Krolyxon
Commit 421f012

Branches

Refs →

nsxiv421f012

Renamed application modes

Author
Bert
Date
2011-08-19 13:09 +0200
Parent
1c68a34
Commit
421f01202238ad56c5b2edc2e1b26194482b614f

+36 −36

3 files changed

Browse files Patch
−Context 3+
  1. M events.c +31 −31
  2. M main.c +3 −3
  3. M types.h +2 −2
M events.c View
@@ -59,7 +59,7 @@ int timo_cursor;
5959 int timo_redraw;
6060
6161 void redraw() {
62− if (mode == MODE_NORMAL) {
62+ if (mode == MODE_IMAGE) {
6363 img_render(&img, &win);
6464 if (timo_cursor)
6565 win_set_cursor(&win, CURSOR_ARROW);
@@ -106,7 +106,7 @@ void on_buttonpress(XButtonEvent *bev) {
106106 if (!bev)
107107 return;
108108
109− if (mode == MODE_NORMAL) {
109+ if (mode == MODE_IMAGE) {
110110 win_set_cursor(&win, CURSOR_ARROW);
111111 timo_cursor = TO_CURSOR_HIDE;
112112
@@ -126,7 +126,7 @@ void on_buttonpress(XButtonEvent *bev) {
126126 if ((sel = tns_translate(&tns, bev->x, bev->y)) >= 0) {
127127 if (sel == tns.sel) {
128128 load_image(tns.sel);
129− mode = MODE_NORMAL;
129+ mode = MODE_IMAGE;
130130 timo_cursor = TO_CURSOR_HIDE;
131131 } else {
132132 tns_highlight(&tns, &win, tns.sel, False);
@@ -152,12 +152,12 @@ void run() {
152152 struct timeval tt, t0, t1;
153153 XEvent ev;
154154
155− timo_cursor = mode == MODE_NORMAL ? TO_CURSOR_HIDE : 0;
155+ timo_cursor = mode == MODE_IMAGE ? TO_CURSOR_HIDE : 0;
156156
157157 redraw();
158158
159159 while (1) {
160− if (mode == MODE_THUMBS && tns.cnt < filecnt) {
160+ if (mode == MODE_THUMB && tns.cnt < filecnt) {
161161 /* load thumbnails */
162162 win_set_cursor(&win, CURSOR_WATCH);
163163 gettimeofday(&t0, 0);
@@ -221,7 +221,7 @@ void run() {
221221 case ConfigureNotify:
222222 if (win_configure(&win, &ev.xconfigure)) {
223223 timo_redraw = TO_WIN_RESIZE;
224− if (mode == MODE_NORMAL)
224+ if (mode == MODE_IMAGE)
225225 img.checkpan = 1;
226226 else
227227 tns.dirty = 1;
@@ -249,7 +249,7 @@ int it_quit(arg_t a) {
249249 }
250250
251251 int it_switch_mode(arg_t a) {
252− if (mode == MODE_NORMAL) {
252+ if (mode == MODE_IMAGE) {
253253 if (!tns.thumbs)
254254 tns_init(&tns, filecnt);
255255 img_close(&img, 0);
@@ -257,18 +257,18 @@ int it_switch_mode(arg_t a) {
257257 timo_cursor = 0;
258258 tns.sel = fileidx;
259259 tns.dirty = 1;
260− mode = MODE_THUMBS;
260+ mode = MODE_THUMB;
261261 } else {
262262 timo_cursor = TO_CURSOR_HIDE;
263263 load_image(tns.sel);
264− mode = MODE_NORMAL;
264+ mode = MODE_IMAGE;
265265 }
266266 return 1;
267267 }
268268
269269 int it_toggle_fullscreen(arg_t a) {
270270 win_toggle_fullscreen(&win);
271− if (mode == MODE_NORMAL)
271+ if (mode == MODE_IMAGE)
272272 img.checkpan = 1;
273273 else
274274 tns.dirty = 1;
@@ -277,7 +277,7 @@ int it_toggle_fullscreen(arg_t a) {
277277 }
278278
279279 int it_reload_image(arg_t a) {
280− if (mode == MODE_NORMAL) {
280+ if (mode == MODE_IMAGE) {
281281 load_image(fileidx);
282282 } else if (!tns_load(&tns, tns.sel, &files[tns.sel], 0)) {
283283 remove_file(tns.sel, 0);
@@ -289,7 +289,7 @@ int it_reload_image(arg_t a) {
289289 }
290290
291291 int it_remove_image(arg_t a) {
292− if (mode == MODE_NORMAL) {
292+ if (mode == MODE_IMAGE) {
293293 remove_file(fileidx, 1);
294294 load_image(fileidx >= filecnt ? filecnt - 1 : fileidx);
295295 return 1;
@@ -307,7 +307,7 @@ int it_remove_image(arg_t a) {
307307 int i_navigate(arg_t a) {
308308 int n = (int) a;
309309
310− if (mode == MODE_NORMAL) {
310+ if (mode == MODE_IMAGE) {
311311 n += fileidx;
312312 if (n < 0)
313313 n = 0;
@@ -323,10 +323,10 @@ int i_navigate(arg_t a) {
323323 }
324324
325325 int it_first(arg_t a) {
326− if (mode == MODE_NORMAL && fileidx != 0) {
326+ if (mode == MODE_IMAGE && fileidx != 0) {
327327 load_image(0);
328328 return 1;
329− } else if (mode == MODE_THUMBS && tns.sel != 0) {
329+ } else if (mode == MODE_THUMB && tns.sel != 0) {
330330 tns.sel = 0;
331331 tns.dirty = 1;
332332 return 1;
@@ -336,10 +336,10 @@ int it_first(arg_t a) {
336336 }
337337
338338 int it_last(arg_t a) {
339− if (mode == MODE_NORMAL && fileidx != filecnt - 1) {
339+ if (mode == MODE_IMAGE && fileidx != filecnt - 1) {
340340 load_image(filecnt - 1);
341341 return 1;
342− } else if (mode == MODE_THUMBS && tns.sel != tns.cnt - 1) {
342+ } else if (mode == MODE_THUMB && tns.sel != tns.cnt - 1) {
343343 tns.sel = tns.cnt - 1;
344344 tns.dirty = 1;
345345 return 1;
@@ -351,7 +351,7 @@ int it_last(arg_t a) {
351351 int it_move(arg_t a) {
352352 direction_t dir = (direction_t) a;
353353
354− if (mode == MODE_NORMAL)
354+ if (mode == MODE_IMAGE)
355355 return img_pan(&img, &win, dir, 0);
356356 else
357357 return tns_move_selection(&tns, &win, dir);
@@ -360,7 +360,7 @@ int it_move(arg_t a) {
360360 int i_pan_screen(arg_t a) {
361361 direction_t dir = (direction_t) a;
362362
363− if (mode == MODE_NORMAL)
363+ if (mode == MODE_IMAGE)
364364 return img_pan(&img, &win, dir, 1);
365365 else
366366 return 0;
@@ -369,7 +369,7 @@ int i_pan_screen(arg_t a) {
369369 int i_pan_edge(arg_t a) {
370370 direction_t dir = (direction_t) a;
371371
372− if (mode == MODE_NORMAL)
372+ if (mode == MODE_IMAGE)
373373 return img_pan_edge(&img, &win, dir);
374374 else
375375 return 0;
@@ -387,7 +387,7 @@ int i_drag(arg_t a) {
387387 XEvent e;
388388 Window w;
389389
390− if (mode != MODE_NORMAL)
390+ if (mode != MODE_IMAGE)
391391 return 0;
392392 if (!XQueryPointer(win.env.dpy, win.xwin, &w, &w, &i, &i, &ox, &oy, &ui))
393393 return 0;
@@ -433,7 +433,7 @@ int i_drag(arg_t a) {
433433 int i_zoom(arg_t a) {
434434 int scale = (int) a;
435435
436− if (mode != MODE_NORMAL)
436+ if (mode != MODE_IMAGE)
437437 return 0;
438438 if (scale > 0)
439439 return img_zoom_in(&img, &win);
@@ -446,7 +446,7 @@ int i_zoom(arg_t a) {
446446 int i_fit_to_win(arg_t a) {
447447 int ret;
448448
449− if (mode == MODE_NORMAL) {
449+ if (mode == MODE_IMAGE) {
450450 if ((ret = img_fit_win(&img, &win)))
451451 img_center(&img, &win);
452452 return ret;
@@ -459,7 +459,7 @@ int i_fit_to_img(arg_t a) {
459459 int ret, x, y;
460460 unsigned int w, h;
461461
462− if (mode == MODE_NORMAL) {
462+ if (mode == MODE_IMAGE) {
463463 x = MAX(0, win.x + img.x);
464464 y = MAX(0, win.y + img.y);
465465 w = img.w * img.zoom;
@@ -477,7 +477,7 @@ int i_fit_to_img(arg_t a) {
477477 int i_rotate(arg_t a) {
478478 direction_t dir = (direction_t) a;
479479
480− if (mode == MODE_NORMAL) {
480+ if (mode == MODE_IMAGE) {
481481 if (dir == DIR_LEFT) {
482482 img_rotate_left(&img, &win);
483483 return 1;
@@ -490,7 +490,7 @@ int i_rotate(arg_t a) {
490490 }
491491
492492 int i_toggle_antialias(arg_t a) {
493− if (mode == MODE_NORMAL) {
493+ if (mode == MODE_IMAGE) {
494494 img_toggle_antialias(&img);
495495 return 1;
496496 } else {
@@ -499,7 +499,7 @@ int i_toggle_antialias(arg_t a) {
499499 }
500500
501501 int i_toggle_alpha(arg_t a) {
502− if (mode == MODE_NORMAL) {
502+ if (mode == MODE_IMAGE) {
503503 img.alpha ^= 1;
504504 return 1;
505505 } else {
@@ -516,7 +516,7 @@ int it_open_with(arg_t a) {
516516
517517 if((pid = fork()) == 0) {
518518 execlp(prog, prog,
519− files[mode == MODE_NORMAL ? fileidx : tns.sel].path, NULL);
519+ files[mode == MODE_IMAGE ? fileidx : tns.sel].path, NULL);
520520 warn("could not exec: %s", prog);
521521 exit(1);
522522 } else if (pid < 0) {
@@ -543,7 +543,7 @@ int it_shell_cmd(arg_t a) {
543543 fpcnt++;
544544 if (!fpcnt)
545545 return 0;
546− fpath = files[mode == MODE_NORMAL ? fileidx : tns.sel].path;
546+ fpath = files[mode == MODE_IMAGE ? fileidx : tns.sel].path;
547547 fplen = strlen(fpath);
548548 cn = cmdline = (char*) s_malloc((strlen(cline) + fpcnt * (fplen + 2)) *
549549 sizeof(char));
@@ -576,7 +576,7 @@ int it_shell_cmd(arg_t a) {
576576 warn("child exited with non-zero return value: %d. command line was: %s",
577577 WEXITSTATUS(status), cmdline);
578578
579− if (mode == MODE_NORMAL) {
579+ if (mode == MODE_IMAGE) {
580580 if (fileidx < tns.cnt)
581581 tns_load(&tns, fileidx, &files[fileidx], 1);
582582 img_close(&img, 1);
@@ -591,7 +591,7 @@ int it_shell_cmd(arg_t a) {
591591 }
592592
593593 end:
594− if (mode == MODE_THUMBS)
594+ if (mode == MODE_THUMB)
595595 win_set_cursor(&win, CURSOR_ARROW);
596596 /* else: cursor is reset in redraw() */
597597
M main.c View
@@ -137,7 +137,7 @@ void update_title() {
137137 float size;
138138 const char *unit;
139139
140− if (mode == MODE_THUMBS) {
140+ if (mode == MODE_THUMB) {
141141 n = snprintf(win_title, TITLE_LEN, "sxiv: [%d/%d] %s",
142142 tns.cnt ? tns.sel + 1 : 0, tns.cnt,
143143 tns.cnt ? files[tns.sel].name : "");
@@ -238,13 +238,13 @@ int main(int argc, char **argv) {
238238 img_init(&img, &win);
239239
240240 if (options->thumbnails) {
241− mode = MODE_THUMBS;
241+ mode = MODE_THUMB;
242242 tns_init(&tns, filecnt);
243243 while (!tns_load(&tns, 0, &files[0], 0))
244244 remove_file(0, 0);
245245 tns.cnt = 1;
246246 } else {
247− mode = MODE_NORMAL;
247+ mode = MODE_IMAGE;
248248 tns.thumbs = NULL;
249249 load_image(fileidx);
250250 }
M types.h View
@@ -2,8 +2,8 @@
22 #define TYPES_H
33
44 typedef enum {
5− MODE_NORMAL,
6− MODE_THUMBS
5+ MODE_IMAGE,
6+ MODE_THUMB
77 } appmode_t;
88
99 typedef enum {