Index: uspace/app/edit/edit.c
===================================================================
--- uspace/app/edit/edit.c	(revision 3e6a98c595287c43d200d28d97f57755342be117)
+++ uspace/app/edit/edit.c	(revision 3f06dae84ce91fe16bc8e73eb9b8545daf76d452)
@@ -182,5 +182,6 @@
 int main(int argc, char *argv[])
 {
-	kbd_event_t ev;
+	cons_event_t ev;
+	kbd_event_t *kev;
 	bool new_file;
 	int rc;
@@ -245,23 +246,25 @@
 
 	while (!done) {
-		console_get_kbd_event(con, &ev);
+		console_get_event(con, &ev);
 		pane.rflags = 0;
 
-		if (ev.type == KEY_PRESS) {
+		if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+			kev = &ev.ev.key;
+
 			/* Handle key press. */
-			if (((ev.mods & KM_ALT) == 0) &&
-			    ((ev.mods & KM_SHIFT) == 0) &&
-			     (ev.mods & KM_CTRL) != 0) {
-				key_handle_ctrl(&ev);
-			} else if (((ev.mods & KM_ALT) == 0) &&
-			    ((ev.mods & KM_CTRL) == 0) &&
-			     (ev.mods & KM_SHIFT) != 0) {
-				key_handle_shift(&ev);
-			} else if (((ev.mods & KM_ALT) == 0) &&
-			    ((ev.mods & KM_CTRL) != 0) &&
-			     (ev.mods & KM_SHIFT) != 0) {
-				key_handle_shift_ctrl(&ev);
-			} else if ((ev.mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
-				key_handle_unmod(&ev);
+			if (((kev->mods & KM_ALT) == 0) &&
+			    ((kev->mods & KM_SHIFT) == 0) &&
+			     (kev->mods & KM_CTRL) != 0) {
+				key_handle_ctrl(kev);
+			} else if (((kev->mods & KM_ALT) == 0) &&
+			    ((kev->mods & KM_CTRL) == 0) &&
+			     (kev->mods & KM_SHIFT) != 0) {
+				key_handle_shift(kev);
+			} else if (((kev->mods & KM_ALT) == 0) &&
+			    ((kev->mods & KM_CTRL) != 0) &&
+			     (kev->mods & KM_SHIFT) != 0) {
+				key_handle_shift_ctrl(kev);
+			} else if ((kev->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
+				key_handle_unmod(kev);
 			}
 		}
@@ -592,5 +595,6 @@
 static char *prompt(char const *prompt, char const *init_value)
 {
-	kbd_event_t ev;
+	cons_event_t ev;
+	kbd_event_t *kev;
 	char *str;
 	wchar_t buffer[INFNAME_MAX_LEN + 1];
@@ -612,13 +616,15 @@
 
 	while (!done) {
-		console_get_kbd_event(con, &ev);
-
-		if (ev.type == KEY_PRESS) {
+		console_get_event(con, &ev);
+
+		if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+			kev = &ev.ev.key;
+
 			/* Handle key press. */
-			if (((ev.mods & KM_ALT) == 0) &&
-			     (ev.mods & KM_CTRL) != 0) {
+			if (((kev->mods & KM_ALT) == 0) &&
+			     (kev->mods & KM_CTRL) != 0) {
 				;
-			} else if ((ev.mods & (KM_CTRL | KM_ALT)) == 0) {
-				switch (ev.key) {
+			} else if ((kev->mods & (KM_CTRL | KM_ALT)) == 0) {
+				switch (kev->key) {
 				case KC_ESCAPE:
 					return NULL;
@@ -634,8 +640,8 @@
 					break;
 				default:
-					if (ev.c >= 32 && nc < max_len) {
-						putchar(ev.c);
+					if (kev->c >= 32 && nc < max_len) {
+						putchar(kev->c);
 						console_flush(con);
-						buffer[nc++] = ev.c;
+						buffer[nc++] = kev->c;
 					}
 					break;