added contrib/ directory, updated WPrefs and wmsetbg for smoothed

backgrounds, added GNUstep info panel, added patch for
saving menu position state

ChangeLog

@@ -27,6 +27,9 @@ Changes since version 0.53.0:
 - HP-UX compiler compatibility workarounds (Sebastien Bauer
 						seb_bauer@bigfoot.com)
 - fixed crash with attributes panel
+- save state of all menus when exiting (Sebastien Bauer
+						seb_bauer@bigfoot.com)
+- added GNUstep info panel (still needs beautification..)
 
 Changes since version 0.52.0:
 .............................

Makefile.am

@@ -4,7 +4,7 @@ SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc\
 	contrib
 
 EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL \
-	Install acconfig.h\
+	Install acconfig.h \
 	mkpatch README.KDE README.GNOME WindowMaker.lsm.in\
 	docklib-0.2.tar.gz libwmfun-0.0.1.tar.gz 
 

Makefile.in

@@ -98,9 +98,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ./src/config.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 config.guess \
+Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess config.sub \
-config.sub configure configure.in install-sh ltconfig ltmain.sh missing \
+configure configure.in install-sh ltconfig ltmain.sh missing \
-mkinstalldirs src/config.h.in src/stamp-h.in
+mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -110,9 +110,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -124,34 +124,6 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-src/config.h: src/stamp-h
-	@if test ! -f $@; then \
-		rm -f src/stamp-h; \
-		$(MAKE) src/stamp-h; \
-	else :; fi
-src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > src/stamp-h 2> /dev/null
-$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/src/stamp-h.in; \
-		$(MAKE) $(srcdir)/src/stamp-h.in; \
-	else :; fi
-$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f src/config.h
-
-maintainer-clean-hdr:
-
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -279,6 +251,11 @@ distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(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 \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -335,33 +312,33 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
+clean-am:  clean-tags clean-generic mostlyclean-am
 
 clean: clean-recursive
 
-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
+distclean-am:  distclean-tags distclean-generic clean-am
 	-rm -f libtool
 
 distclean: distclean-recursive
 	-rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		maintainer-clean-generic distclean-am
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+.PHONY: install-data-recursive uninstall-data-recursive \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
+installcheck-recursive info-recursive dvi-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \

WINGs/Resources/Makefile.in

@@ -108,9 +108,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Resources/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WINGs/Resources/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -142,6 +142,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WINGs/Resources
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WINGs/Resources/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WINGs/wframe.c

@@ -10,8 +10,8 @@ typedef struct W_Frame {
 
     
     struct {
-	WMReliefType relief:3;
+	WMReliefType relief:4;
-	WMTitlePosition titlePosition:3;
+	WMTitlePosition titlePosition:4;
     } flags;
 } Frame;
 

WINGs/wscroller.c

@@ -31,11 +31,11 @@ typedef struct W_Scroller {
 					* dragged */
 #endif
     struct {
-	WMScrollArrowPosition arrowsPosition:3;
+	WMScrollArrowPosition arrowsPosition:4;
 
 	unsigned int horizontal:1;
 
-	WMScrollerPart hitPart:3;
+	WMScrollerPart hitPart:4;
 
 	/* */	
 	unsigned int documentFullyVisible:1;   /* document is fully visible */

WPrefs.app/Appearance.c

@@ -487,17 +487,18 @@ renderTexture(WMScreen *scr, proplist_t texture, int width, int height,
 	    free(colors);
 	}
     } else if (strcasecmp(&type[1], "pixmap")==0) {
-	RImage *timage;
+	RImage *timage = NULL;
 	char *path;
 	RColor color;
 
 	str = PLGetString(PLGetArrayElement(texture, 1));
 
 	path = wfindfileinarray(GetObjectForKey("PixmapPath"), str);
+	if (path)
 	    timage = RLoadImage(rc, path, 0);
 
 	if (!timage) {
-	    wwarning("could not load file '%s': %s", path,
+	    wwarning("could not load file '%s': %s", path ? path : str,
 		     RMessageForError(RErrorCode));
 	} else {
 	    str = PLGetString(PLGetArrayElement(texture, 2));

WPrefs.app/Configurations.c

@@ -49,6 +49,9 @@ typedef struct _Panel {
     WMButton *sfxB;
     WMLabel *noteL;
 
+    WMFrame *smoF;
+    WMButton *smoB;
+
     WMFrame *dithF;
     WMButton *dithB;
     WMSlider *dithS;
@@ -69,6 +72,7 @@ typedef struct _Panel {
 #define ANIM_IMAGE	"animations"
 #define SUPERF_IMAGE	"moreanim"
 #define SOUND_IMAGE	"sound"
+#define SMOOTH_IMAGE	"smooth"
 
 #define SPEED_IMAGE 	"speed%i"
 #define SPEED_IMAGE_S 	"speed%is"
@@ -98,6 +102,8 @@ showData(_Panel *panel)
 
     WMSetButtonSelected(panel->sfxB, !GetBoolForKey("DisableSound"));
 
+    WMSetButtonSelected(panel->smoB, GetBoolForKey("SmoothWorkspaceBack"));
+
     WMSetButtonSelected(panel->dithB, GetBoolForKey("DisableDithering"));
     
     WMSetSliderValue(panel->dithS, GetIntegerForKey("ColormapSize"));
@@ -192,14 +198,14 @@ createPanel(Panel *p)
     /*********** Icon Slide Speed **********/
     
     panel->icoF = WMCreateFrame(panel->frame);
-    WMResizeWidget(panel->icoF, 230, 55);
+    WMResizeWidget(panel->icoF, 230, 45);
     WMMoveWidget(panel->icoF, 15, 10);
     WMSetFrameTitle(panel->icoF, _("Icon Slide Speed"));
     
     /*********** Shade Animation Speed **********/
     panel->shaF = WMCreateFrame(panel->frame);
-    WMResizeWidget(panel->shaF, 230, 55);
+    WMResizeWidget(panel->shaF, 230, 45);
-    WMMoveWidget(panel->shaF, 15, 70);
+    WMMoveWidget(panel->shaF, 15, 60);
     WMSetFrameTitle(panel->shaF, _("Shade Animation Speed"));
 
     
@@ -209,9 +215,9 @@ createPanel(Panel *p)
     for (i = 0; i < 5; i++) {
 	panel->icoB[i] = WMCreateCustomButton(panel->icoF, WBBStateChangeMask);
 	panel->shaB[i] = WMCreateCustomButton(panel->shaF, WBBStateChangeMask);
-	WMResizeWidget(panel->icoB[i], 40, 35);
+	WMResizeWidget(panel->icoB[i], 40, 24);
 	WMMoveWidget(panel->icoB[i], 10+(40*i), 15);
-	WMResizeWidget(panel->shaB[i], 40, 35);
+	WMResizeWidget(panel->shaB[i], 40, 24);
 	WMMoveWidget(panel->shaB[i], 10+(40*i), 15);
 	WMSetButtonBordered(panel->icoB[i], False);
 	WMSetButtonImagePosition(panel->icoB[i], WIPImageOnly);
@@ -257,15 +263,58 @@ createPanel(Panel *p)
     WMMapSubwidgets(panel->icoF);
     WMMapSubwidgets(panel->shaF);
 
+
+    /***************** Smoothed Scaling *****************/
+    panel->smoF = WMCreateFrame(panel->frame);
+    WMResizeWidget(panel->smoF, 115, 110);
+    WMMoveWidget(panel->smoF, 18, 115);
+    WMSetFrameTitle(panel->smoF, _("Smooth Scaling"));
+    WMSetBalloonTextForView(_("Smooth scaled background images, neutralizing\n"
+			      "the `pixelization' effect. This will slow\n"
+			      "down loading of background images considerably."),
+			     WMWidgetView(panel->smoF));
+
+    panel->smoB = WMCreateButton(panel->smoF, WBTToggle);
+    WMResizeWidget(panel->smoB, 64, 64);
+    WMMoveWidget(panel->smoB, 25, 25);
+    WMSetButtonImagePosition(panel->smoB, WIPImageOnly);
+    path = LocateImage(SMOOTH_IMAGE);
+    if (path) {
+	RImage *image, *scaled;
+
+	image = RLoadImage(WMScreenRContext(scr), path, 0);
+	free(path);
+	
+	scaled = RScaleImage(image, 61, 61);
+	icon = WMCreatePixmapFromRImage(scr, scaled, 128);
+	RDestroyImage(scaled);
+	if (icon) {
+	    WMSetButtonImage(panel->smoB, icon);
+	    WMReleasePixmap(icon);
+	}
+
+	scaled = RSmoothScaleImage(image, 61, 61);
+	icon = WMCreatePixmapFromRImage(scr, scaled, 128);
+	RDestroyImage(scaled);
+	if (icon) {
+	    WMSetButtonAltImage(panel->smoB, icon);
+	    WMReleasePixmap(icon);
+	}
+
+	RDestroyImage(image);
+    }
+
+    WMMapSubwidgets(panel->smoF);
+
     /***************** Titlebar Style Size ****************/
     panel->titlF = WMCreateFrame(panel->frame);
-    WMResizeWidget(panel->titlF, 230, 95);
+    WMResizeWidget(panel->titlF, 105, 110);
-    WMMoveWidget(panel->titlF, 15, 130);
+    WMMoveWidget(panel->titlF, 140, 115);
     WMSetFrameTitle(panel->titlF, _("Titlebar Style"));
     
     panel->newsB = WMCreateButton(panel->titlF, WBTOnOff);
-    WMResizeWidget(panel->newsB, 90, 60);
+    WMResizeWidget(panel->newsB, 74, 40);
-    WMMoveWidget(panel->newsB, 25, 20);
+    WMMoveWidget(panel->newsB, 15, 20);
     WMSetButtonImagePosition(panel->newsB, WIPImageOnly);
     path = LocateImage(NEWS_IMAGE);
     if (path) {
@@ -277,8 +326,8 @@ createPanel(Panel *p)
     }
 
     panel->oldsB = WMCreateButton(panel->titlF, WBTOnOff);
-    WMResizeWidget(panel->oldsB, 90, 60);
+    WMResizeWidget(panel->oldsB, 74, 40);
-    WMMoveWidget(panel->oldsB, 115, 20);
+    WMMoveWidget(panel->oldsB, 15, 60);
     WMSetButtonImagePosition(panel->oldsB, WIPImageOnly);
     path = LocateImage(OLDS_IMAGE);
     if (path) {
@@ -452,6 +501,8 @@ storeData(_Panel *panel)
     SetBoolForKey(WMGetButtonSelected(panel->supB), "Superfluous");
     SetBoolForKey(!WMGetButtonSelected(panel->sfxB), "DisableSound");
 
+    SetBoolForKey(!WMGetButtonSelected(panel->smoB), "SmoothWorkspaceBack");
+    
     SetBoolForKey(WMGetButtonSelected(panel->dithB), "DisableDithering");
     SetIntegerForKey(WMGetSliderValue(panel->dithS), "ColormapSize");
 }

WPrefs.app/Menu.c

@@ -1314,7 +1314,8 @@ postProcessMenu(proplist_t menu)
 	    if (strcmp(cmd, "RESTARTW")==0) {
 		changeItemCommand(item, "RESTART");
 		removeParameter(item);
-	    } else if (strcmp(cmd, "EXEC")==0 || strcmp(cmd, "OPEN_MENU")==0) {
+	    } else if (strcmp(cmd, "EXEC")==0 || strcmp(cmd, "SHEXEC")==0 || 
+		       strcmp(cmd, "OPEN_MENU")==0) {
 		/* do nothing */
 	    } else if (strcmp(cmd, "RESTART")==0 || strcmp(cmd, "SHUTDOWN")==0
 		       || strcmp(cmd, "EXIT")==0) {

WPrefs.app/po/Makefile.in

@@ -120,9 +120,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .mo .po
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/po/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/po/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -135,6 +135,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WPrefs.app/po
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/po/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WPrefs.app/tiff/Makefile.am

@@ -33,6 +33,7 @@ tiffdata_DATA = \
 	oldstyle.tiff \
 	opaque.tiff \
 	paths.tiff \
+	smooth.tiff \
 	sound.tiff \
 	speed0.tiff \
 	speed0s.tiff \

WPrefs.app/tiff/Makefile.in

@@ -90,7 +90,7 @@ wprefsdir = @wprefsdir@
 
 tiffdatadir = $(wprefsdir)/tiff
 
-tiffdata_DATA =  	advancetonewworkspace.tiff 	animations.tiff 	appearance.tiff 	clip.tiff 	configs.tiff 	cycleworkspaces.tiff 	dock.tiff 	dontlinkworkspaces.tiff 	ergonomic.tiff 	ergowood.tiff 	expert.tiff 	fonts.tiff 	iconprefs.tiff 	keyboard.tiff 	keyboardprefs.tiff 	keyshortcuts.tiff 	menualign1.tiff 	menualign2.tiff 	menuprefs.tiff 	menus.tiff 	minimouseleft.tiff 	minimousemiddle.tiff 	minimouseright.tiff 	miscprefs2.tiff 	moreanim.tiff 	mousesettings.tiff 	mousespeed.tiff 	newstyle.tiff 	nonopaque.tiff 	oldstyle.tiff 	opaque.tiff 	paths.tiff 	sound.tiff 	speed0.tiff 	speed0s.tiff 	speed1.tiff 	speed1s.tiff 	speed2.tiff 	speed2s.tiff 	speed3.tiff 	speed3s.tiff 	speed4.tiff 	speed4s.tiff 	tdel.tiff 	tedit.tiff 	temp.tiff 	textr.tiff 	theme.tiff 	timer0.tiff 	timer0s.tiff 	timer1.tiff 	timer1s.tiff 	timer2.tiff 	timer2s.tiff 	timer3.tiff 	timer3s.tiff 	timer4.tiff 	timer4s.tiff 	timer5.tiff 	timer5s.tiff 	tnew.tiff 	whandling.tiff 	windowfocus.tiff 	workspace.tiff 	xis.tiff 
+tiffdata_DATA =  	advancetonewworkspace.tiff 	animations.tiff 	appearance.tiff 	clip.tiff 	configs.tiff 	cycleworkspaces.tiff 	dock.tiff 	dontlinkworkspaces.tiff 	ergonomic.tiff 	ergowood.tiff 	expert.tiff 	fonts.tiff 	iconprefs.tiff 	keyboard.tiff 	keyboardprefs.tiff 	keyshortcuts.tiff 	menualign1.tiff 	menualign2.tiff 	menuprefs.tiff 	menus.tiff 	minimouseleft.tiff 	minimousemiddle.tiff 	minimouseright.tiff 	miscprefs2.tiff 	moreanim.tiff 	mousesettings.tiff 	mousespeed.tiff 	newstyle.tiff 	nonopaque.tiff 	oldstyle.tiff 	opaque.tiff 	paths.tiff 	smooth.tiff 	sound.tiff 	speed0.tiff 	speed0s.tiff 	speed1.tiff 	speed1s.tiff 	speed2.tiff 	speed2s.tiff 	speed3.tiff 	speed3s.tiff 	speed4.tiff 	speed4s.tiff 	tdel.tiff 	tedit.tiff 	temp.tiff 	textr.tiff 	theme.tiff 	timer0.tiff 	timer0s.tiff 	timer1.tiff 	timer1s.tiff 	timer2.tiff 	timer2s.tiff 	timer3.tiff 	timer3s.tiff 	timer4.tiff 	timer4s.tiff 	timer5.tiff 	timer5s.tiff 	tnew.tiff 	whandling.tiff 	windowfocus.tiff 	workspace.tiff 	xis.tiff 
 
 
 EXTRA_DIST = $(tiffdata_DATA)
@@ -109,9 +109,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/tiff/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/tiff/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -143,6 +143,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WPrefs.app/tiff
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/tiff/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WPrefs.app/xpm/Makefile.am

@@ -33,6 +33,7 @@ xpmdata_DATA = \
 	oldstyle.xpm \
 	opaque.xpm \
 	paths.xpm \
+	smooth.xpm \
 	sound.xpm \
 	speed0.xpm \
 	speed0s.xpm \

WPrefs.app/xpm/Makefile.in

@@ -90,7 +90,7 @@ wprefsdir = @wprefsdir@
 
 xpmdatadir = $(wprefsdir)/xpm
 
-xpmdata_DATA =  	advancetonewworkspace.xpm 	animations.xpm 	appearance.xpm 	clip.xpm 	configs.xpm 	cycleworkspaces.xpm 	dock.xpm 	dontlinkworkspaces.xpm 	ergonomic.xpm 	ergowood.xpm 	expert.xpm 	fonts.xpm 	iconprefs.xpm 	keyboard.xpm 	keyboardprefs.xpm 	keyshortcuts.xpm 	menualign1.xpm 	menualign2.xpm 	menuprefs.xpm 	menus.xpm 	minimouseleft.xpm 	minimousemiddle.xpm 	minimouseright.xpm 	miscprefs2.xpm 	moreanim.xpm 	mousesettings.xpm 	mousespeed.xpm 	newstyle.xpm 	nonopaque.xpm 	oldstyle.xpm 	opaque.xpm 	paths.xpm 	sound.xpm 	speed0.xpm 	speed0s.xpm 	speed1.xpm 	speed1s.xpm 	speed2.xpm 	speed2s.xpm 	speed3.xpm 	speed3s.xpm 	speed4.xpm 	speed4s.xpm 	temp.xpm 	theme.xpm 	timer0.xpm 	timer0s.xpm 	timer1.xpm 	timer1s.xpm 	timer2.xpm 	timer2s.xpm 	timer3.xpm 	timer3s.xpm 	timer4.xpm 	timer4s.xpm 	timer5.xpm 	timer5s.xpm 	whandling.xpm 	windowfocus.xpm 	workspace.xpm 	xis.xpm 
+xpmdata_DATA =  	advancetonewworkspace.xpm 	animations.xpm 	appearance.xpm 	clip.xpm 	configs.xpm 	cycleworkspaces.xpm 	dock.xpm 	dontlinkworkspaces.xpm 	ergonomic.xpm 	ergowood.xpm 	expert.xpm 	fonts.xpm 	iconprefs.xpm 	keyboard.xpm 	keyboardprefs.xpm 	keyshortcuts.xpm 	menualign1.xpm 	menualign2.xpm 	menuprefs.xpm 	menus.xpm 	minimouseleft.xpm 	minimousemiddle.xpm 	minimouseright.xpm 	miscprefs2.xpm 	moreanim.xpm 	mousesettings.xpm 	mousespeed.xpm 	newstyle.xpm 	nonopaque.xpm 	oldstyle.xpm 	opaque.xpm 	paths.xpm 	smooth.xpm 	sound.xpm 	speed0.xpm 	speed0s.xpm 	speed1.xpm 	speed1s.xpm 	speed2.xpm 	speed2s.xpm 	speed3.xpm 	speed3s.xpm 	speed4.xpm 	speed4s.xpm 	temp.xpm 	theme.xpm 	timer0.xpm 	timer0s.xpm 	timer1.xpm 	timer1s.xpm 	timer2.xpm 	timer2s.xpm 	timer3.xpm 	timer3s.xpm 	timer4.xpm 	timer4s.xpm 	timer5.xpm 	timer5s.xpm 	whandling.xpm 	windowfocus.xpm 	workspace.xpm 	xis.xpm 
 
 
 EXTRA_DIST = $(xpmdata_DATA)
@@ -109,9 +109,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/xpm/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/xpm/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -143,6 +143,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WPrefs.app/xpm
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/xpm/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WPrefs.app/xpm/newstyle.xpm

@@ -1,66 +1,44 @@
 /* XPM */
 static char * image_name[] = {
-"60 45 18 1",
+"39 33 8 1",
-" 	c None",
+" 	c #739C739C739C",
-".	c #596559655965",
+".	c #4A524A524A52",
-"X	c #49244D344924",
+"X	c #000000000000",
-"o	c #514455555144",
+"o	c #294A294A294A",
-"O	c #C71BC71BC71B",
+"O	c #084208420842",
-"+	c #861782078617",
+"+	c #FFFFFFFFFFFF",
-"@	c #8E388A288E38",
+"@	c #AD6AAD6AAD6A",
-"#	c #618561856185",
+"#	c #529452945294",
-"$	c #965892489658",
+"               .X                     X",
-"%	c #410345144103",
+"oooooooooooooooOX ooooooooooooooooooooX",
-"&	c #38E338E338E3",
+"oooooooooooooooOX ooooooooooooooooooooX",
-"*	c #71C675D671C6",
+"oooooooooooooooOX ooooooooooooooooooooX",
-"=	c #000000000000",
+"oooooooooooooooOX ooooooooooooooooooooO",
-"-	c #28A2249228A2",
+"oooooooooooooooOX ooooooooooooooooooooO",
-";	c #082008200820",
+"oooooooooooooooOX ooooo++oooooo++oooooO",
-":	c #28A228A228A2",
+"oooooooooooooooOX ooooo+++oooo+++oooooO",
-">	c #FFFFFFFFFFFF",
+"oooooooooooooooOX oooooo+++oo+++ooooooO",
-",	c #AEBAAAAAAEBA",
+"oooooooooooooooOX ooooooo++++++oooooooO",
-"                                      ..........XX.         ",
+"oooooooooooooooOX oooooooo++++ooooooooO",
-"                                   o.XOOOOOOOOOOO+@oX       ",
+"oooooooooooooooOX oooooooo++++ooooooooO",
-"                                 .oOOOOOOOOOOOOOOOOOO.      ",
+"oooooooooooooooOX ooooooo++++++oooooooO",
-"                                .OOOOOOOOOOOOOOOOOOOOO#     ",
+"oooooooooooooooOX oooooo+++oo+++ooooooO",
-"                               .OOOOOOOOOOO@OOOOOOOOOOO..   ",
+"oooooooooooooooOX ooooo+++oooo+++oooooO",
-"                              #OOOOOOO@+$+@+$+@+$%X+OOOOOo# ",
+"oooooooooooooooOX ooooo++oooooo++oooooO",
-"                             .OOOOOO&X&X&X&X&X&X&@+OOOOOOOO.",
+"oooooooooooooooOX ooooooooooooooooooooO",
-"                            .OOOO%X%OOOOOOOOOOOOOOOOOOOOOOOO",
+"oooooooooooooooOX ooooooooooooooooooooO",
-"                           .+OOX&OOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"oooooooooooooooOX ooooooooooooooooooooO",
-"                          #+OOXOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"oooooooooooooooOX ooooooooooooooooooooO",
-"                         .+OOO&OOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOXX OOOOOOOOOOOOOOOOOOOOX",
-"                        .+OOO+XOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"***************X=*************%X+@+X+X=X&X%X+@OOOOOOOOOOOOOO",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@X",
-"---------------;=*-------:-:-:::X===========X%@OOOOOOOOOOOOO",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@X",
-"---------------;=*------:-:-::::::::::=========@OOOOOOOOOOOO",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@X",
-"---------------;=*------:--:-:::::::::==========OOOOOOOOOOOO",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@X",
-"---------------;=*------:-:-::::::::::;==========OOOOOOOOOOO",
+"###################################+@@X",
-"---------------;=*-----:-:-:-:::::::::;===========@OOOOOOOOO",
+"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX@+@@X",
-"---------------;=*----->>-:-:::>>:::::;=============OOOOOOOO",
+"++++++++++++++++++++++++++++++++++@+@@X",
-"---------------;=*----->>>-:-:>>>:::::;==============+OOOOOO",
+"++++++++++++++++++++++++++++++++++@+@@X",
-"---------------;=*------>>>-:>>>::::::;===============%@+OOO",
+"++++++++++++++++++++++++++++++++++@+@@X",
-"---------------;=*------->>>>>>:::::::;=================X+OO",
+"++++++++++++++++++++++++++++++++++@+@@X",
-"---------------;=*------:->>>>::::::::;===============&X&@+O",
+"++++++++++++++++++++++++++++++++++@+@@X"};
-"---------------;=*------:->>>>::::::::;=====XX=====%X%X+@+O+",
-"---------------;=*------:>>>>>>:::::::;====X  %X====&X+X+@+O",
-"---------------;=*------>>>:->>>::::::;=====     %X%X=X%X+X+",
-"---------------;=*----->>>-:-:>>>:::::;X====          &X&X&X",
-"---------------;=*----->>--:-::>>:::::;%X===             %X%",
-"---------------;=*-------::-::::::::::; &X=                 ",
-"---------------;=*------:--:-:::::::::;                     ",
-"---------------;=*------:-:-::::::::::;                     ",
-"---------------;=*-----:-:-:-:::::::::;                     ",
-";;;;;;;;;;;;;;;==*;;;;;;;;;;;;;;;;;;;;=                     ",
-"=======================================                     ",
-",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=                     ",
-",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=                     ",
-",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=                     ",
-",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=                     ",
-"ooooooooooooooooooooooooooooooooooo>,,=                     ",
-"==================================,>,,=                     ",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>,>,,=                     ",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>,>,,=                     ",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>,>,,=                     ",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>,>,,=                     ",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>,>,,=                     "};

WPrefs.app/xpm/oldstyle.xpm

@@ -1,69 +1,45 @@
 /* XPM */
 static char * image_name[] = {
-"60 45 21 1",
+"38 33 9 1",
-" 	c None",
+" 	c #739C739C739C",
-".	c #596559655965",
+".	c #000000000000",
-"X	c #49244D344924",
+"X	c #210821082108",
-"o	c #514455555144",
+"o	c #294A294A294A",
-"O	c #C71BC71BC71B",
+"O	c #FFFFFFFFFFFF",
-"+	c #861782078617",
+"+	c #084208420842",
-"@	c #8E388A288E38",
+"@	c #A528A528A528",
-"#	c #618561856185",
+"#	c #529452945294",
-"$	c #965892489658",
+"$	c #AD6AAD6AAD6A",
-"%	c #410345144103",
+"                                     .",
-"&	c #38E338E338E3",
+"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.",
-"*	c #71C675D671C6",
+"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.",
-"=	c #000000000000",
+"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.",
-"-	c #208120812081",
+"XXXXXXXXXXXXXXXXXXXoOOOOOOOOOOOOOOooo+",
-";	c #28A2249228A2",
+"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+",
-":	c #28A228A228A2",
+"XXXXXXXXXXXXXXXXXXXoO@.#@@@@@@#.@#ooo+",
-">	c #FFFFFFFFFFFF",
+"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+",
-",	c #082008200820",
+"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+",
-"<	c #A699A699A699",
+"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+",
-"1	c #082004100820",
+"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+",
-"2	c #AEBAAAAAAEBA",
+"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+",
-"                                     ..........XX.          ",
+"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+",
-"                                  o.XOOOOOOOOOOO+@oX        ",
+"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+",
-"                                .oOOOOOOOOOOOOOOOOOO.       ",
+"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+",
-"                               .OOOOOOOOOOOOOOOOOOOOO#      ",
+"XXXXXXXXXXXXXXXXXXXoO@.#@@@@@@#.@#ooo+",
-"                              .OOOOOOOOOOO@OOOOOOOOOOO..    ",
+"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+",
-"                             #OOOOOOO@+$+@+$+@+$%X+OOOOOo#  ",
+"XXXXXXXXXXXXXXXXXXXoO#############ooo+",
-"                            .OOOOOO&X&X&X&X&X&X&@+OOOOOOOO..",
+"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+",
-"                           .OOOO%X%OOOOOOOOOOOOOOOOOOOOOOOOO",
+"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+",
-"                          .+OOX&OOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"+++++++++++++++++++++++++++++++++++++.",
-"                         #+OOXOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"......................................",
-"                        .+OOO&OOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
-"                       .+OOO+XOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
-"*****************************%X+@+X+X=X&X%X+@OOOOOOOOOOOOOOO",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
-"-------------------;;;;;;;:;:::X===========X%@OOOOOOOOOOOOOO",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
-"-------------------;;;;;;;;::::::::::=========@OOOOOOOOOOOOO",
+"##################################O$$.",
-"-------------------;;;;;;;:;:::::::::==========OOOOOOOOOOOOO",
+".................................$O$$.",
-"-------------------;>>>>>>>>>>>>>>:::,==========OOOOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
-"-------------------;><<<<<<<<<<<<o:::,===========@OOOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
-"-------------------;><=o<<<<<<o=<o:::,=============OOOOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
-"-------------------;><o=o<<<<o=o<o:::,==============+OOOOOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
-"-------------------;><<o=o<<o=o<<o:::,===============%@+OOOO",
+"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$."};
-"-------------------;><<<o=oo=o<<<o:::,=================X+OOO",
-"-------------------;><<<<o==o<<<<o:::,===============&X&@+O+",
-"-------------------;><<<<o==o<<<<o:::,=====XX=====%X%X+@+O+O",
-"-------------------;><<<o=oo=o<<<o:::,====X  %X====&X+X+@+O+",
-"-------------------;><<o=o<<o=o<<o:::,=====     %X%X=X%X+X+$",
-"-------------------;><o=o<<<<o=o<o:::,X====          &X&X&X&",
-"-------------------;><=o<<<<<<o=<o:::,%X===             %X%X",
-"-------------------;><<<<<<<<<<<<o:::, &X=                  ",
-"-------------------;>ooooooooooooo:::,                      ",
-"-------------------;;;;;;;;;:::::::::,                      ",
-"-------------------;;;;;;;:;:::::::::,                      ",
-"11111111111111111111111111111111,,,,,=                      ",
-"======================================                      ",
-"2222222222222222222222222222222222222=                      ",
-"2222222222222222222222222222222222222=                      ",
-"2222222222222222222222222222222222222=                      ",
-"2222222222222222222222222222222222222=                      ",
-"oooooooooooooooooooooooooooooooooo>22=                      ",
-"=================================2>22=                      ",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>2>22=                      ",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>2>22=                      ",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>2>22=                      ",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>2>22=                      ",
-">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>2>22=                      "};

WPrefs.app/xpm/smooth.xpm

@@ -0,0 +1,131 @@
+/* XPM */
+static char * image_name[] = {
+"24 24 104 2",
+"  	c #318C5AD60842",
+". 	c #318C63180842",
+"X 	c #39CE5AD60842",
+"o 	c #4210631818C6",
+"O 	c #18C6294A0842",
+"+ 	c #18C6294A0000",
+"@ 	c #18C6318C0000",
+"# 	c #210839CE0000",
+"$ 	c #421052941084",
+"% 	c #6B5A739C294A",
+"& 	c #63187BDE2108",
+"* 	c #5AD67BDE18C6",
+"= 	c #52946B5A2108",
+"- 	c #4A526B5A2108",
+"; 	c #4A5263181084",
+": 	c #210842100000",
+"> 	c #18C639CE0000",
+", 	c #318C63180000",
+"< 	c #42106B5A0842",
+"1 	c #318C5AD60000",
+"2 	c #294A52940842",
+"3 	c #39CE63180000",
+"4 	c #39CE52941084",
+"5 	c #2108318C0000",
+"6 	c #318C42100842",
+"7 	c #42105AD618C6",
+"8 	c #5AD6739C294A",
+"9 	c #6B5A7BDE318C",
+"0 	c #4A526B5A1084",
+"q 	c #4A526B5A0842",
+"w 	c #42106B5A0000",
+"e 	c #4A52739C0842",
+"r 	c #4A52739C1084",
+"t 	c #39CE63181084",
+"y 	c #294A4A520842",
+"u 	c #318C5AD61084",
+"i 	c #39CE63180842",
+"p 	c #421063181084",
+"a 	c #294A39CE1084",
+"s 	c #52946B5A294A",
+"d 	c #5AD66B5A2108",
+"f 	c #5AD6739C18C6",
+"g 	c #52946B5A18C6",
+"h 	c #318C52940842",
+"j 	c #318C4A521084",
+"k 	c #39CE5AD618C6",
+"l 	c #39CE6B5A0842",
+"z 	c #39CE6B5A0000",
+"x 	c #42106B5A1084",
+"c 	c #294A52940000",
+"v 	c #39CE5AD61084",
+"b 	c #5294739C294A",
+"n 	c #52947BDE18C6",
+"m 	c #4A526B5A18C6",
+"M 	c #5AD6739C1084",
+"N 	c #5AD6739C0842",
+"B 	c #318C4A520842",
+"V 	c #294A5AD60000",
+"C 	c #5294739C18C6",
+"Z 	c #5AD67BDE0842",
+"A 	c #294A4A520000",
+"S 	c #52946B5A0842",
+"D 	c #39CE52940000",
+"F 	c #318C52940000",
+"G 	c #210852940000",
+"H 	c #21084A520000",
+"J 	c #52946B5A0000",
+"K 	c #5294739C0842",
+"L 	c #318C4A5218C6",
+"P 	c #42105AD60000",
+"I 	c #18C642100000",
+"U 	c #4A526B5A0000",
+"Y 	c #42105AD61084",
+"T 	c #294A42100842",
+"R 	c #421063180000",
+"E 	c #4210529418C6",
+"W 	c #294A39CE0842",
+"Q 	c #39CE529418C6",
+"! 	c #42106B5A18C6",
+"~ 	c #4A5263180842",
+"^ 	c #4A52739C0000",
+"/ 	c #4A52631818C6",
+"( 	c #18C639CE0842",
+") 	c #421063180842",
+"_ 	c #5294739C0000",
+"` 	c #294A42101084",
+"' 	c #2108294A1084",
+"] 	c #2108318C0842",
+"[ 	c #39CE5AD60000",
+"{ 	c #52946B5A1084",
+"} 	c #18C621080842",
+"| 	c #108410840000",
+" .	c #18C618C60000",
+"..	c #39CE4A520842",
+"X.	c #5AD67BDE0000",
+"o.	c #5AD6739C0000",
+"O.	c #318C42101084",
+"+.	c #52947BDE0000",
+"@.	c #108418C60842",
+"#.	c #084208420842",
+"$.	c #084208420000",
+"%.	c #2108318C1084",
+"&.	c #084218C60000",
+"*.	c #108421080842",
+"  . .   X     . o O + @ # $ % & * = - ;   : > > ",
+", < 1   2 1 1 3 4 + 5 6 7 8 9 & 0 0 q w e r t y ",
+"1 w 1   u , i p @ a 7 s d f g h j k . l z w < x ",
+". i   . c . x v 7 b n m M N q   j B i , . z z l ",
+"1   V t < & & * n C C 0 N Z X h B A   . , , , l ",
+"c c 2     v y     p C S S g k h D F F v u . , , ",
+"G H 2 G 1 t   2 o 0 S J K 4 L B D P 0 p     , , ",
+"G I y G 1     p 0 U J U K Y j 6 4 p w l < i , , ",
+"y T : G V   - 0 < R U q M E W W 2 , z z l , , 1 ",
+"Q # : G   ! x q R ~ U ^ ~ 5 @ # F 3 w w w w l l ",
+"/ # ( G o m q U ) R q _ ; @ @ : X < w w w 3 3 3 ",
+"m ( ( o m 0 ) 3 ~ U U U 4 @ > A 1 w w z z z , l ",
+"; ` W m ) i X ~ R ) U ~ ' O ] B i < w l w , . . ",
+"p ` Q o i i [ ) R R R { } | } ] ` y 4 o 0 C C r ",
+"X Y o [ . 3 ~ R 3 q q 4 |  .+ 6 ..; C C Z N X.o.",
+"[ X [ i 1 [ P 3 R U 0 O } O.; M K _ _ ^ _ _ _ Z ",
+"3 1 1 3 1 ) 3 ) < U 4 T Y K +.K ^ _ ^ _ _ N _ Z ",
+"3 h X [ q R R U U U Y q K e ^ ^ ^ U _ _ _ _ X.M ",
+"X 1 1 ) ~ ) R R ) [ q U ^ U q U K _ ^ _ _ +.Z 4 ",
+"3 1 i 0 i 3 i 3 F < w < q U K S K U ^ ^ _ 0 6 @.",
+"[ 1 3 ~ w 3 i h i w ^ U S K U U ^ _ _ K Z a @.#.",
+"3 [ 0 R R < [ ) w U _ o.K U U U ^ K _ Z O.#.$.$.",
+"3 q q 3 U R R U U _ N J U ^ K U K _ Y %.#.#.#.| ",
+"R e U w R U U _ N U U U ^ ^ U K S $ } | @.@.&.*."};

WindowMaker/Backgrounds/Makefile.in

@@ -108,9 +108,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Backgrounds/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Backgrounds/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -142,6 +142,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Backgrounds
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Backgrounds/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WindowMaker/Defaults/Makefile.in

@@ -110,9 +110,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Defaults/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Defaults/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -144,6 +144,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Defaults
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Defaults/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WindowMaker/IconSets/Makefile.in

@@ -110,9 +110,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/IconSets/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/IconSets/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -144,6 +144,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/IconSets
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/IconSets/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WindowMaker/Icons/Makefile.in

@@ -109,9 +109,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Icons/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Icons/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -143,6 +143,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Icons
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Icons/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WindowMaker/Makefile.in

@@ -111,9 +111,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -231,6 +231,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WindowMaker/Pixmaps/Makefile.in

@@ -109,9 +109,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Pixmaps/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Pixmaps/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -143,6 +143,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Pixmaps
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Pixmaps/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WindowMaker/Styles/Makefile.in

@@ -109,9 +109,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Styles/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Styles/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -143,6 +143,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Styles
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Styles/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WindowMaker/Themes/Makefile.in

@@ -110,9 +110,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Themes/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WindowMaker/Themes/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -230,6 +230,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WindowMaker/Themes
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WindowMaker/Themes/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

WindowMaker/plmenu.it

@@ -0,0 +1,128 @@
+("Applicazioni",
+ ("Informazioni",
+  ("Info Panel...", INFO_PANEL),
+  ("Legal...", LEGAL_PANEL),
+  ("Console di sistema", EXEC, "xconsole"),
+  ("Carico del Sistema", EXEC, "xosview || xload"),
+  ("Lista dei Processi", EXEC, "xterm -e top"),
+  ("Ricerca Manuali", EXEC, "xman")
+  ),
+ ("Esegui...", EXEC, "%a(Esegui,Scrivi il comando da eseguire:)"),
+ ("XTerm", EXEC, "xterm -sb"),
+ ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
+ ("Workspace", WORKSPACE_MENU),
+ ("Programmi",
+  ("Grafica",
+   ("Gimp", EXEC, "gimp >/dev/null"),
+   ("XV", EXEC, "xv"),
+   ("XPaint", EXEC, "xpaint"),
+   ("XFig", EXEC, "xfig")
+   ),
+  ("X File Manager", EXEC, "xfm"),
+  ("OffiX Files", EXEC, "files"),
+  ("LyX", EXEC, "lyx"),
+  ("Netscape", EXEC, "netscape"),
+  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
+  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to
+view)"),
+  ("TkDesk", EXEC, "tkdesk")
+  ),
+ ("Editor",
+  ("XFte", EXEC, "xfte"),
+  ("XEmacs", EXEC, "xemacs || emacs"),
+  ("XJed", EXEC, "xjed"),
+  ("NEdit", EXEC, "nedit"),
+  ("Xedit", EXEC, "xedit"),
+  ("VI", EXEC, "xterm -e vi")
+  ),
+ ("Varie",
+  ("Xmcd", EXEC, "xmcd 2> /dev/null"),
+  ("Xplaycd", EXEC, "xplaycd"),
+  ("Xmixer", EXEC, "xmixer")
+  ),
+ ("Utilità",
+  ("Calcolatrice", EXEC, "xcalc"),
+  ("Proprietà finestra", EXEC, "xprop | xmessage -center -title 'xprop'
+-file -"),
+  ("Selezione Font", EXEC, "xfontsel"),
+  ("Emulatore di terminale", EXEC, "xminicom"),
+  ("Lente", EXEC, "xmag"),
+  ("Mappa Colori", EXEC, "xcmap"),
+  ("Assasino X", EXEC, "xkill"),
+  ("ASClock", EXEC, "asclock -shape"),
+  ("Clipboard", EXEC, "xclipboard")
+  ),
+ ("Selezione",
+  ("Copia", EXEC, "echo '%s' | wxcopy"),
+  ("Spedisci a...", EXEC, "xterm -name mail -T Pine -e pine %s"),
+  ("Naviga", EXEC, "netscape %s"),
+  ("Cerca nei Manuali", EXEC, "MANUAL_SEARCH(%s)")
+  ),
+ ("Workspace",
+  ("Nascondi gli altri", HIDE_OTHERS),
+  ("Mostra Tutti", SHOW_ALL),
+  ("Riordina Icone", ARRANGE_ICONS),
+  ("Refresh", REFRESH),
+  ("Lock", EXEC, "xlock -allowroot -usefirst"),
+  ("Salva Sessione", SAVE_SESSION),
+  ("Cancella Sessione salvata", CLEAR_SESSION)
+  ),
+ ("Visualizzazione",
+  ("Temi", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Themes
+~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+  ("Stili", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Styles
+~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+  ("Set di Icone", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/IconSets
+~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+  ("Sfondo",
+   ("Tinta unita",
+    ("Nero", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
+    ("Blu-Grigio",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid,
+\"#505075\")'"),
+    ("Indaco", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid,
+\"#243e6c\")'"),
+    ("Blue", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid,
+\"#180090\")'"),
+    ("Viola", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid,
+\"#554466\")'"),
+    ("Beige", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
+    ("Grigio", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid,
+\"#333340\")'"),
+    ("Vinaccia", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid,
+\"#400020\")'")
+    ),
+   ("Sfumato",
+    ("Tramonto", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient,
+deepskyblue4, black, deepskyblue4, tomato4)'"),
+    ("Cielo", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4,
+white)'"),
+    ("Sfumature Blu",   EXEC, "wdwrite WindowMaker WorkspaceBack
+'(vgradient, \"#7080a5\", \"#101020\")'"),
+    ("Sfumature Indaco", EXEC, "wdwrite WindowMaker WorkspaceBack
+'(vgradient, \"#746ebc\", \"#242e4c\")'"),
+    ("Sfumature Viola", EXEC, "wdwrite WindowMaker WorkspaceBack
+'(vgradient, \"#654c66\", \"#151426\")'"),
+    ("Sfumature Beige",  EXEC, "wdwrite WindowMaker WorkspaceBack
+'(vgradient, \"#a09060\", \"#302010\")'"),
+    ("Sfumature Grigie",   EXEC, "wdwrite WindowMaker WorkspaceBack
+'(vgradient, \"#636380\", \"#131318\")'"),
+    ("Sfumature Vinaccia",   EXEC, "wdwrite WindowMaker WorkspaceBack
+'(vgradient, \"#600040\", \"#180010\")'")
+    ),
+   ("Immagini", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Backgrounds
+~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+   ),
+  ("Salva il tema", EXEC, "getstyle -t
+~/GNUstep/Library/WindowMaker/Themes/\"%a(Nome Tema)\""),
+  ("Salva il set icone", EXEC, "geticonset
+~/GNUstep/Library/WindowMaker/IconSets/\"%a(Nome IconSet)\"")
+  ),
+ ("Esci",
+  ("Riavvia", RESTART),
+  ("Avvia BlackBox", RESTART, blackbox),
+  ("Avvia kwm", RESTART, kwm),
+  ("Avvia IceWM", RESTART, icewm),
+  ("Esci...", EXIT),
+  ("Uccidi sessione...", SHUTDOWN)
+ )
+)

contrib/Makefile.am

@@ -0,0 +1,4 @@
+
+
+EXTRA_DIST = README single_click.diff
+

contrib/Makefile.in

@@ -0,0 +1,199 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+CC = @CC@
+CPP_PATH = @CPP_PATH@
+DFLAGS = @DFLAGS@
+DLLIBS = @DLLIBS@
+GFXLIBS = @GFXLIBS@
+HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
+ICONEXT = @ICONEXT@
+INTLIBS = @INTLIBS@
+LD = @LD@
+LIBPL = @LIBPL@
+LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@
+LIBTOOL = @LIBTOOL@
+LITE = @LITE@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+MOFILES = @MOFILES@
+NLSDIR = @NLSDIR@
+NM = @NM@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+VERSION = @VERSION@
+WPMOFILES = @WPMOFILES@
+XCFLAGS = @XCFLAGS@
+XGETTEXT = @XGETTEXT@
+XLFLAGS = @XLFLAGS@
+XLIBS = @XLIBS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+wprefsdir = @wprefsdir@
+
+EXTRA_DIST = README single_click.diff
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../src/config.h
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  README Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = contrib
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu contrib/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+	-rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

contrib/README

@@ -0,0 +1,4 @@
+
+This directory contains some patches contributed by ppl. Do NOT mail the
+wmaker developers for any problems with them.
+

contrib/single_click.diff

@@ -0,0 +1,361 @@
+diff -rc WindowMaker-0.52.0.ori/WPrefs.app/Appearance.c WindowMaker-0.52.0/WPrefs.app/Appearance.c
+*** WindowMaker-0.52.0.ori/WPrefs.app/Appearance.c	Mon Mar 22 12:16:49 1999
+--- WindowMaker-0.52.0/WPrefs.app/Appearance.c	Wed Apr 21 08:24:11 1999
+***************
+*** 1286,1315 ****
+  
+      setupTextureFor(panel->texLs, "FTitleBack", "(solid, black)", 
+  		    "[Focused]", i);
+!     panel->textureIndex[i] = i++;
+  
+      setupTextureFor(panel->texLs, "UTitleBack", "(solid, gray)", 
+  		    "[Unfocused]", i);
+!     panel->textureIndex[i] = i++;
+  
+      setupTextureFor(panel->texLs, "PTitleBack", "(solid, \"#616161\")",
+  		    "[Owner of Focused]", i);
+!     panel->textureIndex[i] = i++;
+  
+      setupTextureFor(panel->texLs, "MenuTitleBack", "(solid, black)", 
+  		    "[Menu Title]", i);
+!     panel->textureIndex[i] = i++;
+  
+      setupTextureFor(panel->texLs, "MenuTextBack", "(solid, gray)", 
+  		    "[Menu Item]", i);
+!     panel->textureIndex[i] = i++;
+  
+      setupTextureFor(panel->texLs, "IconBack", "(solid, gray)", "[Icon]", i);
+!     panel->textureIndex[i] = i++;
+  /*
+      setupTextureFor(panel->texLs, "WorkspaceBack", "(solid, black)", 
+  		    "[Workspace]", i);
+!     panel->textureIndex[i] = i++;
+   */
+  
+      updatePreviewBox(panel, EVERYTHING);
+--- 1286,1315 ----
+  
+      setupTextureFor(panel->texLs, "FTitleBack", "(solid, black)", 
+  		    "[Focused]", i);
+!     panel->textureIndex[i++] = i;
+  
+      setupTextureFor(panel->texLs, "UTitleBack", "(solid, gray)", 
+  		    "[Unfocused]", i);
+!     panel->textureIndex[i++] = i;
+  
+      setupTextureFor(panel->texLs, "PTitleBack", "(solid, \"#616161\")",
+  		    "[Owner of Focused]", i);
+!     panel->textureIndex[i++] = i;
+  
+      setupTextureFor(panel->texLs, "MenuTitleBack", "(solid, black)", 
+  		    "[Menu Title]", i);
+!     panel->textureIndex[i++] = i;
+  
+      setupTextureFor(panel->texLs, "MenuTextBack", "(solid, gray)", 
+  		    "[Menu Item]", i);
+!     panel->textureIndex[i++] = i;
+  
+      setupTextureFor(panel->texLs, "IconBack", "(solid, gray)", "[Icon]", i);
+!     panel->textureIndex[i++] = i;
+  /*
+      setupTextureFor(panel->texLs, "WorkspaceBack", "(solid, black)", 
+  		    "[Workspace]", i);
+!     panel->textureIndex[i++] = i;
+   */
+  
+      updatePreviewBox(panel, EVERYTHING);
+diff -rc WindowMaker-0.52.0.ori/WPrefs.app/Expert.c WindowMaker-0.52.0/WPrefs.app/Expert.c
+*** WindowMaker-0.52.0.ori/WPrefs.app/Expert.c	Thu Mar 18 17:39:22 1999
+--- WindowMaker-0.52.0/WPrefs.app/Expert.c	Thu Apr 15 09:02:54 1999
+***************
+*** 31,37 ****
+      
+      WMWindow *win;
+  
+!     WMButton *swi[5];
+  
+  } _Panel;
+  
+--- 31,37 ----
+      
+      WMWindow *win;
+  
+!     WMButton *swi[6];
+  
+  } _Panel;
+  
+***************
+*** 50,55 ****
+--- 50,56 ----
+      WMSetButtonSelected(panel->swi[2], GetBoolForKey("SaveSessionOnExit"));
+      WMSetButtonSelected(panel->swi[3], GetBoolForKey("UseSaveUnders"));
+      WMSetButtonSelected(panel->swi[4], GetBoolForKey("DisableBlinking"));
++     WMSetButtonSelected(panel->swi[5], GetBoolForKey("SingleClickLaunch"));
+  }
+  
+  
+***************
+*** 63,69 ****
+      WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
+      WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
+  
+!     for (i=0; i<5; i++) {
+  	panel->swi[i] = WMCreateSwitchButton(panel->frame);
+  	WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
+  	WMMoveWidget(panel->swi[i], 20, 20+i*25);
+--- 64,70 ----
+      WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
+      WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
+  
+!     for (i=0; i<6; i++) {
+  	panel->swi[i] = WMCreateSwitchButton(panel->frame);
+  	WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
+  	WMMoveWidget(panel->swi[i], 20, 20+i*25);
+***************
+*** 74,79 ****
+--- 75,81 ----
+      WMSetButtonText(panel->swi[2], _("Automatically save session when exiting WindowMaker"));
+      WMSetButtonText(panel->swi[3], _("Use SaveUnder in window frames, icons, menus and other objects"));
+      WMSetButtonText(panel->swi[4], _("Disable cycling color highlighting of icons."));
++     WMSetButtonText(panel->swi[5], _("Launch applications and restore windows with a single click"));
+  
+      WMRealizeWidget(panel->frame);
+      WMMapSubwidgets(panel->frame);
+***************
+*** 94,99 ****
+--- 96,102 ----
+      SetBoolForKey(WMGetButtonSelected(panel->swi[2]), "SaveSessionOnExit");
+      SetBoolForKey(WMGetButtonSelected(panel->swi[3]), "UseSaveUnders");
+      SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DisableBlinking");
++     SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "SingleClickLaunch");
+  }
+  
+  
+diff -rc WindowMaker-0.52.0.ori/src/WindowMaker.h WindowMaker-0.52.0/src/WindowMaker.h
+*** WindowMaker-0.52.0.ori/src/WindowMaker.h	Mon Mar 22 12:16:50 1999
+--- WindowMaker-0.52.0/src/WindowMaker.h	Wed Apr 14 10:35:40 1999
+***************
+*** 348,353 ****
+--- 348,356 ----
+      /* shading animation */
+      char shade_speed;
+  
++ 	/* single click to lauch applications */
++ 	char single_click;
++ 
+      int edge_resistance;
+  
+      struct {
+diff -rc WindowMaker-0.52.0.ori/src/appicon.c WindowMaker-0.52.0/src/appicon.c
+*** WindowMaker-0.52.0.ori/src/appicon.c	Thu Apr  1 12:33:57 1999
+--- WindowMaker-0.52.0/src/appicon.c	Wed Apr 14 10:38:03 1999
+***************
+*** 710,715 ****
+--- 710,716 ----
+      int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0;
+      int ix, iy;
+      int clickButton = event->xbutton.button;
++ 	Bool hasMoved;
+      Pixmap ghost = None;
+  
+      if (aicon->editing || WCHECK_STATE(WSTATE_MODAL))
+***************
+*** 758,763 ****
+--- 759,765 ----
+        dockable = canBeDocked(icon->owner);
+  
+  
++ 	hasMoved = False;
+      while (!done) {
+  	WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask
+  		    |ButtonMotionMask|ExposureMask, &ev);
+***************
+*** 767,772 ****
+--- 769,775 ----
+  	    break;
+  
+  	 case MotionNotify:
++ 		hasMoved = True;
+  	    if (!grabbed) {
+  		if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
+  		    || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
+***************
+*** 917,922 ****
+--- 920,928 ----
+  		XSetWindowBackground(dpy, scr->dock_shadow, scr->white_pixel);
+  	    }
+  	    done = 1;
++ 		if (!hasMoved && wPreferences.single_click) {
++ 			iconDblClick(desc, event);
++ 		}
+  	    break;
+  	}
+      }
+diff -rc WindowMaker-0.52.0.ori/src/defaults.c WindowMaker-0.52.0/src/defaults.c
+*** WindowMaker-0.52.0.ori/src/defaults.c	Mon Mar 22 12:16:51 1999
+--- WindowMaker-0.52.0/src/defaults.c	Wed Apr 14 10:54:24 1999
+***************
+*** 445,450 ****
+--- 445,453 ----
+      {"DisableBlinking",	"NO",		NULL,
+  	   &wPreferences.dont_blink,	getBool,	NULL
+      },
++ 	{"SingleClickLaunch", "NO",		NULL,
++ 	   &wPreferences.single_click,	getBool,	NULL
++ 	},
+  #ifdef WEENDOZE_CYCLE
+      {"WindozeCycling","NO", NULL,
+  	    &wPreferences.windoze_cycling,	getBool, NULL
+diff -rc WindowMaker-0.52.0.ori/src/dock.c WindowMaker-0.52.0/src/dock.c
+*** WindowMaker-0.52.0.ori/src/dock.c	Mon Mar 22 12:16:51 1999
+--- WindowMaker-0.52.0/src/dock.c	Wed Apr 14 10:37:30 1999
+***************
+*** 3484,3490 ****
+  
+  
+  
+! static void
+  handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
+  {
+      WScreen *scr = dock->screen_ptr;
+--- 3484,3490 ----
+  
+  
+  
+! static int
+  handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
+  {
+      WScreen *scr = dock->screen_ptr;
+***************
+*** 3499,3507 ****
+      int ix = aicon->xindex, iy = aicon->yindex;
+      int tmp;
+      Pixmap ghost = None;
+!     Bool docked;
+      int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */
+  
+      if (wPreferences.flags.noupdates)
+  	return;
+      
+--- 3499,3508 ----
+      int ix = aicon->xindex, iy = aicon->yindex;
+      int tmp;
+      Pixmap ghost = None;
+!     Bool docked, hasMoved;
+      int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */
+  
++ 	hasMoved = False;
+      if (wPreferences.flags.noupdates)
+  	return;
+      
+***************
+*** 3551,3556 ****
+--- 3552,3558 ----
+  	    break;
+  
+  	 case MotionNotify:
++ 		hasMoved = True;
+  	    if (!grabbed) {
+  		if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD
+  		    || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) {
+***************
+*** 3690,3696 ****
+  #ifdef DEBUG
+  	    puts("End icon move");
+  #endif
+! 	    return;
+  	}
+      }
+  }
+--- 3692,3701 ----
+  #ifdef DEBUG
+  	    puts("End icon move");
+  #endif
+! 		if (!hasMoved) {
+! 			return 1;
+! 		}
+! 	    return 0;
+  	}
+      }
+  }
+***************
+*** 3807,3813 ****
+  	XUnmapWindow(dpy, scr->clip_balloon);
+  	scr->flags.clip_balloon_mapped = 0;
+      }
+!     
+  #ifdef DEBUG
+      puts("handling dock");
+  #endif
+--- 3812,3818 ----
+  	XUnmapWindow(dpy, scr->clip_balloon);
+  	scr->flags.clip_balloon_mapped = 0;
+      }
+!  
+  #ifdef DEBUG
+      puts("handling dock");
+  #endif
+***************
+*** 3830,3836 ****
+              else
+                  handleDockMove(dock, aicon, event);
+          } else
+! 	    handleIconMove(dock, aicon, event);
+  	
+      } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
+                 aicon->xindex==0 && aicon->yindex==0) {
+--- 3835,3843 ----
+              else
+                  handleDockMove(dock, aicon, event);
+          } else
+! 	    if (handleIconMove(dock, aicon, event) != 0 &&
+! 				wPreferences.single_click)
+!             iconDblClick(desc, event);
+  	
+      } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
+                 aicon->xindex==0 && aicon->yindex==0) {
+diff -rc WindowMaker-0.52.0.ori/src/icon.c WindowMaker-0.52.0/src/icon.c
+*** WindowMaker-0.52.0.ori/src/icon.c	Thu Mar 18 17:39:39 1999
+--- WindowMaker-0.52.0/src/icon.c	Wed Apr 14 10:37:02 1999
+***************
+*** 809,814 ****
+--- 809,815 ----
+      int dx=event->xbutton.x, dy=event->xbutton.y;
+      int grabbed=0;
+      int clickButton=event->xbutton.button;
++ 	Bool hasMoved;
+  
+      if (WCHECK_STATE(WSTATE_MODAL))
+  	return;
+***************
+*** 851,856 ****
+--- 852,858 ----
+  	wwarning("pointer grab failed for icon move");
+  #endif
+      }
++ 	hasMoved = False;
+      while(1) {
+  	WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask
+  		   |ButtonMotionMask|ExposureMask, &ev);
+***************
+*** 860,865 ****
+--- 862,868 ----
+  	    break;
+  
+  	 case MotionNotify:
++ 		hasMoved = True;
+  	    if (!grabbed) {
+  		if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
+  		    || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
+***************
+*** 897,902 ****
+--- 900,908 ----
+  
+  	    if (wPreferences.auto_arrange_icons)
+  		wArrangeIcons(wwin->screen_ptr, True);
++ 		if (!hasMoved && wPreferences.single_click) {
++ 			miniwindowDblClick(desc, event);
++ 		}
+  	    return;
+  	    
+  	}

doc/Makefile.in

@@ -109,9 +109,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -163,6 +163,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = doc
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

po/Makefile.am

@@ -6,7 +6,7 @@ CLEANFILES = $(CATALOGS) WindowMaker.pot
 
 EXTRA_DIST = cs.po de.po es.po fr.po gl.po ja.po ko.po nl.po pt.po se.po it.po \
 	no.po ru.po tr.po fi.po hr.po el.po pl.po ro.po zh_TW.Big5.po\
-	zh_CN.po sk.po
+	zh_CN.po sk.po da.po
 
 POTFILES  = \
 	$(top_builddir)/src/appicon.c \

po/Makefile.in

@@ -94,7 +94,7 @@ CATALOGS = @MOFILES@
 
 CLEANFILES = $(CATALOGS) WindowMaker.pot
 
-EXTRA_DIST = cs.po de.po es.po fr.po gl.po ja.po ko.po nl.po pt.po se.po it.po 	no.po ru.po tr.po fi.po hr.po el.po pl.po ro.po zh_TW.Big5.po 	zh_CN.po sk.po
+EXTRA_DIST = cs.po de.po es.po fr.po gl.po ja.po ko.po nl.po pt.po se.po it.po 	no.po ru.po tr.po fi.po hr.po el.po pl.po ro.po zh_TW.Big5.po 	zh_CN.po sk.po da.po
 
 
 POTFILES =  	$(top_builddir)/src/appicon.c 	$(top_builddir)/src/defaults.c 	$(top_builddir)/src/dialog.c 	$(top_builddir)/src/dock.c 	$(top_builddir)/src/dockedapp.c 	$(top_builddir)/src/event.c 	$(top_builddir)/src/framewin.c 	$(top_builddir)/src/icon.c 	$(top_builddir)/src/main.c 	$(top_builddir)/src/menu.c 	$(top_builddir)/src/misc.c 	$(top_builddir)/src/pixmap.c 	$(top_builddir)/src/proplist.c 	$(top_builddir)/src/resources.c 	$(top_builddir)/src/rootmenu.c 	$(top_builddir)/src/screen.c 	$(top_builddir)/src/session.c 	$(top_builddir)/src/stacking.c 	$(top_builddir)/src/startup.c 	$(top_builddir)/src/switchmenu.c 	$(top_builddir)/src/texture.c 	$(top_builddir)/src/wdefaults.c 	$(top_builddir)/src/window.c 	$(top_builddir)/src/winmenu.c 	$(top_builddir)/src/winspector.c 	$(top_builddir)/src/workspace.c 	$(top_builddir)/src/xutil.c 
@@ -120,9 +120,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .mo .po
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps po/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -135,6 +135,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = po
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu po/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

po/README

@@ -29,7 +29,7 @@ hr.po	Croatian	3	Toni Bilic <tbilic@efos.hr>
 el.po	Greek			Nikolaos Papagrigoriou <papanikos@usa.net>
 pl.po	Polish			Piotr Dembiñski <pdemb@aurora.put.poznan.pl>
 ro.po	Romanian		Andrei Vuta <gigi_man@manag.pub.ro>
-dk.po	Danish			Birger Langkjer <langkjer@post3.tele.dk>
+da.po	Danish			Birger Langkjer <langkjer@post3.tele.dk>
 zh_TW.Big5.po Chinese		Li Wei Jih <lwj83@cs.ccu.edu.tw>
 zh_CN.po Chinese		Wang Jian <wangjian2@asiainfo.com>
 sk.po	Slovak			Milan Hromada <mhromada@elas.sk>

src/dialog.c

@@ -1221,8 +1221,10 @@ wShowLegalPanel(WScreen *scr)
     WWindow *wwin;
 
     if (legalPanel) {
+	if (legalPanel->scr == scr) {
 	    wRaiseFrame(legalPanel->wwin->frame->core);
 	    wSetFocusTo(scr, legalPanel->wwin);
+	}
 	return;
     }
 
@@ -1508,3 +1510,175 @@ wShowCrashingDialogPanel(int whatSig)
 }
 
 
+
+
+/*****************************************************************************
+ *			About GNUstep Panel
+ *****************************************************************************/
+
+
+static void
+drawGNUstepLogo(Display *dpy, Drawable d, int width, int height,
+		unsigned long blackPixel, unsigned long whitePixel)
+{
+    GC gc;
+    XGCValues gcv;
+    XRectangle rects[3];
+
+    gcv.foreground = blackPixel;
+    gc = XCreateGC(dpy, d, GCForeground, &gcv);
+
+    XFillArc(dpy, d, gc, width/45, height/45, 
+	     width - 2*width/45, height - 2*height/45, 0, 360*64);
+
+    rects[0].x = 0;
+    rects[0].y = 37*height/45;
+    rects[0].width = width/3;
+    rects[0].height = height - rects[0].y;
+
+    rects[1].x = rects[0].width;
+    rects[1].y = height/2;
+    rects[1].width = width - 2*width/3;
+    rects[1].height = height - rects[1].y;
+
+    rects[2].x = 2*width/3;
+    rects[2].y = height - 37*height/45;
+    rects[2].width = width/3;
+    rects[2].height = height - rects[2].y;
+
+    XSetClipRectangles(dpy, gc, 0, 0, rects, 3, Unsorted);
+    XFillRectangle(dpy, d, gc, 0, 0, width, height);
+
+    XSetForeground(dpy, gc, whitePixel);
+    XFillArc(dpy, d, gc, width/45, height/45, 
+	     width - 2*width/45, height - 2*height/45, 0, 360*64);
+
+    XFreeGC(dpy, gc);
+}
+
+
+
+#define GNUSTEP_TEXT \
+	"Window Maker is part of the GNUstep project.\n"\
+	"The GNUstep project aims to create a free\n"\
+	"implementation of the OpenStep(tm) specification\n"\
+	"which is a object-oriented framework for\n"\
+	"creating advanced graphical, multi-platform\n"\
+	"applications. Aditionally, a development and\n"\
+	"user desktop enviroment will be created on top\n"\
+	"of the framework. For more information about\n"\
+	"GNUstep, please visit: www.gnustep.org"
+
+
+typedef struct {
+    WScreen *scr;
+    
+    WWindow *wwin;
+
+    WMWindow *win;
+
+    WMLabel *gstepL;
+    WMLabel *textL;
+} GNUstepPanel;
+
+
+static GNUstepPanel *gnustepPanel = NULL;
+
+static void
+destroyGNUstepPanel(WCoreWindow *foo, void *data, XEvent *event)
+{
+    WMUnmapWidget(gnustepPanel->win);
+
+    WMDestroyWidget(gnustepPanel->win);    
+
+    wUnmanageWindow(gnustepPanel->wwin, False, False);
+
+    free(gnustepPanel);
+
+    gnustepPanel = NULL;
+}
+
+
+void
+wShowGNUstepPanel(WScreen *scr)
+{
+    GNUstepPanel *panel;
+    Window parent;
+    WWindow *wwin;
+    WMPixmap *pixmap;
+    WMColor *color;
+
+    if (gnustepPanel) {
+	if (gnustepPanel->scr == scr) {
+	    wRaiseFrame(gnustepPanel->wwin->frame->core);
+	    wSetFocusTo(scr, gnustepPanel->wwin);
+	}
+	return;
+    }
+
+    panel = wmalloc(sizeof(GNUstepPanel));
+
+    panel->scr = scr;
+
+    panel->win = WMCreateWindow(scr->wmscreen, "About GNUstep");
+    WMResizeWidget(panel->win, 325, 200);
+
+    pixmap = WMCreatePixmap(scr->wmscreen, 130, 130, 
+			    WMScreenDepth(scr->wmscreen), True);
+
+    color = WMCreateNamedColor(scr->wmscreen, "gray50", True);
+
+    drawGNUstepLogo(dpy, WMGetPixmapXID(pixmap), 130, 130,
+		    WMColorPixel(color), scr->white_pixel);
+
+    WMReleaseColor(color);
+
+    drawGNUstepLogo(dpy, WMGetPixmapMaskXID(pixmap), 130, 130, 1, 1);
+
+    panel->gstepL = WMCreateLabel(panel->win);
+    WMResizeWidget(panel->gstepL, 285, 64);
+    WMMoveWidget(panel->gstepL, 20, 0);
+    WMSetLabelTextAlignment(panel->gstepL, WARight);
+    WMSetLabelText(panel->gstepL, "GNUstep");
+    {
+	WMFont *font = WMBoldSystemFontOfSize(scr->wmscreen, 24);
+
+	WMSetLabelFont(panel->gstepL, font);
+	WMReleaseFont(font);
+    }
+
+    panel->textL = WMCreateLabel(panel->win);
+    WMResizeWidget(panel->textL, 275, 130);
+    WMMoveWidget(panel->textL, 30, 50);
+    WMSetLabelTextAlignment(panel->textL, WARight);
+    WMSetLabelImagePosition(panel->textL, WIPOverlaps);
+    WMSetLabelText(panel->textL, GNUSTEP_TEXT);
+    WMSetLabelImage(panel->textL, pixmap);
+
+    WMReleasePixmap(pixmap);
+
+    WMRealizeWidget(panel->win);
+    WMMapSubwidgets(panel->win);
+
+    parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, 325, 200, 0, 0, 0);
+
+    XReparentWindow(dpy, WMWidgetXID(panel->win), parent, 0, 0);
+
+    wwin = wManageInternalWindow(scr, parent, None, "About GNUstep",
+				 (scr->scr_width - 325)/2,
+				 (scr->scr_height - 200)/2, 325, 200);
+
+    WSETUFLAG(wwin, no_closable, 0);
+    WSETUFLAG(wwin, no_close_button, 0);
+    wWindowUpdateButtonImages(wwin);
+    wFrameWindowShowButton(wwin->frame, WFF_RIGHT_BUTTON);
+    wwin->frame->on_click_right = destroyGNUstepPanel;
+    
+    panel->wwin = wwin;
+    
+    WMMapWidget(panel->win);
+
+    wWindowMap(wwin);
+
+    gnustepPanel = panel;
+}

src/dialog.h

@@ -41,6 +41,9 @@ void wShowInfoPanel(WScreen *scr);
 
 void wShowLegalPanel(WScreen *scr);
 
+void wShowGNUstepPanel(WScreen *scr);
+
 int wShowCrashingDialogPanel(int whatSig);
 
+
 #endif

src/dock.c

@@ -1731,7 +1731,6 @@ wDockRestoreState(WScreen *scr, proplist_t dock_state, int type)
         }
     }
 
-    
     /* restore attract icons state */
     
     dock->attract_icons = 0;
@@ -3299,9 +3298,7 @@ iconDblClick(WObjDescriptor *desc, XEvent *event)
 	((btn->icon->owner == NULL) && (btn->applist != NULL))) {
 	    if (btn->icon->owner == NULL)
 	    	btn->icon->owner = btn->applist->wapp->main_window_desc;
-#ifdef I_HATE_THIS
     }
-#endif
 #else
     if (btn->icon->owner && !(event->xbutton.state & ControlMask)) {
 #endif
@@ -3339,6 +3336,10 @@ iconDblClick(WObjDescriptor *desc, XEvent *event)
 		    (!btn->running || (event->xbutton.state & ControlMask))) {
 		    launchDockedApplication(btn);
                 }
+            } else if (btn->xindex == 0 && btn->yindex == 0
+		       && btn->dock->type == WM_DOCK) {
+
+		wShowGNUstepPanel(dock->screen_ptr);
 	    }
         }
     }
