Commit 2a2f030

nsxiv2a2f030

Basic image loading

+35 −1

4 files changed

−Context 3+

M app.c View

M app.h View

M image.c View

M image.h View

		@@ -40,8 +40,16 @@ void app_init(app_t *app) {
40	40		}
41	41
42	42		void app_run(app_t *app) {
	43	+	app_load_image(app);
43	44		event_loop(app);
44	45		}
45	46
46	47		void app_quit(app_t *app) {
47	48		}
	49	+
	50	+	void app_load_image(app_t *app) {
	51	+	if (!app \|\| app->fileidx >= app->filecnt \|\| !app->filenames)
	52	+	return;
	53	+
	54	+	img_load(&app->img, app->filenames[app->fileidx]);
	55	+	}

		@@ -16,7 +16,8 @@
16	16		* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17	17		*/
18	18
19		−	#include <Imlib2.h>
	19	+	#include <stdlib.h>
	20	+	#include <stdio.h>
20	21
21	22		#include "sxiv.h"
22	23		#include "image.h"
		@@ -30,3 +31,19 @@ void imlib_init(win_t *win) {
30	31		imlib_context_set_colormap(win->env.cmap);
31	32		imlib_context_set_drawable(win->xwin);
32	33		}
	34	+
	35	+	void img_load(img_t img, char filename) {
	36	+	if (!img \|\| !filename)
	37	+	return;
	38	+
	39	+	if (imlib_context_get_image())
	40	+	imlib_free_image();
	41	+
	42	+	if (!(img->im = imlib_load_image(filename)))
	43	+	FATAL("could not open image: %s", filename);
	44	+
	45	+	imlib_context_set_image(img->im);
	46	+
	47	+	img->w = imlib_image_get_width();
	48	+	img->h = imlib_image_get_height();
	49	+	}