Fix #113

ExistOS-Team · Dec 30, 2022 · dff9576 · dff9576
1 parent 18a0952
commit dff9576
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Libs/libcas.libcpp b/Libs/libcas.libcpp
diff --git a/Libs/libkcasgui.libcpp b/Libs/libkcasgui.libcpp
diff --git a/Libs/src/khicas/keyboard.h b/Libs/src/khicas/keyboard.h
@@ -22,7 +22,7 @@
 #define KEY_CHAR_EXCL       0x21 /* ! */
 #define KEY_CHAR_DP         0x2e /* . */
 #define KEY_CHAR_EXP        0x0f /* ee */
-#define KEY_CHAR_PMINUS     30200 /* - */
+#define KEY_CHAR_PMINUS     30200 /* _ */
 #define KEY_CHAR_PLUS       43   /* + */
 #define KEY_CHAR_MINUS      45   /* - */
 #define KEY_CHAR_MULT       42   /* * */
@@ -142,10 +142,10 @@
 #define KEY_CTRL_ALPHA      30007
 #define KEY_CTRL_OPTN       30008
 #define KEY_CTRL_VARS       30030
-#define KEY_CTRL_UP         30018
-#define KEY_CTRL_LEFT       30020
-#define KEY_CTRL_RIGHT      30021
-#define KEY_CTRL_DOWN       30023
+#define KEY_CTRL_UP         1
+#define KEY_CTRL_DOWN       2
+#define KEY_CTRL_LEFT       0
+#define KEY_CTRL_RIGHT      3
 #define KEY_CTRL_F1         30009
 #define KEY_CTRL_F2         30010
 #define KEY_CTRL_F3         30011

diff --git a/Libs/src/khicas/libcas.libcpp b/Libs/src/khicas/libcas.libcpp
diff --git a/Libs/src/khicas/libkcasgui.libcpp b/Libs/src/khicas/libkcasgui.libcpp
diff --git a/System/khicas_stub.cpp b/System/khicas_stub.cpp
@@ -246,7 +246,7 @@ int GetKey(int *key) {
 
 
         case KEY_SHIFT:
-            *key = 0;
+            *key = -1;
             // *key = KEY_CTRL_SHIFT; 
             if (keyStatus & 1) {
                 keyStatus &= ~1;
@@ -264,7 +264,7 @@ int GetKey(int *key) {
             break;
 
         case KEY_ALPHA:
-            *key = 0;
+            *key = -1;
             // *key = KEY_CTRL_ALPHA;
 
             if (keyStatus & 4) {
@@ -388,15 +388,15 @@ int GetKey(int *key) {
         }
 
         default:
-            *key = 0;
+            *key = -1;
             return KEYREP_NOEVENT;
             break;
         }
 
         return KEYREP_KEYEVENT;
     }
 
-    *key = 0;
+    *key = -1;
 
     return KEYREP_NOEVENT;
 }