Changeset 2f7a564 in mainline for uspace/srv/hid/input/include

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.

Location:

uspace/srv/hid/input/include

Files:

• kbd.h (modified) (2 diffs)
• layout.h (modified) (1 diff)

uspace/srv/hid/input/include/kbd.h

@@ -47 +47 @@
 struct kbd_port_ops;
 struct kbd_ctl_ops;
+struct layout;
 
 typedef struct kbd_dev {
@@ -63 +64 @@
         /** Controller-private data */
         void *ctl_private;
+
+        /** Currently active modifiers. */
+        unsigned mods;
+
+        /** Currently pressed lock keys. We track these to tackle autorepeat. */
+        unsigned lock_keys;
+
+        /** Active keyboard layout */
+        struct layout *active_layout;
 } kbd_dev_t;
 

uspace/srv/hid/input/include/layout.h

@@ -41 +41 @@
 #include <io/console.h>
 
-typedef struct {
-        void (*reset)(void);
-        wchar_t (*parse_ev)(kbd_event_t *);
-} layout_op_t;
+/** Layout instance state */
+typedef struct layout {
+        /** Ops structure */
+        struct layout_ops *ops;
 
-extern layout_op_t us_qwerty_op;
-extern layout_op_t us_dvorak_op;
-extern layout_op_t cz_op;
+        /* Layout-private data */
+        void *layout_priv;
+} layout_t;
+
+/** Layout ops */
+typedef struct layout_ops {
+        int (*create)(layout_t *);
+        void (*destroy)(layout_t *);
+        wchar_t (*parse_ev)(layout_t *, kbd_event_t *);
+} layout_ops_t;
+
+extern layout_ops_t us_qwerty_ops;
+extern layout_ops_t us_dvorak_ops;
+extern layout_ops_t cz_ops;
+
+extern layout_t *layout_create(layout_ops_t *);
+extern void layout_destroy(layout_t *);
+extern wchar_t layout_parse_ev(layout_t *, kbd_event_t *);
 
 #endif