Website: Create script to update the list of man pages in the index

It is a good idea to have an Index web page with the list of the man pages
available, but there is a risk to have it outdated, so there is a script to
take care of this for us.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>

.gitignore

@@ -87,6 +87,7 @@ WINGs/WUtil.pc
 
 wrlib/libwraster.map
 
+WindowMaker/appearance.menu
 WindowMaker/menu
 WindowMaker/menu.bg
 WindowMaker/menu.fi
@@ -105,9 +106,13 @@ WindowMaker/plmenu.fy
 WindowMaker/plmenu.ja
 WindowMaker/plmenu.ko
 WindowMaker/plmenu.nl
+WindowMaker/plmenu.pl
 WindowMaker/plmenu.ro
 WindowMaker/plmenu.sk
+WindowMaker/plmenu.zh_CN
 WindowMaker/plmenu.zh_TW
+WindowMaker/wmmacros
+
 
 WindowMaker/Defaults/WMRootMenu
 WindowMaker/Defaults/WMState
@@ -115,6 +120,16 @@ WindowMaker/Defaults/WMWindowAttributes
 WindowMaker/Defaults/WindowMaker
 WindowMaker/IconSets/Default.iconset
 
+# These files are generated by the i18n process
+/po/WindowMaker.pot
+/po/*.mo
+/WINGs/po/WINGs.pot
+/WINGs/po/*.mo
+/WPrefs.app/po/WPrefs.pot
+/WPrefs.app/po/*.mo
+/util/po/*.pot
+/util/po/*.mo
+
 # Some text editors generate backup files
 *~
 

BUGFORM

@@ -4,7 +4,7 @@
 
 
 	If you find a bug please fill this form and send it to
-wmaker-dev@lists.windowmaker.org Please, USE THIS FORM!!!
+wmaker-dev@googlegroups.com Please, USE THIS FORM!!!
 
 0. Before reporting this bug I already:
 [ ] read the NEWS, README and INSTALL files

ChangeLog

@@ -4063,7 +4063,7 @@ Changes since version 0.17.5:
   icons
 - fixed bug in focusfollowmouse that made windows under the currently
   focused window that close, to not get the focus
-- if the app is a .app, it will try to find it's icon in the .app
+- if the app is a .app, it will try to find its icon in the .app
   directory and save it in the WMWindowAttributes, so that the dock can use it.
 - drag docklets that select for mouse events to with Alt+drag
 
@@ -4934,7 +4934,7 @@ Changes since version 0.3.2:
 
 - application icons (not mini-windows) like I think how it is on NEXTSTEP(tm)
 - fixed "slippery" icon movement
-- added a Dock (not for GNUstep, as it will have it's own)
+- added a Dock (not for GNUstep, as it will have its own)
 
 Changes since version 0.3.1:
 ............................
@@ -4964,7 +4964,7 @@ it's opened to select items, just drag the pointer
 - transient owners get a different titlebar color when the focus
 is in the transient (e.g, in NeXTese: mainWindow is highlighted correctly when
 the keyWindow is a panel)
-- when transient is closed, it's owner always get the focus
+- when transient is closed, its owner always get the focus
 - fixed XGrabButton/BadAccess bug
 - fixed window_count error (this time I'm 90% sure)
 - fixed focusNextWindow through Alt-Tab bug with non-focusable windows

FAQ

@@ -333,7 +333,7 @@ Window Maker distribution.
 
 The author Anthony Quinn <southgat@frontiernet.net> has released a
 version that works with Window Maker >= 0.15.x. It is available from
-it's home page at http://www.frontiernet.net/~southgat/wmsound/ 
+its home page at http://www.frontiernet.net/~southgat/wmsound/
 or on Largo's site at http://wm.current.nu/files.html#wmsound
 for your convenience.
 
@@ -352,7 +352,7 @@ GNOME application they have no title bar" below.
 To use it with CDE, read the answer for "How do I switch
 CDE's window manager to use Window Maker?"
 
-To use it with KDE, read it's documentation to get rid of kwm (and possibly
+To use it with KDE, read its documentation to get rid of kwm (and possibly
 kpanel) and replace it with wmaker. Then, start WPrefs.app, go to "Mouse
 Preferences" and set the "Disable mouse actions" check box. You will
 need to restart Window Maker to make this change take effect. The
@@ -1283,7 +1283,7 @@ WM_NORMAL_HINTS(WM_SIZE_HINTS):
                 user specified size: 400 by 300
                 program specified minimum size: 400 by 300
 
-Now, when scilab opens it's window, Window Maker nicely does exactly what it
+Now, when scilab opens its window, Window Maker nicely does exactly what it
 is told, that is, map the window at position 136679205, 1074468360 which
 obviously falls outside the screen no matter how big is your monitor ;)
 

Makefile.am

@@ -41,11 +41,13 @@ EXTRA_DIST = TODO BUGS BUGFORM FAQ INSTALL \
 	script/check-cmdline-options-doc.sh \
 	script/check-translation-sources.sh \
 	script/check-wmaker-loaddef-callbacks.sh \
+	script/generate-html-from-man.sh \
 	script/generate-mapfile-from-header.sh \
 	script/generate-po-from-template.sh \
 	script/generate-txt-from-texi.sh \
 	script/nested-func-to-macro.sh \
-	script/replace-ac-keywords.sh
+	script/replace-ac-keywords.sh \
+	script/replace-generated-content.sh
 
 
 .PHONY:	coverage-reset coverage
@@ -62,6 +64,10 @@ coverage:
 	genhtml --output-directory @lcov_output_directory@ coverage/coverage.info
 endif
 
+################################################################################
+# Section for the I18N processing
+################################################################################
+
 # make update-lang PO=<lang>
 # ==========================
 # Update the PO files against the POT file in all the translation sub-directories
@@ -80,13 +86,34 @@ if HAVE_XGETTEXT
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) update-lang || exit $$?); \
 	done
 
-SUBDIRS_PO = WINGs/po po util/po WPrefs.app/po
+SUBDIRS_PO = wrlib/po WINGs/po po util/po WPrefs.app/po
 else
 	@echo "Error: the program 'xgettext' was not found by configure, it is mandatory for this operation" >&2 ; exit 1
 endif
 
 .PHONY: update-lang
 
+################################################################################
+# Section related to generating HTML content for the website
+################################################################################
+
+if WITH_WEB_REPO
+
+SUBDIRS_WEB = doc
+
+website:
+	@for subdir in $(SUBDIRS_WEB); do \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) website || exit $$?); \
+	done
+
+endif
+
+.PHONY: website
+
+################################################################################
+# Section for the automated checks
+################################################################################
+
 # Create a 'silent-rule' for our make check the same way automake does
 AM_V_CHKOPTS = $(am__v_CHKOPTS_$(V))
 am__v_CHKOPTS_  = $(am__v_CHKOPTS_$(AM_DEFAULT_VERBOSITY))

NEWS

@@ -1,6 +1,36 @@
 NEWS for veteran Window Maker users
 -----------------------------------
 
+-- 0.95.9
+
+Configurable SwitchPanel
+------------------------
+
+SwitchPanel is now more configurable: you can configure the switch panel icon
+size by setting the "SwitchPanelIconSize" option to your preferred value in
+~/GNUstep/Defaults/WindowMaker. The font size used in this panel now is also
+sensible to changes in the system font.
+
+
+New user configuration directory environment variable
+-----------------------------------------------------
+
+In previous versions, the GNUstep directory used to store a user's Window Maker
+configuration files was specified by the GNUSTEP_USER_ROOT environment variable,
+which defaulted to ~/GNUstep.  However, this environment variable was deprecated
+in gnustep-make v2.  Therefore, it has been replaced by the WMAKER_USER_ROOT
+environment variable.
+
+
+libXmu is now an optional dependency
+------------------------------------
+
+If the library is not found, compilation work, the only limitation will arise
+when trying to install the standard colormap on displays which are not TrueColor.
+Please note that if you have the library but not the headers, configure will
+still stop; there is no user option to explicitly disable the library use.
+
+
 -- 0.95.8
 
 Move pointer with maximized windows
@@ -1613,7 +1643,7 @@ raising/lowering there is a time threshold before raising/lowering.
 The thresholds can be changed in wconfig.h by changing one or both of
 AUTO_LOWER_DELAY and AUTO_RAISE_DELAY (expressed in milliseconds).
 For example if you set AUTO_RAISE_DELAY to 0, then the Clip will be raised as
-soon as the mouse pointer enters it's area. Setting AUTO_RAISE_DELAY to a very
+soon as the mouse pointer enters its area. Setting AUTO_RAISE_DELAY to a very
 big value, will make the Clip to practically do not auto raise unless clicked,
 but to be automatically lowered after AUTO_LOWER_DELAY (ms) when leaved.
 
@@ -2542,7 +2572,7 @@ The OPEN_MENU command now supports the following syntax:
    // it in current position
    OPEN_MENU file.menu
 2. Pipe menu handling.
-   // opens command and uses it's stdout to construct menu.
+   // opens command and uses its stdout to construct menu.
    // Command's output must be a valid menu description.
    OPEN_MENU | command
 3. Directory handling.
@@ -3145,7 +3175,7 @@ when they are first mapped
 titlebar gradients are in a single piece now
 
 the WMDock file was merged into the WMState file. You can insert this
-file in WMState and set it's key to Dock. For example, if your WMDock
+file in WMState and set its key to Dock. For example, if your WMDock
 contains:
 
 {

README

@@ -129,8 +129,8 @@ HELP ME!!!
 ==========
 
 There is a mailing list for discussing Window Maker at
-wmaker-user@lists.windowmaker.org To subscribe to it, send a message to
+wmaker-user@googlegroups.com.  To subscribe to it, visit
-wmaker-user-subscribe@lists.windowmaker.org
+https://groups.google.com/forum/#!forum/wmaker-user
 
 If you got a problem, ask there (after reading the docs, of course). The people
 there is more likely to be able to answer your questions than we are.  For bug
@@ -178,7 +178,7 @@ Running multiple instances of Window Maker
 
 It is not a good idea to run more than one instance of Window Maker
 from the same user (so that wmaker will use the same configuration files) at the
-same time. You might get unexpected behavior when Window Maker updates it's
+same time. You might get unexpected behavior when Window Maker updates its
 configuration files.
 
 If you really desire to do this, try running Window Maker with the command line
@@ -209,7 +209,7 @@ while keeping a nice appearance and good functionality, follow the items bellow:
 - remove support for image formats you don't use
 - to reduce memory usage, disable the icon cache, by setting the RIMAGE_CACHE
   environment variable to 0. If you want to increase performance at the cost of
-  memory usage, set it's value to a value like the number of different icons you
+  memory usage, set its value to a value like the number of different icons you
   use. Also, disable anti-aliased text support in ~/GNUstep/Defaults/WMGLOBAL.
 
 
@@ -311,5 +311,5 @@ project. The name of people who have helped with localization (translation) can
 be found in po/README and Window Maker/README
 
 If you have any comments, fixes and bug reports (filled BUGFORMs) send them
-to wmaker-dev@lists.windowmaker.org
+to wmaker-dev@googlegroups.com
 

The-perfect-Window-Maker-patch.txt

@@ -134,7 +134,7 @@ Sending the patch to the mailing list
 
 Send your patches to:
 
-wmaker-dev@lists.windowmaker.org
+wmaker-dev@googlegroups.com
 
 Please do not send patches to any individual developer unless you have a very
 good reason to avoid more people being able to comment (and improve) on your
@@ -147,7 +147,7 @@ you, otherwise you may face the problems below. Doing this is really easy:
 #   (of course, replace smtp.example.com with your ISP's)
 git config --global sendemail.smtpserver "smtp.example.com"
 git config --global sendemail.validate   true
-git config sendemail.to "Window Maker Devel <wmaker-dev@lists.windowmaker.org>"
+git config sendemail.to "Window Maker Devel <wmaker-dev@googlegroups.com>"
 
 # If you're sending more than 1 patch, you may be interested in having an
 # introduction mail for the batch:

WINGs/Examples/Makefile.am

@@ -8,7 +8,7 @@ noinst_PROGRAMS = fontl puzzle colorpick
 
 LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	@XFTLIBS@ @INTLIBS@ @XLIBS@
+	@XFT_LIBS@ @INTLIBS@ @XLIBS@
 
 colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 

WINGs/Extras/Makefile.am

@@ -25,6 +25,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
 
 LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	@XFTLIBS@ @INTLIBS@
+	@XFT_LIBS@ @INTLIBS@
 
 test_LDADD = wtableview.o wtabledelegates.o $(LDADD)

WINGs/Makefile.am

@@ -8,13 +8,11 @@ DIST_SUBDIRS = $(SUBDIRS) Tests Examples Extras
 libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@
 libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
 
-dist_bin_SCRIPTS = get-wings-flags get-wutil-flags
-
 lib_LTLIBRARIES = libWUtil.la libWINGs.la
 
 
 LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
-libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
+libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@
 libWUtil_la_LIBADD = @LIBBSD@
 
 EXTRA_DIST = BUGS make-rgb Examples Extras Tests
@@ -89,11 +87,12 @@ libWUtil_la_SOURCES = 	\
 	wutil.c
 
 
-AM_CFLAGS =
+AM_CFLAGS = @PANGO_CFLAGS@
 
 AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
-	 -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+	 -I$(top_srcdir)/WINGs/WINGs -I$(top_builddir)/WINGs/WINGs \
-	@XFTFLAGS@ @HEADER_SEARCH_PATH@
+	 -I$(top_builddir)/wrlib -I$(top_srcdir)/src \
+	@XFT_CFLAGS@ @HEADER_SEARCH_PATH@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = WINGs.pc WUtil.pc
@@ -107,8 +106,8 @@ WINGs.pc: Makefile
 	@echo 'Version: $(VERSION)' >> $@
 	@echo 'Requires: wrlib WUtil' >> $@
 	@echo 'Libs: $(lib_search_path) -lWINGs' >> $@
-	@echo 'Libs.private: $(XFTLIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
+	@echo 'Libs.private: $(XFT_LIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
-	@echo 'Cflags: $(inc_search_path)' >> $@
+	@echo 'Cflags: $(inc_search_path) @PANGO_CFLAGS@' >> $@
 
 WUtil.pc: Makefile
 	@echo "Generating $@"

WINGs/README

@@ -8,25 +8,25 @@
                           kojima@windowmaker.info
 
 
-   WINGs is a small widget set with the N*XTSTEP look and feel. It's API
+   WINGs is a small widget set with the N*XTSTEP look and feel. Its API
-is inspired in OpenStep and it's implementation borrows some ideas
+is inspired in OpenStep and its implementation borrows some ideas
 from Tk. It has a reasonable set of widgets, sufficient for building
 small applications (like a CDPlayer or hacking something like rxvt). It
 also has other functions that are usefull for applications, like a
 User Defaults alike configuration manager and a notification system.
 
-   The library is limited and it's design is a little sloppy, 
+   The library is limited and its design is a little sloppy,
 so it's not intended to build large or complex applications, like
 anything more complex than a CDPlayer. GNUstep should be used for such
 applications.
 
    Since WINGs is written in C and is sort of low-level it is small
 and faster than say, Motif or even Athena. Knowing Xlib will help you to
-workaround some of it's limitations, although you'll probably be able to 
+workaround some of its limitations, although you'll probably be able to
 write something like a trivial tic-tac-toe game without knowing much Xlib.
 
-   Some of it's functions are designed to support the Window Maker window
+   Some of its functions are designed to support the Window Maker window
-manager (see http://windowmaker.info) In fact, it's primary role is to
+manager (see http://windowmaker.info) In fact, its primary role is to
 support Window Maker. All other uses of it are just an added bonus.
 
    It will help you to understand the API if you read the ApplicationKit

WINGs/Tests/Makefile.am

@@ -6,7 +6,7 @@ noinst_PROGRAMS = wtest wmquery wmfile testmywidget
 
 LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	@XFTLIBS@ @INTLIBS@ @XLIBS@ 
+	@XFT_LIBS@ @INTLIBS@ @XLIBS@
 
 
 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
@@ -17,4 +17,4 @@ wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
 
 AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
+	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFT_CFLAGS@ @HEADER_SEARCH_PATH@

WINGs/WINGs/Makefile.am

@@ -5,4 +5,14 @@ AUTOMAKE_OPTIONS =
 # is this a kluge? if so, how should i do it?
 includedir = @includedir@/WINGs
 
-include_HEADERS = WINGs.h WUtil.h WINGsP.h
+BUILT_SOURCES = WINGsP.h
+CLEANFILES = WINGsP.h
+include_HEADERS = WINGs.h WUtil.h
+nodist_include_HEADERS = WINGsP.h
+EXTRA_DIST = WINGsP.h.in
+
+WINGsP.h: WINGsP.h.in $(top_builddir)/config.h
+	$(AM_V_GEN)$(top_srcdir)/script/replace-ac-keywords.sh \
+		--header "$(top_builddir)/config.h" \
+		--filter "USE_PANGO" \
+		-o $@  $<

WINGs/WINGs/WINGs.h

@@ -795,6 +795,8 @@ char* WMGetFontName(WMFont *font);
 
 unsigned int WMFontHeight(WMFont *font);
 
+void WMGetScaleBaseFromSystemFont(WMScreen *scrPtr, int *alphabetWidth, int *fontHeight);
+
 void WMSetWidgetDefaultFont(WMScreen *scr, WMFont *font);
 
 void WMSetWidgetDefaultBoldFont(WMScreen *scr, WMFont *font);
@@ -1839,10 +1841,17 @@ WMAlertPanel* WMCreateAlertPanel(WMScreen *app, WMWindow *owner, const char *tit
                                  const char *msg, const char *defaultButton,
                                  const char *alternateButton, const char *otherButton);
 
+WMAlertPanel* WMCreateScaledAlertPanel(WMScreen *app, WMWindow *owner, const char *title,
+                                       const char *msg, const char *defaultButton,
+                                       const char *alternateButton, const char *otherButton);
+
 WMInputPanel* WMCreateInputPanel(WMScreen *app, WMWindow *owner, const char *title,
                                  const char *msg, const char *defaultText, const char *okButton,
                                  const char *cancelButton);
 
+WMInputPanel* WMCreateScaledInputPanel(WMScreen *app, WMWindow *owner, const char *title,
+                                       const char *msg, const char *defaultText, const char *okButton,
+                                       const char *cancelButton);
 
 WMGenericPanel* WMCreateGenericPanel(WMScreen *scrPtr, WMWindow *owner,
                                      const char *title, const char *defaultButton,

WINGs/WINGs/WINGsP.h.in

@@ -5,9 +5,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#ifdef USE_PANGO
+@USE_PANGO@#include <pango/pango.h>
-#include <pango/pango.h>
-#endif
 
 #include <WINGs/WINGs.h>
 
@@ -459,9 +457,7 @@ typedef struct W_Font {
     short refCount;
     char *name;
 
-#ifdef USE_PANGO
+@USE_PANGO@    PangoLayout *layout;
-    PangoLayout *layout;
-#endif
 } W_Font;
 
 #define W_FONTID(f)		(f)->font->fid

WINGs/WINGs/WUtil.h

@@ -193,6 +193,16 @@ typedef void WMNotificationObserverAction(void *observerData,
 		sizeof(array) / sizeof(array[0]);   \
 	})
 
+/* These macros can be used to adjust the location and size pixel values in
+ * the panel layouts so that they match the configured size of the system
+ * font (useful with high DPI screens, where you have to increase this size).
+ * The macros require two local variables to be set:
+ *    wmScaleWidth:  the width of the alphabet in the current system font
+ *    wmScaleHeight: the height of the current system font
+ * Use the WMGetScaleBaseFromSystemFont function to set these values.
+ */
+#define WMScaleX(value) ((int)((double)value / 177.0 * (double)wmScaleWidth + 0.5))
+#define WMScaleY(value) ((int)((double)value / 15.0 * (double)wmScaleHeight + 0.5))
 
 /* ---[ WINGs/memory.c ]-------------------------------------------------- */
 

WINGs/get-wings-flags

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# [Christophe CURIS, 2015/01/31]
-# This script is now reporting itself as deprecated (this should have been done
-# a long time ago), so it should be kept for at least 2 years from now in order
-# to allow users to update their scripts, and then removed.
-
-if test $# -eq 0; then
-      echo "Error: $0 is deprecated, please use 'pkg-config WINGs ...'" >&2
-      exit 1
-fi
-
-while test $# -gt 0; do
-  case $1 in
-    --cflags)
-        echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --cflags'" >&2
-	pkg-config WINGs --cflags
-        ;;
-    --ldflags|--lflags)
-	echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --libs'" >&2
-        pkg-config WINGs --libs-only-L
-        ;;
-    --libs)
-	echo "Warning: $0 is deprecated, please use 'pkg-config WINGs --libs'" >&2
-        pkg-config WINGs --libs
-        ;;
-    *)
-	echo "Error: $0 is deprecated, please use 'pkg-config WINGs ...'" >&2
-	exit 1
-	;;
-  esac
-  shift
-done

WINGs/get-wutil-flags

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# [Christophe CURIS, 2015/01/31]
-# This script is now reporting itself as deprecated (this should have been done
-# a long time ago), so it should be kept for at least 2 years from now in order
-# to allow users to update their scripts, and then removed.
-
-if test $# -eq 0; then
-      echo "Error: $0 is deprecated, please use 'pkg-config WUtil ...'" >&2
-      exit 1
-fi
-
-while test $# -gt 0; do
-  case $1 in
-    --cflags)
-        echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --cflags'" >&2
-	pkg-config WUtil --cflags
-        ;;
-    --ldflags|--lflags)
-	echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --libs'" >&2
-        pkg-config WUtil --libs-only-L
-        ;;
-    --libs)
-	echo "Warning: $0 is deprecated, please use 'pkg-config WUtil --libs'" >&2
-        pkg-config WUtil --libs
-        ;;
-    *)
-	echo "Error: $0 is deprecated, please use 'pkg-config WUtil ...'" >&2
-	exit 1
-	;;
-  esac
-  shift
-done

WINGs/memory.c

@@ -107,6 +107,7 @@ void *wmalloc(size_t size)
 			}
 		}
 	}
+	if (tmp != NULL)
 		memset(tmp, 0, size);
 	return tmp;
 }

WINGs/po/fy.po

@@ -388,8 +388,8 @@ msgid "Could not create component %s"
 msgstr "Koe komponint %s net oanmeitsje"
 
 #: ../../WINGs/userdefaults.c:72
-msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
+msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
-msgstr "fariabele GNUSTEP_USER_ROOT, definiearre mei ûnjildich paad, net brûkt"
+msgstr "fariabele WMAKER_USER_ROOT, definiearre mei ûnjildich paad, net brûkt"
 
 #. something happened with the file. just overwrite it
 #: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225

WINGs/po/hu.po

@@ -197,8 +197,8 @@ msgid "Could not create component %s"
 msgstr "Nem sikerült létrehozni a %s elemet"
 
 #: ../../../wmaker-crm/WINGs/userdefaults.c:65
-msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
+msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
-msgstr "A GNUSTEP_USER_ROOT változó be van állítva, de rossz értékre. Nem használom"
+msgstr "A WMAKER_USER_ROOT változó be van állítva, de rossz értékre. Nem használom"
 
 #. something happened with the file. just overwrite it
 #: ../../../wmaker-crm/WINGs/userdefaults.c:196

WINGs/po/nl.po

@@ -389,9 +389,9 @@ msgid "Could not create component %s"
 msgstr "Kon component %s niet aanmaken"
 
 #: ../../WINGs/userdefaults.c:72
-msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
+msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
 msgstr ""
-"variabele GNUSTEP_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt"
+"variabele WMAKER_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt"
 
 #. something happened with the file. just overwrite it
 #: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225

WINGs/proplist.c

@@ -1253,22 +1253,34 @@ int WMGetPropListItemCount(WMPropList * plist)
 
 Bool WMIsPLString(WMPropList * plist)
 {
+	if (plist)
 		return (plist->type == WPLString);
+	else
+		return False;
 }
 
 Bool WMIsPLData(WMPropList * plist)
 {
+	if (plist)
 		return (plist->type == WPLData);
+	else
+		return False;
 }
 
 Bool WMIsPLArray(WMPropList * plist)
 {
+	if (plist)
 		return (plist->type == WPLArray);
+	else
+		return False;
 }
 
 Bool WMIsPLDictionary(WMPropList * plist)
 {
+	if (plist)
 		return (plist->type == WPLDictionary);
+	else
+		return False;
 }
 
 Bool WMIsPropListEqualTo(WMPropList * plist, WMPropList * other)
@@ -1683,6 +1695,7 @@ Bool WMWritePropListToFile(WMPropList * plist, const char *path)
 	if (fprintf(theFile, "%s\n", desc) != strlen(desc) + 1) {
 		werror(_("writing to file: %s failed"), thePath);
 		wfree(desc);
+		fclose(theFile);
 		goto failure;
 	}
 
@@ -1719,7 +1732,7 @@ Bool WMWritePropListToFile(WMPropList * plist, const char *path)
  * file, and the last component is stripped off. the rest is the
  * the hierarchy to be created.
  *
- * refuses to create anything outside $GNUSTEP_USER_ROOT
+ * refuses to create anything outside $WMAKER_USER_ROOT
  *
  * returns 1 on success, 0 on failure
  */
@@ -1730,7 +1743,7 @@ int wmkdirhier(const char *path)
 	size_t p, plen;
 	struct stat st;
 
-	/* Only create directories under $GNUSTEP_USER_ROOT */
+	/* Only create directories under $WMAKER_USER_ROOT */
 	if ((t = wusergnusteppath()) == NULL)
 		return 0;
 	if (strncmp(path, t, strlen(t)) != 0)
@@ -1811,7 +1824,7 @@ static int wrmdirhier_fn(const char *path, const struct stat *st,
 /*
  * remove a directory hierarchy
  *
- * refuses to remove anything outside $GNUSTEP_USER_ROOT
+ * refuses to remove anything outside $WMAKER_USER_ROOT
  *
  * returns 1 on success, 0 on failure
  *
@@ -1825,7 +1838,7 @@ int wrmdirhier(const char *path)
 	int error;
 	const char *t;
 
-	/* Only remove directories under $GNUSTEP_USER_ROOT */
+	/* Only remove directories under $WMAKER_USER_ROOT */
 	if ((t = wusergnusteppath()) == NULL)
 		return EPERM;
 	if (strncmp(path, t, strlen(t)) != 0)

WINGs/selection.c

@@ -261,7 +261,7 @@ static WMData *getSelectionData(Display * dpy, Window win, Atom where)
 
 	bpi = bits / 8;
 
-	wdata = WMCreateDataWithBytesNoCopy(data, len * bpi, (WMFreeDataProc *) XFree);
+	wdata = WMCreateDataWithBytesNoCopy(data, len * bpi, (void *) XFree);
 	WMSetDataFormat(wdata, bits);
 
 	return wdata;

WINGs/userdefaults.c

@@ -59,9 +59,9 @@ const char *wusergnusteppath()
 		return path;
 
 #ifdef HAVE_SECURE_GETENV
-	gspath = secure_getenv("GNUSTEP_USER_ROOT");
+	gspath = secure_getenv("WMAKER_USER_ROOT");
 #else
-	gspath = getenv("GNUSTEP_USER_ROOT");
+	gspath = getenv("WMAKER_USER_ROOT");
 #endif
 	if (gspath) {
 		gspath = wexpandpath(gspath);
@@ -69,7 +69,7 @@ const char *wusergnusteppath()
 			path = gspath;
 			return path;
 		}
-		wwarning(_("variable GNUSTEP_USER_ROOT defined with invalid path, not used"));
+		wwarning(_("variable WMAKER_USER_ROOT defined with invalid path, not used"));
 	}
 
 	h = wgethomedir();

WINGs/wapplication.c

@@ -140,7 +140,7 @@ char *WMPathForResourceOfType(const char *resource, const char *ext)
 	 * Paths are searched in this order:
 	 * - resourcePath/ext
 	 * - dirname(argv[0])/ext
-	 * - GNUSTEP_USER_ROOT/Applications/ApplicationName.app/ext
+	 * - WMAKER_USER_ROOT/Applications/ApplicationName.app/ext
 	 * - ~/GNUstep/Applications/ApplicationName.app/ext
 	 * - GNUSTEP_LOCAL_ROOT/Applications/ApplicationName.app/ext
 	 * - /usr/local/GNUstep/Applications/ApplicationName.app/ext
@@ -175,7 +175,7 @@ char *WMPathForResourceOfType(const char *resource, const char *ext)
 	if (snprintf(appdir, slen, "Applications/%s.app", WMApplication.applicationName) >= slen)
 		goto out;
 
-	path = checkFile(getenv("GNUSTEP_USER_ROOT"), appdir, ext, resource);
+	path = checkFile(getenv("WMAKER_USER_ROOT"), appdir, ext, resource);
 	if (path)
 		goto out;
 

WINGs/wcolorpanel.c

@@ -2385,6 +2385,8 @@ void rgbIntToChar(W_ColorPanel *panel, int *value)
 	case RGBhex:
 		format = "%0X";
 		break;
+	default:
+		format = "";
 	}
 
 	sprintf(tmp, format, value[0]);
