Add fit-width and fit-height options.

Signed-off-by: Spaceship Operations <spaceshipoperations@gmail.com>

extra/swayimgrc

@@ -113,6 +113,8 @@ j = step_down 10
 equal = zoom_in 10
 plus = zoom_in 10
 minus = zoom_out 10
+w = fit_width
+W = fit_height
 x = zoom_optimal
 z = zoom_fit
 Z = zoom_fill

src/canvas.c

@@ -451,6 +451,12 @@ void canvas_set_scale(enum canvas_scale sc)
         case cs_fit_window:
             ctx.scale = min(scale_w, scale_h);
             break;
+        case cs_fit_width:
+            ctx.scale = scale_w;
+            break;
+        case cs_fit_height:
+            ctx.scale = scale_h;
+            break;
         case cs_fill_window:
             ctx.scale = max(scale_w, scale_h);
             break;

src/canvas.h

@@ -11,6 +11,8 @@
 enum canvas_scale {
     cs_fit_or100,   ///< Fit to window, but not more than 100%
     cs_fit_window,  ///< Fit to window size
+    cs_fit_width,   ///< Fit width to window width
+    cs_fit_height,  ///< Fit height to window height
     cs_fill_window, ///< Fill the window
     cs_real_size,   ///< Real image size (100%)
 };

src/config.c

@@ -131,6 +131,10 @@ static enum config_status load_general(const char* key, const char* value)
             config.scale = cfgsc_optimal;
         } else if (strcmp(value, "fit") == 0) {
             config.scale = cfgsc_fit;
+        } else if (strcmp(value, "fit-width") == 0) {
+            config.scale = cfgsc_fit_width;
+        } else if (strcmp(value, "fit-height") == 0) {
+            config.scale = cfgsc_fit_height;
         } else if (strcmp(value, "fill") == 0) {
             config.scale = cfgsc_fill;
         } else if (strcmp(value, "real") == 0) {

src/config.h

@@ -17,10 +17,12 @@
 
 /** Initial scaling of images. */
 enum config_scale {
-    cfgsc_optimal, ///< Fit to window, but not more than 100%
-    cfgsc_fit,     ///< Fit to window size
-    cfgsc_fill,    ///< Fill the window
-    cfgsc_real     ///< Real image size (100%)
+    cfgsc_optimal,    ///< Fit to window, but not more than 100%
+    cfgsc_fit,        ///< Fit to window size
+    cfgsc_fit_width,  ///< Fit to window size
+    cfgsc_fit_height, ///< Fit to window size
+    cfgsc_fill,       ///< Fill the window
+    cfgsc_real        ///< Real image size (100%)
 };
 
 /** Load status. */

src/keybind.c

@@ -35,6 +35,8 @@ static const char* action_names[] = {
     [kb_zoom_in] = "zoom_in",
     [kb_zoom_out] = "zoom_out",
     [kb_zoom_optimal] = "zoom_optimal",
+    [kb_zoom_fit_width] = "zoom_fit_width",
+    [kb_zoom_fit_height] = "zoom_fit_height",
     [kb_zoom_fit] = "zoom_fit",
     [kb_zoom_fill] = "zoom_fill",
     [kb_zoom_real] = "zoom_real",
@@ -84,6 +86,8 @@ static struct key_binding default_bindings[] = {
     { XKB_KEY_plus, kb_zoom_in, NULL },
     { XKB_KEY_minus, kb_zoom_out, NULL },
     { XKB_KEY_x, kb_zoom_optimal, NULL },
+    { XKB_KEY_w, kb_zoom_fit_width, NULL },
+    { XKB_KEY_W, kb_zoom_fit_height, NULL },
     { XKB_KEY_z, kb_zoom_fit, NULL },
     { XKB_KEY_Z, kb_zoom_fill, NULL },
     { XKB_KEY_0, kb_zoom_real, NULL },

src/keybind.h

@@ -27,8 +27,10 @@ enum kb_action {
     kb_zoom_in,
     kb_zoom_out,
     kb_zoom_optimal,
-    kb_zoom_fit,
-    kb_zoom_fill,
+    kb_zoom_fit_width,
+    kb_zoom_fit_height,
+    kb_zoom_fit,   // Fit largest dimension
+    kb_zoom_fill,  // Fit smallest dimension
     kb_zoom_real,
     kb_zoom_reset,
     kb_rotate_left,

src/main.c

@@ -37,7 +37,7 @@ static const struct cmdarg arguments[] = {
     { 'a', "all",        NULL,    "open all files from the same directory", "list", "all", "yes" },
     { 'l', "slideshow",  NULL,    "activate slideshow mode on startup", NULL, NULL, NULL },
     { 'f', "fullscreen", NULL,    "show image in full screen mode", NULL, NULL, NULL },
-    { 's', "scale",      "SCALE", "set initial image scale: [optimal]/fit/fill/real", "general", "scale", NULL },
+    { 's', "scale",      "SCALE", "set initial image scale: [optimal]/fit/fit-width/fit-height/fill/real", "general", "scale", NULL },
     { 'b', "background", "COLOR", "set image background color: none/[grid]/RGB", "general", "background", NULL },
     { 'w', "wndbkg",     "COLOR", "set window background color: [none]/RGB", "general", "wndbkg", NULL },
     { 'p', "wndpos",     "POS",   "set window position [parent]/X,Y", "general", "wndpos", NULL },

src/viewer.c

@@ -436,6 +436,12 @@ bool viewer_on_keyboard(xkb_keysym_t key)
         case kb_zoom_fit:
             canvas_set_scale(cs_fit_window);
             return true;
+        case kb_zoom_fit_width:
+            canvas_set_scale(cs_fit_width);
+            return true;
+        case kb_zoom_fit_height:
+            canvas_set_scale(cs_fit_height);
+            return true;
         case kb_zoom_fill:
             canvas_set_scale(cs_fill_window);
             return true;