mirror of
https://github.com/gryf/wmaker.git
synced 2026-01-07 14:24:14 +01:00
Initial update from my source tree. For 0.52.0
This commit is contained in:
@@ -185,7 +185,7 @@ DIST_COMMON = README Makefile.am Makefile.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
SOURCES = $(wxcopy_SOURCES) $(wxpaste_SOURCES) $(wdwrite_SOURCES) $(getstyle_SOURCES) $(setstyle_SOURCES) $(seticons_SOURCES) $(geticonset_SOURCES) $(wmsetbg_SOURCES)
|
||||
OBJECTS = $(wxcopy_OBJECTS) $(wxpaste_OBJECTS) $(wdwrite_OBJECTS) $(getstyle_OBJECTS) $(setstyle_OBJECTS) $(seticons_OBJECTS) $(geticonset_OBJECTS) $(wmsetbg_OBJECTS)
|
||||
|
||||
@@ -361,6 +361,11 @@ main(int argc, char **argv)
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
if (!PLIsArray(style)) {
|
||||
printf("%s: '%s' is not a style file/theme\n", ProgName, file);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
hackStyle(style);
|
||||
|
||||
|
||||
@@ -156,14 +156,14 @@ parseTexture(RContext *rc, char *text)
|
||||
}
|
||||
XAllocColor(dpy, DefaultColormap(dpy, scr), &color);
|
||||
|
||||
pixmap = XCreatePixmap(dpy, root, 32, 32, DefaultDepth(dpy, scr));
|
||||
pixmap = XCreatePixmap(dpy, root, 8, 8, DefaultDepth(dpy, scr));
|
||||
XSetForeground(dpy, DefaultGC(dpy, scr), color.pixel);
|
||||
XFillRectangle(dpy, pixmap, DefaultGC(dpy, scr), 0, 0, 32, 32);
|
||||
XFillRectangle(dpy, pixmap, DefaultGC(dpy, scr), 0, 0, 8, 8);
|
||||
|
||||
texture->pixmap = pixmap;
|
||||
texture->color = color;
|
||||
texture->width = 32;
|
||||
texture->height = 32;
|
||||
texture->width = 8;
|
||||
texture->height = 8;
|
||||
} else if (strcasecmp(type, "vgradient")==0
|
||||
|| strcasecmp(type, "dgradient")==0
|
||||
|| strcasecmp(type, "hgradient")==0) {
|
||||
@@ -201,12 +201,12 @@ parseTexture(RContext *rc, char *text)
|
||||
case 'H':
|
||||
gtype = RHorizontalGradient;
|
||||
iwidth = scrWidth;
|
||||
iheight = 32;
|
||||
iheight = 1;
|
||||
break;
|
||||
case 'V':
|
||||
case 'v':
|
||||
gtype = RVerticalGradient;
|
||||
iwidth = 32;
|
||||
iwidth = 1;
|
||||
iheight = scrHeight;
|
||||
break;
|
||||
default:
|
||||
@@ -294,12 +294,12 @@ parseTexture(RContext *rc, char *text)
|
||||
case 'H':
|
||||
gtype = RHorizontalGradient;
|
||||
iwidth = scrWidth;
|
||||
iheight = 32;
|
||||
iheight = 1;
|
||||
break;
|
||||
case 'V':
|
||||
case 'v':
|
||||
gtype = RVerticalGradient;
|
||||
iwidth = 32;
|
||||
iwidth = 1;
|
||||
iheight = scrHeight;
|
||||
break;
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user