@@ -2643,7 +2645,7 @@ static void hsbTextFieldCallback(void *observerData, WMNotification * notificati
 {
 	CPColor cpColor;
 	int value[3];
-	char tmp[4];
+	char tmp[12];  /* We only 4 bytes needed, but compilers cannot know that */
 	int n;
 	W_ColorPanel *panel = (W_ColorPanel *) observerData;
 
@@ -3396,6 +3398,9 @@ static void rgbInit(W_ColorPanel * panel)
 	case RGBhex:
 		format = "%0X";
 		break;
+	default:
+		/* Avoid compiler warning */
+		format = "";
 	}
 
 	sprintf(tmp, format, panel->color.rgb.red);
@@ -3448,7 +3453,7 @@ static void hsbInit(W_ColorPanel * panel)
 	WMSetSliderValue(panel->hsbSaturationS, value[1]);
 	WMSetSliderValue(panel->hsbBrightnessS, value[2]);
 
-	sprintf(tmp, "%d", value[0]);
+	sprintf(tmp, "%hu", value[0]);
 	WMSetTextFieldText(panel->hsbHueT, tmp);
 	sprintf(tmp, "%d", value[1]);
 	WMSetTextFieldText(panel->hsbSaturationT, tmp);
@@ -3499,13 +3504,17 @@ static void convertCPColor(CPColor * color)
 		old_hue = color->hsv.hue;
 		RRGBtoHSV(&(color->rgb), &(color->hsv));
 
-		/* In black the hue is undefined, and may change by conversion
+		/*
-		 * Same for white. */
+		 * For pure grey colors, the Hue is generally calculated
-		if (((color->rgb.red == 0) &&
+		 * as 0, but in reality the Hue does not matter.
-		     (color->rgb.green == 0) &&
+		 *
-		     (color->rgb.blue == 0)) ||
+		 * But in an interactive GUI it is interresting to remember
-		    ((color->rgb.red == 0) && (color->rgb.green == 0) && (color->rgb.blue == 255))
+		 * the previous Hue because if user moves away from perfect
-		    )
+		 * grey then he could be interrested in finding back his
+		 * previous tint
+		 */
+		if ((color->rgb.red == color->rgb.green) &&
+		    (color->rgb.red == color->rgb.blue)  )
 			color->hsv.hue = old_hue;
 		break;
 	case cpHSV:

WINGs/wfont.c

@@ -237,6 +237,16 @@ char *WMGetFontName(WMFont * font)
 	return font->name;
 }
 
+void WMGetScaleBaseFromSystemFont(WMScreen *scrPtr, int *alphabetWidth, int *fontHeight)
+{
+	WMFont *font;
+
+	font = WMDefaultSystemFont(scrPtr);
+	*alphabetWidth = WMWidthOfString(font, "abcdefghijklmnopqrstuvwxyz", 26);
+	*fontHeight = WMFontHeight(font);
+	WMReleaseFont(font);
+}
+
 WMFont *WMDefaultSystemFont(WMScreen * scrPtr)
 {
 	return WMRetainFont(scrPtr->normalFont);

WINGs/widgets.c

@@ -385,6 +385,7 @@ static void renderPixmap(W_Screen * screen, Pixmap d, Pixmap mask, char **data,
 				if (mask)
 					XDrawPoint(screen->display, mask, screen->monoGC, x, y);
 
+				/* FALLTHRU */
 			case '.':
 			case 'l':
 				XDrawPoint(screen->display, d, lightGC, x, y);
@@ -944,7 +945,7 @@ void WMSetFocusToWidget(WMWidget * widget)
 
 /*
  * WMRealizeWidget-
- * 	Realizes the widget and all it's children.
+ * 	Realizes the widget and all its children.
  *
  */
 void WMRealizeWidget(WMWidget * w)

WINGs/wpanel.c

@@ -89,10 +89,12 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
 				 const char *alternateButton, const char *otherButton)
 {
 	WMAlertPanel *panel;
+	WMFont *defaultFont;
 	int dw = 0, aw = 0, ow = 0, w;
 	WMBox *hbox;
 	WMPixmap *icon;
 
+	defaultFont = WMSystemFontOfSize(scrPtr, 12);
 	panel = wmalloc(sizeof(WMAlertPanel));
 
 	if (owner) {
@@ -160,6 +162,7 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
 				WMFontHeight(scrPtr->normalFont) * 4, 0, 5);
 		WMSetLabelText(panel->mLbl, msg);
 		WMSetLabelTextAlignment(panel->mLbl, WACenter);
+		WMSetLabelFont(panel->mLbl, defaultFont);
 	}
 
 	panel->hbox = WMCreateBox(panel->vbox);
@@ -170,13 +173,13 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
 
 	/* create buttons */
 	if (otherButton)
-		ow = WMWidthOfString(scrPtr->normalFont, otherButton, strlen(otherButton));
+		ow = WMWidthOfString(defaultFont, otherButton, strlen(otherButton));
 
 	if (alternateButton)
-		aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton));
+		aw = WMWidthOfString(defaultFont, alternateButton, strlen(alternateButton));
 
 	if (defaultButton)
-		dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton));
+		dw = WMWidthOfString(defaultFont, defaultButton, strlen(defaultButton));
 
 	dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
 
@@ -206,18 +209,187 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
 		WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
 		WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
 		WMSetButtonImagePosition(panel->defBtn, WIPRight);
+		WMSetButtonFont(panel->defBtn, defaultFont);
 	}
 	if (alternateButton) {
 		panel->altBtn = WMCreateCommandButton(panel->hbox);
 		WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->altBtn), False, True, aw, 0, 5);
 		WMSetButtonAction(panel->altBtn, alertPanelOnClick, panel);
 		WMSetButtonText(panel->altBtn, alternateButton);
+		WMSetButtonFont(panel->altBtn, defaultFont);
 	}
 	if (otherButton) {
 		panel->othBtn = WMCreateCommandButton(panel->hbox);
 		WMSetButtonAction(panel->othBtn, alertPanelOnClick, panel);
 		WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->othBtn), False, True, ow, 0, 5);
 		WMSetButtonText(panel->othBtn, otherButton);
+		WMSetButtonFont(panel->othBtn, defaultFont);
+	}
+
+	WMMapSubwidgets(panel->hbox);
+
+	WMCreateEventHandler(W_VIEW(panel->win), KeyPressMask, handleKeyPress, panel);
+
+	WMRealizeWidget(panel->win);
+	WMMapSubwidgets(panel->win);
+
+	WMReleaseFont(defaultFont);
+
+	return panel;
+}
+
+WMAlertPanel *WMCreateScaledAlertPanel(WMScreen * scrPtr, WMWindow * owner,
+				       const char *title, const char *msg, const char *defaultButton,
+				       const char *alternateButton, const char *otherButton)
+{
+	WMAlertPanel *panel;
+	int dw = 0, aw = 0, ow = 0, w;
+	WMBox *hbox;
+	WMPixmap *icon;
+	int wmScaleWidth, wmScaleHeight;
+	int pwidth, pheight;
+
+	panel = wmalloc(sizeof(WMAlertPanel));
+
+	if (owner) {
+		panel->win = WMCreatePanelWithStyleForWindow(owner, "alertPanel", WMTitledWindowMask);
+	} else {
+		panel->win = WMCreateWindowWithStyle(scrPtr, "alertPanel", WMTitledWindowMask);
+	}
+
+	/* calculate and set the panel's size */
+	WMGetScaleBaseFromSystemFont(scrPtr, &wmScaleWidth, &wmScaleHeight);
+	pwidth = WMScaleX(400);
+	pheight = WMScaleY(5)    /* upper margin */
+		+ 64             /* icon size */
+		+ WMScaleY(5)    /* space between icon and divider line */
+		+ 2              /* divider line */
+		+ WMScaleY(5);   /* space between divider line and message */
+	if (msg)
+		pheight += WMFontHeight(scrPtr->normalFont) * 4 + WMScaleY(5);
+	pheight += WMScaleY(44);
+	WMResizeWidget(panel->win, pwidth, pheight);
+
+	WMSetWindowInitialPosition(panel->win,
+				   (scrPtr->rootView->size.width - pwidth) / 2,
+				   (scrPtr->rootView->size.height - pheight) / 2);
+
+	WMSetWindowTitle(panel->win, "");
+
+	panel->vbox = WMCreateBox(panel->win);
+	WMSetViewExpandsToParent(WMWidgetView(panel->vbox), 0, 0, 0, 0);
+	WMSetBoxHorizontal(panel->vbox, False);
+	WMMapWidget(panel->vbox);
+
+	hbox = WMCreateBox(panel->vbox);
+	WMSetBoxBorderWidth(hbox, WMScaleX(5));
+	WMSetBoxHorizontal(hbox, True);
+	WMMapWidget(hbox);
+	WMAddBoxSubview(panel->vbox, WMWidgetView(hbox), False, True, 64 + 2 * WMScaleY(5), 0, WMScaleY(5));
+
+	panel->iLbl = WMCreateLabel(hbox);
+	WMSetLabelImagePosition(panel->iLbl, WIPImageOnly);
+	WMMapWidget(panel->iLbl);
+	WMAddBoxSubview(hbox, WMWidgetView(panel->iLbl), False, True, 64, 0, 10);
+	icon = WMCreateApplicationIconBlendedPixmap(scrPtr, (RColor *) NULL);
+	if (icon) {
+		WMSetLabelImage(panel->iLbl, icon);
+		WMReleasePixmap(icon);
+	} else {
+		WMSetLabelImage(panel->iLbl, scrPtr->applicationIconPixmap);
+	}
+
+	if (title) {
+		WMFont *largeFont;
+
+		largeFont = WMBoldSystemFontOfSize(scrPtr, 24);
+
+		panel->tLbl = WMCreateLabel(hbox);
+		WMMapWidget(panel->tLbl);
+		WMAddBoxSubview(hbox, WMWidgetView(panel->tLbl), True, True, 64, 0, 0);
+		WMSetLabelText(panel->tLbl, title);
+		WMSetLabelTextAlignment(panel->tLbl, WALeft);
+		WMSetLabelFont(panel->tLbl, largeFont);
+
+		WMReleaseFont(largeFont);
+	}
+
+	/* create divider line */
+
+	panel->line = WMCreateFrame(panel->win);
+	WMMapWidget(panel->line);
+	WMAddBoxSubview(panel->vbox, WMWidgetView(panel->line), False, True, 2, 2, WMScaleY(5));
+	WMSetFrameRelief(panel->line, WRGroove);
+
+	if (msg) {
+		panel->mLbl = WMCreateLabel(panel->vbox);
+		WMSetLabelWraps(panel->mLbl, True);
+		WMMapWidget(panel->mLbl);
+		WMAddBoxSubview(panel->vbox, WMWidgetView(panel->mLbl), True, True,
+				WMFontHeight(scrPtr->normalFont) * 4, 0, WMScaleY(5));
+		WMSetLabelText(panel->mLbl, msg);
+		WMSetLabelTextAlignment(panel->mLbl, WACenter);
+	}
+
+	panel->hbox = WMCreateBox(panel->vbox);
+	WMSetBoxBorderWidth(panel->hbox, WMScaleX(10));
+	WMSetBoxHorizontal(panel->hbox, True);
+	WMMapWidget(panel->hbox);
+	WMAddBoxSubview(panel->vbox, WMWidgetView(panel->hbox), False, True, WMScaleY(44), 0, 0);
+
+	/* create buttons */
+	if (otherButton)
+		ow = WMWidthOfString(scrPtr->normalFont, otherButton, strlen(otherButton));
+
+	if (alternateButton)
+		aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton));
+
+	if (defaultButton)
+		dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton));
+
+	dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
+
+	aw += WMScaleX(30);
+	ow += WMScaleX(30);
+	dw += WMScaleX(30);
+
+	w = WMAX(dw, WMAX(aw, ow));
+	if ((w + WMScaleX(10)) * 3 < pwidth) {
+		aw = w;
+		ow = w;
+		dw = w;
+	} else {
+		int t;
+
+		t = pwidth - 4 * WMScaleX(10) - aw - ow - dw;
+		aw += t / 3;
+		ow += t / 3;
+		dw += t / 3;
+	}
+
+	if (defaultButton) {
+		panel->defBtn = WMCreateCommandButton(panel->hbox);
+		WMResizeWidget(panel->defBtn, dw, WMScaleY(24));
+		WMSetButtonAction(panel->defBtn, alertPanelOnClick, panel);
+		WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->defBtn), False, True, dw, 0, 0);
+		WMSetButtonText(panel->defBtn, defaultButton);
+		WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
+		WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
+		WMSetButtonImagePosition(panel->defBtn, WIPRight);
+	}
+	if (alternateButton) {
+		panel->altBtn = WMCreateCommandButton(panel->hbox);
+		WMResizeWidget(panel->altBtn, aw, WMScaleY(24));
+		WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->altBtn), False, True, aw, 0, WMScaleX(5));
+		WMSetButtonAction(panel->altBtn, alertPanelOnClick, panel);
+		WMSetButtonText(panel->altBtn, alternateButton);
+	}
+	if (otherButton) {
+		panel->othBtn = WMCreateCommandButton(panel->hbox);
+		WMResizeWidget(panel->othBtn, ow, WMScaleY(24));
+		WMSetButtonAction(panel->othBtn, alertPanelOnClick, panel);
+		WMAddBoxSubviewAtEnd(panel->hbox, WMWidgetView(panel->othBtn), False, True, ow, 0, WMScaleX(5));
+		WMSetButtonText(panel->othBtn, otherButton);
 	}
 
 	WMMapSubwidgets(panel->hbox);
@@ -338,8 +510,10 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
 				 const char *defaultText, const char *okButton, const char *cancelButton)
 {
 	WMInputPanel *panel;
+	WMFont *defaultFont;
 	int x, dw = 0, aw = 0, w;
 
+	defaultFont = WMSystemFontOfSize(scrPtr, 12);
 	panel = wmalloc(sizeof(WMInputPanel));
 
 	if (owner)
@@ -371,21 +545,23 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
 		WMResizeWidget(panel->mLbl, 320 - 40, WMFontHeight(scrPtr->normalFont) * 2);
 		WMSetLabelText(panel->mLbl, msg);
 		WMSetLabelTextAlignment(panel->mLbl, WALeft);
+		WMSetLabelFont(panel->mLbl, defaultFont);
 	}
 
 	panel->text = WMCreateTextField(panel->win);
 	WMMoveWidget(panel->text, 20, 85);
 	WMResizeWidget(panel->text, 320 - 40, WMWidgetHeight(panel->text));
 	WMSetTextFieldText(panel->text, defaultText);
+	WMSetTextFieldFont(panel->text, defaultFont);
 
 	WMAddNotificationObserver(endedEditingObserver, panel, WMTextDidEndEditingNotification, panel->text);
 
 	/* create buttons */
 	if (cancelButton)
-		aw = WMWidthOfString(scrPtr->normalFont, cancelButton, strlen(cancelButton));
+		aw = WMWidthOfString(defaultFont, cancelButton, strlen(cancelButton));
 
 	if (okButton)
-		dw = WMWidthOfString(scrPtr->normalFont, okButton, strlen(okButton));
+		dw = WMWidthOfString(defaultFont, okButton, strlen(okButton));
 
 	w = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
 	if (aw > w)
@@ -406,6 +582,7 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
 		WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
 		WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
 		WMSetButtonImagePosition(panel->defBtn, WIPRight);
+		WMSetButtonFont(panel->defBtn, defaultFont);
 	}
 	if (cancelButton) {
 		x -= w + 10;
@@ -415,6 +592,104 @@ WMInputPanel *WMCreateInputPanel(WMScreen * scrPtr, WMWindow * owner, const char
 		WMMoveWidget(panel->altBtn, x, 124);
 		WMResizeWidget(panel->altBtn, w, 24);
 		WMSetButtonText(panel->altBtn, cancelButton);
+		WMSetButtonFont(panel->altBtn, defaultFont);
+	}
+
+	WMCreateEventHandler(W_VIEW(panel->win), KeyPressMask, handleKeyPress2, panel);
+
+	WMRealizeWidget(panel->win);
+	WMMapSubwidgets(panel->win);
+
+	WMSetFocusToWidget(panel->text);
+
+	WMReleaseFont(defaultFont);
+
+	return panel;
+}
+
+WMInputPanel *WMCreateScaledInputPanel(WMScreen * scrPtr, WMWindow * owner, const char *title, const char *msg,
+				       const char *defaultText, const char *okButton, const char *cancelButton)
+{
+	WMInputPanel *panel;
+	int x, dw = 0, aw = 0, w;
+	int wmScaleWidth, wmScaleHeight;
+
+	panel = wmalloc(sizeof(WMInputPanel));
+
+	if (owner)
+		panel->win = WMCreatePanelWithStyleForWindow(owner, "inputPanel", WMTitledWindowMask);
+	else
+		panel->win = WMCreateWindowWithStyle(scrPtr, "inputPanel", WMTitledWindowMask);
+	WMSetWindowTitle(panel->win, "");
+
+	WMGetScaleBaseFromSystemFont(scrPtr, &wmScaleWidth, &wmScaleHeight);
+	WMResizeWidget(panel->win, WMScaleX(320), WMScaleY(160));
+
+	if (title) {
+		WMFont *largeFont;
+
+		largeFont = WMBoldSystemFontOfSize(scrPtr, WMScaleY(24));
+
+		panel->tLbl = WMCreateLabel(panel->win);
+		WMMoveWidget(panel->tLbl, WMScaleX(20), WMScaleY(16));
+		WMResizeWidget(panel->tLbl, WMScaleX(320) - 2 * WMScaleX(20), WMFontHeight(largeFont) + WMScaleY(4));
+		WMSetLabelText(panel->tLbl, title);
+		WMSetLabelTextAlignment(panel->tLbl, WALeft);
+		WMSetLabelFont(panel->tLbl, largeFont);
+
+		WMReleaseFont(largeFont);
+	}
+
+	if (msg) {
+		panel->mLbl = WMCreateLabel(panel->win);
+		WMMoveWidget(panel->mLbl, WMScaleX(20), WMScaleY(50));
+		WMResizeWidget(panel->mLbl, WMScaleX(320) - 2 * WMScaleX(20), WMFontHeight(scrPtr->normalFont) * 2);
+		WMSetLabelText(panel->mLbl, msg);
+		WMSetLabelTextAlignment(panel->mLbl, WALeft);
+	}
+
+	panel->text = WMCreateTextField(panel->win);
+	WMMoveWidget(panel->text, WMScaleX(20), WMScaleY(85));
+	WMResizeWidget(panel->text, WMScaleX(320) - 2 * WMScaleX(20), WMScaleY(20));
+	WMSetTextFieldText(panel->text, defaultText);
+
+	WMAddNotificationObserver(endedEditingObserver, panel, WMTextDidEndEditingNotification, panel->text);
+
+	/* create buttons */
+	if (cancelButton)
+		aw = WMWidthOfString(scrPtr->normalFont, cancelButton, strlen(cancelButton));
+
+	if (okButton)
+		dw = WMWidthOfString(scrPtr->normalFont, okButton, strlen(okButton));
+
+	w = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
+	if (aw > w)
+		w = aw;
+
+	w += WMScaleX(30);
+	x = WMScaleX(310);
+
+	if (okButton) {
+		x -= w + WMScaleX(10);
+
+		panel->defBtn = WMCreateCustomButton(panel->win, WBBPushInMask
+						     | WBBPushChangeMask | WBBPushLightMask);
+		WMSetButtonAction(panel->defBtn, inputBoxOnClick, panel);
+		WMMoveWidget(panel->defBtn, x, WMScaleY(124));
+		WMResizeWidget(panel->defBtn, w, WMScaleY(24));
+		WMSetButtonText(panel->defBtn, okButton);
+		WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
+		WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
+		WMSetButtonImagePosition(panel->defBtn, WIPRight);
+	}
+	if (cancelButton) {
+		x -= w + WMScaleX(10);
+
+		panel->altBtn = WMCreateCommandButton(panel->win);
+		WMSetButtonAction(panel->altBtn, inputBoxOnClick, panel);
+		WMMoveWidget(panel->altBtn, x, WMScaleY(124));
+		WMResizeWidget(panel->altBtn, w, WMScaleY(24));
+		WMSetButtonText(panel->altBtn, cancelButton);
 	}
 
 	WMCreateEventHandler(W_VIEW(panel->win), KeyPressMask, handleKeyPress2, panel);
@@ -457,10 +732,12 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
 				     const char *title, const char *defaultButton, const char *alternateButton)
 {
 	WMGenericPanel *panel;
+	WMFont *defaultFont;
 	int dw = 0, aw = 0, w;
 	WMBox *hbox;
 	WMPixmap *icon;
 
+	defaultFont = WMSystemFontOfSize(scrPtr, 12);
 	panel = wmalloc(sizeof(WMGenericPanel));
 
 	if (owner) {
@@ -533,10 +810,10 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
 
 	/* create buttons */
 	if (defaultButton)
-		dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton));
+		dw = WMWidthOfString(defaultFont, defaultButton, strlen(defaultButton));
 
 	if (alternateButton)
-		aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton));
+		aw = WMWidthOfString(defaultFont, alternateButton, strlen(alternateButton));
 
 	dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
 
@@ -561,6 +838,7 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
 		WMSetButtonImage(panel->defBtn, scrPtr->buttonArrow);
 		WMSetButtonAltImage(panel->defBtn, scrPtr->pushedButtonArrow);
 		WMSetButtonImagePosition(panel->defBtn, WIPRight);
+		WMSetButtonFont(panel->defBtn, defaultFont);
 	}
 
 	WMMapSubwidgets(hbox);
@@ -570,5 +848,7 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
 	WMRealizeWidget(panel->win);
 	WMMapSubwidgets(panel->win);
 
+	WMReleaseFont(defaultFont);
+
 	return panel;
 }

WINGs/wruler.c

@@ -181,10 +181,7 @@ static void drawRulerOnPixmap(Ruler * rPtr)
 		XDrawLine(rPtr->view->screen->display, rPtr->drawBuffer,
 			  rPtr->fgGC, rPtr->margins.left + m, 23, rPtr->margins.left + m, marks[i % 8] + 23);
 		if (i != 0 && i % 8 == 0) {
-			if (j < 10)
+			snprintf(c, sizeof(c), "%hu", ++j);
-				snprintf(c, 3, "%d", ++j);
-			else
-				snprintf(c, 3, "%2d", ++j);
 			WMDrawString(rPtr->view->screen, rPtr->drawBuffer, rPtr->fg,
 				     rPtr->font, rPtr->margins.left + 2 + m, 26, c, 2);
 		}

WINGs/wtext.c

@@ -2305,6 +2305,7 @@ static void handleTextKeyPress(Text * tPtr, XEvent * event)
 
 	case XK_Return:
 		*buffer = '\n';
+		/* FALLTHRU */
 	default:
 		if (*buffer != 0 && !control_pressed) {
 			insertTextInteractively(tPtr, buffer, strlen(buffer));
@@ -2544,6 +2545,7 @@ static void handleActionEvents(XEvent * event, void *data)
 			break;
 		}
 