@@ -3550,7 +3551,8 @@ handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
 #endif
     }
 
-/*    wRaiseFrame(icon->core);*/
+    if (event->xbutton.state & MOD_MASK)
+	wRaiseFrame(icon->core);
 
     if (!wPreferences.flags.noclip)
         clip = scr->workspaces[scr->current_workspace]->clip;

src/menu.c

@@ -84,6 +84,10 @@ static void menuCloseClick(WCoreWindow *sender, void *data, XEvent *event);
 
 static void updateTexture(WMenu *menu);
 
+#ifndef LITE
+static int saveMenuRecurs(proplist_t menus, WScreen *scr, WMenu *menu);
+static int restoreMenuRecurs(WScreen *scr, proplist_t menus, WMenu *menu, char *path);
+#endif /* !LITE */
 
 static void selectEntry(WMenu *menu, int entry_no);
 static void closeCascade(WMenu *menu);
@@ -2437,22 +2441,12 @@ wMenuSaveState(WScreen *scr)
 {
     proplist_t menus, key, value;
     int save_menus = 0;
+
     char buffer[256];
 
     menus = PLMakeDictionaryFromEntries(NULL, NULL, NULL);
 
 #ifndef LITE
-    if (scr->root_menu && scr->root_menu->flags.buttoned) {
-        sprintf(buffer, "%i,%i", scr->root_menu->frame_x,
-                                 scr->root_menu->frame_y);
-        key = PLMakeString("RootMenu");
-        value = PLMakeString(buffer);
-        PLInsertDictionaryEntry(menus, key, value);
-        PLRelease(key);
-        PLRelease(value);
-        save_menus = 1;
-    }
-
     if (scr->switch_menu && scr->switch_menu->flags.buttoned) {
         sprintf(buffer, "%i,%i", scr->switch_menu->frame_x,
                                  scr->switch_menu->frame_y);
@@ -2463,6 +2457,10 @@ wMenuSaveState(WScreen *scr)
         PLRelease(value);
         save_menus = 1;
     }
+
+    if (saveMenuRecurs(menus, scr, scr->root_menu))
+	save_menus = 1;
+
 #endif /* !LITE */
     if (scr->workspace_menu && scr->workspace_menu->flags.buttoned) {
         sprintf(buffer, "%i,%i", scr->workspace_menu->frame_x,
@@ -2484,13 +2482,80 @@ wMenuSaveState(WScreen *scr)
 }
 
 
+#ifndef LITE
+
+static Bool
+getMenuPath(WMenu *menu, char *buffer, int bufSize)
+{
+    Bool ok = True;
+    int len = 0;
+
+    if (!menu->flags.titled || !menu->frame->title[0])
+	return False;
+
+    len = strlen(menu->frame->title);
+    if (len >= bufSize)
+	return False;
+
+    if (menu->parent) {
+	ok = getMenuPath(menu->parent, buffer, bufSize - len - 1);
+	if (!ok)
+	    return False;
+    }
+
+    strcat(buffer, "\\");
+    strcat(buffer, menu->frame->title);
+
+    return True;
+}
+
+static Bool
+saveMenuRecurs(proplist_t menus, WScreen *scr, WMenu *menu)
+{
+    proplist_t key, value;
+    int save_menus = 0, i;
+    char buffer[512];
+    Bool ok = True;
+
+    
+    if (menu->flags.brother)
+	menu = menu->brother;
+
+    if (menu->flags.buttoned && menu != scr->switch_menu) {
+
+	sprintf(buffer, "%i,%i", menu->frame_x, menu->frame_y);
+	value = PLMakeString(buffer);
+
+	buffer[0] = '\0';
+	ok = getMenuPath(menu, buffer, 510);
+
+	if (ok) {
+	    key = PLMakeString(buffer);
+	    PLInsertDictionaryEntry(menus, key, value);
+	    PLRelease(key);
+	    PLRelease(value);
+	    save_menus = 1;
+	}
+    }
+
+    if (ok) {
+	for (i = 0; i < menu->cascade_no; i++) {
+	    if (saveMenuRecurs(menus, scr, menu->cascades[i]))
+		save_menus = 1;
+	}
+    }
+    return save_menus;
+}
+#endif /* !LITE */
+
+
 #define COMPLAIN(key) wwarning(_("bad value in menus state info:%s"), key)
 
 
 static int
 restoreMenu(WScreen *scr, proplist_t menu, int which)
 {
-    int i, x, y;
+    int x, y;
     WMenu *pmenu = NULL;
     
     if (!menu)
@@ -2505,27 +2570,11 @@ restoreMenu(WScreen *scr, proplist_t menu, int which)
         COMPLAIN("Position");
 
 #ifndef LITE
-    if (which & WSS_ROOTMENU) {
+    if (which & WSS_SWITCHMENU) {
-        OpenRootMenu(scr, x, y, False);
-        pmenu = scr->root_menu;
-    } else if (which & WSS_SWITCHMENU) {
         OpenSwitchMenu(scr, x, y, False);
         pmenu = scr->switch_menu;
-    } else
+    }
 #endif /* !LITE */
-	if (which & WSS_WSMENU) {
-        OpenWorkspaceMenu(scr, x, y);
-        pmenu = scr->workspace_menu;
-        if (pmenu->parent) {
-            /* make parent map the copy in place of the original */
-            for (i=0; i<pmenu->parent->cascade_no; i++) {
-                if (pmenu->parent->cascades[i] == pmenu) {
-                    pmenu->parent->cascades[i] = pmenu->brother;
-                    break;
-                }
-            }
-        }
-    }
 
     if (pmenu) {
         int width = MENUW(pmenu);
@@ -2544,10 +2593,69 @@ restoreMenu(WScreen *scr, proplist_t menu, int which)
 }
 
 
+#ifndef LITE
+static int
+restoreMenuRecurs(WScreen *scr, proplist_t menus, WMenu *menu, char *path)
+{
+    proplist_t key, entry;
+    char buffer[512];
+    int i, x, y, res;
+
+    if (strlen(path) + strlen(menu->frame->title) > 510)
+	return False;
+
+    sprintf(buffer, "%s\\%s", path, menu->frame->title);
+    key = PLMakeString(buffer);
+    entry = PLGetDictionaryEntry(menus, key);
+    res = False;
+
+    if (entry && PLIsString(entry)) {
+
+	if (sscanf(PLGetString(entry), "%i,%i", &x, &y) != 2)
+	    COMPLAIN("Position");
+
+	if (!menu->flags.mapped) {
+	    int width = MENUW(menu);
+	    int height = MENUH(menu);
+
+	    wMenuMapAt(menu, x, y, False);
+
+	    if (menu->parent) {
+		/* make parent map the copy in place of the original */
+		for (i=0; i<menu->parent->cascade_no; i++) {
+		    if (menu->parent->cascades[i] == menu) {
+			menu->parent->cascades[i] = menu->brother;
+			break;
+		    }
+		}
+	    }
+	    x = (x < -width) ? 0 : x;
+	    x = (x > scr->scr_width) ? scr->scr_width - width : x;
+	    y = (y < 0) ? 0 : y;
+	    y = (y > scr->scr_height) ? scr->scr_height - height : y;
+	    wMenuMove(menu, x, y, True);
+	    menu->flags.buttoned = 1;
+	    wFrameWindowShowButton(menu->frame, WFF_RIGHT_BUTTON);
+	    res = True;
+	}
+    }
+    
+    PLRelease(key);
+
+    for (i=0; i<menu->cascade_no; i++) {
+	if (restoreMenuRecurs(scr, menus, menu->cascades[i], buffer) != False)
+	    res = True;
+    }
+
+    return res;
+}
+#endif /* !LITE */
+
+
 void
 wMenuRestoreState(WScreen *scr)
 {
-    proplist_t menus, menu, key, rkey, skey, wkey;
+    proplist_t menus, menu, key, skey;
 
     key = PLMakeString("Menus");
     menus = PLGetDictionaryEntry(scr->session_state, key);
@@ -2558,19 +2666,19 @@ wMenuRestoreState(WScreen *scr)
 
     /* restore menus */
 
-    rkey = PLMakeString("RootMenu");
     skey = PLMakeString("SwitchMenu");
-    wkey = PLMakeString("WorkspaceMenu");
-    menu = PLGetDictionaryEntry(menus, rkey);
-    restoreMenu(scr, menu, WSS_ROOTMENU);
     menu = PLGetDictionaryEntry(menus, skey);
     restoreMenu(scr, menu, WSS_SWITCHMENU);
-    menu = PLGetDictionaryEntry(menus, wkey);
-    restoreMenu(scr, menu, WSS_WSMENU);
 
-    PLRelease(rkey);
+#ifndef LITE
+    if (!scr->root_menu) {
+        OpenRootMenu(scr, scr->scr_width*2, 0, False);
+        wMenuUnmap(scr->root_menu);
+    }
+    restoreMenuRecurs(scr, menus, scr->root_menu, "");
+#endif /* !LITE */
+
     PLRelease(skey);
-    PLRelease(wkey);
 }
 
 
@@ -2603,8 +2711,7 @@ OpenWorkspaceMenu(WScreen *scr, int x, int y)
                 wRaiseFrame(menu->frame->core);
 		wMenuMapCopyAt(menu, x, y);
             }
-        }
+        } else {
-        else {
             wMenuMapAt(menu, x, y, False);
         }
     }

