Changeset 12b6796 in mainline

Timestamp:

2009-02-20T22:47:08Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

5ad8661

Parents:

90e3d6a

Message:

Tackle scroll lock and cope with lock-key hardware auto-repeat.

Location:

uspace/srv/kbd

Files:

• ctl/pc.c (modified) (2 diffs)
• generic/kbd.c (modified) (2 diffs)

uspace/srv/kbd/ctl/pc.c

@@ -136 +136 @@
         [0x58] = KC_F12,
 
+        [0x46] = KC_SCROLL_LOCK,
+
         [0x1c] = KC_ENTER,
 
@@ -160 +162 @@
 
         [0x37] = KC_PRTSCR,
+
         [0x52] = KC_INSERT,
+        [0x47] = KC_HOME,
         [0x49] = KC_PAGE_UP,
 

uspace/srv/kbd/generic/kbd.c

@@ -64 +64 @@
 static unsigned mods = KM_NUM_LOCK;
 
+/** Currently pressed lock keys. We track these to tackle autorepeat. */
+static unsigned lock_keys;
+
 void kbd_push_scancode(int scancode)
 {
@@ -99 +102 @@
         }
 
-        if (mod_mask != 0 && type == KE_PRESS)
-                mods = mods ^ mod_mask;
+        if (mod_mask != 0) {
+                if (type == KE_PRESS) {
+                        /*
+                         * Only change lock state on transition from released
+                         * to pressed. This prevents autorepeat from messing
+                         * up the lock state.
+                         */
+                        mods = mods ^ (mod_mask & ~lock_keys);
+                        lock_keys = lock_keys | mod_mask;
+                } else {
+                        lock_keys = lock_keys & ~mod_mask;
+                }
+        }
 
         printf("type: %d\n", type);