gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

fix bug with alpha transparent xpm

Browse Source
This commit is contained in:
kojima
1999-05-30 04:58:32 +00:00
parent fbd9035f3e
commit a498d53fda
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wrlib/Makefile.in
View File

@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
XLFLAGS = @XLFLAGS@ XLFLAGS = @XLFLAGS@
XLIBS = @XLIBS@ XLIBS = @XLIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBRARY_PATH = @X_LIBRARY_PATH@
wprefsdir = @wprefsdir@ wprefsdir = @wprefsdir@
AUTOMAKE_OPTIONS = no-dependencies AUTOMAKE_OPTIONS = no-dependencies

28
wrlib/xpm.c
View File

@@ -99,16 +99,10 @@ RGetImageFromXPMData(RContext *context, char **data)
XColor xcolor; XColor xcolor;
if (strncmp(xpm.colorTable[i].c_color,"None",4)==0) { if (strncmp(xpm.colorTable[i].c_color,"None",4)==0) {
if (context->dpy) { color_table[0][i]=0;
/* ??? */ color_table[1][i]=0;
color_table[0][i]=context->red_offset; color_table[2][i]=0;
color_table[1][i]=context->red_offset; transp = i;
color_table[2][i]=context->red_offset;
} else {
color_table[0][i]=0;
color_table[1][i]=0;
color_table[2][i]=0;
}
continue; continue;
} }
if (XParseColor(dpy, cmap, xpm.colorTable[i].c_color, &xcolor)) { if (XParseColor(dpy, cmap, xpm.colorTable[i].c_color, &xcolor)) {
@@ -213,17 +207,9 @@ RLoadXPM(RContext *context, char *file, int index)
XColor xcolor; XColor xcolor;
if (strncmp(xpm.colorTable[i].c_color,"None",4)==0) { if (strncmp(xpm.colorTable[i].c_color,"None",4)==0) {
if (context->dpy) { color_table[0][i]=0;
/* ??? */ color_table[1][i]=0;
color_table[0][i]=context->red_offset; color_table[2][i]=0;
color_table[1][i]=context->red_offset;
color_table[2][i]=context->red_offset;
} else {
color_table[0][i]=0;
color_table[1][i]=0;
color_table[2][i]=0;
}
transp = i; transp = i;
continue; continue;
} }