Changeset 8ff0bd2 in mainline for uspace/srv/hid/input/layout/cz.c

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/hid/input/layout/cz.c (moved) (moved from uspace/srv/hid/kbd/layout/cz.c ) (9 diffs)

uspace/srv/hid/input/layout/cz.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbd
+/** @addtogroup input
  * @brief Czech QWERTZ layout.
  * @{
  */
 
-#include <kbd.h>
+#include <errno.h>
+#include <input.h>
 #include <io/console.h>
 #include <io/keycode.h>
 #include <bool.h>
 #include <layout.h>
-
-static void layout_reset(void);
-static wchar_t layout_parse_ev(kbd_event_t *ev);
+#include <stdlib.h>
+
+static int cz_create(layout_t *);
+static void cz_destroy(layout_t *);
+static wchar_t cz_parse_ev(layout_t *, kbd_event_t *ev);
 
 enum m_state {
@@ -47 +50 @@
 };
 
-static enum m_state mstate;
-
-layout_op_t cz_op = {
-        layout_reset,
-        layout_parse_ev
+typedef struct {
+        enum m_state mstate;
+} layout_cz_t;
+
+layout_ops_t cz_ops = {
+        .create = cz_create,
+        .destroy = cz_destroy,
+        .parse_ev = cz_parse_ev
 };
 
@@ -273 +279 @@
 }
 
-static wchar_t parse_ms_hacek(kbd_event_t *ev)
+static wchar_t parse_ms_hacek(layout_cz_t *cz_state, kbd_event_t *ev)
 {
         wchar_t c;
 
-        mstate = ms_start;
+        cz_state->mstate = ms_start;
 
         /* Produce no characters when Ctrl or Alt is pressed. */
@@ -291 +297 @@
 }
 
-static wchar_t parse_ms_carka(kbd_event_t *ev)
+static wchar_t parse_ms_carka(layout_cz_t *cz_state, kbd_event_t *ev)
 {
         wchar_t c;
 
-        mstate = ms_start;
+        cz_state->mstate = ms_start;
 
         /* Produce no characters when Ctrl or Alt is pressed. */
@@ -309 +315 @@
 }
 
-static wchar_t parse_ms_start(kbd_event_t *ev)
+static wchar_t parse_ms_start(layout_cz_t *cz_state, kbd_event_t *ev)
 {
         wchar_t c;
@@ -319 +325 @@
         if (ev->key == KC_EQUALS) {
                 if ((ev->mods & KM_SHIFT) != 0)
-                        mstate = ms_hacek;
+                        cz_state->mstate = ms_hacek;
                 else
-                        mstate = ms_carka;
+                        cz_state->mstate = ms_carka;
 
                 return 0;
@@ -379 +385 @@
 }
 
-static void layout_reset(void)
-{
-        mstate = ms_start;
-}
-
-static wchar_t layout_parse_ev(kbd_event_t *ev)
-{
+static int cz_create(layout_t *state)
+{
+        layout_cz_t *cz_state;
+
+        cz_state = malloc(sizeof(layout_cz_t));
+        if (cz_state == NULL) {
+                printf("%s: Out of memory.\n", NAME);
+                return ENOMEM;
+        }
+
+        cz_state->mstate = ms_start;
+        state->layout_priv = (void *) cz_state;
+
+        return EOK;
+}
+
+static void cz_destroy(layout_t *state)
+{
+        free(state->layout_priv);
+}
+
+static wchar_t cz_parse_ev(layout_t *state, kbd_event_t *ev)
+{
+        layout_cz_t *cz_state = (layout_cz_t *) state->layout_priv;
+
         if (ev->type != KEY_PRESS)
                 return 0;
@@ -392 +416 @@
                 return 0;
         
-        switch (mstate) {
+        switch (cz_state->mstate) {
         case ms_start:
-                return parse_ms_start(ev);
+                return parse_ms_start(cz_state, ev);
         case ms_hacek:
-                return parse_ms_hacek(ev);
+                return parse_ms_hacek(cz_state, ev);
         case ms_carka:
-                return parse_ms_carka(ev);
+                return parse_ms_carka(cz_state, ev);
         }