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 for 0.51.2-pre2

Browse Source
This commit is contained in:
dan
1999-03-09 14:58:01 +00:00
parent 60980735fe
commit 088c0ac230
108 changed files with 2998 additions and 2770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
util/Makefile.am
View File

@@ -5,9 +5,10 @@ pkgdatadir = $(datadir)/@PACKAGE@
bin_PROGRAMS = wxcopy wxpaste wdwrite getstyle setstyle seticons geticonset wmsetbg
bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont
bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c \
wkdemenu.pl
INCLUDES = @DFLAGS@ -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@

7
util/Makefile.in
View File

@@ -91,9 +91,10 @@ pkgdatadir = $(datadir)/@PACKAGE@
bin_PROGRAMS = wxcopy wxpaste wdwrite getstyle setstyle seticons geticonset wmsetbg
bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont
bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c wkdemenu.pl
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c
INCLUDES = @DFLAGS@ -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
@@ -184,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)

2
util/README
View File

@@ -33,4 +33,4 @@ wdwrite- write data into the defaults database (configuration files).
wsetfont- set locale the fonts needed for a specific locale for Window Maker
wkdemenu.sh- convert a KDE menu into a wmaker menu (for pipe)
wkdemenu.pl- convert a KDE menu into a wmaker menu (for pipe)

12
util/setstyle.c
View File

@@ -303,8 +303,9 @@ main(int argc, char **argv)
prop = PLGetProplistWithPath(path);
if (!prop) {
printf("%s:could not load WindowMaker configuration file \"%s\".\n",
ProgName, path);
perror(path);
printf("%s:could not load WindowMaker configuration file.\n",
ProgName);
exit(1);
}
@@ -345,8 +346,8 @@ main(int argc, char **argv)
style = PLGetProplistWithPath(buffer);
if (!style) {
printf("%s:could not load style file \"%s\".\n", ProgName,
buffer);
perror(buffer);
printf("%s:could not load style file.\n", ProgName);
exit(1);
}
@@ -355,7 +356,8 @@ main(int argc, char **argv)
} else {
style = PLGetProplistWithPath(file);
if (!style) {
printf("%s:could not load style file \"%s\".\n", ProgName, file);
perror(file);
printf("%s:could not load style file.\n", ProgName);
exit(1);
}
}

42
util/wmaker.inst.in
View File

@@ -23,7 +23,7 @@ BINDIR="#bindir#"
make_dir() {
mkdir $1
chmod +rw $1
chmod +rwx $1
}
make_script() {
@@ -37,7 +37,7 @@ PATH="\$PATH:$BINDIR"
# If you login from xdm, uncomment this to make error messages appear
# in the console window.
#
# tail -f $HOME/.xsession-errors > /dev/console
# tail -f $HOME/.xsession-errors > /dev/console &
exec wmaker
@@ -240,21 +240,14 @@ fi
cp $GLOBALDIR/README.themes $GSDIR/Library/WindowMaker
cp $GLOBALDIR/README $GSDIR/Library/WindowMaker
# xx herbert
if test -n "$BATCH"; then
test -f ~$GSDIR/Library/WindowMaker/autostart || \
test -f ~$GSDIR/Library/WindowMaker/autostart || \
cp $GLOBALDIR/autostart.sh $GSDIR/Library/WindowMaker/autostart
chmod +rx $GSDIR/Library/WindowMaker/autostart
test -f ~$GSDIR/Library/WindowMaker/exitscript || \
chmod +rx $GSDIR/Library/WindowMaker/autostart
test -f ~$GSDIR/Library/WindowMaker/exitscript || \
cp $GLOBALDIR/exitscript.sh $GSDIR/Library/WindowMaker/exitscript
chmod +rx $GSDIR/Library/WindowMaker/exitscript
else
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
fi
# /xx herbert
chmod +rx $GSDIR/Library/WindowMaker/exitscript
# xx herbert
if test -n "$BATCH" ; then
@@ -267,7 +260,7 @@ fi
#
#######################
DATE=`date +%m%d%H%M`
DATE=`date +%b%d.%T`
show_end_message() {
@@ -286,13 +279,19 @@ else
fi
}
wmaker_found=1
wmaker_found=0
for xinit in .xinitrc .Xclients .xsession; do
test ! -f "$HOME/$xinit" && continue
test -z "`grep wmaker $HOME/$xinit`"
[ $? -eq 0 ] && wmaker_found=0
res="`grep wmaker $HOME/$xinit`"
if test "x$res" != x; then
wmaker_found=1
break
fi
done
[ $wmaker_found -eq 1 ] && show_end_message && exit 0
if test $wmaker_found = 1; then
show_end_message
exit 0
fi
trap "show_end_message;exit" 2
@@ -301,7 +300,8 @@ echo
echo "Now the .xinitrc, .Xclients or .xsession script must be updated so that"
echo "it calls wmaker when you start an X session."
echo "Type the name of the file that must be changed (normally .xinitrc)."
echo "If the file already exists, it will be backed up with a .old.$DATE extension"
echo "If the file already exists, it will be backed up with a .old.$DATE "
echo "extension"
echo "If you want to edit it by hand, hit <Control>-C now."
read file

15
util/wmsetbg.c
View File

@@ -696,6 +696,12 @@ duplicatePixmap(Pixmap pixmap, int width, int height)
}
static int
dummyErrorHandler(Display *dpy, XErrorEvent *err)
{
return 0;
}
void
setPixmapProperty(Pixmap pixmap)
{
@@ -717,7 +723,10 @@ setPixmapProperty(Pixmap pixmap)
&type, &format, &length, &after, &data);
if ((type == XA_PIXMAP) && (format == 32) && (length == 1)) {
XSetErrorHandler(dummyErrorHandler);
XKillClient(dpy, *((Pixmap *)data));
XSync(dpy, False);
XSetErrorHandler(NULL);
mode = PropModeReplace;
} else {
mode = PropModeAppend;
@@ -976,7 +985,6 @@ char*
getPixmapPath(char *domain)
{
proplist_t val;
proplist_t d;
char *ptr, *data;
int len, i, count;
@@ -1019,7 +1027,7 @@ getPixmapPath(char *domain)
if (i>0)
ptr--; *(ptr--) = 0;
PLRelease(d);
PLRelease(val);
return data;
}
@@ -1118,7 +1126,6 @@ main(int argc, char **argv)
char *texture = NULL;
int workspace = -1;
signal(SIGINT, SIG_DFL);
signal(SIGTERM, SIG_DFL);
signal(SIGQUIT, SIG_DFL);
@@ -1141,7 +1148,7 @@ main(int argc, char **argv)
wfatal("too few arguments for %s\n", argv[i-1]);
exit(1);
}
display = argv[i+1];
display = argv[i];
} else if (strcmp(argv[i], "-s")==0
|| strcmp(argv[i], "--scale")==0) {
style = "spixmap";