fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce starts_with() and starts_with_ci()

Browse Source 
Create user-defined functions to check whether a string contains a
certain prefix instead of messing around with strncmp() and
strncasecmp().

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2015-02-24 11:13:38 +01:00
parent f91208c2f4
commit 52779d2ec6
4 changed files with 72 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/keys.c
View File

@@ -275,48 +275,36 @@ void keys_remove_binding(int key, enum key action)
int keys_str2int(const char *key)
{
const char CONTROL_KEY[] = "C-";
const char TAB_KEY[] = "TAB";
const char SPACE_KEY[] = "SPC";
const char ESCAPE_KEY[] = "ESC";
const char CURSES_KEY_UP[] = "UP";
const char CURSES_KEY_DOWN[] = "DWN";
const char CURSES_KEY_LEFT[] = "LFT";
const char CURSES_KEY_RIGHT[] = "RGT";
const char CURSES_KEY_HOME[] = "KEY_HOME";
const char CURSES_KEY_END[] = "KEY_END";
if (!key)
return -1;
if (strlen(key) == 1) {
if (strlen(key) == 1)
return (int)key[0];
} else {
if (key[0] == '^')
return CTRL((int)key[1]);
else if (!strncmp
(key, CONTROL_KEY, sizeof(CONTROL_KEY) - 1))
return CTRL((int)key[sizeof(CONTROL_KEY) - 1]);
else if (!strcmp(key, TAB_KEY))
return TAB;
else if (!strcmp(key, ESCAPE_KEY))
return ESCAPE;
else if (!strcmp(key, SPACE_KEY))
return SPACE;
else if (!strcmp(key, CURSES_KEY_UP))
return KEY_UP;
else if (!strcmp(key, CURSES_KEY_DOWN))
return KEY_DOWN;
else if (!strcmp(key, CURSES_KEY_LEFT))
return KEY_LEFT;
else if (!strcmp(key, CURSES_KEY_RIGHT))
return KEY_RIGHT;
else if (!strcmp(key, CURSES_KEY_HOME))
return KEY_HOME;
else if (!strcmp(key, CURSES_KEY_END))
return KEY_END;
else
return -1;
}
if (key[0] == '^')
return CTRL((int)key[1]);
else if (starts_with(key, "C-"))
return CTRL((int)key[strlen("C-")]);
else if (!strcmp(key, "TAB"))
return TAB;
else if (!strcmp(key, "ESC"))
return ESCAPE;
else if (!strcmp(key, "SPC"))
return SPACE;
else if (!strcmp(key, "UP"))
return KEY_UP;
else if (!strcmp(key, "DWN"))
return KEY_DOWN;
else if (!strcmp(key, "LFT"))
return KEY_LEFT;
else if (!strcmp(key, "RGT"))
return KEY_RIGHT;
else if (!strcmp(key, "KEY_HOME"))
return KEY_HOME;
else if (!strcmp(key, "KEY_END"))
return KEY_END;
return -1;
}
const char *keys_int2str(int key)