Changeset 3594Tweet

Timestamp:

07/31/09 02:01:13 (4 years ago)

Author:

sam

Message:

Implement conio.h's kbhit().

File:

• libcaca/trunk/caca/caca_conio.c (modified) (4 diffs)

libcaca/trunk/caca/caca_conio.c

@@ -33 +33 @@
 
 static int unget_ch = -1;
+static int kbhit_ch = -1;
 static char pass_buffer[BUFSIZ];
 static char cgets_buffer[BUFSIZ];
@@ -127 +128 @@
 {
     caca_event_t ev;
-    int ch;
 
     conio_init();
@@ -138 +138 @@
     }
 
+    if(kbhit_ch >= 0)
+    {
+        int tmp = kbhit_ch;
+        kbhit_ch = -1;
+        return tmp;
+    }
+
     caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, -1);
-    ch = caca_get_event_key_ch(&ev);
-
-    switch(ch)
-    {
-        case CACA_KEY_LEFT: ch = 75; break;
-        case CACA_KEY_RIGHT: ch = 77; break;
-        default: break;
-    }
-
-    return ch;
+    return caca_get_event_key_ch(&ev);
 }
 
@@ -219 +217 @@
 int caca_conio_kbhit(void)
 {
-    conio_init();
-
-    /* TODO: implement this function */
+    caca_event_t ev;
+
+    conio_init();
+
+    if(kbhit_ch >= 0)
+        return 1;
+
+    if(caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, 0))
+    {
+        kbhit_ch = caca_get_event_key_ch(&ev);
+        return 1;
+    }
 
     return 0;