Changeset 681 for libcaca/trunkTweet

Timestamp:

Mar 23, 2006, 7:36:59 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Massive rework of the event handling code, as per the TODO list.

Location:

libcaca/trunk

Files:

• caca/caca.c (modified) (1 diff)
• caca/caca.h (modified) (2 diffs)
• caca/caca_internals.h (modified) (4 diffs)
• caca/driver_conio.c (modified) (1 diff)
• caca/driver_gl.c (modified) (1 diff)
• caca/driver_ncurses.c (modified) (6 diffs)
• caca/driver_network.c (modified) (1 diff)
• caca/driver_slang.c (modified) (3 diffs)
• caca/driver_vga.c (modified) (1 diff)
• caca/driver_win32.c (modified) (5 diffs)
• caca/driver_x11.c (modified) (2 diffs)
• caca/event.c (modified) (8 diffs)
• src/aafire.c (modified) (1 diff)
• src/cacaball.c (modified) (1 diff)
• src/cacamoir.c (modified) (1 diff)
• src/cacaplas.c (modified) (1 diff)
• src/cacaview.c (modified) (4 diffs)
• test/colors.c (modified) (2 diffs)
• test/demo.c (modified) (2 diffs)
• test/dithering.c (modified) (2 diffs)
• test/event.c (modified) (9 diffs)
• test/gamma.c (modified) (2 diffs)
• test/hsv.c (modified) (2 diffs)
• test/spritedit.c (modified) (1 diff)
• test/transform.c (modified) (2 diffs)
• test/unicode.c (modified) (2 diffs)

libcaca/trunk/caca/caca.c

@@ -75 +75 @@
     kk->events.last_key_ticks = 0;
     kk->events.autorepeat_ticks = 0;
-    kk->events.last_key = 0;
-#endif
-#if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO)
+    kk->events.last_key_event.type = CACA_EVENT_NONE;
+#endif
+#if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO) || defined(USE_GL)
     kk->events.queue = 0;
 #endif

libcaca/trunk/caca/caca.h

@@ -114 +114 @@
  *  Event types returned by caca_get_event().
  */
-enum caca_event
-{
-    CACA_EVENT_NONE =          0x00000000, /**< No event. */
-    CACA_EVENT_KEY_PRESS =     0x01000000, /**< A key was pressed. */
-    CACA_EVENT_KEY_RELEASE =   0x02000000, /**< A key was released. */
-    CACA_EVENT_MOUSE_PRESS =   0x04000000, /**< A mouse button was pressed. */
-    CACA_EVENT_MOUSE_RELEASE = 0x08000000, /**< A mouse button was released. */
-    CACA_EVENT_MOUSE_MOTION =  0x10000000, /**< The mouse was moved. */
-    CACA_EVENT_RESIZE =        0x20000000, /**< The window was resized. */
-    CACA_EVENT_ANY =           0xff000000  /**< Bitmask for any event. */
+enum caca_event_type
+{
+    CACA_EVENT_NONE =          0x0000, /**< No event. */
+
+    CACA_EVENT_KEY_PRESS =     0x0001, /**< A key was pressed. */
+    CACA_EVENT_KEY_RELEASE =   0x0002, /**< A key was released. */
+    CACA_EVENT_MOUSE_PRESS =   0x0004, /**< A mouse button was pressed. */
+    CACA_EVENT_MOUSE_RELEASE = 0x0008, /**< A mouse button was released. */
+    CACA_EVENT_MOUSE_MOTION =  0x0010, /**< The mouse was moved. */
+    CACA_EVENT_RESIZE =        0x0020, /**< The window was resized. */
+
+    CACA_EVENT_ANY =           0xffff  /**< Bitmask for any event. */
+};
+
+struct caca_event
+{
+    enum caca_event_type type;
+    union
+    {
+        struct { unsigned int x, y, button; } mouse;
+        struct { unsigned int w, h; } resize;
+        struct { unsigned int c; unsigned long int ucs4; char utf8[8]; } key;
+    } data;
 };
 
@@ -197 +210 @@
  *
  *  @{ */
-unsigned int caca_get_event(caca_t *kk, unsigned int);
-unsigned int caca_wait_event(caca_t *kk, unsigned int);
+int caca_get_event(caca_t *kk, unsigned int, struct caca_event *);
+int caca_wait_event(caca_t *kk, unsigned int, struct caca_event *);
 unsigned int caca_get_mouse_x(caca_t *kk);
 unsigned int caca_get_mouse_y(caca_t *kk);

libcaca/trunk/caca/caca_internals.h

@@ -116 +116 @@
         void (* display) (caca_t *);
         void (* handle_resize) (caca_t *);
-        unsigned int (* get_event) (caca_t *);
+        int (* get_event) (caca_t *, struct caca_event *);
     } drv;
 
@@ -140 +140 @@
     struct events
     {
-#if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO)
-        unsigned int buf[EVENTBUF_LEN];
+#if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO) || defined(USE_GL)
+        struct caca_event buf[EVENTBUF_LEN];
         int queue;
 #endif
@@ -148 +148 @@
         unsigned int last_key_ticks;
         unsigned int autorepeat_ticks;
-        unsigned int last_key;
+        struct caca_event last_key_event;
 #endif
     } events;
@@ -159 +159 @@
 /* Internal event functions */
 extern void _caca_handle_resize(caca_t *);
-#if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO)
-extern void _push_event(caca_t *, unsigned int);
-extern unsigned int _pop_event(caca_t *);
+#if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO) || defined(USE_GL)
+extern void _push_event(caca_t *, struct caca_event *);
+extern int _pop_event(caca_t *, struct caca_event *);
 #endif
 

libcaca/trunk/caca/driver_conio.c

@@ -122 +122 @@
 }
 
-static unsigned int conio_get_event(caca_t *kk)
+static int conio_get_event(caca_t *kk, struct caca_event *ev)
 {
-    unsigned int event;
+    unsigned char ch;
+    struct caca_event release;
 
     if(!_conio_kbhit())
-        return CACA_EVENT_NONE;
+    {
+        ev->type = CACA_EVENT_NONE;
+        return 0;
+    }
 
-    event = getch();
-    _push_event(kk, CACA_EVENT_KEY_RELEASE | event);
-    return CACA_EVENT_KEY_PRESS | event;
+    ch = getch();
+
+    ev->type = CACA_EVENT_KEY_PRESS;
+    ev->data.key.c = ch;
+    ev->data.key.ucs4 = (uint32_t)ch;
+    ev->data.key.utf8[0] = ch;
+    ev->data.key.utf8[1] = '\0';
+
+    release = *ev;
+    release.type = CACA_EVENT_KEY_RELEASE;
+    _push_event(kk, &release);
+
+    return 1;
 }
 

libcaca/trunk/caca/driver_gl.c

@@ -309 +309 @@
 }
 
