=== modified file 't/11strfkey.c' --- t/11strfkey.c 2011-04-01 09:48:15 +0000 +++ t/11strfkey.c 2011-04-01 09:41:44 +0000 @@ -8,7 +8,7 @@ char buffer[16]; size_t len; - plan_tests(28); + plan_tests(24); tk = termkey_new(0, TERMKEY_FLAG_NOTERMIOS); @@ -79,18 +79,6 @@ is_int(len, 4, "length for sym/Up/0 wrapbracket"); is_str(buffer, "", "buffer for sym/Up/0 wrapbracket"); - key.type = TERMKEY_TYPE_FUNCTION; - key.code.number = 5; - key.modifiers = 0; - - len = termkey_strfkey(tk, buffer, sizeof buffer, &key, 0); - is_int(len, 2, "length for func/5/0"); - is_str(buffer, "F5", "buffer for func/5/0"); - - len = termkey_strfkey(tk, buffer, sizeof buffer, &key, TERMKEY_FORMAT_WRAPBRACKET); - is_int(len, 4, "length for func/5/0 wrapbracket"); - is_str(buffer, "", "buffer for func/5/0 wrapbracket"); - termkey_destroy(tk); return exit_status(); === modified file 't/12strpkey.c' --- t/12strpkey.c 2011-04-01 09:48:15 +0000 +++ t/12strpkey.c 2011-04-01 09:41:44 +0000 @@ -9,7 +9,7 @@ #define CLEAR_KEY do { key.type = -1; key.code.codepoint = -1; key.modifiers = -1; key.utf8[0] = 0; } while(0) - plan_tests(48); + plan_tests(44); tk = termkey_new(0, TERMKEY_FLAG_NOTERMIOS); @@ -84,13 +84,6 @@ is_int(key.code.sym, TERMKEY_SYM_UP, "key.code.codepoint for sym/Up/0"); is_int(key.modifiers, 0, "key.modifiers for sym/Up/0"); - CLEAR_KEY; - res = termkey_strpkey(tk, "F5", &key, 0); - is_int(res, TERMKEY_RES_KEY, "result for func/5/0"); - is_int(key.type, TERMKEY_TYPE_FUNCTION, "key.type for func/5/0"); - is_int(key.code.number, 5, "key.code.number for func/5/0"); - is_int(key.modifiers, 0, "key.modifiers for func/5/0"); - termkey_destroy(tk); return exit_status(); === modified file 'termkey.c' --- termkey.c 2011-04-01 09:48:15 +0000 +++ termkey.c 2011-04-01 09:41:44 +0000 @@ -1122,10 +1122,7 @@ else if((key->code.sym = termkey_keyname2sym(tk, str)) != TERMKEY_SYM_UNKNOWN) { key->type = TERMKEY_TYPE_KEYSYM; } - else if(sscanf(str, "F%d", &key->code.number) == 1) { - key->type = TERMKEY_TYPE_FUNCTION; - } - // TODO: Consider mouse events? + // TODO: Consider function keys else { return TERMKEY_RES_NONE; }