+	/* FALLTHRU */
 	case ButtonRelease:
 		if (tPtr->flags.pointerGrabbed) {
 			tPtr->flags.pointerGrabbed = False;

WINGs/wtextfield.c

@@ -965,6 +965,7 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
 	switch (ksym) {
 	case XK_Tab:
 #ifdef XK_ISO_Left_Tab
+		/* FALLTHRU */
 	case XK_ISO_Left_Tab:
 #endif
 		if (!controled) {
@@ -1001,8 +1002,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
 		break;
 
 #ifdef XK_KP_Enter
+		/* FALLTHRU */
 	case XK_KP_Enter:
 #endif
+		/* FALLTHRU */
 	case XK_Return:
 		if (!modified) {
 			data = (void *)WMReturnTextMovement;
@@ -1019,8 +1022,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
 			controled = False;
 
 #ifdef XK_KP_Left
+		/* FALLTHRU */
 	case XK_KP_Left:
 #endif
+		/* FALLTHRU */
 	case XK_Left:
 		if (tPtr->cursorPosition > 0) {
 			int i;
@@ -1058,8 +1063,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
 			controled = False;
 
 #ifdef XK_KP_Right
+		/* FALLTHRU */
 	case XK_KP_Right:
 #endif
+		/* FALLTHRU */
 	case XK_Right:
 		if (tPtr->cursorPosition < tPtr->textLen) {
 			int i;
@@ -1095,8 +1102,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
 			controled = False;
 
 #ifdef XK_KP_Home
+		/* FALLTHRU */
 	case XK_KP_Home:
 #endif
+		/* FALLTHRU */
 	case XK_Home:
 		if (!controled) {
 			if (tPtr->cursorPosition > 0) {
@@ -1122,8 +1131,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
 			controled = False;
 
 #ifdef XK_KP_End
+		/* FALLTHRU */
 	case XK_KP_End:
 #endif
+		/* FALLTHRU */
 	case XK_End:
 		if (!controled) {
 			if (tPtr->cursorPosition < tPtr->textLen) {
@@ -1149,6 +1160,7 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
 		else
 			modified = False;
 
+		/* FALLTHRU */
 	case XK_BackSpace:
 		if (!modified) {
 			if (tPtr->selection.count) {
@@ -1177,8 +1189,10 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
 			modified = False;
 
 #ifdef XK_KP_Delete
+		/* FALLTHRU */
 	case XK_KP_Delete:
 #endif
+		/* FALLTHRU */
 	case XK_Delete:
 		if (!modified) {
 			if (tPtr->selection.count) {

WINGs/wview.c

@@ -490,6 +490,7 @@ void W_SetViewBackgroundColor(W_View * view, WMColor * color)
 	view->backColor = WMRetainColor(color);
 
 	view->attribFlags |= CWBackPixel;
+	view->attribFlags &= ~CWBackPixmap;
 	view->attribs.background_pixel = W_PIXEL(color);
 	if (view->flags.realized) {
 		XSetWindowBackground(view->screen->display, view->window, W_PIXEL(color));
@@ -504,6 +505,7 @@ void W_SetViewBackgroundPixmap(W_View *view, WMPixmap *pix)
        view->backImage = WMRetainPixmap(pix);
 
        view->attribFlags |= CWBackPixmap;
+       view->attribFlags &= ~CWBackPixel;
        view->attribs.background_pixmap = pix->pixmap;
        if (view->flags.realized) {
                XSetWindowBackgroundPixmap(view->screen->display, view->window, pix->pixmap);

WPrefs.app/Appearance.c

@@ -446,12 +446,18 @@ static void str2rcolor(RContext * rc, const char *name, RColor * color)
 {
 	XColor xcolor;
 
-	XParseColor(rc->dpy, rc->cmap, name, &xcolor);
+	if (XParseColor(rc->dpy, rc->cmap, name, &xcolor) != 0) {
-
 		color->alpha = 255;
 		color->red = xcolor.red >> 8;
 		color->green = xcolor.green >> 8;
 		color->blue = xcolor.blue >> 8;
+	} else {
+		/* Color Name was not found - Return white instead */
+		color->alpha = 255;
+		color->red   = 255;
+		color->green = 255;
+		color->blue  = 255;
+	}
 }
 
 static void dumpRImage(const char *path, RImage * image)
@@ -611,6 +617,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int
 			break;
 		default:
 			wwarning(_("unknown direction in '%s', falling back to diagonal"), type);
+			/* FALLTHRU */
 		case 'D':
 			style = RDiagonalGradient;
 			break;
@@ -637,6 +644,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int
 			break;
 		default:
 			wwarning(_("unknown direction in '%s', falling back to diagonal"), type);
+			/* FALLTHRU */
 		case 'D':
 			style = RDiagonalGradient;
 			break;
@@ -671,6 +679,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int
 			break;
 		default:
 			wwarning(_("unknown direction in '%s', falling back to diagonal"), type);
+			/* FALLTHRU */
 		case 'D':
 			style = RDiagonalGradient;
 			break;

WPrefs.app/Expert.c

@@ -110,7 +110,16 @@ static const struct {
 	  /* default: */ False, OPTION_WMAKER, "PointerWithHalfMaxWindows" },
 
 	{ N_("Open dialogs in the same workspace as their owners."),
-	  /* default: */ False, OPTION_WMAKER, "OpenTransientOnOwnerWorkspace" }
+	  /* default: */ False, OPTION_WMAKER, "OpenTransientOnOwnerWorkspace" },
+
+	{ N_("Wrap dock-attached icons around the screen edges."),
+	  /* default: */ True, OPTION_WMAKER, "WrapAppiconsInDock" },
+	  
+	{ N_("Double click on titlebar maximize a window to full screen."),
+	  /* default: */ False, OPTION_WMAKER, "DbClickFullScreen" },
+
+	{ N_("Close rootmenu when mouse (left or right) is clicked outside focus."),
+	  /* default: */ False, OPTION_WMAKER, "CloseRootMenuByLeftOrRightMouseClick" }
 
 };
 
@@ -137,15 +146,16 @@ typedef struct _Panel {
 static void changeIntTextfield(void *data, int delta)
 {
 	WMTextField *textfield;
-	char *text;
+	char *text, buffer[12];
 	int value;
 
 	textfield = (WMTextField *)data;
 	text = WMGetTextFieldText(textfield);
 	value = atoi(text);
+	wfree(text);
 	value += delta;
-	sprintf(text, "%d", value);
+	sprintf(buffer, "%d", value);
-	WMSetTextFieldText(textfield, text);
+	WMSetTextFieldText(textfield, buffer);
 }
 
 static void downButtonCallback(WMWidget *self, void *data)
@@ -305,6 +315,7 @@ static void storeDefaults(_Panel *panel)
 
 			text = WMGetTextFieldText(panel->textfield[i]);
 			value = atoi(text);
+			wfree(text);
 
 			SetIntegerForKey(value, expert_options[i].op_name);
 			break;

WPrefs.app/FontSimple.c

@@ -22,6 +22,7 @@
 #include "WPrefs.h"
 #include <unistd.h>
 #include <fontconfig/fontconfig.h>
+#include <math.h>
 
 /* workaround for older fontconfig, that doesn't define these constants */
 #ifndef FC_WEIGHT_NORMAL
@@ -521,7 +522,7 @@ static void selectedOption(WMWidget * w, void *data)
 				WMListItem *item = WMGetListItem(panel->sizeL, i);
 				int distance;
 
-				distance = abs(size - atoi(item->text));
+				distance = fabs(size - atoi(item->text));
 
 				if (i == 0 || distance < closest) {
 					closest = distance;
@@ -569,6 +570,9 @@ static void showData(_Panel * panel)
 {
 	int i;
 	WMMenuItem *item;
+	WMScreen *scr;
+
+	scr = WMWidgetScreen(panel->parent);
 
 	for (i = 0; i < WMGetPopUpButtonNumberOfItems(panel->optionP); i++) {
 		char *ofont, *font;
@@ -579,19 +583,12 @@ static void showData(_Panel * panel)
 		if (ofont)
 			wfree(ofont);
 
-		if (strcmp(fontOptions[i].option, "SystemFont") == 0 ||
+		if (strcmp(fontOptions[i].option, "SystemFont") == 0)
-		    strcmp(fontOptions[i].option, "BoldSystemFont") == 0) {
+			font = WMGetFontName(WMDefaultSystemFont(scr));
-			char *path;
+		else if (strcmp(fontOptions[i].option, "BoldSystemFont") == 0)
-			WMUserDefaults *defaults;
+			font = WMGetFontName(WMDefaultBoldSystemFont(scr));
-
+		else
-			path = wdefaultspathfordomain("WMGLOBAL");
-			defaults = WMGetDefaultsFromPath(path);
-			wfree(path);
-			font = WMGetUDStringForKey(defaults,
-						   fontOptions[i].option);
-		} else {
 			font = GetStringForKey(fontOptions[i].option);
-		}
 		if (font)
 			font = wstrdup(font);
 		WMSetMenuItemRepresentedObject(item, font);

WPrefs.app/Icons.c

@@ -60,8 +60,6 @@ typedef struct _Panel {
 
 	CallbackRec callbacks;
 
-	Bool have_legacy_apercu;
-
 	WMWidget *parent;
 
 	WMFrame *posF;
@@ -75,12 +73,13 @@ typedef struct _Panel {
 	WMButton *posB[wlengthof_nocheck(icon_position_dbvalue)];
 
 	WMFrame *animF;
-	WMButton *animB[wlengthof_nocheck(icon_animation)];
+	WMPopUpButton *animP;
 
 	WMFrame *optF;
 	WMButton *arrB;
 	WMButton *omnB;
 	WMButton *sclB;
+	WMButton *marginB;
 
 	struct {
 		WMFrame *frame;
@@ -175,6 +174,7 @@ static void showData(_Panel * panel)
 	WMSetButtonSelected(panel->arrB, GetBoolForKey("AutoArrangeIcons"));
 	WMSetButtonSelected(panel->omnB, GetBoolForKey("StickyIcons"));
 	WMSetButtonSelected(panel->sclB, GetBoolForKey("SingleClickLaunch"));
+	WMSetButtonSelected(panel->marginB, GetBoolForKey("EnforceIconMargin"));
 
 	str = GetStringForKey("IconPosition");
 	if (str != NULL) {
@@ -195,20 +195,12 @@ static void showData(_Panel * panel)
 
 	if (i < 0)
 		i = 0;
-	else if (i > 9)
+	else if (i > 29)
-		i = 9;
+		i = 29;
 	WMSetPopUpButtonSelectedItem(panel->sizeP, i);
 
 	/* Mini-Previews for Icons */
 
-	/*
-	 * Backward Compatibility:
-	 * These settings changed names after 0.95.6, so to avoid breaking user's
-	 * config we still support the old names, and silently convert them to the
-	 * new settings
-	 * This hack should be kept for at least 2 years, that means >= 2017.
-	 */
-	panel->have_legacy_apercu = False;
 	str = GetStringForKey("MiniwindowPreviewBalloons");
 	if (str != NULL) {
 		/* New names found, use them in priority */
@@ -220,25 +212,6 @@ static void showData(_Panel * panel)
 		} else {
 			i = minipreview_minimum_size;
 		}
-	} else {
-		/* No new names, try the legacy names */
-		b = GetBoolForKey("MiniwindowApercuBalloons");
-		if (b) {
-			panel->have_legacy_apercu = True;
-			i = GetIntegerForKey("ApercuSize");
-
-			/*
-			 * In the beginning, the option was coded as a multiple of the icon
-			 * size; then it was converted to pixel size
-			 */
-			if (i < 24)
-				i *= GetIntegerForKey("IconSize");
-
-			if (i <= minipreview_minimum_size)
-				i = minipreview_minimum_size + 1;	/* +1 to not display as "off" */
-		} else {
-			i = minipreview_minimum_size;
-		}
 	}
 	WMSetSliderValue(panel->minipreview.slider, i);
 	minipreview_slider_changed(panel->minipreview.slider, panel);
@@ -248,7 +221,7 @@ static void showData(_Panel * panel)
 	if (str != NULL) {
 		for (i = 0; i < wlengthof(icon_animation); i++) {
 			if (strcasecmp(str, icon_animation[i].db_value) == 0) {
-				WMPerformButtonClick(panel->animB[i]);
+				WMSetPopUpButtonSelectedItem(panel->animP, i);
 				goto found_animation_value;
 			}
 		}
@@ -256,7 +229,7 @@ static void showData(_Panel * panel)
 		         str, icon_animation[0].db_value);
 	}
 	/* If we're here, no valid value have been found so we fall-back to the default */
-	WMPerformButtonClick(panel->animB[0]);
+	WMSetPopUpButtonSelectedItem(panel->animP, 0);
  found_animation_value:
 	;
 }
@@ -366,7 +339,7 @@ static void createPanel(Panel * p)
 	panel->sizeP = WMCreatePopUpButton(panel->sizeF);
 	WMResizeWidget(panel->sizeP, 80, 20);
 	WMMoveWidget(panel->sizeP, 10, 19);
-	for (i = 24; i <= 96; i += 8) {
+	for (i = 24; i <= 256; i += 8) {
 		sprintf(buf, "%ix%i", i, i);
 		WMAddPopUpButtonItem(panel->sizeP, buf);
 	}
@@ -399,50 +372,57 @@ static void createPanel(Panel * p)
 
     /***************** Animation ****************/
 	panel->animF = WMCreateFrame(panel->box);
-	WMResizeWidget(panel->animF, 215, 110);
+	WMResizeWidget(panel->animF, 215, 52);
 	WMMoveWidget(panel->animF, 292, 6);
 	WMSetFrameTitle(panel->animF, _("Iconification Animation"));
 
-	for (i = 0; i < wlengthof(icon_animation); i++) {
+	panel->animP = WMCreatePopUpButton(panel->animF);
-		panel->animB[i] = WMCreateRadioButton(panel->animF);
+	WMResizeWidget(panel->animP, 195, 20);
-		WMResizeWidget(panel->animB[i], 192, 20);
+	WMMoveWidget(panel->animP, 10, 19);
-		WMMoveWidget(panel->animB[i], 12, 16 + i * 22);
+	for (i = 0; i < wlengthof(icon_animation); i++)
-
+		WMAddPopUpButtonItem(panel->animP, _(icon_animation[i].label));
-		if (i > 0)
-			WMGroupButtons(panel->animB[0], panel->animB[i]);
-
-		WMSetButtonText(panel->animB[i], _(icon_animation[i].label));
-	}
 
 	WMMapSubwidgets(panel->animF);
 
     /***************** Options ****************/
 	panel->optF = WMCreateFrame(panel->box);
-	WMResizeWidget(panel->optF, 215, 90);
+	WMResizeWidget(panel->optF, 215, 148);
-	WMMoveWidget(panel->optF, 292, 130);
+	WMMoveWidget(panel->optF, 292, 72);
 	/*    WMSetFrameTitle(panel->optF, _("Icon Display")); */
+	starty = 8 + 14;   /* the last term centers the checkboxes within the panel; subtract 13 for a new option */
 
 	panel->arrB = WMCreateSwitchButton(panel->optF);
 	WMResizeWidget(panel->arrB, 198, 26);
-	WMMoveWidget(panel->arrB, 12, 8);
+	WMMoveWidget(panel->arrB, 12, starty);
+	starty += 26;
 	WMSetButtonText(panel->arrB, _("Auto-arrange icons"));
 
 	WMSetBalloonTextForView(_("Keep icons and miniwindows arranged all the time."), WMWidgetView(panel->arrB));
 
 	panel->omnB = WMCreateSwitchButton(panel->optF);
 	WMResizeWidget(panel->omnB, 198, 26);
-	WMMoveWidget(panel->omnB, 12, 34);
+	WMMoveWidget(panel->omnB, 12, starty);
+	starty += 26;
 	WMSetButtonText(panel->omnB, _("Omnipresent miniwindows"));
 
 	WMSetBalloonTextForView(_("Make miniwindows be present in all workspaces."), WMWidgetView(panel->omnB));
 
 	panel->sclB = WMCreateSwitchButton(panel->optF);
 	WMResizeWidget(panel->sclB, 198, 26);
-	WMMoveWidget(panel->sclB, 12, 60);
+	WMMoveWidget(panel->sclB, 12, starty);
+	starty += 26;
 	WMSetButtonText(panel->sclB, _("Single click activation"));
 
 	WMSetBalloonTextForView(_("Launch applications and restore windows with a single click."), WMWidgetView(panel->sclB));
 
+	panel->marginB = WMCreateSwitchButton(panel->optF);
+	WMResizeWidget(panel->marginB, 198, 26);
+	WMMoveWidget(panel->marginB, 12, starty);
+	starty += 26;
+	WMSetButtonText(panel->marginB, _("Enforce icon margin"));
+
+	WMSetBalloonTextForView(_("Make sure that the icon image does not protrude into the icon frame."), WMWidgetView(panel->marginB));
+
 	WMMapSubwidgets(panel->optF);
 
 	WMRealizeWidget(panel->box);
@@ -458,6 +438,7 @@ static void storeData(_Panel * panel)
 	SetBoolForKey(WMGetButtonSelected(panel->arrB), "AutoArrangeIcons");
 	SetBoolForKey(WMGetButtonSelected(panel->omnB), "StickyIcons");
 	SetBoolForKey(WMGetButtonSelected(panel->sclB), "SingleClickLaunch");
+	SetBoolForKey(WMGetButtonSelected(panel->marginB), "EnforceIconMargin");
 
 	SetIntegerForKey(WMGetPopUpButtonSelectedItem(panel->sizeP) * 8 + 24, "IconSize");
 
@@ -478,17 +459,8 @@ static void storeData(_Panel * panel)
 		}
 		SetIntegerForKey(i, "MiniPreviewSize");
 	}
-	if (panel->have_legacy_apercu) {
-		RemoveObjectForKey("MiniwindowApercuBalloons");
-		RemoveObjectForKey("ApercuSize");
-	}
 
-	for (i = 0; i < wlengthof(icon_animation); i++) {
+	SetStringForKey(icon_animation[WMGetPopUpButtonSelectedItem(panel->animP)].db_value, "IconificationStyle");
-		if (WMGetButtonSelected(panel->animB[i])) {
-			SetStringForKey(icon_animation[i].db_value, "IconificationStyle");
-			break;
-		}
-	}
 }
 
 Panel *InitIcons(WMWidget *parent)

WPrefs.app/KeyboardShortcuts.c

@@ -148,6 +148,10 @@ static const struct {
 	{ "WindowShortcut9Key",  N_("Shortcut for window 9") },
 	{ "WindowShortcut10Key", N_("Shortcut for window 10") },
 
+	/* Head Selection */
+	{ "MoveTo12to6Head",     N_("Move to right/bottom/left/top head") },
+	{ "MoveTo6to12Head",    N_("Move to left/top/right/bottom head") },
+
 	/* Misc. */
 	{ "WindowRelaunchKey", N_("Launch new instance of application") },
 	{ "ScreenSwitchKey",   N_("Switch to Next Screen/Monitor") },

WPrefs.app/Makefile.am

@@ -45,10 +45,11 @@ WPrefs_SOURCES = \
 #	KeyboardSettings.c \
 #	Themes.c
 
-AM_CFLAGS =
+AM_CFLAGS = @PANGO_CFLAGS@
 
 AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
-	 -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
+	 -I$(top_builddir)/wrlib -I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \
+	 @HEADER_SEARCH_PATH@
 
 WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 

WPrefs.app/Menu.c

@@ -22,6 +22,7 @@
 #include "WPrefs.h"
 #include <assert.h>
 #include <ctype.h>
+#include <unistd.h>
 
 #include <X11/keysym.h>
 #include <X11/cursorfont.h>
@@ -613,7 +614,7 @@ static void createPanel(_Panel * p)
 	WMAddNotificationObserver(dataChanged, panel, WMTextDidChangeNotification, panel->pathT);
 
 	label = WMCreateLabel(panel->pathF);
-	WMResizeWidget(label, width - 20, 80);
+	WMResizeWidget(label, width - 20, 90);
 	WMMoveWidget(label, 10, 50);
 	WMSetLabelText(label, _("Enter the path for a file containing a menu\n"
 				"or a list of directories with the programs you\n"
@@ -913,6 +914,11 @@ static ItemData *parseCommand(WMPropList * item)
 
 		data->type = ExecInfo;
 
+		if (parameter == NULL) {
+			wfree(data);
+			return NULL;
+		}
+
 		data->param.exec.command = wstrdup(parameter);
 		if (shortcut)
 			data->param.exec.shortcut = wstrdup(shortcut);
@@ -925,6 +931,12 @@ static ItemData *parseCommand(WMPropList * item)
 		 * |pipe
 		 */
 		p = parameter;
+
+		if (p == NULL) {
+			wfree(data);
+			return NULL;
+		}
+
 		while (isspace(*p) && *p)
 			p++;
 		if (*p == '|') {
@@ -1435,12 +1447,12 @@ static WEditMenu *buildSubmenu(_Panel * panel, WMPropList * pl)
 					WSetEditMenuItemImage(item, panel->markerPix[data->type]);
 				WSetEditMenuItemData(item, data, (WMCallback *) freeItemData);
 			} else {
-				char *buf = wmalloc(1024);
+				char buf[256];
-				snprintf(buf, 1024, _("Invalid menu command \"%s\" with label \"%s\" cleared"),
+
+				snprintf(buf, sizeof(buf), _("Invalid menu command \"%s\" with label \"%s\" cleared"),
 					WMGetFromPLString(WMGetFromPLArray(pi, 1)),
 					WMGetFromPLString(WMGetFromPLArray(pi, 0)));
 				WMRunAlertPanel(scr, panel->parent, _("Warning"), buf, _("OK"), NULL, NULL);
-				wfree(buf);
 			}
 
 		}
@@ -1482,7 +1494,8 @@ static WMPropList *getDefaultMenu(_Panel * panel)
 static void showData(_Panel * panel)
 {
 	const char *gspath;
-	char *menuPath;
+	char *menuPath, *labelText;
+	char buf[1024];
 	WMPropList *pmenu;
 
 	gspath = wusergnusteppath();
@@ -1493,6 +1506,45 @@ static void showData(_Panel * panel)
 
 	pmenu = WMReadPropListFromFile(menuPath);
 
+	/* check if WMRootMenu references another file, and if so,
+	   if that file is in proplist format */
+	while (WMIsPLString(pmenu)) {
+		char *path = NULL;
+
+		path = wexpandpath(WMGetFromPLString(pmenu));
+
+		if (access(path, F_OK) < 0) {
+			char *old_path = path;
+
+			path = wfindfile(DEF_CONFIG_PATHS, path);
+			wfree(old_path);
+		}
+
+		/* TODO: if needed, concatenate locale suffix to path.
+		   See getLocalizedMenuFile() in src/rootmenu.c. */
+
+		if (!path)
+			break;
+
+		if (access(path, W_OK) < 0) {
+			snprintf(buf, sizeof(buf),
+				 _("The menu file \"%s\" referenced by "
+				   "WMRootMenu is read-only.\n"
+				   "You cannot use WPrefs to modify it."),
+				 path);
+			WMRunAlertPanel(WMWidgetScreen(panel->parent),
+					panel->parent,
+					_("Warning"), buf,
+					_("OK"), NULL, NULL);
+			panel->dontSave = True;
+			wfree(path);
+			return;
+		}
+
+		pmenu = WMReadPropListFromFile(path);
+		menuPath = path;
+	}
+
 	if (!pmenu || !WMIsPLArray(pmenu)) {
 		int res;
 
@@ -1517,6 +1569,14 @@ static void showData(_Panel * panel)
 
 	panel->menuPath = menuPath;
 
+	snprintf(buf, sizeof(buf),
+		 _("\n\nWhen saved, the menu will be written to the file\n\"%s\"."),
+		 menuPath);
+	labelText = WMGetLabelText(panel->sections[NoInfo][0]);
+	labelText = wstrconcat(labelText, buf);
+	WMSetLabelText(panel->sections[NoInfo][0], labelText);
+	wfree(labelText);
+
 	buildMenuFromPL(panel, pmenu);
 
 	WMReleasePropList(pmenu);
@@ -1557,15 +1617,12 @@ static WMPropList *processData(const char *title, ItemData * data)
 	case ExecInfo:
 		if (data->param.exec.command == NULL)
 			goto return_null;
-#if 1
+
 		if (strpbrk(data->param.exec.command, "&$*|><?`=;")) {
 			s1 = "SHEXEC";
 		} else {
 			s1 = "EXEC";
 		}
-#else
-		s1 = "SHEXEC";
-#endif
 
 		if (notblank(data->param.exec.shortcut)) {
 			WMAddToPLArray(item, pscut);

WPrefs.app/README

@@ -7,7 +7,7 @@
 
     WPrefs.app is the preferences "editor" for the WindowMaker window
 manager. It can be used to set most of the preference options of WindowMaker
-and define it's applications menu. It also can change some settings 
+and define its applications menu. It also can change some settings
 that do not belong to WindowMaker.
 
     Although WPrefs.app is designed to be easy to use, you should read the
@@ -16,7 +16,7 @@ of WindowMaker that are not related to configuration.
 
     To run WPrefs, do not put it in your search path. Instead, run it
 with the full path, like /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-Then, dock it's application icon. The dock will automatically detect it's
+Then, dock its application icon. The dock will automatically detect its
 icon and use it.
 
     If you change configuration often, you might want to leave WPrefs
@@ -46,7 +46,7 @@ The mouse speed configuration is saved as a call for xset in
 ~/G/D/L/W/autostart. WindowMaker calls this file when it is started.
 
 If you don't want or can't use the menu definition section, do not
-open it's section (or if you do open it, do not Save), or WPrefs will
+open its section (or if you do open it, do not Save), or WPrefs will
 overwrite your ~/G/D/WMRootMenu file.
 
 Only options that have different values than what is found in the

WPrefs.app/WPrefs.c

@@ -602,7 +602,7 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
 	char *path;
 	FILE *file;
 	char buffer[1024];
-	char mbuf[1024];
+	char mbuf[1069]; /* Size of buffer and extra characters for the sprintfs */
 	int v1, v2, v3;
 
 	path = wdefaultspathfordomain("WindowMaker");

WPrefs.app/main.c

@@ -66,19 +66,6 @@ static void print_help(const char *progname)
 	puts(_(" --help		print this message and exit"));
 }
 
-#if 0
-static RETSIGTYPE handleDeadChild(int sig)
-{
-	pid_t pid;
-	int status;
-
-	pid = waitpid(-1, &status, WNOHANG);
-	if (pid > 0) {
-		DeadChildren[DeadChildrenCount++] = pid;
-	}
-}
-#endif
-
 void AddDeadChildHandler(pid_t pid, void (*handler) (void *), void *data)
 {
 	int i;
@@ -164,9 +151,6 @@ int main(int argc, char **argv)
 		wfatal(_("could not open display %s"), XDisplayName(display_name));
 		exit(0);
 	}
-#if 0
-	XSynchronize(dpy, 1);
-#endif
 	scr = WMCreateScreen(dpy, DefaultScreen(dpy));
 	if (!scr) {
 		wfatal(_("could not initialize application"));

WPrefs.app/po/Makefile.am

@@ -5,7 +5,7 @@ CATALOGS = @WPREFSMOFILES@
 CLEANFILES = $(DOMAIN).pot $(CATALOGS)
 
 EXTRA_DIST = bg.po ca.po cs.po de.po es.po et.po fi.po fr.po fy.po hr.po hu.po \
-	it.po ja.po ko.po nl.po pt.po ru.po sk.po uk.po zh_CN.po zh_TW.po
+	it.po ja.po ko.po nl.po pt.po ru.po sk.po tr.po uk.po zh_CN.po zh_TW.po
 
 POTFILES  = \
 	$(top_srcdir)/WPrefs.app/Appearance.c \

WPrefs.app/po/README

@@ -1,7 +1,7 @@
 File	Language		Current Maintainer
 ------------------------------------------------------------------------------
 pt.po	Portuguese		Eliphas Levy Theodoro <eliphas@conectiva.com.br>
-hr.po	Croatian		Toni Biliæ <tbilic@oliver.efos.hr>
+hr.po	Croatian		Toni Biliæ <tbilic@oliver.efos.hr>
 fr.po	French			Bastien NOCERA <hadess@writeme.com>
 				Hadess <hadess@infonie.fr>
 				Antoine Hulin <antoine@origan.fdn.org>
@@ -23,6 +23,6 @@ bg.po	Bulgarian		Slavei Karadjov <slaff@exco.net>
 				Anton Zinoviev <zinoviev@debian.org>
 sk.po   Slovak			Jan 'judas' Tomka <judas@linux.sk>
 et.po	Estonian		Ivar Smolin <okul@linux.ee>
-ca.po	Catalan			Ernest Adrogué <eadrogue@gmx.net>
+ca.po	Catalan			Ernest Adrogué <eadrogue@gmx.net>
 nl.po	Dutch			Alwin <translations@ziggo.nl>
 fy.po	Frisian			Alwin <translations@ziggo.nl>

WPrefs.app/po/de.po

@@ -819,7 +819,7 @@ msgstr "Clip in den Vor-/Hintergrund"
 
 #: ../../WPrefs.app/KeyboardShortcuts.c:518
 msgid "Toggle keyboard language"
-msgstr "Tastatursbelegung ändern"
+msgstr "Tastaturbelegung ändern"
 
 #: ../../WPrefs.app/KeyboardShortcuts.c:532
 msgid "Shortcut"

WPrefs.app/po/et.po

@@ -1671,7 +1671,7 @@ msgstr "Keela tiitliriba"
 msgid ""
 "Remove the titlebar of this window.\n"
 "To access the window commands menu of a window\n"
-"without it's titlebar, press Control+Esc (or the\n"
+"without its titlebar, press Control+Esc (or the\n"
 "equivalent shortcut, if you changed the default\n"
 "settings)."
 msgstr ""

WPrefs.app/po/fy.po

@@ -1,14 +1,14 @@
 # Translation into Western Frisian for Window Maker
-# Copyright (C) 2015-2016 Window Maker Developers Team
+# Copyright (C) 2015-2017 Window Maker Developers Team
 # This file is distributed under the same license as the windowmaker package.
 # Original by Alwin <translations@ziggo.nl>, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: wmaker-0.95.7+\n"
+"Project-Id-Version: wmaker-0.95.8+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-10 10:56+0100\n"
+"POT-Creation-Date: 2017-09-14 19:36+0200\n"
-"PO-Revision-Date: 2017-03-10 00:00+0000\n"
+"PO-Revision-Date: 2017-09-14 00:00+0000\n"
 "Last-Translator: Alwin <translations@ziggo.nl>\n"
 "Language-Team: Western Frisian\n"
 "Language: fy\n"
@@ -664,8 +664,8 @@ msgstr "ferkearde opsjewearde %s foar opsje FocusMode. Brûkt standert Manual"
 msgid "bad option value %s for option ColormapMode. Using default Auto"
 msgstr "ferkearde opsjewearde %s foar opsje ColormapMode. Brûkt standert Auto"
 
-#: ../../WPrefs.app/Focus.c:154 ../../WPrefs.app/Icons.c:162
+#: ../../WPrefs.app/Focus.c:154 ../../WPrefs.app/Icons.c:160
-#: ../../WPrefs.app/Icons.c:396 ../../WPrefs.app/Preferences.c:120
+#: ../../WPrefs.app/Icons.c:367 ../../WPrefs.app/Preferences.c:120
 #: ../../WPrefs.app/WindowHandling.c:140 ../../WPrefs.app/WindowHandling.c:159
 #, c-format
 msgid "OFF"
@@ -765,27 +765,27 @@ msgstr "Systeemletter"
 msgid "Bold System Font"
 msgstr "Systeemletter, fet"
 
-#: ../../WPrefs.app/FontSimple.c:664
+#: ../../WPrefs.app/FontSimple.c:660
 msgid "Sample Text"
 msgstr "Foarbyld"
 
-#: ../../WPrefs.app/FontSimple.c:681
+#: ../../WPrefs.app/FontSimple.c:677
 msgid "Family"
 msgstr "Famylje"
 
-#: ../../WPrefs.app/FontSimple.c:707
+#: ../../WPrefs.app/FontSimple.c:703
 msgid "Style"
 msgstr "Styl"
 
-#: ../../WPrefs.app/FontSimple.c:710
+#: ../../WPrefs.app/FontSimple.c:706
 msgid "Size"
 msgstr "Grutte"
 
-#: ../../WPrefs.app/FontSimple.c:742
+#: ../../WPrefs.app/FontSimple.c:738
 msgid "Font Configuration"
 msgstr "Lettertypekonfiguraasje"
 
-#: ../../WPrefs.app/FontSimple.c:744
+#: ../../WPrefs.app/FontSimple.c:740
 msgid "Configure fonts for Window Maker titlebars, menus etc."
 msgstr ""
 "Stel lettertypen yn foar Window Maker-titelbalken,\n"
@@ -808,36 +808,36 @@ msgstr "3D wintelje"
 msgid "None"
 msgstr "Gjin"
 
-#: ../../WPrefs.app/Icons.c:186 ../../WPrefs.app/Preferences.c:145
+#: ../../WPrefs.app/Icons.c:184 ../../WPrefs.app/Preferences.c:145
 #: ../../WPrefs.app/Preferences.c:159
 #, c-format
 msgid "bad value \"%s\" for option %s, using default \"%s\""
 msgstr "ferkearde wearde \"%s\" foar opsje %s, brûkt standert \"%s\""
 
-#: ../../WPrefs.app/Icons.c:255
+#: ../../WPrefs.app/Icons.c:226
 #, c-format
 msgid "animation style \"%s\" is unknown, resetting to \"%s\""
 msgstr "animaasjestyl \"%s\" is ûnbekend, weromset op \"%s\""
 
-#: ../../WPrefs.app/Icons.c:282
+#: ../../WPrefs.app/Icons.c:253
 msgid "Icon Positioning"
 msgstr "Ikoanpleatsing"
 
-#: ../../WPrefs.app/Icons.c:361
+#: ../../WPrefs.app/Icons.c:332
 msgid "Icon Size"
 msgstr "Ikoangrutte"
 
-#: ../../WPrefs.app/Icons.c:363
+#: ../../WPrefs.app/Icons.c:334
 msgid "The size of the dock/application icon and miniwindows"
 msgstr ""
 "De ôfmjittingen fan it dok-/programma-ikoan\n"
 "en minyfinsters"
 
-#: ../../WPrefs.app/Icons.c:380
+#: ../../WPrefs.app/Icons.c:351
 msgid "Mini-Previews for Icons"
 msgstr "Miniatueren foar ikoanen"
 
-#: ../../WPrefs.app/Icons.c:382
+#: ../../WPrefs.app/Icons.c:353
 msgid ""
 "The Mini-Preview provides a small view of the content of the\n"
 "window when the mouse is placed over the icon."
@@ -845,41 +845,41 @@ msgstr ""
 "De miniatuer biedt in lytse blik op 'e ynhâld fan it\n"
 "finster, as de mûs op it ikoan pleatst wurdt."
 
-#: ../../WPrefs.app/Icons.c:404
+#: ../../WPrefs.app/Icons.c:375
 msgid "Iconification Animation"
 msgstr "Ikoanifisearringsanimaasje"
 
-#: ../../WPrefs.app/Icons.c:428
+#: ../../WPrefs.app/Icons.c:399
 msgid "Auto-arrange icons"
 msgstr "Ikoanen fansels skikke"
 
-#: ../../WPrefs.app/Icons.c:430
+#: ../../WPrefs.app/Icons.c:401
 msgid "Keep icons and miniwindows arranged all the time."
 msgstr "Hâld ikoanen en minyfinsters altiten skikt."
 
-#: ../../WPrefs.app/Icons.c:435
+#: ../../WPrefs.app/Icons.c:406
 msgid "Omnipresent miniwindows"
 msgstr "Rûnombywêzige minyfinsters"
 
-#: ../../WPrefs.app/Icons.c:437
+#: ../../WPrefs.app/Icons.c:408
 msgid "Make miniwindows be present in all workspaces."
 msgstr "Meitsje minyfinsters oanwêzich yn alle wurkromten."
 
-#: ../../WPrefs.app/Icons.c:442
+#: ../../WPrefs.app/Icons.c:413
 msgid "Single click activation"
 msgstr "Inkeldkliksaktivearring"
 
-#: ../../WPrefs.app/Icons.c:444
+#: ../../WPrefs.app/Icons.c:415
 msgid "Launch applications and restore windows with a single click."
 msgstr ""
 "Start programma's op, en werstel finsters mei\n"
 "in inkelde klik."
 
-#: ../../WPrefs.app/Icons.c:500
+#: ../../WPrefs.app/Icons.c:467
 msgid "Icon Preferences"
 msgstr "Ikoanfoarkarren"
 
-#: ../../WPrefs.app/Icons.c:502
+#: ../../WPrefs.app/Icons.c:469
 msgid ""
 "Icon/Miniwindow handling options. Icon positioning\n"
 "area, sizes of icons, miniaturization animation style."
@@ -1210,7 +1210,7 @@ msgstr "Ferheegje/ferleegje Klip"
 msgid "Toggle keyboard language"
 msgstr "Wikselje toetseboerdtaal"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:375 ../../WPrefs.app/Menu.c:274
+#: ../../WPrefs.app/KeyboardShortcuts.c:375 ../../WPrefs.app/Menu.c:275
 #: ../../WPrefs.app/TexturePanel.c:1425
 msgid "Cancel"
 msgstr "Annulearje"
@@ -1222,8 +1222,8 @@ msgstr ""
 "stopjen."
 
 #: ../../WPrefs.app/KeyboardShortcuts.c:396
-#: ../../WPrefs.app/KeyboardShortcuts.c:566 ../../WPrefs.app/Menu.c:284
+#: ../../WPrefs.app/KeyboardShortcuts.c:566 ../../WPrefs.app/Menu.c:285
-#: ../../WPrefs.app/Menu.c:732
+#: ../../WPrefs.app/Menu.c:733
 msgid "Capture"
 msgstr "Opnimme"
 
@@ -1240,7 +1240,7 @@ msgstr "Aksjes"
 msgid "Shortcut"
 msgstr "Fluchtoets"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:560 ../../WPrefs.app/Menu.c:738
+#: ../../WPrefs.app/KeyboardShortcuts.c:560 ../../WPrefs.app/Menu.c:739
 msgid "Clear"
 msgstr "Wiskje"
 
@@ -1256,188 +1256,188 @@ msgstr ""
 "Wizigje de fluchtoetsen foar aksjes, sa as fan\n"
 "wurkromte wikseljen en menu's iepenjen."
 
-#: ../../WPrefs.app/Menu.c:250
+#: ../../WPrefs.app/Menu.c:251
 msgid "Select Program"
 msgstr "Kies programma"
 
-#: ../../WPrefs.app/Menu.c:412
+#: ../../WPrefs.app/Menu.c:413
 msgid "New Items"
 msgstr "Nije ûnderdielen"
 
-#: ../../WPrefs.app/Menu.c:413
+#: ../../WPrefs.app/Menu.c:414
 msgid "Sample Commands"
 msgstr "Foarbyldkommando's"
 
-#: ../../WPrefs.app/Menu.c:414
+#: ../../WPrefs.app/Menu.c:415
 msgid "Sample Submenus"
 msgstr "Foarbyldmenu's"
 
-#: ../../WPrefs.app/Menu.c:426
+#: ../../WPrefs.app/Menu.c:427
 msgid "Run Program"
 msgstr "Programma útfiere"
 
-#: ../../WPrefs.app/Menu.c:427
+#: ../../WPrefs.app/Menu.c:428
 msgid "Internal Command"
 msgstr "Yntern kommando"
 
-#: ../../WPrefs.app/Menu.c:428
+#: ../../WPrefs.app/Menu.c:429
 msgid "Submenu"
 msgstr "Submenu"
 
-#: ../../WPrefs.app/Menu.c:429
+#: ../../WPrefs.app/Menu.c:430
 msgid "External Submenu"
 msgstr "Ekstern submenu"
 
-#: ../../WPrefs.app/Menu.c:430
+#: ../../WPrefs.app/Menu.c:431
 msgid "Generated Submenu"
 msgstr "Oanmakke submenu"
 
-#: ../../WPrefs.app/Menu.c:431
+#: ../../WPrefs.app/Menu.c:432
 msgid "Generated PL Menu"
 msgstr "Oanmakke PL-menu"
 
-#: ../../WPrefs.app/Menu.c:432
+#: ../../WPrefs.app/Menu.c:433
 msgid "Directory Contents"
 msgstr "Mapynhâld"
 
-#: ../../WPrefs.app/Menu.c:433
+#: ../../WPrefs.app/Menu.c:434
 msgid "Workspace Menu"
 msgstr "Wurkromtenmenu"
 
-#: ../../WPrefs.app/Menu.c:434 ../../WPrefs.app/MouseSettings.c:58
+#: ../../WPrefs.app/Menu.c:435 ../../WPrefs.app/MouseSettings.c:58
 msgid "Window List Menu"
 msgstr "Finsterlistmenu"
 
-#: ../../WPrefs.app/Menu.c:453
+#: ../../WPrefs.app/Menu.c:454
 msgid "XTerm"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:456
+#: ../../WPrefs.app/Menu.c:457
 msgid "rxvt"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:459
+#: ../../WPrefs.app/Menu.c:460
 msgid "ETerm"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:462
+#: ../../WPrefs.app/Menu.c:463
 msgid "Run..."
 msgstr "Utfiere..."
 
-#: ../../WPrefs.app/Menu.c:463
+#: ../../WPrefs.app/Menu.c:464
 #, c-format
 msgid "%A(Run,Type command to run)"
 msgstr "%A(Utfiere,Typ út te fieren kommando)"
 
-#: ../../WPrefs.app/Menu.c:465
+#: ../../WPrefs.app/Menu.c:466
 msgid "Firefox"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:468
+#: ../../WPrefs.app/Menu.c:469
 msgid "gimp"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:471
+#: ../../WPrefs.app/Menu.c:472
 msgid "epic"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:474
+#: ../../WPrefs.app/Menu.c:475
 msgid "ee"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:477
+#: ../../WPrefs.app/Menu.c:478
 msgid "xv"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:480
+#: ../../WPrefs.app/Menu.c:481
 msgid "Evince"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:483
+#: ../../WPrefs.app/Menu.c:484
 msgid "ghostview"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:486 ../../WPrefs.app/Menu.c:757
+#: ../../WPrefs.app/Menu.c:487 ../../WPrefs.app/Menu.c:758
 msgid "Exit Window Maker"
 msgstr "Window Maker ôfslute"
 
-#: ../../WPrefs.app/Menu.c:508
+#: ../../WPrefs.app/Menu.c:509
 msgid "Debian Menu"
 msgstr "Debian-menu"
 
-#: ../../WPrefs.app/Menu.c:511
+#: ../../WPrefs.app/Menu.c:512
 msgid "RedHat Menu"
 msgstr "RedHat-menu"
 
-#: ../../WPrefs.app/Menu.c:514
+#: ../../WPrefs.app/Menu.c:515
 msgid "Menu Conectiva"
 msgstr "Conectiva-menu"
 
-#: ../../WPrefs.app/Menu.c:517
+#: ../../WPrefs.app/Menu.c:518
 msgid "Themes"
 msgstr "Tema's"
 
-#: ../../WPrefs.app/Menu.c:523
+#: ../../WPrefs.app/Menu.c:524
 msgid "Bg Images (scale)"
 msgstr "Eftergrûn (skaal)"
 
-#: ../../WPrefs.app/Menu.c:529
+#: ../../WPrefs.app/Menu.c:530
 msgid "Bg Images (tile)"
 msgstr "Eftergrûn (tegel)"
 
-#: ../../WPrefs.app/Menu.c:535
+#: ../../WPrefs.app/Menu.c:536
 msgid "Assorted XTerms"
 msgstr "Alderhande XTerms"
 
-#: ../../WPrefs.app/Menu.c:537
+#: ../../WPrefs.app/Menu.c:538
 msgid "XTerm Yellow on Blue"
 msgstr "XTerm giel op blau"
 
-#: ../../WPrefs.app/Menu.c:540
+#: ../../WPrefs.app/Menu.c:541
 msgid "XTerm White on Black"
 msgstr "XTerm wyt op swart"
 
-#: ../../WPrefs.app/Menu.c:543
+#: ../../WPrefs.app/Menu.c:544
 msgid "XTerm Black on White"
 msgstr "XTerm swart op wyt"
 
-#: ../../WPrefs.app/Menu.c:546
+#: ../../WPrefs.app/Menu.c:547
 msgid "XTerm Black on Beige"
 msgstr "XTerm swart op bêzje"
 
-#: ../../WPrefs.app/Menu.c:549
+#: ../../WPrefs.app/Menu.c:550
 msgid "XTerm White on Green"
 msgstr "XTerm wyt op grien"
 
-#: ../../WPrefs.app/Menu.c:552
+#: ../../WPrefs.app/Menu.c:553
 msgid "XTerm White on Olive"
 msgstr "XTerm wyt op oliifgrien"
 
-#: ../../WPrefs.app/Menu.c:555
+#: ../../WPrefs.app/Menu.c:556
 msgid "XTerm Blue on Blue"
 msgstr "XTerm blau op blau"
 
-#: ../../WPrefs.app/Menu.c:558
+#: ../../WPrefs.app/Menu.c:559
 msgid "XTerm BIG FONTS"
 msgstr "XTerm GRUTTE LETTERS"
 
-#: ../../WPrefs.app/Menu.c:579
+#: ../../WPrefs.app/Menu.c:580
 msgid "Program to Run"
 msgstr "Ut te fieren programma"
 
-#: ../../WPrefs.app/Menu.c:589
+#: ../../WPrefs.app/Menu.c:590
 msgid "Browse"
 msgstr "Blêdzje"
 
-#: ../../WPrefs.app/Menu.c:598
+#: ../../WPrefs.app/Menu.c:599
 msgid "Run the program inside a Xterm"
 msgstr "Fier it programma út yn in XTerm"
 
-#: ../../WPrefs.app/Menu.c:607
+#: ../../WPrefs.app/Menu.c:608
 msgid "Path for Menu"
 msgstr "Paad nei menu"
 
-#: ../../WPrefs.app/Menu.c:618
+#: ../../WPrefs.app/Menu.c:619
 msgid ""
 "Enter the path for a file containing a menu\n"
 "or a list of directories with the programs you\n"
@@ -1453,11 +1453,11 @@ msgstr ""
 "of\n"
 "/usr/bin ~/xbin"
 
-#: ../../WPrefs.app/Menu.c:630 ../../WPrefs.app/Menu.c:655
+#: ../../WPrefs.app/Menu.c:631 ../../WPrefs.app/Menu.c:656
 msgid "Command"
 msgstr "Kommando"
 
-#: ../../WPrefs.app/Menu.c:641
+#: ../../WPrefs.app/Menu.c:642
 msgid ""
 "Enter a command that outputs a menu\n"
 "definition to stdout when invoked."
@@ -1465,7 +1465,7 @@ msgstr ""
 "Fier in kommando yn, dat by oanroppen\n"
 "in útwurke menu jout nei 'stdout'."
 
-#: ../../WPrefs.app/Menu.c:646 ../../WPrefs.app/Menu.c:671
+#: ../../WPrefs.app/Menu.c:647 ../../WPrefs.app/Menu.c:672
 msgid ""
 "Cache menu contents after opening for\n"
 "the first time"
@@ -1473,7 +1473,7 @@ msgstr ""
 "Bewarje menuynhâld nei de earste kear\n"
 "iepenjen"
 
-#: ../../WPrefs.app/Menu.c:666
+#: ../../WPrefs.app/Menu.c:667
 msgid ""
 "Enter a command that outputs a proplist menu\n"
 "definition to stdout when invoked."
@@ -1482,11 +1482,11 @@ msgstr ""
 "in útwurke 'property list'-menu jout\n"
 "nei 'stdout'."
 
-#: ../../WPrefs.app/Menu.c:680
+#: ../../WPrefs.app/Menu.c:681
 msgid "Command to Open Files"
 msgstr "Kommando om bestannen te iepenjen"
 
-#: ../../WPrefs.app/Menu.c:691
+#: ../../WPrefs.app/Menu.c:692
 msgid ""
 "Enter the command you want to use to open the\n"
 "files in the directories listed below."
@@ -1494,71 +1494,71 @@ msgstr ""
 "Fier it te brûken kommando yn, om 'e\n"
 "bestannen yn ûndersteande mappen te iepenjen."
 
-#: ../../WPrefs.app/Menu.c:699
+#: ../../WPrefs.app/Menu.c:700
 msgid "Directories with Files"
 msgstr "Mappen mei bestannen"
 
-#: ../../WPrefs.app/Menu.c:710
+#: ../../WPrefs.app/Menu.c:711
 msgid "Strip extensions from file names"
 msgstr "Ekstinsjes fan bestânsnammen ôf helje"
 
-#: ../../WPrefs.app/Menu.c:721
+#: ../../WPrefs.app/Menu.c:722
 msgid "Keyboard Shortcut"
 msgstr "Fluchtoets"
 
-#: ../../WPrefs.app/Menu.c:753
+#: ../../WPrefs.app/Menu.c:754
 msgid "Arrange Icons"
 msgstr "Ikoanen skikke"
 
-#: ../../WPrefs.app/Menu.c:754
+#: ../../WPrefs.app/Menu.c:755
 msgid "Hide All Windows Except For The Focused One"
 msgstr "Alle finsters ferbergje, útsein dy't fokus hat"
 
-#: ../../WPrefs.app/Menu.c:755
+#: ../../WPrefs.app/Menu.c:756
 msgid "Show All Windows"
 msgstr "Alle finsters toane"
 
-#: ../../WPrefs.app/Menu.c:758
+#: ../../WPrefs.app/Menu.c:759
 msgid "Exit X Session"
 msgstr "X-sesje ôfslute"
 
-#: ../../WPrefs.app/Menu.c:759
+#: ../../WPrefs.app/Menu.c:760
 msgid "Restart Window Maker"
 msgstr "Window Maker werstarte"
 
-#: ../../WPrefs.app/Menu.c:760
+#: ../../WPrefs.app/Menu.c:761
 msgid "Start Another Window Manager   : ("
 msgstr "Oare finsterbehearder starte   : ("
 
-#: ../../WPrefs.app/Menu.c:762
+#: ../../WPrefs.app/Menu.c:763
 msgid "Save Current Session"
 msgstr "Hjoeddeiske sesje bewarje"
 
-#: ../../WPrefs.app/Menu.c:763
+#: ../../WPrefs.app/Menu.c:764
 msgid "Clear Saved Session"
 msgstr "Bewarre sesje wiskje"
 
-#: ../../WPrefs.app/Menu.c:764
+#: ../../WPrefs.app/Menu.c:765
 msgid "Refresh Screen"
 msgstr "Skerm fernije"
 
-#: ../../WPrefs.app/Menu.c:765
+#: ../../WPrefs.app/Menu.c:766
 msgid "Open Info Panel"
 msgstr "Ynfopaniel iepenje"
 
-#: ../../WPrefs.app/Menu.c:766
+#: ../../WPrefs.app/Menu.c:767
 msgid "Open Copyright Panel"
 msgstr "Auteursrjochtenpaniel iepenje"
 
-#: ../../WPrefs.app/Menu.c:771
+#: ../../WPrefs.app/Menu.c:772
 msgid "Window Manager to Start"
 msgstr "Te starten finsterbehearder"
 
-#: ../../WPrefs.app/Menu.c:784
+#: ../../WPrefs.app/Menu.c:785
 msgid "Do not confirm action."
 msgstr "Aksje net befêstigje."
 
-#: ../../WPrefs.app/Menu.c:791
+#: ../../WPrefs.app/Menu.c:792
 msgid ""
 "Instructions:\n"
 "\n"
@@ -1571,60 +1571,57 @@ msgid ""
 msgstr ""
 "Ynstruksjes:\n"
 "\n"
-"- Fersleep ûnderdielen fan lofts nei it menu, om\n"
+"Fersleep ûnderdielen...\n"
-"  nije yngongen ta te foegjen.\n"
+" ...fan lofts nei it menu, om nije yngongen ta te foegjen.\n"
-"- Fersleep ûnderdielen út it menu, om se te ferwiderjen.\n"
+" ...út it menu, om se te ferwiderjen.\n"
-"- Fersleep ûnderdielen binnen it menu, om har plak te\n"
+" ...binnen it menu, om har plak te feroarjen.\n"
-"  feroarjen.\n"
+" ...mei Control yndrukt, om se te kopiearjen.\n"
-"- Fersleep ûnderdielen mei Control yndrukt, om se te\n"
+"(Dûbeld)klik op in menuyngong, om...\n"
-"  kopiearjen.\n"
+" ...de beneaming te wizigjen.\n"
-"- Dûbeldklik op in menuyngong, om 'e beneaming te\n"
+" ...relatearre ynformaasje te wizigjen."
-"  wizigjen.\n"
-"- Klik op in menuyngong, om relatearre ynformaasje te\n"
-"  wizigjen."
 
-#: ../../WPrefs.app/Menu.c:1030
+#: ../../WPrefs.app/Menu.c:1031
 #, c-format
 msgid "unknown command '%s' in menu"
 msgstr "ûnbekend kommando '%s' yn menu"
 
-#: ../../WPrefs.app/Menu.c:1054
+#: ../../WPrefs.app/Menu.c:1055
 msgid ": Execute Program"
 msgstr ": start programma"
 
-#: ../../WPrefs.app/Menu.c:1058
+#: ../../WPrefs.app/Menu.c:1059
 msgid ": Perform Internal Command"
 msgstr ": fier yntern kommando út"
 
-#: ../../WPrefs.app/Menu.c:1062
+#: ../../WPrefs.app/Menu.c:1063
 msgid ": Open a Submenu"
 msgstr ": iepenje in submenu"
 
-#: ../../WPrefs.app/Menu.c:1066
+#: ../../WPrefs.app/Menu.c:1067
 msgid ": Program Generated Submenu"
 msgstr ": submenu út programma"
 
-#: ../../WPrefs.app/Menu.c:1070
+#: ../../WPrefs.app/Menu.c:1071
 msgid ": Program Generated Proplist Submenu"
 msgstr ": PropList-submenu út programma"
 
-#: ../../WPrefs.app/Menu.c:1074
+#: ../../WPrefs.app/Menu.c:1075
 msgid ": Directory Contents Menu"
 msgstr ": menu mei mapynhâld"
 
-#: ../../WPrefs.app/Menu.c:1078
+#: ../../WPrefs.app/Menu.c:1079
 msgid ": Open Workspaces Submenu"
 msgstr ": iepenje wurkromtensubmenu"
 
-#: ../../WPrefs.app/Menu.c:1082
+#: ../../WPrefs.app/Menu.c:1083
 msgid ": Open Window List Submenu"
 msgstr ": iepenje finsterlistsubmenu"
 
-#: ../../WPrefs.app/Menu.c:1298
+#: ../../WPrefs.app/Menu.c:1299
 msgid "Remove Submenu"
 msgstr "Submenu ferwiderje"
 
-#: ../../WPrefs.app/Menu.c:1299
+#: ../../WPrefs.app/Menu.c:1300
 msgid ""
 "Removing this item will destroy all items inside\n"
 "the submenu. Do you really want to do that?"
@@ -1632,45 +1629,45 @@ msgstr ""
 "Dit ûnderdiel ferwiderjen, sil alle yngongen yn it\n"
 "submenu ferneatigje. Wolle jo dat echt dwaan?"
 
-#: ../../WPrefs.app/Menu.c:1301
+#: ../../WPrefs.app/Menu.c:1302
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../WPrefs.app/Menu.c:1301
+#: ../../WPrefs.app/Menu.c:1302
 msgid "No"
 msgstr "Nee"
 
-#: ../../WPrefs.app/Menu.c:1301
+#: ../../WPrefs.app/Menu.c:1302
 msgid "Yes, don't ask again"
 msgstr "Ja, freegje net wer"
 
-#: ../../WPrefs.app/Menu.c:1439
+#: ../../WPrefs.app/Menu.c:1440
 #, c-format
 msgid "Invalid menu command \"%s\" with label \"%s\" cleared"
 msgstr "Unjildich menukommando \"%s\" mei label \"%s\" leech"
 
-#: ../../WPrefs.app/Menu.c:1442 ../../WPrefs.app/Menu.c:1500
+#: ../../WPrefs.app/Menu.c:1443 ../../WPrefs.app/Menu.c:1522
-#: ../../WPrefs.app/WPrefs.c:668
+#: ../../WPrefs.app/Menu.c:1537 ../../WPrefs.app/WPrefs.c:668
 msgid "Warning"
 msgstr "Warskôging"
 
-#: ../../WPrefs.app/Menu.c:1442 ../../WPrefs.app/Menu.c:1475
+#: ../../WPrefs.app/Menu.c:1443 ../../WPrefs.app/Menu.c:1476
-#: ../../WPrefs.app/MouseSettings.c:156 ../../WPrefs.app/MouseSettings.c:176
+#: ../../WPrefs.app/Menu.c:1523 ../../WPrefs.app/MouseSettings.c:156
-#: ../../WPrefs.app/TexturePanel.c:585 ../../WPrefs.app/TexturePanel.c:663
+#: ../../WPrefs.app/MouseSettings.c:176 ../../WPrefs.app/TexturePanel.c:585
-#: ../../WPrefs.app/TexturePanel.c:1419 ../../WPrefs.app/WPrefs.c:617
+#: ../../WPrefs.app/TexturePanel.c:663 ../../WPrefs.app/TexturePanel.c:1419
-#: ../../WPrefs.app/WPrefs.c:621 ../../WPrefs.app/WPrefs.c:641
+#: ../../WPrefs.app/WPrefs.c:617 ../../WPrefs.app/WPrefs.c:621
-#: ../../WPrefs.app/WPrefs.c:653 ../../WPrefs.app/WPrefs.c:659
+#: ../../WPrefs.app/WPrefs.c:641 ../../WPrefs.app/WPrefs.c:653
-#: ../../WPrefs.app/WPrefs.c:668 ../../WPrefs.app/WPrefs.c:699
+#: ../../WPrefs.app/WPrefs.c:659 ../../WPrefs.app/WPrefs.c:668
-#: ../../WPrefs.app/WPrefs.c:703
+#: ../../WPrefs.app/WPrefs.c:699 ../../WPrefs.app/WPrefs.c:703
 msgid "OK"
 msgstr "OK"
 
-#: ../../WPrefs.app/Menu.c:1471
+#: ../../WPrefs.app/Menu.c:1472
 #, c-format
 msgid "Could not open default menu from '%s'"
 msgstr "Koe standertmenu net iepenje út '%s'"
 
-#: ../../WPrefs.app/Menu.c:1475 ../../WPrefs.app/MouseSettings.c:154
+#: ../../WPrefs.app/Menu.c:1476 ../../WPrefs.app/MouseSettings.c:154
 #: ../../WPrefs.app/MouseSettings.c:173 ../../WPrefs.app/TexturePanel.c:585
 #: ../../WPrefs.app/TexturePanel.c:661 ../../WPrefs.app/WPrefs.c:617
 #: ../../WPrefs.app/WPrefs.c:621 ../../WPrefs.app/WPrefs.c:638
@@ -1679,7 +1676,16 @@ msgstr "Koe standertmenu net iepenje út '%s'"
 msgid "Error"
 msgstr "Flater"
 
-#: ../../WPrefs.app/Menu.c:1501
+#: ../../WPrefs.app/Menu.c:1516
+#, c-format
+msgid ""
+"The menu file \"%s\" referenced by WMRootMenu is read-only.\n"
+"You cannot use WPrefs to modify it."
+msgstr ""
+"Menubestân \"%s\" ferwiisd troch WMRootMenu is allinnich-lêze.\n"
+"Jo kinne WPrefs net brûke om it te wizigjen."
+
+#: ../../WPrefs.app/Menu.c:1538
 msgid ""
 "The menu file format currently in use is not supported\n"
 "by this tool. Do you want to discard the current menu\n"
@@ -1689,19 +1695,32 @@ msgstr ""
 "troch dit helpmiddel. Wolle jo it hjoeddeiske menu fersmite,\n"
 "om dit helpmiddel te brûken?"
 
-#: ../../WPrefs.app/Menu.c:1504
+#: ../../WPrefs.app/Menu.c:1541
 msgid "Yes, Discard and Update"
-msgstr "Ja, fersmiet en wurkje by"
+msgstr "Ja, fersmiet, wurkje by"
 
-#: ../../WPrefs.app/Menu.c:1504
+#: ../../WPrefs.app/Menu.c:1541
 msgid "No, Keep Current Menu"
 msgstr "Nee, behâld hjoeddeisk menu"
 
-#: ../../WPrefs.app/Menu.c:1750
+#: ../../WPrefs.app/Menu.c:1558
+#, c-format
+msgid ""
+"\n"
+"\n"
+"When saved, the menu will be written to the file\n"
+"\"%s\"."
+msgstr ""
+"\n"
+"\n"
+"By bewarjen wurdt it menu skreaun nei it bestân\n"
+"\"%s\"."
+
+#: ../../WPrefs.app/Menu.c:1795
 msgid "Applications Menu Definition"
 msgstr "Programmamenu fêststelle"
 
-#: ../../WPrefs.app/Menu.c:1752
+#: ../../WPrefs.app/Menu.c:1797
 msgid "Edit the menu for launching applications."
 msgstr "Bewurkje it menu foar programma's opstarten."
 

WPrefs.app/po/nl.po

@@ -1,14 +1,14 @@
 # New translation into Dutch for Window Maker
-# Copyright (C) 2014-2016 Window Maker Developers Team
+# Copyright (C) 2014-2017 Window Maker Developers Team
 # This file is distributed under the same license as the windowmaker package.
 # Original by Alwin <translations@ziggo.nl>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: wmaker-0.95.7+\n"
+"Project-Id-Version: wmaker-0.95.8+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-10 10:56+0100\n"
+"POT-Creation-Date: 2017-09-14 19:36+0200\n"
-"PO-Revision-Date: 2017-03-10 00:00+0000\n"
+"PO-Revision-Date: 2017-09-14 00:00+0000\n"
 "Last-Translator: Alwin <translations@ziggo.nl>\n"
 "Language-Team: Dutch\n"
 "Language: nl\n"
@@ -667,8 +667,8 @@ msgid "bad option value %s for option ColormapMode. Using default Auto"
 msgstr ""
 "verkeerde optiewaarde %s voor optie ColormapMode. Gebruikt standaard Auto"
 
-#: ../../WPrefs.app/Focus.c:154 ../../WPrefs.app/Icons.c:162
+#: ../../WPrefs.app/Focus.c:154 ../../WPrefs.app/Icons.c:160
-#: ../../WPrefs.app/Icons.c:396 ../../WPrefs.app/Preferences.c:120
+#: ../../WPrefs.app/Icons.c:367 ../../WPrefs.app/Preferences.c:120
 #: ../../WPrefs.app/WindowHandling.c:140 ../../WPrefs.app/WindowHandling.c:159
 #, c-format
 msgid "OFF"
@@ -768,27 +768,27 @@ msgstr "Systeemletter"
 msgid "Bold System Font"
 msgstr "Systeemletter, vet"
 
-#: ../../WPrefs.app/FontSimple.c:664
+#: ../../WPrefs.app/FontSimple.c:660
 msgid "Sample Text"
 msgstr "Voorbeeld"
 
-#: ../../WPrefs.app/FontSimple.c:681
+#: ../../WPrefs.app/FontSimple.c:677
 msgid "Family"
 msgstr "Familie"
 
-#: ../../WPrefs.app/FontSimple.c:707
+#: ../../WPrefs.app/FontSimple.c:703
 msgid "Style"
 msgstr "Stijl"
 
-#: ../../WPrefs.app/FontSimple.c:710
+#: ../../WPrefs.app/FontSimple.c:706
 msgid "Size"
 msgstr "Grootte"
 
-#: ../../WPrefs.app/FontSimple.c:742
+#: ../../WPrefs.app/FontSimple.c:738
 msgid "Font Configuration"
 msgstr "Lettertypenconfiguratie"
 
-#: ../../WPrefs.app/FontSimple.c:744
+#: ../../WPrefs.app/FontSimple.c:740
 msgid "Configure fonts for Window Maker titlebars, menus etc."
 msgstr ""
 "Stel lettertypen in voor Window Maker-titelbalken,\n"
@@ -811,36 +811,36 @@ msgstr "3D wentelen"
 msgid "None"
 msgstr "Geen"
 
-#: ../../WPrefs.app/Icons.c:186 ../../WPrefs.app/Preferences.c:145
+#: ../../WPrefs.app/Icons.c:184 ../../WPrefs.app/Preferences.c:145
 #: ../../WPrefs.app/Preferences.c:159
 #, c-format
 msgid "bad value \"%s\" for option %s, using default \"%s\""
 msgstr "verkeerde waarde \"%s\" voor optie %s, gebruikt standaard \"%s\""
 
-#: ../../WPrefs.app/Icons.c:255
+#: ../../WPrefs.app/Icons.c:226
 #, c-format
 msgid "animation style \"%s\" is unknown, resetting to \"%s\""
 msgstr "animatiestijl \"%s\" is onbekend, teruggezet op \"%s\""
 
-#: ../../WPrefs.app/Icons.c:282
+#: ../../WPrefs.app/Icons.c:253
 msgid "Icon Positioning"
 msgstr "Icoonplaatsing"
 
-#: ../../WPrefs.app/Icons.c:361
+#: ../../WPrefs.app/Icons.c:332
 msgid "Icon Size"
 msgstr "Icoongrootte"
 
-#: ../../WPrefs.app/Icons.c:363
+#: ../../WPrefs.app/Icons.c:334
 msgid "The size of the dock/application icon and miniwindows"
 msgstr ""
 "De afmetingen van 't dok-/programma-icoon\n"
 "en minivensters"
 
-#: ../../WPrefs.app/Icons.c:380
+#: ../../WPrefs.app/Icons.c:351
 msgid "Mini-Previews for Icons"
 msgstr "Miniaturen voor iconen"
 
-#: ../../WPrefs.app/Icons.c:382
+#: ../../WPrefs.app/Icons.c:353
 msgid ""
 "The Mini-Preview provides a small view of the content of the\n"
 "window when the mouse is placed over the icon."
@@ -848,41 +848,41 @@ msgstr ""
 "De miniatuur biedt 'n kleine blik op de inhoud van 't\n"
 "venster, als de muis op 't icoon wordt geplaatst."
 
-#: ../../WPrefs.app/Icons.c:404
+#: ../../WPrefs.app/Icons.c:375
 msgid "Iconification Animation"
 msgstr "Iconificeringsanimatie"
 
-#: ../../WPrefs.app/Icons.c:428
+#: ../../WPrefs.app/Icons.c:399
 msgid "Auto-arrange icons"
 msgstr "Iconen vanzelf schikken"
 
-#: ../../WPrefs.app/Icons.c:430
+#: ../../WPrefs.app/Icons.c:401
 msgid "Keep icons and miniwindows arranged all the time."
 msgstr "Houd iconen en minivensters altijd geschikt."
 
-#: ../../WPrefs.app/Icons.c:435
+#: ../../WPrefs.app/Icons.c:406
 msgid "Omnipresent miniwindows"
 msgstr "Alomtegenwoordige minivensters"
 
-#: ../../WPrefs.app/Icons.c:437
+#: ../../WPrefs.app/Icons.c:408
 msgid "Make miniwindows be present in all workspaces."
 msgstr "Maak minivensters aanwezig in alle werkruimten."
 
-#: ../../WPrefs.app/Icons.c:442
+#: ../../WPrefs.app/Icons.c:413
 msgid "Single click activation"
 msgstr "Enkelkliksactivering"
 
-#: ../../WPrefs.app/Icons.c:444
+#: ../../WPrefs.app/Icons.c:415
 msgid "Launch applications and restore windows with a single click."
 msgstr ""
 "Start programma's op, en herstel vensters met\n"
 "'n enkele klik."
 
-#: ../../WPrefs.app/Icons.c:500
+#: ../../WPrefs.app/Icons.c:467
 msgid "Icon Preferences"
 msgstr "Icoonvoorkeuren"
 
-#: ../../WPrefs.app/Icons.c:502
+#: ../../WPrefs.app/Icons.c:469
 msgid ""
 "Icon/Miniwindow handling options. Icon positioning\n"
 "area, sizes of icons, miniaturization animation style."
@@ -1213,7 +1213,7 @@ msgstr "Verhoog/verlaag Clip"
 msgid "Toggle keyboard language"
 msgstr "Wissel toetsenbordtaal"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:375 ../../WPrefs.app/Menu.c:274
+#: ../../WPrefs.app/KeyboardShortcuts.c:375 ../../WPrefs.app/Menu.c:275
 #: ../../WPrefs.app/TexturePanel.c:1425
 msgid "Cancel"
 msgstr "Annuleren"
@@ -1224,8 +1224,8 @@ msgstr ""
 "Druk op de verlangde sneltoets(en), of klik Annuleren om opnemen te stoppen."
 
 #: ../../WPrefs.app/KeyboardShortcuts.c:396
-#: ../../WPrefs.app/KeyboardShortcuts.c:566 ../../WPrefs.app/Menu.c:284
+#: ../../WPrefs.app/KeyboardShortcuts.c:566 ../../WPrefs.app/Menu.c:285
-#: ../../WPrefs.app/Menu.c:732
+#: ../../WPrefs.app/Menu.c:733
 msgid "Capture"
 msgstr "Opnemen"
 
@@ -1242,7 +1242,7 @@ msgstr "Acties"
 msgid "Shortcut"
 msgstr "Sneltoets"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:560 ../../WPrefs.app/Menu.c:738
+#: ../../WPrefs.app/KeyboardShortcuts.c:560 ../../WPrefs.app/Menu.c:739
 msgid "Clear"
 msgstr "Wissen"
 
@@ -1258,188 +1258,188 @@ msgstr ""
 "Wijzig de sneltoetsen voor acties, zoals van\n"
 "werkruimte wisselen en menu's openen."
 
-#: ../../WPrefs.app/Menu.c:250
+#: ../../WPrefs.app/Menu.c:251
 msgid "Select Program"
 msgstr "Kies programma"
 
-#: ../../WPrefs.app/Menu.c:412
+#: ../../WPrefs.app/Menu.c:413
 msgid "New Items"
 msgstr "Nieuwe onderdelen"
 
-#: ../../WPrefs.app/Menu.c:413
+#: ../../WPrefs.app/Menu.c:414
 msgid "Sample Commands"
 msgstr "Voorbeeldcommando's"
 
-#: ../../WPrefs.app/Menu.c:414
+#: ../../WPrefs.app/Menu.c:415
 msgid "Sample Submenus"
 msgstr "Voorbeeldmenu's"
 
-#: ../../WPrefs.app/Menu.c:426
+#: ../../WPrefs.app/Menu.c:427
 msgid "Run Program"
 msgstr "Programma uitvoeren"
 
-#: ../../WPrefs.app/Menu.c:427
+#: ../../WPrefs.app/Menu.c:428
 msgid "Internal Command"
 msgstr "Intern commando"
 
-#: ../../WPrefs.app/Menu.c:428
+#: ../../WPrefs.app/Menu.c:429
 msgid "Submenu"
 msgstr "Submenu"
 
-#: ../../WPrefs.app/Menu.c:429
+#: ../../WPrefs.app/Menu.c:430
 msgid "External Submenu"
 msgstr "Extern submenu"
 
-#: ../../WPrefs.app/Menu.c:430
+#: ../../WPrefs.app/Menu.c:431
 msgid "Generated Submenu"
 msgstr "Aangemaakt submenu"
 
-#: ../../WPrefs.app/Menu.c:431
+#: ../../WPrefs.app/Menu.c:432
 msgid "Generated PL Menu"
 msgstr "Aangemaakt PL-menu"
 
-#: ../../WPrefs.app/Menu.c:432
+#: ../../WPrefs.app/Menu.c:433
 msgid "Directory Contents"
 msgstr "Mapinhoud"
 
-#: ../../WPrefs.app/Menu.c:433
+#: ../../WPrefs.app/Menu.c:434
 msgid "Workspace Menu"
 msgstr "Werkruimtenmenu"
 
-#: ../../WPrefs.app/Menu.c:434 ../../WPrefs.app/MouseSettings.c:58
+#: ../../WPrefs.app/Menu.c:435 ../../WPrefs.app/MouseSettings.c:58
 msgid "Window List Menu"
 msgstr "Vensterlijstmenu"
 
-#: ../../WPrefs.app/Menu.c:453
+#: ../../WPrefs.app/Menu.c:454
 msgid "XTerm"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:456
+#: ../../WPrefs.app/Menu.c:457
 msgid "rxvt"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:459
+#: ../../WPrefs.app/Menu.c:460
 msgid "ETerm"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:462
+#: ../../WPrefs.app/Menu.c:463
 msgid "Run..."
 msgstr "Uitvoeren..."
 
-#: ../../WPrefs.app/Menu.c:463
+#: ../../WPrefs.app/Menu.c:464
 #, c-format
 msgid "%A(Run,Type command to run)"
 msgstr "%A(Uitvoeren,Typ uit te voeren commando)"
 
-#: ../../WPrefs.app/Menu.c:465
+#: ../../WPrefs.app/Menu.c:466
 msgid "Firefox"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:468
+#: ../../WPrefs.app/Menu.c:469
 msgid "gimp"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:471
+#: ../../WPrefs.app/Menu.c:472
 msgid "epic"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:474
+#: ../../WPrefs.app/Menu.c:475
 msgid "ee"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:477
+#: ../../WPrefs.app/Menu.c:478
 msgid "xv"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:480
+#: ../../WPrefs.app/Menu.c:481
 msgid "Evince"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:483
+#: ../../WPrefs.app/Menu.c:484
 msgid "ghostview"
 msgstr ""
 
-#: ../../WPrefs.app/Menu.c:486 ../../WPrefs.app/Menu.c:757
+#: ../../WPrefs.app/Menu.c:487 ../../WPrefs.app/Menu.c:758
 msgid "Exit Window Maker"
 msgstr "Window Maker afsluiten"
 
-#: ../../WPrefs.app/Menu.c:508
+#: ../../WPrefs.app/Menu.c:509
 msgid "Debian Menu"
 msgstr "Debian-menu"
 
-#: ../../WPrefs.app/Menu.c:511
+#: ../../WPrefs.app/Menu.c:512
 msgid "RedHat Menu"
 msgstr "RedHat-menu"
 
-#: ../../WPrefs.app/Menu.c:514
+#: ../../WPrefs.app/Menu.c:515
 msgid "Menu Conectiva"
 msgstr "Conectiva-menu"
 
-#: ../../WPrefs.app/Menu.c:517
+#: ../../WPrefs.app/Menu.c:518
 msgid "Themes"
 msgstr "Thema's"
 
-#: ../../WPrefs.app/Menu.c:523
+#: ../../WPrefs.app/Menu.c:524
 msgid "Bg Images (scale)"
 msgstr "Achtergr. (schaal)"
 
-#: ../../WPrefs.app/Menu.c:529
+#: ../../WPrefs.app/Menu.c:530
 msgid "Bg Images (tile)"
 msgstr "Achtergr. (tegel)"
 
-#: ../../WPrefs.app/Menu.c:535
+#: ../../WPrefs.app/Menu.c:536
 msgid "Assorted XTerms"
 msgstr "Allerlei XTerms"
 
-#: ../../WPrefs.app/Menu.c:537
+#: ../../WPrefs.app/Menu.c:538
 msgid "XTerm Yellow on Blue"
 msgstr "XTerm geel op blauw"
 
-#: ../../WPrefs.app/Menu.c:540
+#: ../../WPrefs.app/Menu.c:541
 msgid "XTerm White on Black"
 msgstr "XTerm wit op zwart"
 
-#: ../../WPrefs.app/Menu.c:543
+#: ../../WPrefs.app/Menu.c:544
 msgid "XTerm Black on White"
 msgstr "XTerm zwart op wit"
 
-#: ../../WPrefs.app/Menu.c:546
+#: ../../WPrefs.app/Menu.c:547
 msgid "XTerm Black on Beige"
 msgstr "XTerm zwart op beige"
 
-#: ../../WPrefs.app/Menu.c:549
+#: ../../WPrefs.app/Menu.c:550
 msgid "XTerm White on Green"
 msgstr "XTerm wit op groen"
 
-#: ../../WPrefs.app/Menu.c:552
+#: ../../WPrefs.app/Menu.c:553
 msgid "XTerm White on Olive"
 msgstr "XTerm wit op olijfgroen"
 
-#: ../../WPrefs.app/Menu.c:555
+#: ../../WPrefs.app/Menu.c:556
 msgid "XTerm Blue on Blue"
 msgstr "XTerm blauw op blauw"
 
-#: ../../WPrefs.app/Menu.c:558
+#: ../../WPrefs.app/Menu.c:559
 msgid "XTerm BIG FONTS"
 msgstr "XTerm GROTE LETTERS"
 
-#: ../../WPrefs.app/Menu.c:579
+#: ../../WPrefs.app/Menu.c:580
 msgid "Program to Run"
 msgstr "Uit te voeren programma"
 
-#: ../../WPrefs.app/Menu.c:589
+#: ../../WPrefs.app/Menu.c:590
 msgid "Browse"
 msgstr "Bladeren"
 
-#: ../../WPrefs.app/Menu.c:598
+#: ../../WPrefs.app/Menu.c:599
 msgid "Run the program inside a Xterm"
 msgstr "Voer 't programma uit in 'n XTerm"
 
-#: ../../WPrefs.app/Menu.c:607
+#: ../../WPrefs.app/Menu.c:608
 msgid "Path for Menu"
 msgstr "Pad naar menu"
 
-#: ../../WPrefs.app/Menu.c:618
+#: ../../WPrefs.app/Menu.c:619
 msgid ""
 "Enter the path for a file containing a menu\n"
 "or a list of directories with the programs you\n"
@@ -1455,11 +1455,11 @@ msgstr ""
 "of\n"
 "/usr/bin ~/xbin"
 
-#: ../../WPrefs.app/Menu.c:630 ../../WPrefs.app/Menu.c:655
+#: ../../WPrefs.app/Menu.c:631 ../../WPrefs.app/Menu.c:656
 msgid "Command"
 msgstr "Commando"
 
-#: ../../WPrefs.app/Menu.c:641
+#: ../../WPrefs.app/Menu.c:642
 msgid ""
 "Enter a command that outputs a menu\n"
 "definition to stdout when invoked."
@@ -1467,7 +1467,7 @@ msgstr ""
 "Voer 'n commando in, dat bij aanroepen\n"
 "'n uitgewerkt menu geeft naar 'stdout'."
 
-#: ../../WPrefs.app/Menu.c:646 ../../WPrefs.app/Menu.c:671
+#: ../../WPrefs.app/Menu.c:647 ../../WPrefs.app/Menu.c:672
 msgid ""
 "Cache menu contents after opening for\n"
 "the first time"
@@ -1475,7 +1475,7 @@ msgstr ""
 "Bewaar menu-inhoud na de eerste keer\n"
 "openen"
 
-#: ../../WPrefs.app/Menu.c:666
+#: ../../WPrefs.app/Menu.c:667
 msgid ""
 "Enter a command that outputs a proplist menu\n"
 "definition to stdout when invoked."
@@ -1484,11 +1484,11 @@ msgstr ""
 "'n uitgewerkt 'property list'-menu geeft\n"
 "naar 'stdout'."
 
-#: ../../WPrefs.app/Menu.c:680
+#: ../../WPrefs.app/Menu.c:681
 msgid "Command to Open Files"
 msgstr "Commando om bestanden te openen"
 
-#: ../../WPrefs.app/Menu.c:691
+#: ../../WPrefs.app/Menu.c:692
 msgid ""
 "Enter the command you want to use to open the\n"
 "files in the directories listed below."
@@ -1496,71 +1496,71 @@ msgstr ""
 "Voer 't te gebruiken commando in, om de\n"
 "bestanden in onderstaande mappen te openen."
 
-#: ../../WPrefs.app/Menu.c:699
+#: ../../WPrefs.app/Menu.c:700
 msgid "Directories with Files"
 msgstr "Mappen met bestanden"
 
-#: ../../WPrefs.app/Menu.c:710
+#: ../../WPrefs.app/Menu.c:711
 msgid "Strip extensions from file names"
 msgstr "Extensies van bestandsnamen af halen"
 
-#: ../../WPrefs.app/Menu.c:721
+#: ../../WPrefs.app/Menu.c:722
 msgid "Keyboard Shortcut"
 msgstr "Sneltoets"
 
-#: ../../WPrefs.app/Menu.c:753
+#: ../../WPrefs.app/Menu.c:754
 msgid "Arrange Icons"
 msgstr "Iconen schikken"
 
-#: ../../WPrefs.app/Menu.c:754
+#: ../../WPrefs.app/Menu.c:755
 msgid "Hide All Windows Except For The Focused One"
 msgstr "Alle vensters verbergen, behalve die focus heeft"
 
-#: ../../WPrefs.app/Menu.c:755
+#: ../../WPrefs.app/Menu.c:756
 msgid "Show All Windows"
 msgstr "Alle vensters tonen"
 
-#: ../../WPrefs.app/Menu.c:758
+#: ../../WPrefs.app/Menu.c:759
 msgid "Exit X Session"
 msgstr "X-sessie afsluiten"
 
-#: ../../WPrefs.app/Menu.c:759
+#: ../../WPrefs.app/Menu.c:760
 msgid "Restart Window Maker"
 msgstr "Window Maker herstarten"
 
-#: ../../WPrefs.app/Menu.c:760
+#: ../../WPrefs.app/Menu.c:761
 msgid "Start Another Window Manager   : ("
 msgstr "Andere vensterbeheerder starten   : ("
 
-#: ../../WPrefs.app/Menu.c:762
+#: ../../WPrefs.app/Menu.c:763
 msgid "Save Current Session"
 msgstr "Huidige sessie opslaan"
 
-#: ../../WPrefs.app/Menu.c:763
+#: ../../WPrefs.app/Menu.c:764
 msgid "Clear Saved Session"
 msgstr "Opgeslagen sessie wissen"
 
-#: ../../WPrefs.app/Menu.c:764
+#: ../../WPrefs.app/Menu.c:765
 msgid "Refresh Screen"
 msgstr "Scherm vernieuwen"
 
-#: ../../WPrefs.app/Menu.c:765
+#: ../../WPrefs.app/Menu.c:766
 msgid "Open Info Panel"
 msgstr "Infopaneel openen"
 
-#: ../../WPrefs.app/Menu.c:766
+#: ../../WPrefs.app/Menu.c:767
 msgid "Open Copyright Panel"
 msgstr "Auteursrechtenpaneel openen"
 
-#: ../../WPrefs.app/Menu.c:771
+#: ../../WPrefs.app/Menu.c:772
 msgid "Window Manager to Start"
 msgstr "Te starten vensterbeheerder"
 
-#: ../../WPrefs.app/Menu.c:784
+#: ../../WPrefs.app/Menu.c:785
 msgid "Do not confirm action."
 msgstr "Actie niet bevestigen."
 
-#: ../../WPrefs.app/Menu.c:791
+#: ../../WPrefs.app/Menu.c:792
 msgid ""
 "Instructions:\n"
 "\n"
@@ -1573,60 +1573,57 @@ msgid ""
 msgstr ""
 "Instructies:\n"
 "\n"
-"- Versleep onderdelen van links naar 't menu, om\n"
+"Versleep onderdelen...\n"
-"  nieuwe ingangen toe te voegen.\n"
+" ...van links naar 't menu, om ingangen toe te voegen.\n"
-"- Versleep onderdelen uit 't menu, om ze te verwijderen.\n"
+" ...uit 't menu, om ze te verwijderen.\n"
-"- Versleep onderdelen binnen 't menu, om hun plaats te\n"
+" ...binnen 't menu, om hun plaats te veranderen.\n"
-"  veranderen.\n"
+" ...met Control ingedrukt, om ze te kopiëren.\n"
-"- Versleep onderdelen met Control ingedrukt, om ze te\n"
+"(Dubbel)klik op 'n menu-ingang, om...\n"
-"  kopiëren.\n"
+" ...de benaming te wijzigen.\n"
-"- Dubbelklik op 'n menu-ingang, om de benaming te\n"
+" ...gerelateerde informatie te wijzigen."
-"  wijzigen.\n"
-"- Klik op 'n menu-ingang, om gerelateerde informatie te\n"
-"  wijzigen."
 
-#: ../../WPrefs.app/Menu.c:1030
+#: ../../WPrefs.app/Menu.c:1031
 #, c-format
 msgid "unknown command '%s' in menu"
 msgstr "onbekend commando '%s' in menu"
 
-#: ../../WPrefs.app/Menu.c:1054
+#: ../../WPrefs.app/Menu.c:1055
 msgid ": Execute Program"
 msgstr ": start programma"
 
-#: ../../WPrefs.app/Menu.c:1058
+#: ../../WPrefs.app/Menu.c:1059
 msgid ": Perform Internal Command"
 msgstr ": voer intern commando uit"
 
-#: ../../WPrefs.app/Menu.c:1062
+#: ../../WPrefs.app/Menu.c:1063
 msgid ": Open a Submenu"
 msgstr ": open 'n submenu"
 
-#: ../../WPrefs.app/Menu.c:1066
+#: ../../WPrefs.app/Menu.c:1067
 msgid ": Program Generated Submenu"
 msgstr ": submenu uit programma"
 
-#: ../../WPrefs.app/Menu.c:1070
+#: ../../WPrefs.app/Menu.c:1071
 msgid ": Program Generated Proplist Submenu"
 msgstr ": PropList-submenu uit programma"
 
-#: ../../WPrefs.app/Menu.c:1074
+#: ../../WPrefs.app/Menu.c:1075
 msgid ": Directory Contents Menu"
 msgstr ": menu met mapinhoud"
 
-#: ../../WPrefs.app/Menu.c:1078
+#: ../../WPrefs.app/Menu.c:1079
 msgid ": Open Workspaces Submenu"
 msgstr ": open werkruimtensubmenu"
 
-#: ../../WPrefs.app/Menu.c:1082
+#: ../../WPrefs.app/Menu.c:1083
 msgid ": Open Window List Submenu"
 msgstr ": open vensterlijstsubmenu"
 
-#: ../../WPrefs.app/Menu.c:1298
+#: ../../WPrefs.app/Menu.c:1299
 msgid "Remove Submenu"
 msgstr "Submenu verwijderen"
 
-#: ../../WPrefs.app/Menu.c:1299
+#: ../../WPrefs.app/Menu.c:1300
 msgid ""
 "Removing this item will destroy all items inside\n"
 "the submenu. Do you really want to do that?"
@@ -1634,45 +1631,45 @@ msgstr ""
 "Dit onderdeel verwijderen, zal alle ingangen in 't\n"
 "submenu vernietigen. Wilt u dat echt doen?"
 
-#: ../../WPrefs.app/Menu.c:1301
+#: ../../WPrefs.app/Menu.c:1302
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../WPrefs.app/Menu.c:1301
+#: ../../WPrefs.app/Menu.c:1302
 msgid "No"
 msgstr "Nee"
 
-#: ../../WPrefs.app/Menu.c:1301
+#: ../../WPrefs.app/Menu.c:1302
 msgid "Yes, don't ask again"
 msgstr "Ja, vraag niet weer"
 
-#: ../../WPrefs.app/Menu.c:1439
+#: ../../WPrefs.app/Menu.c:1440
 #, c-format
 msgid "Invalid menu command \"%s\" with label \"%s\" cleared"
 msgstr "Ongeldig menucommando \"%s\" met label \"%s\" leeg"
 
-#: ../../WPrefs.app/Menu.c:1442 ../../WPrefs.app/Menu.c:1500
+#: ../../WPrefs.app/Menu.c:1443 ../../WPrefs.app/Menu.c:1522
-#: ../../WPrefs.app/WPrefs.c:668
+#: ../../WPrefs.app/Menu.c:1537 ../../WPrefs.app/WPrefs.c:668
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../../WPrefs.app/Menu.c:1442 ../../WPrefs.app/Menu.c:1475
+#: ../../WPrefs.app/Menu.c:1443 ../../WPrefs.app/Menu.c:1476
-#: ../../WPrefs.app/MouseSettings.c:156 ../../WPrefs.app/MouseSettings.c:176
+#: ../../WPrefs.app/Menu.c:1523 ../../WPrefs.app/MouseSettings.c:156
-#: ../../WPrefs.app/TexturePanel.c:585 ../../WPrefs.app/TexturePanel.c:663
+#: ../../WPrefs.app/MouseSettings.c:176 ../../WPrefs.app/TexturePanel.c:585
-#: ../../WPrefs.app/TexturePanel.c:1419 ../../WPrefs.app/WPrefs.c:617
+#: ../../WPrefs.app/TexturePanel.c:663 ../../WPrefs.app/TexturePanel.c:1419
-#: ../../WPrefs.app/WPrefs.c:621 ../../WPrefs.app/WPrefs.c:641
+#: ../../WPrefs.app/WPrefs.c:617 ../../WPrefs.app/WPrefs.c:621
-#: ../../WPrefs.app/WPrefs.c:653 ../../WPrefs.app/WPrefs.c:659
+#: ../../WPrefs.app/WPrefs.c:641 ../../WPrefs.app/WPrefs.c:653
-#: ../../WPrefs.app/WPrefs.c:668 ../../WPrefs.app/WPrefs.c:699
+#: ../../WPrefs.app/WPrefs.c:659 ../../WPrefs.app/WPrefs.c:668
-#: ../../WPrefs.app/WPrefs.c:703
+#: ../../WPrefs.app/WPrefs.c:699 ../../WPrefs.app/WPrefs.c:703
 msgid "OK"
 msgstr "OK"
 
-#: ../../WPrefs.app/Menu.c:1471
+#: ../../WPrefs.app/Menu.c:1472
 #, c-format
 msgid "Could not open default menu from '%s'"
 msgstr "Kon standaardmenu niet openen uit '%s'"
 
-#: ../../WPrefs.app/Menu.c:1475 ../../WPrefs.app/MouseSettings.c:154
+#: ../../WPrefs.app/Menu.c:1476 ../../WPrefs.app/MouseSettings.c:154
 #: ../../WPrefs.app/MouseSettings.c:173 ../../WPrefs.app/TexturePanel.c:585
 #: ../../WPrefs.app/TexturePanel.c:661 ../../WPrefs.app/WPrefs.c:617
 #: ../../WPrefs.app/WPrefs.c:621 ../../WPrefs.app/WPrefs.c:638
@@ -1681,7 +1678,16 @@ msgstr "Kon standaardmenu niet openen uit '%s'"
 msgid "Error"
 msgstr "Fout"
 
-#: ../../WPrefs.app/Menu.c:1501
+#: ../../WPrefs.app/Menu.c:1516
+#, c-format
+msgid ""
+"The menu file \"%s\" referenced by WMRootMenu is read-only.\n"
+"You cannot use WPrefs to modify it."
+msgstr ""
+"Menubestand \"%s\" verwezen door WMRootMenu is alleen-lezen.\n"
+"U kunt WPrefs niet gebruiken om 't te wijzigen."
+
+#: ../../WPrefs.app/Menu.c:1538
 msgid ""
 "The menu file format currently in use is not supported\n"
 "by this tool. Do you want to discard the current menu\n"
@@ -1691,19 +1697,32 @@ msgstr ""
 "door dit hulpmiddel. Wilt u 't huidige menu verwerpen,\n"
 "om dit hulpmiddel te gebruiken?"
 
-#: ../../WPrefs.app/Menu.c:1504
+#: ../../WPrefs.app/Menu.c:1541
 msgid "Yes, Discard and Update"
 msgstr "Ja, verwerp en werk bij"
 
-#: ../../WPrefs.app/Menu.c:1504
+#: ../../WPrefs.app/Menu.c:1541
 msgid "No, Keep Current Menu"
 msgstr "Nee, behoud huidig menu"
 
-#: ../../WPrefs.app/Menu.c:1750
+#: ../../WPrefs.app/Menu.c:1558
+#, c-format
+msgid ""
+"\n"
+"\n"
+"When saved, the menu will be written to the file\n"
+"\"%s\"."
+msgstr ""
+"\n"
+"\n"
+"Bij opslaan wordt 't menu geschreven naar 't bestand\n"
+"\"%s\"."
+
+#: ../../WPrefs.app/Menu.c:1795
 msgid "Applications Menu Definition"
 msgstr "Programmamenu bepalen"
 
-#: ../../WPrefs.app/Menu.c:1752
+#: ../../WPrefs.app/Menu.c:1797
 msgid "Edit the menu for launching applications."
 msgstr "Bewerk 't menu voor programma's opstarten."
 

WPrefs.app/po/ru.po

@@ -380,45 +380,71 @@ msgstr ""
 "параметров и количества цветов для резервирования за\n"
 "Window Maker'ом при работе с 8bit'ным цветом (8bpp)."
 
-#: ../../WPrefs.app/Expert.c:75
+#: ../../WPrefs.app/Expert.c:44
-msgid ""
+msgid  "Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."
-"Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."
+msgstr "Запретить миниокна иконки для минимизированных окон. Для использования с KDE/GNOME."
-msgstr ""
-"Запретить миниокна (иконки для минимизированных окон). Для использования с "
-"KDE/GNOME."
 
-#: ../../WPrefs.app/Expert.c:76
+#: ../../WPrefs.app/Expert.c:47
+msgid "Ignore decoration hints for GTK applications."
+msgstr "Игнорировать декорацию окон для GTK приложений."
+
+#: ../../WPrefs.app/Expert.c:53
 msgid "Do not set non-WindowMaker specific parameters (do not use xset)."
 msgstr ""
 "Не устанавливать параметры, не относящиеся непосредственно к\n"
 "Window Maker'у (не использовать xset)."
 
-#: ../../WPrefs.app/Expert.c:77
+#: ../../WPrefs.app/Expert.c:56
 msgid "Automatically save session when exiting Window Maker."
 msgstr "Автоматически сохранять сессию при выходе из Window Maker'а."
 
-#: ../../WPrefs.app/Expert.c:78
+#: ../../WPrefs.app/Expert.c:59
 msgid "Use SaveUnder in window frames, icons, menus and other objects."
 msgstr "Использовать SaveUnder для окон, иконок, меню и других объектов."
 
-#: ../../WPrefs.app/Expert.c:79
+#: ../../WPrefs.app/Expert.c:62
-msgid "Use Windoze style cycling."
-msgstr "Переключение окон в стиле Windows"
-
-#: ../../WPrefs.app/Expert.c:80
 msgid "Disable confirmation panel for the Kill command."
 msgstr "Запретить диалог подтверждения для команды `Убить'."
 
-# awn: FIXME: что это вообще значит?
-#: ../../WPrefs.app/Expert.c:81
 msgid "Disable selection animation for selected icons."
 msgstr "Запретить анимацию выбора для выбранных иконок."
 
-#: ../../WPrefs.app/Expert.c:115
+msgid "Show switch panel when cycling windows."
+msgstr "Показывать панель переключения окон."
+
+#: ../../WPrefs.app/Expert.c:68
+msgid "Smooth font edges (needs restart)."
+msgstr "Cглаживание шрифтов (требуется перезагрузка)."
+
+#: ../../WPrefs.app/Expert.c:80
+msgid "Show workspace title on Clip."
+msgstr "Показывать имя рабочего места на скрепке."
+
+#: ../../WPrefs.app/Expert.c:83
+msgid "Highlight the icon of the application when it has the focus."
+msgstr "Подсвечивание иконок при нажатии (в фокусе)."
+
+#: ../../WPrefs.app/Expert.c:91
+msgid "Maximize (snap) a window to edge or corner by dragging."
+msgstr "Прилипания окон по краям и углам."
+
+#: ../../WPrefs.app/Expert.c:100
+msgid "Snapping a window to the top maximizes it to the full screen."
+msgstr "Распахнуть окно при перетаскивании к верхнему краю."
+
+#: ../../WPrefs.app/Expert.c:118
+msgid "Double click on titlebar maximize a window to full screen."
+msgstr "Распахнуть окно двойным щелчком."
+
+#: ../../WPrefs.app/Expert.c:121
+msgid "Close rootmenu when mouse (left or right) is clicked outside focus."
+msgstr "Закрывать меню приложений правым или левым щелчком мыши вне фокуса."
+
+#: ../../WPrefs.app/Expert.c:328
 msgid "Expert User Preferences"
 msgstr "Установки для опытного пользователя"
 
-#: ../../WPrefs.app/Expert.c:117
+#: ../../WPrefs.app/Expert.c:330
 msgid ""
 "Options for people who know what they're doing...\n"
 "Also have some other misc. options."
@@ -623,6 +649,11 @@ msgstr ""
 "Параметры обработки иконок и миниокон.  Размещение иконок,\n"
 "размер иконок, в каком стиле анимировать сворачивание."
 
+#: ../../WPrefs.app/Icons.c:414
+msgid "Single click activation"
+msgstr "Одинарный щелчок мыши"
+
+
 #: ../../WPrefs.app/imagebrowser.c:95
 msgid "View"
 msgstr ""
@@ -1901,6 +1932,10 @@ msgstr ""
 msgid "Resist"
 msgstr "Упираться"
 
+#: ../../WPrefs.app/WindowHandling.c:406
+msgid "Opaque Move/Resize"
+msgstr "Перемещ/Измен.разм."
+
 #: ../../WPrefs.app/WindowHandling.c:407
 msgid "Attract"
 msgstr "Притягиваться"
@@ -1923,6 +1958,22 @@ msgstr ""
 "Как обращаться с окнами.  Начальное расположение окон.\n"
 "Сопротивляемость границ.  Сплошное/каркасное перемещение, и т.п."
 
+#: ../../WPrefs.app/WindowHandling.c:474
+msgid "by keyboard"
+msgstr "c помощ.клав."
+
+#: ../../WPrefs.app/WindowHandling.c:490
+msgid "...do not cover:"
+msgstr "не перекрывать:"
+
+#: ../../WPrefs.app/WindowHandling.c:497
+msgid "Icons"
+msgstr "Иконок"
+
+#: ../../WPrefs.app/WindowHandling.c:502
+msgid "The dock"
+msgstr "Дока"
+
 #: ../../WPrefs.app/Workspace.c:176
 msgid "Workspace Navigation"
 msgstr "Навигация по рабочим пространствам"

WindowMaker/Defaults/Makefile.am

@@ -12,7 +12,8 @@ WMWindowAttributes: $(srcdir)/WMWindowAttributes.in
 	chmod 644 WMWindowAttributes
 
 WindowMaker: $(srcdir)/WindowMaker.in
-	$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
+	$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
+		-e "s:#pixmapdir#:$(pixmapdir):" $(srcdir)/WindowMaker.in \
 		> WindowMaker ; \
 	chmod 644 WindowMaker
 

WindowMaker/Defaults/WindowMaker.in

@@ -1,93 +1,198 @@
 {
-  SmoothWorkspaceBack = NO;
+	ColormapSize = 4;
-  PopupSwitchMenu = NO;
+	DisableDithering = NO;
-  MenuStyle = normal;
-  DisableMiniwindows = NO;
-  DisableWorkspacePager = NO;
-  OpenTransientOnOwnerWorkspace = NO;
-  EdgeResistance = 30;
-  WorkspaceBorderSize = 0;
-  WorkspaceBorder = None;
-  IconificationStyle = Zoom;
-  IconPath = (
-    "~/GNUstep/Library/Icons",
-    "#pkgdatadir#/Icons",
-    "#pkgdatadir#/Pixmaps",
-    "/usr/include/X11/pixmaps",
-    "~/GNUstep/Library/WindowMaker/Pixmaps",
-    "~/GNUstep/Library/WindowMaker/CachedPixmaps",
-    "/usr/share/icons",
-    "/usr/local/share/pixmaps",
-    "/usr/share/pixmaps"
-  );
-  PixmapPath = (
-    "~/GNUstep/Library/WindowMaker/Pixmaps",
-    "~/GNUstep/Library/WindowMaker/Backgrounds",
-    "~/GNUstep/Library/WindowMaker/CachedPixmaps",
-    "#pkgdatadir#/Pixmaps",
-    "#pkgdatadir#/Backgrounds",
-    "/usr/include/X11/pixmaps",
-    "/usr/local/share/pixmaps",
-    "/usr/share/pixmaps"
-  );
-  WindowTitleBalloons = YES;
 	IconSize = 64;
+	ModifierKey = Mod1;
 	FocusMode = manual;
+	NewStyle = new;
+	DisableDock = NO;
+	DisableClip = NO;
+	DisableDrawers = NO;
+	ClipMergedInDock = NO;
+	DisableMiniwindows = NO;
+	EnableWorkspacePager = NO;
+	IconPosition = blh;
+	IconificationStyle = Zoom;
 	DisableWSMouseActions = NO;
 	MouseLeftButtonAction = SelectWindows;
 	MouseMiddleButtonAction = OpenWindowListMenu;
 	MouseRightButtonAction = OpenApplicationsMenu;
+	MouseBackwardButtonAction = None;
+	MouseForwardButtonAction = None;
 	MouseWheelAction = None;
-  ColormapSize = 4;
+	MouseWheelTiltAction = None;
-  DisableDithering = NO;
+	PixmapPath = (
-  ModifierKey = Mod1;
+		"~/GNUstep/Library/WindowMaker/Pixmaps",
-  NewStyle = "new";
+		"~/GNUstep/Library/WindowMaker/Backgrounds",
-  DisableDock = NO;
+		"~/GNUstep/Library/WindowMaker/CachedPixmaps",
-  DisableClip = NO;
+		"~/pixmaps",
-  DisableDrawers = NO;
+		"#pkgdatadir#/Pixmaps",
-  Superfluous = YES;
+		"#pkgdatadir#/Backgrounds",
-  StickyIcons = NO;
+		"#pixmapdir#"
-  SaveSessionOnExit = NO;
+	);
+	IconPath =  (
+		"~/GNUstep/Library/Icons",
+		"~/GNUstep/Library/WindowMaker/Pixmaps",
+		"~/GNUstep/Library/WindowMaker/CachedPixmaps",
+		"~/pixmaps",
+		"#pkgdatadir#/Icons",
+		"#pkgdatadir#/Pixmaps",
+		"#pixmapdir#"
+	);
 	ColormapMode = auto;
-  RaiseDelay = 0;
 	AutoFocus = YES;
-  WindowPlacement = auto;
+	RaiseDelay = 0;
-  WindowPlaceOrigin = (64, 0);
+	CirculateRaise = NO;
-  UseSaveUnders = NO;
+	Superfluous = YES;
-  DisableSound = NO;
-  DisableAnimations = NO;
-  DontLinkWorkspaces = YES;
-  AutoArrangeIcons = NO;
 	AdvanceToNewWorkspace = NO;
 	CycleWorkspaces = NO;
-  ResizeDisplay = center;
+	WorkspaceNameDisplayPosition = center;
-  MoveDisplay = floating;
+	WorkspaceBorder = None;
-  OpaqueMove = YES;
+	WorkspaceBorderSize = 0;
-  IconPosition = "blh";
+	StickyIcons = NO;
+	SaveSessionOnExit = NO;
 	WrapMenus = NO;
 	ScrollableMenus = YES;
 	MenuScrollSpeed = fast;
 	IconSlideSpeed = fast;
 	ShadeSpeed = fast;
+	BounceAppIconsWhenUrgent = YES;
+	RaiseAppIconsWhenBouncing = NO;
+	DoNotMakeAppIconsBounce = NO;
 	DoubleClickTime = 250;
+	ClipAutoraiseDelay = 600;
+	ClipAutolowerDelay = 1000;
+	ClipAutoexpandDelay = 600;
+	ClipAutocollapseDelay = 1000;
+	WrapAppiconsInDock = YES;
 	AlignSubmenus = NO;
-  NoWindowOverIcons = NO;
+	ViKeyMenus = NO;
+	OpenTransientOnOwnerWorkspace = NO;
+	WindowPlacement = auto;
 	IgnoreFocusClick = NO;
-  CloseKey = None;
+	UseSaveUnders = NO;
-  MaximizeKey = None;
+	OpaqueMove = YES;
-  VMaximizeKey = None;
+	OpaqueResize = NO;
-  RaiseLowerKey = None;
+	OpaqueMoveResizeKeyboard = NO;
+	DisableAnimations = NO;
+	DontLinkWorkspaces = YES;
+	WindowSnapping = NO;
+	SnapEdgeDetect = 1;
+	SnapCornerDetect = 10;
+	SnapToTopMaximizesFullscreen = NO;
+	DragMaximizedWindow = Move;
+	MoveHalfMaximizedWindowsBetweenScreens = NO;
+	AlternativeHalfMaximized = NO;
+	PointerWithHalfMaxWindows = NO;
+	HighlightActiveApp = YES;
+	AutoArrangeIcons = NO;
+	NoWindowOverDock = NO;
+	NoWindowOverIcons = NO;
+	WindowPlaceOrigin = (64, 0);
+	ResizeDisplay = center;
+	MoveDisplay = floating;
 	DontConfirmKill = NO;
-  ShadeKey = None;
+	WindowTitleBalloons = YES;
-  NextWorkspaceKey = "Mod1+Control+Right";
+	MiniwindowTitleBalloons = NO;
-  PrevWorkspaceKey = "Mod1+Control+Left";
+	MiniwindowPreviewBalloons = NO;
+	AppIconBalloons = NO;
+	HelpBalloons = NO;
+	EdgeResistance = 30;
+	ResizeIncrement = 0;
+	Attraction = NO;
+	DisableBlinking = NO;
+	SingleClickLaunch = NO;
+	StrictWindozeCycle = YES;
+	SwitchPanelOnlyOpen = NO;
+	MiniPreviewSize = 128;
+	IgnoreGtkHints = NO;
+	MenuStyle = normal;
+	WidgetColor = (solid, gray);
+	WorkspaceSpecificBack = ();
+	WorkspaceBack =  (solid, "rgb:50/50/75");
+	SmoothWorkspaceBack = NO;
+	IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+	TitleJustify = center;
+	WindowTitleFont = "Sans:bold:pixelsize=12";
+	WindowTitleExtendSpace = 0;
+	WindowTitleMinHeight = 0;
+	WindowTitleMaxHeight = 0x7fffffff;
+	MenuTitleExtendSpace = 0;
+	MenuTitleMinHeight = 0;
+	MenuTitleMaxHeight = 0x7fffffff;
+	MenuTextExtendSpace = 0;
+	MenuTitleFont = "Sans:bold:pixelsize=12";
+	MenuTextFont = "Sans:pixelsize=12";
+	IconTitleFont = "Sans:pixelsize=9";
+	ClipTitleFont = "Sans:bold:pixelsize=10";
+	ShowClipTitle = YES;
+	LargeDisplayFont = "Sans:pixelsize=24";
+	HighlightColor = white;
+	HighlightTextColor = black;
+	ClipTitleColor = black;
+	CClipTitleColor = "rgb:61/61/61";
+	FTitleColor = white;
+	PTitleColor = white;
+	UTitleColor = black;
+	FTitleBack = (solid, black);
+	PTitleBack = (solid, gray40);
+	UTitleBack = (solid, "rgb:aa/aa/aa");
+	ResizebarBack = (solid, "rgb:aa/aa/aa");
+	MenuTitleColor = white;
+	MenuTextColor = black;
+	MenuDisabledColor = gray50;
+	MenuTitleBack = (solid, black);
+	MenuTextBack = (solid, "rgb:aa/aa/aa");
+	IconTitleColor = white;
+	IconTitleBack = black;
+	SwitchPanelImages = (swtile.png, swback.png, 30, 40);
+	ModifierKeyLabels = ("Shift+", "Control+", "Mod1+", "Mod2+", "Mod3+", "Mod4+", "Mod5+");
+	FrameBorderWidth = 1;
+	FrameBorderColor = black;
+	FrameFocusedBorderColor = black;
+	FrameSelectedBorderColor = white;
+	WorkspaceMapBack = (solid, black);
 	RootMenuKey = F12;
 	WindowListKey = F11;
 	WindowMenuKey = "Control+Escape";
+	DockRaiseLowerKey = None;
+	ClipRaiseLowerKey = None;
+	MiniaturizeKey = "Mod1+M";
+	MinimizeAllKey = None;
+	HideKey = "Mod1+H";
+	HideOthersKey = None;
+	MoveResizeKey = None;
+	CloseKey = None;
+	MaximizeKey = None;
+	VMaximizeKey = None;
+	HMaximizeKey = None;
+	LHMaximizeKey = None;
+	RHMaximizeKey = None;
+	THMaximizeKey = None;
+	BHMaximizeKey = None;
+	LTCMaximizeKey = None;
+	RTCMaximizeKey = None;
+	LBCMaximizeKey = None;
+	RBCMaximizeKey = None;
+	MaximusKey = None;
+	KeepOnTopKey = None;
+	KeepAtBottomKey = None;
+	OmnipresentKey = None;
 	RaiseKey = "Mod1+Up";
 	LowerKey = "Mod1+Down";
+	RaiseLowerKey = None;
+	ShadeKey = None;
+	SelectKey = None;
+	WorkspaceMapKey = None;
 	FocusNextKey = "Mod1+Tab";
 	FocusPrevKey = "Mod1+Shift+Tab";
+	GroupNextKey = None;
+	GroupPrevKey = None;
+	NextWorkspaceKey = "Mod1+Control+Right";
+	PrevWorkspaceKey = "Mod1+Control+Left";
+	LastWorkspaceKey = None;
+	NextWorkspaceLayerKey = None;
+	PrevWorkspaceLayerKey = None;
 	Workspace1Key = "Mod1+1";
 	Workspace2Key = "Mod1+2";
 	Workspace3Key = "Mod1+3";
@@ -98,42 +203,49 @@
 	Workspace8Key = "Mod1+8";
 	Workspace9Key = "Mod1+9";
 	Workspace10Key = "Mod1+0";
-  HideKey = "Mod1+H";
+	MoveToWorkspace1Key = None;
-  SelectKey = None;
+	MoveToWorkspace2Key = None;
-  MiniaturizeKey = "Mod1+M";
+	MoveToWorkspace3Key = None;
-  NextWorkspaceLayerKey = None;
+	MoveToWorkspace4Key = None;
-  PrevWorkspaceLayerKey = None;
+	MoveToWorkspace5Key = None;
-  ConstrainWindowSize = NO;
+	MoveToWorkspace6Key = None;
-  DockRaiseLowerKey = None;
+	MoveToWorkspace7Key = None;
-  ClipRaiseLowerKey = None;
+	MoveToWorkspace8Key = None;
-  TitleJustify = center;
+	MoveToWorkspace9Key = None;
-  WindowTitleFont = "Sans:bold:pixelsize=12";
+	MoveToWorkspace10Key = None;
-  MenuTitleFont = "Sans:bold:pixelsize=12";
+	MoveToNextWorkspaceKey = None;
-  MenuTextFont = "Sans:pixelsize=12";
+	MoveToPrevWorkspaceKey = None;
-  IconTitleFont = "Sans:pixelsize=9";
+	MoveToLastWorkspaceKey = None;
-  ClipTitleFont = "Sans:bold:pixelsize=10";
+	MoveToNextWorkspaceLayerKey = None;
-  LargeDisplayFont = "Sans:pixelsize=24";
+	MoveToPrevWorkspaceLayerKey = None;
-  HighlightColor = white;
+	WindowShortcut1Key = None;
-  HighlightTextColor = black;
+	WindowShortcut2Key = None;
-  ClipTitleColor = black;
+	WindowShortcut3Key = None;
-  CClipTitleColor = "rgb:61/61/61";
+	WindowShortcut4Key = None;
-  FTitleColor = white;
+	WindowShortcut5Key = None;
-  PTitleColor = white;
+	WindowShortcut6Key = None;
-  UTitleColor = black;
+	WindowShortcut7Key = None;
-  MenuTitleColor = white;
+	WindowShortcut8Key = None;
-  MenuTextColor = black;
+	WindowShortcut9Key = None;
-  MenuDisabledColor = gray50;
+	WindowShortcut10Key = None;
-  WorkspaceBack = (solid, "rgb:50/50/75");
+	WindowRelaunchKey = None;
-  MenuTextColor = black;
+	ScreenSwitchKey = None;
-  FTitleBack = (solid, black);
+	RunKey = None;
-  UTitleBack = (solid, "rgb:aa/aa/aa");
+	NormalCursor = (builtin, left_ptr);
-  ResizebarBack = (solid, "rgb:aa/aa/aa");
+	ArrowCursor = (builtin, top_left_arrow);
-  PTitleBack = (solid, gray40);
+	MoveCursor = (builtin, fleur);
-  MenuTitleBack = (solid, black);
+	ResizeCursor = (builtin, sizing);
-  MenuTextBack = (solid, "rgb:aa/aa/aa");
+	TopLeftResizeCursor = (builtin, top_left_corner);
-  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+	TopRightResizeCursor = (builtin, top_right_corner);
-  ClipAutocollapseDelay = 1000;
+	BottomLeftResizeCursor = (builtin, bottom_left_corner);
-  ClipAutolowerDelay = 1000;
+	BottomRightResizeCursor = (builtin, bottom_right_corner);
-  ClipAutoexpandDelay = 600;
+	VerticalResizeCursor = (builtin, sb_v_double_arrow);
-  ClipAutoraiseDelay = 600;
+	HorizontalResizeCursor = (builtin, sb_h_double_arrow);
+	WaitCursor = (builtin, watch);
+	QuestionCursor = (builtin, question_arrow);
+	TextCursor = (builtin, xterm);
+	SelectCursor = (builtin, cross);
+	DialogHistoryLines = 500;
+	CycleActiveHeadOnly = NO;
+	CycleIgnoreMinimized = NO;
 }

WindowMaker/Makefile.am

@@ -4,8 +4,11 @@ prefsdatadir = $(pkgdatadir)
 
 wpexecbindir = @wprefs_bindir@
 
-# menus which need generated to have correct path to WPrefs
+# menus which need generated to have correct path to WPrefs or data directory
 GENERATED_MENUS =\
+	appearance.menu\
+	appearance.menu.fy\
+	appearance.menu.nl\
 	menu\
 	menu.bg\
 	menu.fi\
@@ -24,11 +27,14 @@ GENERATED_MENUS =\
 	plmenu.ja\
 	plmenu.ko\
 	plmenu.nl\
+	plmenu.pl\
 	plmenu.ro\
 	plmenu.sk\
-	plmenu.zh_TW
+	plmenu.zh_CN\
+	plmenu.zh_TW\
+	wmmacros
 
-# menus which do not mention WPrefs
+# menus which do not mention WPrefs or data directory
 NONGENERATED_MENUS =\
 	menu.ca\
 	menu.cz\
@@ -54,18 +60,16 @@ NONGENERATED_MENUS =\
 	plmenu.de\
 	plmenu.fr\
 	plmenu.hr\
-	plmenu.it\
+	plmenu.it
-	plmenu.pl\
-	plmenu.zh_CN
 
 dist_prefsdata_DATA =\
-	appearance.menu\
 	autostart.sh\
 	background.menu\
+	background.menu.fy\
+	background.menu.nl\
 	exitscript.sh\
 	README\
 	README.themes\
-	wmmacros\
 	$(NONGENERATED_MENUS)
 
 nodist_prefsdata_DATA = $(GENERATED_MENUS)
@@ -76,4 +80,4 @@ CLEANFILES = $(GENERATED_MENUS)
 
 $(GENERATED_MENUS):
 	$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" \
-		$(srcdir)/$@.in > $@
+		-e "s:#wmdatadir#:$(pkgdatadir):" $(srcdir)/$@.in > $@

WindowMaker/README

@@ -36,7 +36,7 @@ menu.ja Japanese        MANOME Tomonori <manome@itlb.te.noda.sut.ac.jp>
 				ABE Shige <sabe@ibm.net>
 menu.pt Portuguese      Alfredo K. Kojima <kojima@inf.ufrgs.br>
 menu.de	German		Carsten Schaar <nhadcasc@fs-maphy.uni-hannover.de>
-menu.cz	Czech		David ©auer <xsauer@hwlab.felk.cvut.cz>
+menu.cz	Czech		David ©auer <xsauer@hwlab.felk.cvut.cz>
 menu.ko	Korean		Chae-Yong Chong <cychong@metro.telecom.samsung.co.kr>
 			Byeong-Chan Kim <redhands@linux.sarang.net>
 menu.gl	Galician	Xose Vazquez <xose@arrakis.es>
@@ -44,7 +44,7 @@ menu.fr French		ObiTuarY <obituary@freshmeat.net>
 menu.it Italian		Roberto Checozzo <croberto@aerre.it>
 menu.ru Russian		August S.Sigov <freedomain@actor.ru>
 menu.es Spanish		Rodrigo Hornos Prados <tnetrhp@ctv.es>
-			José Luis Rivas López <jrivas@ares.ipf.uvigo.es>
+			José Luis Rivas López <jrivas@ares.ipf.uvigo.es>
 menu.he	Hebrew		Please send me your name/email if you wrote this
 			We unfortunately lost that info :(
 menu.tr Turkish         F. Kagan Gurkaynak <kgf@wpi.edu>
@@ -56,7 +56,7 @@ menu.dk Danish		John M. Lockard <jlockard@math.lsa.umich.edu>
 			Jacob Sparre Andersen <sparre@cats.nbi.dk>
 menu.sl Slovene		Alen Salamun <snowman@hal9000.medinet.si>
 menu.hu Hungarian	Csanaki Csaba <prew@mail.matav.hu>
-menu.ca Català		Carles Amig<F3> dj_fr3nd@hotmail.com
+menu.ca Català		Carles Amig<F3> dj_fr3nd@hotmail.com
 menu.zh_TW.Big5 Chinese Li Wei Jih <lwj83@cs.ccu.edu.tw>
 menu.zh_CN Chinese	Wang Jian <wangjian2@asiainfo.com>
 menu.pl Polish		Maciej Friedel <tytus@tytus.itma.pwr.wroc.pl>

WindowMaker/Styles/Adwaita.style

@@ -0,0 +1,35 @@
+{
+  CClipTitleColor = "#8b8e8e";
+  ClipTitleColor = "#2e3436";
+  ClipTitleFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=13";
+  FrameBorderColor = "#b6b6b3";
+  FrameFocusedBorderColor = "#b6b6b3";
+  FrameSelectedBorderColor = "#ffffff";
+  FTitleBack = (solid, "#e8e8e7");
+  FTitleColor = "#2e3436";
+  HighlightColor = "#4a90d9";
+  HighlightTextColor = "#ffffff";
+  IconBack = (solid, "#e8e8e7");
+  IconTitleBack = "#e8e8e7";
+  IconTitleColor = "#2e3436";
+  IconTitleFont = "Cantarell:slant=0:weight=80:width=100:pixelsize=9";
+  LargeDisplayFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=24";
+  MenuDisabledColor = "#8b8e8e";
+  MenuStyle = flat;
+  MenuTextBack = (solid, "#ffffff");
+  MenuTextColor = "#2e3436";
+  MenuTextExtendSpace = 0;
+  MenuTextFont = "Cantarell:slant=0:weight=80:width=100:pixelsize=13";
+  MenuTitleBack = (solid, "#e8e8e7");
+  MenuTitleColor = "#2e3436";
+  MenuTitleExtendSpace = 0;
+  MenuTitleFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=13";
+  PTitleBack = (solid, "#e8e8e7");
+  PTitleColor = "#8b8e8e";
+  ResizebarBack = (solid, "#e8e8e7");
+  TitleJustify = center;
+  UTitleBack = (solid, "#e8e8e7");
+  UTitleColor = "#8b8e8e";
+  WindowTitleExtendSpace = 0;
+  WindowTitleFont = "Cantarell:slant=0:weight=200:width=100:pixelsize=13";
+}

WindowMaker/Styles/Makefile.am

@@ -2,6 +2,7 @@
 prefsdatadir = $(pkgdatadir)/Styles
 
 prefsdata_DATA =\
+	Adwaita.style\
 	Autumn.style\
 	Black.style\
 	BlackTexture.style\

WindowMaker/appearance.menu

@@ -1,11 +0,0 @@
-#include "wmmacros"
-
-Appearance MENU 
-  "Background" OPEN_MENU background.menu
-  "Styles" OPEN_MENU -noext LOCAL_STYLES_DIR STYLES_DIR USER_STYLES_DIR WITH setstyle
-  "Themes" OPEN_MENU -noext LOCAL_THEMES_DIR THEMES_DIR USER_THEMES_DIR WITH setstyle
-  "Icon Sets" OPEN_MENU -noext LOCAL_ICON_SETS_DIR ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
-  "Save IconSet" EXEC geticonset USER_ICON_SETS_DIR/"%a(IconSet name)"
-  "Save Theme" EXEC getstyle -t USER_THEMES_DIR/"%a(Theme name)"
-Appearance  END 
-

WindowMaker/appearance.menu.fy.in

@@ -0,0 +1,12 @@
+#include "wmmacros"
+
+Uterlik MENU
+  "Eftergrûn" OPEN_MENU background.menu.fy
+  "Stilen" OPEN_MENU -noext  STYLES_DIR USER_STYLES_DIR WITH setstyle
+  "Tema's" OPEN_MENU -noext  THEMES_DIR USER_THEMES_DIR WITH setstyle
+  "Ikoanesets" OPEN_MENU -noext  ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
+  "Ikoaneset bewarje" EXEC geticonset USER_ICON_SETS_DIR/"%a(Ikoanesetnamme)"
+  "Tema bewarje" EXEC getstyle -p "%a(Temanamme)"
+  "Foarkarrehelpmiddel" EXEC #wprefs#
+Uterlik  END
+

WindowMaker/appearance.menu.in

@@ -0,0 +1,12 @@
+#include "wmmacros"
+
+Appearance MENU
+  "Background" OPEN_MENU background.menu
+  "Styles" OPEN_MENU -noext  STYLES_DIR USER_STYLES_DIR WITH setstyle
+  "Themes" OPEN_MENU -noext  THEMES_DIR USER_THEMES_DIR WITH setstyle
+  "Icon Sets" OPEN_MENU -noext  ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
+  "Save IconSet" EXEC geticonset USER_ICON_SETS_DIR/"%a(IconSet name)"
+  "Save Theme" EXEC getstyle -p "%a(Theme name)"
+  "Preferences Utility" EXEC #wprefs#
+Appearance  END
+

WindowMaker/appearance.menu.nl.in

@@ -0,0 +1,12 @@
+#include "wmmacros"
+
+Uiterlijk MENU
+  "Achtergrond" OPEN_MENU background.menu.nl
+  "Stijlen" OPEN_MENU -noext  STYLES_DIR USER_STYLES_DIR WITH setstyle
+  "Thema's" OPEN_MENU -noext  THEMES_DIR USER_THEMES_DIR WITH setstyle
+  "Iconensets" OPEN_MENU -noext  ICON_SETS_DIR USER_ICON_SETS_DIR WITH seticons
+  "Iconenset opslaan" EXEC geticonset USER_ICON_SETS_DIR/"%a(Iconensetnaam)"
+  "Thema opslaan" EXEC getstyle -p "%a(Themanaam)"
+  "Voorkeurenhulpmiddel" EXEC #wprefs#
+Uiterlijk  END
+

WindowMaker/background.menu

@@ -5,6 +5,7 @@
                 "Black" WS_BACK '(solid, black)'
                 "Blue"  WS_BACK '(solid, "#505075")'
                 "Indigo" WS_BACK '(solid, "#243e6c")'
+                "Bluemarine" WS_BACK '(solid, "#224477")'
                 "Deep Blue" WS_BACK '(solid, "#180090")'
                 "Purple" WS_BACK '(solid, "#554466")'
                 "Wheat"  WS_BACK '(solid, "wheat4")'
@@ -22,7 +23,10 @@
 		"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
         "Gradient" END
         "Images" MENU
-            "Tiled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
+            "Tiled" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
-            "Scaled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
+            "Scaled" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
-        "Image" END
+            "Centered" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
+            "Maximized" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -a
+            "Filled" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -f
+        "Images" END
 "Background" END

WindowMaker/background.menu.fy

@@ -0,0 +1,32 @@
+#include "wmmacros"
+
+"Eftergrûn" MENU
+        "Effen" MENU
+                "Swart" WS_BACK '(solid, black)'
+                "Blau"  WS_BACK '(solid, "#505075")'
+                "Indigo" WS_BACK '(solid, "#243e6c")'
+                "Marineblau" WS_BACK '(solid, "#224477")'
+                "Djipblau" WS_BACK '(solid, "#180090")'
+                "Poarper" WS_BACK '(solid, "#554466")'
+                "Weet"  WS_BACK '(solid, "wheat4")'
+                "Donkergriis"  WS_BACK '(solid, "#333340")'
+                "Wynread" WS_BACK '(solid, "#400020")'
+        "Effen" END
+        "Kleurferrin" MENU
+		"Sinneûndergong" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
+		"Loft" WS_BACK '(vgradient, blue4, white)'
+		"Blautinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
+		"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
+	    	"Poarpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
+		"Weettinten" WS_BACK '(vgradient, "#a09060", "#302010")'
+		"Griistinten" WS_BACK '(vgradient, "#636380", "#131318")'
+		"Wynreadtinten" WS_BACK '(vgradient, "#600040", "#180010")'
+        "Kleurferrin" END
+        "Ofbyldingen" MENU
+            "Tegele" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
+            "Skaald" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
+            "Sintrearre" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
+            "Maksimalisearre" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -a
+            "Opfolle" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -f
+        "Ofbyldingen" END
+"Eftergrûn" END

WindowMaker/background.menu.nl

@@ -0,0 +1,32 @@
+#include "wmmacros"
+
+"Achtergrond" MENU
+        "Effen" MENU
+                "Zwart" WS_BACK '(solid, black)'
+                "Blauw"  WS_BACK '(solid, "#505075")'
+                "Indigo" WS_BACK '(solid, "#243e6c")'
+                "Marineblauw" WS_BACK '(solid, "#224477")'
+                "Diepblauw" WS_BACK '(solid, "#180090")'
+                "Purper" WS_BACK '(solid, "#554466")'
+                "Tarwe"  WS_BACK '(solid, "wheat4")'
+                "Donkergrijs"  WS_BACK '(solid, "#333340")'
+                "Wijnrood" WS_BACK '(solid, "#400020")'
+        "Effen" END
+        "Kleurverloop" MENU
+		"Zonsondergang" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
+		"Lucht" WS_BACK '(vgradient, blue4, white)'
+		"Blauwtinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
+		"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
+	    	"Purpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
+		"Tarwetinten" WS_BACK '(vgradient, "#a09060", "#302010")'
+		"Grijstinten" WS_BACK '(vgradient, "#636380", "#131318")'
+		"Wijnroodtinten" WS_BACK '(vgradient, "#600040", "#180010")'
+        "Kleurverloop" END
+        "Afbeeldingen" MENU
+            "Getegeld" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
+            "Geschaald" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
+            "Gecentreerd" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
+            "Gemaximaliseerd" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -a
+            "Opgevuld" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -f
+        "Afbeeldingen" END
+"Achtergrond" END

WindowMaker/menu.fi.in

@@ -53,7 +53,7 @@
  *	// it in current position
  *	OPEN_MENU file.menu
  *   2. Pipe menu handling.
- *	// opens command and uses it's stdout to construct menu.
+ *	// opens command and uses its stdout to construct menu.
  *	// Command's output must be a valid menu description.
  *	// The space between '|' and command itself is optional.
  *	OPEN_MENU | command

WindowMaker/menu.fy.in

@@ -5,7 +5,7 @@
  *
  * <Titel> [SHORTCUT <Fluchtoets>] <Kommando> <Parameters>
  *
- * <Titel> is elke tekenrige te brûken as titel. Moat tusken " stean as it
+ * <Titel> is elke tekenrige te brûken as titel. Moat tusken " stean at it
  * 	spaasjes hat.
  *
  * SHORTCUT jout in fluchtoets op foar dy yngong. <Fluchtoets> hat
@@ -39,12 +39,12 @@
  *		       miniaturisearre, oprôle of ferburgen). Bewaret teffens de aktuele
  *		       wurkromte fan 'e brûker. Alles sil wersteld wurde by elke
  *		       start fan windowmaker, oant in oare SAVE_SESSION of
- *		       CLEAR_SESSION brûkt wurdt. As SaveSessionOnExit = Yes; yn
+ *		       CLEAR_SESSION brûkt wurdt. At SaveSessionOnExit = Yes; yn
  *		       it WindowMaker-domeinbestân, dan wurdt bewarjen automatysk
  *		       dien by elke windowmaker-ôfsluting, en wurdt in
  *		       SAVE_SESSION of CLEAR_SESSION oerskreaun (sjoch hjirnei).
  *	CLEAR_SESSION - wisket in earder bewarre sesje. Dit sil gjin
- *		       effekt hawwe as SaveSessionOnExit is True.
+ *		       effekt hawwe at SaveSessionOnExit is True.
  *	INFO - toant it Ynfopaniel
  *
  * OPEN_MENU-opmaak:
@@ -56,7 +56,7 @@
  *	// iepenet kommando en brûkt syn 'stdout' om in menu oan te meitsjen.
  *	// Kommando-output moat in jildige menubeskriuwing wêze.
  *	// De romte tusken '|' en it kommando sels is opsjoneel.
- *      // Brûk '||' yn plak fan '|' as jo it menu altiten bywurkje wolle
+ *      // Brûk '||' yn plak fan '|' at jo it menu altiten bywurkje wolle
  *	// by iepenjen. Dat soe traach wurkje kinne.
  *	OPEN_MENU | kommando
  *      OPEN_MENU || kommando
@@ -74,6 +74,11 @@
  * 			-noext 	lit alles fan 'e lêste punt yn 'e
  *				bestânsnamme ôf wei
  *
+ *      // Brûk #usergnusteppath# as tydlike oantsjutting foar it paad nei de
+ *      // brûkers-GNUstep-map.  Window Maker sil dy ferfange mei de wearde
+ *      // fan WMAKER_USER_ROOT, at dizze omjouwingsfariabele ynsteld is, of
+ *      // oars "~/GNUstep"
+ *
  * <Parameters> is it út te fieren programma.
  *
  * ** Kommandorigelopsjes yn EXEC:
@@ -179,37 +184,7 @@
 		"Beskoattelje" EXEC xlock -allowroot -usefirst
 	"Kommando's" END
 
-	"Uterlik" MENU
+	"Uterlik" OPEN_MENU "appearance.menu.fy"
-		"Tema's" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
-		"Stilen" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
-		"Ikoanesets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
-		"Eftergrûn" MENU
-			"Effen" MENU
-				"Swart" WS_BACK '(solid, black)'
-				"Blau"  WS_BACK '(solid, "#505075")'
-				"Indigo" WS_BACK '(solid, "#243e6c")'
-				"Marineblau" WS_BACK '(solid, "#224477")'
-				"Poarper" WS_BACK '(solid, "#554466")'
-				"Weet"  WS_BACK '(solid, "wheat4")'
-				"Donkergriis"  WS_BACK '(solid, "#333340")'
-				"Wynread" WS_BACK '(solid, "#400020")'
-				"Effen" END
-			"Kleurferrin" MENU
-				"Sinneûndergong" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
-				"Loft" WS_BACK '(vgradient, blue4, white)'
-    			"Blautinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
-				"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
-			    "Poarpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
-    			"Weettinten" WS_BACK '(vgradient, "#a09060", "#302010")'
-    			"Griistinten" WS_BACK '(vgradient, "#636380", "#131318")'
-    			"Wynreadtinten" WS_BACK '(vgradient, "#600040", "#180010")'
-			"Kleurferrin" END
-			"Ofbyldingen" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
-		"Eftergrûn" END
-		"Tema bewarje" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Temanamme,Fier bestânsnamme yn:)"
-		"Ikoaneset bewarje" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikoanesetnamme,Fier bestânsnamme yn:)"
-		"Foarkarrehelpmiddel" EXEC #wprefs#
-	"Uterlik" END
 
 	"Sesje" MENU
 		"Sesje bewarje" SAVE_SESSION

WindowMaker/menu.he

@@ -45,7 +45,7 @@
  *	// it in current position
  *	OPEN_MENU file.menu
  *   2. Pipe menu handling.
- *	// opens command and uses it's stdout to construct menu.
+ *	// opens command and uses its stdout to construct menu.
  *	// Command's output must be a valid menu description.
  *	// The space between '|' and command itself is optional.
  *	OPEN_MENU | command

WindowMaker/menu.hr

@@ -45,7 +45,7 @@
  *	// it in current position
  *	OPEN_MENU file.menu
  *   2. Pipe menu handling.
- *	// opens command and uses it's stdout to construct menu.
+ *	// opens command and uses its stdout to construct menu.
  *	// Command's output must be a valid menu description.
  *	// The space between '|' and command itself is optional.
  *	OPEN_MENU | command

WindowMaker/menu.in

@@ -74,6 +74,11 @@
  * 			-noext 	strip whatever is after the last dot in the
  *				file name
  *
+ *      // Use #usergnusteppath# as a placeholder for the path to the user
+ *      // GNUstep directory.  Window Maker will replace this with the value
+ *      // of WMAKER_USER_ROOT, if this environment variable is set, or
+ *      // "~/GNUstep" otherwise
+ *
  * <Parameters> is the program to execute.
  *
  * ** Options for command line in EXEC:
@@ -179,37 +184,7 @@
 		"Lock" EXEC xlock -allowroot -usefirst
 	"Commands" END
 
-	"Appearance" MENU
+	"Appearance" OPEN_MENU "appearance.menu"
-		"Themes" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
-		"Styles" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
-		"Icon Sets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
-		"Background" MENU
-			"Solid" MENU
-				"Black" WS_BACK '(solid, black)'
-				"Blue"  WS_BACK '(solid, "#505075")'
-				"Indigo" WS_BACK '(solid, "#243e6c")'
-				"Bluemarine" WS_BACK '(solid, "#224477")'
-				"Purple" WS_BACK '(solid, "#554466")'
-				"Wheat"  WS_BACK '(solid, "wheat4")'
-				"Dark Gray"  WS_BACK '(solid, "#333340")'
-				"Wine" WS_BACK '(solid, "#400020")'
-				"Solid" END
-			"Gradient" MENU
-				"Sunset" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
-				"Sky" WS_BACK '(vgradient, blue4, white)'
-    			"Blue Shades" WS_BACK '(vgradient, "#7080a5", "#101020")'
-				"Indigo Shades" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
-			    "Purple Shades" WS_BACK '(vgradient, "#654c66", "#151426")'
-    			"Wheat Shades" WS_BACK '(vgradient, "#a09060", "#302010")'
-    			"Grey Shades" WS_BACK '(vgradient, "#636380", "#131318")'
-    			"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
-			"Gradient" END
-			"Images" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
-		"Background" END
-		"Save Theme" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
-		"Save IconSet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
-		"Preferences Utility" EXEC #wprefs#
-	"Appearance" END
 
 	"Session" MENU
 		"Save Session" SAVE_SESSION

WindowMaker/menu.nl.in

@@ -74,6 +74,11 @@
  * 			-noext 	laat alles vanaf de laatste punt in de
  *				bestandsnaam weg
  *
+ *      // Gebruik #usergnusteppath# als tijdelijke aanduiding voor het pad naar de
+ *      // gebruikers-GNUstep-map.  Window Maker zal die vervangen met de waarde
+ *      // van WMAKER_USER_ROOT, als deze omgevingsvariabele is ingesteld, of
+ *      // anders "~/GNUstep"
+ *
  * <Parameters> is het uit te voeren programma.
  *
  * ** Commandoregelopties in EXEC:
@@ -179,37 +184,7 @@
 		"Vergrendelen" EXEC xlock -allowroot -usefirst
 	"Commando's" END
 
-	"Uiterlijk" MENU
+	"Uiterlijk" OPEN_MENU "appearance.menu.nl"
-		"Thema's" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
-		"Stijlen" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
-		"Iconensets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
-		"Achtergrond" MENU
-			"Effen" MENU
-				"Zwart" WS_BACK '(solid, black)'
-				"Blauw"  WS_BACK '(solid, "#505075")'
-				"Indigo" WS_BACK '(solid, "#243e6c")'
-				"Marineblauw" WS_BACK '(solid, "#224477")'
-				"Purper" WS_BACK '(solid, "#554466")'
-				"Tarwe"  WS_BACK '(solid, "wheat4")'
-				"Donkergrijs"  WS_BACK '(solid, "#333340")'
-				"Wijnrood" WS_BACK '(solid, "#400020")'
-				"Effen" END
-			"Kleurverloop" MENU
-				"Zonsondergang" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
-				"Lucht" WS_BACK '(vgradient, blue4, white)'
-    			"Blauwtinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
-				"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
-			    "Purpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
-    			"Tarwetinten" WS_BACK '(vgradient, "#a09060", "#302010")'
-    			"Grijstinten" WS_BACK '(vgradient, "#636380", "#131318")'
-    			"Wijnroodtinten" WS_BACK '(vgradient, "#600040", "#180010")'
-			"Kleurverloop" END
-			"Afbeeldingen" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
-		"Achtergrond" END
-		"Thema opslaan" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Themanaam,Voer bestandsnaam in:)"
-		"Iconenset opslaan" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Iconensetnaam,Voer bestandsnaam in:)"
-		"Voorkeurenhulpmiddel" EXEC #wprefs#
-	"Uiterlijk" END
 
 	"Sessie" MENU
 		"Sessie opslaan" SAVE_SESSION

WindowMaker/menu.ro.in

@@ -53,7 +53,7 @@
  *	// it in current position
  *	OPEN_MENU file.menu
  *   2. Pipe menu handling.
- *	// opens command and uses it's stdout to construct menu.
+ *	// opens command and uses its stdout to construct menu.
  *	// Command's output must be a valid menu description.
  *	// The space between '|' and command itself is optional.
  *	OPEN_MENU | command

WindowMaker/menu.sl

@@ -53,7 +53,7 @@
  *	// it in current position
  *	OPEN_MENU file.menu
  *   2. Pipe menu handling.
- *	// opens command and uses it's stdout to construct menu.
+ *	// opens command and uses its stdout to construct menu.
  *	// Command's output must be a valid menu description.
  *	// The space between '|' and command itself is optional.
  *	OPEN_MENU | command

WindowMaker/menu.zh_CN

@@ -53,7 +53,7 @@
  *	// it in current position
  *	OPEN_MENU file.menu
  *   2. Pipe menu handling.
- *	// opens command and uses it's stdout to construct menu.
+ *	// opens command and uses its stdout to construct menu.
  *	// Command's output must be a valid menu description.
  *	// The space between '|' and command itself is optional.
  *	OPEN_MENU | command

WindowMaker/menu.zh_TW.in

@@ -52,7 +52,7 @@
  *	// it in current position
  *	OPEN_MENU file.menu
  *   2. Pipe menu handling.
- *	// opens command and uses it's stdout to construct menu.
+ *	// opens command and uses its stdout to construct menu.
  *	// Command's output must be a valid menu description.
  *	// The space between '|' and command itself is optional.
  *	OPEN_MENU | command

WindowMaker/plmenu.fy.in

@@ -64,37 +64,7 @@
   ("Fernije", REFRESH),
   ("Beskoattelje", EXEC, "xlock -allowroot -usefirst")
  ),
- ("Uterlik",
+ ("Uterlik", OPEN_MENU, "appearance.menu.fy"),
-  ("Tema's", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-  ("Stilen", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-  ("Ikoanesets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-  ("Eftergrûn",
-   ("Effen",
-	("Swart", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
-	("Blau",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
-	("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
-	("Marineblau", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
-	("Poarper", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
-	("Weet", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
-	("Donkergriis", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
-	("Wynread", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
-   ),
-   ("Kleurferrin",
-	("Sinneûndergong", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
-	("Loft", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
-	("Blautinten",     EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
-	("Indigotinten",    EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
-	("Poarpertinten",    EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
-	("Weettinten",     EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
-	("Griistinten",     EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-	("Wynreadtinten",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-   ),
-   ("Ofbyldingen", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-   ),
-   ("Tema bewarje", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Temanamme)\""),
-   ("Ikoaneset bewarje", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikoanesetnamme)\""),
-   ("Foarkarrehelpmiddel", EXEC, "#wprefs#")
-   ),
    ("Sesje",
     ("Sesje bewarje", SAVE_SESSION),
     ("Sesje wiskje", CLEAR_SESSION),

WindowMaker/plmenu.in

@@ -64,37 +64,7 @@
   ("Refresh", REFRESH),
   ("Lock", EXEC, "xlock -allowroot -usefirst")
  ),
- ("Appearance",
+ ("Appearance", OPEN_MENU, "appearance.menu"),
-  ("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-  ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-  ("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-  ("Background",
-   ("Solid",
-	("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
-	("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
-	("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
-	("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
-	("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
-	("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
-	("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
-	("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
-   ),
-   ("Gradient",
-	("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
-	("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
-	("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
-	("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
-	("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
-	("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
-	("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-	("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-   ),
-   ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-   ),
-   ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-   ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-   ("Preferences Utility", EXEC, "#wprefs#")
-   ),
    ("Session",
     ("Save Session", SAVE_SESSION),
     ("Clear Session", CLEAR_SESSION),

WindowMaker/plmenu.nl.in

@@ -64,37 +64,7 @@
   ("Vernieuwen", REFRESH),
   ("Vergrendelen", EXEC, "xlock -allowroot -usefirst")
  ),
- ("Uiterlijk",
+ ("Uiterlijk", OPEN_MENU, "appearance.menu.nl"),
-  ("Thema's", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-  ("Stijlen", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-  ("Iconensets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-  ("Achtergrond",
-   ("Effen",
-	("Zwart", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
-	("Blauw",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
-	("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
-	("Marineblauw", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
-	("Purper", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
-	("Tarwe", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
-	("Donkergrijs", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
-	("Wijnrood", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
-   ),
-   ("Kleurverloop",
-	("Zonsondergang", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
-	("Lucht", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
-	("Blauwtinten",     EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
-	("Indigotinten",    EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
-	("Purpertinten",    EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
-	("Tarwetinten",     EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
-	("Grijstinten",     EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-	("Wijnroodtinten",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-   ),
-   ("Afbeeldingen", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-   ),
-   ("Thema opslaan", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Themanaam)\""),
-   ("Iconenset opslaan", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconensetnaam)\""),
-   ("Voorkeurenhulpmiddel", EXEC, "#wprefs#")
-   ),
    ("Sessie",
     ("Sessie opslaan", SAVE_SESSION),
     ("Sessie wissen", CLEAR_SESSION),

WindowMaker/wmmacros.in

@@ -19,12 +19,6 @@
 #define CLEARROOT xsetroot
 
 
-/*
- * SETSTYLE FILE - loads a style file 
- */
-#define SETSTYLE EXEC cd $HOME/GNUstep/Library/WindowMaker/Styles; setstyle 
-
-
 /*
  *
  * MANUAL_SEARCH(ITEM) - search manual page for ITEM
@@ -61,6 +55,10 @@
 #define ICON_SETS_DIR		#wmdatadir#/IconSets
 #define BACKGROUNDS_DIR		#wmdatadir#/Backgrounds
 
+#define USER_THEMES_DIR         #usergnusteppath#/Library/WindowMaker/Themes
+#define USER_STYLES_DIR         #usergnusteppath#/Library/WindowMaker/Styles
+#define USER_ICON_SETS_DIR      #usergnusteppath#/Library/WindowMaker/IconSets
+#define USER_BACKGROUNDS_DIR    #usergnusteppath#/Library/WindowMaker/Backgrounds
 
 #define StaticGray		0
 #define GrayScale		1

checkpatch.pl

@@ -2419,8 +2419,10 @@ sub process {
 
 # function brace can't be on same line, except for #defines of do while,
 # or if closed on same line
-		if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
+		if ($line =~ /$Type\s*$Ident\s*$balanced_parens\s*\{/ &&
-		    !($line=~/\#\s*define.*do\s{/) and !($line=~/}/)) {
+		    $line !~ /\#\s*define\b.*do\s*\{/ &&
+		    $line !~ /}/) {
+
 			ERROR("OPEN_BRACE",
 			      "open brace '{' following function declarations go on the next line\n" . $herecurr);
 		}
@@ -2847,12 +2849,12 @@ sub process {
 
 
 #need space before brace following if, while, etc
-		if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||
+		if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
-		    $line =~ /do{/) {
+		    $line =~ /\b(?:else|do)\{/) {
 			if (ERROR("SPACING",
 				  "space required before the open brace '{'\n" . $herecurr) &&
 			    $fix) {
-				$fixed[$linenr - 1] =~ s/^(\+.*(?:do|\))){/$1 {/;
+				$fixed[$linenr - 1] =~ s/^(\+.*(?:do|else|\)))\{/$1 {/;
 			}
 		}
 
@@ -3198,7 +3200,7 @@ sub process {
 			    $dstat !~ /^for\s*$Constant$/ &&				# for (...)
 			    $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&	# for (...) bar()
 			    $dstat !~ /^do\s*{/ &&					# do {...
-			    $dstat !~ /^\({/ &&						# ({...
+			    $dstat !~ /^\(\{/ &&					# ({...
 			    $ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
 			{
 				$ctx =~ s/\n*$//;

configure.ac

@@ -34,14 +34,14 @@ AC_PREREQ([2.69])
 
 dnl Configuration for Autoconf and Automake
 dnl =======================================
-AC_INIT([WindowMaker],[0.95.8],[wmaker-dev@lists.windowmaker.org],[WindowMaker],[http://www.windowmaker.org/])
+AC_INIT([WindowMaker],[0.95.9],[wmaker-dev@googlegroups.com],[WindowMaker],[http://www.windowmaker.org/])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
 dnl We need the EXTRA_xxx_DEPENDENCIES keyword in Makefiles which have been
 dnl introduced in the version 1.11.3; because the 1.12 was realeased shortly
 dnl after, we just ask for it
-AM_INIT_AUTOMAKE([1.12 silent-rules])
+AM_INIT_AUTOMAKE([1.12 silent-rules -Wno-portability])
 
 dnl Reference file used by 'configure' to make sure the path to sources is valid
 AC_CONFIG_SRCDIR([src/WindowMaker.h])
@@ -232,6 +232,18 @@ AS_IF([test "x$debug" = "xyes"],
 ])
 
 
+dnl To upload documentation to the Website
+dnl ======================================
+AC_ARG_WITH([web-repo],
+    [AS_HELP_STRING([--with-web-repo=PATH], [path to your git repository for the Web home page (maintainer stuff)])],
+    [AS_CASE([$withval],
+        [yes], [AC_MSG_ERROR([bad value '$withval' for --with-web-repo, expected a path]) ],
+        [no],  [WEB_REPO_ROOT=""],
+        [WEB_REPO_ROOT=$withval])],
+    [WEB_REPO_ROOT=""])
+WM_CHECK_WEBREPODIR
+
+
 dnl Support for Nested Functions by the compiler
 dnl ============================================
 WM_PROG_CC_NESTEDFUNC
@@ -284,18 +296,14 @@ _bindir=`eval echo $_bindir`
 _libdir=`eval echo $libdir`
 _libdir=`eval echo $_libdir`
 
-lib_search_path='-L${libdir}'
-
-inc_search_path='-I${includedir}'
-
 dnl ===============================================
 dnl Specify paths to look for libraries and headers
 dnl ===============================================
 AC_ARG_WITH(libs-from, AS_HELP_STRING([--with-libs-from], [pass compiler flags to look for libraries]),
-	[lib_search_path="$withval $lib_search_path"])
+	[lib_search_path="$withval"], [lib_search_path='-L${libdir}'])
 
 AC_ARG_WITH(incs-from, AS_HELP_STRING([--with-incs-from], [pass compiler flags to look for header files]),
-	[inc_search_path="$withval $inc_search_path"])
+	[inc_search_path="$withval"], [inc_search_path='-I${includedir}'])
 
 
 dnl Features Configuration
@@ -370,7 +378,7 @@ AC_SEARCH_LIBS([strerror], [cposix])
 dnl nanosleep is generally available in standard libc, although not always the
 dnl case. One known example is Solaris which needs -lrt
 AC_SEARCH_LIBS([nanosleep], [rt], [],
-    [AC_MSG_ERROR([function 'nanosleep' not found, please report to wmaker-dev@lists.windowmaker.org])])
+    [AC_MSG_ERROR([function 'nanosleep' not found, please report to wmaker-dev@googlegroups.com])])
 
 dnl the flag 'O_NOFOLLOW' for 'open' is used in WINGs
 WM_FUNC_OPEN_NOFOLLOW
@@ -459,12 +467,7 @@ dnl that the gettext environment works
 WM_I18N_LANGUAGES
 WM_I18N_XGETTEXT
 WM_I18N_MENUTEXTDOMAIN
-
+WM_LIBRARY_CONSTRUCTORS
-dnl 2014/12/29: The option is deprecated, we should keep this message for at
-dnl least 2 years to ensure users see it and update their build scripts
-AC_ARG_WITH([nlsdir], [],
-    [AC_MSG_ERROR([option '--with-nlsdir' is deprecated, please use autoconf's standard '--localedir' instead])])
-
 
 dnl ===========================================
 dnl 		Stuff that uses X
@@ -474,7 +477,7 @@ AC_PATH_XTRA
 
 AS_IF([test "x$no_x" = "xyes"],
     [AC_MSG_ERROR([The path for the X11 files not found!
-Make sure you have X and it's headers and libraries (the -devel packages
+Make sure you have X and its headers and libraries (the -devel packages
 in Linux) installed.])])
 
 X_LIBRARY_PATH=$x_libraries
@@ -624,72 +627,36 @@ AC_SUBST(FCLIBS)
 
 dnl Xft2 antialiased font support
 dnl =============================
+m4_define([XFT_MIN_VERSION], [2.1.0])
+PKG_CHECK_MODULES([XFT], [xft >= ]XFT_MIN_VERSION,
+    [], dnl Module found, nothing to do
+    [XFT_CFLAGS=failed])
+AS_IF([test "x$XFT_CFLAGS" = "xfailed"],
+    [dnl pkg-config did not find it, try the legacy method
+     AC_CHECK_PROG([XFTCONFIG], [xft-config], [xft-config])
+     AS_IF([test -z "$XFTCONFIG"],
+         [AC_MSG_ERROR([libXft2 is not installed, is too old or could not be found -- $XFT_PKG_ERRORS]) ])
+     XFT_LIBS=`$XFTCONFIG --libs`
+     XFT_CFLAGS=`$XFTCONFIG --cflags`
+     WM_CHECK_XFT_VERSION(XFT_MIN_VERSION,
+         [], dnl Version is ok, nothing to do
+         [AC_MSG_ERROR([Version of libXft is too old, consider upgrading to] XFT_MIN_VERSION [or newer]) ])
+    ])
+AC_SUBST(XFT_CFLAGS)
+AC_SUBST(XFT_LIBS)
 
-xft=yes
-XFTLIBS=""
-
-if test "x$PKG_CONFIG" != x -a "`$PKG_CONFIG xft; echo $?`" = 0; then
-        XFTCONFIG="$PKG_CONFIG xft"
-        pkgconfig_xft=yes
-else
-        AC_CHECK_PROG(XFTCONFIG, xft-config, xft-config)
-fi
-
-AC_MSG_CHECKING([for the Xft2 library])
-
-if test "x$XFTCONFIG" != x; then
-        XFTLIBS=`$XFTCONFIG --libs`
-        XFTFLAGS=`$XFTCONFIG --cflags`
-        AC_MSG_RESULT([found])
-else
-        AC_MSG_RESULT([not found])
-        echo
-        echo "ERROR!!! libXft2 is not installed or could not be found."
-        echo "         Xft2 is a requirement for building Window Maker."
-        echo "         Please install it (along with fontconfig) before continuing."
-        echo
-        exit 1
-fi
-
-minXFT="2.1.0"
-goodxft="no"
-
-dnl
-dnl The macro below will use $XFTFLAGS (defined above) to find Xft.h
-dnl
-WM_CHECK_XFT_VERSION($minXFT, goodxft=yes, goodxft=no)
-
-if test "$goodxft" = no; then
-        echo
-        echo "ERROR!!! libXft on this system is an old version."
-        echo "         Please consider upgrading to at least version ${minXFT}."
-        echo
-        exit 1
-fi
-
-AC_SUBST(XFTFLAGS)
-AC_SUBST(XFTLIBS)
 
 dnl PANGO support
 dnl =============
-pango=no
+dnl The libray can be used by WINGs to get better support on UTF-8 for i18n
-AC_ARG_ENABLE(pango, AS_HELP_STRING([--enable-pango], [enable Pango text layout support]),
+AC_ARG_ENABLE([pango],
-                pango=$enableval, pango=no)
+    [AS_HELP_STRING([--disable-pango], [disable Pango text layout support @<:@default=auto@:>@])],
+    [AS_CASE([$enableval],
+        [yes|no], [],
+        [AC_MSG_ERROR([bad value $enableval for --disable-pango])] )],
+    [enable_pango=auto])
+WM_CHECK_LIBPANGO
 
-PANGOFLAGS=
-PANGOLIBS=
-if test "$pango" = yes; then
-	PANGOLIBS=`$PKG_CONFIG pangoxft --libs`
-	PANGOFLAGS=`$PKG_CONFIG pangoxft --cflags`
-	if test "x$PANGOLIBS" = "x" ; then
-	        AC_MSG_RESULT([not found])
-	else
-		AC_DEFINE(USE_PANGO, 1, [Define if Pango is to be used])
-		AC_MSG_RESULT([found])
-	fi
-fi
-inc_search_path="$inc_search_path $PANGOFLAGS"
-AC_SUBST(PANGOLIBS)
 
 dnl ==============================================
 dnl         Graphic Format Libraries
@@ -916,7 +883,7 @@ AC_CONFIG_FILES(
     Makefile
 
     dnl WRaster Library
-    wrlib/Makefile
+    wrlib/Makefile wrlib/po/Makefile
     wrlib/tests/Makefile
 
     dnl WINGs toolkit
@@ -961,9 +928,10 @@ echo "Supported core features:            :$supported_core"
 echo "Supported X extensions:             :$supported_xext"
 echo "Supported graphic format libraries  :$supported_gfx"
 echo "Unsupported features                :$unsupported"
-echo "Antialiased text support in WINGs   : $xft"
 echo "Pango text layout support in WINGs  : $pango"
 echo "Translated languages to support     :$supported_locales"
+AS_IF([test "x$WEB_REPO_ROOT" != "x"],
+    [AS_ECHO(["Git repository for WMaker's Website : $WEB_REPO_ROOT"]) ])
 AS_IF([test "x$debug" = "xyes"],
     [AS_ECHO(["Debug enabled: CFLAGS = $CFLAGS"]) ])
 echo
@@ -988,6 +956,15 @@ AS_IF([test "x$enable_jpeg" = xno], [dnl
     AS_ECHO(["WARNING   WARNING   WARNING   WARNING   WARNING   WARNING   WARNING"])dnl
 ])
 
+AS_IF([test "x$LINGUAS" != "x"],
+    [AS_IF([test "X$wm_cv_library_constructors" = "Xlegacy"],
+        [AC_MSG_WARN([I18N is enabled, but library constructor attribute is not supported])
+         AS_ECHO(["   If you have translation problems in lib WRaster, yet you know that the translation"])
+         AS_ECHO(["   file (po) is valid, this could be a cause."])
+         AS_ECHO([])dnl
+        ])dnl
+    ])
+
 
 dnl This is for Emacs.  I'm lazy, I know... (nicolai)
 dnl ================================================

debian/README.Debian

@@ -1,254 +0,0 @@
-Window Maker for DEBIAN
-=======================
-
-This is Debian GNU/Linux's prepackaged version of Window Maker, yet
-another window manager, written mostly from scratch by Alfredo Kojima
-in an attempt to provide as much of the useful OpenStep functionality
-as possible under X11.  It is the natural step after AfterStep.
-
-There are some changes in the paths, added support for Debian menu
-system, improved user configuration (from the sysadmin point of view).
- 
-To run Window Maker put this at the end of ~/.xsession:
-
-exec /usr/bin/wmaker
-
-and remove other exec lines if present.  I have done my best to
-overcome certain glitches and gotchas regarding Window Maker
-installation. /usr/bin/wmaker is a shell script that tries to
-make sure things are properly set up.  Take a look at it to see what's
-going on.  Please read wmaker(1).
-
-
-Other sources for documentation
--------------------------------
-
-* The Window Maker web site
-  http://www.windowmaker.org/
-
-  You can find all sorts of information here. It's kept very up to
-  date.
-
-* The Window Maker manual written by Alfredo Kojima
-  ftp://ftp.windowmaker.org/pub/wmaker/docs/
-
-  Please note the manual documents version 0.10.x of Window Maker, and
-  many features/changes have occurred since then.  To find out what has
-  changed, please read file:/usr/share/doc/wmaker/NEWS.gz and
-  file:/usr/share/doc/wmaker/changelog.gz.  A new version of this manual is
-  being developed.  If you want to contribute to the manual please
-  contact wm-user@windowmaker.info
-
-* The Window Maker mailing list
-  http://www.windowmaker.org/lists.php
-
-  There's a Window Maker mailing list.  There you can ask questions about
-  Window Maker and *related* applications (s/n is _way_ low nowadays
-  due to unrelated discussions).
-
-  Please read the archives before asking!
-
-* The Window Maker FAQ
-  http://www.dpo.uab.edu/~grapeape/wmfaq.html
-
-  This is NOT file:/usr/share/doc/wmaker/FAQ.gz, but another document.
-  It contains information about several aspects of Window Maker that are
-  not covered on the FAQ included alongside with this Readme.
-
-* The Window Maker Configuration documents
-  ftp://ftp.windowmaker.info/pub/wmaker/docs/WindowMaker-*-Config.txt.gz
-
-  This documents the files found on ~/GNUstep/Defaults/. It's kept as
-  up to date as possible.
-
-As a sidenote, I can't package these files with wmaker because they
-don't have a copyright statement that permits redistribution.
-
-
-IF YOU ARE UPGRADING FROM 0.6.3 or earlier
-------------------------------------------
-
-  * The directory name has changed form gnustep to GNUstep
-  * The format of the style files and Window Maker file has
-    changed.
-
-IF YOU ARE UPGRADING FROM 0.14.1 or earlier (but newer than 0.6.3)
-------------------------------------------------------------------
-
-  * The Fiend has been renamed to Clip (in order to avoid hurting
-    certain people's feelings... does that ring a bell or
-    what?!?).  Look up "Fiend" in the dictionary... therefore, every
-    keyword on Defaults/WindowMaker that says "Fiend" has to be
-    replaced by "Clip".  The installation package tries to fix this
-    globally, i.e, both in the system wide files and the user's files.
-  * The ~/GNUstep/Library/WindowMaker/Style directory is no longer
-    called that, but "Styles" instead.  Update accordingly.  The wrapper
-    script tries to be smart about this...
-
-IF YOU ARE UPGRADING FROM 0.15.0 or earlier
--------------------------------------------
-
-  * WindowPlaceOrigin syntax changed. The old was:
-      WindowPlaceOrigin = "64, 64"
-    The new one is:
-      WindowPlaceOrigin = (64, 64)
-    The installation package also fixes this.
-
-IF YOU ARE UPGRADING FROM 0.17.3 or earlier
--------------------------------------------
-
-  * Please note there's a new Icons directory under ~/GNUstep/Library,
-    and a new key IconPath. Read the section on paths.
-
-IF YOU ARE UPGRADING FROM 0.17.5 or earlier
--------------------------------------------
-
-  * Pandora's Box has been opened: Beware that some features of recent
-    releases may not be compatible with those of 0.17.5; PLEASE read
-    the NEWS file and the ChangeLog.  If you don't have problems
-    upgrading, consider it a gift from the gods.  PLEASE NOTE: WPrefs
-    is a work in progress.  SAVE YOUR CONFIGURATION. READ THE READMEs.
-  * Please note that WPrefs' Menu Guru REQUIRES a menu in "Property
-    List" format to work properly.  It's very likely that you have an
-    old format menu.  There's a script called wm-oldmenu2new alongside
-    this file that converts your menu to the new format.  It's a hack,
-    it won't be installed anywhere else.
-
-
-Debian specific notes
----------------------
-
-Debian prepackaged version of Window Maker will search
-~/GNUstep/Library/WindowMaker and /usr/share/WindowMaker (in that order)
-for its configuration files. It will read defaults from files in
-~/GNUstep/Defaults and /etc/GNUstep/Defaults. The files in the
-WindowMaker directories have cpp-like format and are preprocessed by
-WindowMaker. It will read both WindowMaker directories searching for
-#included files.
-
-WindowMaker makes a (little) difference between Pixmaps and Icons, and
-there are two configurable options for setting the paths Window Maker
-would search Pixmaps and Icons in, namely, PixmapPath and
-IconPath. The compiled in defaults are:
-
-  PixmapPath = (
-    "~/GNUstep/Library/WindowMaker/Pixmaps",
-    "~/GNUstep/Library/WindowMaker/Backgrounds",
-    "/usr/local/share/WindowMaker/Pixmaps",
-    "/usr/local/share/WindowMaker/Backgrounds",
-    "/usr/share/WindowMaker/Backgrounds",
-    "/usr/share/WindowMaker/Pixmaps",
-    "/usr/local/share/pixmaps",
-    "/usr/share/pixmaps",
-  );
-
-  IconPath = (
-    "~/GNUstep/Library/Icons",
-    "/usr/local/share/WindowMaker/Icons",
-    "/usr/share/WindowMaker/Icons",
-    "/usr/local/share/icons",
-    "/usr/share/icons",
-  );
-
-Please note that the internal default doesn't include the "Pixmaps"
-paths anymore, but you are free to modify your Window Maker file in any
-way you see fit.
-
-Other Window Maker packages should put pixmaps in
-/usr/share/WindowMaker/Pixmaps and icons in
-/usr/share/WindowMaker/Icons, ONLY.
-
-The structure Window Maker tries to use is like this:
-
-GNUstep
-  +.AppInfo
-  +Defaults
-  +Library
-     +WindowMaker
-        + Backgrounds [*]
-        + IconSets [*]
-        + Pixmaps
-        + Sounds
-        + Styles [*]
-        + Themes [*]
-     +Icons
-
-Please note Icons are not considered Window Maker-only resources.
-
-[*] these directories are OPEN_MENU'ed WITH the right
-application. That means you can put the *file* "Great Debian Theme" on
-Themes, it will show up in the menu, and will be opened using
-setstyle, which installs it, i.e., sets that theme as the current
-theme.
-
-If you don't like the arrangement of the Appearance menu, you can put
-a file "appearance.menu" in ~/GNUstep/Library/WindowMaker, and it will
-override the default one. Look at /etc/GNUstep/Defaults/appearance.menu
-for an example.
-
-Shortcuts
----------
-
-Thanks to a suggestion, there's support for Shortcuts.  If you want to
-have Shift F1 launch an XTerm, you can:
-
-$ cp /usr/lib/menu/xterm /etc/menu
-$ sensible-editor /etc/menu/xterm
-
-add:
-
-        shortcut=Shift+F1
-
-and run update-menus.
-
-Sound Support
--------------
-
-This version of Window Maker is compiled with sound support. The sound
-server is available as a separate package, but may not be in sync with
-the current release.
-
-Changing the menus (or "WPrefs segfaults when I click the cute menu icon")
---------------------------------------------------------------------------
-
-First of all, I have this urge to say that it doesn't segfault for
-me.  It gives me a nice warning about being unable to use my current
-menu.
-
-The problem is that wmaker now is capable of using a new type of menu,
-namely a PropList menu.  It looks something like this:
-
-(
-  Applications,
-  (Debian, OPEN_MENU, menu.hook),
-  (
-    WorkSpace,
-    (Appearance, OPEN_MENU, appearance.menu),
-    (Workspaces, WORKSPACE_MENU),
-    ("Arrange Icons", ARRANGE_ICONS),
-    ("Hide Others", HIDE_OTHERS),
-    ("Show All Windows", SHOW_ALL),
-    ("Clear Session", CLEAR_SESSION),
-    ("Save Session", EXEC, "")
-  ),
-  (About..., INFO_PANEL),
-  (Exit, SHUTDOWN)
-)
-
-That cute looking menu button (let's call it by its name: the Menu
-Guru) in WPrefs expects to find a menu in this format.  I considered
-changing the menu-method to something that spits out a menu in this
-format (it's quite easy) but there's a little tiny problem: see that
-line that reads "OPEN_MENU" in the example above... well, it happens
-that appearance.menu has to be in the old format.  That means that if
-I make the menu method produce a new style menu, that menu has to be
-the root menu.  And that is not a good idea (the reason is left as an
-exercise to the reader, take into account the people that aren't using
-menu.hook as the root menu in the first place).
-
-Still want to use WPrefs to edit you menu? Cut and paste the example
-above into ~/GNUstep/Defaults/WMRootMenu, start WPrefs, click the Menu
-Guru (the 9th icon, left to right).  Now go read the docs.  That's the
-reason they are there.
-
-Marcelo E. Magallon <mmagallo@debian.org>, Thr, 1 Apr 1999 18:47:30 -0600

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -1,194 +0,0 @@
-Source: wmaker
-Section: x11
-Priority: optional
-Maintainer: Debian Window Maker Team <pkg-wmaker-devel@lists.alioth.debian.org>
-Uploaders: Rodolfo García Peñas (kix) <kix@debian.org>,
-           Andreas Metzler <ametzler@debian.org>,
-           Doug Torrance <dtorrance@piedmont.edu>
-Standards-Version: 3.9.7
-Build-Depends: automake (>= 1:1.12),
-               debhelper (>= 9),
-               dh-autoreconf,
-               gettext,
-               libfontconfig1-dev,
-               libgif-dev,
-               libjpeg-dev,
-               libpng-dev,
-               libsm-dev,
-               libtiff-dev,
-               libtool,
-               libx11-dev,
-               libxext-dev,
-               libxft-dev,
-               libxinerama-dev,
-               libxkbfile-dev,
-               libxmu-dev,
-               libxpm-dev,
-               libxrandr-dev,
-               libxrender-dev,
-               libxt-dev,
-               sharutils
-Homepage: http://windowmaker.org/
-Vcs-Browser: https://anonscm.debian.org/git/pkg-wmaker/wmaker.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-wmaker/wmaker.git
-
-Package: wmaker
-Architecture: any
-Multi-Arch: foreign
-Depends: wmaker-common (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Provides: x-window-manager
-Suggests: desktop-base,
-          menu,
-          wmaker-data,
-          wmaker-utils,
-          x-terminal-emulator,
-          x11-apps
-Description: NeXTSTEP-like window manager for X
- Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
- very closely, and it is now an official GNU project. Window Maker (originally
- named WindowMaker) is not overloaded with features, and it is easier to
- configure than most other window managers. Its final goal is to produce a
- window manager that doesn't require editing of configuration files.
- Window Maker is fast and doesn't require tons of memory to run.
-
-Package: wmaker-common
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Suggests: wmaker
-Description: Window Maker - Architecture independent files
- Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
- very closely, and it is now an official GNU project. Window Maker (originally
- named WindowMaker) is not overloaded with features, and it is easier to
- configure than most other window managers. Its final goal is to produce a
- window manager that doesn't require editing of configuration files.
- Window Maker is fast and doesn't require tons of memory to run.
- .
- This package contains the architecture independent files.
-
-Package: wmaker-utils
-Architecture: any
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: wmaker (<< 0.95.7-6)
-Replaces: wmaker (<< 0.95.7-6)
-Description: Window Maker - Utilities
- Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
- very closely, and it is now an official GNU project. Window Maker (originally
- named WindowMaker) is not overloaded with features, and it is easier to
- configure than most other window managers. Its final goal is to produce a
- window manager that doesn't require editing of configuration files.
- Window Maker is fast and doesn't require tons of memory to run.
- .
- This package contains wxcopy and wxpaste, two utilities ordinarily shipped with
- Window Maker but not depending on it or any of its libraries.  These
- utilities allow users to interact with cut buffers on the command line.
-
-Package: libwraster-dev
-Architecture: any
-Multi-Arch: same
-Section: libdevel
-Depends: libc6-dev,
-         libgif-dev,
-         libjpeg-dev,
-         libpng-dev,
-         libtiff5-dev,
-         libwraster5 (= ${binary:Version}),
-         libx11-dev,
-         libxext-dev,
-         libxpm-dev,
-         ${misc:Depends}
-Breaks: libwraster3-dev
-Replaces: libwraster3-dev
-Description: Static libraries and headers of Window Maker rasterizer
- This library is used to manipulate images and convert them to
- a format that can be displayed through the X window system.
- Read the wraster.h header for an idea of what is available
- .
- Contains libwraster and header files, for manipulating and
- rasterizing images.
-
-Package: libwraster5
-Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Shared libraries of Window Maker rasterizer
- This library is used to manipulate images and convert them to
- a format that can be displayed through the X window system.
- Read the wraster.h header for an idea of what is available
-
-Package: libwings-dev
-Architecture: any
-Multi-Arch: same
-Section: libdevel
-Depends: libc6-dev,
-         libfontconfig1-dev,
-         libwings3 (= ${binary:Version}),
-         libwraster-dev,
-         libwutil5 (= ${binary:Version}),
-         libx11-dev,
-         libxext-dev,
-         libxft-dev,
-         ${misc:Depends}
-Description: Window Maker's own widget set
- WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
- look and feel. Its API is inspired in OpenSTEP and its
- implementation borrows some ideas from Tk. It has a reasonable set of
- widgets, sufficient for building small applications like a CDPlayer
- or hacking something like rxvt. It is used for basic widgets in
- the WindowMaker window manager.
-
-Package: libwutil5
-Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Window Maker's own widget set - utility library
- WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
- look and feel. Its API is inspired in OpenSTEP and its
- implementation borrows some ideas from Tk. It has a reasonable set of
- widgets, sufficient for building small applications like a CDPlayer
- or hacking something like rxvt. It is used for basic widgets in
- the WindowMaker window manager.
- .
- This package contains the libWUtils runtime library.
-
-Package: libwings3
-Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Window Maker's own widget set - runtime library
- WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
- look and feel. Its API is inspired in OpenSTEP and its
- implementation borrows some ideas from Tk. It has a reasonable set of
- widgets, sufficient for building small applications like a CDPlayer
- or hacking something like rxvt. It is used for basic widgets in
- the WindowMaker window manager.
- .
- This package contains the libWINGs runtime library.
-
-Package: libwmaker-dev
-Architecture: any
-Multi-Arch: same
-Section: libdevel
-Depends: libwmaker1 (= ${binary:Version}), libx11-dev, ${misc:Depends}
-Description: Static libraries and headers for Window Maker applications
- Window Maker is a NeXTSTEP-like window manager for X.
- .
- This package contains libWMaker and header files, for building
- Window Maker aware applications.
-
-Package: libwmaker1
-Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Runtime library for Window Maker applications
- Window Maker is a NeXTSTEP-like window manager for X.
- .
- This package contains the libWMaker runtime library for Window Maker
- aware applications.

debian/copyright

@@ -1,211 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: wmaker
-Upstream-Contact: Window Maker developers mailing list <wmaker-dev@lists.windowmaker.org>
-Source: http://repo.or.cz/w/wmaker-crm.git
-
-Files: *
-Copyright: 1991-1995 Free Software Foundation, Inc.
-	   1995 Spencer Kimball
-	   1995 Peter Mattis
-	   1995 Sun Microsystems, Inc.
-	   1996 Ben Wing
-	   1997 Shige Abe
-	   1997-2004, 2006 Alfredo Kengi Kojima <kojima@windowmaker.info>
-	   1998-2004, 2006 Dan Pascu
-	   1998 scottc
-	   1998 James Thompson
-	   1999-2000 Nwanua Elumeze
-	   2001-2016 Window Maker Team
-	   2008 Norayr Chilingaryan <chnorik@gmail.com>
-	   2008 Guido U. Draheim <guidod@gmx.de>
-	   2010-2011 Carlos R. Mafra <crmafra@gmail.com>
-	   2010 Tamas Tevesz <ice@extreme.hu>
-	   2011 Camille d'Alméras <camilledalmeras@yahoo.com>
-	   2012-2015 Christophe Curis
-	   2012 Daniel Déchelotte
-	   2012 Leandro Vital <leandro.vital@yahoo.com.br>
-License: GPL-2+
-
-Files: m4/ax_pthread.m4
-Copyright: 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-	   2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-License: GPL-3+
-
-Files: m4/ld-version-script.m4
-Copyright: 2008-2015 Free Software Foundation, Inc.
-License: FSFULLR
-
-Files: util/common.h wmlib/* wrlib/*
-Copyright: 1997-2003 Alfredo Kengi Kojima <kojima@windowmaker.info>
-           1998-2004 Dan Pascu
-           2011 Carlos R. Mafra <crmafra@gmail.com>
-License: LGPL-2+
-
-Files: WindowMaker/Icons/BitchX.tiff WindowMaker/Icons/defaultAppIcon.tiff
-       WindowMaker/Icons/GNUterm.tiff WindowMaker/Icons/defaultterm.tiff
-       WindowMaker/Icons/draw.tiff WindowMaker/Icons/linuxterm.tiff
-       WindowMaker/Icons/mixer.tiff WindowMaker/Icons/notepad.tiff
-       WindowMaker/Icons/pdf.tiff WindowMaker/Icons/ps.tiff
-       WindowMaker/Icons/real.tiff WindowMaker/Icons/sgiterm.tiff
-       WindowMaker/Icons/staroffice2.tiff WindowMaker/Icons/timer.tiff
-       WindowMaker/Icons/wilber.tiff WindowMaker/Icons/write.tiff
-       WindowMaker/Icons/xdvi.tiff WindowMaker/Icons/xv.tiff
-Copyright: 1997, Marco van Hylckama Vlieg <marco@windowmaker.info>
-License: attribution
- They may be distributed freely and/or modified as long as the original
- Author is mentioned!
-
-Files: WindowMaker/Icons/GNUstepGlow.tiff WindowMaker/Icons/GNUstepGlow.xpm
-       WindowMaker/Icons/Magnify.tiff WindowMaker/Icons/Magnify.xpm
-       WindowMaker/Icons/Terminal.tiff WindowMaker/Icons/Terminal.xpm
-       WindowMaker/Icons/TerminalGNUstep.tiff WindowMaker/Icons/TerminalGNUstep.xpm
-       WindowMaker/Icons/TerminalLinux.tiff WindowMaker/Icons/TerminalLinux.xpm
-       WindowMaker/Icons/Ear.png WindowMaker/Icons/Ftp.png WindowMaker/Icons/ICQ.png
-       WindowMaker/Icons/Jabber.png WindowMaker/Icons/Mozilla.png
-       WindowMaker/Icons/Pen.png WindowMaker/Icons/Pencil.png
-       WindowMaker/Icons/Shell.png WindowMaker/Icons/Speaker.png
-       WindowMaker/Icons/XChat.png
-       WPrefs.app/tiff/msty1.tiff WPrefs.app/tiff/msty2.tiff WPrefs.app/tiff/msty3.tiff
-       WPrefs.app/xpm/msty1.xpm WPrefs.app/xpm/msty2.xpm WPrefs.app/xpm/msty3.xpm
-       WPrefs.app/WPrefs.tiff WPrefs.app/WPrefs.xpm WPrefs.app/tiff/tdel.tiff
-       WPrefs.app/tiff/tedit.tiff WPrefs.app/tiff/textr.tiff WPrefs.app/tiff/tnew.tiff
-       WPrefs.app/xpm/tdel.xpm WPrefs.app/xpm/tedit.xpm WPrefs.app/xpm/textr.xpm
-       WPrefs.app/xpm/tnew.xpm WINGs/Resources/defaultIcon.tiff
-       WINGs/Resources/Images.tiff WINGs/Resources/Images.xpm
-       WINGs/Resources/defaultIcon.xpm WINGs/Resources/Images.xcf
-Copyright: 2000, Banlu Kemiyatorn
-License: WTFPL-1
-
-Files: debian/*
-Copyright: 1997, Neil A. Rubin <nar5@po.cwru.edu>
-           1997, Marcelo E. Magallon <mmagallo@debian.org>
-           2011, Rodolfo García Peñas (kix) <kix@kix.es>
-License: GPL-2+
-
-Files: debian/debianfiles/Themes/DebianLegacy.style
-       debian/debianfiles/Themes/DebianLegacy.txt
-       debian/debianfiles/Themes/DebianSwirl.jpg
-Copyright: 1999 Gary Burke <gfburke@earthlink.net>
-License: GPL-1+
-
-Files: WINGs/string.c
-Copyright: 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-License: Expat
-
-Files: wrlib/load_ppm.c
-Copyright: 1988 Jef Poskanzer
-	   1997-2003 Alfredo K. Kojima
-	   2014 Window Maker Team
-License: HPND and LGPL-2+
-
-License: Expat
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-License: FSFULLR
- This file 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.
-
-License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- .
- On Debian systems, the complete text of version 1 of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-1'.
-
-License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-
-License: GPL-3+
- This program is free software: you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation, either
- version 3 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this program.  If not, see
- <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
-
-License: HPND
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose and without fee is hereby granted, provided
- that the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation.  This software is provided "as is" without express or
- implied warranty.
-
-License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU Library General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/LGPL-2'.
-
-License: WTFPL-1
- do What The Fuck you want to Public License
- .
- Version 1.0, March 2000
- Copyright (C) 2000 Banlu Kemiyatorn (]d).
- 136 Nives 7 Jangwattana 14 Laksi Bangkok
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
- .
- Ok, the purpose of this license is simple
- and you just
- .
- DO WHAT THE FUCK YOU WANT TO.

debian/debianfiles/Themes/Debian

@@ -1,25 +0,0 @@
-{
-  TitleJustify = left;
-  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
-  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
-  ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*";
-  HighlightColor = white;
-  HighlightTextColor = black;
-  ClipTitleColor = black;
-  CClipTitleColor = "rgb:61/61/61";
-  FTitleColor = white;
-  PTitleColor = white;
-  UTitleColor = black;
-  FTitleBack = (hgradient, "rgb:50/5a/5e", "rgb:20/2a/2e");
-  PTitleBack = (hgradient, "rgb:51/50/55", "rgb:80/80/80");
-  UTitleBack = (hgradient, "rgb:c2/c0/c5", "rgb:82/80/85");
-  MenuTitleColor = white;
-  MenuTextColor = black;
-  MenuDisabledColor = gray40;
-  MenuTitleBack = (hgradient, "rgb:50/5a/5e", "rgb:20/2a/2e");
-  MenuTextBack = (hgradient, "rgb:c2/c0/c5", "rgb:82/80/85");
-  WorkspaceBack = (spixmap, debian.tiff, "rgb:8c/81/65");
-  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
-}

debian/debianfiles/Themes/DebianLegacy.style

@@ -1,28 +0,0 @@
-{
-  TitleJustify = left;
-  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
-  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
-  ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*";
-  DisplayFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
-  HighlightColor = white;
-  HighlightTextColor = black;
-  ClipTitleColor = black;
-  CClipTitleColor = "rgb:93/0d/29";
-  FTitleColor = white;
-  PTitleColor = white;
-  UTitleColor = black;
-  FTitleBack = (dgradient, "rgb:62/08/19", "rgb:85/0b/22");
-  PTitleBack = (dgradient, "rgb:51/50/55", "rgb:80/80/80");
-  UTitleBack = (dgradient, "rgb:8c/81/6d", "rgb:c6/b9/ae");
-  MenuTitleColor = white;
-  MenuTextColor = black;
-  MenuDisabledColor = gray40;
-  MenuTitleBack = (hgradient, "rgb:93/0d/29", "rgb:85/0b/22");
-  MenuTextBack = (hgradient, "rgb:c6/b9/ae", "rgb:ff/ff/ff");
-  WorkspaceBack = (spixmap,
-                   "/usr/share/WindowMaker/Backgrounds/DebianSwirl.jpg",
-		   "rgb:8c/81/65");
-  IconBack = (dgradient, "rgb:8c/81/6d", "rgb:c6/b9/ae");
-}

debian/debianfiles/Themes/DebianLegacy.txt

@@ -1,20 +0,0 @@
-Begin3
-Title:		Debian
-Version:	1.0
-Entered-date:	June 5, 1999
-Description:	Debian swirl theme for WindowMaker
-		This theme was inspired by the new Debian logo.
-		The background art is derived from copyright-free
-		stock artwork.  GIMP was used for the imaging.
-
-Keywords:	Wmaker, theme, debian, swirl
-Author:		gfburke@earthlink.net (Gary Burke)
-Maintained-by:	gfburke@earthlink.net (Gary Burke)
-Primary-site:	wm.themes.org
-		Debian.tar.gz
-		186123 Backgrounds/Debian
-		1117 Themes/Debian
-
-Platforms:	WindowMaker, XFree86 window manager
-Copying-policy: GPL
-End

debian/debianfiles/conf/WMRootMenu

@@ -1 +0,0 @@
-"menu.hook"

debian/debianfiles/conf/WMWindowAttributes

@@ -1,56 +0,0 @@
-{
-  Logo.WMDock = {Icon = GNUstep.tiff;};
-  Logo.WMPanel = {Icon = GNUstep.tiff;};
-  Tile.WMClip = {Icon = clip.tiff;};
-  WPrefs = {Icon = "/usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.tiff";};
-  Dockit = {Icon = GNUstep.tiff;};
-  WMSoundServer = {Icon = Sound.tiff;};
-  "*" = {Icon = defaultAppIcon.tiff;};
-  Rxvt = {Icon = GNUterm.tiff;};
-  KTerm = {Icon = GNUterm.tiff;};
-  NXTerm = {Icon = GNUterm.tiff;};
-  XTerm = {Icon = GNUterm.tiff;};
-  Netscape = {Icon = "wmaker-netscape.tif";};
-  "Mozilla-bin" = {Icon = "wmaker-nav.tif";};
-  emacs = {Icon = "wmaker-emacs.tif";};
-  Gimp = {AlwaysUserIcon = Yes;Icon = "wmaker-gimp2.tif";};
-  toolbox.Gimp = {NoAppIcon = Yes;Icon = "wmaker-gimp2.tif";};
-  gimp_startup.Gimp = {
-    Icon = "wmaker-gimp2.tif";
-    AlwaysUserIcon = Yes;
-    NoTitlebar = Yes;
-    NoResizebar = Yes;
-    NotClosable = Yes;
-    NotMiniaturizable = Yes;
-  };
-  tip_of_the_day.Gimp = {
-    Icon = "wmaker-gimp2.tif";
-    AlwaysUserIcon = Yes;
-    NoResizebar = Yes;
-    NoCloseButton = Yes;
-    NoMiniaturizeButton = Yes;
-    KeepOnTop = Yes;
-  };
-  image_window.Gimp = {Icon = "wmaker-gimp-work.tif";AlwaysUserIcon = Yes;};
-  brushselection.Gimp = {Icon = "wmaker-gimp-brushes.tif";AlwaysUserIcon = Yes;};
-  patternselection.Gimp = {Icon = "wmaker-gimp-patterns.tif";AlwaysUserIcon = Yes;};
-  color_palette.Gimp = {
-    Icon = "wmaker-gimp-palette.tif";
-    AlwaysUserIcon = Yes;
-    NoResizebar = Yes;
-  };
-  gradient_editor.Gimp = {Icon = "wmaker-gimp-gradient.tif";AlwaysUserIcon = Yes;};
-  tool_options.Gimp = {Icon = "wmaker-gimp-tooloption.tif";AlwaysUserIcon = Yes;};
-  layers_and_channels.Gimp = {Icon = "wmaker-gimp-layers.tif";AlwaysUserIcon = Yes;};
-  indexed_color_palette.Gimp = {
-    Icon = "wmaker-gimp-palette.tif";
-    AlwaysUserIcon = Yes;
-    NoResizebar = Yes;
-  };
-  "Script-fu" = {Icon = "wmaker-gimp-script-fu.tif";};
-  "script-fu.Script-fu" = {Icon = "wmaker-gimp-script-fu.tif";};
-  preferences.Gimp = {Icon = "wmaker-gimp-prefs.tif";AlwaysUserIcon = Yes;};
-  panel = {NoAppIcon = Yes;};
-  gmc = {NoAppIcon = Yes;Omnipresent = Yes;SkipWindowList = Yes;};
-  Logo.WMClip = {Icon = clip.tiff;};
-}