From 40aae1493178923142bf07e45c6063bd314d4cc2 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Sun, 26 Mar 2017 14:05:16 -0700
Subject: [PATCH] Surface resize is working again

---
 scripts/core/init.js        |  2 +-
 scripts/modules/module.js   |  4 +++-
 scripts/modules/surface.js  | 19 ++++++++++---------
 scripts/modules/terminal.js | 31 +++++++++++++++++--------------
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/scripts/core/init.js b/scripts/core/init.js
index f72c02c..e63d961 100644
--- a/scripts/core/init.js
+++ b/scripts/core/init.js
@@ -32,7 +32,7 @@ starting_canvas.width = parseInt(starting_canvas.width/40) * 40;
 starting_canvas.height = parseInt(starting_canvas.height/40) * 40;
 
 ronin.terminal.query("~ "+ronin.timestamp());
-ronin.terminal.query("@ resize:"+starting_canvas.render());
+ronin.terminal.query("surface.resize "+starting_canvas.render());
 ronin.terminal.query("@ select:Main");
 ronin.terminal.query("- color=#ff0000");
 ronin.terminal.query("# fill=#ff0000");
diff --git a/scripts/modules/module.js b/scripts/modules/module.js
index cb69a6e..884d1b7 100644
--- a/scripts/modules/module.js
+++ b/scripts/modules/module.js
@@ -80,13 +80,15 @@ function Module(rune)
     var method_name = content.split(" ")[0];
 
     if(this.methods[method_name]){
-      console.log(this.methods[method_name].params)
       s = this.methods[method_name].params;
     }
     else{
       for(method in this.methods){
         s += "."+method+"("+method_name+") ";
       }
+      for(setting in this.settings){
+        s += setting+"="+this.settings[setting].render()+" ";
+      }
     }
     return s;  
   }
diff --git a/scripts/modules/surface.js b/scripts/modules/surface.js
index c55139a..6d7db18 100644
--- a/scripts/modules/surface.js
+++ b/scripts/modules/surface.js
@@ -24,19 +24,18 @@ function Surface(rune)
 
   this.resize = function(params)
   {
-    var rect = new Rect(params[0]);
-    this.settings["size"] = rect;
+    this.settings["size"] = params.rect();
 
     Object.keys(ronin.surface.layers).forEach(function (key) {
-      ronin.surface.layers[key].resize(rect);
+      ronin.surface.layers[key].resize(this.settings["size"]);
     });
     
-    ronin.surface.element.width = rect.width * 2;
-    ronin.surface.element.height = rect.height * 2;
-    ronin.surface.element.style.width = rect.width+"px";
-    ronin.surface.element.style.height = rect.height+"px";
-    ronin.surface.element.style.marginLeft = -(rect.width/2);
-    ronin.surface.element.style.marginTop = -(rect.height/2);
+    ronin.surface.element.width = this.settings["size"].width * 2;
+    ronin.surface.element.height = this.settings["size"].height * 2;
+    ronin.surface.element.style.width = this.settings["size"].width+"px";
+    ronin.surface.element.style.height = this.settings["size"].height+"px";
+    ronin.surface.element.style.marginLeft = -(this.settings["size"].width/2);
+    ronin.surface.element.style.marginTop = -(this.settings["size"].height/2);
 
     ronin.on_resize();
     ronin.terminal.log(new Log(this,"Resized Surface to "+this.settings["size"].render()));
@@ -98,6 +97,8 @@ function Surface(rune)
 
   this.update_widget = function()
   {
+    if(!this.active_layer){ return; }
+
     var s = "";
     
     s += "<span class='module'>";
diff --git a/scripts/modules/terminal.js b/scripts/modules/terminal.js
index 1633c7a..a8cce55 100644
--- a/scripts/modules/terminal.js
+++ b/scripts/modules/terminal.js
@@ -92,27 +92,30 @@ function Terminal(rune)
     var module_name = content.indexOf(".") > -1 ? content.split(" ")[0].split(".")[0] : content.split(" ")[0];
     var method_name = content.indexOf(".") > -1 ? content.split(" ")[0].split(".")[1] : "default";
 
+    var parameters = content.split(" "); parameters.shift();
+    var parameters = new Command(parameters);
+
     if(ronin[module_name] && ronin[module_name][method_name]){
-      ronin[module_name][method_name]();
+      ronin[module_name][method_name](parameters);
     }
     else{
       ronin.terminal.log(new Log(ronin.terminal,"Unknown module"));
     }
 
-    var key = content[0];
-    var cmd = new Command(content.substring(1).trim().split(" "));
+    // var key = content[0];
+    // var cmd = new Command(content.substring(1).trim().split(" "));
 
-    if(ronin.modules[key]){
-      ronin.modules[key].update_settings(cmd);
-      ronin.modules[key].run_methods(cmd);
-      // ronin.modules[key].active(cmd);
-      ronin.terminal.history.push(content);
-      ronin.terminal.history_index = ronin.terminal.history.length-1;
-      ronin.terminal.update_menu();
-    }
-    else{
-      ronin.terminal.log(new Log(ronin.terminal,"Unknown module: "+key));
-    }    
+    // if(ronin.modules[key]){
+    //   ronin.modules[key].update_settings(cmd);
+    //   ronin.modules[key].run_methods(cmd);
+    //   // ronin.modules[key].active(cmd);
+    //   ronin.terminal.history.push(content);
+    //   ronin.terminal.history_index = ronin.terminal.history.length-1;
+    //   ronin.terminal.update_menu();
+    // }
+    // else{
+    //   ronin.terminal.log(new Log(ronin.terminal,"Unknown module: "+key));
+    // }    
   }
 
   // Hint