Added own bool type

1 files changed, 107 insertions, 109 deletions

diff --git a/commands.c b/commands.c
index 4c9553e..18080cd 100644
--- a/commands.c
+++ b/commands.c
@@ -26,17 +26,16 @@
 #include "commands.h"
 #include "image.h"
 #include "thumbs.h"
-#include "types.h"
 #include "util.h"
 
 void cleanup();
-void remove_file(int, unsigned char);
+void remove_file(int, bool);
 void load_image(int);
 void redraw();
 void reset_cursor();
 void animate();
 void slideshow();
-void set_timeout(timeout_f, int, int);
+void set_timeout(timeout_f, int, bool);
 void reset_timeout(timeout_f);
 
 extern appmode_t mode;
@@ -47,73 +46,73 @@ extern win_t win;
 extern fileinfo_t *files;
 extern int filecnt, fileidx;
 
-int it_quit(arg_t a) {
+bool it_quit(arg_t a) {
 	cleanup();
 	exit(0);
 }
 
-int it_switch_mode(arg_t a) {
+bool it_switch_mode(arg_t a) {
 	if (mode == MODE_IMAGE) {
 		if (!tns.thumbs)
 			tns_init(&tns, filecnt);
-		img_close(&img, 0);
+		img_close(&img, false);
 		reset_timeout(reset_cursor);
 		if (img.slideshow) {
-			img.slideshow = 0;
+			img.slideshow = false;
 			reset_timeout(slideshow);
 		}
 		tns.sel = fileidx;
-		tns.dirty = 1;
+		tns.dirty = true;
 		mode = MODE_THUMB;
 	} else {
 		load_image(tns.sel);
 		mode = MODE_IMAGE;
 	}
-	return 1;
+	return true;
 }
 
-int it_toggle_fullscreen(arg_t a) {
+bool it_toggle_fullscreen(arg_t a) {
 	win_toggle_fullscreen(&win);
-	set_timeout(redraw, TO_REDRAW_RESIZE, 0);
+	set_timeout(redraw, TO_REDRAW_RESIZE, false);
 	if (mode == MODE_IMAGE)
-		img.checkpan = 1;
+		img.checkpan = true;
 	else
-		tns.dirty = 1;
-	return 0;
+		tns.dirty = true;
+	return false;
 }
 
-int it_reload_image(arg_t a) {
+bool it_reload_image(arg_t a) {
 	if (mode == MODE_IMAGE) {
 		load_image(fileidx);
 	} else {
 		win_set_cursor(&win, CURSOR_WATCH);
-		if (!tns_load(&tns, tns.sel, &files[tns.sel], True, False)) {
-			remove_file(tns.sel, 0);
-			tns.dirty = 1;
+		if (!tns_load(&tns, tns.sel, &files[tns.sel], true, false)) {
+			remove_file(tns.sel, false);
+			tns.dirty = true;
 			if (tns.sel >= tns.cnt)
 				tns.sel = tns.cnt - 1;
 		}
 	}
-	return 1;
+	return true;
 }
 
-int it_remove_image(arg_t a) {
+bool it_remove_image(arg_t a) {
 	if (mode == MODE_IMAGE) {
-		remove_file(fileidx, 1);
+		remove_file(fileidx, true);
 		load_image(fileidx >= filecnt ? filecnt - 1 : fileidx);
-		return 1;
+		return true;
 	} else if (tns.sel < tns.cnt) {
-		remove_file(tns.sel, 1);
-		tns.dirty = 1;
+		remove_file(tns.sel, true);
+		tns.dirty = true;
 		if (tns.sel >= tns.cnt)
 			tns.sel = tns.cnt - 1;
-		return 1;
+		return true;
 	} else {
-		return 0;
+		return false;
 	}
 }
 
-int i_navigate(arg_t a) {
+bool i_navigate(arg_t a) {
 	long n = (long) a;
 
 	if (mode == MODE_IMAGE) {
@@ -125,86 +124,83 @@ int i_navigate(arg_t a) {
 
 		if (n != fileidx) {
 			load_image(n);
-			return 1;
+			return true;
 		}
 	}
-	return 0;
+	return false;
 }
 
-int it_first(arg_t a) {
+bool it_first(arg_t a) {
 	if (mode == MODE_IMAGE && fileidx != 0) {
 		load_image(0);
-		return 1;
+		return true;
 	} else if (mode == MODE_THUMB && tns.sel != 0) {
 		tns.sel = 0;
-		tns.dirty = 1;
-		return 1;
+		tns.dirty = true;
+		return true;
 	} else {
-		return 0;
+		return false;
 	}
 }
 
-int it_last(arg_t a) {
+bool it_last(arg_t a) {
 	if (mode == MODE_IMAGE && fileidx != filecnt - 1) {
 		load_image(filecnt - 1);
-		return 1;
+		return true;
 	} else if (mode == MODE_THUMB && tns.sel != tns.cnt - 1) {
 		tns.sel = tns.cnt - 1;
-		tns.dirty = 1;
-		return 1;
+		tns.dirty = true;
+		return true;
 	} else {
-		return 0;
+		return false;
 	}
 }
 
-int i_navigate_frame(arg_t a) {
+bool i_navigate_frame(arg_t a) {
 	if (mode == MODE_IMAGE && !img.multi.animate)
 		return img_frame_navigate(&img, (long) a);
 	else
-		return 0;
+		return false;
 }
 
-int i_toggle_animation(arg_t a) {
-	int delay;
-
+bool i_toggle_animation(arg_t a) {
 	if (mode != MODE_IMAGE)
-		return 0;
+		return false;
 
 	if (img.multi.animate) {
 		reset_timeout(animate);
-		img.multi.animate = 0;
-	} else {
-		delay = img_frame_animate(&img, 1);
-		set_timeout(animate, delay, 1);
+		img.multi.animate = false;
+	} else if (img_frame_animate(&img, true)) {
+		set_timeout(animate, img.multi.frames[img.multi.sel].delay, true);
 	}
-	return 1;
+	return true;
 }
 
-int it_move(arg_t a) {
+bool it_move(arg_t a) {
 	direction_t dir = (direction_t) a;
 
 	if (mode == MODE_IMAGE)
-		return img_pan(&img, &win, dir, 0);
+		return img_pan(&img, &win, dir, false);
 	else
 		return tns_move_selection(&tns, &win, dir);
 }
 
-int i_pan_screen(arg_t a) {
+bool i_pan_screen(arg_t a) {
 	direction_t dir = (direction_t) a;
 
 	if (mode == MODE_IMAGE)
-		return img_pan(&img, &win, dir, 1);
+		return img_pan(&img, &win, dir, true);
 	else
-		return 0;
+		return false;
 }
 
-int i_pan_edge(arg_t a) {
+bool i_pan_edge(arg_t a) {
 	direction_t dir = (direction_t) a;
 
 	if (mode == MODE_IMAGE)
 		return img_pan_edge(&img, &win, dir);
 	else
-		return 0;
+		return false;
 }
 
 /* Xlib helper function for i_drag() */
@@ -212,17 +208,17 @@ Bool is_motionnotify(Display *d, XEvent *e, XPointer a) {
 	return e != NULL && e->type == MotionNotify;
 }
 
-int i_drag(arg_t a) {
+bool i_drag(arg_t a) {
 	int dx = 0, dy = 0, i, ox, oy, x, y;
 	unsigned int ui;
-	Bool dragging = True, next = False;
+	bool dragging = true, next = false;
 	XEvent e;
 	Window w;
 
 	if (mode != MODE_IMAGE)
-		return 0;
+		return false;
 	if (!XQueryPointer(win.env.dpy, win.xwin, &w, &w, &i, &i, &ox, &oy, &ui))
-		return 0;
+		return false;
 	
 	win_set_cursor(&win, CURSOR_HAND);
 
@@ -233,7 +229,7 @@ int i_drag(arg_t a) {
 		switch (e.type) {
 			case ButtonPress:
 			case ButtonRelease:
-				dragging = False;
+				dragging = false;
 				break;
 			case MotionNotify:
 				x = e.xmotion.x;
@@ -256,17 +252,17 @@ int i_drag(arg_t a) {
 	}
 	
 	win_set_cursor(&win, CURSOR_ARROW);
-	set_timeout(reset_cursor, TO_CURSOR_HIDE, 1);
+	set_timeout(reset_cursor, TO_CURSOR_HIDE, true);
 	reset_timeout(redraw);
 
-	return 0;
+	return false;
 }
 
-int i_zoom(arg_t a) {
+bool i_zoom(arg_t a) {
 	long scale = (long) a;
 
 	if (mode != MODE_IMAGE)
-		return 0;
+		return false;
 
 	if (scale > 0)
 		return img_zoom_in(&img, &win);
@@ -276,21 +272,22 @@ int i_zoom(arg_t a) {
 		return img_zoom(&img, &win, 1.0);
 }
 
-int i_fit_to_win(arg_t a) {
-	int ret;
+bool i_fit_to_win(arg_t a) {
+	bool ret;
 
 	if (mode == MODE_IMAGE) {
 		if ((ret = img_fit_win(&img, &win)))
 			img_center(&img, &win);
 		return ret;
 	} else {
-		return 0;
+		return false;
 	}
 }
 
-int i_fit_to_img(arg_t a) {
-	int ret, x, y;
+bool i_fit_to_img(arg_t a) {
+	int x, y;
 	unsigned int w, h;
+	bool ret;
 
 	if (mode == MODE_IMAGE) {
 		x = MAX(0, win.x + img.x);
@@ -303,90 +300,91 @@ int i_fit_to_img(arg_t a) {
 		}
 		return ret;
 	} else {
-		return 0;
+		return false;
 	}
 }
 
-int i_rotate(arg_t a) {
+bool i_rotate(arg_t a) {
 	direction_t dir = (direction_t) a;
 
 	if (mode == MODE_IMAGE) {
 		if (dir == DIR_LEFT) {
 			img_rotate_left(&img, &win);
-			return 1;
+			return true;
 		} else if (dir == DIR_RIGHT) {
 			img_rotate_right(&img, &win);
-			return 1;
+			return true;
 		}
 	}
-	return 0;
+	return false;
 }
 
-int i_toggle_slideshow(arg_t a) {
+bool i_toggle_slideshow(arg_t a) {
 	if (mode == MODE_IMAGE) {
 		if (img.slideshow) {
-			img.slideshow = 0;
+			img.slideshow = false;
 			reset_timeout(slideshow);
-			return 1;
+			return true;
 		} else if (fileidx + 1 < filecnt) {
-			img.slideshow = 1;
-			set_timeout(slideshow, img.ss_delay, 1);
-			return 1;
+			img.slideshow = true;
+			set_timeout(slideshow, img.ss_delay, true);
+			return true;
 		}
 	}
-	return 0;
+	return false;
 }
 
-int i_adjust_slideshow(arg_t a) {
+bool i_adjust_slideshow(arg_t a) {
 	long d = (long) a;
 	int i, delays[] = { 1, 2, 3, 5, 10, 15, 20, 30, 60, 120, 180, 300, 600 };
 
 	if (mode != MODE_IMAGE || !img.slideshow)
-		return 0;
+		return false;
 
 	if (d < 0) {
 		for (i = ARRLEN(delays) - 2; i >= 0; i--) {
 			if (img.ss_delay > delays[i] * 1000) {
 				img.ss_delay = delays[i] * 1000;
-				return 1;
+				return true;
 			}
 		}
 	} else {
 		for (i = 1; i < ARRLEN(delays); i++) {
 			if (img.ss_delay < delays[i] * 1000) {
 				img.ss_delay = delays[i] * 1000;
-				return 1;
+				return true;
 			}
 		}
 	}
-	return 0;
+	return false;
 }
 
-int i_toggle_antialias(arg_t a) {
+bool i_toggle_antialias(arg_t a) {
 	if (mode == MODE_IMAGE) {
 		img_toggle_antialias(&img);
-		return 1;
+		return true;
 	} else {
-		return 0;
+		return false;
 	}
 }
 
-int it_toggle_alpha(arg_t a) {
-	img.alpha ^= 1;
-	tns.alpha = img.alpha;
-	if (mode == MODE_THUMB)
-		tns.dirty = 1;
-	return 1;
+bool it_toggle_alpha(arg_t a) {
+	img.alpha = tns.alpha = !img.alpha;
+	if (mode == MODE_IMAGE)
+		img.dirty = true;
+	else
+		tns.dirty = true;
+	return true;
 }
 
-int it_open_with(arg_t a) {
+bool it_open_with(arg_t a) {
 	const char *prog = (const char*) a;
 	pid_t pid;
 
 	if (!prog || !*prog)
-		return 0;
+		return false;
 
-	if((pid = fork()) == 0) {
+	if ((pid = fork()) == 0) {
 		execlp(prog, prog,
 		       files[mode == MODE_IMAGE ? fileidx : tns.sel].path, NULL);
 		warn("could not exec: %s", prog);
@@ -395,10 +393,10 @@ int it_open_with(arg_t a) {
 		warn("could not fork. program was: %s", prog);
 	}
 	
-	return 0;
+	return false;
 }
 
-int it_shell_cmd(arg_t a) {
+bool it_shell_cmd(arg_t a) {
 	int n, status;
 	const char *cmdline = (const char*) a;
 	pid_t pid;
@@ -411,7 +409,7 @@ int it_shell_cmd(arg_t a) {
 	if (setenv("SXIV_IMG", files[n].path, 1) < 0) {
 		warn("could not set env.-variable: SXIV_IMG. command line was: %s",
 		     cmdline);
-		return 0;
+		return false;
 	}
 
 	if ((pid = fork()) == 0) {
@@ -420,7 +418,7 @@ int it_shell_cmd(arg_t a) {
 		exit(1);
 	} else if (pid < 0) {
 		warn("could not fork. command line was: %s", cmdline);
-		return 0;
+		return false;
 	}
 
 	win_set_cursor(&win, CURSOR_WATCH);
@@ -431,17 +429,17 @@ int it_shell_cmd(arg_t a) {
 		     WEXITSTATUS(status), cmdline);
 	
 	if (mode == MODE_IMAGE) {
-		img_close(&img, 1);
+		img_close(&img, true);
 		load_image(fileidx);
 	}
-	if (!tns_load(&tns, n, &files[n], True, mode == MODE_IMAGE) &&
+	if (!tns_load(&tns, n, &files[n], true, mode == MODE_IMAGE) &&
 	    mode == MODE_THUMB)
 	{
-		remove_file(tns.sel, 0);
-		tns.dirty = 1;
+		remove_file(tns.sel, false);
+		tns.dirty = true;
 		if (tns.sel >= tns.cnt)
 			tns.sel = tns.cnt - 1;
 	}
 
-	return 1;
+	return true;
 }