WebSVN – HelenOS – Path Comparison – / – /branches/network/uspace/srv/kbd/ Rev 4263 and /branches/network/uspace/srv/kbd/ Rev 4262

Ignore whitespace Rev 4263 → Rev 4262

 /branches/network/uspace/srv/kbd/include/layout.h
 ,16 → 38,9
 #define KBD_LAYOUT_H_
 #include <kbd/kbd.h>
-#include <sys/types.h>
-typedef struct {
-    wchar_t (*parse_ev)(kbd_event_t *);
-} layout_op_t;
+extern char layout_parse_ev(kbd_event_t *);
-extern layout_op_t us_qwerty_op;
-extern layout_op_t us_dvorak_op;
-extern layout_op_t cz_op;
 #endif
 /**

/branches/network/uspace/srv/kbd/include/key_buffer.h
55,6 → 55,7
extern int keybuffer_available(keybuffer_t *);
extern int keybuffer_empty(keybuffer_t *);
extern void keybuffer_push(keybuffer_t , const kbd_event_t );
extern void keybuffer_push0(keybuffer_t *, int c);
extern int keybuffer_pop(keybuffer_t , kbd_event_t );

#endif

 /branches/network/uspace/srv/kbd/generic/kbd.c
 ,16 → 70,6
 int cir_service = 0;
 int cir_phone = -1;
-#define NUM_LAYOUTS 3
-static layout_op_t *layout[NUM_LAYOUTS] = {
-    &us_qwerty_op,
-    &us_dvorak_op,
-    &cz_op
-};
-static int active_layout = 0;
 void kbd_push_scancode(int scancode)
 {
 /*  printf("scancode: 0x%x\n", scancode);*/
 ,29 → 123,11
     printf("mods: 0x%x\n", mods);
     printf("keycode: %u\n", key);
 */
-    if (type == KE_PRESS && (mods & KM_LCTRL) &&
-        key == KC_F1) {
-        active_layout = 0;
-        return;
-    }
-    if (type == KE_PRESS && (mods & KM_LCTRL) &&
-        key == KC_F2) {
-        active_layout = 1;
-        return;
-    }
-    if (type == KE_PRESS && (mods & KM_LCTRL) &&
-        key == KC_F3) {
-        active_layout = 2;
-        return;
-    }
     ev.type = type;
     ev.key = key;
     ev.mods = mods;
-    ev.c = layout[active_layout]->parse_ev(&ev);
+    ev.c = layout_parse_ev(&ev);
     async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
 }

 /branches/network/uspace/srv/kbd/generic/key_buffer.c
 ,6 → 93,14
     futex_up(&keybuffer_futex);
 }
+void keybuffer_push0(keybuffer_t *keybuffer, int c)
+{
+    kbd_event_t ev;
+    ev.key = c; ev.mods = 0; ev.c = c;
+    keybuffer_push(keybuffer, &ev);
+}
 /** Pop event from buffer.
  *
  * @param edst  Pointer to where the event should be saved.

 /branches/network/uspace/srv/kbd/Makefile
 ,11 → 49,15
     generic/key_buffer.c
 ARCH_SOURCES =
-GENARCH_SOURCES = \
-    layout/cz.c \
-    layout/us_qwerty.c \
-    layout/us_dvorak.c
+GENARCH_SOURCES =
+ifeq ($(KBD_LAYOUT), us_qwerty)
+    GENARCH_SOURCES += layout/us_qwerty.c
+endif
+ifeq ($(KBD_LAYOUT), us_dvorak)
+    GENARCH_SOURCES += layout/us_dvorak.c
+endif
 ifeq ($(UARCH), amd64)
     GENARCH_SOURCES += \
         port/i8042.c \

/branches/network/uspace/srv/kbd/layout/cz.c
File deleted

 /branches/network/uspace/srv/kbd/layout/us_dvorak.c
 ,13 → 36,7
 #include <kbd/keycode.h>
 #include <layout.h>
-static wchar_t layout_parse_ev(kbd_event_t *ev);
-layout_op_t us_dvorak_op = {
-    layout_parse_ev
-};
-static wchar_t map_lcase[] = {
+static char map_lcase[] = {
     [KC_R] = 'p',
     [KC_T] = 'y',
     [KC_Y] = 'f',
 ,7 → 69,7
     [KC_SLASH] = 'z',
 };
-static wchar_t map_ucase[] = {
+static char map_ucase[] = {
     [KC_R] = 'P',
     [KC_T] = 'Y',
     [KC_Y] = 'F',
 ,7 → 102,7
     [KC_SLASH] = 'Z',
 };
-static wchar_t map_not_shifted[] = {
+static char map_not_shifted[] = {
     [KC_BACKTICK] = '`',
     [KC_1] = '1',
 ,7 → 132,7
     [KC_Z] = ';',
 };
-static wchar_t map_shifted[] = {
+static char map_shifted[] = {
     [KC_BACKTICK] = '~',
     [KC_1] = '!',
 ,7 → 162,7
     [KC_Z] = ':',
 };
-static wchar_t map_neutral[] = {
+static char map_neutral[] = {
     [KC_BACKSPACE] = '\b',
     [KC_TAB] = '\t',
     [KC_ENTER] = '\n',
 ,7 → 175,7
     [KC_NENTER] = '\n'
 };
-static wchar_t map_numeric[] = {
+static char map_numeric[] = {
     [KC_N7] = '7',
     [KC_N8] = '8',
     [KC_N9] = '9',
 ,7 → 190,7
     [KC_NPERIOD] = '.'
 };
-static wchar_t translate(unsigned int key, wchar_t *map, size_t map_length)
+static int translate(unsigned int key, char *map, size_t map_length)
 {
     if (key >= map_length)
         return 0;
 ,36 → 197,36
     return map[key];
 }
-static wchar_t layout_parse_ev(kbd_event_t *ev)
+char layout_parse_ev(kbd_event_t *ev)
 {
-    wchar_t c;
+    char c;
     /* Produce no characters when Ctrl or Alt is pressed. */
     if ((ev->mods & (KM_CTRL | KM_ALT)) != 0)
         return 0;
