diff options
| -rw-r--r-- | console-client/xkb/parser.y | 12 | ||||
| -rw-r--r-- | console-client/xkb/xkb.c | 7 | ||||
| -rw-r--r-- | console-client/xkb/xkb.h | 2 | ||||
| -rw-r--r-- | console-client/xkb/xkbtimer.c | 4 |
4 files changed, 1 insertions, 24 deletions
diff --git a/console-client/xkb/parser.y b/console-client/xkb/parser.y index 845fcbaf..27b62145 100644 --- a/console-client/xkb/parser.y +++ b/console-client/xkb/parser.y @@ -1545,20 +1545,8 @@ parse_xkbconfig (char *xkbdir, char *xkbkeymapfile, char *xkbkeymap) extern FILE *yyin; extern char *filename; - // xkbkeymap = 0; - - // xkbkeymapfile = 0; - - // xkbdir = "/etc/X11/xkb"; - // xkbdir ="/home/marco/xkb"; - // xkbkeymapfile = "keymap/hurd"; - // xkbkeymap = "hack"; - debug_printf ("Dir: %s, file: %s sect: %s\n", xkbdir, xkbkeymapfile, xkbkeymap); - // xkbkeymapfile = "default.xkb"; - //xkbkeymap = "us"; - // yydebug = 1; if (xkbkeymapfile) { filename = xkbkeymapfile; diff --git a/console-client/xkb/xkb.c b/console-client/xkb/xkb.c index bb1647d9..a63d1ba0 100644 --- a/console-client/xkb/xkb.c +++ b/console-client/xkb/xkb.c @@ -161,9 +161,6 @@ interpret_kc (keycode_t kc) SA_NoAction) continue; -/* if (action->type == 13) */ -/* printf ("AA %d AAAAAAAAAAAAAAA %d: %d - %d\n", kc, flags, symbol, interp->symbol); */ - action = malloc (sizeof (xkb_action_t)); memcpy (action, &interp->action, sizeof (xkb_action_t)); @@ -1187,7 +1184,6 @@ xkb_input (keypress_t key) if (key.rel) keystate[key.keycode].lmods = lmods; input = handle_key (key); - //printf ("sym: %d\n", input); debug_printf ("handle: %d\n", input); if (input == -1) @@ -1200,7 +1196,6 @@ xkb_input (keypress_t key) buf[size] = '\0'; - debug_printf ("input: %d\n", input); if (!input) return; @@ -1319,7 +1314,6 @@ xkb_input (keypress_t key) break; } - debug_printf ("bla\n"); if (escseq != NULL) { strcat (buf + size, escseq); @@ -1366,7 +1360,6 @@ xkb_input (keypress_t key) size = sizeof (buf) - left; } - // printf ("SIZE: %d\n", size); if (size) console_input (buf, size); size = 0; diff --git a/console-client/xkb/xkb.h b/console-client/xkb/xkb.h index e13d5ddb..07694930 100644 --- a/console-client/xkb/xkb.h +++ b/console-client/xkb/xkb.h @@ -23,7 +23,6 @@ typedef unsigned int scancode_t; typedef int symbol; typedef int group_t; typedef unsigned int boolctrls; -//typedef int error_t; #define KEYCONSUMED 1 #define KEYNOTCONSUMED 0 @@ -328,7 +327,6 @@ typedef struct keypress { keycode_t keycode; keycode_t prevkc; - // struct keystate *state; unsigned short repeat:1; /* It this a real keypress?. */ unsigned short redir:1; /* This is not a real keypress. */ unsigned short rel; /* Key release. */ diff --git a/console-client/xkb/xkbtimer.c b/console-client/xkb/xkbtimer.c index c842d188..7621af72 100644 --- a/console-client/xkb/xkbtimer.c +++ b/console-client/xkb/xkbtimer.c @@ -24,9 +24,6 @@ #include "xkb.h" #include <timer.h> -/* Timer used to time key controls. */ -//static struct timer_list key_timer; - /* For key repeat. */ static int key_delay = 0; static int key_repeat = 0; @@ -48,6 +45,7 @@ enum timer_status timer_repeating }; +/* Timer used to time key controls. */ static struct per_key_timer { /* Used for slowkeys and repeat. */ |