=== modified file 'man/termkey_strfkey.3' --- man/termkey_strfkey.3 2013-08-26 00:14:35 +0000 +++ man/termkey_strfkey.3 2013-08-25 23:56:07 +0000 @@ -30,9 +30,6 @@ .B TERMKEY_FORMAT_SPACEMOD Use spaces instead of hyphens to separate the modifier name(s) from the base key name. .TP -.B TERMKEY_FORMAT_LOWERMOD -Use lowercase for the modifier name -.TP .B TERMKEY_FORMAT_MOUSE_POS If the event is a mouse event, include the position rendered as "\f(CW@ (col,line)\fP". .PP === modified file 'man/termkey_strpkey.3' --- man/termkey_strpkey.3 2013-08-26 00:14:35 +0000 +++ man/termkey_strpkey.3 2013-08-25 23:56:07 +0000 @@ -26,9 +26,6 @@ .TP .B TERMKEY_FORMAT_SPACEMOD Expect spaces instead of hyphens to separate the modifer name(s) from the base key name. -.TP -.B TERMKEY_FORMAT_LOWERMOD -Expect lowercase for the modifier name .PP Before returning, this function canonicalises the \fIkey\fP structure according to the rules given for \fBtermkey_canonicalise\fP(3). .PP === modified file 't/11strfkey.c' --- t/11strfkey.c 2013-08-26 00:14:35 +0000 +++ t/11strfkey.c 2013-08-25 23:56:07 +0000 @@ -8,7 +8,7 @@ char buffer[16]; size_t len; - plan_tests(36); + plan_tests(32); tk = termkey_new_abstract("vt100", 0); @@ -43,16 +43,6 @@ is_int(len, 6, "length for unicode/b/CTRL longmod|spacemod"); is_str(buffer, "Ctrl b", "buffer for unicode/b/CTRL longmod|spacemod"); - len = termkey_strfkey(tk, buffer, sizeof buffer, &key, - TERMKEY_FORMAT_LONGMOD|TERMKEY_FORMAT_LOWERMOD); - is_int(len, 6, "length for unicode/b/CTRL longmod|lowermod"); - is_str(buffer, "ctrl-b", "buffer for unicode/b/CTRL longmod|lowermod"); - - len = termkey_strfkey(tk, buffer, sizeof buffer, &key, - TERMKEY_FORMAT_LONGMOD|TERMKEY_FORMAT_SPACEMOD|TERMKEY_FORMAT_LOWERMOD); - is_int(len, 6, "length for unicode/b/CTRL longmod|spacemod|lowermode"); - is_str(buffer, "ctrl b", "buffer for unicode/b/CTRL longmod|spacemod|lowermode"); - len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_CARETCTRL); is_int(len, 2, "length for unicode/b/CTRL caretctrl"); is_str(buffer, "^B", "buffer for unicode/b/CTRL caretctrl"); === modified file 't/12strpkey.c' --- t/12strpkey.c 2013-08-26 00:14:35 +0000 +++ t/12strpkey.c 2013-08-25 23:56:07 +0000 @@ -86,12 +86,12 @@ is_str(endp, "", "consumed entire input for unicode/c/ALT altismeta+longmod"); CLEAR_KEY; - endp = termkey_strpkey(tk, "meta c", &key, TERMKEY_FORMAT_ALTISMETA|TERMKEY_FORMAT_LONGMOD|TERMKEY_FORMAT_SPACEMOD|TERMKEY_FORMAT_LOWERMOD); - is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT altismeta+long/space+lowermod"); - is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT altismeta+long/space+lowermod"); - is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT altismeta+long/space+lowermod"); - is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT altismeta+long/space_lowermod"); - is_str(endp, "", "consumed entire input for unicode/c/ALT altismeta+long/space+lowermod"); + endp = termkey_strpkey(tk, "Meta c", &key, TERMKEY_FORMAT_ALTISMETA|TERMKEY_FORMAT_LONGMOD|TERMKEY_FORMAT_SPACEMOD); + is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT altismeta+long/lowermod"); + is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT altismeta+long/lowermod"); + is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT altismeta+long/lowermod"); + is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT altismeta+long/lowermod"); + is_str(endp, "", "consumed entire input for unicode/c/ALT altismeta+longmod"); CLEAR_KEY; endp = termkey_strpkey(tk, "Up", &key, 0); === modified file 'termkey.c' --- termkey.c 2013-08-26 00:14:35 +0000 +++ termkey.c 2013-08-25 23:56:07 +0000 @@ -1178,10 +1178,6 @@ { "Shift", "Alt", "Ctrl" }, // LONGMOD { "S", "M", "C" }, // ALTISMETA { "Shift", "Meta", "Ctrl" }, // ALTISMETA+LONGMOD - { "s", "a", "c" }, // LOWERMOD - { "shift", "alt", "ctrl" }, // LOWERMOD+LONGMOD - { "s", "m", "c" }, // LOWERMOD+ALTISMETA - { "shift", "meta", "ctrl" }, // LOWERMOD+ALTISMETA+LONGMOD }; size_t termkey_strfkey(TermKey *tk, char *buffer, size_t len, TermKeyKey *key, TermKeyFormat format) @@ -1190,8 +1186,7 @@ size_t l = 0; struct modnames *mods = &modnames[!!(format & TERMKEY_FORMAT_LONGMOD) + - !!(format & TERMKEY_FORMAT_ALTISMETA) * 2 + - !!(format & TERMKEY_FORMAT_LOWERMOD) * 4]; + !!(format & TERMKEY_FORMAT_ALTISMETA) * 2]; int wrapbracket = (format & TERMKEY_FORMAT_WRAPBRACKET) && (key->type != TERMKEY_TYPE_UNICODE || key->modifiers != 0); @@ -1307,8 +1302,7 @@ const char *termkey_strpkey(TermKey *tk, const char *str, TermKeyKey *key, TermKeyFormat format) { struct modnames *mods = &modnames[!!(format & TERMKEY_FORMAT_LONGMOD) + - !!(format & TERMKEY_FORMAT_ALTISMETA) * 2 + - !!(format & TERMKEY_FORMAT_LOWERMOD) * 4]; + !!(format & TERMKEY_FORMAT_ALTISMETA) * 2]; key->modifiers = 0; === modified file 'termkey.h.in' --- termkey.h.in 2013-08-26 00:14:35 +0000 +++ termkey.h.in 2013-08-25 23:56:07 +0000 @@ -216,7 +216,6 @@ TERMKEY_FORMAT_ALTISMETA = 1 << 2, /* Meta- or M- instead of Alt- or A- */ TERMKEY_FORMAT_WRAPBRACKET = 1 << 3, /* Wrap special keys in brackets like */ TERMKEY_FORMAT_SPACEMOD = 1 << 4, /* M Foo instead of M-Foo */ - TERMKEY_FORMAT_LOWERMOD = 1 << 5, /* meta or m instead of Meta or M */ TERMKEY_FORMAT_MOUSE_POS = 1 << 8 /* Include mouse position if relevant; @ col,line */ } TermKeyFormat;