add on/off button

ghewgill · Jun 20, 2011 · db1fda8 · db1fda8
1 parent 417a74a
commit db1fda8
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 10 deletions.
diff --git a/common/hp15c.js b/common/hp15c.js
@@ -1,3 +1,4 @@
+var On = true;
 var Display;
 var Stack = [0, 0, 0, 0];
 var StackI = [0, 0, 0, 0];
@@ -220,7 +221,7 @@ var KeyTable = [
     ['q', 'E', ')', '^', '\\','_', '7', '8', '9', '/'],
     ['T', 'G', 's', 'c', 't', 'e', '4', '5', '6', '*'],
     ['P', 'U', 'r', 'x', '\b','\r','1', '2', '3', '-'],
-    [' ', 'f', 'g', 'S', 'R', '\r','0', '.', ';', '+']
+    ['\x1b', 'f', 'g', 'S', 'R', '\r','0', '.', ';', '+']
 ];
 var ExtraKeyTable = [
     [3, 6, -1, '!'],
@@ -570,6 +571,9 @@ function log10int(x) {
 function update_lcd(s) {
     LcdDisplay = s;
     Display.clear_digits();
+    if (!On) {
+        return;
+    }
     if (Flags[9] && !BlinkOn) {
         return;
     }
@@ -1869,7 +1873,7 @@ function op_test(t) {
 }
 
 function op_on() {
-    alert("Unimplemented: ON");
+    On = !On;
 }
 
 function op_sto_reg(n) {
@@ -2754,6 +2758,9 @@ function run() {
 }
 
 function key(k, override) {
+    if (!On && k != '\x1b') {
+        return;
+    }
     if (DisableKeys && !override) {
         return;
     }

diff --git a/dashboard/hp15c.html b/dashboard/hp15c.html
@@ -249,16 +249,20 @@
             var html = "";
             for (var i = 0; i < 4; i++) {
                 for (var j = 0; j < 10; j++) {
-                    if (i === 3 && (j === 0 || j === 5)) continue;
+                    if (i === 3 && j === 5) continue;
                     var c = KeyTable[i][j];
+                    var w = "1em";
                     if (c === "\b") {
                         c = "\u2190";
                     } else if (c === "\r") {
                         c = "\u21b2";
+                    } else if (c === "\u001b") {
+                        c = "esc";
+                        w = "2em";
                     }
                     var top = 167 + 65*i;
                     var left = 70 + 57*j;
-                    html += '<div class="help" style="top: ' + top + '; left: ' + left + '">' + c + '</div>';
+                    html += '<div class="help" style="top: ' + top + '; left: ' + left + '; width: ' + w + '">' + c + '</div>';
                 }
             }
             for (var i in ExtraKeyTable) {

diff --git a/qt/hp15c.cpp b/qt/hp15c.cpp
@@ -215,16 +215,20 @@ CalcWidget::CalcWidget(QWidget *parent)
             mapper.setMapping(b, key);
             connect(b, SIGNAL(clicked()), &mapper, SLOT(map()));
             buttons[i] = b;
-            if (!(r == 3 && (c == 0 || c == 5))) {
+            if (!(r == 3 && c == 5)) {
                 QString hk = key;
+                int w = 16;
                 if (hk == "\b") {
                     hk = QChar(0x2190);
                 } else if (hk == "\r") {
                     hk = QChar(0x21b2);
+                } else if (hk == "\x1b") {
+                    hk = "esc";
+                    w = 32;
                 }
                 QLabel *help = new QLabel(hk, this);
                 help->move(70 + 57 * c, 167 + 65 * r);
-                help->resize(16, 16);
+                help->resize(w, 16);
                 help->setAutoFillBackground(true);
                 help->setPalette(helpPalette);
                 help->setMargin(1);

diff --git a/swing/CalcFrame.java b/swing/CalcFrame.java
@@ -437,15 +437,19 @@ public void actionPerformed(ActionEvent e) {
                 });
                 b.setBounds(bx, by, 39, h);
                 pane.add(b, 0);
-                if (!(r == 3 && (c == 0 || c == 5))) {
+                if (!(r == 3 && c == 5)) {
                     String hk = key;
+                    int w = 16;
                     if (hk == "\b") {
                         hk = "\u2190";
                     } else if (hk == "\r") {
                         hk = "\u21b2";
+                    } else if (hk == "\u001b") {
+                        hk = "esc";
+                        w = 32;
                     }
                     JLabel help = new JLabel(hk);
-                    help.setBounds(70 + 57 * c, 167 + 65 * r, 16, 16);
+                    help.setBounds(70 + 57 * c, 167 + 65 * r, w, 16);
                     help.setOpaque(true);
                     help.setBackground(Color.yellow);
                     help.setHorizontalAlignment(SwingConstants.CENTER);

diff --git a/web/hp15c.html b/web/hp15c.html
@@ -185,16 +185,20 @@
             var frame = $("#frame");
             for (var i = 0; i < 4; i++) {
                 for (var j = 0; j < 10; j++) {
-                    if (i === 3 && (j === 0 || j === 5)) continue;
+                    if (i === 3 && j === 5) continue;
                     var c = KeyTable[i][j];
+                    var w = "1em";
                     if (c === "\b") {
                         c = "\u2190";
                     } else if (c === "\r") {
                         c = "\u21b2";
+                    } else if (c === "\u001b") {
+                        c = "esc";
+                        w = "2em";
                     }
                     var top = 167 + 65*i;
                     var left = 70 + 57*j;
-                    frame.append('<div class="help" style="top: ' + top + '; left: ' + left + '">' + c + '</div>');
+                    frame.append('<div class="help" style="top: ' + top + '; left: ' + left + '; width: ' + w + '">' + c + '</div>');
                 }
             }
             for (var i in ExtraKeyTable) {