Changeset fa09449 in mainline for uspace/srv/kbd/generic/key_buffer.c

Timestamp:

2009-02-15T22:31:07Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6cd9aa6

Parents:

76dd25b

Message:

Keycodes, keyboard events, kbd_event_get(). Keyboard driver now (formally) produces kbd events (press/release, keycode, mods, char) instead of just characters. In reality, the driver and client are only hacked to work with the new interface atm.

File:

• uspace/srv/kbd/generic/key_buffer.c (modified) (3 diffs)

uspace/srv/kbd/generic/key_buffer.c

@@ -41 +41 @@
 /** Clear key buffer.
  */
-void keybuffer_free(keybuffer_t *keybuffer) 
+void keybuffer_free(keybuffer_t *keybuffer)
 {
         futex_down(&keybuffer_futex);
@@ -76 +76 @@
 }
 
-/** Push key to key buffer.
- * If buffer is full, character is ignored.
- * @param key code of stored key
+/** Push key event to key buffer.
+ *
+ * If the buffer is full, the event is ignored.
+ *
+ * @param keybuffer     The keybuffer.
+ * @param ev            The event to push.
  */
-void keybuffer_push(keybuffer_t *keybuffer, int key)
+void keybuffer_push(keybuffer_t *keybuffer, const kbd_event_t *ev)
 {
         futex_down(&keybuffer_futex);
         if (keybuffer->items < KEYBUFFER_SIZE) {
-                keybuffer->fifo[keybuffer->tail] = key;
+                keybuffer->fifo[keybuffer->tail] = *ev;
                 keybuffer->tail = (keybuffer->tail + 1) % KEYBUFFER_SIZE;
                 keybuffer->items++;
@@ -91 +94 @@
 }
 
-/** Pop character from buffer.
- * @param c pointer to space where to store character from buffer.
- * @return zero on empty buffer, nonzero else
+void keybuffer_push0(keybuffer_t *keybuffer, int c)
+{
+        kbd_event_t ev;
+
+        ev.key = c; ev.mods = 0; ev.c = c;
+        keybuffer_push(keybuffer, &ev);
+}
+
+/** Pop event from buffer.
+ *
+ * @param edst  Pointer to where the event should be saved.
+ * @return      Zero on empty buffer, nonzero otherwise.
  */
-int keybuffer_pop(keybuffer_t *keybuffer, int *c)
+int keybuffer_pop(keybuffer_t *keybuffer, kbd_event_t *edst)
 {
         futex_down(&keybuffer_futex);
         if (keybuffer->items > 0) {
                 keybuffer->items--;
-                *c = (keybuffer->fifo[keybuffer->head]) ;
+                *edst = (keybuffer->fifo[keybuffer->head]) ;
                 keybuffer->head = (keybuffer->head + 1) % KEYBUFFER_SIZE;
                 futex_up(&keybuffer_futex);