Use a specific enum for image.zoom_mode values (ZoomMode) and

simplify calls to image_zoom_get_default(), dropping last parameter
which was always options->image.zoom_mode.

diff --git a/src/image.c b/src/image.c
index aaae255..30c9092 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -1312,29 +1312,21 @@ gchar *image_zoom_get_as_text(ImageWindow *imd)
        return g_strdup_printf("%.*f :%s%.*f", pl, l, approx, pr, r);
 }
 
-gdouble image_zoom_get_default(ImageWindow *imd, gint mode)
+gdouble image_zoom_get_default(ImageWindow *imd)
 {
-       gdouble zoom;
+       gdouble zoom = 1.0;
 
-       if (mode == ZOOM_RESET_ORIGINAL)
-               {
-               zoom = 1.0;
-               }
-       else if (mode == ZOOM_RESET_FIT_WINDOW)
-               {
+       switch (options->image.zoom_mode)
+       {
+       case ZOOM_RESET_ORIGINAL:
+               break;
+       case ZOOM_RESET_FIT_WINDOW:
                zoom = 0.0;
-               }
-       else
-               {
-               if (imd)
-                       {
-                       zoom = image_zoom_get(imd);
-                       }
-               else
-                       {
-                       zoom = 1.0;
-                       }
-               }
+               break;
+       case ZOOM_RESET_NONE:
+               if (imd) zoom = image_zoom_get(imd);
+               break;
+       }
 
        return zoom;
 }

diff --git a/src/image.h b/src/image.h
index e0d6dde..0c545b3 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -83,7 +83,7 @@ void image_zoom_set_fill_geometry(ImageWindow *imd, gint vertical);
 gdouble image_zoom_get(ImageWindow *imd);
 gdouble image_zoom_get_real(ImageWindow *imd);
 gchar *image_zoom_get_as_text(ImageWindow *imd);
-gdouble image_zoom_get_default(ImageWindow *imd, gint mode);
+gdouble image_zoom_get_default(ImageWindow *imd);
 
 /* read ahead, pass NULL to cancel */
 void image_prebuffer_set(ImageWindow *imd, FileData *fd);

diff --git a/src/img-view.c b/src/img-view.c
index d547cd9..15deb4f 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -135,7 +135,7 @@ static void view_collection_step(ViewWindow *vw, gint next)
 
        if (info)
                {
-               image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->image.zoom_mode));
+               image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
 
                if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
                }
@@ -166,7 +166,7 @@ static void view_collection_step_to_end(ViewWindow *vw, gint last)
 
        if (info)
                {
-               image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->image.zoom_mode));
+               image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
                if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
                }
 }
@@ -226,7 +226,7 @@ static void view_list_step(ViewWindow *vw, gint next)
 
        vw->list_pointer = work;
        fd = work->data;
-       image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
+       image_change_fd(imd, fd, image_zoom_get_default(imd));
 
        if (options->image.enable_read_ahead && work_ahead)
                {
@@ -257,7 +257,7 @@ static void view_list_step_to_end(ViewWindow *vw, gint last)
 
        vw->list_pointer = work;
        fd = work->data;
-       image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
+       image_change_fd(imd, fd, image_zoom_get_default(imd));
 
        if (options->image.enable_read_ahead && work_ahead)
                {
@@ -872,7 +872,7 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
                         G_CALLBACK(view_window_key_press_cb), vw);
        if (cd && info)
                {
-               image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL, options->image.zoom_mode));
+               image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL));
                if (options->image.enable_read_ahead)
                        {
                        CollectInfo * r_info = collection_next_by_info(cd, info);
@@ -884,7 +884,7 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
                {
                view_window_set_list(vw, list);
                vw->list_pointer = vw->list;
-               image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL, options->image.zoom_mode));
+               image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL));
 
                if (options->image.enable_read_ahead)
                        {
@@ -894,7 +894,7 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
                }
        else
                {
-               image_change_fd(vw->imd, fd, image_zoom_get_default(NULL, options->image.zoom_mode));
+               image_change_fd(vw->imd, fd, image_zoom_get_default(NULL));
                }
 
        if (image_zoom_get(vw->imd) == 0.0)
@@ -1386,7 +1386,7 @@ static void view_dir_list_do(ViewWindow *vw, GList *list, gint skip, gint recurs
 
                vw->list_pointer = vw->list;
                fd = vw->list->data;
-               image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd, options->image.zoom_mode));
+               image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd));
 
                work = vw->list->next;
                if (options->image.enable_read_ahead && work)
@@ -1397,7 +1397,7 @@ static void view_dir_list_do(ViewWindow *vw, GList *list, gint skip, gint recurs
                }
        else
                {
-               image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd, options->image.zoom_mode));
+               image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd));
                }
 }
 
@@ -1516,7 +1516,7 @@ static void view_window_get_dnd_data(GtkWidget *widget, GdkDragContext *context,
 
                                if (source && info_list)
                                        {
-                                       image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd, options->image.zoom_mode));
+                                       image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd));
                                        }
                                else
                                        {
@@ -1527,7 +1527,7 @@ static void view_window_get_dnd_data(GtkWidget *widget, GdkDragContext *context,
 
                                                vw->list_pointer = vw->list;
                                                }
-                                       image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
+                                       image_change_fd(imd, fd, image_zoom_get_default(imd));
                                        }
                                }
                        }
