COMMON: implement DEFINEKEY undo #92

Author: chrisws

samples/distro-examples/tests/keymap.bas

@@ -0,0 +1,34 @@
+sub foo
+  ? "f"
+end
+
+definekey 2, foo
+definekey 1, foo
+definekey 1, foo
+definekey 1, foo
+definekey 1, 1
+definekey 1, 2
+definekey 1, 3
+definekey 1, 2
+definekey 1, 3
+definekey 2, 0
+definekey 2, 0
+definekey 2, 0
+definekey 2, 0
+
+definekey asc("x"), foo
+definekey asc("x"), foo
+definekey asc("y"), foo
+definekey asc("z"), foo
+definekey asc("f"), foo
+definekey asc("x"), 0
+definekey asc("y"), 0
+definekey asc("z"), 0
+
+if (instr(sbver, "SDL") <> 0) then
+  while 1
+    ? ".";
+    delay 10
+  wend
+endif
+

src/common/blib.c

@@ -2835,14 +2835,20 @@ void cmd_definekey(void) {
 
   if (!prog_error) {
     par_getcomma();
-
-    if (code_peek() != kwTYPE_CALL_UDF) {
-      err_syntax(kwDEFINEKEY, "%I,%G");
-    } else {
+    switch (code_peek()) {
+    case kwTYPE_INT:
+      prog_ip++;
+      keymap_remove(key, code_getint());
+      break;
+    case kwTYPE_CALL_UDF:
       keymap_add(key, prog_ip);
 
       // skip ahead to avoid immediate call
       prog_ip += BC_CTRLSZ + 1;
+      break;
+    default:
+      err_syntax(kwDEFINEKEY, "%I,%G");
+      break;
     }
   }
   v_free(&var);

src/common/keymap.c

@@ -30,7 +30,7 @@ struct key_map_s {
   int key;         // key definition
 };
 
-key_map_s* keymap = 0;
+key_map_s *keymap = 0;
 
 /**
  * Prepare task_t exec.keymap for keymap handling at program init
@@ -42,7 +42,7 @@ void keymap_init() {
 /**
  * Handler for keymap_free()
  */
-void keymap_delete(key_map_s* km) {
+void keymap_delete(key_map_s *km) {
   if (km) {
     keymap_delete(km->next);
     free(km);
@@ -61,13 +61,13 @@ void keymap_free() {
  * DEFINEKEY command handler to add a keymap 
  */
 void keymap_add(uint32_t key, bcip_t ip) {
-  key_map_s* km = (key_map_s*) malloc(sizeof (key_map_s));
+  key_map_s *km = (key_map_s *)malloc(sizeof(key_map_s));
   km->next = 0;
   km->ip = ip;
   km->key = key;
 
   // add the new mapping onto the linked list
-  key_map_s* head = keymap;
+  key_map_s *head = keymap;
   if (!head) {
     keymap = km;
   } else {
@@ -78,12 +78,44 @@ void keymap_add(uint32_t key, bcip_t ip) {
   }
 }
 
+/**
+ * DEFINEKEY key, 0
+ */
+void keymap_remove(uint32_t key, int level) {
+  key_map_s *head = keymap;
+  key_map_s *prev = head;
+  int size = 0;
+
+  while (head) {
+    if (head->key == key) {
+      key_map_s *current = head;
+      prev->next = head->next;
+      head = head->next;
+      free(current);
+      if (current == prev) {
+        prev = head;
+      }
+      if (current == keymap) {
+        keymap = head;
+      }
+    } else {
+      prev = head;
+      head = head->next;
+      size++;
+    }
+  }
+  if (!size) {
+    keymap = 0;
+  }
+}
+
+
 /**
  * invokes the handler for the given key
  */
 int keymap_invoke(uint32_t key) {
   int result = 0;
-  key_map_s* head = keymap;
+  key_map_s *head = keymap;
   while (head) {
     if (head->key == key) {
       bcip_t ip = prog_ip; // store current ip
@@ -175,7 +207,7 @@ void timer_free(timer_s *timer) {
 }
 
 void timer_add(var_num_t interval, bcip_t ip) {
-  timer_s* timer = (timer_s*) malloc(sizeof (timer_s));
+  timer_s *timer = (timer_s *)malloc(sizeof (timer_s));
   timer->next = NULL;
   timer->ip = ip;
   timer->interval = interval;
@@ -195,7 +227,7 @@ void timer_add(var_num_t interval, bcip_t ip) {
 }
 
 void timer_run(uint32_t now) {
-  timer_s* timer = prog_timer;
+  timer_s *timer = prog_timer;
   while (timer) {
     if (timer->value == 0) {
       // start timer

src/common/keymap.h

@@ -87,6 +87,7 @@ extern "C" {
 void keymap_init();
 void keymap_free();
 void keymap_add(uint32_t key, bcip_t ip);
+void keymap_remove(uint32_t key, int level);
 int keymap_invoke(uint32_t key);
 int keymap_kbhit();
 int keymap_kbpeek();

src/platform/console/Makefile.am

@@ -28,7 +28,7 @@ TEST_DIR=../../../samples/distro-examples/tests
 UNIT_TESTS=array break byref eval-test iifs matrices metaa ongoto \
 	         uds hash pass1 call_tau short-circuit strings stack-test \
            replace-test read-data proc optchk letbug ptr ref \
-           trycatch chain stream-files split-join sprint all scope goto
+           trycatch chain stream-files split-join sprint all scope goto keymap
 
 test: ${bin_PROGRAMS}
 	@for utest in $(UNIT_TESTS); do                             \