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

Fixed a bug in wmsetbg.c

Browse Source
This commit is contained in:
dan
1999-05-31 19:10:38 +00:00
parent bb1a700aa9
commit 81d1ec430f
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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@
SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc contrib SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc contrib
@@ -113,9 +114,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \ cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -282,11 +283,6 @@ distdir: $(DISTFILES)
-rm -rf $(distdir) -rm -rf $(distdir)
mkdir $(distdir) mkdir $(distdir)
-chmod 777 $(distdir) -chmod 777 $(distdir)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

1
test/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

1
util/Makefile.in
View File

@@ -87,6 +87,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

18
util/wmsetbg.c
View File

@@ -358,6 +358,15 @@ parseTexture(RContext *rc, char *text)
pixmap = LoadJPEG(rc, tmp, &iwidth, &iheight); pixmap = LoadJPEG(rc, tmp, &iwidth, &iheight);
*/ */
if (!pixmap) {
image = loadImage(rc, tmp);
if (!image) {
goto error;
}
iwidth = image->width;
iheight = image->height;
}
GETSTRORGOTO(val, tmp, 2, error); GETSTRORGOTO(val, tmp, 2, error);
if (!XParseColor(dpy, DefaultColormap(dpy, scr), tmp, &color)) { if (!XParseColor(dpy, DefaultColormap(dpy, scr), tmp, &color)) {
@@ -374,15 +383,6 @@ parseTexture(RContext *rc, char *text)
RGetClosestXColor(rc, &rcolor, &color); RGetClosestXColor(rc, &rcolor, &color);
} }
if (!pixmap) {
image = loadImage(rc, tmp);
if (!image) {
goto error;
}
iwidth = image->width;
iheight = image->height;
}
switch (toupper(type[0])) { switch (toupper(type[0])) {
case 'T': case 'T':
texture->width = iwidth; texture->width = iwidth;

1
wmlib/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