-static unsigned int gl_get_event(caca_t *kk)
-{
-    unsigned int event = 0;
-
+static int gl_get_event(caca_t *kk, struct caca_event *ev)
+{
     glutMainLoopEvent();
 
     if(kk->resize.resized)
-        return CACA_EVENT_RESIZE;
+    {
+        ev->type = CACA_EVENT_RESIZE;
+        ev->data.resize.w = kk->qq->width;
+        ev->data.resize.h = kk->qq->height;
+        return 1;
+    }
 
     if(kk->drv.p->mouse_changed)
     {
+        ev->type = CACA_EVENT_MOUSE_MOTION;
+        ev->data.mouse.x = kk->mouse.x;
+        ev->data.mouse.y = kk->mouse.y;
+        kk->drv.p->mouse_changed = 0;
+
         if(kk->drv.p->mouse_clicked)
         {
-            event |= CACA_EVENT_MOUSE_PRESS | kk->drv.p->mouse_button;
+            _push_event(kk, ev);
+            ev->type = CACA_EVENT_MOUSE_PRESS;
+            ev->data.mouse.button = kk->drv.p->mouse_button;
             kk->drv.p->mouse_clicked = 0;
         }
-        kk->mouse.x = kk->drv.p->mouse_x;
-        kk->mouse.y = kk->drv.p->mouse_y;
-        event |= CACA_EVENT_MOUSE_MOTION | (kk->mouse.x << 12) | kk->mouse.y;
-        kk->drv.p->mouse_changed = 0;
+
+        return 1;
     }
 
     if(kk->drv.p->key != 0)
     {
-        event |= CACA_EVENT_KEY_PRESS;
-        event |= kk->drv.p->key;
+        ev->type = CACA_EVENT_KEY_PRESS;
+        ev->data.key.c = kk->drv.p->key;
+        ev->data.key.ucs4 = (uint32_t)kk->drv.p->key;
+        ev->data.key.utf8[0] = kk->drv.p->key;
+        ev->data.key.utf8[1] = '\0';
         kk->drv.p->key = 0;
-        return event;
+        return 1;
     }
 
     if(kk->drv.p->special_key != 0)
     {
-        event |= CACA_EVENT_KEY_PRESS;
-
         switch(kk->drv.p->special_key)
         {
-            case GLUT_KEY_F1 : kk->drv.p->special_key = 0; return event | CACA_KEY_F1;
-            case GLUT_KEY_F2 : kk->drv.p->special_key = 0; return event | CACA_KEY_F2;
-            case GLUT_KEY_F3 : kk->drv.p->special_key = 0; return event | CACA_KEY_F3;
-            case GLUT_KEY_F4 : kk->drv.p->special_key = 0; return event | CACA_KEY_F4;
-            case GLUT_KEY_F5 : kk->drv.p->special_key = 0; return event | CACA_KEY_F5;
-            case GLUT_KEY_F6 : kk->drv.p->special_key = 0; return event | CACA_KEY_F6;
-            case GLUT_KEY_F7 : kk->drv.p->special_key = 0; return event | CACA_KEY_F7;
-            case GLUT_KEY_F8 : kk->drv.p->special_key = 0; return event | CACA_KEY_F8;
-            case GLUT_KEY_F9 : kk->drv.p->special_key = 0; return event | CACA_KEY_F9;
-            case GLUT_KEY_F10: kk->drv.p->special_key = 0; return event | CACA_KEY_F10;
-            case GLUT_KEY_F11: kk->drv.p->special_key = 0; return event | CACA_KEY_F11;
-            case GLUT_KEY_F12: kk->drv.p->special_key = 0; return event | CACA_KEY_F12;
-            case GLUT_KEY_LEFT : kk->drv.p->special_key = 0; return event | CACA_KEY_LEFT;
-            case GLUT_KEY_RIGHT: kk->drv.p->special_key = 0; return event | CACA_KEY_RIGHT;
-            case GLUT_KEY_UP   : kk->drv.p->special_key = 0; return event | CACA_KEY_UP;
-            case GLUT_KEY_DOWN : kk->drv.p->special_key = 0; return event | CACA_KEY_DOWN;
-            default: return CACA_EVENT_NONE;
+            case GLUT_KEY_F1 : ev->data.key.c = CACA_KEY_F1; break;
+            case GLUT_KEY_F2 : ev->data.key.c = CACA_KEY_F2; break;
+            case GLUT_KEY_F3 : ev->data.key.c = CACA_KEY_F3; break;
+            case GLUT_KEY_F4 : ev->data.key.c = CACA_KEY_F4; break;
+            case GLUT_KEY_F5 : ev->data.key.c = CACA_KEY_F5; break;
+            case GLUT_KEY_F6 : ev->data.key.c = CACA_KEY_F6; break;
+            case GLUT_KEY_F7 : ev->data.key.c = CACA_KEY_F7; break;
+            case GLUT_KEY_F8 : ev->data.key.c = CACA_KEY_F8; break;
+            case GLUT_KEY_F9 : ev->data.key.c = CACA_KEY_F9; break;
+            case GLUT_KEY_F10: ev->data.key.c = CACA_KEY_F10; break;
+            case GLUT_KEY_F11: ev->data.key.c = CACA_KEY_F11; break;
+            case GLUT_KEY_F12: ev->data.key.c = CACA_KEY_F12; break;
+            case GLUT_KEY_LEFT : ev->data.key.c = CACA_KEY_LEFT; break;
+            case GLUT_KEY_RIGHT: ev->data.key.c = CACA_KEY_RIGHT; break;
+            case GLUT_KEY_UP   : ev->data.key.c = CACA_KEY_UP; break;
+            case GLUT_KEY_DOWN : ev->data.key.c = CACA_KEY_DOWN; break;
+            default: ev->type = CACA_EVENT_NONE; return 0;
         }
-    }
-    return CACA_EVENT_NONE;
+
+        ev->type = CACA_EVENT_KEY_PRESS;
+        ev->data.key.ucs4 = 0;
+        ev->data.key.utf8[0] = '\0';
+
+        kk->drv.p->special_key = 0;
+        return 1;
+    }
+
+    ev->type = CACA_EVENT_NONE;
+    return 0;
 }
 

libcaca/trunk/caca/driver_ncurses.c

@@ -227 +227 @@
 }
 
-static unsigned int ncurses_get_event(caca_t *kk)
-{
-    unsigned int event;
+static int ncurses_get_event(caca_t *kk, struct caca_event *ev)
+{
     int intkey;
 
     intkey = getch();
     if(intkey == ERR)
-        return CACA_EVENT_NONE;
+    {
+        ev->type = CACA_EVENT_NONE;
+        return 0;
+    }
 
     if(intkey < 0x100)
     {
-        return CACA_EVENT_KEY_PRESS | intkey;
+        ev->type = CACA_EVENT_KEY_PRESS;
+        ev->data.key.c = intkey;
+        return 1;
     }
 
@@ -249 +253 @@
         {
             case BUTTON1_PRESSED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 1);
+                ev->data.mouse.button = 1;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
                 break;
             case BUTTON1_RELEASED:
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 1);
+                ev->data.mouse.button = 1;
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON1_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 1);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 1);
+                ev->data.mouse.button = 1;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON1_DOUBLE_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 1);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 1);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 1);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 1);
+                ev->data.mouse.button = 1;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON1_TRIPLE_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 1);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 1);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 1);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 1);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 1);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 1);
+                ev->data.mouse.button = 1;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON1_RESERVED_EVENT:
@@ -276 +285 @@
 
             case BUTTON2_PRESSED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 2);
