Krolyxon
Commit 629d373

Branches

Refs →

nsxiv629d373

Merged img_display() into img_render()

Author
Bert
Date
2011-01-21 12:13 +0100
Parent
44921e0
Commit
629d37376d1c9b175a525e8c30f8d468996a3bd6

+32 −33

3 files changed

Browse files Patch
−Context 3+
  1. M image.c +28 −29
  2. M image.h +1 −1
  3. M main.c +3 −3
M image.c View
@@ -62,40 +62,13 @@ int img_load(img_t *img, const char *filename) {
6262
6363 imlib_context_set_image(im);
6464
65+ img->re = 0;
6566 img->w = imlib_image_get_width();
6667 img->h = imlib_image_get_height();
6768
6869 return 0;
6970 }
7071
71−void img_display(img_t *img, win_t *win) {
72− float zw, zh;
73−
74− if (!img || !win || !imlib_context_get_image())
75− return;
76−
77− /* set zoom level to fit image into window */
78− if (img->scalemode != SCALE_ZOOM) {
79− zw = (float) win->w / (float) img->w;
80− zh = (float) win->h / (float) img->h;
81− img->zoom = MIN(zw, zh);
82−
83− if (img->zoom < zoom_min)
84− img->zoom = zoom_min;
85− else if (img->zoom > zoom_max)
86− img->zoom = zoom_max;
87−
88− if (img->scalemode == SCALE_DOWN && img->zoom > 1.0)
89− img->zoom = 1.0;
90− }
91−
92− /* center image in window */
93− img->x = (win->w - img->w * img->zoom) / 2;
94− img->y = (win->h - img->h * img->zoom) / 2;
95−
96− img_render(img, win);
97−}
98−
9972 void img_check_pan(img_t *img, win_t *win) {
10073 if (!img)
10174 return;
@@ -121,11 +94,37 @@ void img_check_pan(img_t *img, win_t *win) {
12194 void img_render(img_t *img, win_t *win) {
12295 int sx, sy, sw, sh;
12396 int dx, dy, dw, dh;
97+ float zw, zh;
12498
12599 if (!img || !win || !imlib_context_get_image())
126100 return;
127101
128− img_check_pan(img, win);
102+ if (!img->re) {
103+ /* rendered for the first time */
104+ img->re = 1;
105+
106+ /* set zoom level to fit image into window */
107+ if (img->scalemode != SCALE_ZOOM) {
108+ zw = (float) win->w / (float) img->w;
109+ zh = (float) win->h / (float) img->h;
110+ img->zoom = MIN(zw, zh);
111+
112+ if (img->zoom < zoom_min)
113+ img->zoom = zoom_min;
114+ else if (img->zoom > zoom_max)
115+ img->zoom = zoom_max;
116+
117+ if (img->scalemode == SCALE_DOWN && img->zoom > 1.0)
118+ img->zoom = 1.0;
119+ }
120+
121+ /* center image in window */
122+ img->x = (win->w - img->w * img->zoom) / 2;
123+ img->y = (win->h - img->h * img->zoom) / 2;
124+ } else {
125+ /* typically after zooming and panning */
126+ img_check_pan(img, win);
127+ }
129128
130129 if (img->x < 0) {
131130 sx = -img->x / img->zoom;
M image.h View
@@ -30,6 +30,7 @@ typedef enum scalemode_e {
3030 typedef struct img_s {
3131 float zoom;
3232 scalemode_t scalemode;
33+ unsigned char re;
3334 int x;
3435 int y;
3536 int w;
@@ -40,7 +41,6 @@ void imlib_init(win_t*);
4041 void imlib_destroy();
4142
4243 int img_load(img_t*, const char*);
43−void img_display(img_t*, win_t*);
4444 void img_render(img_t*, win_t*);
4545
4646 int img_zoom_in(img_t*);
M main.c View
@@ -93,7 +93,7 @@ int main(int argc, char **argv) {
9393 imlib_init(&win);
9494
9595 img_load(&img, filenames[fileidx]);
96− img_display(&img, &win);
96+ img_render(&img, &win);
9797 update_title();
9898
9999 run();
@@ -146,14 +146,14 @@ void on_keypress(XEvent *ev) {
146146 case 'n':
147147 if (fileidx + 1 < filecnt) {
148148 img_load(&img, filenames[++fileidx]);
149− img_display(&img, &win);
149+ img_render(&img, &win);
150150 update_title();
151151 }
152152 break;
153153 case 'p':
154154 if (fileidx > 0) {
155155 img_load(&img, filenames[--fileidx]);
156− img_display(&img, &win);
156+ img_render(&img, &win);
157157 update_title();
158158 }
159159 break;