Changeset 07b7c48 in mainline for uspace/app/tetris

Timestamp:

2013-04-12T09:01:10Z (13 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/app/tetris

Files:

• scores.c (modified) (3 diffs)
• screen.c (modified) (3 diffs)

uspace/app/tetris/scores.c

@@ -125 +125 @@
         int j;
         size_t off;
-        kbd_event_t ev;
+        cons_event_t ev;
+        kbd_event_t *kev;
         
         clear_screen();
@@ -141 +142 @@
         while (1) {
                 console_flush(console);
-                if (!console_get_kbd_event(console, &ev))
+                if (!console_get_event(console, &ev))
                         exit(1);
                 
-                if (ev.type == KEY_RELEASE)
+                if (ev.type != CEV_KEY || ev.ev.key.type == KEY_RELEASE)
                         continue;
                 
-                if (ev.key == KC_ENTER || ev.key == KC_NENTER)
+                kev = &ev.ev.key;
+                
+                if (kev->key == KC_ENTER || kev->key == KC_NENTER)
                         break;
                 
-                if (ev.key == KC_BACKSPACE) {
+                if (kev->key == KC_BACKSPACE) {
                         if (i > 0) {
                                 wchar_t uc;
@@ -166 +169 @@
                                 scores[NUMSPOTS - 1].hs_name[off] = '\0';
                         }
-                } else if (ev.c != '\0') {
+                } else if (kev->c != '\0') {
                         if (i < (MAXLOGNAME - 1)) {
-                                if (chr_encode(ev.c, scores[NUMSPOTS - 1].hs_name,
+                                if (chr_encode(kev->c, scores[NUMSPOTS - 1].hs_name,
                                     &off, STR_BOUNDS(MAXLOGNAME) + 1) == EOK) {
                                         ++i;

uspace/app/tetris/screen.c

@@ -344 +344 @@
         
         while (timeout > 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event_timeout(console, &event, &timeout))
+                cons_event_t event;
+                
+                if (!console_get_event_timeout(console, &event, &timeout))
                         break;
         }
@@ -376 +376 @@
         
         while (c == 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event_timeout(console, &event, &timeleft)) {
+                cons_event_t event;
+                
+                if (!console_get_event_timeout(console, &event, &timeleft)) {
                         timeleft = 0;
                         return -1;
                 }
                 
-                if (event.type == KEY_PRESS)
-                        c = event.c;
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
+                        c = event.ev.key.c;
         }
         
@@ -398 +398 @@
         
         while (c == 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event(console, &event))
+                cons_event_t event;
+                
+                if (!console_get_event(console, &event))
                         return -1;
                 
-                if (event.type == KEY_PRESS)
-                        c = event.c;
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
+                        c = event.ev.key.c;
         }