Changeset 428834d

Timestamp:

Jan 9, 2008, 2:17:57 PM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

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

Children:

369479d

Parents:

c10fef0

Message:

take two for input processing

Files:

• keymap.c (modified) (6 diffs)
• keypress.c (modified) (2 diffs)
• keys.c (modified) (2 diffs)
• owl.c (modified) (3 diffs)
• owl.h (modified) (2 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, gunichar 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) {

keypress.c

@@ -148 +148 @@
   }
   if (!*kb) {
-    if (j&OWL_META(0)) {
+    if (j & OWL_META(0)) {
       strcat(kb, "M-");
       j &= ~OWL_META(0);
@@ -163 +163 @@
       strcat(kb, kb2);    
     }
+    
   }  
   if (!*kb) {

keys.c

@@ -294 +294 @@
 /****************************************************************/
 
-void owl_keys_recwin_prealways(int j) {
+void owl_keys_recwin_prealways(owl_input j) {
   /* Clear the message line on subsequent key presses */
   owl_function_makemsg("");
 }
 
-void owl_keys_editwin_default(int j) {
+void owl_keys_editwin_default(owl_input j) {
   owl_editwin *e;
-  if (NULL != (e=owl_global_get_typwin(&g))) {
-    owl_editwin_process_char(e, j);
+  if (NULL != (e=owl_global_get_typwin(&g))
+      && j.ch < 0x100) {
+       owl_editwin_process_char(e, j.uch);
   }
 }
 
-void owl_keys_editwin_postalways(int j) {
+void owl_keys_editwin_postalways(owl_input j) {
   owl_editwin *e;
-  if (NULL != (e=owl_global_get_typwin(&g))) {
-    owl_editwin_post_process_char(e, j);
+  if (NULL != (e=owl_global_get_typwin(&g))
+      && j.ch < 0x100) {
+    owl_editwin_post_process_char(e, j.uch);
   }  
   owl_global_set_needrefresh(&g);
 }
 
-void owl_keys_popless_postalways(int j) {
+void owl_keys_popless_postalways(owl_input j) {
   owl_viewwin *v = owl_global_get_viewwin(&g);
   owl_popwin *pw = owl_global_get_popwin(&g);
@@ -323 +325 @@
 }
 
-void owl_keys_default_invalid(int j) {
-  if (j==ERR) return;
-  if (j==410) return;
+void owl_keys_default_invalid(owl_input j) {
+  if (j.ch==ERR) return;
+  if (j.ch==410) return;
   owl_keyhandler_invalidkey(owl_global_get_keyhandler(&g));
 }

owl.c

@@ -71 +71 @@
   owl_popwin *pw;
   int ret, initialsubs, debug, argcsave, followlast;
-  gunichar j;
+  owl_input j;
   int newmsgs, nexttimediff;
   struct sigaction sigact;
@@ -546 +546 @@
      * little bit, but otherwise do not.  This lets input be grabbed
      * as quickly as possbile */
-    j=wgetch(typwin);
-    if (j == ERR
-#ifdef KEY_RESIZE
-        || j == KEY_RESIZE
-#endif
-         ) {
+    j.ch = wgetch(typwin);
+    if (j.ch == ERR) {
       usleep(10000);
     } else {
-      /* Pull in a full utf-8 character. */
-      if (j & 0x80) {
-        char utf8buf[7];
+      j.uch = '\0';
+      if (j.ch >= KEY_MIN && j.ch <= KEY_MAX) {
+        /* This is a curses control character. */
+      }
+      else if (j.ch > 0x7f && j.ch < 0xfe) {
+        /* Pull in a full utf-8 character. */
         int bytes, i;
-        memset(utf8buf,'\0',7);
-        utf8buf[0] = j;
-
-        if ((j & 0xc0) && (~j & 0x20)) bytes = 2;
-        else if ((j & 0xe0) && (~j & 0x10)) bytes = 3;
-        else if ((j & 0xf0) && (~j & 0x08)) bytes = 4;
-        else if ((j & 0xf8) && (~j & 0x04)) bytes = 5;
-        else if ((j & 0xfc) && (~j & 0x02)) bytes = 6;
+        char *utf8buf[7];
+        memset(utf8buf, '\0', 7);
+
+        utf8buf[0] = j.ch;
+
+        if ((j.ch & 0xc0) && (~j.ch & 0x20)) bytes = 2;
+        else if ((j.ch & 0xe0) && (~j.ch & 0x10)) bytes = 3;
+        else if ((j.ch & 0xf0) && (~j.ch & 0x08)) bytes = 4;
+        else if ((j.ch & 0xf8) && (~j.ch & 0x04)) bytes = 5;
+        else if ((j.ch & 0xfc) && (~j.ch & 0x02)) bytes = 6;
         else bytes = 1;
         
@@ -572 +573 @@
         }
         if (g_utf8_validate(utf8buf, -1, NULL)) {
-          j = g_utf8_get_char(utf8buf);
+          j.uch = g_utf8_get_char(utf8buf);
         }
         else {
-          j = ERR;
+          j.ch = ERR;
         }
       }
+      else if (j.ch <= 0x7f) {
+        j.uch = j.ch;
+      }
+      
       owl_global_update_lastinputtime(&g);
       /* find and activate the current keymap.

owl.h

@@ -272 +272 @@
 } owl_variable;
 
+typedef struct _owl_input {
+  int ch;
+  char utf8buf[8];
+  gunichar uch;
+} owl_input;
+
 typedef struct _owl_fmtext {
   int textlen;
@@ -511 +517 @@
   owl_list  bindings;           /* key bindings */
   struct _owl_keymap *submap;   /* submap */
-  void (*default_fn)(int j);    /* default action (takes a keypress) */
-  void (*prealways_fn)(int j);  /* always called before a keypress is received */
-  void (*postalways_fn)(int j); /* always called after keypress is processed */
+  void (*default_fn)(owl_input j);      /* default action (takes a keypress) */
+  void (*prealways_fn)(owl_input  j);   /* always called before a keypress is received */
+  void (*postalways_fn)(owl_input  j);  /* always called after keypress is processed */
 } owl_keymap;