old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sun Oct 13 01:27:51 2002 Michael Jennings (mej) 

Make sure it builds without Imlib2 so we don't have a repeat of last
time.


SVN revision: 6422
This commit is contained in:
Michael Jennings 2002-10-13 05:28:36 +00:00
parent a74ae94c5a
commit 340755e956
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4864,3 +4864,8 @@ Make sure we exit cleanly if our window is destroyed.
Fixed the missing menus in the Escreen theme. You'll still get an
error message when it loads, but I'm not that worried about it.
----------------------------------------------------------------------
Sun Oct 13 01:27:51 2002 Michael Jennings (mej)
Make sure it builds without Imlib2 so we don't have a repeat of last
time.
----------------------------------------------------------------------

10
src/options.c
View File

@ -1694,8 +1694,8 @@ parse_image(char *buff, void *state)
FREE(fg);
FREE(bg);
#ifdef PIXMAP_SUPPORT
} else if (!BEG_STRCASECMP(buff, "file ")) {
#ifdef PIXMAP_SUPPORT
char *filename = get_pword(2, buff);
if (!CHECK_VALID_INDEX(idx)) {
@ -1716,8 +1716,10 @@ parse_image(char *buff, void *state)
images[idx].mode &= ~(MODE_IMAGE | ALLOW_IMAGE);
D_PIXMAP(("New image mode is 0x%02x, iml->im is 0x%08x\n", images[idx].mode, images[idx].current->iml->im));
}
#endif
} else if (!BEG_STRCASECMP(buff, "geom ")) {
#ifdef PIXMAP_SUPPORT
char *geom = get_pword(2, buff);
if (!CHECK_VALID_INDEX(idx)) {
@ -1735,8 +1737,10 @@ parse_image(char *buff, void *state)
return NULL;
}
set_pixmap_scale(geom, images[idx].current->pmap);
#endif
} else if (!BEG_STRCASECMP(buff, "cmod ") || !BEG_STRCASECMP(buff, "colormod ")) {
#ifdef PIXMAP_SUPPORT
char *color = get_pword(2, buff);
char *mods = get_pword(3, buff);
unsigned char n;
@ -3594,10 +3598,12 @@ save_config(char *path, unsigned char save_theme)
} else {
fprintf(fp, " button ");
}
#ifdef PIXMAP_SUPPORT
if (b->icon && b->icon->iml) {
imlib_context_set_image(b->icon->iml->im);
fprintf(fp, "icon \"%s\" ", NONULL(imlib_image_get_filename()));
}
#endif
fprintf(fp, "action ");
if (b->type == ACTION_STRING) {
fprintf(fp, "string '%s'\n", safe_print_string(b->action.string, -1));
@ -3615,10 +3621,12 @@ save_config(char *path, unsigned char save_theme)
} else {
fprintf(fp, " rbutton ");
}
#ifdef PIXMAP_SUPPORT
if (b->icon && b->icon->iml) {
imlib_context_set_image(b->icon->iml->im);
fprintf(fp, "icon \"%s\" ", NONULL(imlib_image_get_filename()));
}
#endif
fprintf(fp, "action ");
if (b->type == ACTION_STRING) {
fprintf(fp, "string '%s'\n", safe_print_string(b->action.string, -1));

4
src/pixmap.c
View File

@ -1011,9 +1011,11 @@ render_simage(simage_t *simg, Window win, unsigned short width, unsigned short h
LIBAST_X_FREE_PIXMAP(buffer_pixmap);
buffer_pixmap = None;
}
#ifdef PIXMAP_SUPPORT
/* Reset window shape mask. */
shaped_window_apply_mask(win, None);
#ifdef PIXMAP_SUPPORT
if ((images[which].mode & MODE_AUTO) && (images[which].mode & ALLOW_AUTO)) {
char buff[255];
const char *iclass, *state;

2
src/pixmap.h
View File

@ -27,7 +27,7 @@
#include <X11/Xatom.h>
#ifdef PIXMAP_SUPPORT
# include <Imlib2.h>
#else
#elif !defined(DATA64)
typedef struct {
int left, top, right, bottom;
} Imlib_Border;