Changeset fa09449 in mainline for uspace/srv/console/console.c

Timestamp:

2009-02-15T22:31:07Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

6cd9aa6

Parents:

76dd25b

Message:

Keycodes, keyboard events, kbd_event_get(). Keyboard driver now (formally) produces kbd events (press/release, keycode, mods, char) instead of just characters. In reality, the driver and client are only hacked to work with the new interface atm.

File:

• uspace/srv/console/console.c (modified) (7 diffs)

uspace/srv/console/console.c

@@ -298 +298 @@
         ipc_call_t call;
         int retval;
-        int c;
+        kbd_event_t ev;
         connection_t *conn;
         int newcon;
@@ -320 +320 @@
                         retval = 0;
                         break;
-                case KBD_PUSHCHAR:
-                        /* got key from keyboard driver */
+                case KBD_EVENT:
+                        /* Got event from keyboard driver. */
                         retval = 0;
-                        c = IPC_GET_ARG1(call);
+                        ev.type = IPC_GET_ARG1(call);
+                        ev.key = IPC_GET_ARG2(call);
+                        ev.mods = IPC_GET_ARG3(call);
+                        ev.c = IPC_GET_ARG4(call);
+                        
                         /* switch to another virtual console */
                         
                         conn = &connections[active_console];
-/*
- *                      if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 +
- *                              CONSOLE_COUNT)) {
- */
-                        if ((c >= 0x101) && (c < 0x101 + CONSOLE_COUNT)) {
-                                if (c == 0x112)
+
+                        if ((ev.key >= 0x101) && (ev.key < 0x101 +
+                            CONSOLE_COUNT)) {
+                                if (ev.key == 0x112)
                                         change_console(KERNEL_CONSOLE);
                                 else
-                                        change_console(c - 0x101);
+                                        change_console(ev.key - 0x101);
                                 break;
                         }
@@ -342 +344 @@
                         if (conn->keyrequest_counter > 0) {             
                                 conn->keyrequest_counter--;
-                                ipc_answer_1(fifo_pop(conn->keyrequests), EOK,
-                                    c);
+                                ipc_answer_4(fifo_pop(conn->keyrequests), EOK,
+                                    ev.type, ev.key, ev.mods, ev.c);
                                 break;
                         }
-                        
-                        keybuffer_push(&conn->keybuffer, c);
+
+                        keybuffer_push(&conn->keybuffer, &ev);
                         retval = 0;
-                        
+
                         break;
                 default:
@@ -364 +366 @@
         ipc_call_t call;
         int consnum;
-        ipcarg_t arg1, arg2, arg3;
+        ipcarg_t arg1, arg2, arg3, arg4;
         connection_t *conn;
         
@@ -389 +391 @@
                 arg1 = 0;
                 arg2 = 0;
+                arg3 = 0;
+                arg4 = 0;
+
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
@@ -459 +464 @@
                                 curs_visibility(arg1);
                         break;
-                case CONSOLE_GETCHAR:
+                case CONSOLE_GETKEY:
                         if (keybuffer_empty(&conn->keybuffer)) {
                                 /* buffer is empty -> store request */
@@ -475 +480 @@
                                 continue;
                         }
-                        int ch;
-                        keybuffer_pop(&conn->keybuffer, &ch);
-                        arg1 = ch;
+                        kbd_event_t ev;
+                        keybuffer_pop(&conn->keybuffer, &ev);
+                        arg1 = ev.type;
+                        arg2 = ev.key;
+                        arg3 = ev.mods;
+                        arg4 = ev.c;
                         break;
                 }
-                ipc_answer_2(callid, EOK, arg1, arg2);
+                ipc_answer_4(callid, EOK, arg1, arg2, arg3, arg4);
         }
 }