Added optional pos to inject and write

3 files changed, 11 insertions, 7 deletions

diff --git a/desktop/sources/scripts/commander.js b/desktop/sources/scripts/commander.js
index fad4085..4d8cf63 100644
--- a/desktop/sources/scripts/commander.js
+++ b/desktop/sources/scripts/commander.js
@@ -11,8 +11,8 @@ export default function Commander (terminal) {
   this.passives = {
     'find': (p) => { terminal.cursor.find(p.str) },
     'select': (p) => { terminal.cursor.select(p.x, p.y, p.w, p.h) },
-    'inject': (p) => { terminal.source.inject(p.str, false) },
-    'write': (p) => { terminal.cursor.select(p.x, p.y, p.length) }
+    'inject': (p) => { terminal.cursor.select(p._x, p._y); terminal.source.inject(p._str, false) },
+    'write': (p) => { terminal.cursor.select(p._x, p._y, p._str.length) }
   }
 
   this.actives = {
@@ -42,8 +42,8 @@ export default function Commander (terminal) {
     // Edit
     'find': (p) => { terminal.cursor.find(p.str) },
     'select': (p) => { terminal.cursor.select(p.x, p.y, p.w, p.h) },
-    'inject': (p) => { terminal.source.inject(p.str, true) },
-    'write': (p) => { terminal.cursor.select(p.x, p.y, p.length.length); terminal.cursor.writeBlock([p.chars]) }
+    'inject': (p) => { terminal.cursor.select(p._x, p._y); terminal.source.inject(p._str, true) },
+    'write': (p) => { terminal.cursor.select(p._x, p._y, p._str.length); terminal.cursor.writeBlock([p._str.split('')]) }
   }
 
   // Make shorthands
@@ -61,6 +61,10 @@ export default function Commander (terminal) {
     this.y = parseInt(this.parts[1])
     this.w = parseInt(this.parts[2])
     this.h = parseInt(this.parts[3])
+    // Optionals Position Style
+    this._str = this.parts[0]
+    this._x = parseInt(this.parts[1])
+    this._y = parseInt(this.parts[2])
   }
 
   // Begin
diff --git a/desktop/sources/scripts/cursor.js b/desktop/sources/scripts/cursor.js
index 0de531b..e09c012 100644
--- a/desktop/sources/scripts/cursor.js
+++ b/desktop/sources/scripts/cursor.js
@@ -33,8 +33,8 @@ export default function Cursor (terminal) {
 
   this.scaleTo = function (w, h) {
     if (isNaN(w) || isNaN(h)) { return }
-    this.w = clamp(parseInt(w), 0, terminal.orca.w - 1)
-    this.h = clamp(parseInt(h), 0, terminal.orca.h - 1)
+    this.w = clamp(parseInt(w), 1, terminal.orca.w - 1)
+    this.h = clamp(parseInt(h), 1, terminal.orca.h - 1)
     terminal.update()
   }
 
diff --git a/desktop/sources/scripts/terminal.js b/desktop/sources/scripts/terminal.js
index e625d4c..1b0d93e 100644
--- a/desktop/sources/scripts/terminal.js
+++ b/desktop/sources/scripts/terminal.js
@@ -12,7 +12,7 @@ import Controller from './lib/controller.js'
 import library from '../../core/library.js'
 
 export default function Terminal () {
-  this.version = 139
+  this.version = 141
   this.library = library
 
   this.orca = new Orca(this)