Added local helpers

1 files changed, 42 insertions, 31 deletions

diff --git a/desktop/sources/scripts/terminal.js b/desktop/sources/scripts/terminal.js
index 8d24ca5..28ccad0 100644
--- a/desktop/sources/scripts/terminal.js
+++ b/desktop/sources/scripts/terminal.js
@@ -122,8 +122,20 @@ function Terminal () {
     return x % this.grid.w === 0 && y % this.grid.h === 0
   }
 
-  this.isHelper = function (x, y) {
-    return (y === 0 && this.cursor.x === x) || (x === 0 && this.cursor.y === y) || (y === this.orca.h - 1 && this.cursor.x === x) || (x === this.orca.w - 1 && this.cursor.y === y)
+  this.isNear = function (x, y) {
+    return x > (parseInt(this.cursor.x / this.grid.w) * this.grid.w) - 1 && x <= ((1 + parseInt(this.cursor.x / this.grid.w)) * this.grid.w) && y > (parseInt(this.cursor.y / this.grid.h) * this.grid.h) - 1 && y <= ((1 + parseInt(this.cursor.y / this.grid.h)) * this.grid.h)
+  }
+
+  this.isAligned = function (x, y) {
+    return x === this.cursor.x || y == this.cursor.y
+  }
+
+  this.isEdge = function (x, y) {
+    return x === 0 || y === 0 || x === this.orca.w - 1 || y === this.orca.h - 1
+  }
+
+  this.isLocals = function (x, y) {
+    return this.isNear(x, y) === true && (x % (this.grid.w / 4) === 0 && y % (this.grid.h / 4) === 0) === true
   }
 
   this.portAt = function (x, y) {
@@ -152,7 +164,6 @@ function Terminal () {
     if (g !== '.') { return g }
     if (this.isCursor(x, y)) { return this.isPaused ? '~' : '@' }
     if (this.isMarker(x, y)) { return '+' }
-    if (this.isHelper(x, y)) { return '"' }
     return g
   }
 
@@ -160,13 +171,34 @@ function Terminal () {
     const isLocked = this.orca.lockAt(x, y)
     const port = this.ports[this.orca.indexAt(x, y)]
     if (this.isSelection(x, y)) { return 4 }
-    if (glyph === '.' && isLocked === false) { return 7 }
-    if (selection === glyph && isLocked === false) { return 6 }
+    if (glyph === '.' && isLocked === false) { return this.isLocals(x, y) === true ? 9 : 7 }
+    if (selection === glyph && isLocked === false && selection !== '.') { return 6 }
     if (port) { return port[2] }
     if (isLocked === true) { return 5 }
     return 9
   }
 
+  this.makeTheme = function (type) {
+    // Operator
+    if (type === 0) { return { bg: this.theme.active.b_med, fg: this.theme.active.f_low } }
+    // Haste
+    if (type === 1) { return { fg: this.theme.active.b_med } }
+    // Input
+    if (type === 2) { return { fg: this.theme.active.b_high } }
+    // Output
+    if (type === 3) { return { bg: this.theme.active.b_high, fg: this.theme.active.f_low } }
+    // Selected
+    if (type === 4) { return { bg: this.theme.active.b_inv, fg: this.theme.active.f_inv } }
+    // Locked
+    if (type === 5) { return { fg: this.theme.active.f_med } }
+    // LikeCursor
+    if (type === 6) { return { fg: this.theme.active.b_inv } }
+    // Invisible
+    if (type === 7) { return {} }
+    // Default
+    return { fg: this.theme.active.f_low }
+  }
+
   // Canvas
 
   this.clear = function () {
@@ -210,40 +242,19 @@ function Terminal () {
   }
 
   this.drawSprite = function (x, y, g, type) {
-    const style = this.drawStyle(type)
-    if (style.bg) {
+    const theme = this.makeTheme(type)
+    if (theme.bg) {
       const bgrect = { x: x * this.tile.w * this.scale, y: (y) * this.tile.h * this.scale, w: this.tile.w * this.scale, h: this.tile.h * this.scale }
-      this.context.fillStyle = style.bg
+      this.context.fillStyle = theme.bg
       this.context.fillRect(bgrect.x, bgrect.y, bgrect.w, bgrect.h)
     }
-    if (style.fg) {
+    if (theme.fg) {
       const fgrect = { x: (x + 0.5) * this.tile.w * this.scale, y: (y + 1) * this.tile.h * this.scale, w: this.tile.w * this.scale, h: this.tile.h * this.scale }
-      this.context.fillStyle = style.fg
+      this.context.fillStyle = theme.fg
       this.context.fillText(g, fgrect.x, fgrect.y)
     }
   }
 
-  this.drawStyle = function (type) {
-    // Operator
-    if (type === 0) { return { bg: this.theme.active.b_med, fg: this.theme.active.f_low } }
-    // Haste
-    if (type === 1) { return { fg: this.theme.active.b_med } }
-    // Input
-    if (type === 2) { return { fg: this.theme.active.b_high } }
-    // Output
-    if (type === 3) { return { bg: this.theme.active.b_high, fg: this.theme.active.f_low } }
-    // Selected
-    if (type === 4) { return { bg: this.theme.active.b_inv, fg: this.theme.active.f_inv } }
-    // Locked
-    if (type === 5) { return { fg: this.theme.active.f_med } }
-    // LikeCursor
-    if (type === 6) { return { fg: this.theme.active.b_inv } }
-    // Invisible
-    if (type === 7) { return {} }
-    // Default
-    return { fg: this.theme.active.f_low }
-  }
-
   this.write = function (text, offsetX, offsetY, limit, type = 2) {
     let x = 0
     while (x < text.length && x < limit - 1) {