src/workspace.c

@@ -409,8 +409,8 @@ showWorkspaceName(WScreen *scr, int workspace)
 
     data->count = 10;
 
-    /* set a 2 second timeout for the effect */
+    /* set a timeout for the effect */
-    data->timeout = time(NULL) + 1 +
+    data->timeout = time(NULL) + 2 +
 	(WORKSPACE_NAME_DELAY + WORKSPACE_NAME_FADE_DELAY*data->count)/1000;
 
     scr->workspace_name_data = data;

util/wmsetbg.c

@@ -52,7 +52,7 @@
 
 #include <proplist.h>
 
-#define PROG_VERSION	"wmsetbg (Window Maker) 2.2"
+#define PROG_VERSION	"wmsetbg (Window Maker) 2.3"
 
 
 #define WORKSPACE_COUNT (MAX_WORKSPACES+1)
@@ -999,6 +999,11 @@ updateDomain(char *domain, char *key, char *texture)
 {
     char *program = "wdwrite";
 
+    if (smooth)
+	system("wdwrite SmoothWorkspaceBack YES");
+    else
+	system("wdwrite SmoothWorkspaceBack NO");
+
     execlp(program, program, domain, key, texture, NULL);
     wwarning("warning could not run \"%s\"", program);
 }
@@ -1344,6 +1349,14 @@ main(int argc, char **argv)
 
     
     PixmapPath = getPixmapPath(domain);
+    if (!smooth) {
+	proplist_t val;
+	
+	val = PLGetDictionaryEntry(domain, 
+				   PLMakeString("SmoothWorkspaceBack"));
+	if (val && PLIsString(val) && strcasecmp(PLGetString(val), "YES")==0)
+	    smooth = True;
+    }
 
     dpy = XOpenDisplay(display);
     if (!dpy) {