Changeset 215abc1 in mainline for uspace/srv/kbd/layout/cz.c

Timestamp:

2009-06-03T18:49:33Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

05b9912

Parents:

bbdbf86

Message:

keyboard server rewrite: rename "kbd events" to more generic "console events" and similar changes
rename key_buffer.* to keybuffer.*
coding style changes

File:

• uspace/srv/kbd/layout/cz.c (modified) (6 diffs)

uspace/srv/kbd/layout/cz.c

@@ -28 +28 @@
 
 /** @addtogroup kbd
- * @brief       US QWERTY leyout.
+ * @brief US QWERTY leyout.
  * @{
- */ 
+ */
 
 #include <kbd.h>
-#include <kbd/kbd.h>
-#include <kbd/keycode.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);
+static wchar_t layout_parse_ev(console_event_t *ev);
 
 enum m_state {
         ms_start,
         ms_hacek,
-        ms_carka        
+        ms_carka
 };
 
@@ -273 +273 @@
 }
 
-static wchar_t parse_ms_hacek(kbd_event_t *ev)
+static wchar_t parse_ms_hacek(console_event_t *ev)
 {
         wchar_t c;
@@ -291 +291 @@
 }
 
-static wchar_t parse_ms_carka(kbd_event_t *ev)
+static wchar_t parse_ms_carka(console_event_t *ev)
 {
         wchar_t c;
@@ -309 +309 @@
 }
 
-static wchar_t parse_ms_start(kbd_event_t *ev)
+static wchar_t parse_ms_start(console_event_t *ev)
 {
         wchar_t c;
@@ -384 +384 @@
 }
 
-static wchar_t layout_parse_ev(kbd_event_t *ev)
-{
-        if (ev->type != KE_PRESS)
-                return '\0';
-
+static wchar_t layout_parse_ev(console_event_t *ev)
+{
+        if (ev->type != KEY_PRESS)
+                return 0;
+        
         if (key_is_mod(ev->key))
-                return '\0';
-
+                return 0;
+        
         switch (mstate) {
-        case ms_start: return parse_ms_start(ev);
-        case ms_hacek: return parse_ms_hacek(ev);
-        case ms_carka: return parse_ms_carka(ev);
+        case ms_start:
+                return parse_ms_start(ev);
+        case ms_hacek:
+                return parse_ms_hacek(ev);
+        case ms_carka:
+                return parse_ms_carka(ev);
         }
 }
@@ -401 +404 @@
 /**
  * @}
- */ 
+ */