Changeset 269 for libcacaTweet

Timestamp:

Dec 23, 2003, 5:32:56 PM (18 years ago)

Author:

Sam Hocevar

Message:

• src/io.c: + Fixed a warning by including <unistd.h>. + Support for arrow and function keys under X11.

File:

• libcaca/trunk/src/io.c (modified) (4 diffs)

libcaca/trunk/src/io.c

@@ -42 +42 @@
 #   include <X11/Xlib.h>
 #   include <X11/Xutil.h>
-#endif
+#   include <X11/keysym.h>
+#endif
+
+#include <unistd.h>
 
 #include "caca.h"
@@ -68 +71 @@
     unsigned int event = 0;
 
-    /* Read all available key events */
+    /* Read all available key events and push them into the buffer */
     while(keys < KEY_BUFLEN)
     {
@@ -77 +80 @@
     }
 
+    /* If no keys were read, return */
     if(!keys)
         return 0;
@@ -267 +271 @@
                == True)
         {
-            if(event.type == KeyPress)
+            KeySym keysym;
+
+            if(event.type != KeyPress)
+                continue;
+
+            if(XLookupString(&event.xkey, &key, 1, NULL, NULL))
+                return key;
+
+            keysym = XKeycodeToKeysym(x11_dpy, event.xkey.keycode, 0);
+            switch(keysym)
             {
-                //KeySym keysym;
-                //keysym = XKeycodeToKeysym(_caca_dpy, event.xkey.keycode, 0);
-                if(XLookupString(&event.xkey, &key, 1, NULL, NULL))
-                    return key;
+            case XK_F1:    return CACA_KEY_F1;
+            case XK_F2:    return CACA_KEY_F2;
+            case XK_F3:    return CACA_KEY_F3;
+            case XK_F4:    return CACA_KEY_F4;
+            case XK_F5:    return CACA_KEY_F5;
+            case XK_F6:    return CACA_KEY_F6;
+            case XK_F7:    return CACA_KEY_F7;
+            case XK_F8:    return CACA_KEY_F8;
+            case XK_F9:    return CACA_KEY_F9;
+            case XK_F10:   return CACA_KEY_F10;
+            case XK_F11:   return CACA_KEY_F11;
+            case XK_F12:   return CACA_KEY_F12;
+            case XK_F13:   return CACA_KEY_F13;
+            case XK_F14:   return CACA_KEY_F14;
+            case XK_F15:   return CACA_KEY_F15;
+            case XK_Left:  return CACA_KEY_LEFT;
+            case XK_Right: return CACA_KEY_RIGHT;
+            case XK_Up:    return CACA_KEY_UP;
+            case XK_Down:  return CACA_KEY_DOWN;
+            default:       return 0;
             }
         }