+                ev->data.mouse.button = 2;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
                 break;
             case BUTTON2_RELEASED:
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 2);
+                ev->data.mouse.button = 2;
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON2_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 2);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 2);
+                ev->data.mouse.button = 2;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON2_DOUBLE_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 2);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 2);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 2);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 2);
+                ev->data.mouse.button = 2;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON2_TRIPLE_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 2);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 2);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 2);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 2);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 2);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 2);
+                ev->data.mouse.button = 2;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON2_RESERVED_EVENT:
@@ -303 +317 @@
 
             case BUTTON3_PRESSED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 3);
+                ev->data.mouse.button = 3;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
                 break;
             case BUTTON3_RELEASED:
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 3);
+                ev->data.mouse.button = 3;
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON3_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 3);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 3);
+                ev->data.mouse.button = 3;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON3_DOUBLE_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 3);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 3);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 3);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 3);
+                ev->data.mouse.button = 3;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON3_TRIPLE_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 3);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 3);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 3);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 3);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 3);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 3);
+                ev->data.mouse.button = 3;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON3_RESERVED_EVENT:
@@ -330 +349 @@
 
             case BUTTON4_PRESSED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 4);
+                ev->data.mouse.button = 4;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
                 break;
             case BUTTON4_RELEASED:
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 4);
+                ev->data.mouse.button = 4;
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON4_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 4);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 4);
+                ev->data.mouse.button = 4;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON4_DOUBLE_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 4);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 4);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 4);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 4);
+                ev->data.mouse.button = 4;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON4_TRIPLE_CLICKED:
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 4);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 4);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 4);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 4);
-                _push_event(kk, CACA_EVENT_MOUSE_PRESS | 4);
-                _push_event(kk, CACA_EVENT_MOUSE_RELEASE | 4);
+                ev->data.mouse.button = 4;
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_PRESS; _push_event(kk, ev);
+                ev->type = CACA_EVENT_MOUSE_RELEASE; _push_event(kk, ev);
                 break;
             case BUTTON4_RESERVED_EVENT:
@@ -362 +386 @@
         if(kk->mouse.x == (unsigned int)mevent.x &&
            kk->mouse.y == (unsigned int)mevent.y)
-            return _pop_event(kk);
+            return _pop_event(kk, ev);
 
         kk->mouse.x = mevent.x;
         kk->mouse.y = mevent.y;
 
-        return CACA_EVENT_MOUSE_MOTION | (kk->mouse.x << 12) | kk->mouse.y;
-    }
-
-    event = CACA_EVENT_KEY_PRESS;
+        ev->type = CACA_EVENT_MOUSE_MOTION;
+        ev->data.mouse.x = kk->mouse.x;
+        ev->data.mouse.y = kk->mouse.y;
+        return 1;
+    }
 
     switch(intkey)
     {
-        case KEY_UP: return event | CACA_KEY_UP;
-        case KEY_DOWN: return event | CACA_KEY_DOWN;
-        case KEY_LEFT: return event | CACA_KEY_LEFT;
-        case KEY_RIGHT: return event | CACA_KEY_RIGHT;
-
-        case KEY_IC: return event | CACA_KEY_INSERT;
-        case KEY_DC: return event | CACA_KEY_DELETE;
-        case KEY_HOME: return event | CACA_KEY_HOME;
-        case KEY_END: return event | CACA_KEY_END;
-        case KEY_PPAGE: return event | CACA_KEY_PAGEUP;
-        case KEY_NPAGE: return event | CACA_KEY_PAGEDOWN;
-
-        case KEY_F(1): return event | CACA_KEY_F1;
-        case KEY_F(2): return event | CACA_KEY_F2;
-        case KEY_F(3): return event | CACA_KEY_F3;
-        case KEY_F(4): return event | CACA_KEY_F4;
-        case KEY_F(5): return event | CACA_KEY_F5;
-        case KEY_F(6): return event | CACA_KEY_F6;
-        case KEY_F(7): return event | CACA_KEY_F7;
-        case KEY_F(8): return event | CACA_KEY_F8;
-        case KEY_F(9): return event | CACA_KEY_F9;
-        case KEY_F(10): return event | CACA_KEY_F10;
-        case KEY_F(11): return event | CACA_KEY_F11;
-        case KEY_F(12): return event | CACA_KEY_F12;
-    }
-
-    return CACA_EVENT_NONE;
+        case KEY_UP: ev->data.key.c = CACA_KEY_UP; break;
+        case KEY_DOWN: ev->data.key.c = CACA_KEY_DOWN; break;
+        case KEY_LEFT: ev->data.key.c = CACA_KEY_LEFT; break;
+        case KEY_RIGHT: ev->data.key.c = CACA_KEY_RIGHT; break;
+
+        case KEY_IC: ev->data.key.c = CACA_KEY_INSERT; break;
+        case KEY_DC: ev->data.key.c = CACA_KEY_DELETE; break;
+        case KEY_HOME: ev->data.key.c = CACA_KEY_HOME; break;
+        case KEY_END: ev->data.key.c = CACA_KEY_END; break;
+        case KEY_PPAGE: ev->data.key.c = CACA_KEY_PAGEUP; break;
+        case KEY_NPAGE: ev->data.key.c = CACA_KEY_PAGEDOWN; break;
+
+        case KEY_F(1): ev->data.key.c = CACA_KEY_F1; break;
+        case KEY_F(2): ev->data.key.c = CACA_KEY_F2; break;
+        case KEY_F(3): ev->data.key.c = CACA_KEY_F3; break;
+        case KEY_F(4): ev->data.key.c = CACA_KEY_F4; break;
+        case KEY_F(5): ev->data.key.c = CACA_KEY_F5; break;
+        case KEY_F(6): ev->data.key.c = CACA_KEY_F6; break;
+        case KEY_F(7): ev->data.key.c = CACA_KEY_F7; break;
+        case KEY_F(8): ev->data.key.c = CACA_KEY_F8; break;
+        case KEY_F(9): ev->data.key.c = CACA_KEY_F9; break;
+        case KEY_F(10): ev->data.key.c = CACA_KEY_F10; break;
+        case KEY_F(11): ev->data.key.c = CACA_KEY_F11; break;
+        case KEY_F(12): ev->data.key.c = CACA_KEY_F12; break;
+
+        default: ev->type = CACA_EVENT_NONE; return 0;
+    }
+
+    ev->type = CACA_EVENT_KEY_PRESS;
+    ev->data.key.ucs4 = 0;
+    ev->data.key.utf8[0] = '\0';
+    return 1;
 }
 

libcaca/trunk/caca/driver_network.c

@@ -284 +284 @@
 }
 
