Permalink
Browse files

New commands: fit to the window's height/width

  • Loading branch information...
1 parent 5b64679 commit b56989f8fbfa6ab32e1fa8f54c0d03ff924c7308 @baskerville baskerville committed Jul 19, 2012
Showing with 30 additions and 6 deletions.
  1. +2 −0 README.md
  2. +2 −1 commands.c
  3. +3 −1 config.def.h
  4. +14 −3 image.c
  5. +1 −1 image.h
  6. +6 −0 sxiv.1
  7. +2 −0 types.h
View
@@ -115,6 +115,8 @@ The following additional key commands are available in *image mode*:
- Zoom out
= Set zoom level to 100%, or [count]%
w Fit image into window
+ e Fit image to window's width
+ E Fit image to window's height
h,j,k,l Pan image 1/5 of window width/height or [count] pixels
left/down/up/right (also with arrow keys)
View
@@ -310,9 +310,10 @@ bool i_set_zoom(arg_t a) {
bool i_fit_to_win(arg_t a) {
bool ret = false;
+ scalemode_t sm = (scalemode_t) a;
if (mode == MODE_IMAGE) {
- if ((ret = img_fit_win(&img)))
+ if ((ret = img_fit_win(&img, sm)))
img_center(&img);
}
return ret;
View
@@ -108,7 +108,9 @@ static const keymap_t keys[] = {
{ false, XK_minus, i_zoom, (arg_t) -1 },
{ false, XK_KP_Subtract, i_zoom, (arg_t) -1 },
{ false, XK_equal, i_set_zoom, (arg_t) 100 },
- { false, XK_w, i_fit_to_win, (arg_t) None },
+ { false, XK_w, i_fit_to_win, (arg_t) SCALE_FIT },
+ { false, XK_e, i_fit_to_win, (arg_t) SCALE_WIDTH },
+ { false, XK_E, i_fit_to_win, (arg_t) SCALE_HEIGHT },
{ false, XK_W, i_fit_to_img, (arg_t) None },
{ false, XK_less, i_rotate, (arg_t) DIR_LEFT },
View
17 image.c
@@ -365,7 +365,18 @@ bool img_fit(img_t *img) {
zw = (float) img->win->w / (float) img->w;
zh = (float) img->win->h / (float) img->h;
- z = MIN(zw, zh);
+ switch (img->scalemode) {
+ case SCALE_WIDTH:
+ z = zw;
+ break;
+ case SCALE_HEIGHT:
+ z = zh;
+ break;
+ default:
+ z = MIN(zw, zh);
+ break;
+ }
+
z = MAX(z, zoom_min);
z = MIN(z, zmax);
@@ -448,11 +459,11 @@ void img_render(img_t *img) {
img->dirty = false;
}
-bool img_fit_win(img_t *img) {
+bool img_fit_win(img_t *img, scalemode_t sm) {
if (img == NULL || img->im == NULL)
return false;
- img->scalemode = SCALE_FIT;
+ img->scalemode = sm;
return img_fit(img);
}
View
@@ -65,7 +65,7 @@ void img_close(img_t*, bool);
void img_render(img_t*);
-bool img_fit_win(img_t*);
+bool img_fit_win(img_t*, scalemode_t);
bool img_center(img_t*);
bool img_zoom(img_t*, float);
View
6 sxiv.1
@@ -197,6 +197,12 @@ Set zoom level to 100%, or
.TP
.B w
Set zoom level to fit image into window.
+.TP
+.B e
+Set zoom level to fit image into the window's width.
+.TP
+.B E
+Set zoom level to fit image into the window's height.
.SS Panning
.TP
.BR h ", " Left
View
@@ -31,6 +31,8 @@ typedef enum {
typedef enum {
SCALE_DOWN,
SCALE_FIT,
+ SCALE_WIDTH,
+ SCALE_HEIGHT,
SCALE_ZOOM
} scalemode_t;

0 comments on commit b56989f

Please sign in to comment.