Changes in keymap.c [cf83b7a:428834d]

File:

• keymap.c (modified) (6 diffs)

keymap.c

@@ -5 +5 @@
 
 /* returns 0 on success */
-int owl_keymap_init(owl_keymap *km, char *name, char *desc, void (*default_fn)(int), void (*prealways_fn)(int), void (*postalways_fn)(int))
+int owl_keymap_init(owl_keymap *km, char *name, char *desc, void (*default_fn)(owl_input), void (*prealways_fn)(owl_input), void (*postalways_fn)(owl_input))
 {
   if (!name || !desc) return(-1);
@@ -151 +151 @@
 }
 
-owl_keymap *owl_keyhandler_create_and_add_keymap(owl_keyhandler *kh, char *name, char *desc, void (*default_fn)(int), void (*prealways_fn)(int), void (*postalways_fn)(int))
+owl_keymap *owl_keyhandler_create_and_add_keymap(owl_keyhandler *kh, char *name, char *desc, void (*default_fn)(owl_input), void (*prealways_fn)(owl_input), void (*postalways_fn)(owl_input))
 {
   owl_keymap *km;
@@ -202 +202 @@
 /* processes a keypress.  returns 0 if the keypress was handled,
  * 1 if not handled, -1 on error, and -2 if j==ERR. */
-int owl_keyhandler_process(owl_keyhandler *kh, int j)
+int owl_keyhandler_process(owl_keyhandler *kh, owl_input j)
 {
   owl_keymap     *km;
@@ -214 +214 @@
 
   /* temporarily disallow C-`/C-SPACE until we fix associated bugs */
-  if (j==ERR || j==0) {
+  if (j.ch == ERR || j.ch == 0) {
         return(-1);
   }
@@ -224 +224 @@
 
   /* deal with ESC prefixing */
-  if (!kh->in_esc && j==27) {
+  if (!kh->in_esc && j.ch == 27) {
     kh->in_esc = 1;
     return(0);
   }
   if (kh->in_esc) {
-    j = OWL_META(j);
+    j.ch = OWL_META(j.ch);
     kh->in_esc = 0;
   }
   
-  kh->kpstack[++(kh->kpstackpos)] = j;
+  kh->kpstack[++(kh->kpstackpos)] = j.ch;
   if (kh->kpstackpos >= OWL_KEYMAP_MAXSTACK) {
     owl_keyhandler_reset(kh);
@@ -260 +260 @@
       } else if (match == 2) {  /* exact match */
         /* owl_function_debugmsg("processkey: found exact match in %s", km->name); */
-        owl_keybinding_execute(kb, j);
+        owl_keybinding_execute(kb, j.ch);
         owl_keyhandler_reset(kh);
         if (km->postalways_fn) {