| @@ -40,15 +40,15 @@ |
| 40 | 40 | | #include <X11/XF86keysym.h> |
| 41 | 41 | | #include <X11/keysym.h> |
| 42 | 42 | | |
| 43 | | − | #define MODMASK(mask) ((mask) & USED_MODMASK) |
| 43 | + | #define MODMASK(mask) (USED_MODMASK & (mask)) |
| 44 | 44 | | #define BAR_SEP " " |
| 45 | 45 | | |
| 46 | 46 | | #define TV_DIFF(t1,t2) (((t1)->tv_sec - (t2)->tv_sec ) * 1000 + \ |
| 47 | 47 | | ((t1)->tv_usec - (t2)->tv_usec) / 1000) |
| 48 | | − | #define TV_ADD_MSEC(tv,t) { \ |
| 48 | + | #define TV_ADD_MSEC(tv,t) do { \ |
| 49 | 49 | | (tv)->tv_sec += (t) / 1000; \ |
| 50 | 50 | | (tv)->tv_usec += (t) % 1000 * 1000; \ |
| 51 | | − | } |
| 51 | + | } while (0) |
| 52 | 52 | | |
| 53 | 53 | | typedef struct { |
| 54 | 54 | | int err; |
| @@ -200,8 +200,8 @@ void remove_file(int n, bool manual) |
| 200 | 200 | | |
| 201 | 201 | | if (n + 1 < filecnt) { |
| 202 | 202 | | if (tns.thumbs != NULL) { |
| 203 | | − | memmove(tns.thumbs + n, tns.thumbs + n + 1, (filecnt - n - 1) * |
| 204 | | − | sizeof(*tns.thumbs)); |
| 203 | + | memmove(tns.thumbs + n, tns.thumbs + n + 1, |
| 204 | + | (filecnt - n - 1) * sizeof(*tns.thumbs)); |
| 205 | 205 | | memset(tns.thumbs + filecnt - 1, 0, sizeof(*tns.thumbs)); |
| 206 | 206 | | } |
| 207 | 207 | | memmove(files + n, files + n + 1, (filecnt - n - 1) * sizeof(*files)); |
| @@ -377,7 +377,7 @@ void load_image(int new) |
| 377 | 377 | | if (new >= filecnt) |
| 378 | 378 | | new = filecnt - 1; |
| 379 | 379 | | else if (new > 0 && prev) |
| 380 | | − | new--; |
| 380 | + | new -= 1; |
| 381 | 381 | | } |
| 382 | 382 | | files[new].flags &= ~FF_WARN; |
| 383 | 383 | | fileidx = current = new; |
| @@ -562,8 +562,9 @@ void handle_key_handler(bool init) |
| 562 | 562 | | return; |
| 563 | 563 | | if (init) { |
| 564 | 564 | | close_info(); |
| 565 | | − | snprintf(win.bar.l.buf, win.bar.l.size, "Getting key handler input " |
| 566 | | − | "(%s to abort)...", XKeysymToString(KEYHANDLER_ABORT)); |
| 565 | + | snprintf(win.bar.l.buf, win.bar.l.size, |
| 566 | + | "Getting key handler input (%s to abort)...", |
| 567 | + | XKeysymToString(KEYHANDLER_ABORT)); |
| 567 | 568 | | } else { /* abort */ |
| 568 | 569 | | open_info(); |
| 569 | 570 | | update_info(); |
| @@ -739,8 +740,8 @@ static void run(void) |
| 739 | 740 | | init_thumb = mode == MODE_THUMB && tns.initnext < filecnt; |
| 740 | 741 | | load_thumb = mode == MODE_THUMB && tns.loadnext < tns.end; |
| 741 | 742 | | |
| 742 | | − | if ((init_thumb || load_thumb || to_set || info.fd != -1 || |
| 743 | | − | arl.fd != -1) && XPending(win.env.dpy) == 0) |
| 743 | + | if ((init_thumb || load_thumb || to_set || info.fd != -1 || arl.fd != -1) && |
| 744 | + | XPending(win.env.dpy) == 0) |
| 744 | 745 | | { |
| 745 | 746 | | if (load_thumb) { |
| 746 | 747 | | set_timeout(redraw, TO_REDRAW_THUMBS, false); |
| @@ -793,8 +794,8 @@ static void run(void) |
| 793 | 794 | | discard = ev.type == nextev.type; |
| 794 | 795 | | break; |
| 795 | 796 | | case KeyPress: |
| 796 | | − | discard = (nextev.type == KeyPress || nextev.type == KeyRelease) |
| 797 | | − | && ev.xkey.keycode == nextev.xkey.keycode; |
| 797 | + | discard = (nextev.type == KeyPress || nextev.type == KeyRelease) && |
| 798 | + | ev.xkey.keycode == nextev.xkey.keycode; |
| 798 | 799 | | break; |
| 799 | 800 | | } |
| 800 | 801 | | } |