=== modified file 'man/termkey_strfkey.3' --- man/termkey_strfkey.3 2013-08-26 00:32:35 +0000 +++ man/termkey_strfkey.3 2013-08-26 00:14:35 +0000 @@ -31,10 +31,7 @@ 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_LOWERSPACE -Use lowercase for the key name instead of camelCase (for example "\f(CWpage down\fP" instead of "\f(CWPageDown\fP"). +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". === modified file 't/11strfkey.c' --- t/11strfkey.c 2013-08-26 00:32:35 +0000 +++ t/11strfkey.c 2013-08-26 00:14:35 +0000 @@ -8,7 +8,7 @@ char buffer[16]; size_t len; - plan_tests(40); + plan_tests(36); tk = termkey_new_abstract("vt100", 0); @@ -102,10 +102,6 @@ is_int(len, 6, "length for sym/PageUp/0"); is_str(buffer, "PageUp", "buffer for sym/PageUp/0"); - len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_LOWERSPACE); - is_int(len, 7, "length for sym/PageUp/0 lowerspace"); - is_str(buffer, "page up", "buffer for sym/PageUp/0 lowerspace"); - key.type = TERMKEY_TYPE_FUNCTION; key.code.number = 5; key.modifiers = 0; @@ -118,10 +114,6 @@ is_int(len, 4, "length for func/5/0 wrapbracket"); is_str(buffer, "", "buffer for func/5/0 wrapbracket"); - len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_LOWERSPACE); - is_int(len, 2, "length for func/5/0 lowerspace"); - is_str(buffer, "f5", "buffer for func/5/0 lowerspace"); - termkey_destroy(tk); return exit_status(); === modified file 'termkey.c' --- termkey.c 2013-08-26 00:32:35 +0000 +++ termkey.c 2013-08-26 00:14:35 +0000 @@ -1,7 +1,6 @@ #include "termkey.h" #include "termkey-internal.h" -#include #include #include #include @@ -1171,29 +1170,6 @@ return termkey_strfkey(tk, buffer, len, key, format); } -/* Similar to snprintf(str, size, "%s", src) except it turns CamelCase into - * space separated values - */ -static int snprint_cameltospaces(char *str, size_t size, const char *src) -{ - int prev_lower = 0; - size_t l = 0; - while(*src && l < size) { - if(isupper(*src) && prev_lower) { - if(str) - str[l++] = ' '; - if(l >= size) - return -1; - } - prev_lower = islower(*src); - str[l++] = tolower(*src++); - } - if(l >= size) - return -1; - str[l] = 0; - return l; -} - static struct modnames { const char *shift, *alt, *ctrl; } @@ -1274,17 +1250,10 @@ l = snprintf(buffer + pos, len - pos, "%s", key->utf8); break; case TERMKEY_TYPE_KEYSYM: - { - const char *name = termkey_get_keyname(tk, key->code.sym); - if(format & TERMKEY_FORMAT_LOWERSPACE) - l = snprint_cameltospaces(buffer + pos, len - pos, name); - else - l = snprintf(buffer + pos, len - pos, "%s", name); - } + l = snprintf(buffer + pos, len - pos, "%s", termkey_get_keyname(tk, key->code.sym)); break; case TERMKEY_TYPE_FUNCTION: - l = snprintf(buffer + pos, len - pos, "%c%d", - (format & TERMKEY_FORMAT_LOWERSPACE ? 'f' : 'F'), key->code.number); + l = snprintf(buffer + pos, len - pos, "F%d", key->code.number); break; case TERMKEY_TYPE_MOUSE: { === modified file 'termkey.h.in' --- termkey.h.in 2013-08-26 00:32:35 +0000 +++ termkey.h.in 2013-08-26 00:14:35 +0000 @@ -217,7 +217,6 @@ 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_LOWERSPACE = 1 << 6, /* page down instead of PageDown */ TERMKEY_FORMAT_MOUSE_POS = 1 << 8 /* Include mouse position if relevant; @ col,line */ } TermKeyFormat;