Changeset 331 for libcaca/trunk/testTweet

Timestamp:

Jan 9, 2004, 10:51:53 AM (18 years ago)

Author:

Sam Hocevar

Message:

• test/event.c: + Do not refresh after each event, but only when there is no event

pending.

+ If the pressed key is a printable character, display it.

• src/time.c: + Moved _caca_getticks() to this file.
• src/caca.c: + Set the escape delay to a very low value in the ncurses driver,

because I don't want escape sequences to be entered manually.

• src/io.c: + Autorepeat emulation in the ncurses and slang drivers: do not

immediately send the key release event.

• configure.ac: + Check for usleep. + Improvements in the win32 platform detection.

File:

• libcaca/trunk/test/event.c (modified) (7 diffs)

libcaca/trunk/test/event.c

@@ -34 +34 @@
 {
     int *events;
-    int i, h;
+    int i, h, quit;
 
     if(caca_init())
@@ -49 +49 @@
     memset(events, 0, h * sizeof(int));
 
-    for( ; ; )
+    for(quit = 0; !quit; )
     {
         unsigned int event = caca_wait_event(CACA_EVENT_ANY);
@@ -56 +56 @@
             continue;
 
-        memmove(events + 1, events, (h - 1) * sizeof(int));
-        events[0] = event;
+        do
+        {
+            /* q quits */
+            if(event == (CACA_EVENT_KEY_PRESS | 'q'))
+                quit = 1;
+
+            memmove(events + 1, events, (h - 1) * sizeof(int));
+            events[0] = event;
+
+            event = caca_get_event(CACA_EVENT_ANY);
+        }
+        while(event);
 
         caca_clear();
@@ -64 +74 @@
         caca_set_color(CACA_COLOR_WHITE, CACA_COLOR_BLUE);
         caca_draw_line(0, 0, caca_get_width() - 1, 0, ' ');
-        print_event(0, 0, event);
+        print_event(0, 0, events[0]);
 
         /* Print previous events */
@@ -70 +80 @@
         for(i = 1; i < h && events[i]; i++)
             print_event(0, i, events[i]);
-
-        /* q quits */
-        if(event == (CACA_EVENT_KEY_PRESS | 'q'))
-            break;
 
         caca_refresh();
@@ -86 +92 @@
 static void print_event(int x, int y, unsigned int event)
 {
+    int character;
+
     switch(event & 0xff000000)
     {
@@ -92 +100 @@
         break;
     case CACA_EVENT_KEY_PRESS:
-        caca_printf(x, y, "CACA_EVENT_KEY_PRESS 0x%02x",
-                    event & 0x00ffffff);
+        character = event & 0x00ffffff;
+        caca_printf(x, y, "CACA_EVENT_KEY_PRESS 0x%02x (%c)", character,
+                    (character > 0x20 && character < 0x80) ? character : '?');
         break;
     case CACA_EVENT_KEY_RELEASE:
-        caca_printf(x, y, "CACA_EVENT_KEY_RELEASE 0x2%x",
-                    event & 0x00ffffff);
+        character = event & 0x00ffffff;
+        caca_printf(x, y, "CACA_EVENT_KEY_RELEASE 0x%02x (%c)", character,
+                    (character > 0x20 && character < 0x80) ? character : '?');
         break;
     case CACA_EVENT_MOUSE_MOTION: