Changeset efdfebc in mainline for uspace/lib/c/include/io/kbd_event.h

Timestamp:

2012-11-06T21:03:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/include/io/kbd_event.h (moved) (moved from uspace/lib/c/include/adt/hash_set.h ) (2 diffs)

uspace/lib/c/include/io/kbd_event.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2011 Radim Vansa
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -34 +33 @@
  */
 
-#ifndef LIBC_HASH_SET_H_
-#define LIBC_HASH_SET_H_
+#ifndef LIBC_IO_KBD_EVENT_H_
+#define LIBC_IO_KBD_EVENT_H_
 
 #include <adt/list.h>
-#include <unistd.h>
+#include <io/keycode.h>
 
-#define HASH_SET_MIN_SIZE  8
+typedef enum {
+        KEY_PRESS,
+        KEY_RELEASE
+} kbd_event_type_t;
 
-typedef unsigned long (*hash_set_hash)(const link_t *);
-typedef int (*hash_set_equals)(const link_t *, const link_t *);
-
-/** Hash table structure. */
+/** Console event structure. */
 typedef struct {
-        list_t *table;
+        /** List handle */
+        link_t link;
         
-        /** Current table size */
-        size_t size;
+        /** Press or release event. */
+        kbd_event_type_t type;
         
-        /**
-         * Current number of entries. If count > size,
-         * the table is rehashed into table with double
-         * size. If (4 * count < size) && (size > min_size),
-         * the table is rehashed into table with half the size.
-         */
-        size_t count;
+        /** Keycode of the key that was pressed or released. */
+        keycode_t key;
         
-        /** Hash function */
-        hash_set_hash hash;
+        /** Bitmask of modifiers held. */
+        keymod_t mods;
         
-        /** Hash table item equals function */
-        hash_set_equals equals;
-} hash_set_t;
-
-extern int hash_set_init(hash_set_t *, hash_set_hash, hash_set_equals, size_t);
-extern int hash_set_insert(hash_set_t *, link_t *);
-extern link_t *hash_set_find(hash_set_t *, const link_t *);
-extern int hash_set_contains(const hash_set_t *, const link_t *);
-extern size_t hash_set_count(const hash_set_t *);
-extern link_t *hash_set_remove(hash_set_t *, const link_t *);
-extern void hash_set_remove_selected(hash_set_t *,
-    int (*)(link_t *, void *), void *);
-extern void hash_set_destroy(hash_set_t *);
-extern void hash_set_apply(hash_set_t *, void (*)(link_t *, void *), void *);
-extern void hash_set_clear(hash_set_t *, void (*)(link_t *, void *), void *);
+        /** The character that was generated or '\0' for none. */
+        wchar_t c;
+} kbd_event_t;
 
 #endif