Changeset 192565b in mainline for uspace/app/top/screen.c

Timestamp:

2013-05-27T13:18:13Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f2c19b0

Parents:

d120133 (diff), c90aed4 (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/app/top/screen.c (modified) (2 diffs)

uspace/app/top/screen.c

@@ -556 +556 @@
         
         while (c == 0) {
-                kbd_event_t event;
+                cons_event_t event;
                 
                 warning_timeleft -= timeleft;
-                if (!console_get_kbd_event_timeout(console, &event, &timeleft)) {
+                if (!console_get_event_timeout(console, &event, &timeleft)) {
                         timeleft = 0;
                         return -1;
@@ -565 +565 @@
                 warning_timeleft += timeleft;
                 
-                if (event.type == KEY_PRESS)
-                        c = event.c;
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
+                        c = event.ev.key.c;
         }