Changeset 07b7c48 in mainline for uspace/lib/clui/tinput.c

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.

File:

• uspace/lib/clui/tinput.c (modified) (1 diff)

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);
                 }
         }