Commit ac3794c5 authored by Ulrich Sibiller's avatar Ulrich Sibiller

Keystroke.c: reorder parse_keystroke_file

for better readability
parent 06c83be7
...@@ -387,21 +387,19 @@ static void parse_keystroke_file(void) ...@@ -387,21 +387,19 @@ static void parse_keystroke_file(void)
static enum nxagentSpecialKeystroke find_keystroke(XKeyEvent *X) static enum nxagentSpecialKeystroke find_keystroke(XKeyEvent *X)
{ {
enum nxagentSpecialKeystroke ret = KEYSTROKE_NOTHING;
int keysyms_per_keycode_return; int keysyms_per_keycode_return;
XlibKeySym *keysym = XGetKeyboardMapping(nxagentDisplay,
X->keycode,
1,
&keysyms_per_keycode_return);
struct nxagentSpecialKeystrokeMap *cur = map; struct nxagentSpecialKeystrokeMap *cur = map;
parse_keystroke_file(); parse_keystroke_file();
enum nxagentSpecialKeystroke ret = KEYSTROKE_NOTHING; XlibKeySym *keysym = XGetKeyboardMapping(nxagentDisplay,
X->keycode,
1,
&keysyms_per_keycode_return);
while (cur->stroke != KEYSTROKE_END_MARKER) { while (cur->stroke != KEYSTROKE_END_MARKER) {
if (cur->keysym == keysym[0] && modifier_matches(cur->modifierMask, cur->modifierAltMeta, X->state)) { if (cur->keysym == keysym[0] && modifier_matches(cur->modifierMask, cur->modifierAltMeta, X->state)) {
free(keysym); free(keysym);
return cur->stroke; return cur->stroke;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment