Changeset e1b136bf for keymap.c

Timestamp:

May 11, 2009, 9:50:58 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

70110286, dfaa47d

Parents:

fa8f439

Message:

Fix handling of C-SPACE, etc.

Instead of storing key sequences NULL-terminated, store an explicit
length everywhere, so that we can handle C-SPACE (which is a 0).

File:

• keymap.c (modified) (3 diffs)

keymap.c

@@ -213 +213 @@
   }
 
-  /* temporarily disallow C-`/C-SPACE until we fix associated bugs */
-  if (j.ch == ERR || j.ch == 0) {
-        return(-1);
-  }
-
-  /*
-    owl_function_debugmsg("processkey: got key %d, active keymap %s, stack at %d",
-    j, kh->active->name, kh->kpstackpos);
-  */
-
   /* deal with ESC prefixing */
   if (!kh->in_esc && j.ch == 27) {
@@ -253 +243 @@
     for (i=owl_list_get_size(&km->bindings)-1; i>=0; i--) {
       kb = (owl_keybinding*)owl_list_get_element(&km->bindings, i);
-      match = owl_keybinding_match(kb, kh->kpstack);
+      match = owl_keybinding_match(kb, kh);
       if (match == 1) {         /* subset match */
 
@@ -290 +280 @@
 {
     char kbbuff[500];
-    owl_keybinding_stack_tostring(kh->kpstack, kbbuff, 500);
+    owl_keybinding_stack_tostring(kh->kpstack, kh->kpstackpos+1, kbbuff, 500);
     owl_function_makemsg("'%s' is not a valid key in this context.", kbbuff);
     owl_keyhandler_reset(kh);