From c6bfd9c44048aa9a437db919bdef61509501f22a Mon Sep 17 00:00:00 2001
From: John Hawthorn <jhawthor@uvic.ca>
Date: Thu, 22 May 2008 12:00:22 -0700
Subject: basic error handling

---
 src/main.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/main.c b/src/main.c
index 8ee8367..d2bc5cb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -152,6 +152,7 @@ void init(){
 
 void run(char *images[], int length){
 	int i = 0;
+	int direction = 0;
 	int bufwidth = 0, bufheight = 0;
 	int xoffset = 0, yoffset = 0;
 	int imagewidth = 0, imageheight = 0;
@@ -189,17 +190,9 @@ void run(char *images[], int length){
 							exit(0);
 							break;
 						case XK_t:
-							i = (i + 1) % length;
-							if(img)
-								free(img);
-							if(buf)
-								free(buf);
-							img = NULL;
-							buf = NULL;
-							redraw = 1;
-							break;
 						case XK_n:
-							i = i ? i - 1 : length - 1;
+							direction = (XLookupKeysym(&event.xkey, 0) == XK_t) ? 1 : -1;
+							i += direction;
 							if(img)
 								free(img);
 							if(buf)
@@ -213,9 +206,15 @@ void run(char *images[], int length){
 			}
 		}
 		if(redraw){
-			if(!buf){
+			while(!buf){
+				if(i > length)
+					i -= length;
+				if(i < 0)
+					i += length;
 				buf = loadbuf(images[i], &bufwidth, &bufheight);
-				assert(buf);
+				if(!buf){
+					i += direction;
+				}
 			}
 			if(!img){
 				if(width * bufheight > height * bufwidth){
-- 
cgit v1.2.3