Krolyxon
Commit c6556f8

Branches

Refs →

nsxivc6556f8

New key mappings: 0/w, zoom to 100%/to fit window

Author
Bert
Date
2011-02-03 16:14 +0100
Parent
bad9a70
Commit
c6556f8cc7a90909b2dd71747ab605954a3f7892

+19 −8

3 files changed

Browse files Patch
−Context 3+
  1. M image.c +9 −6
  2. M image.h +3 −2
  3. M main.c +7 −0
M image.c View
@@ -88,9 +88,9 @@ int img_load(img_t *img, const char *filename) {
8888
8989 imlib_context_set_anti_alias(img->aa);
9090
91+ img->scalemode = options->scalemode;
9192 img->re = 0;
9293 img->checkpan = 0;
93− img->zoomed = 0;
9494
9595 img->w = imlib_image_get_width();
9696 img->h = imlib_image_get_height();
@@ -127,9 +127,9 @@ void img_render(img_t *img, win_t *win) {
127127 if (!img || !win || !imlib_context_get_image())
128128 return;
129129
130− if (!img->zoomed && options->scalemode != SCALE_ZOOM) {
131− img_fit(img, win);
132− if (options->scalemode == SCALE_DOWN && img->zoom > 1.0)
130+ if (img->scalemode != SCALE_ZOOM) {
131+ img_fit(img, win, 0);
132+ if (img->scalemode == SCALE_DOWN && img->zoom > 1.0)
133133 img->zoom = 1.0;
134134 }
135135
@@ -176,7 +176,7 @@ void img_render(img_t *img, win_t *win) {
176176 win_draw(win);
177177 }
178178
179−int img_fit(img_t *img, win_t *win) {
179+int img_fit(img_t *img, win_t *win, unsigned char set) {
180180 float oz, zw, zh;
181181
182182 if (!img || !win)
@@ -190,6 +190,9 @@ int img_fit(img_t *img, win_t *win) {
190190 img->zoom = MAX(img->zoom, zoom_min);
191191 img->zoom = MIN(img->zoom, zoom_max);
192192
193+ if (set)
194+ img->scalemode = SCALE_FIT;
195+
193196 return oz != img->zoom;
194197 }
195198
@@ -214,13 +217,13 @@ int img_zoom(img_t *img, float z) {
214217
215218 z = MAX(z, zoom_min);
216219 z = MIN(z, zoom_max);
220+ img->scalemode = SCALE_ZOOM;
217221
218222 if (z != img->zoom) {
219223 img->x -= (img->w * z - img->w * img->zoom) / 2;
220224 img->y -= (img->h * z - img->h * img->zoom) / 2;
221225 img->zoom = z;
222226 img->checkpan = 1;
223− img->zoomed = 1;
224227 return 1;
225228 } else {
226229 return 0;
M image.h View
@@ -36,9 +36,9 @@ typedef enum pandir_e {
3636
3737 typedef struct img_s {
3838 float zoom;
39+ scalemode_t scalemode;
3940 unsigned char re;
4041 unsigned char checkpan;
41− unsigned char zoomed;
4242 unsigned char aa;
4343 int x;
4444 int y;
@@ -54,9 +54,10 @@ int img_load(img_t*, const char*);
5454
5555 void img_render(img_t*, win_t*);
5656
57−int img_fit(img_t*, win_t*);
57+int img_fit(img_t*, win_t*, unsigned char);
5858 int img_center(img_t*, win_t*);
5959
60+int img_zoom(img_t*, float);
6061 int img_zoom_in(img_t*);
6162 int img_zoom_out(img_t*);
6263
M main.c View
@@ -284,6 +284,13 @@ void on_keypress(XKeyEvent *kev) {
284284 case XK_minus:
285285 changed = img_zoom_out(&img);
286286 break;
287+ case XK_0:
288+ changed = img_zoom(&img, 1.0);
289+ break;
290+ case XK_w:
291+ if ((changed = img_fit(&img, &win, 1)))
292+ img_center(&img, &win);
293+ break;
287294
288295 /* panning */
289296 case XK_h: