Changeset e1b136bf

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).

Files:

• keybinding.c (modified) (7 diffs)
• keymap.c (modified) (3 diffs)
• owl.h (modified) (1 diff)

keybinding.c

@@ -34 +34 @@
     return(-1);
   }
-  kb->j = owl_malloc((nktokens+1)*sizeof(int));
+  kb->keys = owl_malloc(nktokens*sizeof(int));
   for (i=0; i<nktokens; i++) {
-    kb->j[i] = owl_keypress_fromstring(ktokens[i]);
-    if (kb->j[i] == ERR) { 
+    kb->keys[i] = owl_keypress_fromstring(ktokens[i]);
+    if (kb->keys[i] == ERR) { 
       atokenize_free(ktokens, nktokens);
-      owl_free(kb->j);
+      owl_free(kb->keys);
       return(-1);
     }
   }
-  kb->j[i] = 0;
+  kb->len = nktokens;
 
   atokenize_free(ktokens, nktokens);
@@ -57 +57 @@
 void owl_keybinding_free(owl_keybinding *kb)
 {
-  if (kb->j) owl_free(kb->j);
+  if (kb->keys) owl_free(kb->keys);
   if (kb->desc) owl_free(kb->desc);
   if (kb->command) owl_free(kb->command);
@@ -80 +80 @@
 
 /* returns 0 on success */
-int owl_keybinding_stack_tostring(int *j, char *buff, int bufflen)
+int owl_keybinding_stack_tostring(int *j, int len, char *buff, int bufflen)
 {
   char *pos = buff;
@@ -86 +86 @@
   int   i, n;
 
-  for (i=0; j[i]; i++) {
+  for (i=0; i < len; i++) {
     owl_keypress_tostring(j[i], 0, pos, rem-1);
-    if (j[i+1]) strcat(pos, " ");
+    if (i < len - 1) strcat(pos, " ");
     n = strlen(pos);
     pos += n;
@@ -99 +99 @@
 int owl_keybinding_tostring(owl_keybinding *kb, char *buff, int bufflen)
 {
-  return owl_keybinding_stack_tostring(kb->j, buff, bufflen);
+  return owl_keybinding_stack_tostring(kb->keys, kb->len, buff, bufflen);
 }
 
@@ -108 +108 @@
 
 /* returns 0 on no match, 1 on subset match, and 2 on complete match */
-int owl_keybinding_match(owl_keybinding *kb, int *kpstack)
+int owl_keybinding_match(owl_keybinding *kb, owl_keyhandler *kh)
 {
-  int *kbstack = kb->j;
-  
-  while (*kbstack && *kpstack) {
-    if (*kbstack != *kpstack) {
+  int i;
+  for(i = 0; i <= kh->kpstackpos && i < kb->len; i++) {
+    if(kb->keys[i] != kh->kpstack[i])
       return 0;
-    }
-    kbstack++; kpstack++;
   }
-  if (!*kpstack && !*kbstack) {
+
+  /* If we've made it to this point, then they match as far as they are. */
+  if(kb->len == kh->kpstackpos + 1) {
+    /* Equal length */
     return 2;
-  } else if (!*kpstack) {
+  } else if(kb->len > kh->kpstackpos + 1) {
     return 1;
-  } else {
-    return 0;
   }
+
+  return 0;
 }
 
@@ -130 +130 @@
 int owl_keybinding_equal(owl_keybinding *kb1, owl_keybinding *kb2)
 {
-  int *j1 = kb1->j;
-  int *j2 = kb2->j;
-  while (*j1 && *j2) {
-    if (*(j1++) != *(j2++))  return(0);
+  int i;
+
+  if(kb1->len != kb2->len) return 0;
+
+  for(i = 0; i < kb1->len; i++) {
+    if(kb1->keys[i] != kb2->keys[i])
+      return 0;
   }
-  if (*j1 != *j2) return(0);
-  return(1);
+
+  return 1;
 }

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);

owl.h

@@ -444 +444 @@
 
 typedef struct _owl_keybinding {
-  int  *j;                      /* keypress stack (0-terminated) */  
+  int  *keys;                   /* keypress stack */
+  int   len;                    /* length of stack */
   int   type;                   /* command or function? */
   char *desc;                   /* description (or "*user*") */