Changeset 331 for libcaca/trunk/src/io.cTweet

Timestamp:

Jan 9, 2004, 10:51:53 AM (19 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/src/io.c (modified) (8 diffs)

libcaca/trunk/src/io.c

@@ -55 +55 @@
 
 static unsigned int _get_next_event(void);
+static unsigned int _lowlevel_event(void);
 static void _push_event(unsigned int);
 static unsigned int _pop_event(void);
@@ -63 +64 @@
 static unsigned int eventbuf[EVENTBUF_LEN];
 static int events = 0;
+
+#if !defined(_DOXYGEN_SKIP_ME)
+/* If no new key was pressed after AUTOREPEAT_THRESHOLD usec, assume the
+ * key was released */
+#define AUTOREPEAT_THRESHOLD 200000
+/* Start repeating key after AUTOREPEAT_TRIGGER usec and send keypress
+ * events every AUTOREPEAT_RATE usec. */
+#define AUTOREPEAT_TRIGGER 300000
+#define AUTOREPEAT_RATE 100000
+#endif
 
 /** \brief Get the next mouse or keyboard input event.
@@ -105 +116 @@
             return event;
 
-        usleep(1000);
+#if defined(HAVE_USLEEP)
+        usleep(10000);
+#elif defined(HAVE_SLEEP)
+        Sleep(10);
+#else
+        SLEEP
+#endif
     }
 }
@@ -114 +131 @@
 
 static unsigned int _get_next_event(void)
+{
+#if defined(USE_SLANG) || defined(USE_NCURSES)
+    static struct caca_timer key_timer = CACA_TIMER_INITIALIZER;
+    static unsigned int last_key_ticks = 0;
+    static unsigned int autorepeat_ticks = 0;
+    static unsigned int last_key = 0;
+    unsigned int ticks;
+#endif
+    unsigned int event = _lowlevel_event();
+
+#if defined(USE_SLANG)
+    if(_caca_driver != CACA_DRIVER_SLANG)
+#endif
+#if defined(USE_NCURSES)
+    if(_caca_driver != CACA_DRIVER_NCURSES)
+#endif
+    return event;
+
+#if defined(USE_SLANG) || defined(USE_NCURSES)
+    /* Simulate long keypresses using autorepeat features */
+    ticks = _caca_getticks(&key_timer);
+    last_key_ticks += ticks;
+    autorepeat_ticks += ticks;
+
+    /* Handle autorepeat */
+    if(last_key && autorepeat_ticks > AUTOREPEAT_TRIGGER
+                && autorepeat_ticks > AUTOREPEAT_THRESHOLD
+                && autorepeat_ticks > AUTOREPEAT_RATE)
+    {
+        _push_event(event);
+        autorepeat_ticks -= AUTOREPEAT_RATE;
+        return CACA_EVENT_KEY_PRESS | last_key;
+    }
+
+    /* 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 | last_key))
+    {
+        last_key_ticks = 0;
+        return _get_next_event();
+    }
+
+    /* 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(last_key && (last_key_ticks > AUTOREPEAT_THRESHOLD
+                     || (event & CACA_EVENT_KEY_PRESS)))
+    {
+        _push_event(event);
+        event = CACA_EVENT_KEY_RELEASE | last_key;
+        last_key = 0;
+        return event;
+    }
+
+    /* A new key was pressed, enter autorepeat mode */
+    if(event & CACA_EVENT_KEY_PRESS)
+    {
+        last_key_ticks = 0;
+        autorepeat_ticks = 0;
+        last_key = event & 0x00ffffff;
+    }
+
+    return event;
+#endif
+}
+
+static unsigned int _lowlevel_event(void)
 {
     unsigned int event = _pop_event();
@@ -214 +297 @@
         if(intkey < 0x100)
         {
-            _push_event(CACA_EVENT_KEY_RELEASE | intkey);
             return CACA_EVENT_KEY_PRESS | intkey;
         }
@@ -361 +443 @@
         }
 
-        _push_event(CACA_EVENT_KEY_RELEASE | event);
         return CACA_EVENT_KEY_PRESS | event;
     }
@@ -378 +459 @@
         if(intkey < 0x100)
         {
-            _push_event(CACA_EVENT_KEY_RELEASE | intkey);
             return CACA_EVENT_KEY_PRESS | intkey;
         }
@@ -413 +493 @@
         }
 
-        _push_event(CACA_EVENT_KEY_RELEASE | event);
         return CACA_EVENT_KEY_PRESS | event;
     }