diff options
| author | Diego Nieto Cid <dnietoc@gmail.com> | 2011-04-12 21:08:04 -0300 |
|---|---|---|
| committer | Diego Nieto Cid <dnietoc@gmail.com> | 2011-04-16 23:45:26 -0300 |
| commit | b2662d9ddb3320fb3ac295c4858efe285fc4168f (patch) | |
| tree | 9fc14fb1de0585b3d134afdd5174b60d99766a07 /console-client/pc-kbd.c | |
| parent | 7a0510fa0ccb7a25bef0c2527ff7c570bd60a863 (diff) | |
Use locale's compose file by default.
* 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.
Diffstat (limited to 'console-client/pc-kbd.c')
| -rw-r--r-- | console-client/pc-kbd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/console-client/pc-kbd.c b/console-client/pc-kbd.c index fdc749d7..9999654f 100644 --- a/console-client/pc-kbd.c +++ b/console-client/pc-kbd.c @@ -1329,12 +1329,9 @@ pc_kbd_init (void **handle, int no_exit, int argc, char *argv[], int *next) xkb_repeat_delay = arguments.repeat_delay; xkb_repeat_interval = arguments.repeat_interval; - if (arguments.composefile) - { - err = read_composefile (arguments.composefile); - if (err) - return err; - } + err = read_composefile (arguments.composefile); + if (err) + return err; xkb_data_init (); err = xkb_load_layout (arguments.xkbdir, arguments.keymapfile, |