ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: condense three asserts into a single one 

Also, when a key string does not denote a Ctrl nor Meta nor Function key,
there is no point in assigning a keycode, because plain characters cannot
be used as a function shortcut.
master
Benno Schulenberg 2016-07-25 09:33:43 +02:00
parent 1c9ab8bf16
commit 1c528db8da
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/global.c
View File

@ -404,19 +404,16 @@ void assign_keyinfo(sc *s, const char *keystring)
s->keystr = (char *)keystring; s->keystr = (char *)keystring;
s->meta = (keystring[0] == 'M'); s->meta = (keystring[0] == 'M');
if (s->keystr[0] == '^') { assert(strlen(keystring) > 1 && (!s->meta || strlen(keystring) > 2));
assert(strlen(s->keystr) > 1);
s->keycode = s->keystr[1] - 64;
} else if (s->meta) {
assert(strlen(s->keystr) > 2);
s->keycode = tolower((int) s->keystr[2]);
} else if (s->keystr[0] == 'F') {
assert(strlen(s->keystr) > 1);
s->keycode = KEY_F0 + atoi(&s->keystr[1]);
} else /* RAWINPUT */
s->keycode = (int) s->keystr[0];
/* Override some keys which don't bind as easily as we'd like. */ if (keystring[0] == '^')
s->keycode = s->keystr[1] - 64;
else if (s->meta)
s->keycode = tolower((int) s->keystr[2]);
else if (keystring[0] == 'F')
s->keycode = KEY_F0 + atoi(&s->keystr[1]);
/* Catch the strings that don't bind as easily as we'd like. */
if (strcasecmp(s->keystr, "^Space") == 0) if (strcasecmp(s->keystr, "^Space") == 0)
s->keycode = 0; s->keycode = 0;
else if (strcasecmp(s->keystr, "M-Space") == 0) else if (strcasecmp(s->keystr, "M-Space") == 0)