Changeset 07b7c48 in mainline for uspace/lib

Timestamp:

2013-04-12T09:01:10Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

902f0906

Parents:

bc4bf97

Message:

Extend console library API to support different event types.

Location:

uspace/lib

Files:

• c/generic/io/console.c (modified) (5 diffs)
• c/include/io/cons_event.h (added)
• c/include/io/console.h (modified) (2 diffs)
• clui/tinput.c (modified) (1 diff)

uspace/lib/c/generic/io/console.c

@@ -154 +154 @@
 }
 
-bool console_get_kbd_event(console_ctrl_t *ctrl, kbd_event_t *event)
+bool console_get_event(console_ctrl_t *ctrl, cons_event_t *event)
 {
         if (ctrl->input_aid == 0) {
@@ -171 +171 @@
                 }
                 
-                event->type = type;
-                event->key = key;
-                event->mods = mods;
-                event->c = c;
+                event->type = CEV_KEY;
+                event->ev.key.type = type;
+                event->ev.key.key = key;
+                event->ev.key.mods = mods;
+                event->ev.key.c = c;
         } else {
                 sysarg_t retval;
@@ -186 +187 @@
                 }
                 
-                event->type = IPC_GET_ARG1(ctrl->input_call);
-                event->key = IPC_GET_ARG2(ctrl->input_call);
-                event->mods = IPC_GET_ARG3(ctrl->input_call);
-                event->c = IPC_GET_ARG4(ctrl->input_call);
+                event->type = CEV_KEY;
+                event->ev.key.type = IPC_GET_ARG1(ctrl->input_call);
+                event->ev.key.key = IPC_GET_ARG2(ctrl->input_call);
+                event->ev.key.mods = IPC_GET_ARG3(ctrl->input_call);
+                event->ev.key.c = IPC_GET_ARG4(ctrl->input_call);
         }
         
@@ -195 +197 @@
 }
 
-bool console_get_kbd_event_timeout(console_ctrl_t *ctrl, kbd_event_t *event,
+bool console_get_event_timeout(console_ctrl_t *ctrl, cons_event_t *event,
     suseconds_t *timeout)
 {
@@ -223 +225 @@
         }
         
-        event->type = IPC_GET_ARG1(ctrl->input_call);
-        event->key = IPC_GET_ARG2(ctrl->input_call);
-        event->mods = IPC_GET_ARG3(ctrl->input_call);
-        event->c = IPC_GET_ARG4(ctrl->input_call);
+        event->type = CEV_KEY;
+        event->ev.key.type = IPC_GET_ARG1(ctrl->input_call);
+        event->ev.key.key = IPC_GET_ARG2(ctrl->input_call);
+        event->ev.key.mods = IPC_GET_ARG3(ctrl->input_call);
+        event->ev.key.c = IPC_GET_ARG4(ctrl->input_call);
         
         /* Update timeout */

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

@@ -39 +39 @@
 #include <io/concaps.h>
 #include <io/kbd_event.h>
+#include <io/cons_event.h>
 #include <io/keycode.h>
 #include <async.h>
@@ -82 +83 @@
 extern void console_cursor_visibility(console_ctrl_t *, bool);
 extern int console_get_color_cap(console_ctrl_t *, sysarg_t *);
-extern bool console_get_kbd_event(console_ctrl_t *, kbd_event_t *);
-extern bool console_get_kbd_event_timeout(console_ctrl_t *, kbd_event_t *,
+extern bool console_get_event(console_ctrl_t *, cons_event_t *);
+extern bool console_get_event_timeout(console_ctrl_t *, cons_event_t *,
     suseconds_t *);
 

uspace/lib/clui/tinput.c

@@ -816 +816 @@
                 console_flush(ti->console);
                 
-                kbd_event_t ev;
-                if (!console_get_kbd_event(ti->console, &ev))
+                cons_event_t ev;
+                if (!console_get_event(ti->console, &ev))
                         return EIO;
                 
-                if (ev.type != KEY_PRESS)
+                if (ev.type != CEV_KEY || ev.ev.key.type != KEY_PRESS)
                         continue;
                 
-                if (((ev.mods & KM_CTRL) != 0) &&
-                    ((ev.mods & (KM_ALT | KM_SHIFT)) == 0))
-                        tinput_key_ctrl(ti, &ev);
-                
-                if (((ev.mods & KM_SHIFT) != 0) &&
-                    ((ev.mods & (KM_CTRL | KM_ALT)) == 0))
-                        tinput_key_shift(ti, &ev);
-                
-                if (((ev.mods & KM_CTRL) != 0) &&
-                    ((ev.mods & KM_SHIFT) != 0) &&
-                    ((ev.mods & KM_ALT) == 0))
-                        tinput_key_ctrl_shift(ti, &ev);
-                
-                if ((ev.mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0)
-                        tinput_key_unmod(ti, &ev);
-                
-                if (ev.c >= ' ') {
+                kbd_event_t *kev = &ev.ev.key;
+                
+                if (((kev->mods & KM_CTRL) != 0) &&
+                    ((kev->mods & (KM_ALT | KM_SHIFT)) == 0))
+                        tinput_key_ctrl(ti, kev);
+                
+                if (((kev->mods & KM_SHIFT) != 0) &&
+                    ((kev->mods & (KM_CTRL | KM_ALT)) == 0))
+                        tinput_key_shift(ti, kev);
+                
+                if (((kev->mods & KM_CTRL) != 0) &&
+                    ((kev->mods & KM_SHIFT) != 0) &&
+                    ((kev->mods & KM_ALT) == 0))
+                        tinput_key_ctrl_shift(ti, kev);
+                
+                if ((kev->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0)
+                        tinput_key_unmod(ti, kev);
+                
+                if (kev->c >= ' ') {
                         tinput_sel_delete(ti);
-                        tinput_insert_char(ti, ev.c);
+                        tinput_insert_char(ti, kev->c);
                 }
         }