Changeset 2f7a564 in mainline for uspace/srv/hid/input/generic/input.c

Timestamp:

2011-06-13T22:05:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ef15fbb

Parents:

a07a454

Message:

Make key lock/modifier state as well as layout state per-device.

File:

• uspace/srv/hid/input/generic/input.c (modified) (10 diffs)

uspace/srv/hid/input/generic/input.c

@@ -70 +70 @@
 int client_phone = -1;
 
-/** Currently active modifiers. */
-static unsigned mods = KM_NUM_LOCK;
-
-/** Currently pressed lock keys. We track these to tackle autorepeat. */
-static unsigned lock_keys;
-
 /** List of keyboard devices */
 static link_t kbd_devs;
@@ -84 +78 @@
 #define NUM_LAYOUTS 3
 
-static layout_op_t *layout[NUM_LAYOUTS] = {
-        &us_qwerty_op,
-        &us_dvorak_op,
-        &cz_op
+static layout_ops_t *layout[NUM_LAYOUTS] = {
+        &us_qwerty_ops,
+        &us_dvorak_ops,
+        &cz_ops
 };
-
-static int active_layout = 0;
 
 void kbd_push_scancode(kbd_dev_t *kdev, int scancode)
@@ -115 +107 @@
         if (mod_mask != 0) {
                 if (type == KEY_PRESS)
-                        mods = mods | mod_mask;
+                        kdev->mods = kdev->mods | mod_mask;
                 else
-                        mods = mods & ~mod_mask;
+                        kdev->mods = kdev->mods & ~mod_mask;
         }
 
@@ -134 +126 @@
                          * up the lock state.
                          */
-                        mods = mods ^ (mod_mask & ~lock_keys);
-                        lock_keys = lock_keys | mod_mask;
+                        kdev->mods = kdev->mods ^ (mod_mask & ~kdev->lock_keys);
+                        kdev->lock_keys = kdev->lock_keys | mod_mask;
 
                         /* Update keyboard lock indicator lights. */
-                        (*kdev->ctl_ops->set_ind)(kdev, mods);
+                        (*kdev->ctl_ops->set_ind)(kdev, kdev->mods);
                 } else {
-                        lock_keys = lock_keys & ~mod_mask;
+                        kdev->lock_keys = kdev->lock_keys & ~mod_mask;
                 }
         }
@@ -148 +140 @@
         printf("keycode: %u\n", key);
 */
-        if (type == KEY_PRESS && (mods & KM_LCTRL) &&
+        if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
                 key == KC_F1) {
-                active_layout = 0;
-                layout[active_layout]->reset();
+                layout_destroy(kdev->active_layout);
+                kdev->active_layout = layout_create(layout[0]);
                 return;
         }
 
-        if (type == KEY_PRESS && (mods & KM_LCTRL) &&
+        if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
                 key == KC_F2) {
-                active_layout = 1;
-                layout[active_layout]->reset();
+                layout_destroy(kdev->active_layout);
+                kdev->active_layout = layout_create(layout[1]);
                 return;
         }
 
-        if (type == KEY_PRESS && (mods & KM_LCTRL) &&
+        if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
                 key == KC_F3) {
-                active_layout = 2;
-                layout[active_layout]->reset();
+                layout_destroy(kdev->active_layout);
+                kdev->active_layout = layout_create(layout[2]);
                 return;
         }
@@ -171 +163 @@
         ev.type = type;
         ev.key = key;
-        ev.mods = mods;
-
-        ev.c = layout[active_layout]->parse_ev(&ev);
+        ev.mods = kdev->mods;
+
+        ev.c = layout_parse_ev(kdev->active_layout, &ev);
 
         async_obsolete_msg_4(client_phone, INPUT_EVENT, ev.type, ev.key, ev.mods, ev.c);
@@ -223 +215 @@
 }
 
+static kbd_dev_t *kbd_dev_new(void)
+{
+        kbd_dev_t *kdev;
+
+        kdev = calloc(1, sizeof(kbd_dev_t));
+        if (kdev == NULL) {
+                printf(NAME ": Allocating keyboard device. Out of memory.\n");
+                return NULL;
+        }
+
+        link_initialize(&kdev->kbd_devs);
+
+        kdev->mods = KM_NUM_LOCK;
+        kdev->lock_keys = 0;
+        kdev->active_layout = layout_create(layout[0]);
+
+        return kdev;
+}
+
 /** Add new legacy keyboard device. */
 static void kbd_add_dev(kbd_port_ops_t *port, kbd_ctl_ops_t *ctl)
@@ -228 +239 @@
         kbd_dev_t *kdev;
 
-        kdev = malloc(sizeof(kbd_dev_t));
-        if (kdev == NULL) {
-                printf(NAME ": Failed adding keyboard device. Out of memory.\n");
+        kdev = kbd_dev_new();
+        if (kdev == NULL)
                 return;
-        }
-
-        link_initialize(&kdev->kbd_devs);
-        kdev->dev_path = NULL;
+
         kdev->port_ops = port;
         kdev->ctl_ops = ctl;
+        kdev->dev_path = NULL;
 
         /* Initialize port driver. */
@@ -263 +271 @@
         kbd_dev_t *kdev;
 
-        kdev = malloc(sizeof(kbd_dev_t));
-        if (kdev == NULL) {
-                printf(NAME ": Failed adding keyboard device. Out of memory.\n");
+        kdev = kbd_dev_new();
+        if (kdev == NULL)
                 return -1;
-        }
-
-        link_initialize(&kdev->kbd_devs);
+
         kdev->dev_path = dev_path;
         kdev->port_ops = NULL;
@@ -435 +440 @@
         kbd_add_legacy_devs();
 
-        /* Initialize (reset) layout. */
-        layout[active_layout]->reset();
         
         /* Register driver */