Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize imlib2

Browse Source
This commit is contained in:
Bert
2011-01-18 16:40:37 +01:00
parent 22db1ed361
commit 7121e7b468
4 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -4,7 +4,7 @@ CC?=gcc
PREFIX?=/usr/local PREFIX?=/usr/local
CFLAGS+= -std=c99 -Wall -pedantic -g CFLAGS+= -std=c99 -Wall -pedantic -g
LDFLAGS+= LDFLAGS+=
LIBS+= -lX11 LIBS+= -lX11 -lImlib2
SRCFILES=$(wildcard *.c) SRCFILES=$(wildcard *.c)
OBJFILES=$(SRCFILES:.c=.o) OBJFILES=$(SRCFILES:.c=.o)

2
app.c
View File

@@ -35,6 +35,8 @@ void app_init(app_t *app) {
app->win.h = WIN_HEIGHT; app->win.h = WIN_HEIGHT;
win_open(&app->win); win_open(&app->win);
imlib_init(&app->win);
} }
void app_run(app_t *app) { void app_run(app_t *app) {

11
image.c
View File

@@ -16,6 +16,17 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <Imlib2.h>
#include "sxiv.h" #include "sxiv.h"
#include "image.h" #include "image.h"
void imlib_init(win_t *win) {
if (!win)
return;
imlib_context_set_display(win->env.dpy);
imlib_context_set_visual(win->env.vis);
imlib_context_set_colormap(win->env.cmap);
imlib_context_set_drawable(win->xwin);
}

4
image.h
View File

@@ -19,6 +19,8 @@
#ifndef IMAGE_H #ifndef IMAGE_H
#define IMAGE_H #define IMAGE_H
#include "window.h"
typedef enum scalemode_e { typedef enum scalemode_e {
SCALE_DOWN = 0, SCALE_DOWN = 0,
SCALE_FIT, SCALE_FIT,
@@ -34,4 +36,6 @@ typedef struct img_s {
int y; int y;
} img_t; } img_t;
void imlib_init(win_t*);
#endif /* IMAGE_H */ #endif /* IMAGE_H */