Changeset 838c48e in mainline

Timestamp:

2006-06-02T09:25:00Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

49d072e

Parents:

1180a88e

Message:

Fix cursor position.
Do not rewrite active console on switch to it.

Files:

• console/console.c (modified) (3 diffs)
• kbd/generic/kbd.c (modified) (4 diffs)

console/console.c

@@ -140 +140 @@
         scr->position_x = scr->position_x % scr->size_x;
         scr->position_y = scr->position_y  % scr->size_y;
+        ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, scr->position_y, scr->position_x, NULL, NULL);
         
 }
@@ -173 +174 @@
                         if ((c >= '1') && (c < '1' + CONSOLE_COUNT)) {
                                 /*FIXME: draw another console content from buffer */
-                                if (c - KBD_KEY_F1 == active_console)
+                                if (c - '1' == active_console)
                                                 break;
                                 active_console = c - '1';
@@ -187 +188 @@
                                                         ipc_call_async_3(fb_info.phone, FB_PUTCHAR, d, j, i, NULL, NULL);
                                         }
+
                                 ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, conn->screenbuffer.position_y, conn->screenbuffer.position_x, NULL, NULL); 
                                 ipc_call_async(fb_info.phone, FB_CURSOR_VISIBILITY, 1, NULL, NULL); 

kbd/generic/kbd.c

@@ -52 +52 @@
         ipcarg_t retval, arg1, arg2;
 
-//      printf("Uspace kbd service started.\n");
-
         /* Initialize arch dependent parts */
         if (!(res = kbd_arch_init())) {
-//                      printf("Kbd registration failed with retval %d.\n", res);
                         return -1;
                         };
@@ -64 +61 @@
         
         /* Register service at nameserver */
-//      printf("%s: Registering at naming service.\n", NAME);
-
+        
         if ((res = ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, &phonead)) != 0) {
-//              printf("%s: Error: Registering at naming service failed.\n", NAME);
                 return -1;
         };
@@ -73 +68 @@
         while (1) {
                 callid = ipc_wait_for_call(&call);
-        //      printf("%s:Call phone=%lX..", NAME, call.in_phone_hash);
                 switch (IPC_GET_METHOD(call)) {
                         case IPC_M_PHONE_HUNGUP:
-//                              printf("%s: Phone hung up.\n", NAME);
                                 connected = 0;
                                 retval = 0;
                                 break;
                         case IPC_M_CONNECT_ME_TO:
-                        //      printf("%s: Connect me (%P) to: %zd\n",NAME, IPC_GET_ARG3(call), IPC_GET_ARG1(call));
                                 /* Only one connected client allowed */
                                 if (connected) {
@@ -100 +92 @@
                                         kbd_arch_process(&keybuffer, IPC_GET_ARG2(call));
 
-                                        //printf("%s: GOT INTERRUPT: %c\n", NAME, key);
-
-                                        /* Some callers could awaiting keypress - if its true, we have to send keys to them.
-                                         * One interrupt can store more than one key into buffer. */
-                                        
                                         retval = 0;
 
                                         while (!keybuffer_empty(&keybuffer)) {
                                                 if (!keybuffer_pop(&keybuffer, (char *)&arg1)) {
-//                                                      printf("%s: KeyBuffer is empty but it should not be.\n");
                                                         break;
                                                 }
-                                                /*FIXME: detection of closed connection */
                                                 ipc_call_async(phoneid, KBD_PUSHCHAR, arg1, NULL, NULL);
                                         }
 
                                 }
-//                              printf("%s: Interrupt processed.\n", NAME);
                                 break;
                         default:
-//                              printf("%s: Unknown method: %zd\n", NAME, IPC_GET_METHOD(call));
                                 retval = ENOENT;
                                 break;