Changeset 710 for libcacaTweet

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

Files:

• caca/caca.h (modified) (1 diff)
• caca/event.c (modified) (1 diff)
• 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/cacaplay.c (modified) (1 diff)
• src/cacaview.c (modified) (2 diffs)
• test/colors.c (modified) (1 diff)
• test/demo.c (modified) (3 diffs)
• test/dithering.c (modified) (1 diff)
• test/event.c (modified) (2 diffs)
• test/gamma.c (modified) (1 diff)
• test/hsv.c (modified) (1 diff)
• test/spritedit.c (modified) (1 diff)
• test/transform.c (modified) (1 diff)
• test/unicode.c (modified) (1 diff)

libcaca/trunk/caca/caca.h

@@ -238 +238 @@
  *
  *  @{ */
-int caca_get_event(caca_t *kk, unsigned int, struct caca_event *);
-int caca_wait_event(caca_t *kk, unsigned int, struct caca_event *);
+int caca_get_event(caca_t *kk, unsigned int, struct caca_event *, int);
 unsigned int caca_get_mouse_x(caca_t *kk);
 unsigned int caca_get_mouse_y(caca_t *kk);

libcaca/trunk/caca/event.c

@@ -46 +46 @@
  *  This function polls the event queue for mouse or keyboard events matching
  *  the event mask and returns the first matching event. Non-matching events
- *  are discarded. \c event_mask must have a non-zero value. This function is
- *  non-blocking and returns zero if no more events are pending in the queue.
- *  See also caca_wait_event() for a blocking version of this function.
+ *  are discarded. \c event_mask must have a non-zero value.
+ *
+ *  The timeout value tells how long this function needs to wait for an
+ *  event. A value of zero returns immediately and the function returns zero
+ *  if no more events are pending in the queue. A negative value causes the
+ *  function to wait indefinitely until a matching event is received.
  *
  * \param event_mask Bitmask of requested events.
+ * \param timeout A timeout value in microseconds
  * \return The next matching event in the queue, or 0 if no event is pending.
  */
-int caca_get_event(caca_t *kk, unsigned int event_mask, struct caca_event *ev)
-{
+int caca_get_event(caca_t *kk, unsigned int event_mask,
+                   struct caca_event *ev, int timeout)
+{
+    struct caca_timer timer;
+    int usec = 0;
+
     if(!event_mask)
         return 0;
 
+    if(timeout > 0)
+        _caca_getticks(&timer);
+
     for( ; ; )
     {
         int ret = _get_next_event(kk, ev);
 
-        if(!ret || ev->type & event_mask)
+        /* If we got the event we wanted, return */
+        if(ev->type & event_mask)
             return ret;
-    }
-}
-
-/** \brief Wait for the next mouse or keyboard input event.
- *
- *  This function returns the first mouse or keyboard event in the queue
- *  that matches the event mask. If no event is pending, it blocks until a
- *  matching event is received. \c event_mask must have a non-zero value.
- *  See also caca_get_event() for a non-blocking version of this function.
- *
- *  \param event_mask Bitmask of requested events.
- *  \return The next event in the queue.
- */
-int caca_wait_event(caca_t *kk, unsigned int event_mask, struct caca_event *ev)
-{
-    if(!event_mask)
-        return 0;
-
-    for( ; ; )
-    {
-        int ret = _get_next_event(kk, ev);
-
-        if(ret && (ev->type & event_mask))
-            return ret;
-
-        _caca_sleep(10000);
+
+        /* If there is no timeout, sleep and try again. */
+        if(timeout < 0)
+        {
+            _caca_sleep(10000);
+            continue;
+        }
+
+        /* If we timeouted, return an empty event */
+        if(usec >= timeout)
+        {
+            ev->type = CACA_EVENT_NONE;
+            return 0;
+        }
+
+        /* Otherwise sleep a bit. Our granularity is far too high for values
+         * below 10000 microseconds so we cheat a bit. */
+        if(usec > 10000)
+            _caca_sleep(10000);
+        else
+            _caca_sleep(1000);
+
+        usec += _caca_getticks(&timer);
     }
 }

libcaca/trunk/src/aafire.c

@@ -267 +267 @@
 #ifdef LIBCACA
       struct caca_event ev;
-      if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev))
+      if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
         {
           switch(ev.data.key.c)

libcaca/trunk/src/cacaball.c

@@ -94 +94 @@
     {
         struct caca_event ev;
-        if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev))
+        if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
         {
             switch(ev.data.key.c)

libcaca/trunk/src/cacamoir.c

@@ -70 +70 @@
     {
         struct caca_event ev;
-        if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev))
+        if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
         {
             switch(ev.data.key.c)

libcaca/trunk/src/cacaplas.c

@@ -86 +86 @@
     {
         struct caca_event ev;
-        if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev))
+        if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
         {
             switch(ev.data.key.c)

libcaca/trunk/src/cacaplay.c

@@ -67 +67 @@
     caca_display(kk);
 
-    while(caca_wait_event(kk, CACA_EVENT_KEY_PRESS, &ev))
+    while(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1))
     {
         if(ev.data.key.c == CACA_KEY_ESCAPE)

libcaca/trunk/src/cacaview.c

@@ -152 +152 @@
 
         if(update)
-            event = caca_get_event(kk, event_mask, &ev);
+            event = caca_get_event(kk, event_mask, &ev, 0);
         else
-            event = caca_wait_event(kk, event_mask, &ev);
+            event = caca_get_event(kk, event_mask, &ev, -1);
 
         while(event)
@@ -305 +305 @@
                 help = new_help;
 
-            event = caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev);
+            event = caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0);
         }
 

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);