sam
/
nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small refactorings

This commit is contained in:
Bert 2011-08-18 12:05:38 +02:00
parent 5c77e1aa22
commit 27591b5a52
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
events.c
View File

@ -92,7 +92,7 @@ void on_keypress(XKeyEvent *kev) {
XLookupString(kev, &key, 1, &ksym, NULL);
for (i = 0; i < LEN(keys); i++) {
if (keymask(&keys[i], kev->state) && ksym == keys[i].ksym) {
if (keys[i].ksym == ksym && keymask(&keys[i], kev->state)) {
if (keys[i].handler && keys[i].handler(keys[i].arg))
redraw();
return;
@ -111,8 +111,8 @@ void on_buttonpress(XButtonEvent *bev) {
timo_cursor = TO_CURSOR_HIDE;
for (i = 0; i < LEN(buttons); i++) {
if (buttonmask(&buttons[i], bev->state) &&
bev->button == buttons[i].button)
if (buttons[i].button == bev->button &&
buttonmask(&buttons[i], bev->state))
{
if (buttons[i].handler && buttons[i].handler(buttons[i].arg))
redraw();

4
types.h
View File

@ -27,8 +27,8 @@ typedef enum {
} cursor_t;
typedef struct {
const char *name;
const char *path;
const char *name; /* as given by user */
const char *path; /* always absolute */
} fileinfo_t;
#endif /* TYPES_H */