-static unsigned int network_get_event(caca_t *kk)
+static int network_get_event(caca_t *kk, struct caca_event *ev)
 {
     /* Manage new connections as this function will be called sometimes

libcaca/trunk/caca/driver_slang.c

@@ -255 +255 @@
 }
 
-static unsigned int slang_get_event(caca_t *kk)
-{
-    unsigned int event;
+static int slang_get_event(caca_t *kk, struct caca_event *ev)
+{
     int intkey;
 
     if(!SLang_input_pending(0))
-        return CACA_EVENT_NONE;
+    {
+        ev->type = CACA_EVENT_NONE;
+        return 0;
+    }
 
     /* We first use SLang_getkey() to see whether Esc was pressed
@@ -277 +279 @@
     if(intkey < 0x100)
     {
-        return CACA_EVENT_KEY_PRESS | intkey;
+        ev->type = CACA_EVENT_KEY_PRESS;
+        ev->data.key.c = intkey;
+        return 1;
     }
 
@@ -285 +289 @@
         unsigned int x = SLang_getkey() - '!';
         unsigned int y = SLang_getkey() - '!';
-        _push_event(kk, CACA_EVENT_MOUSE_PRESS | button);
-        _push_event(kk, CACA_EVENT_MOUSE_RELEASE | button);
+
+        ev->data.mouse.button = button;
+        ev->type = CACA_EVENT_MOUSE_PRESS;
+        _push_event(kk, ev);
+        ev->type = CACA_EVENT_MOUSE_RELEASE;
+        _push_event(kk, ev);
 
         if(kk->mouse.x == x && kk->mouse.y == y)
-            return _pop_event(kk);
+            return _pop_event(kk, ev);
 
         kk->mouse.x = x;
         kk->mouse.y = y;
 
-        return CACA_EVENT_MOUSE_MOTION | (kk->mouse.x << 12) | kk->mouse.y;
-    }
-
-    event = CACA_EVENT_KEY_PRESS;
+        ev->type = CACA_EVENT_MOUSE_MOTION;
+        ev->data.mouse.x = kk->mouse.x;
+        ev->data.mouse.y = kk->mouse.y;
+        return 1;
+    }
 
     switch(intkey)
     {
-        case SL_KEY_UP: return event | CACA_KEY_UP;
-        case SL_KEY_DOWN: return event | CACA_KEY_DOWN;
-        case SL_KEY_LEFT: return event | CACA_KEY_LEFT;
-        case SL_KEY_RIGHT: return event | CACA_KEY_RIGHT;
-
-        case SL_KEY_IC: return event | CACA_KEY_INSERT;
-        case SL_KEY_DELETE: return event | CACA_KEY_DELETE;
-        case SL_KEY_HOME: return event | CACA_KEY_HOME;
-        case SL_KEY_END: return event | CACA_KEY_END;
-        case SL_KEY_PPAGE: return event | CACA_KEY_PAGEUP;
-        case SL_KEY_NPAGE: return event | CACA_KEY_PAGEDOWN;
-
-        case SL_KEY_F(1): return event | CACA_KEY_F1;
-        case SL_KEY_F(2): return event | CACA_KEY_F2;
-        case SL_KEY_F(3): return event | CACA_KEY_F3;
-        case SL_KEY_F(4): return event | CACA_KEY_F4;
-        case SL_KEY_F(5): return event | CACA_KEY_F5;
-        case SL_KEY_F(6): return event | CACA_KEY_F6;
-        case SL_KEY_F(7): return event | CACA_KEY_F7;
-        case SL_KEY_F(8): return event | CACA_KEY_F8;
-        case SL_KEY_F(9): return event | CACA_KEY_F9;
-        case SL_KEY_F(10): return event | CACA_KEY_F10;
-        case SL_KEY_F(11): return event | CACA_KEY_F11;
-        case SL_KEY_F(12): return event | CACA_KEY_F12;
-    }
-
-    return CACA_EVENT_NONE;
+        case SL_KEY_UP: ev->data.key.c = CACA_KEY_UP; break;
+        case SL_KEY_DOWN: ev->data.key.c = CACA_KEY_DOWN; break;
+        case SL_KEY_LEFT: ev->data.key.c = CACA_KEY_LEFT; break;
+        case SL_KEY_RIGHT: ev->data.key.c = CACA_KEY_RIGHT; break;
+
+        case SL_KEY_IC: ev->data.key.c = CACA_KEY_INSERT; break;
+        case SL_KEY_DELETE: ev->data.key.c = CACA_KEY_DELETE; break;
+        case SL_KEY_HOME: ev->data.key.c = CACA_KEY_HOME; break;
+        case SL_KEY_END: ev->data.key.c = CACA_KEY_END; break;
+        case SL_KEY_PPAGE: ev->data.key.c = CACA_KEY_PAGEUP; break;
+        case SL_KEY_NPAGE: ev->data.key.c = CACA_KEY_PAGEDOWN; break;
+
+        case SL_KEY_F(1): ev->data.key.c = CACA_KEY_F1; break;
+        case SL_KEY_F(2): ev->data.key.c = CACA_KEY_F2; break;
+        case SL_KEY_F(3): ev->data.key.c = CACA_KEY_F3; break;
+        case SL_KEY_F(4): ev->data.key.c = CACA_KEY_F4; break;
+        case SL_KEY_F(5): ev->data.key.c = CACA_KEY_F5; break;
+        case SL_KEY_F(6): ev->data.key.c = CACA_KEY_F6; break;
+        case SL_KEY_F(7): ev->data.key.c = CACA_KEY_F7; break;
+        case SL_KEY_F(8): ev->data.key.c = CACA_KEY_F8; break;
+        case SL_KEY_F(9): ev->data.key.c = CACA_KEY_F9; break;
+        case SL_KEY_F(10): ev->data.key.c = CACA_KEY_F10; break;
+        case SL_KEY_F(11): ev->data.key.c = CACA_KEY_F11; break;
+        case SL_KEY_F(12): ev->data.key.c = CACA_KEY_F12; break;
+
+        default: ev->type = CACA_EVENT_NONE; return 0;
+    }
+
+    ev->type = CACA_EVENT_KEY_PRESS;
+    ev->data.key.ucs4 = 0;
+    ev->data.key.utf8[0] = '\0';
+    return 1;
 }
 

libcaca/trunk/caca/driver_vga.c

@@ -135 +135 @@
 }
 
-static unsigned int vga_get_event(caca_t *kk)
+static int vga_get_event(caca_t *kk, struct caca_event *ev)
 {
     /* FIXME */
-    return CACA_EVENT_NONE;
+    ev->type = CACA_EVENT_NONE;
+    return 0;
 }
 

libcaca/trunk/caca/driver_win32.c

@@ -236 +236 @@
 }
 
-static unsigned int win32_get_event(caca_t *kk)
+static int win32_get_event(caca_t *kk, struct caca_event *ev)
 {
     INPUT_RECORD rec;
@@ -253 +253 @@
 
             if(rec.Event.KeyEvent.bKeyDown)
-                event = CACA_EVENT_KEY_PRESS;
+                ev->type = CACA_EVENT_KEY_PRESS;
             else
-                event = CACA_EVENT_KEY_RELEASE;
+                ev->type = CACA_EVENT_KEY_RELEASE;
 
             if(rec.Event.KeyEvent.uChar.AsciiChar)
-                return event | rec.Event.KeyEvent.uChar.AsciiChar;
+            {
+                ev->data.key.c = rec.Event.KeyEvent.uChar.AsciiChar;
+                ev->data.key.ucs4 = (uint32_t)ev->data.key.c;
+                ev->data.key.utf8[0] = ev->data.key.c;
+                ev->data.key.utf8[1] = '\0';
+
+                return 1;
+            }
         }
 
