nsxiv27591b5
Small refactorings
+5 −5
2 files changed
| @@ -92,7 +92,7 @@ void on_keypress(XKeyEvent *kev) { | |||
| 92 | 92 | XLookupString(kev, &key, 1, &ksym, NULL); | |
| 93 | 93 | ||
| 94 | 94 | for (i = 0; i < LEN(keys); i++) { | |
| 95 | − | if (keymask(&keys[i], kev->state) && ksym == keys[i].ksym) { | |
| 95 | + | if (keys[i].ksym == ksym && keymask(&keys[i], kev->state)) { | |
| 96 | 96 | if (keys[i].handler && keys[i].handler(keys[i].arg)) | |
| 97 | 97 | redraw(); | |
| 98 | 98 | return; | |
| @@ -111,8 +111,8 @@ void on_buttonpress(XButtonEvent *bev) { | |||
| 111 | 111 | timo_cursor = TO_CURSOR_HIDE; | |
| 112 | 112 | ||
| 113 | 113 | for (i = 0; i < LEN(buttons); i++) { | |
| 114 | − | if (buttonmask(&buttons[i], bev->state) && | |
| 115 | − | bev->button == buttons[i].button) | |
| 114 | + | if (buttons[i].button == bev->button && | |
| 115 | + | buttonmask(&buttons[i], bev->state)) | |
| 116 | 116 | { | |
| 117 | 117 | if (buttons[i].handler && buttons[i].handler(buttons[i].arg)) | |
| 118 | 118 | redraw(); | |
| @@ -27,8 +27,8 @@ typedef enum { | |||
| 27 | 27 | } cursor_t; | |
| 28 | 28 | ||
| 29 | 29 | typedef struct { | |
| 30 | − | const char *name; | |
| 31 | − | const char *path; | |
| 30 | + | const char *name; /* as given by user */ | |
| 31 | + | const char *path; /* always absolute */ | |
| 32 | 32 | } fileinfo_t; | |
| 33 | 33 | ||
| 34 | 34 | #endif /* TYPES_H */ | |