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

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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/console.h (modified) (2 diffs)

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

@@ -37 +37 @@
 
 #include <sys/time.h>
+#include <io/concaps.h>
+#include <io/kbd_event.h>
 #include <io/keycode.h>
 #include <async.h>
 #include <bool.h>
 #include <stdio.h>
-
-typedef enum {
-        CONSOLE_CAP_NONE = 0,
-        CONSOLE_CAP_STYLE = 1,
-        CONSOLE_CAP_INDEXED = 2,
-        CONSOLE_CAP_RGB = 4
-} console_caps_t;
 
 /** Console control structure. */
@@ -69 +64 @@
         aid_t input_aid;
 } console_ctrl_t;
-
-typedef enum {
-        KEY_PRESS,
-        KEY_RELEASE
-} kbd_event_type_t;
-
-/** Console event structure. */
-typedef struct {
-        /** List handle */
-        link_t link;
-        
-        /** Press or release event. */
-        kbd_event_type_t type;
-        
-        /** Keycode of the key that was pressed or released. */
-        keycode_t key;
-        
-        /** Bitmask of modifiers held. */
-        keymod_t mods;
-        
-        /** The character that was generated or '\0' for none. */
-        wchar_t c;
-} kbd_event_t;
 
 extern console_ctrl_t *console_init(FILE *, FILE *);