@@ -266 +273 @@
             {
                 if(rec.Event.MouseEvent.dwButtonState & 0x01)
-                    return CACA_EVENT_MOUSE_PRESS | 0x000001;
+                {
+                    ev->type = CACA_EVENT_MOUSE_PRESS;
+                    ev->data.mouse.button = 1;
+                    return 1;
+                }
 
                 if(rec.Event.MouseEvent.dwButtonState & 0x02)
-                    return CACA_EVENT_MOUSE_PRESS | 0x000002;
+                {
+                    ev->type = CACA_EVENT_MOUSE_PRESS;
+                    ev->data.mouse.button = 2;
+                    return 1;
+                }
             }
             else if(rec.Event.MouseEvent.dwEventFlags == MOUSE_MOVED)
@@ -282 +297 @@
                 kk->mouse.y = pos.Y;
 
-                return CACA_EVENT_MOUSE_MOTION
-                        | (kk->mouse.x << 12) | kk->mouse.y;
+                ev->type = CACA_EVENT_MOUSE_MOTION;
+                ev->data.mouse.x = kk->mouse.x;
+                ev->data.mouse.y = kk->mouse.y;
+                return 1;
             }
 #if 0
@@ -304 +321 @@
 
         /* Unknown event */
-        return CACA_EVENT_NONE;
+        ev->type = CACA_EVENT_NONE;
+        return 0;
     }
 
     /* No event */
-    return CACA_EVENT_NONE;
+    ev->type = CACA_EVENT_NONE;
+    return 0;
 }
 

libcaca/trunk/caca/driver_x11.c

@@ -400 +400 @@
 }
 
-static unsigned int x11_get_event(caca_t *kk)
-{
-    unsigned int event = 0;
+static int x11_get_event(caca_t *kk, struct caca_event *ev)
+{
     XEvent xevent;
     char key;
@@ -458 +457 @@
             kk->mouse.y = newy;
 
-            return CACA_EVENT_MOUSE_MOTION | (kk->mouse.x << 12) | kk->mouse.y;
+            ev->type = CACA_EVENT_MOUSE_MOTION;
+            ev->data.mouse.x = kk->mouse.x;
+            ev->data.mouse.y = kk->mouse.y;
+            return 1;
         }
 
         /* Check for mouse press and release events */
         if(xevent.type == ButtonPress)
-            return CACA_EVENT_MOUSE_PRESS
-                    | ((XButtonEvent *)&xevent)->button;
+        {
+            ev->type = CACA_EVENT_MOUSE_PRESS;
+            ev->data.mouse.button = ((XButtonEvent *)&xevent)->button;
+            return 1;
+        }
 
         if(xevent.type == ButtonRelease)
-            return CACA_EVENT_MOUSE_RELEASE
-                    | ((XButtonEvent *)&xevent)->button;
+        {
+            ev->type = CACA_EVENT_MOUSE_RELEASE;
+            ev->data.mouse.button = ((XButtonEvent *)&xevent)->button;
+            return 1;
+        }
 
         /* Check for key press and release events */
         if(xevent.type == KeyPress)
-            event |= CACA_EVENT_KEY_PRESS;
+            ev->type = CACA_EVENT_KEY_PRESS;
         else if(xevent.type == KeyRelease)
-            event |= CACA_EVENT_KEY_RELEASE;
+            ev->type = CACA_EVENT_KEY_RELEASE;
         else
             continue;
 
         if(XLookupString(&xevent.xkey, &key, 1, NULL, NULL))
-            return event | key;
+        {
+            ev->data.key.c = key;
+            ev->data.key.ucs4 = key;
+            ev->data.key.utf8[0] = key;
+            ev->data.key.utf8[1] = '\0';
+            return 1;
+        }
 
         keysym = XKeycodeToKeysym(kk->drv.p->dpy, xevent.xkey.keycode, 0);
         switch(keysym)
         {
-        case XK_F1:    return event | CACA_KEY_F1;
-        case XK_F2:    return event | CACA_KEY_F2;
-        case XK_F3:    return event | CACA_KEY_F3;
-        case XK_F4:    return event | CACA_KEY_F4;
-        case XK_F5:    return event | CACA_KEY_F5;
-        case XK_F6:    return event | CACA_KEY_F6;
-        case XK_F7:    return event | CACA_KEY_F7;
-        case XK_F8:    return event | CACA_KEY_F8;
-        case XK_F9:    return event | CACA_KEY_F9;
-        case XK_F10:   return event | CACA_KEY_F10;
-        case XK_F11:   return event | CACA_KEY_F11;
-        case XK_F12:   return event | CACA_KEY_F12;
-        case XK_F13:   return event | CACA_KEY_F13;
-        case XK_F14:   return event | CACA_KEY_F14;
-        case XK_F15:   return event | CACA_KEY_F15;
-        case XK_Left:  return event | CACA_KEY_LEFT;
-        case XK_Right: return event | CACA_KEY_RIGHT;
-        case XK_Up:    return event | CACA_KEY_UP;
-        case XK_Down:  return event | CACA_KEY_DOWN;
-        default:       return CACA_EVENT_NONE;
-        }
+            case XK_F1:    ev->data.key.c = CACA_KEY_F1;    break;
+            case XK_F2:    ev->data.key.c = CACA_KEY_F2;    break;
+            case XK_F3:    ev->data.key.c = CACA_KEY_F3;    break;
+            case XK_F4:    ev->data.key.c = CACA_KEY_F4;    break;
+            case XK_F5:    ev->data.key.c = CACA_KEY_F5;    break;
+            case XK_F6:    ev->data.key.c = CACA_KEY_F6;    break;
+            case XK_F7:    ev->data.key.c = CACA_KEY_F7;    break;
+            case XK_F8:    ev->data.key.c = CACA_KEY_F8;    break;
+            case XK_F9:    ev->data.key.c = CACA_KEY_F9;    break;
+            case XK_F10:   ev->data.key.c = CACA_KEY_F10;   break;
+            case XK_F11:   ev->data.key.c = CACA_KEY_F11;   break;
+            case XK_F12:   ev->data.key.c = CACA_KEY_F12;   break;
+            case XK_F13:   ev->data.key.c = CACA_KEY_F13;   break;
+            case XK_F14:   ev->data.key.c = CACA_KEY_F14;   break;
+            case XK_F15:   ev->data.key.c = CACA_KEY_F15;   break;
+            case XK_Left:  ev->data.key.c = CACA_KEY_LEFT;  break;
+            case XK_Right: ev->data.key.c = CACA_KEY_RIGHT; break;
+            case XK_Up:    ev->data.key.c = CACA_KEY_UP;    break;
+            case XK_Down:  ev->data.key.c = CACA_KEY_DOWN;  break;
+
+            default: ev->type = CACA_EVENT_NONE; return 0;
+        }
+
+        ev->data.key.ucs4 = 0;
+        ev->data.key.utf8[0] = '\0';
+        return 1;
     }
 
-    return CACA_EVENT_NONE;
+    ev->type = CACA_EVENT_NONE;
+    return 0;
 }
 

libcaca/trunk/caca/event.c

@@ -20 +20 @@
 #include "config.h"
 
+#if !defined(__KERNEL__)
+#   include <stdio.h>
+#endif
+
 #include "cucul.h"
 #include "cucul_internals.h"
