Changeset bd929cfb in mainline

Timestamp:

2006-06-02T13:23:07Z (18 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

83b1d61

Parents:

2d22049

Message:

Some console bugfixes.

Files:

• console/console.c (modified) (2 diffs)
• kbd/arch/ia32/src/kbd.c (modified) (5 diffs)

console/console.c

@@ -139 +139 @@
         
         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);
+        
+        if (console == active_console)  
+                ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, scr->position_y, scr->position_x, NULL, NULL);
         
 }
@@ -322 +323 @@
         }
         
+        ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, 0, 0, NULL, NULL); 
 
         if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) {

kbd/arch/ia32/src/kbd.c

@@ -79 +79 @@
         ' ',
         SPECIAL, /* 0x3a - CapsLock */
-        0x3b, /* 0x3b - F1 */
-//      SPECIAL, /* 0x3b - F1 */
-        0x3c, /* 0x3c - F2 */
-//      SPECIAL, /* 0x3c - F2 */
-        0x3d, /* 0x3d - F3 */
-//      SPECIAL, /* 0x3d - F3 */
-        0x3e, /* 0x3e - F4 */
-//      SPECIAL, /* 0x3e - F4 */
-//      SPECIAL, /* 0x3f - F5 */
-        0x3f, /* 0x3f - F5 */
-//      SPECIAL, /* 0x40 - F6 */
-        0x40, /* 0x40 - F6 */
-//      SPECIAL, /* 0x41 - F7 */
-        0x41, /* 0x41 - F7 */
-//      SPECIAL, /* 0x42 - F8 */
-        0x42, /* 0x42 - F8 */
-//      SPECIAL, /* 0x43 - F9 */
-        0x43, /* 0x43 - F9 */
-//      SPECIAL, /* 0x44 - F10 */
-        0x44, /* 0x44 - F10 */
+        SPECIAL, /* 0x3b - F1 */
+        SPECIAL, /* 0x3c - F2 */
+        SPECIAL, /* 0x3d - F3 */
+        SPECIAL, /* 0x3e - F4 */
+        SPECIAL, /* 0x3f - F5 */
+        SPECIAL, /* 0x40 - F6 */
+        SPECIAL, /* 0x41 - F7 */
+        SPECIAL, /* 0x42 - F8 */
+        SPECIAL, /* 0x43 - F9 */
+        SPECIAL, /* 0x44 - F10 */
         SPECIAL, /* 0x45 - NumLock */
         SPECIAL, /* 0x46 - ScrollLock */
@@ -169 +159 @@
         ' ',
         SPECIAL, /* 0x3a - CapsLock */
-        0x3b, /* 0x3b - F1 */
-        0x3c, /* 0x3c - F2 */
-        0x3d, /* 0x3d - F3 */
-        0x3e, /* 0x3e - F4 */
-        0x3f, /* 0x3f - F5 */
-        0x40, /* 0x40 - F6 */
-        0x41, /* 0x41 - F7 */
-        0x42, /* 0x42 - F8 */
-        0x43, /* 0x43 - F9 */
-        0x44, /* 0x44 - F10 */
-//      SPECIAL, /* 0x3b - F1 */
-//      SPECIAL, /* 0x3c - F2 */
-//      SPECIAL, /* 0x3d - F3 */
-//      SPECIAL, /* 0x3e - F4 */
-//      SPECIAL, /* 0x3f - F5 */
-//      SPECIAL, /* 0x40 - F6 */
-//      SPECIAL, /* 0x41 - F7 */
-//      SPECIAL, /* 0x42 - F8 */
-//      SPECIAL, /* 0x43 - F9 */
-//      SPECIAL, /* 0x44 - F10 */
+        SPECIAL, /* 0x3b - F1 */
+        SPECIAL, /* 0x3c - F2 */
+        SPECIAL, /* 0x3d - F3 */
+        SPECIAL, /* 0x3e - F4 */
+        SPECIAL, /* 0x3f - F5 */
+        SPECIAL, /* 0x40 - F6 */
+        SPECIAL, /* 0x41 - F7 */
+        SPECIAL, /* 0x42 - F8 */
+        SPECIAL, /* 0x43 - F9 */
+        SPECIAL, /* 0x44 - F10 */
         SPECIAL, /* 0x45 - NumLock */
         SPECIAL, /* 0x46 - ScrollLock */
@@ -286 +266 @@
                 case SC_SPEC_ESCAPE:
                         break;
-                case SC_LEFTARR:
+        /*      case SC_LEFTARR:
                         if (keybuffer_available(keybuffer) >= 3) {
                                 keybuffer_push(keybuffer, 0x1b);        
@@ -336 +316 @@
                         }
                         break;
-                default:
+        */      default:
                         letter = ((ascii >= 'a') && (ascii <= 'z'));
                         capslock = (keyflags & PRESSED_CAPSLOCK) || (lockflags & LOCKED_CAPSLOCK);
@@ -344 +324 @@
                         if (shift)
                                 map = sc_secondary_map;
-                        keybuffer_push(keybuffer, map[key]);    
+                        if (map[key] != SPECIAL)
+                                keybuffer_push(keybuffer, map[key]);    
                         break;
         }