Age | Commit message (Collapse) | Author |
|
|
|
Specifying the header file relative to $(includeir) won't work because
it is defined in terms of prefix variable which is redefined during
installation to the destination directory.
And the dependency check will fail during 'make install' because the
header might not be in the destination tree.
* config.make.in (X11_KEYSYMDEF_H, SED): New variables.
* configure.in: Check for sed. Find X11/keysymdef.h absolute location
using the preprocessor and save it in X11_KEYSYMDEF_H variable.
* console-client/Makefile (kstoucs_map.c): Use X11_KEYSYMDEF_H to
depend on the header file.
|
|
* console-client/Makefile [HAVE_X11=yes](compose-CFLAGS): Define DATADIR.
* console-client/pc-kbd.c (pc_kbd_init): Load compose file
unconditionally.
* console-client/xkb/compose.c: Include fcntl.h, unistd.h and locale.h
(struct map_entry, enum callback_result, map_callback): New types.
(map_iterate): New function.
(struct matcher_context): New type.
(match_left_set_right, match_right_set_left): New functions.
(get_compose_file_for_locale): Likewise.
(read_composefile): Use get_compose_file_for_locale result when
argument composefn is NULL.
|
|
|
|
* console-client/xkb/xkb.c: Remove macro NoSymbol.
* console-client/xkb/compose.c: Likewise.
|
|
|
|
|
|
* console-client/xkb/parser.y(parse_xkbconfig): Free cwd.
|
|
* console-client/xkb/default.xkb: Removed file.
* console-client/xkb/makeconf.sh: Likewise.
* console-client/xkb/xkbdefaults.c: Likewise.
* console-client/xkb/parser.y(parse_xkbconfig): Don't use harcoded
defaults, return error when no keymap file is given.
|
|
|
|
|
|
* console-client/Makefile (DIST_FILES): Add xkb/kstoucs_map.sh.
(kstoucs_map.c): New target.
* console-client/xkb/kstoucs.c: Reimplement KeySymToUcs4.
* console-client/xkb/kstoucs_map.sh: New file.
|
|
* 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 <X11/keysymdef.h>.
* console-client/xkb/compose.c: Likewise.
* console-client/xkb/xkb.h: Remove XStringToKeysym prototype.
Include <X11/Xlib.h>.
|
|
* console-client/xkb/README: Refer to this artifact as "module"
instead of "input driver".
Key repeater is now implemented by pc-kbd.
Update the module's installation and usage procedures.
|
|
* console-client/xkb/parser.y (skip_to_firstsection): New function.
(include_section): Call skip_to_firstsection when
skip_to_defaultsection fails.
|
|
|
|
|
|
* console-client/xkb/README: Keymap selection example.
|
|
* console-client/xkb/parser.y(symbolname): Shift by '0' numbers [0..9].
|
|
* console-client/xkb/parser.y(symbolname): Match and return hex value.
|
|
* console-client/xkb/keysymdef.h: Replaced file.
* console-client/xkb/ks_tables.h: Likewise.
* console-client/xkb/kstoucs.c: Likewise.
* console-client/xkb/symname.c: Likewise.
* console-client/xkb/HACKING: New file, added foreign files information.
|
|
* console-client/xkb/README: Updated.
|
|
|
|
|
|
* console-client/xkb/parser.y (key_set_action): Test actions variable.
(key_set_keysym): Test keysyms instead of keys.
|
|
* console-client/xkb/parser.y (key_set_keysym): Consider symbol's size
when reallocing.
(key_set_action): Consider (xkb_action_t *)'s size when reallocing.
Start clearing levels from 'width' and up to 'level'.
|
|
* console-client/xkb/xkb-data/keymap/hurd: New keymap neo.
|
|
|
|
|
|
|
|
|
|
* console-client/xkb/lex.l(include_file): Log file changes.
* console-client/xkb/parser.y(key_set_keysym): Log symbol associations.
(include_section): Log section being read.
(symbolssect,keycodesect,key_new): Log current key.
* console-client/xkb/xkbdata.c(keyname_add): Log keyname, keycode and hash.
(set_rmod_keycode): Log modifier, keyname and keycode.
|
|
|
|
* console-client/xkb/parser.y (include_section): Declare scanner_get_current_location and
scanner_get_current_file prototypes.
New local variables current_location, current_file and err.
Report error and exit when a section cannot be processed successfully.
|
|
* console-client/xkb/lex.l (scanner_get_current_location): New function.
(scanner_get_current_file): Likewise.
|
|
* console-client/xkb/parser.y [!YY_NULL]: Define YY_NULL, the end of
file token.
* console-client/xkb/parser.y (skip_to_sectionname): If the end of file
is reached while skipping symbols return an error.
Return 0 on success.
* console-client/xkb/parser.y (skip_to_defaultsection): Likewise.
|
|
* console-client/xkb/lex.l (close_include): Return an error code on
failure.
(yywrap): Indicate termination when close_include fails.
|
|
|
|
|
|
|
|
This allows to combine virtual modifiers safely.
|
|
modified: xkb/keymap/hurd
* Don't include inexistant symbol file: pc104.
* en_US was replaced by pc(pc105).
* Append us layout by default as pc(pc105) no longer describes
a full keyboard.
|
|
|
|
|
|
|
|
|
|
|
|
* console-client/Makefile (XKB_DATA_DIR, XKB_DATA_FILES): New variables.
(DIST_FILES): Use XKB_DATA_FILES to list data files.
(pc-kbd-CFLAGS): Use XKB_DATA_DIR variable.
(intall): Add XKB data files to it's dependencies.
($(XKB_DATA_DIR), $(XKB_DATA_DIR)/%): New targets.
|
|
* console-client/Makefile (pc-kbd-CFLAGS): New variable.
(PC_KBD_SO_SRCS): Add sources from xkb directory.
(LCLHDRS): Add includes from xkb directory.
(lex.c, parser.tab.h): New targets.
(VPATH): New variable.
(CPPFLAGS): Add xkb directory to include search path.
(LFLAGS, YFLAGS): New variables.
(DIST_FILES): New variable.
* console-client/pc-kbd.c [XKB_SUPPORT]: Include xkb/xkb.h.
(cd): Removed static qualifier.
[XKB_SUPPORT] (ctrlaltbs): New variable.
[XKB_SUPPORT] (xkb_repeat_delay, xkb_repeat_interval): Likewise.
(gnumach_v1_input_next) [XKB_SUPPORT]: Skip conversion to set 2.
[XKB_SUPPORT] (read_keycode): New function.
[XKB_SUPPORT] (input_loop): Pass keycode to xkb_input_key.
(struct arguments): New type.
(options) [XKB_SUPPORT]: New options xkbdir, keymapfile, keymap
compose, ctrlaltbs, no-ctrlaltbs, repeat-delay and repeat-interval.
(parse_opt) [XKB_SUPPORT]: Handle new options.
(pc_kbd_init) [XKB_SUPPORT]: Initialize XKB and load layout.
(pc_kbd_start) [XKB_SUPPORT]: Initialize xkb timers.
|
|
* console-client/xkb/parser.y: Add semicolons where needed.
|