From 8582683290c390d8e5f551f35886eb2453f7f8e7 Mon Sep 17 00:00:00 2001 From: Diego Nieto Cid Date: Sun, 3 Apr 2011 00:02:46 -0300 Subject: Depend on X11 for string to keysym mappings. * config.make.in (HAVE_X11,X11_CFLAGS,X11_LIBS,XKB_BASE): New variables. * configure.in: Check for x11 module. * console-client/Makefile (PC_KBD_SO_SRCS): Move XKB sources... * console-client/Makefile (XKB_SRCS): ... here. New variable. * console-client/Makefile (SRCS): Add $(XKB_SRCS). * console-client/Makefile (LCLHDRS): Add xkb/xkb.h. * console-client/Makefile (XKB_DATA_DIR): Removed variable. * console-client/Makefile (pc_kbd.so.$(hurd-version)): Use patsubst. Depend on XKB objects when HAVE_X11 = yes. * console-client/Makefile (install): Depend on XKB datafiles when HAVE_X11 = yes. * console-client/Makefile (pc-kbd-CFLAGS): Set variable when HAVE_X11 = yes * console-client/Makefile ($(XKB_DATA_DIR),$(XKB_DATA_DIR)/%): Replaced by... * console-client/Makefile[HAVE_X11=yes]($(XKB_BASE),$(XKB_BASE)/%): ... this targets. * console-client/Makefile[HAVE_X11=yes](pc_kbd-LDLIBS): New variable. * console-client/xkb/keysymdef.h: Removed file. * console-client/xkb/ks_tables.h: Likewise. * console-client/xkb/symname.c: Likewise. * console-client/xkb/xkb.c: Include . * console-client/xkb/compose.c: Likewise. * console-client/xkb/xkb.h: Remove XStringToKeysym prototype. Include . --- console-client/xkb/xkb.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'console-client/xkb/xkb.h') diff --git a/console-client/xkb/xkb.h b/console-client/xkb/xkb.h index 71c7803f..e13d5ddb 100644 --- a/console-client/xkb/xkb.h +++ b/console-client/xkb/xkb.h @@ -16,7 +16,7 @@ #include #include -//#include "kbd_driver.h" +#include typedef int keycode_t; typedef unsigned int scancode_t; @@ -359,7 +359,6 @@ typedef struct xkb_indicator unsigned int KeySymToUcs4(int keysym); symbol compose_symbols (symbol symbol); error_t read_composefile (char *); -KeySym XStringToKeysym(char *s); struct keytype *keytype_find (char *name); void key_set_action (struct key *key, group_t group, int level, -- cgit v1.2.3