Changeset 710 for libcaca/trunk/testTweet

Timestamp:

Apr 1, 2006, 4:44:09 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Merged caca_wait_event() into caca_get_event() and added a timeout parameter to do what both functions did before, and even more.

Location:

libcaca/trunk/test

Files:

• colors.c (modified) (1 diff)
• demo.c (modified) (3 diffs)
• dithering.c (modified) (1 diff)
• event.c (modified) (2 diffs)
• gamma.c (modified) (1 diff)
• hsv.c (modified) (1 diff)
• spritedit.c (modified) (1 diff)
• transform.c (modified) (1 diff)
• unicode.c (modified) (1 diff)

libcaca/trunk/test/colors.c

@@ -51 +51 @@
 
     caca_display(kk);
-    caca_wait_event(kk, CACA_EVENT_KEY_PRESS, &ev);
+    caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1);
 
     caca_detach(kk);

libcaca/trunk/test/demo.c

@@ -75 +75 @@
         int menu = 0, mouse = 0, xmouse = 0, ymouse = 0;
 
-        while(caca_get_event(kk, CACA_EVENT_ANY, &ev))
+        while(caca_get_event(kk, CACA_EVENT_ANY, &ev, 0))
         {
             if(demo && (ev.type & CACA_EVENT_KEY_PRESS))
@@ -149 +149 @@
                 ymouse = ev.data.mouse.y;
             }
+            else if(ev.type & CACA_EVENT_RESIZE)
+            {
+                mouse = 1; /* old hack */
+            }
         }
 
@@ -157 +161 @@
             {
                 cucul_set_color(qq, CUCUL_COLOR_RED, CUCUL_COLOR_BLACK);
-                cucul_putstr(qq, xmouse, ymouse, "|\\");
+                cucul_putstr(qq, xmouse, ymouse,     ".");
+                cucul_putstr(qq, xmouse, ymouse + 1, "|\\");
             }
             caca_display(kk);

libcaca/trunk/test/dithering.c

@@ -125 +125 @@
     caca_display(kk);
 
-    caca_wait_event(kk, CACA_EVENT_KEY_PRESS, &ev);
+    caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1);
 
     caca_detach(kk);

libcaca/trunk/test/event.c

@@ -55 +55 @@
         struct caca_event ev;
         static char const * quit_string[] = { "", "q", "qu", "qui", "quit" };
-        int ret = caca_wait_event(kk, CACA_EVENT_ANY, &ev);
+        int ret = caca_get_event(kk, CACA_EVENT_ANY, &ev, -1);
 
         if(!ret)
@@ -78 +78 @@
             events[0] = ev;
 
-            ret = caca_get_event(kk, CACA_EVENT_ANY, &ev);
+            ret = caca_get_event(kk, CACA_EVENT_ANY, &ev, 0);
         }
         while(ret);

libcaca/trunk/test/gamma.c

@@ -63 +63 @@
     for(x = 0; ; x++)
     {
-        int ret = caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev);
+        int ret = caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0);
 
         if(ret)

libcaca/trunk/test/hsv.c

@@ -54 +54 @@
     caca_display(kk);
 
-    caca_wait_event(kk, CACA_EVENT_KEY_PRESS, &ev);
+    caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0);
 
     caca_detach(kk);

libcaca/trunk/test/spritedit.c

@@ -58 +58 @@
         char buf[BUFSIZ];
 
-        while(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev))
+        while(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
         {
             switch(ev.data.key.c)

libcaca/trunk/test/transform.c

@@ -109 +109 @@
     caca_display(kk);
 
-    caca_wait_event(kk, CACA_EVENT_KEY_PRESS, &ev);
+    caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1);
 
     caca_detach(kk);

libcaca/trunk/test/unicode.c

@@ -88 +88 @@
     caca_display(kk);
 
-    caca_wait_event(kk, CACA_EVENT_KEY_PRESS, &ev);
+    caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1);
 
     caca_detach(kk);