Changeset 428834d for owl.c

Timestamp:

Jan 9, 2008, 2:17:57 PM (16 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

File:

• owl.c (modified) (3 diffs)

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.