@@ -25 +29 @@
 #include "caca_internals.h"
 
-static unsigned int _get_next_event(caca_t *);
-static unsigned int _lowlevel_event(caca_t *);
+static int _get_next_event(caca_t *, struct caca_event *);
+static int _lowlevel_event(caca_t *, struct caca_event *);
 
 #if !defined(_DOXYGEN_SKIP_ME)
@@ -49 +53 @@
  * \return The next matching event in the queue, or 0 if no event is pending.
  */
-unsigned int caca_get_event(caca_t *kk, unsigned int event_mask)
+int caca_get_event(caca_t *kk, unsigned int event_mask, struct caca_event *ev)
 {
     if(!event_mask)
-        return CACA_EVENT_NONE;
+        return 0;
 
     for( ; ; )
     {
-        unsigned int event = _get_next_event(kk);
-
-        if(!event || event & event_mask)
-            return event;
+        int ret = _get_next_event(kk, ev);
+
+        if(!ret || ev->type & event_mask)
+            return ret;
     }
 }
@@ -73 +77 @@
  *  \return The next event in the queue.
  */
-unsigned int caca_wait_event(caca_t *kk, unsigned int event_mask)
+int caca_wait_event(caca_t *kk, unsigned int event_mask, struct caca_event *ev)
 {
     if(!event_mask)
-        return CACA_EVENT_NONE;
+        return 0;
 
     for( ; ; )
     {
-        unsigned int event = _get_next_event(kk);
-
-        if(event & event_mask)
-            return event;
+        int ret = _get_next_event(kk, ev);
+
+        if(ret && (ev->type & event_mask))
+            return ret;
 
         _caca_sleep(10000);
@@ -127 +131 @@
  */
 
-static unsigned int _get_next_event(caca_t *kk)
+static int _get_next_event(caca_t *kk, struct caca_event *ev)
 {
 #if defined(USE_SLANG) || defined(USE_NCURSES)
     unsigned int ticks;
 #endif
-    unsigned int event;
+    int ret;
 
     /* If we are about to return a resize event, acknowledge it */
@@ -139 +143 @@
         kk->resize.resized = 0;
         _caca_handle_resize(kk);
-        return CACA_EVENT_RESIZE;
-    }
-
-    event = _lowlevel_event(kk);
+        ev->type = CACA_EVENT_RESIZE;
+        ev->data.resize.w = kk->qq->width;
+        ev->data.resize.h = kk->qq->height;
+        return 1;
+    }
+
+    ret = _lowlevel_event(kk, ev);
 
 #if defined(USE_SLANG)
@@ -150 +157 @@
     if(kk->drv.driver != CACA_DRIVER_NCURSES)
 #endif
-    return event;
+    return ret;
 
 #if defined(USE_SLANG) || defined(USE_NCURSES)
@@ -159 +166 @@
 
     /* Handle autorepeat */
-    if(kk->events.last_key
+    if(kk->events.last_key_event.type
            && kk->events.autorepeat_ticks > AUTOREPEAT_TRIGGER
            && kk->events.autorepeat_ticks > AUTOREPEAT_THRESHOLD
            && kk->events.autorepeat_ticks > AUTOREPEAT_RATE)
     {
-        _push_event(kk, event);
+        _push_event(kk, ev);
         kk->events.autorepeat_ticks -= AUTOREPEAT_RATE;
-        return CACA_EVENT_KEY_PRESS | kk->events.last_key;
+        *ev = kk->events.last_key_event;
+        return 1;
     }
 
     /* We are in autorepeat mode and the same key was just pressed, ignore
      * this event and return the next one by calling ourselves. */
-    if(event == (CACA_EVENT_KEY_PRESS | kk->events.last_key))
+    if(ev->type == CACA_EVENT_KEY_PRESS
+        && kk->events.last_key_event.type
+        && ev->data.key.c == kk->events.last_key_event.data.key.c
+        && ev->data.key.ucs4 == kk->events.last_key_event.data.key.ucs4)
     {
         kk->events.last_key_ticks = 0;
-        return _get_next_event(kk);
+        return _get_next_event(kk, ev);
     }
 
     /* We are in autorepeat mode, but key has expired or a new key was
      * pressed - store our event and return a key release event first */
-    if(kk->events.last_key
+    if(kk->events.last_key_event.type
           && (kk->events.last_key_ticks > AUTOREPEAT_THRESHOLD
-               || (event & CACA_EVENT_KEY_PRESS)))
-    {
-        _push_event(kk, event);
-        event = CACA_EVENT_KEY_RELEASE | kk->events.last_key;
-        kk->events.last_key = 0;
-        return event;
+               || (ev->type & CACA_EVENT_KEY_PRESS)))
+    {
+        _push_event(kk, ev);
+        *ev = kk->events.last_key_event;
+        ev->type = CACA_EVENT_KEY_RELEASE;
+        kk->events.last_key_event.type = CACA_EVENT_NONE;
+        return 1;
     }
 
     /* A new key was pressed, enter autorepeat mode */
-    if(event & CACA_EVENT_KEY_PRESS)
+    if(ev->type & CACA_EVENT_KEY_PRESS)
     {
         kk->events.last_key_ticks = 0;
         kk->events.autorepeat_ticks = 0;
-        kk->events.last_key = event & 0x00ffffff;
-    }
-
-    return event;
-#endif
-}
-
-static unsigned int _lowlevel_event(caca_t *kk)
+        kk->events.last_key_event = *ev;
+    }
+
+    return ev->type ? 1 : 0;
+#endif
+}
+
+static int _lowlevel_event(caca_t *kk, struct caca_event *ev)
 {
 #if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO)
-    unsigned int event = _pop_event(kk);
-
-    if(event)
-        return event;
-#endif
-
-    return kk->drv.get_event(kk);
-}
-
-#if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO)
-void _push_event(caca_t *kk, unsigned int event)
-{
-    if(!event || kk->events.queue == EVENTBUF_LEN)
+    int ret = _pop_event(kk, ev);
+
+    if(ret)
+        return ret;
+#endif
+
+    return kk->drv.get_event(kk, ev);
+}
+
+#if defined(USE_SLANG) || defined(USE_NCURSES) || defined(USE_CONIO) || defined(USE_GL)
+void _push_event(caca_t *kk, struct caca_event *ev)
+{
+    if(!ev->type || kk->events.queue == EVENTBUF_LEN)
         return;
-    kk->events.buf[kk->events.queue] = event;
+    kk->events.buf[kk->events.queue] = *ev;
     kk->events.queue++;
 }
 
-unsigned int _pop_event(caca_t *kk)
+int _pop_event(caca_t *kk, struct caca_event *ev)
 {
     int i;
-    unsigned int event;
 
     if(kk->events.queue == 0)
-        return CACA_EVENT_NONE;
-
-    event = kk->events.buf[0];
+        return 0;
+
+    *ev = kk->events.buf[0];
     for(i = 1; i < kk->events.queue; i++)
         kk->events.buf[i - 1] = kk->events.buf[i];
     kk->events.queue--;
 
-    return event;
-}
-#endif
-
+    return 1;
+}
+#endif
+

libcaca/trunk/src/aafire.c