@@ -1633,7 +1633,7 @@ static void view_real_removed(ViewWindow *vw, FileData *fd)
                        }
                if (image_get_fd(imd) == image_fd)
                        {
-                       image_change_fd(imd, NULL, image_zoom_get_default(imd, options->image.zoom_mode));
+                       image_change_fd(imd, NULL, image_zoom_get_default(imd));
                        }
                }
 
@@ -1679,7 +1679,7 @@ static void view_real_removed(ViewWindow *vw, FileData *fd)
                                fd = NULL;
                                }
 
-                       image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
+                       image_change_fd(imd, fd, image_zoom_get_default(imd));
                        }
                }
 

diff --git a/src/layout_image.c b/src/layout_image.c
index 8796787..bb9e044 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -1181,7 +1181,7 @@ void layout_image_set_fd(LayoutWindow *lw, FileData *fd)
 
        image_get_scroll_center(lw->image, &sx, &sy);
 
-       image_change_fd(lw->image, fd, image_zoom_get_default(lw->image, options->image.zoom_mode));
+       image_change_fd(lw->image, fd, image_zoom_get_default(lw->image));
 
        image_set_scroll_center(lw->image, sx, sy);
 
@@ -1273,7 +1273,7 @@ static void layout_image_set_collection_real(LayoutWindow *lw, CollectionData *c
 {
        if (!layout_valid(&lw)) return;
 
-       image_change_from_collection(lw->image, cd, info, image_zoom_get_default(lw->image, options->image.zoom_mode));
+       image_change_from_collection(lw->image, cd, info, image_zoom_get_default(lw->image));
        if (options->image.enable_read_ahead)
                {
                CollectInfo *r_info;

diff --git a/src/main.h b/src/main.h
index 560ad8f..fa80bc8 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -82,10 +82,6 @@
 
 #define GQ_COLLECTION_EXT ".gqv"
 
-#define ZOOM_RESET_ORIGINAL 0
-#define ZOOM_RESET_FIT_WINDOW 1
-#define ZOOM_RESET_NONE 2
-
 #define SCROLL_RESET_TOPLEFT 0
 #define SCROLL_RESET_CENTER 1
 #define SCROLL_RESET_NOCHANGE 2

diff --git a/src/options.h b/src/options.h
index 7b4b8ab..0eda377 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -71,7 +71,7 @@ struct _ConfOptions
                guint dither_quality;
                gboolean enable_read_ahead;
 
-               gint zoom_mode;
+               ZoomMode zoom_mode;
                gboolean zoom_2pass;
                gboolean zoom_to_fit_allow_expand;
                guint zoom_quality;

diff --git a/src/rcfile.c b/src/rcfile.c
index bd197f0..18257e7 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -442,12 +442,12 @@ static gboolean save_options_to(const gchar *utf8_path, ConfOptions *options)
                            "#   fit\n"
                            "#   dont_change\n");
        secure_fprintf(ssi, "image.zoom_mode: ");
-       if (options->image.zoom_mode == ZOOM_RESET_ORIGINAL)
-               secure_fprintf(ssi, "original\n");
-       else if (options->image.zoom_mode == ZOOM_RESET_FIT_WINDOW)
-               secure_fprintf(ssi, "fit\n");
-       else if (options->image.zoom_mode == ZOOM_RESET_NONE)
-               secure_fprintf(ssi, "dont_change\n");
+       switch (options->image.zoom_mode)
+       {
+       case ZOOM_RESET_ORIGINAL: secure_fprintf(ssi, "original\n"); break;
+       case ZOOM_RESET_FIT_WINDOW: secure_fprintf(ssi, "fit\n"); break;
+       case ZOOM_RESET_NONE: secure_fprintf(ssi, "dont_change\n"); break;
+       }
        WRITE_SEPARATOR();
        WRITE_BOOL(image.zoom_2pass);
        WRITE_BOOL(image.zoom_to_fit_allow_expand);

diff --git a/src/slideshow.c b/src/slideshow.c
index 8a23892..bea4bbf 100644 (file)
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -183,7 +183,7 @@ static gint slideshow_step(SlideShowData *ss, gboolean forward)
        if (ss->filelist)
                {
                ss->slide_fd = file_data_ref((FileData *)g_list_nth_data(ss->filelist, row));
-               image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd, options->image.zoom_mode));
+               image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd));
                }
        else if (ss->cd)
                {
@@ -192,7 +192,7 @@ static gint slideshow_step(SlideShowData *ss, gboolean forward)
                info = g_list_nth_data(ss->cd->list, row);
                ss->slide_fd = file_data_ref(info->fd);
 
-               image_change_from_collection(ss->imd, ss->cd, info, image_zoom_get_default(ss->imd, options->image.zoom_mode));
+               image_change_from_collection(ss->imd, ss->cd, info, image_zoom_get_default(ss->imd));
                }
        else
                {
@@ -200,7 +200,7 @@ static gint slideshow_step(SlideShowData *ss, gboolean forward)
 
                if (ss->from_selection)
                        {
-                       image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd, options->image.zoom_mode));
+                       image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd));
                        layout_status_update_info(ss->layout, NULL);
                        }
                else

diff --git a/src/typedefs.h b/src/typedefs.h
index 0f56332..72c2ca9 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -14,6 +14,12 @@
 #ifndef TYPEDEFS_H
 #define TYPEDEFS_H
 
+typedef enum {
+       ZOOM_RESET_ORIGINAL     = 0,
+       ZOOM_RESET_FIT_WINDOW   = 1,
+       ZOOM_RESET_NONE         = 2
+} ZoomMode;
+
 typedef enum {
        MOUSE_BUTTON_LEFT       = 1,
        MOUSE_BUTTON_MIDDLE     = 2,