Commit 00f3212

nsxiv00f3212

Handle expose events

Author: Bert
Date: 2011-01-20 15:39 +0100
Parent: 822ef72
Commit: 00f32120a6c62069b66737a5265d9befa3ac59ac

+39 −22

3 files changed

Browse files Patch

−Context 3+

M image.c +29 −18
M image.h +4 −3
M main.c +6 −1

M image.c View

M image.h View

M main.c View

		@@ -57,10 +57,8 @@ void img_load(img_t img, const char filename) {
57	57		img->h = imlib_image_get_height();
58	58		}
59	59
60		−	void img_render(img_t img, win_t win) {
	60	+	void img_display(img_t img, win_t win) {
61	61		float zw, zh;
62		−	unsigned int sx, sy, sw, sh;
63		−	unsigned int dx, dy, dw, dh;
64	62
65	63		if (!img \|\| !win \|\| !imlib_context_get_image())
66	64		return;
		@@ -84,30 +82,43 @@ void img_render(img_t img, win_t win) {
84	82		img->x = (win->w - img->w * img->zoom) / 2;
85	83		img->y = (win->h - img->h * img->zoom) / 2;
86	84
87		−	if (img->x < 0) {
88		−	sx = -img->x / img->zoom;
89		−	sw = (img->x + win->w) / img->zoom;
90		−	dx = 0;
91		−	dw = win->w;
	85	+	win_clear(win);
	86	+
	87	+	img_render(img, win, 0, 0, win->w, win->h);
	88	+	}
	89	+
	90	+	void img_render(img_t img, win_t win, int x, int y, int w, int h) {
	91	+	int sx, sy, sw, sh;
	92	+	int dx, dy, dw, dh;
	93	+
	94	+	if (!img \|\| !win \|\| !imlib_context_get_image())
	95	+	return;
	96	+
	97	+	if (img->x < x) {
	98	+	sx = (x - img->x) / img->zoom;
	99	+	sw = MIN(w / img->zoom, img->w - sx);
	100	+	dx = x;
	101	+	dw = sw * img->zoom;
92	102		} else {
93	103		sx = 0;
94		−	sw = img->w;
	104	+	sw = MIN((w - img->x + x) / img->zoom, img->w);
95	105		dx = img->x;
96		−	dw = img->w * img->zoom;
	106	+	dw = sw * img->zoom;
97	107		}
98		−	if (img->y < 0) {
99		−	sy = -img->y / img->zoom;
100		−	sh = (img->y + win->h) / img->zoom;
101		−	dy = 0;
102		−	dh = win->h;
	108	+	if (img->y < y) {
	109	+	sy = (y - img->y) / img->zoom;
	110	+	sh = MIN(h / img->zoom, img->h - sy);
	111	+	dy = y;
	112	+	dh = sh * img->zoom;
103	113		} else {
104	114		sy = 0;
105		−	sh = img->h;
	115	+	sh = MIN((h - img->y + y) / img->zoom, img->h);
106	116		dy = img->y;
107		−	dh = img->h * img->zoom;
	117	+	dh = sh * img->zoom;
108	118		}
109	119
110		−	win_clear(win);
	120	+	if (sw < 0 \|\| sh < 0)
	121	+	return;
111	122
112	123		imlib_render_image_part_on_drawable_at_size(sx, sy, sw, sh, dx, dy, dw, dh);
113	124		}

		@@ -30,16 +30,17 @@ typedef enum scalemode_e {
30	30		typedef struct img_s {
31	31		float zoom;
32	32		scalemode_t scalemode;
33		−	int w;
34		−	int h;
35	33		int x;
36	34		int y;
	35	+	int w;
	36	+	int h;
37	37		} img_t;
38	38
39	39		void imlib_init(win_t*);
40	40		void imlib_destroy();
41	41
42	42		void img_load(img_t, const char);
43		−	void img_render(img_t, win_t);
	43	+	void img_display(img_t, win_t);
	44	+	void img_render(img_t, win_t, int, int, int, int);
44	45
45	46		#endif /* IMAGE_H */

		@@ -69,7 +69,7 @@ int main(int argc, char **argv) {
69	69		imlib_init(&win);
70	70
71	71		img_load(&img, options->filenames[fileidx]);
72		−	img_render(&img, &win);
	72	+	img_display(&img, &win);
73	73
74	74		run();
75	75
		@@ -113,4 +113,9 @@ void on_configurenotify(XEvent *ev) {
113	113		}
114	114
115	115		void on_expose(XEvent *ev) {
	116	+	if (!ev)
	117	+	return;
	118	+
	119	+	img_render(&img, &win, ev->xexpose.x, ev->xexpose.y,
	120	+	ev->xexpose.width, ev->xexpose.height);
116	121		}

nsxiv/00f3212

Handle expose events

nsxiv00f3212