e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compile with imlib1 + trivial stuff. 

SVN revision: 10595
This commit is contained in:
Kim Woelders 2004-06-27 10:42:53 +00:00
parent 190bdcc4d8
commit fe129f815e
5 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/E.h
View File

@ -66,19 +66,6 @@
#define ENABLE_TRANSPARENCY 1
#define ENABLE_THEME_TRANSPARENCY 1
#define ST_UNKNWN 0
#define ST_BORDER 1
#define ST_WIDGET 2
#define ST_ICONBOX 3
#define ST_MENU 4
#define ST_MENU_ITEM 5
#define ST_TOOLTIP 6
#define ST_DIALOG 7
#define ST_HILIGHT 8
#define ST_PAGER 9
#define ST_WARPLIST 10
#define ST_BUTTON 11
#define ICLASS_ATTR_OPAQUE 0 /* No transparency */
#define ICLASS_ATTR_BG 1 /* Background transparency */
#define ICLASS_ATTR_GLASS 2 /* Glass transparency */
@ -565,6 +552,19 @@ int Esnprintf(va_alist);
#define SET_ON 1
#define SET_TOGGLE 2
#define ST_UNKNWN 0
#define ST_BORDER 1
#define ST_WIDGET 2
#define ST_ICONBOX 3
#define ST_MENU 4
#define ST_MENU_ITEM 5
#define ST_TOOLTIP 6
#define ST_DIALOG 7
#define ST_HILIGHT 8
#define ST_PAGER 9
#define ST_WARPLIST 10
#define ST_BUTTON 11
/* ISO encodings */
#define ENCOING_ISO_8859_1 0
#define ENCOING_ISO_8859_2 1

2
src/file.c
View File

@ -584,7 +584,6 @@ void
word(const char *s, int num, char *wd)
{
int cnt, i;
char *w;
const char *start, *finish, *ss;
EDBUG(9, "word");
@ -602,7 +601,6 @@ word(const char *s, int num, char *wd)
start = NULL;
finish = NULL;
ss = NULL;
w = wd;
while (s[i])
{

5
src/iclass.c
View File

@ -387,7 +387,7 @@ IclassGetImageState(ImageClass * iclass, int state, int active, int sticky)
static void
ImageStateMakePmapMask(ImageState * is, Drawable win, PmapMask * pmm,
int make_mask, int w, int h, int image_type __UNUSED__)
int make_mask, int w, int h, int image_type)
{
int apply, trans;
int ww, hh;
@ -667,6 +667,9 @@ ImageStateMakePmapMask(ImageState * is, Drawable win, PmapMask * pmm,
imlib_context_set_image(ii);
imlib_free_image();
}
#else
make_mask = 0;
image_type = 0;
#endif
}

3
src/settings.c
View File

@ -2443,11 +2443,14 @@ static char tmp_hiq;
static char tmp_userbg;
static int tmp_bg_timeout;
static int tmp_theme_transparency;
#ifdef ENABLE_THEME_TRANSPARENCY
static int tmp_st_border;
static int tmp_st_widget;
static int tmp_st_menu;
static int tmp_st_tooltip;
static int tmp_st_hilight;
#endif
static void BG_RedrawView(char nuke_old);

2
src/ttfont.c
View File

@ -138,6 +138,8 @@ Efont_extents(Efont * f, const char *text, int *font_ascent_return,
#else
#include <freetype.h>
#endif
#include <sys/ipc.h>
#include <sys/shm.h>
struct _efont
{