@@ -262 +262 @@
     {
 #ifdef LIBCACA
-      switch (caca_get_event(kk, CACA_EVENT_KEY_PRESS))
+      struct caca_event ev;
+      if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev))
         {
-          case CACA_EVENT_KEY_PRESS | CACA_KEY_ESCAPE: return;
-          case CACA_EVENT_KEY_PRESS | ' ': pause = !pause;
+          switch(ev.data.key.c)
+            {
+                case CACA_KEY_ESCAPE: return;
+                case ' ': pause = !pause;
+            }
         }
-
 #endif
       drawfire ();

libcaca/trunk/src/cacaball.c

@@ -93 +93 @@
     for(;;)
     {
-        switch(caca_get_event(kk, CACA_EVENT_KEY_PRESS))
-        {
-            case CACA_EVENT_KEY_PRESS | CACA_KEY_ESCAPE: goto end;
-            case CACA_EVENT_KEY_PRESS | ' ': pause = !pause;
+        struct caca_event ev;
+        if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev))
+        {
+            switch(ev.data.key.c)
+            {
+                case CACA_KEY_ESCAPE: goto end;
+                case ' ': pause = !pause;
+            }
         }
 

libcaca/trunk/src/cacamoir.c

@@ -69 +69 @@
     for(;;)
     {
-        switch(caca_get_event(kk, CACA_EVENT_KEY_PRESS))
+        struct caca_event ev;
+        if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev))
         {
-            case CACA_EVENT_KEY_PRESS | CACA_KEY_ESCAPE: goto end;
-            case CACA_EVENT_KEY_PRESS | ' ': pause = !pause;
+            switch(ev.data.key.c)
+            {
+                case CACA_KEY_ESCAPE: goto end;
+                case ' ': pause = !pause;
+            }
         }
 

libcaca/trunk/src/cacaplas.c

@@ -81 +81 @@
     for(;;) 
     {
-        switch(caca_get_event(kk, CACA_EVENT_KEY_PRESS))
+        struct caca_event ev;
+        if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev))
         {
-            case CACA_EVENT_KEY_PRESS | CACA_KEY_ESCAPE: goto end;
-            case CACA_EVENT_KEY_PRESS | ' ': pause = !pause;
+            switch(ev.data.key.c)
+            {
+                case CACA_KEY_ESCAPE: goto end;
+                case ' ': pause = !pause;
+            }
         }
 

libcaca/trunk/src/cacaview.c

