Commit dafe7ea

nsxivdafe7ea

Refactored imlib context handling

Author: Bert
Date: 2011-02-25 12:08 +0100
Parent: 62fb69b
Commit: dafe7eac742301952c088d68a455586b0225a7bd

+55 −38

5 files changed

Browse files Patch

−Context 3+

M icon.h +2 −0
M image.c +39 −35
M image.h +5 −1
M main.c +5 −1
M thumbs.c +4 −1

M icon.h View

M image.c View

M image.h View

M main.c View

M thumbs.c View

		@@ -1,6 +1,8 @@
1	1		#ifndef ICON_H
2	2		#define ICON_H
3	3
	4	+	#include <Imlib2.h>
	5	+
4	6		static DATA32 icon_broken[] = {
5	7		0xffcc0000, 0xffcc0000, 0xffcc0000, 0xffcc0000, 0xffcc0000, 0xffcc0000,
6	8		0xffcc0000, 0xffcc0000, 0xffcc0000, 0xffcc0000, 0xffcc0000, 0xffcc0000,

		@@ -17,7 +17,6 @@
17	17		*/
18	18
19	19		#include <unistd.h>
20		−	#include <Imlib2.h>
21	20
22	21		#include "config.h"
23	22		#include "icon.h"
		@@ -39,6 +38,7 @@ void img_init(img_t img, win_t win) {
39	38		im_broken = imlib_create_image_using_data(32, 32, icon_broken);
40	39
41	40		if (img) {
	41	+	img->im = NULL;
42	42		img->zoom = options->zoom;
43	43		img->zoom = MAX(img->zoom, zoom_min);
44	44		img->zoom = MIN(img->zoom, zoom_max);
		@@ -53,48 +53,38 @@ void img_init(img_t img, win_t win) {
53	53		}
54	54
55	55		void img_free(img_t* img) {
56		−	if (img && img->valid && imlib_context_get_image())
57		−	imlib_free_image();
58	56		imlib_context_set_image(im_broken);
59	57		imlib_free_image();
60	58		}
61	59
62		−	int _imlib_load_image(const char *filename) {
	60	+	int img_check(const char *filename) {
63	61		Imlib_Image *im;
64	62
65	63		if (!filename)
66	64		return 0;
67	65
68		−	if (access(filename, F_OK) \|\| !(im = imlib_load_image(filename))) {
	66	+	if (!access(filename, F_OK) && (im = imlib_load_image(filename))) {
	67	+	imlib_context_set_image(im);
	68	+	imlib_image_set_changes_on_disk();
	69	+	imlib_free_image();
	70	+	return 1;
	71	+	} else {
69	72		warn("could not open file: %s", filename);
70	73		return 0;
71	74		}
72		−
73		−	imlib_context_set_image(im);
74		−	imlib_image_set_changes_on_disk();
75		−
76		−	return 1;
77		−	}
78		−
79		−	int img_check(const char *filename) {
80		−	int ret;
81		−
82		−	if ((ret = _imlib_load_image(filename)))
83		−	imlib_free_image();
84		−	return ret;
85	75		}
86	76
87	77		int img_load(img_t img, const char filename) {
88	78		if (!img \|\| !filename)
89	79		return 0;
90	80
91		−	if (img->valid && imlib_context_get_image())
92		−	imlib_free_image();
93		−
94		−	if ((img->valid = _imlib_load_image(filename))) {
	81	+	if (!access(filename, F_OK) && (img->im = imlib_load_image(filename))) {
	82	+	imlib_context_set_image(img->im);
	83	+	imlib_image_set_changes_on_disk();
95	84		imlib_context_set_anti_alias(img->aa);
96	85		img->scalemode = options->scalemode;
97	86		} else {
	87	+	warn("could not open file: %s", filename);
98	88		imlib_context_set_image(im_broken);
99	89		imlib_context_set_anti_alias(0);
100	90		img->scalemode = SCALE_DOWN;
		@@ -109,6 +99,14 @@ int img_load(img_t img, const char filename) {
109	99		return 1;
110	100		}
111	101
	102	+	void img_close(img_t *img) {
	103	+	if (img && img->im) {
	104	+	imlib_context_set_image(img->im);
	105	+	imlib_free_image();
	106	+	img->im = NULL;
	107	+	}
	108	+	}
	109	+
112	110		void img_check_pan(img_t img, win_t win) {
113	111		if (!img \|\| !win)
114	112		return;
		@@ -152,7 +150,7 @@ void img_render(img_t img, win_t win) {
152	150		int sx, sy, sw, sh;
153	151		int dx, dy, dw, dh;
154	152
155		−	if (!img \|\| !win \|\| !imlib_context_get_image())
	153	+	if (!img \|\| !win)
156	154		return;
157	155
158	156		if (img->scalemode != SCALE_ZOOM) {
		@@ -198,6 +196,11 @@ void img_render(img_t img, win_t win) {
198	196
199	197		win_clear(win);
200	198
	199	+	if (img->im)
	200	+	imlib_context_set_image(img->im);
	201	+	else
	202	+	imlib_context_set_image(im_broken);
	203	+
201	204		imlib_context_set_drawable(win->pm);
202	205		imlib_render_image_part_on_drawable_at_size(sx, sy, sw, sh, dx, dy, dw, dh);
203	206
		@@ -205,7 +208,7 @@ void img_render(img_t img, win_t win) {
205	208		}
206	209
207	210		int img_fit_win(img_t img, win_t win) {
208		−	if (!img \|\| !img->valid \|\| !win)
	211	+	if (!img \|\| !img->im \|\| !win)
209	212		return 0;
210	213
211	214		img->scalemode = SCALE_FIT;
		@@ -228,7 +231,7 @@ int img_center(img_t img, win_t win) {
228	231		}
229	232
230	233		int img_zoom(img_t *img, float z) {
231		−	if (!img \|\| !img->valid)
	234	+	if (!img \|\| !img->im)
232	235		return 0;
233	236
234	237		z = MAX(z, zoom_min);
		@@ -250,7 +253,7 @@ int img_zoom(img_t *img, float z) {
250	253		int img_zoom_in(img_t *img) {
251	254		int i;
252	255
253		−	if (!img \|\| !img->valid)
	256	+	if (!img \|\| !img->im)
254	257		return 0;
255	258
256	259		for (i = 1; i < zl_cnt; ++i) {
		@@ -263,7 +266,7 @@ int img_zoom_in(img_t *img) {
263	266		int img_zoom_out(img_t *img) {
264	267		int i;
265	268
266		−	if (!img \|\| !img->valid)
	269	+	if (!img \|\| !img->im)
267	270		return 0;
268	271
269	272		for (i = zl_cnt - 2; i >= 0; --i) {
		@@ -276,7 +279,7 @@ int img_zoom_out(img_t *img) {
276	279		int img_move(img_t img, win_t win, int dx, int dy) {
277	280		int ox, oy;
278	281
279		−	if (!img \|\| !img->valid \|\| !win)
	282	+	if (!img \|\| !img->im \|\| !win)
280	283		return 0;
281	284
282	285		ox = img->x;
		@@ -291,7 +294,7 @@ int img_move(img_t img, win_t win, int dx, int dy) {
291	294		}
292	295
293	296		int img_pan(img_t img, win_t win, pandir_t dir) {
294		−	if (!img \|\| !img->valid \|\| !win)
	297	+	if (!img \|\| !img->im \|\| !win)
295	298		return 0;
296	299
297	300		switch (dir) {
		@@ -311,12 +314,13 @@ int img_pan(img_t img, win_t win, pandir_t dir) {
311	314		void img_rotate(img_t img, win_t win, int d) {
312	315		int ox, oy, tmp;
313	316
314		−	if (!img \|\| !img->valid \|\| !win)
	317	+	if (!img \|\| !img->im \|\| !win)
315	318		return;
316	319
317	320		ox = d == 1 ? img->x : win->w - img->x - img->w * img->zoom;
318	321		oy = d == 3 ? img->y : win->h - img->y - img->h * img->zoom;
319	322
	323	+	imlib_context_set_image(img->im);
320	324		imlib_image_orientate(d);
321	325
322	326		img->x = oy + (win->w - win->h) / 2;
		@@ -338,9 +342,9 @@ void img_rotate_right(img_t img, win_t win) {
338	342		}
339	343
340	344		void img_toggle_antialias(img_t *img) {
341		−	if (!img \|\| !img->valid)
342		−	return;
343		−
344		−	img->aa ^= 1;
345		−	imlib_context_set_anti_alias(img->aa);
	345	+	if (img && img->im) {
	346	+	img->aa ^= 1;
	347	+	imlib_context_set_image(img->im);
	348	+	imlib_context_set_anti_alias(img->aa);
	349	+	}
346	350		}

		@@ -19,6 +19,8 @@
19	19		#ifndef IMAGE_H
20	20		#define IMAGE_H
21	21
	22	+	#include <Imlib2.h>
	23	+
22	24		#include "window.h"
23	25
24	26		typedef enum scalemode_e {
		@@ -35,10 +37,11 @@ typedef enum pandir_e {
35	37		} pandir_t;
36	38
37	39		typedef struct img_s {
	40	+	Imlib_Image *im;
	41	+
38	42		float zoom;
39	43		scalemode_t scalemode;
40	44
41		−	unsigned char valid;
42	45		unsigned char re;
43	46		unsigned char checkpan;
44	47		unsigned char aa;
		@@ -54,6 +57,7 @@ void img_free(img_t*);
54	57
55	58		int img_check(const char*);
56	59		int img_load(img_t, const char);
	60	+	void img_close(img_t*);
57	61
58	62		void img_render(img_t, win_t);
59	63

		@@ -62,6 +62,7 @@ void cleanup() {
62	62		static int in = 0;
63	63
64	64		if (!in++) {
	65	+	img_close(&img);
65	66		img_free(&img);
66	67		tns_free(&tns, &win);
67	68		win_close(&win);
		@@ -71,6 +72,8 @@ void cleanup() {
71	72		int load_image() {
72	73		struct stat fstats;
73	74
	75	+	img_close(&img);
	76	+
74	77		if (!stat(filenames[fileidx], &fstats))
75	78		filesize = fstats.st_size;
76	79		else
		@@ -158,7 +161,7 @@ void update_title() {
158	161		tns.cnt ? tns.sel + 1 : 0, tns.cnt,
159	162		tns.cnt ? filenames[tns.sel] : "");
160	163		} else {
161		−	if (img.valid) {
	164	+	if (img.im) {
162	165		size = filesize;
163	166		size_readable(&size, &unit);
164	167		n = snprintf(win_title, TITLE_LEN, "sxiv: [%d/%d] <%d%%> (%.2f%s) %s",
		@@ -388,6 +391,7 @@ void on_keypress(XKeyEvent *kev) {
388	391		case XK_Return:
389	392		if (!tns.thumbs)
390	393		tns_init(&tns, filecnt);
	394	+	img_close(&img);
391	395		mode = MODE_THUMBS;
392	396		win_set_cursor(&win, CURSOR_ARROW);
393	397		timo_cursor = 0;

		@@ -79,10 +79,13 @@ void tns_load(tns_t tns, win_t win, const char *filename) {
79	79
80	80		t->pm = win_create_pixmap(win, t->w, t->h);
81	81		imlib_context_set_drawable(t->pm);
	82	+	imlib_context_set_anti_alias(1);
82	83		imlib_render_image_part_on_drawable_at_size(0, 0, w, h,
83	84		0, 0, t->w, t->h);
84		−	imlib_free_image();
85	85		tns->dirty = 1;
	86	+
	87	+	if (im)
	88	+	imlib_free_image();
86	89		}
87	90
88	91		void tns_check_view(tns_t *tns, Bool scrolled) {

nsxiv/dafe7ea

Refactored imlib context handling

nsxivdafe7ea