zoom-per-image-v31.diff

diff --git a/image.c b/image.c
index 426a05a..ba3a14a 100644
--- a/image.c
+++ b/image.c
@@ -29,6 +29,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
 #if HAVE_LIBEXIF
 #include <libexif/exif-data.h>
 #endif
@@ -680,8 +683,10 @@ static bool img_fit(img_t *img)
 {
 	float z, zw, zh;
 
-	if (img->scalemode == SCALE_ZOOM)
-		return false;
+	if (img->scalemode == SCALE_ZOOM && files[fileidx].zoom != 0) {
+		img_zoom_to(img, files[fileidx].zoom);
+		return true;
+	}
 
 	zw = (float)img->win->w / (float)img->w;
 	zh = (float)img->win->h / (float)img->h;
@@ -703,7 +708,7 @@ static bool img_fit(img_t *img)
 	z = MIN(z, img->scalemode == SCALE_DOWN ? 1.0 : ZOOM_MAX);
 
 	if (ABS(img->zoom - z) > 1.0 / MAX(img->w, img->h)) {
-		img->zoom = z;
+		files[fileidx].zoom = img->zoom = z;
 		img->dirty = title_dirty = true;
 		return true;
 	} else {
@@ -849,12 +854,15 @@ bool img_zoom_to(img_t *img, float z)
 bool img_zoom(img_t *img, int d)
 {
 	int i = d > 0 ? 0 : (int)ARRLEN(zoom_levels) - 1;
+	if(files[fileidx].zoom)
+		img->zoom = files[fileidx].zoom;
 	while (i >= 0 && i < (int)ARRLEN(zoom_levels) &&
 	       (d > 0 ? zoom_levels[i] / 100 <= img->zoom : zoom_levels[i] / 100 >= img->zoom))
 	{
 		i += d;
 	}
 	i = MIN(MAX(i, 0), (int)ARRLEN(zoom_levels) - 1);
+	files[fileidx].zoom = zoom_levels[i]/100;
 	return img_zoom_to(img, zoom_levels[i] / 100);
 }
 
diff --git a/main.c b/main.c
index fed9528..891c5fe 100644
--- a/main.c
+++ b/main.c
@@ -146,6 +146,7 @@ static void check_add_file(const char *filename, bool given)
 
 	files[fileidx].name = estrdup(filename);
 	files[fileidx].path = path;
+	files[fileidx].zoom = 0;
 	if (given)
 		files[fileidx].flags |= FF_WARN;
 	fileidx++;
diff --git a/nsxiv.h b/nsxiv.h
index 7e373c2..b07443d 100644
--- a/nsxiv.h
+++ b/nsxiv.h
@@ -103,6 +103,7 @@ typedef struct {
 	const char *name; /* as given by user */
 	const char *path; /* always absolute */
 	fileflags_t flags;
+	float zoom;
 } fileinfo_t;
 
 /* timeouts in milliseconds: */