From 30a920e5475781e37f23aa54e2c2303088d56f2c Mon Sep 17 00:00:00 2001 From: Alexey Gladkov Date: Tue, 30 Apr 2013 00:40:08 +0400 Subject: [PATCH] Rename LKFLAG_* on LK_FLAG_* Signed-off-by: Alexey Gladkov --- src/dumpkeys.c | 2 +- src/libkeymap/dump.c | 4 ++-- src/libkeymap/keymap/data.h | 12 ++++++------ src/libkeymap/kmap.c | 2 +- src/libkeymap/ksyms.c | 6 +++--- src/libkeymap/ksyms.h | 2 +- src/libkeymap/loadkeys.c | 10 +++++----- src/libkeymap/parser.y | 4 ++-- src/loadkeys.c | 12 ++++++------ tests/libkeymap-dumpkeys.c | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/dumpkeys.c b/src/dumpkeys.c index 71facc0..dcfc26c 100644 --- a/src/dumpkeys.c +++ b/src/dumpkeys.c @@ -153,7 +153,7 @@ main (int argc, char *argv[]) { } if (kbd_mode == K_UNICODE) { - kmap.flags |= LKFLAG_PREFER_UNICODE; + kmap.flags |= LK_FLAG_PREFER_UNICODE; } if ((rc = lk_kernel_keymap(&kmap, fd)) < 0) diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c index f2a8e3e..de8066e 100644 --- a/src/libkeymap/dump.c +++ b/src/libkeymap/dump.c @@ -194,7 +194,7 @@ lk_dump_ctable(struct keymap *kmap, FILE *fd) fprintf(fd, "};\n"); #ifdef KDSKBDIACRUC - if (kmap->flags & LKFLAG_PREFER_UNICODE) { + if (kmap->flags & LK_FLAG_PREFER_UNICODE) { fprintf(fd, "\nstruct kbdiacruc accent_table[MAX_DIACR] = {\n"); for (i = 0; i < kmap->accent_table_size; i++) { fprintf(fd, "\t{"); @@ -269,7 +269,7 @@ lk_dump_diacs(struct keymap *kmap, FILE *fd) { unsigned int i; #ifdef KDSKBDIACRUC - if (kmap->flags & LKFLAG_PREFER_UNICODE) { + if (kmap->flags & LK_FLAG_PREFER_UNICODE) { for (i = 0; i < kmap->accent_table_size; i++) { fprintf(fd, "compose "); dumpchar(fd, kmap->accent_table[i].diacr & 0xff, 0); diff --git a/src/libkeymap/keymap/data.h b/src/libkeymap/keymap/data.h index 43cee74..bf73f8b 100644 --- a/src/libkeymap/keymap/data.h +++ b/src/libkeymap/keymap/data.h @@ -12,11 +12,11 @@ typedef struct kbdiacr accent_entry; #endif typedef enum { - LKFLAG_UNICODE_MODE = (1 << 1), - LKFLAG_CLEAR_COMPOSE = (1 << 2), - LKFLAG_CLEAR_STRINGS = (1 << 3), - LKFLAG_PREFER_UNICODE= (1 << 4) -} lkflags; + LK_FLAG_UNICODE_MODE = (1 << 1), + LK_FLAG_CLEAR_COMPOSE = (1 << 2), + LK_FLAG_CLEAR_STRINGS = (1 << 3), + LK_FLAG_PREFER_UNICODE= (1 << 4) +} lk_flags; typedef enum { LK_KEYWORD_KEYMAPS = (1 << 1), @@ -29,7 +29,7 @@ typedef enum { struct keymap { /* Parser flags */ - lkflags flags; + lk_flags flags; /* Keymap keywords (keymaps, alt-is-meta, charset, ...) */ lk_keywords keywords; diff --git a/src/libkeymap/kmap.c b/src/libkeymap/kmap.c index ff366c9..dea57f8 100644 --- a/src/libkeymap/kmap.c +++ b/src/libkeymap/kmap.c @@ -232,7 +232,7 @@ lk_add_compose(struct keymap *kmap, int direction = TO_8BIT; #ifdef KDSKBDIACRUC - if (kmap->flags & LKFLAG_PREFER_UNICODE) + if (kmap->flags & LK_FLAG_PREFER_UNICODE) direction = TO_UNICODE; #endif return lk_add_diacr(kmap, diff --git a/src/libkeymap/ksyms.c b/src/libkeymap/ksyms.c index 8b711e0..2f59058 100644 --- a/src/libkeymap/ksyms.c +++ b/src/libkeymap/ksyms.c @@ -241,7 +241,7 @@ ksymtocode(struct keymap *kmap, const char *s, int direction) { sym *p; if (direction == TO_AUTO) - direction = (kmap->flags & LKFLAG_PREFER_UNICODE) + direction = (kmap->flags & LK_FLAG_PREFER_UNICODE) ? TO_UNICODE : TO_8BIT; if (!strncmp(s, "Meta_", 5)) { @@ -342,7 +342,7 @@ convert_code(struct keymap *kmap, int code, int direction) int result; if (direction == TO_AUTO) - direction = (kmap->flags & LKFLAG_PREFER_UNICODE) + direction = (kmap->flags & LK_FLAG_PREFER_UNICODE) ? TO_UNICODE : TO_8BIT; if (KTYP(code) == KT_META) @@ -378,7 +378,7 @@ convert_code(struct keymap *kmap, int code, int direction) int add_capslock(struct keymap *kmap, int code) { - if (KTYP(code) == KT_LATIN && (!(kmap->flags & LKFLAG_PREFER_UNICODE) || code < 0x80)) + if (KTYP(code) == KT_LATIN && (!(kmap->flags & LK_FLAG_PREFER_UNICODE) || code < 0x80)) return K(KT_LETTER, KVAL(code)); else if ((code ^ 0xf000) < 0x100) /* Unicode Latin-1 Supplement */ diff --git a/src/libkeymap/ksyms.h b/src/libkeymap/ksyms.h index 822c473..b717c09 100644 --- a/src/libkeymap/ksyms.h +++ b/src/libkeymap/ksyms.h @@ -28,7 +28,7 @@ extern const unsigned int syn_size; #define CODE_FOR_UNKNOWN_KSYM (-1) /* Directions for converting keysyms */ -#define TO_AUTO (-1) /* use LKFLAG_PREFER_UNICODE */ +#define TO_AUTO (-1) /* use LK_FLAG_PREFER_UNICODE */ #define TO_8BIT 0 #define TO_UNICODE 1 diff --git a/src/libkeymap/loadkeys.c b/src/libkeymap/loadkeys.c index a585005..e6cf8bc 100644 --- a/src/libkeymap/loadkeys.c +++ b/src/libkeymap/loadkeys.c @@ -18,7 +18,7 @@ defkeys(struct keymap *kmap, int fd, int kbd_mode) int ct = 0; int i, j, fail; - if (kmap->flags & LKFLAG_UNICODE_MODE) { + if (kmap->flags & LK_FLAG_UNICODE_MODE) { /* temporarily switch to K_UNICODE while defining keys */ if (ioctl(fd, KDSKBMODE, K_UNICODE)) { ERR(kmap, _("KDSKBMODE: %s: could not switch to Unicode mode"), @@ -92,7 +92,7 @@ defkeys(struct keymap *kmap, int fd, int kbd_mode) } } - if ((kmap->flags & LKFLAG_UNICODE_MODE) && ioctl(fd, KDSKBMODE, kbd_mode)) { + if ((kmap->flags & LK_FLAG_UNICODE_MODE) && ioctl(fd, KDSKBMODE, kbd_mode)) { ERR(kmap, _("KDSKBMODE: %s: could not return to original keyboard mode"), strerror(errno)); goto fail; @@ -159,7 +159,7 @@ deffuncs(struct keymap *kmap, int fd) } else { ct++; } - } else if (kmap->flags & LKFLAG_CLEAR_STRINGS) { + } else if (kmap->flags & LK_FLAG_CLEAR_STRINGS) { kbs.kb_string[0] = 0; if (ioctl(fd, KDSKBSENT, (unsigned long)&kbs)) { @@ -188,7 +188,7 @@ defdiacs(struct keymap *kmap, int fd) ERR(kmap, _("too many compose definitions")); } #ifdef KDSKBDIACRUC - if (kmap->flags & LKFLAG_PREFER_UNICODE) { + if (kmap->flags & LK_FLAG_PREFER_UNICODE) { kdu.kb_cnt = count; for (i = 0; i < kdu.kb_cnt; i++) { @@ -239,7 +239,7 @@ lk_load_keymap(struct keymap *kmap, int fd, int kbd_mode) keyct, (keyct == 1) ? _("key") : _("keys"), funcct, (funcct == 1) ? _("string") : _("strings")); - if (kmap->accent_table_size > 0 || kmap->flags & LKFLAG_CLEAR_COMPOSE) { + if (kmap->accent_table_size > 0 || kmap->flags & LK_FLAG_CLEAR_COMPOSE) { diacct = defdiacs(kmap, fd); if (diacct < 0) diff --git a/src/libkeymap/parser.y b/src/libkeymap/parser.y index fd453ff..10624d0 100644 --- a/src/libkeymap/parser.y +++ b/src/libkeymap/parser.y @@ -196,9 +196,9 @@ charsetline : CHARSET STRLITERAL EOL /* Unicode: The first 256 code points were made identical to the content of ISO 8859-1 */ - if (kmap->flags & LKFLAG_PREFER_UNICODE && + if (kmap->flags & LK_FLAG_PREFER_UNICODE && !strcasecmp((char *) $2.data, "iso-8859-1")) - kmap->flags ^= LKFLAG_PREFER_UNICODE; + kmap->flags ^= LK_FLAG_PREFER_UNICODE; } ; altismetaline : ALT_IS_META EOL diff --git a/src/loadkeys.c b/src/loadkeys.c index 50c3ee6..2f8669c 100644 --- a/src/loadkeys.c +++ b/src/loadkeys.c @@ -121,7 +121,7 @@ main(int argc, char *argv[]) options |= OPT_B; break; case 'c': - kmap.flags |= LKFLAG_CLEAR_COMPOSE; + kmap.flags |= LK_FLAG_CLEAR_COMPOSE; break; case 'C': console = optarg; @@ -133,12 +133,12 @@ main(int argc, char *argv[]) options |= OPT_M; break; case 's': - kmap.flags |= LKFLAG_CLEAR_STRINGS; + kmap.flags |= LK_FLAG_CLEAR_STRINGS; break; case 'u': options |= OPT_U; - kmap.flags |= LKFLAG_UNICODE_MODE; - kmap.flags |= LKFLAG_PREFER_UNICODE; + kmap.flags |= LK_FLAG_UNICODE_MODE; + kmap.flags |= LK_FLAG_PREFER_UNICODE; break; case 'q': lk_set_log_priority(&kmap, LOG_ERR); @@ -181,11 +181,11 @@ main(int argc, char *argv[]) " (perhaps you want to do `kbd_mode -a'?)\n"), progname); } else { - kmap.flags |= LKFLAG_PREFER_UNICODE; + kmap.kmap |= LK_FLAG_PREFER_UNICODE; } /* reset -u option if keyboard is in K_UNICODE anyway */ - kmap.flags ^= LKFLAG_UNICODE_MODE; + kmap.flags ^= LK_FLAG_UNICODE_MODE; } else if (options & OPT_U && kd_mode != KD_GRAPHICS) { fprintf(stderr, diff --git a/tests/libkeymap-dumpkeys.c b/tests/libkeymap-dumpkeys.c index f0d490e..3adb8c7 100644 --- a/tests/libkeymap-dumpkeys.c +++ b/tests/libkeymap-dumpkeys.c @@ -22,7 +22,7 @@ int main(int argc, char **argv) numeric = (!strcasecmp(argv[3], "TRUE")) ? 1 : 0; lk_init(&kmap); - kmap.flags |= LKFLAG_PREFER_UNICODE; + kmap.flags |= LK_FLAG_PREFER_UNICODE; f.pipe = 0; strcpy(f.pathname, argv[1]); -- 2.7.4