nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

look for masks only where the themerc was read from

Browse source
This commit is contained in:
Dana Jansens 2003-08-01 18:23:23 +00:00
parent 0c2ee99388
commit b98021773b
1 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
render/theme.c
View file

@ -1040,28 +1040,12 @@ static gboolean read_mask(const RrInstance *inst,
unsigned int w, h; unsigned int w, h;
unsigned char *b; unsigned char *b;
s = g_build_filename(g_get_home_dir(), ".openbox", "themes", s = g_build_filename(theme->path, maskname, NULL);
theme->name, maskname, NULL); if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) {
if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
ret = TRUE; ret = TRUE;
else {
g_free(s);
s = g_build_filename(THEMEDIR, theme->name, maskname, NULL);
if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
ret = TRUE;
else {
g_free(s);
s = g_build_filename(theme->path, maskname, NULL);
if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
ret = TRUE;
}
}
if (ret) {
*value = RrPixmapMaskNew(inst, w, h, (char*)b); *value = RrPixmapMaskNew(inst, w, h, (char*)b);
XFree(b); XFree(b);
} }
g_free(s); g_free(s);
return ret; return ret;