gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-02 22:25:48 +01:00
Code Issues Projects Releases Wiki Activity

Update to Window Maker 0.50.2

Browse Source
This commit is contained in:
dan
1999-01-11 12:28:12 +00:00
parent a37bb3aed5
commit cb320b2fc3
87 changed files with 4999 additions and 4465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
util/Makefile.am
View File

@@ -30,9 +30,10 @@ seticons_LDADD= $(liblist)
geticonset_LDADD= $(liblist)
wmsetbg_LDADD = $(top_builddir)/libPropList/libPropList.la \
wmsetbg_LDADD = \
$(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWINGs.a \
$(top_builddir)/libPropList/libPropList.la \
@GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm
getstyle_SOURCES = getstyle.c

9
util/Makefile.in
View File

@@ -74,6 +74,7 @@ LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MOFILES = @MOFILES@
NLSDIR = @NLSDIR@
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
REDUCE_APPICONS = @REDUCE_APPICONS@
@@ -121,9 +122,10 @@ seticons_LDADD= $(liblist)
geticonset_LDADD= $(liblist)
wmsetbg_LDADD = $(top_builddir)/libPropList/libPropList.la \
wmsetbg_LDADD = \
$(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWINGs.a \
$(top_builddir)/libPropList/libPropList.la \
@GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm
getstyle_SOURCES = getstyle.c
@@ -178,8 +180,9 @@ geticonset_OBJECTS = geticonset.o
geticonset_DEPENDENCIES = $(top_builddir)/libPropList/libPropList.la
geticonset_LDFLAGS =
wmsetbg_OBJECTS = wmsetbg.o
wmsetbg_DEPENDENCIES = $(top_builddir)/libPropList/libPropList.la \
$(top_builddir)/wrlib/libwraster.la $(top_builddir)/WINGs/libWINGs.a
wmsetbg_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la \
$(top_builddir)/WINGs/libWINGs.a \
$(top_builddir)/libPropList/libPropList.la
wmsetbg_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS)

21
util/wmaker.inst.in
View File

@@ -52,9 +52,14 @@ copy() {
sed -e "s|~/GNUstep|$GSDIR|g" $source > $target
else
if test "x$GNUSTEP_USER_ROOT" = "x"; then
cp $source $target
sed -e "s:#wmdatadir#:$GLOBALDIR:g" \
-e "s://:/:g" \
$source > $target
else
sed -e "s|~/GNUstep|$GSDIR|g" $source > $target
sed -e "s|~/GNUstep|$GSDIR|g" \
-e "s:#wmdatadir#:$GLOBALDIR:g" \
-e "s://:/:g" \
$source > $target
fi
fi
}
@@ -66,7 +71,7 @@ echo "Installing WindowMaker $VERSION for current user..."
if [ ! -d $GLOBALDIR ]; then
echo "Could not find global configurations files"
echo "Make sure you've installed Window Maker correctly"
echo "Make sure you have installed Window Maker correctly"
exit 1
fi
@@ -195,7 +200,8 @@ else
fi
if test -z #LITE# ; then
if test -z "#LITE#" ; then
FILES=`(cd $GLOBALDIR; ls menu menu.* plmenu plmenu.?? wmmacros)`
for i in $FILES; do
if [ -f "$GSDIR/Library/WindowMaker/$i" ]; then
echo "The file \"$i\" already exists in $GSDIR/Library/WindowMaker"
@@ -215,9 +221,12 @@ for i in $FILES; do
done
fi
cp $GLOBALDIR/README.themes $GSDIR/Library/WindowMaker
cp $GLOBALDIR/README $GSDIR/Library/WindowMaker
cp -i $GLOBALDIR/autostart.sh $GSDIR/Library/WindowMaker/autostart
chmod +rx $GSDIR/Library/WindowMaker/autostart
cp -i $GLOBALDIR/exitscript.sh $GSDIR/Library/WindowMaker/exitscript
chmod +rx $GSDIR/Library/WindowMaker/exitscript
#
#######################
@@ -229,7 +238,7 @@ show_end_message() {
echo
echo "Installation Finished"
echo
if test -z #LITE# ; then
if test -z "#LITE#" ; then
echo "There are menus in 2 different file formats. The plain text format and"
echo "the property list format. The plain text format is more flexible, but"
echo "the menu in the property list format can be edited graphically. The"
@@ -241,7 +250,7 @@ else
fi
}
if test -z `grep wmaker ~/.xinitrc`; then
if test -z "`grep wmaker ~/.xinitrc`"; then
show_end_message
exit 0
fi

28
util/wmsetbg.c
View File

@@ -32,6 +32,7 @@
#include <pwd.h>
#include <signal.h>
#include <sys/types.h>
#include <ctype.h>
#include "../src/wconfig.h"
@@ -311,10 +312,12 @@ parseTexture(RContext *rc, char *text)
texture->pixmap = pixmap;
} else if (strcasecmp(type, "cpixmap")==0
|| strcasecmp(type, "spixmap")==0
|| strcasecmp(type, "mpixmap")==0
|| strcasecmp(type, "tpixmap")==0) {
XColor color;
Pixmap pixmap;
RImage *image;
int w, h;
GETSTR(val, tmp, 1);
@@ -338,8 +341,7 @@ parseTexture(RContext *rc, char *text)
rcolor.blue = color.blue >> 8;
RGetClosestXColor(rc, &rcolor, &color);
}
switch (type[0]) {
case 't':
switch (toupper(type[0])) {
case 'T':
texture->width = image->width;
texture->height = image->height;
@@ -350,12 +352,12 @@ parseTexture(RContext *rc, char *text)
goto error;
}
break;
case 's':
case 'S':
{
RImage *simage;
int w, h;
case 'M':
if (toupper(type[0])=='S') {
w = scrWidth;
h = scrHeight;
} else {
if (image->width*scrHeight > image->height*scrWidth) {
w = scrWidth;
h = (scrWidth*image->height)/image->width;
@@ -363,6 +365,9 @@ parseTexture(RContext *rc, char *text)
h = scrHeight;
w = (scrHeight*image->width)/image->height;
}
}
{
RImage *simage;
simage = RScaleImage(image, w, h);
if (!simage) {
@@ -835,6 +840,12 @@ helperLoop(RContext *rc)
setupTexture(rc, textures, &maxTextures, workspace, NULL);
break;
case 'K':
#ifdef DEBUG
printf("exit command\n");
#endif
exit(0);
default:
wwarning("unknown message received");
break;
@@ -949,6 +960,7 @@ print_help(char *ProgName)
puts(" -t tile image");
puts(" -e center image");
puts(" -s scale image (default)");
puts(" -a scale image and keep aspect ratio");
puts(" -u update WindowMaker domain database");
puts(" -D <domain> update <domain> database");
puts(" -c <cpc> colors per channel to use");
@@ -1041,6 +1053,8 @@ main(int argc, char **argv)
style = "tpixmap";
} else if (strcmp(argv[i], "-e")==0) {
style = "cpixmap";
} else if (strcmp(argv[i], "-a")==0) {
style = "mpixmap";
} else if (strcmp(argv[i], "-d")==0) {
render_mode = RM_DITHER;
obey_user++;