Index: uspace/lib/clui/tinput.c
===================================================================
--- uspace/lib/clui/tinput.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
+++ uspace/lib/clui/tinput.c	(revision 07b7c48db097d0b27a33d03332ecd39ea551a2b9)
@@ -816,30 +816,32 @@
 		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);
 		}
 	}