-    c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(wchar_t));
+    c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(char));
     if (c != 0)
         return c;
     if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0))
-        c = translate(ev->key, map_ucase, sizeof(map_ucase) / sizeof(wchar_t));
+        c = translate(ev->key, map_ucase, sizeof(map_ucase) / sizeof(char));
     else
-        c = translate(ev->key, map_lcase, sizeof(map_lcase) / sizeof(wchar_t));
+        c = translate(ev->key, map_lcase, sizeof(map_lcase) / sizeof(char));
     if (c != 0)
         return c;
     if ((ev->mods & KM_SHIFT) != 0)
-        c = translate(ev->key, map_shifted, sizeof(map_shifted) / sizeof(wchar_t));
+        c = translate(ev->key, map_shifted, sizeof(map_shifted) / sizeof(char));
     else
-        c = translate(ev->key, map_not_shifted, sizeof(map_not_shifted) / sizeof(wchar_t));
+        c = translate(ev->key, map_not_shifted, sizeof(map_not_shifted) / sizeof(char));
     if (c != 0)
         return c;
     if ((ev->mods & KM_NUM_LOCK) != 0)
-        c = translate(ev->key, map_numeric, sizeof(map_numeric) / sizeof(wchar_t));
+        c = translate(ev->key, map_numeric, sizeof(map_numeric) / sizeof(char));
     else
         c = 0;

 /branches/network/uspace/srv/kbd/layout/us_qwerty.c
 ,13 → 36,7
 #include <kbd/keycode.h>
 #include <layout.h>
-static wchar_t layout_parse_ev(kbd_event_t *ev);
-layout_op_t us_qwerty_op = {
-    layout_parse_ev
-};
-static wchar_t map_lcase[] = {
+static char map_lcase[] = {
     [KC_Q] = 'q',
     [KC_W] = 'w',
     [KC_E] = 'e',
 ,7 → 67,7
     [KC_M] = 'm',
 };
-static wchar_t map_ucase[] = {
+static char map_ucase[] = {
     [KC_Q] = 'Q',
     [KC_W] = 'W',
     [KC_E] = 'E',
 ,7 → 98,7
     [KC_M] = 'M',
 };
-static wchar_t map_not_shifted[] = {
+static char map_not_shifted[] = {
     [KC_BACKTICK] = '`',
     [KC_1] = '1',
 ,7 → 127,7
     [KC_SLASH] = '/',
 };
-static wchar_t map_shifted[] = {
+static char map_shifted[] = {
     [KC_BACKTICK] = '~',
     [KC_1] = '!',
 ,7 → 156,7
     [KC_SLASH] = '?',
 };
-static wchar_t map_neutral[] = {
+static char map_neutral[] = {
     [KC_BACKSPACE] = '\b',
     [KC_TAB] = '\t',
     [KC_ENTER] = '\n',
 ,7 → 169,7
     [KC_NENTER] = '\n'
 };
-static wchar_t map_numeric[] = {
+static char map_numeric[] = {
     [KC_N7] = '7',
     [KC_N8] = '8',
     [KC_N9] = '9',
 ,43 → 184,39
     [KC_NPERIOD] = '.'
 };
-static wchar_t translate(unsigned int key, wchar_t *map, size_t map_length)
+static int translate(unsigned int key, char *map, size_t map_length)
 {
-    if (key >= map_length)
-        return 0;
-    return map[key];
+    if (key >= map_length) return 0;
+    return map[key];
 }
-static wchar_t layout_parse_ev(kbd_event_t *ev)
+char layout_parse_ev(kbd_event_t *ev)
 {
-    wchar_t c;
+    char c;
     /* Produce no characters when Ctrl or Alt is pressed. */
     if ((ev->mods & (KM_CTRL | KM_ALT)) != 0)
         return 0;
-    c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(wchar_t));
-    if (c != 0)
-        return c;
+    c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(char));
+    if (c != 0) return c;
     if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0))
-        c = translate(ev->key, map_ucase, sizeof(map_ucase) / sizeof(wchar_t));
+        c = translate(ev->key, map_ucase, sizeof(map_ucase) / sizeof(char));
     else
-        c = translate(ev->key, map_lcase, sizeof(map_lcase) / sizeof(wchar_t));
+        c = translate(ev->key, map_lcase, sizeof(map_lcase) / sizeof(char));
-    if (c != 0)
-        return c;
+    if (c != 0) return c;
     if ((ev->mods & KM_SHIFT) != 0)
-        c = translate(ev->key, map_shifted, sizeof(map_shifted) / sizeof(wchar_t));
+        c = translate(ev->key, map_shifted, sizeof(map_shifted) / sizeof(char));
     else
-        c = translate(ev->key, map_not_shifted, sizeof(map_not_shifted) / sizeof(wchar_t));
+        c = translate(ev->key, map_not_shifted, sizeof(map_not_shifted) / sizeof(char));
-    if (c != 0)
-        return c;
+    if (c != 0) return c;
     if ((ev->mods & KM_NUM_LOCK) != 0)
-        c = translate(ev->key, map_numeric, sizeof(map_numeric) / sizeof(wchar_t));
+        c = translate(ev->key, map_numeric, sizeof(map_numeric) / sizeof(char));
     else
         c = 0;

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4263 → Rev 4262