@@ -144 +144 @@
     while(!quit)
     {
+        struct caca_event ev;
         unsigned int const event_mask = CACA_EVENT_KEY_PRESS
                                       | CACA_EVENT_RESIZE
                                       | CACA_EVENT_MOUSE_PRESS;
-        unsigned int event, new_status = 0, new_help = 0;
+        unsigned int new_status = 0, new_help = 0;
+        int event;
 
         if(update)
-            event = caca_get_event(kk, event_mask);
+            event = caca_get_event(kk, event_mask, &ev);
         else
-            event = caca_wait_event(kk, event_mask);
+            event = caca_wait_event(kk, event_mask, &ev);
 
         while(event)
         {
-            if(event & CACA_EVENT_MOUSE_PRESS)
+            if(ev.type & CACA_EVENT_MOUSE_PRESS)
             {
-                if((event & 0x00ffffff) == 1)
+                if(ev.data.mouse.button == 1)
                 {
                     if(items) current = (current + 1) % items;
                     reload = 1;
                 }
-                else if((event & 0x00ffffff) == 2)
+                else if(ev.data.mouse.button == 2)
                 {
                     if(items) current = (items + current - 1) % items;
@@ -169 +171 @@
                 }
             }
-            else if(event & CACA_EVENT_KEY_PRESS) switch(event & 0x00ffffff)
+            else if(ev.type & CACA_EVENT_KEY_PRESS) switch(ev.data.key.c)
             {
             case 'n':
@@ -288 +290 @@
                 break;
             }
-            else if(event == CACA_EVENT_RESIZE)
+            else if(ev.type == CACA_EVENT_RESIZE)
             {
                 caca_display(kk);
-                ww = cucul_get_width(qq);
-                wh = cucul_get_height(qq);
+                ww = ev.data.resize.w;
+                wh = ev.data.resize.h;
                 update = 1;
                 set_zoom(zoom);
@@ -303 +305 @@
                 help = new_help;
 
-            event = caca_get_event(kk, CACA_EVENT_KEY_PRESS);
+            event = caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev);
         }
 

libcaca/trunk/test/colors.c

@@ -25 +25 @@
     cucul_t *qq;
     caca_t *kk;
+    struct caca_event ev;
     int i, j;
 
@@ -50 +51 @@
 
     caca_display(kk);
-    caca_wait_event(kk, CACA_EVENT_KEY_PRESS);
+    caca_wait_event(kk, CACA_EVENT_KEY_PRESS, &ev);
 
     caca_detach(kk);

libcaca/trunk/test/demo.c

@@ -69 +69 @@
     while(!quit)
     {
+        struct caca_event ev;
         int menu = 0, mouse = 0, xmouse = 0, ymouse = 0;
-        int event;
-
-        while((event = caca_get_event(kk, CACA_EVENT_ANY)))
+
+        while(caca_get_event(kk, CACA_EVENT_ANY, &ev))
         {
-            if(demo && (event & CACA_EVENT_KEY_PRESS))
+            if(demo && (ev.type & CACA_EVENT_KEY_PRESS))
             {
                 menu = 1;
                 demo = NULL;
             }
-            else if(event & CACA_EVENT_KEY_PRESS)
+            else if(ev.type & CACA_EVENT_KEY_PRESS)
             {
-                switch(event & 0xffff)
+                switch(ev.data.key.c)
                 {
                 case 'q':
@@ -140 +140 @@
                     cucul_clear(qq);
             }
-            else if(event & CACA_EVENT_MOUSE_MOTION)
+            else if(ev.type & CACA_EVENT_MOUSE_MOTION)
             {
                 mouse = 1;
-                xmouse = (event & 0xfff000) >> 12;
-                ymouse = event & 0xfff;
+                xmouse = ev.data.mouse.x;
+                ymouse = ev.data.mouse.y;
             }
         }

libcaca/trunk/test/dithering.c

@@ -35 +35 @@
 int main(void)
 {
+    struct caca_event ev;
     cucul_t *qq;
     caca_t *kk;
@@ -124 +125 @@
     caca_display(kk);
 
-    while(!caca_get_event(kk, CACA_EVENT_KEY_PRESS));
+    caca_wait_event(kk, CACA_EVENT_KEY_PRESS, &ev);
 
     caca_detach(kk);

libcaca/trunk/test/event.c

@@ -24 +24 @@
 static caca_t *kk;
 
-static void print_event(int, int, unsigned int);
+static void print_event(int, int, struct caca_event *);
 
 int main(int argc, char **argv)
 {
-    int *events;
+    struct caca_event *events;
     int i, h, quit;
 
@@ -48 +48 @@
     caca_display(kk);
 
-    events = malloc(h * sizeof(int));
-    memset(events, 0, h * sizeof(int));
+    events = malloc(h * sizeof(struct caca_event));
+    memset(events, 0, h * sizeof(struct caca_event));
 
     for(quit = 0; quit < 4; )
     {
+        struct caca_event ev;
         static char const * quit_string[] = { "", "q", "qu", "qui", "quit" };
-        unsigned int event = caca_wait_event(kk, CACA_EVENT_ANY);
+        int ret = caca_wait_event(kk, CACA_EVENT_ANY, &ev);
 
-        if(!event)
+        if(!ret)
             continue;
 
@@ -62 +63 @@
         {
             /* "quit" quits */
-            if(event & CACA_EVENT_KEY_PRESS)
+            if(ev.type & CACA_EVENT_KEY_PRESS)
             {
-                int key = event & ~CACA_EVENT_KEY_PRESS;
+                int key = ev.data.key.c;
                 if((key == 'q' && quit == 0) || (key == 'u' && quit == 1)
                     || (key == 'i' && quit == 2) || (key == 't' && quit == 3))
@@ -74 +75 @@
             }
 
-            memmove(events + 1, events, (h - 1) * sizeof(int));
-            events[0] = event;
+            memmove(events + 1, events, (h - 1) * sizeof(struct caca_event));
+            events[0] = ev;
 
-            event = caca_get_event(kk, CACA_EVENT_ANY);
+            ret = caca_get_event(kk, CACA_EVENT_ANY, &ev);
         }
-        while(event);
+        while(ret);
 
         cucul_clear(qq);
@@ -86 +87 @@
         cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
         cucul_draw_line(qq, 0, 0, cucul_get_width(qq) - 1, 0, " ");
-        print_event(0, 0, events[0]);
+        print_event(0, 0, events);
 
         cucul_draw_line(qq, 0, h, cucul_get_width(qq) - 1, h, " ");
@@ -93 +94 @@
         /* Print previous events */
         cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
-        for(i = 1; i < h && events[i]; i++)
-            print_event(0, i, events[i]);
+        for(i = 1; i < h && events[i].type; i++)
+            print_event(0, i, events + i);
 
         caca_display(kk);
@@ -106 +107 @@
 }
 
-static void print_event(int x, int y, unsigned int event)
+static void print_event(int x, int y, struct caca_event *ev)
 {
     int character;
 
-    switch(event & 0xff000000)
+    switch(ev->type)
     {
     case CACA_EVENT_NONE:
@@ -116 +117 @@
         break;
     case CACA_EVENT_KEY_PRESS:
-        character = event & 0x00ffffff;
+        character = ev->data.key.c;
         cucul_printf(qq, x, y, "CACA_EVENT_KEY_PRESS 0x%02x (%c)", character,
                      (character > 0x20 && character < 0x80) ? character : '?');
         break;
     case CACA_EVENT_KEY_RELEASE:
-        character = event & 0x00ffffff;
+        character = ev->data.key.c;
         cucul_printf(qq, x, y, "CACA_EVENT_KEY_RELEASE 0x%02x (%c)", character,
                      (character > 0x20 && character < 0x80) ? character : '?');
@@ -127 +128 @@
     case CACA_EVENT_MOUSE_MOTION:
         cucul_printf(qq, x, y, "CACA_EVENT_MOUSE_MOTION %u %u",
-                     (event & 0x00fff000) >> 12, event & 0x00000fff);
+                     ev->data.mouse.x, ev->data.mouse.y);
         break;
     case CACA_EVENT_MOUSE_PRESS:
         cucul_printf(qq, x, y, "CACA_EVENT_MOUSE_PRESS %u",
-                     event & 0x00ffffff);
+                     ev->data.mouse.button);
         break;
     case CACA_EVENT_MOUSE_RELEASE:
         cucul_printf(qq, x, y, "CACA_EVENT_MOUSE_RELEASE %u",
-                     event & 0x00ffffff);
+                     ev->data.mouse.button);
         break;
     case CACA_EVENT_RESIZE:
-        cucul_printf(qq, x, y, "CACA_EVENT_RESIZE");
+        cucul_printf(qq, x, y, "CACA_EVENT_RESIZE %u %u",
+                     ev->data.resize.w, ev->data.resize.h);
         break;
     default:

libcaca/trunk/test/gamma.c

@@ -34 +34 @@
 int main(void)
 {
+    struct caca_event ev;
     cucul_t *qq, *gg, *mask;
     caca_t *kk;
@@ -62 +63 @@
     for(x = 0; ; x++)
     {
-        int ev = caca_get_event(kk, CACA_EVENT_KEY_PRESS);
+        int ret = caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev);
 
-        if(ev == (CACA_EVENT_KEY_PRESS | CACA_KEY_LEFT))
-            gam /= 1.03;
-        else if(ev == (CACA_EVENT_KEY_PRESS | CACA_KEY_RIGHT))
-            gam *= 1.03;
-        else if(ev == (CACA_EVENT_KEY_PRESS | CACA_KEY_DOWN))
-            gam = 1.0;
-        else if(ev == (CACA_EVENT_KEY_PRESS | CACA_KEY_ESCAPE))
-            break;
+        if(ret)
+        {
+            if(ev.data.key.c == CACA_KEY_LEFT)
+                gam /= 1.03;
+            else if(ev.data.key.c == CACA_KEY_RIGHT)
+                gam *= 1.03;
+            else if(ev.data.key.c == CACA_KEY_DOWN)
+                gam = 1.0;
+            else if(ev.data.key.c == CACA_KEY_ESCAPE)
+                break;
+        }
 
         /* Resize the spare canvas, just in case the main one changed */

libcaca/trunk/test/hsv.c

@@ -29 +29 @@
 int main(void)
 {
+    struct caca_event ev;
     cucul_t *qq;
     caca_t *kk;
@@ -53 +54 @@
     caca_display(kk);
 
-    while(!caca_get_event(kk, CACA_EVENT_KEY_PRESS));
+    caca_wait_event(kk, CACA_EVENT_KEY_PRESS, &ev);
 
     caca_detach(kk);

libcaca/trunk/test/spritedit.c

@@ -54 +54 @@
     while(!quit)
     {
+        struct caca_event ev;
         int xa, ya, xb, yb;
         char buf[BUFSIZ];
-        int event;
 
-        while((event = caca_get_event(kk, CACA_EVENT_KEY_PRESS)))
+        while(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev))
         {
-            switch(event & 0x00ffffff)
+            switch(ev.data.key.c)
             {
             case 0:

libcaca/trunk/test/transform.c

@@ -50 +50 @@
 int main(void)
 {
+    struct caca_event ev;
     cucul_t *qq, *normal, *flip, *flop, *rotate;
     caca_t *kk;
@@ -108 +109 @@
     caca_display(kk);
 
-    while(!caca_get_event(kk, CACA_EVENT_KEY_PRESS));
+    caca_wait_event(kk, CACA_EVENT_KEY_PRESS, &ev);
 
     caca_detach(kk);

libcaca/trunk/test/unicode.c

@@ -27 +27 @@
 int main(void)
 {
+    struct caca_event ev;
     cucul_t *qq;
     caca_t *kk;
@@ -87 +88 @@
     caca_display(kk);
 
-    while(!caca_get_event(kk, CACA_EVENT_KEY_PRESS));
+    caca_wait_event(kk, CACA_EVENT_KEY_PRESS, &ev);
 
     caca_detach(kk);