nsxiv89ec183
Added app-mode
+24 −14
1 file changed
- M main.c +24 −14
| @@ -32,11 +32,17 @@ | |||
| 32 | 32 | #include "util.h" | |
| 33 | 33 | #include "window.h" | |
| 34 | 34 | ||
| 35 | + | typedef enum appmode_e { | |
| 36 | + | MODE_NORMAL = 0, | |
| 37 | + | MODE_THUMBS | |
| 38 | + | } appmode_t; | |
| 39 | + | ||
| 35 | 40 | void update_title(); | |
| 36 | 41 | int check_append(const char*); | |
| 37 | 42 | void read_dir_rec(const char*); | |
| 38 | 43 | void run(); | |
| 39 | 44 | ||
| 45 | + | appmode_t mode; | |
| 40 | 46 | img_t img; | |
| 41 | 47 | win_t win; | |
| 42 | 48 | ||
| @@ -129,12 +135,16 @@ int main(int argc, char **argv) { | |||
| 129 | 135 | } | |
| 130 | 136 | } | |
| 131 | 137 | ||
| 132 | − | load_image(); | |
| 133 | − | img_render(&img, &win); | |
| 134 | − | update_title(); | |
| 138 | + | if (options->thumbnails == 2) { | |
| 139 | + | mode = MODE_THUMBS; | |
| 140 | + | } else { | |
| 141 | + | mode = MODE_NORMAL; | |
| 142 | + | load_image(); | |
| 143 | + | img_render(&img, &win); | |
| 144 | + | } | |
| 135 | 145 | ||
| 146 | + | update_title(); | |
| 136 | 147 | run(); | |
| 137 | − | ||
| 138 | 148 | cleanup(); | |
| 139 | 149 | ||
| 140 | 150 | return 0; | |
| @@ -243,6 +253,12 @@ void read_dir_rec(const char *dirname) { | |||
| 243 | 253 | unsigned char timeout; | |
| 244 | 254 | int mox, moy; | |
| 245 | 255 | ||
| 256 | + | void redraw() { | |
| 257 | + | img_render(&img, &win); | |
| 258 | + | update_title(); | |
| 259 | + | timeout = 0; | |
| 260 | + | } | |
| 261 | + | ||
| 246 | 262 | void on_keypress(XKeyEvent *kev) { | |
| 247 | 263 | int x, y; | |
| 248 | 264 | unsigned int w, h; | |
| @@ -374,11 +390,8 @@ void on_keypress(XKeyEvent *kev) { | |||
| 374 | 390 | break; | |
| 375 | 391 | } | |
| 376 | 392 | ||
| 377 | − | if (changed) { | |
| 378 | − | img_render(&img, &win); | |
| 379 | − | update_title(); | |
| 380 | − | timeout = 0; | |
| 381 | − | } | |
| 393 | + | if (changed) | |
| 394 | + | redraw(); | |
| 382 | 395 | } | |
| 383 | 396 | ||
| 384 | 397 | void on_buttonpress(XButtonEvent *bev) { | |
| @@ -433,11 +446,8 @@ void on_buttonpress(XButtonEvent *bev) { | |||
| 433 | 446 | break; | |
| 434 | 447 | } | |
| 435 | 448 | ||
| 436 | − | if (changed) { | |
| 437 | − | img_render(&img, &win); | |
| 438 | − | update_title(); | |
| 439 | − | timeout = 0; | |
| 440 | − | } | |
| 449 | + | if (changed) | |
| 450 | + | redraw(); | |
| 441 | 451 | } | |
| 442 | 452 | ||
| 443 | 453 | void on_motionnotify(XMotionEvent *mev) { | |