Getting things back into order

scripts/core/init.js

@@ -21,17 +21,6 @@ document.onkeydown = function myFunction(){ keyboard.listen_onkeydown(event); };
 
 ronin.install();
 
-// Canvas
-var starting_canvas = new Rect();
-starting_canvas.width = window.innerWidth - 200;
-starting_canvas.height = window.innerHeight - 300;
-
-// Clamp
-
-starting_canvas.width = parseInt(starting_canvas.width/40) * 40;
-starting_canvas.height = parseInt(starting_canvas.height/40) * 40;
-
-
 var target_file = window.location.hash ? window.location.hash : "default";
 target_file = target_file.substr(1,target_file.length-1);
 

scripts/modules/frame.js

@@ -18,7 +18,17 @@ function Frame(rune)
     this.blink();
     this.select(new Command(["background"]));
 
-    this.resize(new Command(["300x300"]));
+    // Canvas
+    var starting_canvas = new Rect();
+    starting_canvas.width = window.innerWidth - 100;
+    starting_canvas.height = window.innerHeight - 100;
+
+    // Clamp
+
+    starting_canvas.width = parseInt(starting_canvas.width/40) * 40;
+    starting_canvas.height = parseInt(starting_canvas.height/40) * 40;
+
+    this.resize(new Command([starting_canvas.width+"x"+starting_canvas.height]));
   }
 
   // Methods
@@ -38,6 +48,9 @@ function Frame(rune)
     ronin.frame.element.style.width = this.settings["size"].width+"px";
     ronin.frame.element.style.height = this.settings["size"].height+"px";
 
+    ronin.frame.element.style.left = (window.innerWidth - this.settings["size"].width)/2;
+    ronin.frame.element.style.top = (window.innerHeight - this.settings["size"].height)/2;
+
     ronin.on_resize();
 
     return 1, "ok";

scripts/modules/terminal.js

@@ -6,7 +6,6 @@ function Terminal(rune)
   this.input = document.createElement("input");
   this.hint_element = document.createElement("hint");
   this.logs_element = document.createElement("logs");
-  this.status_element = document.createElement("status");
 
   this.history = [];
   this.locks = [];
@@ -20,24 +19,19 @@ function Terminal(rune)
     this.element.appendChild(this.input);
     this.element.appendChild(this.hint_element);
     this.element.appendChild(this.logs_element);
-    this.element.appendChild(this.status_element);
-
-    this.status_element.innerHTML = "Ready.";
+    
     this.input.value = ""
     this.hint_element.innerHTML = "";
   }
 
   this.run = function()
   {
-    this.run_line(this.input.value);
-    // this.hint_element.innerHTML = "";
-    // var queue = ronin.terminal.input.value.split("\n")
-    // for(id in queue){
-    //   this.hint_element.innerHTML += "<line><text class='input'>"+this.syntax_highlight(queue[id])+"</text><text class='status'>"+this.run_line(queue.length - id,queue[id])+"</text></line>\n";
-    // }
+    this.hint_element.innerHTML = "";
+    this.run_line(this.input.value,false);
+    this.input.value = "";
   }
 
-  this.run_line = function(line)
+  this.run_line = function(line,is_preview)
   {
     var content = line;
 
@@ -63,7 +57,7 @@ function Terminal(rune)
     ronin.cursor.set_mode(ronin[module_name]);
 
     if(ronin[module_name] && ronin[module_name][method_name]){
-      return ronin[module_name][method_name](parameters);
+      return ronin[module_name][method_name](parameters,is_preview);
     }
     else if(ronin[module_name] && ronin[module_name].settings[setting_name]){
       return ronin[module_name].update_setting(setting_name,parameters);
@@ -86,15 +80,6 @@ function Terminal(rune)
     return  0, "Unknown";
   }
 
-  this.update_active_line = function(new_line)
-  {
-    var lines = this.input.value.split("\n");
-
-    lines[lines.length-1] = new_line;
-
-    this.input.value = lines.join("\n");
-  }
-
   this.log = function(log)
   {
 
@@ -102,7 +87,7 @@ function Terminal(rune)
 
   this.update = function()
   {
-
+    this.hint_element.innerHTML = "<span class='input'>"+this.input.value+"</span> "+this.run_line(this.input.value,true);
   }
 
   this.filename = "default.rin";

scripts/modules/terminal.widget.js

@@ -12,22 +12,9 @@ function Widget(rune)
 
   this.update = function()
   {
-    var s = "";
-    s += ronin.terminal.file_name+" ";
-    s += "Cursor: "+ronin.cursor.widget();
-    
-    this.element.innerHTML = s;
+    this.element.innerHTML = ronin.cursor.widget();
   }
 
-  // this.widget = function()
-  // {
-  //   if(!this.active_layer){ return ""; }
-
-  //   return this.rune+" "+this.settings["size"].render();
-  // }
-
-  // // Widget
-
   this.update_widget = function()
   {
     if(!this.active_layer){ return; }