Additional function for checking head

Added function for checking head of certain location. This function is used for determinig head bounduary.
Fix for unmaximize.
2026-07-11 16:36:38 +02:00 · 2017-01-16 21:25:17 +01:00 · 2017-01-16 21:05:45 +01:00 · 2017-01-15 21:07:07 +01:00
390 changed files with 10326 additions and 10522 deletions
@@ -87,50 +87,11 @@ WINGs/WUtil.pc
 wrlib/libwraster.map
 WindowMaker/appearance.menu
 WindowMaker/menu
 WindowMaker/menu.bg
 WindowMaker/menu.fi
 WindowMaker/menu.fy
 WindowMaker/menu.hu
 WindowMaker/menu.ko
 WindowMaker/menu.nl
 WindowMaker/menu.ro
 WindowMaker/menu.sk
 WindowMaker/menu.zh_TW
 WindowMaker/plmenu
 WindowMaker/plmenu.bg
 WindowMaker/plmenu.es
 WindowMaker/plmenu.fi
 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
 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
 *~
 .pc
@@ -210,7 +210,7 @@ various fixes/enhancements to WINGs
 Yoav Yerushalmi <yoav@mit.edu>
-Fixed -visualid for screens that can do multiple depths. Another fix in
+Fixed -visualid for screens that can do multiple depths. Another fix in 
 libproplist. Chooses best depth in screen.
 FRBall <frb@umr.edu>
@@ -218,7 +218,7 @@ dgradient fix
 "]d" <id@windowmaker.info>
-Window list menu miniaturized/hidden hints, XDE support, XKB lock
+Window list menu miniaturized/hidden hints, XDE support, XKB lock 
 language status, WINGs enhancements, bug fixes, window commands menu
 enhancement, window move/resize by keyboard. GNUstepGlow.tiff icon,
 WINGs color panel, Appearance section icon(s)
@@ -3,8 +3,8 @@
 			---------------------------
-	If you find a bug please fill this form and send it to
+	If you find a bug please fill this form and send it to 
-wmaker-dev@googlegroups.com Please, USE THIS FORM!!!
+wmaker-dev@lists.windowmaker.org Please, USE THIS FORM!!!
 0. Before reporting this bug I already:
 [ ] read the NEWS, README and INSTALL files
@@ -16,8 +16,8 @@ wmaker-dev@googlegroups.com Please, USE THIS FORM!!!
 [ ] crashed
 [ ] configuration option does not work
 [ ] weird behavior
-[ ] cosmetic
+[ ] cosmetic 
-[ ] some problem with WPrefs
+[ ] some problem with WPrefs 
 [ ] others: ...................................
 2. Detailed description of what happened:
@@ -28,7 +28,7 @@ wmaker-dev@googlegroups.com Please, USE THIS FORM!!!
 4. Configure time options you specified:
 [ ]  --enable-kanji
-[ ]  --disable-shape
+[ ]  --disable-shape   
 [ ]  --enable-single-icon
 [ ]  --enable-modelock
 [ ]  Others: .......................
@@ -1,5 +1,5 @@
 Newly added
- after a crash, wmaker will forget the hidden state of the apps and just
+- after a crash, wmaker will forget the hidden state of the apps and just 
  show their windows minimized. normal restart is unaffected
 - after a crash, wmaker will completely mess the window's saved geometries
  and maximizing will have weird results. restart is unaffected
@@ -16,7 +16,7 @@ Newly added
  in the session/allow docking it if yes.
 - the SHELL environment variable support in the apps menu was removed
  because of a problem with tcsh. If ~/.tcshrc contains "stty erase ^H",
-  it will block and the cmd will not be executed.
+  it will block and the cmd will not be executed. 
 - mouse grab being done in client window (in wWindowResetMouseGrabs())
  instead of the frame window. If grab is done in frame, titlebar buttons
  dont work well
@@ -51,4 +51,4 @@ 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.
+DO WHAT THE FUCK YOU WANT TO. 
@@ -1,95 +1,3 @@
 Changes since version 0.95.7:
 .............................
 - Build on Ubuntu 14.04
  (Johann Haarhoff <johann@haarhoff.org.za>)
 - Window Maker 0.95.7 Debian files
 - create_appicon_from_dock checks if no_appicon flag is set
 - New applications do not create Cached Icon
 - Remove unused argument in save_appicon
 - Avoid recreate Cached icon moving between docks
 - Avoid create again a docked application cache icon
 - save the icon filename instead the full path
 - Remove cache icon when detached
 - usermenu.c Avoid compiler warnings
 - Enable usermenu
  (Rodolfo GarcÃa PeÃ±as (kix) <kix@kix.es>)
 - wmaker: fixed infinite loop in switching within group
  (Satya Mishra <qufgmx@gmail.com>)
 - wmaker: Print error dialog when attempting to delete an in-use workspace.
  (Doug Torrance <dtorrance@piedmont.edu>)
 - debian: Ignore missing documentation for --runstatedir.
 - debian: Use dh_autoreconf.
 - debian: Simplify debian/rules.
 - debian: Fix typo occured. (Thanks, lintian.)
 - debian: wmaker manpage moved from 1x to 1.
  (Andreas Metzler <ametzler@bebt.de>)
 - debian: Add wmiv to wmaker package.
 - debian: Add version 0.95.6-1.2 entry to changelog.
 - debian: Update with final version of 0.95.7-1 packaging.
 - wmaker: Maintain sorting of windows by workspace in switch menu.
 - debian: Update with version 0.95.7-2 packaging.
 - wmaker: Update copyright years in info panel.
 - wmaker: Remove prototype for unused get_right_position_on_screen function.
 - wmaker: Fix typos (used codespell).
 - wmaker: Add option for window snap to top edge to maximize to full screen.
 - wmaker: Use window placement settings on other workspaces.
 - wmaker: Add keyboard shortcuts for keeping window on top or at bottom.
 - wmaker: Display keyboard shortcuts for remaining options in window menu.
 - wmaker: Fix whitespace in menu.h; passes checkpatch.pl inspection.
 - wmaker: Implement basic menu shading.
  (Doug Torrance <dtorrance@piedmont.edu>)
 - Translations: Dutch language files updated
 - Translations: Frisian language files updated
  (Alwin <translations@ziggo.nl>)
 - wmlib: Add pkg-config file.
 - wmlib: Remove install-exec-local target.
 - WPrefs: Code formatting in TexturePanel.c; minimizes checkpatch.pl warnings.
 - WPrefs: Add support for fpixmap ("fillscale") texture.
 - check-doc: Ignore runstatedir in check-cmdline-options-doc.sh
 - check-doc: Ignore with-aix-soname in check-cmdline-options-doc.sh
 - debian: Remove 56_ignore_runstatedir.diff.
 - debian: Update with version 0.95.7-3 packaging.
 - debian: Update with version 0.95.7-4 packaging.
 - debian: Update with version 0.95.7-5 packaging.
 - debian: Update with version 0.95.7-6 packaging.
 - wmmenugen: Fix segfault; argv[argc] doesn't exist.
  (Doug Torrance <dtorrance@piedmont.edu>)
 - getstyle: fix wcopy_file paths
  (Alexandru Lazar <alazar@startmail.com>)
 - wmaker: fix stacking order of dock and fullscreen
 - wmaker: allow alt+tabbed windows over fullscreen
  (BjÃ¸rn Mork <bjorn@mork.no>)
 - WPrefs: Update path for Debian menu
 - Use wprefs_bindir output variable to set WPrefs path in menus.
 - Remove WindowMaker/mkMakefile script.
 - Don't try and add removed file mkMakefile to distribution tarball.
 - Look for plmenu in build directory when creating WMRootMenu.
 - debian: Update with version 0.95.7-7 packaging.
 - configure: Use PKG_PROG_PKG_CONFIG macro to allow cross building.
  (Doug Torrance <dtorrance@piedmont.edu>)
 - Trivial cleanup: Removed unused defines.
  (Roman Dobosz <gryf73@gmail.com>)
 - Added 'head' parameter to wMaximizeWindow
 - Added wGetHeadRelativeToCurrentHead function
 - Added option for ability to move half-maximized between heads.
 - Added possibility for half-maximized windows to move across the screens.
 - Fixed wrong (re)stored dimensions for unmaximized window.
  (gryf <gryf73@gmail.com>)
 - Bugfix for moving windows between heads.
 - New option for enabling alternative half-maximized window movement.
 - Alternative way for traversing half-maximized windows.
 - New option for moving mouse pointer along with half-maximized windows.
 - Implementation for moving mouse pointer within the maximized window.
 - Refactoring handleMaximize() function
 - Removed trailing whitespaces from readme files.
 - Fixed couple of compilator warning and removed unused macros.
  (Roman Dobosz <gryf73@gmail.com>)
 - wmaker: Do not place icons under the dock
  (Cyrus Rahman <crahman@gmail.com>)
 - debian: Update with version 0.95.7-8 packaging.
  (Doug Torrance <dtorrance@piedmont.edu>)
 Changes since version 0.95.6:
 .............................
@@ -488,51 +396,6 @@ Changes since version 0.95.6:
 - debian: Import version 0.95.6-1.
 - debian: Import version 0.95.6-1.1.
  (Doug Torrance <dtorrance@monmouthcollege.edu>)
 - Import of (partly outdated) Ukrainian translations.
  (Martin Dietze <mdietze@gmail.com>)
 - Add folder with fedora .spec file
  (Alexey I. Froloff <raorn@raorn.name>)
 - make: Add Ukrainian translation files to EXTRA_DIST.
 - wmiv: Add long command line options --help and --version.
 - wmiv: Improve help text.
 - doc: Add manpage for wmiv.
  (Doug Torrance <dtorrance@monmouthcollege.edu>)
 - wmaker: replaced old email address with the official one
 - WINGs: Updated news with the API changes that occured between 0.95.6 and
  0.95.7
 - WINGs: ran spell checker on the NEWS file
 - WINGs: fix non-portable int conversion for printf in font panel size handling
 - WRaster: fix unused variable warning when XShm extention is not enabled
  (Christophe CURIS <christophe.curis@free.fr>)
 - New translation into Frisian for Window Maker
  (Alwin <translations@ziggo.nl>)
 - wrlib: fixed gcc version needed for deprecated attribute support
 - Configure: increased the version of Automake requested
  (Christophe CURIS <christophe.curis@free.fr>)
 - configure: Fix output of libdir directory in summary
  (Josip Deanovic <djosip+news@linuxpages.net>)
 - wmaker: fix detection of legacy Apercu configuration keywords
 - WPrefs: fix conversion of old "Apercu" setting to the new keywords
  (Christophe CURIS <christophe.curis@free.fr>)
 - wmaker: Allow window snapping and linked workspaces simultaneously.
 - wmaker: Allow configuration of window snapping detect distances.
 - WPrefs: Add ability to set integer values in Expert panel
 - WPrefs: Add snap edge and corner detect to Expert panel.
  (Doug Torrance <dtorrance@monmouthcollege.edu>)
 - Translations: Dutch updates for WPrefs
 - Translations: Frisian updates for WPrefs
  (Alwin <translations@ziggo.nl>)
 - configure: fixed incorrect variable name that prevented --disable-xdnd to
  work
  (Rodolfo GarcÃa PeÃ±as (kix) <kix@kix.es>)
 - Revert "wmaker: fix clearing of window attribute that was not saved properly"
 - Disable pager by default
  (Carlos R. Mafra <crmafra@gmail.com>)
 - Allow using keypad Enter to commit move/resize
 - Allow using numpad Enter key in dialogs for confirmation
  (Amadeusz SÅ‚awiÅ„ski <amade@asmblr.net>)
 - Window Maker 0.95.7
  (Carlos R. Mafra <crmafra@gmail.com>)
 Changes since version 0.95.5:
@@ -2810,7 +2673,7 @@ Changes since version 0.92.0:
  platforms with a recent pkg-config (debian unstable/sid for one)
 - Fixed buggy handling of UTF8 characters in textfields in WINGs.
  (Stanislav Maslovski <stanislav.maslovski@gmail.com>)
- Fixed segfault in WPrefs when some font description is missing from the
+- Fixed segfault in WPrefs when some font description is missing from the 
  configuration file (Stanislav Maslovski <stanislav.maslovski@gmail.com>)
 - Removed WINGs' dependency on rgb.txt (from X11) and issues with locating it
  on the filesystem for different systems/distributions.
@@ -2891,11 +2754,11 @@ Changes since version 0.80.2:
 - Removed obsoleted acconfig.h and implemented its functionality using
  AC_DEFINE and AC_DEFINE_UNQUOTED as autoconf 2.5x recommends.
  This will definitely enforce the need to use autoconf 2.5x
- Added Xft2 support to WINGs, for rendering antialiased fonts with
+- Added Xft2 support to WINGs, for rendering antialiased fonts with 
  transparency. Details in WINGs/ChangeLog.
- Fixed problem with long, preset workspace names (Wanderlei Antonio Cavassin
+- Fixed problem with long, preset workspace names (Wanderlei Antonio Cavassin 
  <cavassin@conectiva.com.br>)
- Added kinput2 bug workaround to stock WMWindowAttributes (Seiichi SATO
+- Added kinput2 bug workaround to stock WMWindowAttributes (Seiichi SATO 
  <sato@cvs-net.co.jp>)
 - Added Belarusian translation (Ihar Viarheichyk <iverg@mail.ru>)
 - Fixed wrlib not to load braindead images with 0 sized width or height
@@ -2966,7 +2829,7 @@ Changes since version 0.80.2:
 - Made maximize behave differently with keyboard/mouse for xinerama
  (Peter Zijlstra <a.p.zijlstra@chello.nl>)
 - A few leftover xinerama fixes (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Extended the 'strut' to multiple heads
+- Extended the 'strut' to multiple heads 
  (Peter Zijlstra <a.p.zijlstra@chello.nl>)
 - Icon placement now takes into account the new xinerama extended 'strut'
  (Peter Zijlstra <a.p.zijlstra@chello.nl>)
@@ -3012,7 +2875,7 @@ Changes since version 0.80.2:
  by Peter Zijlstra <a.p.zijlstra@chello.nl>)
 - Applied patch to enhance the Virtual Desktop behaviour, and to integrate
  it with the NetWM code (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Applied a few xinerama and placement fixes (Peter Zijlstra
+- Applied a few xinerama and placement fixes (Peter Zijlstra 
    <a.p.zijlstra@chello.nl>)
 - Fixed memory leak in dock code.
 - Fixed and enhanced the text wrapping in WINGs.
@@ -3036,7 +2899,7 @@ Changes since version 0.80.2:
 - MacOS X style window switching panel (navigate through windows with Alt-Tab
  or arrow keys)
 - Added support for NET_WM_NAME/NET_WM_ICON_NAME
- Moved out font name conversion code from getstyle/setstyle/convertfonts and
+- Moved out font name conversion code from getstyle/setstyle/convertfonts and 
  made it support fontsets
 - Converted all menu and po files to UTF-8
 - Updated de.po (Thomas Otto <3.1415926535897932384626433832@gmx.net>)
@@ -3059,8 +2922,8 @@ Changes since version 0.80.0:
  WMState.<number> file on multihead system.
 - Fixed problem with keyboard shortcuts executed an every screen for
  multihead systems.
- Updated traditional chinese translations
+- Updated traditional chinese translations 
- Fixed buglet in non-caching rootmenu option
+- Fixed buglet in non-caching rootmenu option 
  ("John H. Robinson, IV" <jhriv@ucsd.edu>)
 - Added Malay translation
 - Fixed problem with kcalc not having a miniaturize button.
@@ -3081,7 +2944,7 @@ Changes since version 0.80.0:
 - Added Greek (el) language pixmap (Michalis Kabrianis <Michalis@bigfoot.com>)
 - Fixes icons being reduced twice when icon size != 64x64
  Eduardo Pereira Habkost <ehabkost@conectiva.com.br>
- Fixed a bug that crashed wmaker when selecting the "Start alternate window
+- Fixed a bug that crashed wmaker when selecting the "Start alternate window 
  manager" option in the crashing dialog panel.
 - Window Maker will now use the WINDOWMAKER_ALT_WM environment variable (if
  it is defined) to overwrite the default hardcoded fallback window manager.
@@ -3090,7 +2953,7 @@ Changes since version 0.80.0:
  "Keep on Top" option is active.
 - Added ability to browse for files/directories in the WPrefs menu editor.
 - Added Czech translations of documentation (Jiri Hnidek <Jiri.Hnidek@vslib.cz>)
- Fixed segfault with incomplete WM_CLASS specifications.
+- Fixed segfault with incomplete WM_CLASS specifications. 
 - Fixed a bug about arranging subviews in a WMBox after removing a subview
  and a memleak occuring in the same situation.
 - Fixed a bug in wdread
@@ -3102,7 +2965,7 @@ Changes since version 0.80.0:
 Changes since version 0.70.0:
 .............................
- Disabled window birth animation by default (while it was ok with normal
+- Disabled window birth animation by default (while it was ok with normal 
  windows, it was very annoying with menus editing in WPrefs.app)
 - Added ability to shade/unshade a window using the mouse wheel.
 - Fixed compilation for systems that required -lintl for WINGs
@@ -3119,7 +2982,7 @@ Changes since version 0.70.0:
  saving dock/clip/session information on exit.
 - Added an internal strcasecmp() to WINGs (only on systems where's not present)
 - Deminiaturizing a window that is also shaded, will perform an unshade too.
-  (Note that this only applies to deminiaturizing shaded windows. Unhiding
+  (Note that this only applies to deminiaturizing shaded windows. Unhiding 
  an application will keep the shaded/unshaded state of windows.)
 - Removed compile time option for definable cursors and made them available by
  default.
@@ -3127,7 +2990,7 @@ Changes since version 0.70.0:
  will unhide the application.
 - Added || pipe menu for generating non-cached menus
 - Removed the collapse appicons thing.
- Added real appicon sharing (apps of the same kind will have a single shared
+- Added real appicon sharing (apps of the same kind will have a single shared 
  appicon).
 - Fixed user and global defaults domain merging to preserve values present in
  global but not in user, in sub-dictionaries.
@@ -3158,7 +3021,7 @@ Changes since version 0.65.1:
    (Marcelo E. Magallon <marcelo.magallon@bigfoot.com>)
 - fixed crash with broken apps that set null WM_CLASS
 - fixed crash when with gnome panel and multi-screens, some menu
-  updates and applied various other patches from
+  updates and applied various other patches from 
  (Crutcher Dunnavant <crutcher@redhat.com>)
 - po file fixes (Crutcher Dunnavant <crutcher@redhat.com>)
 - replaced I18N_MB with I18N in one place in src/wconfig.h.in
@@ -3187,7 +3050,7 @@ Changes since version 0.65.1:
  More details about this can be found in WINGs/ChangeLog and WINGs/NEWS.
  Say bye, bye libPropList =)
 - rewrote all Window Maker code to use the new WINGs based proplist functions.
- fixed a few compilation warnings and a problem caused by an uninitialized
+- fixed a few compilation warnings and a problem caused by an uninitialized 
  variable.
@@ -3229,7 +3092,7 @@ Changes since version 0.64.0:
 - use Hermes in wrlib
 - removed MOUSE_WS_WHEEL #defines
 - fixed bug with multibyte text on libc5 systems (Osamu Ajiki <osam-a@astroarts.co.jp>)
- fixed race conditions on signal handlers
+- fixed race conditions on signal handlers 
 - SIGINT will gently exit, SIGTERM will not be handled
 - When Window Maker calls wmsetbg to set the background, it will consider the
  value of the DisableDithering option and pass the right switch to wmsetbg.
@@ -3240,7 +3103,7 @@ Changes since version 0.64.0:
  desktop level.
 - Fixed incorrect parsing of display and screen number from $DISPLAY.
 - Organized the inspector panel a bit better.
- Replaced bags with arrays wherever appropriate. This will improve
+- Replaced bags with arrays wherever appropriate. This will improve 
  performance a bit.
 - Made the Gnome tasklist skip the windows with the "Skip window list" flag
  enabled. (Bastien Nocera <hadess@hadess.net>)
@@ -3258,11 +3121,11 @@ Changes since version 0.64.0:
 - Added retain/release mechanism for RImages. RDestroyImage() has become
  obsolete. More about this can be found in wrlib/Changelog and wrlib/NEWS.
 - Small API change in WINGs to allow images with alpha blending set as the
-  application icons be shown correctly. More about this in WINGs/Changelog
+  application icons be shown correctly. More about this in WINGs/Changelog 
  and WINGs/NEWS.
 - Made images with alpha blending be shown correctly in the panels and the
  icon chooser.
- The icon image set to be shown in panels ("Logo.WMPanel") will be
+- The icon image set to be shown in panels ("Logo.WMPanel") will be 
  automatically updated if its entry in WMWindowAttributes changes (without
  a need to restart as until now).
 - Fixed a bug in the icon chooser dialog that made the selected icon look
@@ -3282,7 +3145,7 @@ Changes since version 0.64.0:
 Changes since version 0.63.1:
 .............................
 - fixed messup in get-{wings,wutil,wraster}-flags
- fixed #wmdatadir# substitution in wmaker.inst
+- fixed #wmdatadir# substitution in wmaker.inst 
 	(Seiichi SATO <sato@cvs-net.co.jp>)
 - Removed spurious focus disabling for GNUstep applications - but retain
  code that lets GNUstep apps control their window titlebar.
@@ -3323,7 +3186,7 @@ Changes since version 0.62.1:
 - added wmagnify utility
 - changed behaviour of control/shift double click on titlebar for maximize
 - updated getstyle to account for extendspace options
- fixed weird color bug in jpeg loader
+- fixed weird color bug in jpeg loader 
 	(Alban Hertroys <dalroi@wit401310.student.utwente.nl>)
 - improved and simplified fonts configuration for multibyte languages
 	(Tomohiro KUBOTA <kubota@debian.or.jp>)
@@ -3337,7 +3200,7 @@ Changes since version 0.62.1:
 - fixed bug with incorrect window placement using automatic placement, while
  there were shaded windows on other workspaces
 - fixed some buffer overflow issues in WINGs
- fixed bug with WPrefs.app not selecting the menu appearance options after
+- fixed bug with WPrefs.app not selecting the menu appearance options after 
  startup.
 - replaced free() with wfree() wherever appropriate
 - fixed some memory leaks generated by wstrappend()
@@ -3401,7 +3264,7 @@ Changes since version 0.61.1:
 - changed semantics of GNUstep window attribute hints
 - added get-wings-flags and get-wutil-flags with the same purpose as
  get-wraster-flags, but for compiling and linking with WINGs/WUtil
- fixed bug handling non-string values given to string valued options in
+- fixed bug handling non-string values given to string valued options in 
  defaults.c
 - fixed colormap_window crash bug (appears when launching some apps from dock,
  or removing apps from gnome panel etc)
@@ -3420,7 +3283,7 @@ Changes since version 0.61.1:
 - added Jim Knoble <jmknoble@pobox.com>'s cursor thing patch
 - fixed lock of wmaker when clicking on menu multiple times
 - made transients appear near their owner
- fixed crash bug with broken java implementations (Miguel Covarrubias
+- fixed crash bug with broken java implementations (Miguel Covarrubias 
 							<mcovarr@tigr.org>)
 - made Revert on attributes panel apply the reverted changes immediately
  to avoid inconsistent internal state
@@ -3438,7 +3301,7 @@ Changes since version 0.61.0:
 - fixed OPEN_MENU
 - fixed crash when moving a shaded window with keyboard
 - fixed problem with window shortcut assignment from the menu
- fixed problem with fonts in WINGs (Masahide -mac- NODA
+- fixed problem with fonts in WINGs (Masahide -mac- NODA 
 					<mac@flab.fujitsu.co.jp>)
 - fixed multihead bugs (Morten Bøgeskov" <mb@dbc.dk>)
 - fixed crashing bug when saving session information.
@@ -3465,7 +3328,7 @@ Changes since version 0.60.0:
 - added missing kbd shortcut definitions for window shortcuts
 	(Michael Smith <mjsmith@spirit.com.au>)
 - fixed floppy button layout in filepanel (Matthew Ashton <mrashton@home.com>)
- fixed bug with documentedited close button (Felipe A. Rodriguez
+- fixed bug with documentedited close button (Felipe A. Rodriguez 
 						<farz@mindspring.com>)
 - fixed some buffer overflows
 - fixed some problem with the alpha
@@ -3481,7 +3344,7 @@ Changes since version 0.60.0:
 - removed drop shadow for text on title bar code. (TITLE_TEXT_SHADOW)
 - text on title bar is now possible to be drawn by plugin. See NEWS.
 - WPrefs: added support for button4/5
- fixed scrolling of menus outside screen (Vito Caputo
+- fixed scrolling of menus outside screen (Vito Caputo 
 						<swivel@virtual-webworld.com)
 - added dialog window for menu commands that can't be executed
 - fixed crash when deiconifying windows when icons are disabled
@@ -3511,7 +3374,7 @@ Changes since version 0.53.0:
 - fixed crash when changing icon of window without WM_CLASS
 - added hysteresys for offscreen menu scrollback
 - fixed bug with IgnoreFocusClick
- fixed crash with windows with width == 1 (Alban Hertroys
+- fixed crash with windows with width == 1 (Alban Hertroys 
 					<dalroi@wit401310.student.utwente.nl>)
 - added SHEXEC command
 - fixed resizebarback for SHADOW_RESIZEBAR ( jim knoble jmknoble@pobox.com)
@@ -3631,7 +3494,7 @@ Changes since version 0.51.1:
 - fixed bug with window that can get focus if both shaded and hidden.
 - maximize for full screen
- fixed problem with frame drawing in non-opaque
+- fixed problem with frame drawing in non-opaque 
 - fixed installation path prob [jmknoble@pobox.com]
 - fixed bug moving window when only one window is on screen
 - fixed bug with ignored GNUstep attributes
@@ -3727,7 +3590,7 @@ Changes since version 0.50.1:
 - fixed wmsetbg
 - fixed parsing of WorkspaceSpecificBack
 - fixed initial workspace for new windows
- added the workspace button proxy thingy for GNOME
+- added the workspace button proxy thingy for GNOME 
 - added more GNOME compatibility fixes
 - fixed bug in %a() macro in root menu
@@ -3901,7 +3764,7 @@ Changes since version 0.19.3:
 .............................
 - fixed crash when closing windows in autoraise
- fixed a memory leak
+- fixed a memory leak 
 - fixed a crash when closing Lotus Notes
 - rewrote colormap code
 - incomplete multihead support
@@ -4014,7 +3877,7 @@ Changes since version 0.17.5:
 .............................
 - fixed handling of signals when the X event queue is empty
- fixed blank window titles
+- fixed blank window titles 
 - made current workspace entry be disabled in Move To window menu command, and
  in the Clip's Move To submenu.
 - fixed menu width calculation
@@ -4025,7 +3888,7 @@ Changes since version 0.17.5:
 - added a hack to make everything work even if NumLock or ScrollLock is on
 - added a little more verbosity to error messages
 - fixed kluged workspace menu in clip
- removed workspace menu mapped through the microbutton in the clip.
+- removed workspace menu mapped through the microbutton in the clip. 
 - remade clip button layout to be more usable
 - fixed bug with keepontop and apps with Motif hints (x11amp)
 - changed menu border drawing
@@ -4063,7 +3926,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 its icon in the .app
+- if the app is a .app, it will try to find it's 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
@@ -4091,7 +3954,7 @@ Changes since version 0.17.3:
 - fixed bug with rootmenu that caused twin menus to be left mapped
 - added DontConfirmKill option to remove confirmation panel for Kill
 - fixed bug with hide of app with wmaker menu
- changed all NSsomething internal flags for the GNUstep attributes to
+- changed all NSsomething internal flags for the GNUstep attributes to 
  WMsomething
 Changes since version 0.17.2:
@@ -4099,7 +3962,7 @@ Changes since version 0.17.2:
 - fixed bug in attributes panel with Disable Resizebar
 - fixed save in attribs panel with windows other than the client leader
- bug in  attribs panel with Revert that made it save attributes with the
+- bug in  attribs panel with Revert that made it save attributes with the 
  wrong name
 - fixed (by kluging) bugs related to destroying dialog panels in a bad order
 - fixed various bug with hide in empty screens
@@ -4206,7 +4069,7 @@ Changes since version 0.16.0:
 - Added autoscroll for scrollers in WINGs.
 - Optimized WMList and WMBrowser in WINGs.
 - Button2 on clip opens workspace menu
- Changed cycling colors of selected icons.
+- Changed cycling colors of selected icons. 
 - Made icon chooser display a better rendering of alpha-channeled icons.
 - Sorted list/browser entries.
 - Fixed bug in timer code that was causing some timer events to be lost.
@@ -4243,11 +4106,11 @@ Changes since version 0.15.1:
 - clicking on the appicon switches to the workspace where the app was last
  focused before unhiding
 - fixed problem with aspect ratio setting (gr_osview etc.)
- changed some extensions in the default config/data files and removed
+- changed some extensions in the default config/data files and removed 
  Sound.{xpm,tif} because it seem to be copyrighted.
 - added icon selection panel
 - changed selection indication of icons. Removed SClipColor option
- simplified animation speed options (IconSlideDelay, IconDelayStep,
+- simplified animation speed options (IconSlideDelay, IconDelayStep, 
  MenuScrollDelay, MenuScrollStep etc. etc) to IconSlideSpeed etc.
 - removed Start miniaturized/hidden items from Dock/Clip and added them
  as attributes
@@ -4319,7 +4182,7 @@ Changes since version 0.15.0:
  window is correctly updated if the font size is changed while running.
 - Deleted unnecessary redrawing code in moveres.c.
 - Many fixes to moveres.c.
- Put all the keys from defaults.c in WindowMaker domain database.
+- Put all the keys from defaults.c in WindowMaker domain database. 
 - Fixed a crashing bug when workspace names were as long (or longer) as
  MAX_WORKSPACENAME_WIDTH (16 characters). In this case a right click on a
  window title caused WindowMaker to crash.
@@ -4622,7 +4485,7 @@ Changes since version 0.12.1:
 Changes since version 0.12.0:
 .............................
- now maintained by Matthew Hawkins <matt@mail.goldweb.com.au> while our
+- now maintained by Matthew Hawkins <matt@mail.goldweb.com.au> while our 
  esteemed friend Alfredo is away.  Have a great holiday in Japan, mate!
 - fixed __DuMmY install problems
 - made NextMenuBehaviour and ScrollableMenus run-time configuration options
@@ -4634,7 +4497,7 @@ Changes since version 0.11.1:
 - added Launch command in dock menu
 - fixed manual window placement
 - fixed problem during installation in po/ directory
- changed Command format for dock state
+- changed Command format for dock state 
 - added OffiX DND support for the dock
 - added Move To submenu in window commands menu
 - right click on root window does not deselect windows (to allow workspace
@@ -4650,7 +4513,7 @@ Changes since version 0.11.1:
 Changes since version 0.11.0:
 .............................
- fixed bug with menus that caused wmaker to crash
+- fixed bug with menus that caused wmaker to crash 
 - brought program parameter dialog box back
 - fixed autoplacement
 - changed window matching precedence for WMWindowAttributes (complete, just
@@ -4671,7 +4534,7 @@ Changes since version 0.10.2:
 - fixed maximize bug
 - added a widget set and new dialog panels
 - fixed titlebar update after font change
- renamed back _WINDOWMAKER_COMMAND to _WINDOWMAKER_WM_FUNCTION
+- renamed back _WINDOWMAKER_COMMAND to _WINDOWMAKER_WM_FUNCTION 
 - fixed bug with miniaturization of bad behaved apps (vtcl)
 Changes since version 0.10.1:
@@ -4721,7 +4584,7 @@ pipe
 - more apps can be docked (ghostview et. al)
 - fixed diagonal/horizontal resize detection to be like in NS
 - simplified titlebar button code: removed possibility to add more buttons
- fixed window gravity handling (xclock -geometry 100x100-0-0)
+- fixed window gravity handling (xclock -geometry 100x100-0-0) 
 - removed shadeable window attribute, added DontMoveOff
 - window resize with Meta-Click3 on window
 - fixed bug that caused keyboard locks if a invalid key was used in a shortcut
@@ -4831,20 +4694,20 @@ has quit. (probably the same problem with XFMail and others)
 - better handling of long text
 - limited windowlist menu width
 - fixed arrange icons
- changed geometry display to account for base size if it's not in
+- changed geometry display to account for base size if it's not in 
 the technical drawing style
- meta-dbl-click on appicon does hide others
+- meta-dbl-click on appicon does hide others 
 - changed RaiseOnFocus option with RaiseDelay
- dbl-click on root window or open submenu entry brings the root menu
+- dbl-click on root window or open submenu entry brings the root menu 
 to the cursor.
 - removed AllowMenuLowering option and made menu ontopness work like on dock
- changed meta-click on dock with meta-dbl-click, to change ontopness
+- changed meta-click on dock with meta-dbl-click, to change ontopness 
- moved gradient and image code to a library.
+- moved gradient and image code to a library. 
 - added support for icons with alpha channel
 - simplified dithering setup
- many clean ups
+- many clean ups 
 - not-so-good looking gradients for 8bpp
- changed application menu stuff
+- changed application menu stuff 
 - started wmaker client library. Try out test/test.c
@@ -4889,7 +4752,7 @@ Changes since version 0.4.2:
 - fixed docking on left side dock
 - fixed bug in window command menu
 - fixed bug in narrow windows with NEWSTYLE enabled
- fixed Hide Others crash
+- fixed Hide Others crash 
 - I18N fixes
 - hopefully stable again
@@ -4934,13 +4797,13 @@ 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 its own)
+- added a Dock (not for GNUstep, as it will have it's own)
 Changes since version 0.3.1:
 ............................
 - fixed bug that caused window frames to be left after window closure
- submenus are opened to the left/right if it is too close to the right/left
+- submenus are opened to the left/right if it is too close to the right/left 
 edge (not perfect, but better than before)
 - remember window state (shade) on restart
 - fixed resize bug
@@ -4957,14 +4820,14 @@ Changes since version 0.3.0:
 - added diagonal gradients
 - ignoreHideOthers window flag
 - optimized/fixed window raising and lowering
- fixed menu handling: don't need to click on the menu after
+- fixed menu handling: don't need to click on the menu after 
 it's opened to select items, just drag the pointer
 - _GNUSTEP_WM_RESIZE_WINDOW, _GNUSTEP_WM_RESIZED_WINDOW protocols
 - application specified titlebar button pixmaps
 - 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, its owner always get the focus
+- when transient is closed, it's 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
@@ -4985,10 +4848,10 @@ with accidental dbl-clicks on the root menu.
 - remade application group code (more stable)
 - undid stacking code change from 0.2.0
 - fixed bug that caused hangs (not sure)
- fixed bug that caused window_count error and associated crashes
+- fixed bug that caused window_count error and associated crashes 
 - remade application defined menus
 - vertical gradient
- I18N support
+- I18N support 
 - fixed multiple window selection bug with windows in other workspaces
 - changed workspace numbering
 - fixed problem with series of X errors when a window is destroyed
@@ -5026,7 +4889,7 @@ you focus a shaded window
 - fixed bug that allowed on top window to be lowered
 - disappearing xconsole and other initial-state==IconicState windows fixed
 - menus open always inside screen area
- open submenus are moved with their parents
+- open submenus are moved with their parents 
 - keyboard support
 - faster menu drawing
 - hide for applications that use window_group hint fixed (LyX et al)
@@ -5089,7 +4952,7 @@ Changes since version 0.0.4:
 - added cpp preprocessing
 - zombie process bug fixed
 - interactive and dumb (cascade) window placement
- floating transient windows
+- floating transient windows 
 - disable mapped submenu entry on parent
 - added colormap handling stolen from fvwm (temporary)
@@ -5097,10 +4960,10 @@ Changes since version 0.0.4:
 Changes since version 0.0.3:
 ............................
- hide application implemented (just for apps that have the window_group
+- hide application implemented (just for apps that have the window_group 
-field of WMHints set or the WM_CLIENT_LEADER property set,
+field of WMHints set or the WM_CLIENT_LEADER property set, 
 apparently most Xt based apps)
- fixed a crashing bug caused by icons
+- fixed a crashing bug caused by icons 
 - internal change on button pixmap structure and other places
 - handling of property changes on mapped windows
 - fixed bug in event handling (MapRequest)
@@ -21,8 +21,8 @@ config-paths.h: Makefile
 	@echo '/* where shared data is stored */' >> $@
 	@echo '#define PKGDATADIR "$(datadir)/WindowMaker"' >> $@
 	@echo '' >> $@
-	@echo '/* where the global defaults are stored */' >> $@
+	@echo '/* where the configuration is stored */' >> $@
-	@echo '#define DEFSDATADIR "$(defsdatadir)"' >> $@
+	@echo '#define SYSCONFDIR "$(sysconfdir)"' >> $@
 ACLOCAL_AMFLAGS = -I m4
@@ -41,13 +41,11 @@ 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
@@ -64,10 +62,6 @@ 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
@@ -86,34 +80,13 @@ if HAVE_XGETTEXT
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) update-lang || exit $$?); \
 	done
-SUBDIRS_PO = wrlib/po WINGs/po po util/po WPrefs.app/po
+SUBDIRS_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))
@@ -133,8 +106,6 @@ configure-documentation:
 		--ignore-prg 'enable-shared,enable-static # should be in INSTALL' \
 		--ignore-prg 'disable-option-checking,enable-fast-install # should be in INSTALL' \
 		--ignore-prg 'disable-libtool-lock,with-pic,with-gnu-ld,with-sysroot # for libtool' \
 		--ignore-prg 'runstatedir #new in autoconf 2.70, backported in Debian' \
 		--ignore-prg 'with-aix-soname #new in libtool 2.4.4' \
 		--ignore-prg 'with-x # no use, it would not work without X'
 .PHONY: configure-documentation
@@ -1,261 +1,7 @@
 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
 -----------------------------------
 Implementation for moving mouse pointer within the maximized window.
 Mouse pointer can be now moved together with window if keyboard was used for
 arrange maximized windows on screen. This feature can be turned on in WPrefs.app
 in Expert tab by selecting "Move mouse pointer with half maximized windows.", or
 setting "PointerWithHalfMaxWindows" to "Yes" on ~/GNUstep/Defaults/WindowMaker
 file.
 Alternative way for traverse half-maximized windows
 ---------------------------------------------------
 For now, there could be three possible state of the window while using
 half-maximized feature. Unmaximized window have its state saved during that
 process, which was use to unmaximize it. For example, if there is a window,
 which is maximized on the half left side of the screen, and while requesting
 left-half-maximized, it become unmaximized with size and dimension restored to
 original state.
 By setting "AlternativeHalfMaximized" option to "Yes"
 ~/GNUstep/Defaults/WindowMaker config file (or by using WPrefs.app and option
 "Alternative transitions between states for half maximized windows."), there
 would be slightly different change in window "traverse". Given layout depicted
 below:
 ┌┬────────────────────┬┐
 ├┘ ┌───────┐          ├┤
 │  ├───────┤          ├┤
 │  │       │          ├┤
 │  │       │          ├┤
 │  └───────┘          └┤
 ├┬┐                    │
 └┴┴────────────────────┘
 Window can be moved using keyboard shortcut right-half-maximize:
 ┌┬─────────┬──────────┬┐
 ├┘         ├──────────┼┤
 │          │          ├┤
 │          │          ├┤
 │          │          ├┤
 │          │          ├┤
 ├┬┐        └──────────┘│
 └┴┴────────────────────┘
 Further invoking right-half-maximize will do nothing. Note, that window always
 can be unmaximzied using appropriate keyboard shortcut or by selecting
 "Unmaximize" from window menu.
 Going to opposite direction by invoking left-half-maximize, will make the window
 maximized in both, vertical and horizontal directions:
 ┌─────────────────────┬┐
 ├─────────────────────┼┤
 │                     ├┤
 │                     ├┤
 │                     ├┤
 │                     ├┤
 ├┬┬───────────────────┘│
 └┴┴────────────────────┘
 Further invoking left-half-maximize, will make the window maximized in half left
 side od the screen:
 ┌──────────┬──────────┬┐
 ├──────────┤          ├┤
 │          │          ├┤
 │          │          ├┤
 │          │          ├┤
 │          │          └┤
 ├┬┬────────┘           │
 └┴┴────────────────────┘
 And again, further invoking left-half-maximize, will do nothing in this mode.
 This change affects all possible half-maximized window state also quarters.
 Issuing bottom-left-corner will take lower left quarter of the screen (nothing
 is new so far):
 ┌┬────────────────────┬┐
 ├┘                    ├┤
 │                     ├┤
 ├──────────┐          ├┤
 ├──────────┤          ├┤
 │          │          └┤
 ├┬┬────────┘           │
 └┴┴────────────────────┘
 Issuing bottom-right-corner again will change window state to bottom half
 maximized:
 ┌┬────────────────────┬┐
 ├┘                    ├┤
 │                     ├┤
 ├─────────────────────┼┤
 ├─────────────────────┼┤
 │                     ├┤
 ├┬┬───────────────────┘│
 └┴┴────────────────────┘
 Invoking bottom-right-corner again:
 ┌┬────────────────────┬┐
 ├┘                    ├┤
 │                     ├┤
 │          ┌──────────┼┤
 │          ├──────────┼┤
 │          │          ├┤
 ├┬┐        └──────────┘│
 └┴┴────────────────────┘
 Issuing bottom-right-corner again will have no effect.
 Move half-maximized windows between the screens
 -----------------------------------------------
 New option was introduced to allow change of behaviour of half-maximize windows
 in multiple displays environment. In such environment it is more natural that
 half maximized windows would travel from one screen to another. Now it is
 possible to make that happen by setting an option
 "MoveHalfMaximizedWindowsBetweenScreens" to "Yes" in
 ~/GNUstep/Defaults/WindowMaker config file, or by checking "Allow move
 half-maximized windows between multiple screens." in 'Expert User Preferences"
 tab in WPrefs.app.
 For example, given there are two screens in layout where one display is on the
 left and second display is on the right with window on first screen:
 ┌┬────────────────┬─────────────────┬┐
 ├┘ ┌───────┐      │                 ├┤
 │  ├───────┤      │                 ├┤
 │  │       │      │                 ├┤
 │  │       │      │                 ├┤
 │  └───────┘      │                 └┤
 ├┬┐               ├┬┬┐               │
 └┴┴───────────────┴┴┴┴───────────────┘
 It can be right-half-maximized (using previously defined key combination), so it
 become:
 ┌┬───────┬────────┬─────────────────┬┐
 ├┘       ├────────┤                 ├┤
 │        │        │                 ├┤
 │        │        │                 ├┤
 │        │        │                 ├┤
 │        │        │                 └┤
 ├┬┐      └────────┼┬┬┐               │
 └┴┴───────────────┴┴┴┴───────────────┘
 In this example there is an assumption that WindowMaker is configured, that
 maximized windows wont cover mini icons nor dock.
 Without setting new option to true, issuing another right-half-maximize will
 restore window dimensions and position to the original state (like on the first
 figure). With new option set to true it will move window to second screen like:
 ┌┬────────────────┬────────┬────────┬┐
 ├┘                ├────────┤        ├┤
 │                 │        │        ├┤
 │                 │        │        ├┤
 │                 │        │        ├┤
 │                 │        │        └┤
 ├┬┐               ├┬┬┬─────┘         │
 └┴┴───────────────┴┴┴┴───────────────┘
 Another activation of right-half-maxmimize:
 ┌┬────────────────┬────────┬────────┬┐
 ├┘                │        ├────────┼┤
 │                 │        │        ├┤
 │                 │        │        ├┤
 │                 │        │        ├┤
 │                 │        │        ├┤
 ├┬┐               ├┬┬┐     └────────┘│
 └┴┴───────────────┴┴┴┴───────────────┘
 And final activation of right-half-maxmimize:
 ┌┬────────────────┬───────┬─────────┬┐
 ├┘                ├───────┤         ├┤
 │                 │       │         ├┤
 │                 │       │         ├┤
 │                 ├───────┘         ├┤
 │                 │                 └┤
 ├┬┐               ├┬┬┐               │
 └┴┴───────────────┴┴┴┴───────────────┘
 Where window is restored its size (but not position, since it it on different
 head now). Moving window in directions like left-half-maximize,
 top-half-maximize and bottom-half-maximize will behave in similar way depending
 on the layout of displays.
 Note, that only windows that are half-maximized vertically or horizontally can
 be moved to another screen due to the fact, that direction of movement of
 quarter-maximized windows is ambiguous. As for vertical/horizontal-maximize,
 since doesn't move the window but only stretch it vertically/horizontally this
 feature also doesn't apply.
 Snapping a window to the top
 ----------------------------
 You can now choose whether snapping a window to the top edge of the screen
 maximizes it to the top half (the previous and default behavior) or to the
 full screen by setting "SnapToTopMaximizesFullscreen" to "NO" or "YES",
 respectively.  This setting can also be changed by unchecking or checking
 "Snapping a window to the top maximizes it to the full screen" in the
 "Expert User Preferences" tab in WPrefs.app.
 Global defaults directory configuration
 ---------------------------------------
 You can now configure the global defaults directory, where the system
 WindowMaker, WMRootMenu, etc. files are stored, by running
    ./configure --with-defsdatadir=/path/to/defaults
 at build time.  The previous method, which only partially worked, involved
 defining the GLOBAL_DEFAULTS_SUBDIR macro.  This is no longer available.
 Note that the default location is ${sysconfdir}/WindowMaker.
 -- 0.95.7
 Window snapping
@@ -665,7 +411,7 @@ The 4 corner images will be copied in their original sizes and the rest will
 be scaled to the final panel size.
 background_image, width and height are optional. If you leave them out,
-a gray panel will be used. If your machine is not very fast, you may want
+a gray panel will be used. If your machine is not very fast, you may want 
 to use it.
@@ -688,7 +434,7 @@ Antialiased font support
 With the addition of Xft2 support in the WINGs library, now
 Window Maker can display antialiased text with TrueType or any scalable fonts.
-You can pick fonts for Window Maker in the Font configuration section of
+You can pick fonts for Window Maker in the Font configuration section of 
 WPrefs.
 Antialiased text is enabled by default, but can be disabled by adding
@@ -722,7 +468,7 @@ These are to be proplist format menus, for example:
 or, in case you want a submenu:
-(("Submenu",
+(("Submenu", 
 	("Foobar", EXEC, foobar),
 	("Blabla", EXEC, blabla)))
@@ -765,7 +511,7 @@ shading and unshading respectfully.
 However, to avoid unwanted triggers of shading/unshading the window, two
 consecutive mouse wheel events in the same direction are required. The
-trigger won't occur if the events are separated by more than a double-click's
+trigger won't occur if the events are separated by more than a double-click's 
 worth of time, which is technically speaking like making a double-click with
 the button that corresponds to the mouse wheel direction.
@@ -870,7 +616,7 @@ Less dependencies
 starting with 0.70.0 libPropList is no longer required to build Window
 Maker. PropList handling code was added to WINGs being now better
-integrated with all the rest. For more details check the Changelog and the
+integrated with all the rest. For more details check the Changelog and the 
 following files:
 ./WINGs/ChangeLog
 ./WINGs/NEWS
@@ -943,9 +689,9 @@ behavior regarding workspaces you can now (use WPrefs.app to do this).
 Client supplied icons
 ---------------------
-Window Maker saves the client supplied icons in
+Window Maker saves the client supplied icons in 
-~/GNUstep/Library/WindowMaker/CachedPixmaps in XPM format for later use
+~/GNUstep/Library/WindowMaker/CachedPixmaps in XPM format for later use 
-when the app is no longer running (to have the image to display for docked
+when the app is no longer running (to have the image to display for docked 
 icons for example).
 Until recently the XPM images saved by Window Maker were incorrect, but a
@@ -953,9 +699,9 @@ recent fix in the code to save XPM's fixed them. But with this fix, all
 previously saved XPM's in that directory are no longer readable (they give
 wrong images on screen or fail to load).
-To avoid the need for the user to fix this by hand editing WMWindowAttributes
+To avoid the need for the user to fix this by hand editing WMWindowAttributes 
-and removing all references to icons in ~/GNUstep/Library/WindowMaker/CachedPixmaps
+and removing all references to icons in ~/GNUstep/Library/WindowMaker/CachedPixmaps 
-which can be annoying, new code was added to Window Maker to permit the
+which can be annoying, new code was added to Window Maker to permit the 
 regeneration of images in ~/GNUstep/Library/WindowMaker/CachedPixmaps if they are missing.
 With this addition, all you need to do to fix your old broken images, is to
@@ -1057,7 +803,7 @@ performance increases can go up to 150%
 Weendoze Window Cycling (alt-tab)
 ---------------------------------
-Window cycling was changed to weendoze style.
+Window cycling was changed to weendoze style. 
 NoBorder Window Attribute
@@ -1153,7 +899,7 @@ arguments. To code new plugin, please see plugin.h for more information.
 User Menu
 ---------
-The user menu is now a compile time option disabled by default.
+The user menu is now a compile time option disabled by default. 
 Supply --enable-usermenu to configure to enable it.
@@ -1287,7 +1033,7 @@ New Options
 MenuStyle=<style>; will change the menu texture style.
 <style> can be:
-normal (default): for the traditional one texture per item, with bevels in
+normal (default): for the traditional one texture per item, with bevels in 
 each
 singleTexture: for a single texture that spans the whole menu, with bevels
@@ -1304,7 +1050,7 @@ where <texture> is any of the textures you normally use in titlebars and
 other places.
 If the style file/theme does not contain a ResizebarBack option, setstyle
-will automatically hack it so that wmaker will make the theme work like
+will automatically hack it so that wmaker will make the theme work like 
 before.
@@ -1405,7 +1151,7 @@ Full Screen Maximization
 The FullMaximize window attribute will allow the window to
 be maximized to the full size of the screen (ignoring anything
 like titlebar, resizebar, dock, panels etc). It should be useful
-for programs that must use the whole screen, like games or things
+for programs that must use the whole screen, like games or things 
 like presentation programs.
@@ -1414,7 +1160,7 @@ like presentation programs.
 KDE Application Menu script
 ---------------------------
-wkdemenu.pl is a converter from KDE application menu structures to wmaker
+wkdemenu.pl is a converter from KDE application menu structures to wmaker 
 menu that can be used as a piped menu. Look wkdemenu.sh for how to use it.
@@ -1444,14 +1190,14 @@ Window Maker has become a GNU program (part of the GNU Project).
 Title text drop shadow
 ----------------------
-drop shadow option added for titlebar text. This is a compile time
+drop shadow option added for titlebar text. This is a compile time 
 option which needs to be defined in src/wconfig.h after you run
 configure and before you run make.
 New options and syntax for your WindowMaker domain file are:
  Shadow = yes/no;
-  FShadowColor = <color>;
+  FShadowColor = <color>;  
  PShadowColor = <color>;
  UShadowColor = <color>;
  MShadowColor = <color>;
@@ -1515,7 +1261,7 @@ it will scale the pixmap by keeping the aspect ratio (maximize or maxpect).
 The option only works for workspace backgrounds.
 Also added IGNORE_PPOSITION compile time flag, which is equivalent
-to NoPPosition from fvwm.
+to NoPPosition from fvwm. 
@@ -1526,7 +1272,7 @@ to NoPPosition from fvwm.
 KDE and GNOME
 -------------
-Added full support for GNOME and KWM hints.
+Added full support for GNOME and KWM hints. 
 Read the INSTALL file to see how enable them.
 Everything in the so called GNOME window manager bla bla bla pseudo-spec is
@@ -1535,13 +1281,13 @@ implemented.
 As for KDE stuff, it implements 90% of everything kwm does, adds some
 Window Maker specific extensions to it and still uses half of the memory
 kwm does, which should be enough to let you dump kwm ;) For details on what
-exactly is implemented, see comments in src/kwm.c Read the README.KDE file
+exactly is implemented, see comments in src/kwm.c Read the README.KDE file 
 for more information.
 WARNING: Some KDE hints are badly designed, so doing things like using
 kpanel's desktop switcher/pager and Window Maker's internal workspace
-management functions to create, destroy and rename workspaces at the same
+management functions to create, destroy and rename workspaces at the same 
 time might cause unknown effects. To be on the safe side, only
 use either of them to manage workspaces. Switching workspaces is hopefully,
 safe, so you can switch workspaces from wherever you want.
@@ -1556,7 +1302,7 @@ workspaces. The WorkspaceBack is used as the default background image.
 Example:
-WorkspaceSpecificBack = ((solid, red), (cpixmap, ship.jpg, gray), (),
+WorkspaceSpecificBack = ((solid, red), (cpixmap, ship.jpg, gray), (), 
 				(dgradient, red, blue))
 This will set the background image of workspace 1 to (solid, 0),
@@ -1585,8 +1331,8 @@ WindowMaker/README.themes file.
 New Texture Type
 ----------------
-Textured gradients will tile a texture pixmap and combine it with a gradient,
+Textured gradients will tile a texture pixmap and combine it with a gradient, 
-using an arbitrary opaqueness.
+using an arbitrary opaqueness. 
 Syntax is (thgradient, <file>, <opaqueness>, <color1>, <color2>)
 	  (tvgradient, <file>, <opaqueness>, <color1>, <color2>)
@@ -1643,7 +1389,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 its area. Setting AUTO_RAISE_DELAY to a very
+soon as the mouse pointer enters it's 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.
@@ -1657,7 +1403,7 @@ the old format is still supported. The new format is documented
 in the WindowMaker/README.themes file.
-Root Menu
+Root Menu 
 ---------
 The -noext option for OPEN_MENU will strip whatever is after the last .
@@ -1685,7 +1431,7 @@ WDesktopLevel
 If you have a 5 button mouse and want to give some utility for
 the extra 2 buttons, edit the appropriate line in src/wconfig.h
-Clicking Button4 in the root window will switch you to the previous
+Clicking Button4 in the root window will switch you to the previous 
 workspace and Button5 will do that for the next.
@@ -1711,7 +1457,7 @@ Hysteresis for menu item selection
 Hopefully it's intelligent enough, so you won't notice it.
 In case you want to know what's it, it's equivalent to that
-(insanely long) 2 second delay present in that Windoze95 menu,
+(insanely long) 2 second delay present in that Windoze95 menu, 
 but more useful than annoying (I hope :). To see it, do the following
 with your current wmaker version and later with 0.20.3:
@@ -1800,7 +1546,7 @@ make
 make install
 You also don't need to worry about GNOME libPropList incompatibilities
-anymore.
+anymore. 
 Bug with focus lost in sloppy focus fixed
@@ -1839,11 +1585,11 @@ optimize it and remove a few hundred of bytes, then use --disable-sound or
 --- 0.20.0
-
+  
 Multihead support. wmaker will now manage all screens that are attached to the
-display.
+display. 
 ------------------------------------------------------------------------------
-
+  
 It does so from a single process (instead of spawning a new process for each
 screen, like fvwm does). This keeps memory usage a lot lower than fvwm.
@@ -1941,7 +1687,7 @@ c3 can be v or h (meaning vertical or horizontal)
 case is insensitive.
-For example,
+For example, 
 IconPosition = blh;
 is the old iconPosition position.
@@ -1998,7 +1744,7 @@ submenus was removed, so a menu that looked like:
 ( Applications,
  ("Xterm", EXEC, "xterm"),
-  (
+  ( 
    (Paint,
  	("Gimp", EXEC, "gimp"),
 	("XV", EXEC, "xv")
@@ -2022,7 +1768,7 @@ Misc
 ----
 NUMLOCK_HACK is back. This time it works and is enabled by default.
-If you think you don't need it and promise me that you won't send
+If you think you don't need it and promise me that you won't send 
 "bug" reports saying that shortcuts stop working after a while, you can
 disable it ;) It will save some memory and CPU.
@@ -2066,7 +1812,7 @@ New Options
 -----------
 PixmapPath was split to PixmapPath and IconPath. PixmapPath is the path
-for the pixmaps used as textures and IconPath is for the icons.
+for the pixmaps used as textures and IconPath is for the icons. 
 Don't forget to add IconPath to your current configuration file.
 There's also a new library in ~/GNUstep/Library/Icons. You should place
@@ -2112,7 +1858,7 @@ Misc. Changes
 Removed --with-gnome and made MWM_HINTS defined by default.
 This means that "GNOME support" will work with no additional
-flags passed to configure.
+flags passed to configure. 
 Added support for KDE, by adding a DisableWorkspaceMouseActions option.
 Set it to YES and run krootwm to be able to use everything in kfm.
@@ -2139,7 +1885,7 @@ Interface Changes
 -----------------
 ** Configuration of docked applications is now done in a panel instead of
-in the menu.
+in the menu. 
 ** Added a command menu for application icons
@@ -2317,7 +2063,7 @@ Now, selecting icons is as easy as clicking in the file name in a list.
 Simplified Options
 ------------------
-IconSlideStep, IconSlideSlowDown and IconSlideDelay were merged to
+IconSlideStep, IconSlideSlowDown and IconSlideDelay were merged to 
 IconSlideSpeed
 MenuScrollStep and MenuScrollDelay were merged to MenuScrollSpeed
@@ -2572,7 +2318,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 its stdout to construct menu.
+   // opens command and uses it's stdout to construct menu.
   // Command's output must be a valid menu description.
   OPEN_MENU | command
 3. Directory handling.
@@ -3115,7 +2861,7 @@ thus, making a menu with entries like:
 (mhgradient, colorX, color1, color2, color3, ..., colorn)
 (mvgradient, colorX, color1, color2, color3, ..., colorn)
-You can put any number of colors >= 2.
+You can put any number of colors >= 2. 
 colorX is a special color that is used as the solid color of the
 texture when wmaker needs a solid color (like in miniwindow title and
@@ -3175,7 +2921,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 its key to Dock. For example, if your WMDock
+file in WMState and set it's key to Dock. For example, if your WMDock
 contains:
 {
@@ -3206,13 +2952,13 @@ then you can merge both and have:
 The configuration format has changed!! Forget everything about the old
 format.
-dockapp was removed and the old version will not work anymore.
+dockapp was removed and the old version will not work anymore. 
 the dialogs require tcl/tk. they will be rewritten in plain C
 These are some tips for people upgrading from older versions and don't want
-too many unused files around. There is no problem if you decide to keep
+too many unused files around. There is no problem if you decide to keep 
 them for a while.
 	you can  rm -r ~/gnustep if you don't want anything from there
@@ -8,7 +8,7 @@
 				     by
-		      	     Alfredo K. Kojima
+		      	     Alfredo K. Kojima 
 			 	 Dan Pascu
@@ -21,19 +21,19 @@
 		Congratulations! You have purchased an extremely fine
-	device that would give you thousands of years of trouble-free
+	device that would give you thousands of years of trouble-free 
 	service, except	that you undoubtedly will destroy it via some
 	typical bonehead consumer maneuver. Which is why we ask you
 	to PLEASE FOR GOD'S SAKE READ THIS OWNER'S MANUAL CAREFULLY
 	BEFORE YOU UNPACK THE DEVICE. YOU ALREADY UNPACKED IT, DIDN'T
-	YOU? YOU UNPACKED IT AND PLUGGED IT IN AND TURNED IT ON AND
+	YOU? YOU UNPACKED IT AND PLUGGED IT IN AND TURNED IT ON AND 
 	FIDDLED WITH THE KNOBS, AND NOW YOUR CHILD, THE	SAME CHILD WHO
 	ONCE SHOVED A POLISH SAUSAGE INTO YOUR VIDEOCASSETTE RECORDER
 	AND SET IT ON "FAST FORWARD", THIS CHILD ALSO IS FIDDLING
-	WITH THE KNOBS, RIGHT?  AND YOU'RE JUST NOW STARTING TO READ
+	WITH THE KNOBS, RIGHT?  AND YOU'RE JUST NOW STARTING TO READ 
-	THE INSTRUCTIONS, RIGHT???  WE MIGHT AS WELL JUST BREAK THESE
+	THE INSTRUCTIONS, RIGHT???  WE MIGHT AS WELL JUST BREAK THESE 
-	DEVICES	RIGHT AT THE FACTORY BEFORE WE SHIP THEM OUT, YOU
+	DEVICES	RIGHT AT THE FACTORY BEFORE WE SHIP THEM OUT, YOU 
-	KNOW THAT?
+	KNOW THAT? 
 				-- Dave	Barry, "Read This First!"
@@ -67,7 +67,7 @@ Documentation
 Read before asking.
 * README files all over the source tree have info related to the stuff
-in the directories.
+in the directories. 
 * INSTALL has installation instructions and some troubleshooting tips.
 You're meant to read it if you are compiling the sources.
@@ -112,7 +112,7 @@ Directories & Files in the Source Tree
 * util/ has various utility programs.
-* WPrefs.app/ is the configuration program.
+* WPrefs.app/ is the configuration program. 
 * src/wconfig.h has compile time options you can change to select some
  options/features and other stuff.
@@ -129,8 +129,8 @@ HELP ME!!!
 ==========
 There is a mailing list for discussing Window Maker at
-wmaker-user@googlegroups.com.  To subscribe to it, visit
+wmaker-user@lists.windowmaker.org To subscribe to it, send a message to
-https://groups.google.com/forum/#!forum/wmaker-user
+wmaker-user-subscribe@lists.windowmaker.org
 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 its
+same time. You might get unexpected behavior when Window Maker updates it's
 configuration files.
 If you really desire to do this, try running Window Maker with the command line
@@ -203,13 +203,13 @@ while keeping a nice appearance and good functionality, follow the items bellow:
  fully supported). Make sure to always keep NumLock and ScrollLock turned off.
 - turn on DisableAnimations. You can also specify --disable-animation at compile
  time to the configure script.
- strip down the default IconPath and PixmapPath entries to contain only
+- strip down the default IconPath and PixmapPath entries to contain only 
-  the paths that you really have in your system.
+  the paths that you really have in your system. 
 - do not use large images in the root background
 - 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 its value to a value like the number of different icons you
+  memory usage, set it's value to a value like the number of different icons you
  use. Also, disable anti-aliased text support in ~/GNUstep/Defaults/WMGLOBAL.
@@ -225,7 +225,7 @@ To enable it, hit the Control+Shift+NumLock or Shift+NumLock key combination.
 You should hear the speaker beeping. To disable it, do the same thing.
 To control the mouse the numeric keypad is used as follows:
- 4 (left arrow), 7 (Home), 8 (up arrow), 9 (PgUp), 6 (right arrow),
+- 4 (left arrow), 7 (Home), 8 (up arrow), 9 (PgUp), 6 (right arrow), 
 3 (PgDn), 2 (down arrow) and 1 (End) move the mouse to the corresponding
 direction;
 - holding one of the above keys and then holding the 5 key will move the
@@ -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@googlegroups.com
+to wmaker-dev@lists.windowmaker.org
@@ -23,7 +23,7 @@ They have the following meanings:
    none     The cursor is inherited from the parent window (often,
             this means the root window).
-
+            
    builtin  Use the cursor named <cursor-name> from X11's set of
             built-in cursors.  The names are the same as you use
             with 'xsetroot -cursor_name'.  See the xsetroot(1) man
@@ -46,7 +46,7 @@ Maybe some day:
 Never: (so, dont even bother to ask)
 ======
 - different themes for each workspace. Unless you give us a SGI/Power Onyx
-  with 2 CPUs ;).
+  with 2 CPUs ;). 
 - anything that requires the mouse pointer to be jumped by WindowMaker to
  somewhere. This is *terrible* behaviour. And it's not just IMO.
 - rewrite to use Gtk... I wont even bother to explain why...
@@ -134,7 +134,7 @@ Sending the patch to the mailing list
 Send your patches to:
-wmaker-dev@googlegroups.com
+wmaker-dev@lists.windowmaker.org
 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@googlegroups.com>"
+git config sendemail.to "Window Maker Devel <wmaker-dev@lists.windowmaker.org>"
 # If you're sending more than 1 patch, you may be interested in having an
 # introduction mail for the batch:
@@ -205,7 +205,7 @@ Example .gitconfig
        ui = auto
 [apply]
        whitespace = fix
-
+	
@@ -63,7 +63,7 @@ Changes since wmaker 0.80.1:
 - Fixed small memory leak in the font panel code.
 - Fixed call to qsort in WMSortArray.
 - Fixed a memleak in the file panel.
- Double/triple-click selection in text widgets
+- Double/triple-click selection in text widgets 
  (Vitaly Ovtchinnikov <ov@rbcmail.ru>)
 - Fixed bug in tableview (clicked row callback got incorrect row)
  (Carlos Torres <vlaadbrain@operamail.com>)
@@ -102,7 +102,7 @@ Changes since wmaker 0.70.0:
 ............................
 - added an internal strcasecmp() (only on systems where is not present)
- removed some redundant includes of ../src/config.h when wconfig.h is
+- removed some redundant includes of ../src/config.h when wconfig.h is 
  included too
 - removed a wsyserror() message when reading a property list from file
  (the programmer should decide if to give that message or just ignore).
@@ -117,7 +117,7 @@ Changes since wmaker 0.65.0:
  related error when text was selected in a textfiled.
 - moved wstrdup(), wstrconcat() and wstrappend() from memory.c to string.c
 - added property list handling code making libPropList unnecessary and
-  obsolete. Backward compatibility is provided through the
+  obsolete. Backward compatibility is provided through the 
  WINGs/proplist-compat.h header file which has #defines from old libPropList
  function names to new function names with minimal changes. Read this
  header file and the NEWS file for more details about this subject.
@@ -197,7 +197,7 @@ changes since wmaker 0.63.1:
 changes since wmaker 0.62.1:
 ............................
 - added WRuler widget
- added WText widget (rtf multiline text widget)
+- added WText widget (rtf multiline text widget) 
 	Nwanua Elumeze <nwanua@colorado.edu>
 - added a new AUTO option for the UseMultiByte option
 - added WMRaiseWidget()/WMLowerWidget()
@@ -217,7 +217,7 @@ changes since wmaker 0.62.1:
 - added WMGetListSelectedItems()
 - added WMSetListAllowMultipleSelection(), WMListAllowsMultipleSelection().
 - added WMSetListAllowEmptySelection(), WMListAllowsEmptySelection().
- WMListSelectionDidChangeNotification passes NULL as the notification
+- WMListSelectionDidChangeNotification passes NULL as the notification 
  client data (previously passed the selected item row).
 - added WMUnselectListItem(), WMSelectAllListItems(), WMUnselectAllListItems()
 - better behavior of wheel mices in WMList. Simple mouse wheel events
@@ -243,8 +243,8 @@ changes since wmaker 0.62.1:
  str1 with str2 and returns that in a newly malloc'ed string.
  Be sure to rename wstrappend with wstrconcat in your code too, else
  hazardous things can happen!
- implemented a new wstrappend() function. wstrappend(dst, src) will append
+- implemented a new wstrappend() function. wstrappend(dst, src) will append 
-  src to dst modifing dst and returning a pointer to it. No new string is
+  src to dst modifing dst and returning a pointer to it. No new string is 
  generated, except if dst is NULL, in which case its the same as calling
  wstrdup(src).
  dst can ONLY be NULL or a dynamically allocated string (obtained from a
@@ -334,7 +334,7 @@ changes since wmaker 0.61.1:
  item that is beyond the total number of items present in the popup button.
 - changed names of functions for SplitView to be consistent. Some contained
  SubView while other Subview. Now all have Subview.
- fixed a bug in how input events were posted. Establishing 2 or more input
+- fixed a bug in how input events were posted. Establishing 2 or more input 
  handlers for the same file descriptor, handling different (read/write/except)
  events, caused wrong handlers to be called.
 - Reimplemented the input and idle handlers with WMBag to avoid a functional
@@ -346,7 +346,7 @@ changes since wmaker 0.61.1:
    2. if new_size is 0, call wfree(old), and return NULL.
    3. if both old is a valid pointer and new_size>0, call realloc.
 - added wstrerror(int errnum) to return the string associated with errnum.
- new wsyserrorwithcode(int error, const char* fmt, ...), similar to
+- new wsyserrorwithcode(int error, const char* fmt, ...), similar to 
  wsyserror(), but printing the message for the specified error code.
 - added 3 new classes: WMData, WMHost and WMConnection
 - fixed a big memory leak in the color panel code (from Pascal Hofstee).
@@ -357,7 +357,7 @@ changes since wmaker 0.61.0:
 - added WMGetTextFieldFont()
 - escape key in panels (craig nellist <crn@ozemail.com.au>)
- applied patch with fixes and enhancements to textfield
+- applied patch with fixes and enhancements to textfield 
 	(Franck Wolff <wolff@cybercable.fr>)
 - changed WMList to use WMBag internally, instead of a linked list
 - replaced WMAddSortedListItem() with WMSortListItems()
@@ -437,10 +437,10 @@ changes since wmaker 0.53.0:
 	The notifications will still work, but using the delegate is preferable
  How to convert old code to delegate callbacks:
-  	1 - create a variable (static or dynamic) of the type of the
+  	1 - create a variable (static or dynamic) of the type of the 
 	    delegate for the widget type.
-	2 - Replace the notification observers with the equivalent
+	2 - Replace the notification observers with the equivalent 
-	    delegate callbacks.
+	    delegate callbacks. 
 	3 - Put pointers to the callbacks in the delegate variable.
 	Take a look in wfilepanel.c to see how it is used there.
@@ -480,7 +480,7 @@ changes since wmaker 0.51.2:
 - added WMColorWellDidChangeNotification
 - added wfindfileinarray()
- fixed bug in window title setting
+- fixed bug in window title setting 
 	(MANOME Tomonori <manome@itlb.te.noda.sut.ac.jp>)
 changes since wmaker 0.51.1:
@@ -611,7 +611,7 @@ I don't remember everything, but here it goes:
 The same panel will be reused every time you call for it, unless you free it.
 - changed semantics of WMCreateFont() so that it returns NULL if the requested
  font can't be loaded
- removed WMAddDestroyCallback()
+- removed WMAddDestroyCallback() 
 - fixed bug in WMRemovePopUpButtonItem()
 - added function for user specified item height in WMList
 - added WMSetPopUpButtonText(). It will set the default text in the button
@@ -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 \
-	@XFT_LIBS@ @INTLIBS@ @XLIBS@
+	@XFTLIBS@ @INTLIBS@ @XLIBS@
 colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
@@ -5,26 +5,26 @@ AUTOMAKE_OPTIONS =
 # is this a kluge? if so, how should i do it?
 includedir = @includedir@/WINGs
-include_HEADERS = wtableview.h wtabledelegates.h
+include_HEADERS = wtableview.h wtabledelegates.h 
 lib_LTLIBRARIES = libExtraWINGs.la
 noinst_PROGRAMS = test
-EXTRA_DIST =
+EXTRA_DIST = 
 libExtraWINGs_la_SOURCES = 	\
 	wtableview.c \
 	wtabledelegates.c \
 	wtableview.h \
-	wtabledelegates.h
+	wtabledelegates.h 
 AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
 LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	@XFT_LIBS@ @INTLIBS@
+	@XFTLIBS@ @INTLIBS@
 test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
@@ -11,15 +11,15 @@ WMTableColumnDelegate *WTCreateStringDelegate(WMTableView *table);
 WMTableColumnDelegate *WTCreatePixmapStringDelegate(WMTableView *parent);
 WMTableColumnDelegate *WTCreateStringEditorDelegate(WMTableView *table);
-
+    
 WMTableColumnDelegate *WTCreateEnumSelectorDelegate(WMTableView *table);
 void WTSetEnumSelectorOptions(WMTableColumnDelegate *delegate,
                              char **options, int count);
-
+    
 WMTableColumnDelegate *WTCreateBooleanSwitchDelegate(WMTableView *parent);
-
+    
 #ifdef __cplusplus
 }
 #endif
-
+    
 #endif
@@ -8,17 +8,19 @@ 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@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@
+libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
 libWUtil_la_LIBADD = @LIBBSD@
 EXTRA_DIST = BUGS make-rgb Examples Extras Tests
-# wbutton.c
+# wbutton.c 
 libWINGs_la_SOURCES = 	\
 	configuration.c \
 	dragcommon.c \
@@ -87,12 +89,11 @@ libWUtil_la_SOURCES = 	\
 	wutil.c
-AM_CFLAGS = @PANGO_CFLAGS@
+AM_CFLAGS =
 AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
-	 -I$(top_srcdir)/WINGs/WINGs -I$(top_builddir)/WINGs/WINGs \
+	 -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-	 -I$(top_builddir)/wrlib -I$(top_srcdir)/src \
+	@XFTFLAGS@ @HEADER_SEARCH_PATH@
 	@XFT_CFLAGS@ @HEADER_SEARCH_PATH@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = WINGs.pc WUtil.pc
@@ -106,8 +107,8 @@ WINGs.pc: Makefile
 	@echo 'Version: $(VERSION)' >> $@
 	@echo 'Requires: wrlib WUtil' >> $@
 	@echo 'Libs: $(lib_search_path) -lWINGs' >> $@
-	@echo 'Libs.private: $(XFT_LIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
+	@echo 'Libs.private: $(XFTLIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
-	@echo 'Cflags: $(inc_search_path) @PANGO_CFLAGS@' >> $@
+	@echo 'Cflags: $(inc_search_path)' >> $@
 WUtil.pc: Makefile
 	@echo "Generating $@"
@@ -388,13 +388,13 @@ Property lists handling code
 ----------------------------
 Code to handle property lists was added to WINGs. It is more robust
-than the libPropList code, mostly because some conflicting concepts
+than the libPropList code, mostly because some conflicting concepts 
 borrowed from UserDefaults (which libPropList use) are no longer used in
 the WINGs property lists code. These borrowed concepts conflicted with the
 retain/release mechanism of property lists and could lead in certain cases
 to segmentation faults when executing libPropList based code. But the worse
 part was that these libPropList problems were practically unsolvable without
-removing one of those conflicting concepts and without a complete redesign.
+removing one of those conflicting concepts and without a complete redesign. 
 The new WINGs property lists code is also better integrated with the other
 data types from WINGs and is actively maintained.
@@ -469,10 +469,10 @@ All WM...IconImage() functions operate on RImages
    and will also convert the RImage to a WMPixmap with a threshold of 128
    and will use that pixmap for the appicon image. If that doesn't satisfy
    you, you can make a call to WMSetApplicationIconPixmap() on your own to
-    set whatever WMPixmap you see fit for the appicon.
+    set whatever WMPixmap you see fit for the appicon. 
 - WMSetApplicationIconPixmap() will set the WMPixmap to be used for the
-    appicon and for the panels
+    appicon and for the panels 
 If you use only one of the above functions, the corresponding image/pixmap
@@ -3,35 +3,35 @@
                                   by
-                          Alfredo Kengi Kojima
+                          Alfredo Kengi Kojima 
-
+                  
                          kojima@windowmaker.info
-   WINGs is a small widget set with the N*XTSTEP look and feel. Its API
+   WINGs is a small widget set with the N*XTSTEP look and feel. It's API
-is inspired in OpenStep and its implementation borrows some ideas
+is inspired in OpenStep and it's 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 its design is a little sloppy,
+   The library is limited and it's design is a little sloppy, 
-so it's not intended to build large or complex applications, like
+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
+and faster than say, Motif or even Athena. Knowing Xlib will help you to 
-workaround some of its limitations, although you'll probably be able to
+workaround some of it's limitations, although you'll probably be able to 
 write something like a trivial tic-tac-toe game without knowing much Xlib.
-   Some of its functions are designed to support the Window Maker window
+   Some of it's functions are designed to support the Window Maker window
-manager (see http://windowmaker.info) In fact, its primary role is to
+manager (see http://windowmaker.info) In fact, it's 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
 reference manual, distributed as a PDF by Apple. The function names,
-structs and most of the intrinsics are very close to OpenStep classes.
+structs and most of the intrinsics are very close to OpenStep classes. 
 Internationalization:
@@ -66,7 +66,7 @@ Widgets provided by WINGs:
 - input box
 - file panel
 - color panel
- alert panel
+- alert panel 
 - font panel
 If you think you can code the following, please do. They are needed by
@@ -2,14 +2,14 @@
 AUTOMAKE_OPTIONS =
-noinst_PROGRAMS = wtest wmquery wmfile testmywidget
+noinst_PROGRAMS = wtest wmquery wmfile testmywidget 
 LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	@XFT_LIBS@ @INTLIBS@ @XLIBS@
+	@XFTLIBS@ @INTLIBS@ @XLIBS@ 
-testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
+testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
 wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
@@ -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\" @XFT_CFLAGS@ @HEADER_SEARCH_PATH@
+	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
@@ -8,16 +8,16 @@ ftp.windowmaker.info</u></font><Br>
 </center>
 <b><i>Window Maker</b>
-<Img src=upbtn.xpm></i>is the GNU window manager
+<Img src=upbtn.xpm></i>is the GNU window manager 
 for the X Window System. It was
 designed to emulate the look and feel of part of the NEXTSTEP(tm) GUI. Its
-supposed to be relatively fast and small, feature rich, easy to configure and
+supposed to be relatively fast and small, feature rich, easy to configure and 
 easy to use, with a simple and elegant appearance borrowed from NEXTSTEP(tm).
 <p>
-<b>Window Maker</b> was designed keeping integration with GNUstep in
+<b>Window Maker</b> was designed keeping integration with GNUstep in 
 mind and is the
 "official" window manager for it. It is also part of the GNU project
-(<u>www.gnu.org</u>)
+(<u>www.gnu.org</u>) 
 <p>
 <b>What is <i>GNUstep?</i></b><p>
@@ -5,14 +5,4 @@ AUTOMAKE_OPTIONS =
 # is this a kluge? if so, how should i do it?
 includedir = @includedir@/WINGs
-BUILT_SOURCES = WINGsP.h
+include_HEADERS = WINGs.h WUtil.h 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 $@  $<
@@ -795,8 +795,6 @@ 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);
@@ -1841,17 +1839,10 @@ 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,
@@ -5,7 +5,9 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-@USE_PANGO@#include <pango/pango.h>
+#ifdef USE_PANGO
 #include <pango/pango.h>
 #endif
 #include <WINGs/WINGs.h>
@@ -252,7 +254,7 @@ typedef struct W_Screen {
    Atom wmIconDragOffsetAtom;
    Atom wmStateAtom;              /* WM_STATE */
-
+    
    Atom utf8String;
    Atom netwmName;
@@ -457,7 +459,9 @@ typedef struct W_Font {
    short refCount;
    char *name;
-@USE_PANGO@    PangoLayout *layout;
+#ifdef USE_PANGO
    PangoLayout *layout;
 #endif
 } W_Font;
 #define W_FONTID(f)		(f)->font->fid
@@ -193,16 +193,6 @@ 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 ]-------------------------------------------------- */
@@ -0,0 +1,33 @@
 #!/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
@@ -0,0 +1,33 @@
 #!/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
@@ -107,8 +107,7 @@ void *wmalloc(size_t size)
 			}
 		}
 	}
-	if (tmp != NULL)
+	memset(tmp, 0, size);
 		memset(tmp, 0, size);
 	return tmp;
 }
@@ -71,7 +71,7 @@ POTFILES += \
 SUFFIXES = .po .mo
-.po.mo:
+.po.mo: 
 	$(AM_V_GEN)$(MSGFMT) -c -o $@ $<
@@ -3,10 +3,10 @@
 #
 # Initial translation
 #   Gudio Scholz <guido.scholz@bayernline.de>
-#
+# 
 # Adapted to versions 0.80 ff.
 #   Torsten Marek <shlomme@gmx.net>
-#
+# 
 msgid ""
 msgstr ""
@@ -1,14 +1,14 @@
 # Translation into Western Frisian for Window Maker
-# Copyright (C) 2015-2016 Window Maker Developers Team
+# Copyright (C) 2015 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.6+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-21 16:19+0100\n"
+"POT-Creation-Date: 2015-06-14 16:10+0200\n"
-"PO-Revision-Date: 2016-01-21 00:00+0000\n"
+"PO-Revision-Date: 2015-06-14 00:00+0000\n"
 "Last-Translator: Alwin <translations@ziggo.nl>\n"
 "Language-Team: Western Frisian\n"
 "Language: fy\n"
@@ -99,7 +99,7 @@ msgstr "foartidich bestânsein, ferwachte in nije rigel nei '\\'"
 #, c-format
 msgid "reached end of file while searching '*/' for comment started at line %d"
 msgstr ""
-"bestânsein berikt by sykjen nei '*/' foar kommentaar begûnen op rigel %d"
+"bestânsein berikt by sykje nei '*/' foar kommentaar begûnen op rigel %d"
 #: ../../WINGs/menuparser.c:344
 msgid "missing closing double-quote before end-of-line"
@@ -111,7 +111,7 @@ msgstr "ûntbrekkend slutend inkeld oanhelteken foar rigelein"
 #: ../../WINGs/menuparser.c:380
 msgid "too many nested macro expansions, breaking loop"
-msgstr "te folle neske makro-útwurkingen, syklus ôfbrutsen"
+msgstr "te folle neste makro-útwurkingen, syklus ôfbrutsen"
 #: ../../WINGs/menuparser.c:439
 #, c-format
@@ -140,7 +140,7 @@ msgstr "ûntbrekkende slutende '%c' yn bestânsnammeopjefte"
 #: ../../WINGs/menuparser.c:503
 msgid "too many nested #include's"
-msgstr "te folle neske #include's"
+msgstr "te folle neste #include's"
 #: ../../WINGs/menuparser.c:568
 #, c-format
@@ -150,11 +150,11 @@ msgstr "koe bestân \"%s\" net fine foar #include"
 #: ../../WINGs/menuparser.c:589
 #, c-format
 msgid "missing macro name argument to #%s"
-msgstr "ûntbrekkend makronamme-argumint by #%s"
+msgstr "ûntbrekkend makronammeargumint by #%s"
 #: ../../WINGs/menuparser.c:600
 msgid "too many nested #if sequences"
-msgstr "te folle neske #if-rigen"
+msgstr "te folle neste #if-rigen"
 #: ../../WINGs/menuparser.c:626 ../../WINGs/menuparser.c:643
 #, c-format
@@ -168,7 +168,7 @@ msgstr "gjin makronamme fûn foar #define"
 #: ../../WINGs/menuparser_macros.c:187
 #, c-format
 msgid "premature end of file while reading arg-list for macro \"%s\""
-msgstr "foartidich bestânsein by ynlêzen arg.-list foar makro \"%s\""
+msgstr "foartidich bestânsein by ynlêze arg.-list foar makro \"%s\""
 #: ../../WINGs/menuparser_macros.c:194
 #, c-format
@@ -196,7 +196,7 @@ msgstr ""
 #: ../../WINGs/menuparser_macros.c:253
 #, c-format
 msgid "macro \"%s\" already defined, ignoring redefinition"
-msgstr "makro \"%s\" al definiearre, negearret werdefiniearjen"
+msgstr "makro \"%s\" al definiearre, negearret werdefiniearje"
 #: ../../WINGs/menuparser_macros.c:346
 #, c-format
@@ -225,7 +225,7 @@ msgstr "te folle arguminten foar makro \"%s\", ferwachte allinnich %d"
 #: ../../WINGs/menuparser_macros.c:530
 #, c-format
 msgid "premature end of line while searching for arguments to macro \"%s\""
-msgstr "foartidich rigelein by sykjen nei arguminten by makro \"%s\""
+msgstr "foartidich rigelein by sykje nei arguminten by makro \"%s\""
 #: ../../WINGs/menuparser_macros.c:536
 #, c-format
@@ -345,7 +345,7 @@ msgstr "koe grutte foar bestân '%s' net krije"
 #: ../../WINGs/proplist.c:1531
 #, c-format
 msgid "error reading from file '%s'"
-msgstr "flater by ynlêzen bestân '%s'"
+msgstr "flater by ynlêze bestân '%s'"
 #: ../../WINGs/proplist.c:1578
 #, c-format
@@ -355,32 +355,32 @@ msgstr "%s:koe menubestân net iepenje"
 #: ../../WINGs/proplist.c:1660
 #, c-format
 msgid "mkstemp (%s) failed"
-msgstr "oanmeitsjen unyk tydlik bestân (%s) mislearre"
+msgstr "oanmeitsje unyk tydlik bestân (%s) mislearre"
 #: ../../WINGs/proplist.c:1670
 #, c-format
 msgid "mktemp (%s) failed"
-msgstr "oanmeitsjen tydlik bestân (%s) mislearre"
+msgstr "oanmeitsje tydlik bestân (%s) mislearre"
 #: ../../WINGs/proplist.c:1677
 #, c-format
 msgid "open (%s) failed"
-msgstr "iepenjen (%s) mislearre"
+msgstr "iepenje (%s) mislearre"
 #: ../../WINGs/proplist.c:1684
 #, c-format
 msgid "writing to file: %s failed"
-msgstr "skriuwen nei bestân: %s mislearre"
+msgstr "skriuwe nei bestân: %s mislearre"
 #: ../../WINGs/proplist.c:1693
 #, c-format
 msgid "fclose (%s) failed"
-msgstr "ôfsluten stream (%s) mislearre"
+msgstr "ôfslute stream (%s) mislearre"
 #: ../../WINGs/proplist.c:1701
 #, c-format
 msgid "rename ('%s' to '%s') failed"
-msgstr "omneamen ('%s' nei '%s') mislearre"
+msgstr "omneame ('%s' nei '%s') mislearre"
 #: ../../WINGs/proplist.c:1772
 #, c-format
@@ -388,14 +388,14 @@ msgid "Could not create component %s"
 msgstr "Koe komponint %s net oanmeitsje"
 #: ../../WINGs/userdefaults.c:72
-msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
+msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
-msgstr "fariabele WMAKER_USER_ROOT, definiearre mei ûnjildich paad, net brûkt"
+msgstr "fariabele GNUSTEP_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
 #, c-format
 msgid "cannot read domain from file '%s' when syncing"
-msgstr "kin domeinbestân '%s' net ynlêze by syngronisearjen"
+msgstr "kin domeinbestân '%s' net ynlêze by syngronisearje"
 #: ../../WINGs/dragcommon.c:60
 #, c-format
@@ -414,11 +414,11 @@ msgstr "net-stipe ferzje %i foar XDND-berjocht by binnen gean"
 #: ../../WINGs/dragsource.c:163
 msgid "XDND selection lost during drag operation..."
-msgstr "XDND-seleksje ferlern ûnder fersleephanneling..."
+msgstr "XDND-seleksje ferlern by fersleephanneling..."
 #: ../../WINGs/dragsource.c:758
 msgid "could not get XDND version for target of drop"
-msgstr "koe XDND-ferzje net krije foar doel fan ferslepen"
+msgstr "koe XDND-ferzje net krije foar doel fan ferslepe"
 #: ../../WINGs/dragsource.c:774
 msgid "could not get ownership of XDND selection"
@@ -456,7 +456,7 @@ msgstr "Kleuren"
 #: ../../WINGs/wcolorpanel.c:568 ../../WINGs/wcolorpanel.c:2720
 msgid "Brightness"
-msgstr "Helderens"
+msgstr "Helderheid"
 #: ../../WINGs/wcolorpanel.c:570 ../../WINGs/wcolorpanel.c:644
 #: ../../WINGs/wcolorpanel.c:675 ../../WINGs/wcolorpanel.c:706
@@ -558,7 +558,7 @@ msgstr "Nij..."
 msgid ""
 "Color Panel: Could not create directory %s needed to store configurations"
 msgstr ""
-"Kleurepaniel: Koe map %s, nedich om ynstellingen te bewarjen, net oanmeitsje"
+"Kleurepaniel: Koe map %s, nedich om ynstellingen te bewarje, net oanmeitsje"
 #. Delete the file, it doesn't belong here
 #: ../../WINGs/wcolorpanel.c:1176 ../../WINGs/wcolorpanel.c:3073
@@ -568,7 +568,7 @@ msgstr "Bestânsflater"
 #: ../../WINGs/wcolorpanel.c:1177
 msgid "Could not create ColorPanel configuration directory"
-msgstr "Koe ynstellingemap Kleurepaniel net oanmeitsje"
+msgstr "Koe ynstellingenmap Kleurepaniel net oanmeitsje"
 #: ../../WINGs/wcolorpanel.c:1178 ../../WINGs/wcolorpanel.c:3074
 #: ../../WINGs/wcolorpanel.c:3079 ../../WINGs/wcolorpanel.c:3104
@@ -593,7 +593,7 @@ msgstr "Fersêding"
 #: ../../WINGs/wcolorpanel.c:2788
 msgid "Hue"
-msgstr "Tint"
+msgstr "Tinte"
 #: ../../WINGs/wcolorpanel.c:3012
 msgid "Open Palette"
@@ -610,7 +610,7 @@ msgstr "kin bestân %s net ferwiderje"
 #: ../../WINGs/wcolorpanel.c:3078
 msgid "Couldn't remove file from Configuration Directory !"
-msgstr "Koe bestân net ferwiderje út ynstellingemap!"
+msgstr "Koe bestân net ferwiderje út ynstellingenmap!"
 #: ../../WINGs/wcolorpanel.c:3103
 msgid "Rename"
@@ -737,12 +737,12 @@ msgstr "Bestân"
 #: ../../WINGs/wfilepanel.c:719
 #, c-format
 msgid "Removing %s failed: %s"
-msgstr "Ferwiderjen %s mislearre: %s"
+msgstr "Ferwiderje %s mislearre: %s"
 #: ../../WINGs/wfilepanel.c:751
 #, c-format
 msgid "An error occurred browsing '%s'."
-msgstr "Der trede in flater op by blêdzjen troch '%s'."
+msgstr "Der trede in flater op by blêdzje troch '%s'."
 #: ../../WINGs/wfilepanel.c:754
 #, c-format
@@ -799,7 +799,7 @@ msgstr "Koe biblioteek 'lettertype ynstelle' net inisjalisearje\n"
 #: ../../WINGs/widgets.c:446
 #, c-format
 msgid "WINGs: could not load widget images file: %s"
-msgstr "WINGs: Koe ôfbyldingebestân bestjoeringseleminten net lade: %s"
+msgstr "WINGs: Koe ôfbyldingenbestân bestjoeringseleminten net lade: %s"
 #: ../../WINGs/widgets.c:542
 #, c-format
@@ -824,7 +824,7 @@ msgstr "0   inch"
 #: ../../WINGs/wtextfield.c:494
 msgid "only left alignment is supported in textfields"
-msgstr "allinnich lofts rjochtsjen wurdt stipe yn tekstfjilden"
+msgstr "allinnich lofts rjochtsje wurdt stipe yn tekstfjilden"
 #: ../../WINGs/wwindow.c:160
 msgid "window title conversion error... using STRING encoding"
@@ -833,3 +833,42 @@ msgstr "finstertitelomsettingsflater... brûkt STRING-kodearring"
 #: ../../WINGs/wwindow.c:181
 msgid "icon title conversion error... using STRING encoding"
 msgstr "ikoantitelomsettingsflater... brûkt STRING-kodearring"
 # Keep next entries for wmaker-0.95.6
 msgid "Could not open input file \"%s\""
 msgstr "Koe ynfierbestân \"%s\" net iepenje"
 msgid "Could not create target file \"%s\""
 msgstr "Koe doelbestân \"%s\" net oanmeitsje"
 msgid "An error occured browsing '%s'."
 msgstr "Der trede in flater op by blêdzje troch '%s'."
 msgid ""
 "invalid characted '%c' in arg-list for macro \"%s\" while expecting "
 "parameter name"
 msgstr ""
 "ûnjildich letterteken '%c' yn arg.-list foar makro \"%s\", ferwachte "
 "parameternamme"
 msgid ""
 "invalid characted '%c' in arg-list for macro \"%s\" while expecting ',' "
 "or ')'"
 msgstr ""
 "ûnjildich letterteken '%c' yn arg.-list foar makro \"%s\", ferwachte ',' "
 "of ')'"
 msgid "unknow directive '#%s'"
 msgstr "ûnbekende oanwizing '#%s'"
 msgid "found #%s but have no matching #if"
 msgstr "#%s fûn, mar hat gjin bybehearrende #if"
 msgid "too many nested includes"
 msgstr "te folle neste #include's"
 msgid "could not find file \"%s\" for include"
 msgstr "koe bestân \"%s\" net fine foar #include"
 msgid "too many nested macro expansion, breaking loop"
 msgstr "te folle neste makro-útwurkingen, syklus ôfbrutsen"
@@ -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 WMAKER_USER_ROOT defined with invalid path, not used"
+msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
-msgstr "A WMAKER_USER_ROOT változó be van állítva, de rossz értékre. Nem használom"
+msgstr "A GNUSTEP_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
@@ -389,9 +389,9 @@ msgid "Could not create component %s"
 msgstr "Kon component %s niet aanmaken"
 #: ../../WINGs/userdefaults.c:72
-msgid "variable WMAKER_USER_ROOT defined with invalid path, not used"
+msgid "variable GNUSTEP_USER_ROOT defined with invalid path, not used"
 msgstr ""
-"variabele WMAKER_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt"
+"variabele GNUSTEP_USER_ROOT, gedefinieerd met ongeldig pad, niet gebruikt"
 #. something happened with the file. just overwrite it
 #: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225
@@ -1253,34 +1253,22 @@ int WMGetPropListItemCount(WMPropList * plist)
 Bool WMIsPLString(WMPropList * plist)
 {
-	if (plist)
+	return (plist->type == WPLString);
 		return (plist->type == WPLString);
 	else
 		return False;
 }
 Bool WMIsPLData(WMPropList * plist)
 {
-	if (plist)
+	return (plist->type == WPLData);
 		return (plist->type == WPLData);
 	else
 		return False;
 }
 Bool WMIsPLArray(WMPropList * plist)
 {
-	if (plist)
+	return (plist->type == WPLArray);
 		return (plist->type == WPLArray);
 	else
 		return False;
 }
 Bool WMIsPLDictionary(WMPropList * plist)
 {
-	if (plist)
+	return (plist->type == WPLDictionary);
 		return (plist->type == WPLDictionary);
 	else
 		return False;
 }
 Bool WMIsPropListEqualTo(WMPropList * plist, WMPropList * other)
@@ -1695,7 +1683,6 @@ 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;
 	}
@@ -1732,7 +1719,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 $WMAKER_USER_ROOT
+ * refuses to create anything outside $GNUSTEP_USER_ROOT
 *
 * returns 1 on success, 0 on failure
 */
@@ -1743,7 +1730,7 @@ int wmkdirhier(const char *path)
 	size_t p, plen;
 	struct stat st;
-	/* Only create directories under $WMAKER_USER_ROOT */
+	/* Only create directories under $GNUSTEP_USER_ROOT */
 	if ((t = wusergnusteppath()) == NULL)
 		return 0;
 	if (strncmp(path, t, strlen(t)) != 0)
@@ -1824,7 +1811,7 @@ static int wrmdirhier_fn(const char *path, const struct stat *st,
 /*
 * remove a directory hierarchy
 *
- * refuses to remove anything outside $WMAKER_USER_ROOT
+ * refuses to remove anything outside $GNUSTEP_USER_ROOT
 *
 * returns 1 on success, 0 on failure
 *
@@ -1838,7 +1825,7 @@ int wrmdirhier(const char *path)
 	int error;
 	const char *t;
-	/* Only remove directories under $WMAKER_USER_ROOT */
+	/* Only remove directories under $GNUSTEP_USER_ROOT */
 	if ((t = wusergnusteppath()) == NULL)
 		return EPERM;
 	if (strncmp(path, t, strlen(t)) != 0)
@@ -261,7 +261,7 @@ static WMData *getSelectionData(Display * dpy, Window win, Atom where)
 	bpi = bits / 8;
-	wdata = WMCreateDataWithBytesNoCopy(data, len * bpi, (void *) XFree);
+	wdata = WMCreateDataWithBytesNoCopy(data, len * bpi, (WMFreeDataProc *) XFree);
 	WMSetDataFormat(wdata, bits);
 	return wdata;
@@ -59,9 +59,9 @@ const char *wusergnusteppath()
 		return path;
 #ifdef HAVE_SECURE_GETENV
-	gspath = secure_getenv("WMAKER_USER_ROOT");
+	gspath = secure_getenv("GNUSTEP_USER_ROOT");
 #else
-	gspath = getenv("WMAKER_USER_ROOT");
+	gspath = getenv("GNUSTEP_USER_ROOT");
 #endif
 	if (gspath) {
 		gspath = wexpandpath(gspath);
@@ -69,7 +69,7 @@ const char *wusergnusteppath()
 			path = gspath;
 			return path;
 		}
-		wwarning(_("variable WMAKER_USER_ROOT defined with invalid path, not used"));
+		wwarning(_("variable GNUSTEP_USER_ROOT defined with invalid path, not used"));
 	}
 	h = wgethomedir();
@@ -103,14 +103,17 @@ char *wdefaultspathfordomain(const char *domain)
 }
 /* XXX: doesn't quite belong to *user*defaults.c */
 #ifndef GLOBAL_DEFAULTS_SUBDIR
 #define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
 #endif
 char *wglobaldefaultspathfordomain(const char *domain)
 {
 	char *t = NULL;
 	size_t len;
-	len = strlen(DEFSDATADIR) + strlen(domain) + 2;
+	len = strlen( SYSCONFDIR ) + strlen( GLOBAL_DEFAULTS_SUBDIR ) + strlen(domain) + 3;
 	t = wmalloc(len);
-	snprintf(t, len, "%s/%s", DEFSDATADIR, domain);
+	snprintf(t, len, "%s/%s/%s", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR, domain);
 	return t;
 }
@@ -140,7 +140,7 @@ char *WMPathForResourceOfType(const char *resource, const char *ext)
 	 * Paths are searched in this order:
 	 * - resourcePath/ext
 	 * - dirname(argv[0])/ext
-	 * - WMAKER_USER_ROOT/Applications/ApplicationName.app/ext
+	 * - GNUSTEP_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("WMAKER_USER_ROOT"), appdir, ext, resource);
+	path = checkFile(getenv("GNUSTEP_USER_ROOT"), appdir, ext, resource);
 	if (path)
 		goto out;
@@ -67,6 +67,9 @@ static unsigned char Cursor_bits[] = {
 	0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x70
 };
 /* Cursor shape-mask */
 #define Cursor_shape_width 32
 #define Cursor_shape_height 32
 static unsigned char Cursor_shape_bits[] = {
 	0x00, 0x7e, 0x00, 0x00, 0xc0, 0x81, 0x03, 0x00, 0x20, 0x00, 0x04, 0x00, 0x10, 0x00, 0x08,
 	0x00, 0x08, 0x00, 0x10, 0x00, 0x04, 0x00, 0x20, 0x00, 0x02, 0x00, 0x40, 0x00, 0x02, 0x00,
@@ -2385,8 +2388,6 @@ void rgbIntToChar(W_ColorPanel *panel, int *value)
 	case RGBhex:
 		format = "%0X";
 		break;
 	default:
 		format = "";
 	}
 	sprintf(tmp, format, value[0]);
@@ -2645,7 +2646,7 @@ static void hsbTextFieldCallback(void *observerData, WMNotification * notificati
 {
 	CPColor cpColor;
 	int value[3];
-	char tmp[12];  /* We only 4 bytes needed, but compilers cannot know that */
+	char tmp[4];
 	int n;
 	W_ColorPanel *panel = (W_ColorPanel *) observerData;
@@ -3398,9 +3399,6 @@ static void rgbInit(W_ColorPanel * panel)
 	case RGBhex:
 		format = "%0X";
 		break;
 	default:
 		/* Avoid compiler warning */
 		format = "";
 	}
 	sprintf(tmp, format, panel->color.rgb.red);
@@ -3453,7 +3451,7 @@ static void hsbInit(W_ColorPanel * panel)
 	WMSetSliderValue(panel->hsbSaturationS, value[1]);
 	WMSetSliderValue(panel->hsbBrightnessS, value[2]);
-	sprintf(tmp, "%hu", value[0]);
+	sprintf(tmp, "%d", value[0]);
 	WMSetTextFieldText(panel->hsbHueT, tmp);
 	sprintf(tmp, "%d", value[1]);
 	WMSetTextFieldText(panel->hsbSaturationT, tmp);
@@ -3504,17 +3502,13 @@ 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
-		 * For pure grey colors, the Hue is generally calculated
+		 * Same for white. */
-		 * as 0, but in reality the Hue does not matter.
+		if (((color->rgb.red == 0) &&
-		 *
+		     (color->rgb.green == 0) &&
-		 * But in an interactive GUI it is interresting to remember
+		     (color->rgb.blue == 0)) ||
-		 * the previous Hue because if user moves away from perfect
+		    ((color->rgb.red == 0) && (color->rgb.green == 0) && (color->rgb.blue == 255))
-		 * 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:
@@ -237,16 +237,6 @@ 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);
@@ -700,7 +700,7 @@ static void typefaceClick(WMWidget * w, void *data)
 	WM_ITERATE_ARRAY(face->sizes, size, i) {
 		if (size != NULL) {
-			int size_int = (intptr_t) size;
+			int size_int = (int) size;
 			sprintf(buffer, "%i", size_int);
@@ -802,7 +802,7 @@ static void setFontPanelFontName(FontPanel * panel, const char *family, const ch
 		char buffer[32];
 		if (vsize != NULL) {
-			int size_int = (intptr_t) vsize;
+			int size_int = (int) vsize;
 			sprintf(buffer, "%i", size_int);
@@ -385,7 +385,6 @@ 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);
@@ -945,7 +944,7 @@ void WMSetFocusToWidget(WMWidget * widget)
 /*
 * WMRealizeWidget-
- * 	Realizes the widget and all its children.
+ * 	Realizes the widget and all it's children.
 *
 */
 void WMRealizeWidget(WMWidget * w)
@@ -89,12 +89,10 @@ 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) {
@@ -162,7 +160,6 @@ 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);
@@ -173,13 +170,13 @@ WMAlertPanel *WMCreateAlertPanel(WMScreen * scrPtr, WMWindow * owner,
 	/* create buttons */
 	if (otherButton)
-		ow = WMWidthOfString(defaultFont, otherButton, strlen(otherButton));
+		ow = WMWidthOfString(scrPtr->normalFont, otherButton, strlen(otherButton));
 	if (alternateButton)
-		aw = WMWidthOfString(defaultFont, alternateButton, strlen(alternateButton));
+		aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton));
 	if (defaultButton)
-		dw = WMWidthOfString(defaultFont, defaultButton, strlen(defaultButton));
+		dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton));
 	dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
@@ -209,187 +206,18 @@ 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);
@@ -510,10 +338,8 @@ 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)
@@ -545,23 +371,21 @@ 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(defaultFont, cancelButton, strlen(cancelButton));
+		aw = WMWidthOfString(scrPtr->normalFont, cancelButton, strlen(cancelButton));
 	if (okButton)
-		dw = WMWidthOfString(defaultFont, okButton, strlen(okButton));
+		dw = WMWidthOfString(scrPtr->normalFont, okButton, strlen(okButton));
 	w = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
 	if (aw > w)
@@ -582,7 +406,6 @@ 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;
@@ -592,104 +415,6 @@ 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);
@@ -732,12 +457,10 @@ 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) {
@@ -810,10 +533,10 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
 	/* create buttons */
 	if (defaultButton)
-		dw = WMWidthOfString(defaultFont, defaultButton, strlen(defaultButton));
+		dw = WMWidthOfString(scrPtr->normalFont, defaultButton, strlen(defaultButton));
 	if (alternateButton)
-		aw = WMWidthOfString(defaultFont, alternateButton, strlen(alternateButton));
+		aw = WMWidthOfString(scrPtr->normalFont, alternateButton, strlen(alternateButton));
 	dw = dw + (scrPtr->buttonArrow ? scrPtr->buttonArrow->width : 0);
@@ -838,7 +561,6 @@ 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);
@@ -848,7 +570,5 @@ WMGenericPanel *WMCreateGenericPanel(WMScreen * scrPtr, WMWindow * owner,
 	WMRealizeWidget(panel->win);
 	WMMapSubwidgets(panel->win);
 	WMReleaseFont(defaultFont);
 	return panel;
 }
@@ -181,7 +181,10 @@ 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) {
-			snprintf(c, sizeof(c), "%hu", ++j);
+			if (j < 10)
 				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);
 		}
@@ -41,6 +41,9 @@ typedef struct W_SplitView {
 /* TODO: rewrite --Dan */
 #define _GetSubviewsCount() WMGetArrayItemCount(sPtr->subviews)
 #define _AddPSubviewStruct(P) \
    (WMAddToArray(sPtr->subviews,((void*)P)))
 #define _GetPSubviewStructAt(i) \
    ((W_SplitViewSubview*)WMGetFromArray(sPtr->subviews,(i)))
@@ -2305,7 +2305,6 @@ static void handleTextKeyPress(Text * tPtr, XEvent * event)
 	case XK_Return:
 		*buffer = '\n';
 		/* FALLTHRU */
 	default:
 		if (*buffer != 0 && !control_pressed) {
 			insertTextInteractively(tPtr, buffer, strlen(buffer));
@@ -2545,7 +2544,6 @@ static void handleActionEvents(XEvent * event, void *data)
 			break;
 		}
 	/* FALLTHRU */
 	case ButtonRelease:
 		if (tPtr->flags.pointerGrabbed) {
 			tPtr->flags.pointerGrabbed = False;
@@ -965,7 +965,6 @@ 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) {
@@ -1002,10 +1001,8 @@ 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;
@@ -1022,10 +1019,8 @@ 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;
@@ -1063,10 +1058,8 @@ 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;
@@ -1102,10 +1095,8 @@ 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) {
@@ -1131,10 +1122,8 @@ 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) {
@@ -1160,7 +1149,6 @@ static void handleTextFieldKeyPress(TextField * tPtr, XEvent * event)
 		else
 			modified = False;
 		/* FALLTHRU */
 	case XK_BackSpace:
 		if (!modified) {
 			if (tPtr->selection.count) {
@@ -1189,10 +1177,8 @@ 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) {
@@ -490,7 +490,6 @@ 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));
@@ -505,7 +504,6 @@ 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);
@@ -446,18 +446,12 @@ static void str2rcolor(RContext * rc, const char *name, RColor * color)
 {
 	XColor xcolor;
-	if (XParseColor(rc->dpy, rc->cmap, name, &xcolor) != 0) {
+	XParseColor(rc->dpy, rc->cmap, name, &xcolor);
-		color->alpha = 255;
+
-		color->red = xcolor.red >> 8;
+	color->alpha = 255;
-		color->green = xcolor.green >> 8;
+	color->red = xcolor.red >> 8;
-		color->blue = xcolor.blue >> 8;
+	color->green = xcolor.green >> 8;
-	} else {
+	color->blue = xcolor.blue >> 8;
 		/* 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)
@@ -617,7 +611,6 @@ 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;
@@ -644,7 +637,6 @@ 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;
@@ -679,7 +671,6 @@ 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;
@@ -68,7 +68,7 @@ typedef struct _Panel {
 	WMButton *autoDelayB[wlengthof_nocheck(auto_delay)][wlengthof_nocheck(autoDelayPresetValues)];
 	WMTextField *autoDelayT[wlengthof_nocheck(auto_delay)];
 	WMLabel *autoDelayMsL[wlengthof_nocheck(auto_delay)];
-
+	
 	WMFrame *dockF;
 	WMButton *docksB[wlengthof_nocheck(dock_config)];
 } _Panel;
@@ -267,7 +267,7 @@ static void createPanel(Panel *p)
 		WMSetBalloonTextForView(_(dock_config[i].balloon_text), WMWidgetView(panel->docksB[i]));
 		WMSetButtonAction(panel->docksB[i], pushDockButton, panel);
 	}
-
+	
 	WMMapSubwidgets(panel->dockF);
 	if (xis)
@@ -97,29 +97,8 @@ static const struct {
 	{ N_("Distance from corner to begin window snap."),
 	  /* default: */ 10, OPTION_WMAKER_INT, "SnapCornerDetect" },
 	{ N_("Snapping a window to the top maximizes it to the full screen."),
 	  /* default: */ False, OPTION_WMAKER, "SnapToTopMaximizesFullscreen" },
 	{ N_("Allow move half-maximized windows between multiple screens."),
 	  /* default: */ False, OPTION_WMAKER, "MoveHalfMaximizedWindowsBetweenScreens" },
 	{ N_("Alternative transitions between states for half maximized windows."),
 	  /* default: */ False, OPTION_WMAKER, "AlternativeHalfMaximized" },
 	{ N_("Move mouse pointer with half maximized windows."),
 	  /* 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" }
 };
@@ -146,16 +125,15 @@ typedef struct _Panel {
 static void changeIntTextfield(void *data, int delta)
 {
 	WMTextField *textfield;
-	char *text, buffer[12];
+	char *text;
 	int value;
 	textfield = (WMTextField *)data;
 	text = WMGetTextFieldText(textfield);
 	value = atoi(text);
 	wfree(text);
 	value += delta;
-	sprintf(buffer, "%d", value);
+	sprintf(text, "%d", value);
-	WMSetTextFieldText(textfield, buffer);
+	WMSetTextFieldText(textfield, text);
 }
 static void downButtonCallback(WMWidget *self, void *data)
@@ -315,7 +293,6 @@ static void storeDefaults(_Panel *panel)
 			text = WMGetTextFieldText(panel->textfield[i]);
 			value = atoi(text);
 			wfree(text);
 			SetIntegerForKey(value, expert_options[i].op_name);
 			break;
@@ -1,9 +1,9 @@
 /* FontSimple.c- simplified font configuration panel
- *
+ * 
 *  WPrefs - Window Maker Preferences Program
- *
+ * 
 *  Copyright (c) 1998-2004 Alfredo K. Kojima
- *
+ * 
 *  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
@@ -22,7 +22,6 @@
 #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
@@ -522,7 +521,7 @@ static void selectedOption(WMWidget * w, void *data)
 				WMListItem *item = WMGetListItem(panel->sizeL, i);
 				int distance;
-				distance = fabs(size - atoi(item->text));
+				distance = abs(size - atoi(item->text));
 				if (i == 0 || distance < closest) {
 					closest = distance;
@@ -570,9 +569,6 @@ 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;
@@ -583,12 +579,19 @@ static void showData(_Panel * panel)
 		if (ofont)
 			wfree(ofont);
-		if (strcmp(fontOptions[i].option, "SystemFont") == 0)
+		if (strcmp(fontOptions[i].option, "SystemFont") == 0 ||
-			font = WMGetFontName(WMDefaultSystemFont(scr));
+		    strcmp(fontOptions[i].option, "BoldSystemFont") == 0) {
-		else if (strcmp(fontOptions[i].option, "BoldSystemFont") == 0)
+			char *path;
-			font = WMGetFontName(WMDefaultBoldSystemFont(scr));
+			WMUserDefaults *defaults;
-		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);
@@ -60,6 +60,8 @@ typedef struct _Panel {
 	CallbackRec callbacks;
 	Bool have_legacy_apercu;
 	WMWidget *parent;
 	WMFrame *posF;
@@ -73,13 +75,12 @@ typedef struct _Panel {
 	WMButton *posB[wlengthof_nocheck(icon_position_dbvalue)];
 	WMFrame *animF;
-	WMPopUpButton *animP;
+	WMButton *animB[wlengthof_nocheck(icon_animation)];
 	WMFrame *optF;
 	WMButton *arrB;
 	WMButton *omnB;
 	WMButton *sclB;
 	WMButton *marginB;
 	struct {
 		WMFrame *frame;
@@ -174,7 +175,6 @@ 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,12 +195,20 @@ static void showData(_Panel * panel)
 	if (i < 0)
 		i = 0;
-	else if (i > 29)
+	else if (i > 9)
-		i = 29;
+		i = 9;
 	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 */
@@ -212,6 +220,25 @@ 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);
@@ -221,7 +248,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) {
-				WMSetPopUpButtonSelectedItem(panel->animP, i);
+				WMPerformButtonClick(panel->animB[i]);
 				goto found_animation_value;
 			}
 		}
@@ -229,7 +256,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 */
-	WMSetPopUpButtonSelectedItem(panel->animP, 0);
+	WMPerformButtonClick(panel->animB[0]);
 found_animation_value:
 	;
 }
@@ -339,7 +366,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 <= 256; i += 8) {
+	for (i = 24; i <= 96; i += 8) {
 		sprintf(buf, "%ix%i", i, i);
 		WMAddPopUpButtonItem(panel->sizeP, buf);
 	}
@@ -372,57 +399,50 @@ static void createPanel(Panel * p)
    /***************** Animation ****************/
 	panel->animF = WMCreateFrame(panel->box);
-	WMResizeWidget(panel->animF, 215, 52);
+	WMResizeWidget(panel->animF, 215, 110);
 	WMMoveWidget(panel->animF, 292, 6);
 	WMSetFrameTitle(panel->animF, _("Iconification Animation"));
-	panel->animP = WMCreatePopUpButton(panel->animF);
+	for (i = 0; i < wlengthof(icon_animation); i++) {
-	WMResizeWidget(panel->animP, 195, 20);
+		panel->animB[i] = WMCreateRadioButton(panel->animF);
-	WMMoveWidget(panel->animP, 10, 19);
+		WMResizeWidget(panel->animB[i], 192, 20);
-	for (i = 0; i < wlengthof(icon_animation); i++)
+		WMMoveWidget(panel->animB[i], 12, 16 + i * 22);
-		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, 148);
+	WMResizeWidget(panel->optF, 215, 90);
-	WMMoveWidget(panel->optF, 292, 72);
+	WMMoveWidget(panel->optF, 292, 130);
 	/*    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, starty);
+	WMMoveWidget(panel->arrB, 12, 8);
 	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, starty);
+	WMMoveWidget(panel->omnB, 12, 34);
 	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, starty);
+	WMMoveWidget(panel->sclB, 12, 60);
 	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);
@@ -438,7 +458,6 @@ 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");
@@ -459,8 +478,17 @@ static void storeData(_Panel * panel)
 		}
 		SetIntegerForKey(i, "MiniPreviewSize");
 	}
 	if (panel->have_legacy_apercu) {
 		RemoveObjectForKey("MiniwindowApercuBalloons");
 		RemoveObjectForKey("ApercuSize");
 	}
-	SetStringForKey(icon_animation[WMGetPopUpButtonSelectedItem(panel->animP)].db_value, "IconificationStyle");
+	for (i = 0; i < wlengthof(icon_animation); i++) {
 		if (WMGetButtonSelected(panel->animB[i])) {
 			SetStringForKey(icon_animation[i].db_value, "IconificationStyle");
 			break;
 		}
 	}
 }
 Panel *InitIcons(WMWidget *parent)
@@ -89,8 +89,6 @@ static const struct {
 	{ "LBCMaximizeKey", N_("Maximize active window left bottom corner") },
 	{ "RBCMaximizeKey", N_("Maximize active window right bottom corner") },
 	{ "MaximusKey",     N_("Maximus: Tiled maximization ") },
 	{ "KeepOnTopKey",   N_("Toggle window on top status") },
 	{ "KeepAtBottomKey",N_("Toggle window at bottom status") },
 	{ "OmnipresentKey", N_("Toggle window omnipresent status") },
 	{ "RaiseKey",       N_("Raise active window") },
 	{ "LowerKey",       N_("Lower active window") },
@@ -148,10 +146,6 @@ 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") },
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS =
 wpexecbindir = @wprefs_bindir@
-wpexecbin_PROGRAMS = WPrefs
+wpexecbin_PROGRAMS = WPrefs 
 wpdatadir = @wprefs_datadir@
@@ -45,11 +45,10 @@ WPrefs_SOURCES = \
 #	KeyboardSettings.c \
 #	Themes.c
-AM_CFLAGS = @PANGO_CFLAGS@
+AM_CFLAGS =
 AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
-	 -I$(top_builddir)/wrlib -I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \
+	 -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
 	 @HEADER_SEARCH_PATH@
 WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
@@ -22,7 +22,6 @@
 #include "WPrefs.h"
 #include <assert.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <X11/keysym.h>
 #include <X11/cursorfont.h>
@@ -507,7 +506,7 @@ static void createPanel(_Panel * p)
 		WMSetScrollViewContentView(sview, WMWidgetView(pad));
 		data = putNewItem(panel, pad, ExternalInfo, _("Debian Menu"));
-		data->param.pipe.command = "/etc/GNUstep/Defaults/menu.hook";
+		data->param.pipe.command = "/etc/X11/WindowMaker/menu.hook";
 		data = putNewItem(panel, pad, PipeInfo, _("RedHat Menu"));
 		data->param.pipe.command = "wmconfig --output wmaker";
@@ -614,7 +613,7 @@ static void createPanel(_Panel * p)
 	WMAddNotificationObserver(dataChanged, panel, WMTextDidChangeNotification, panel->pathT);
 	label = WMCreateLabel(panel->pathF);
-	WMResizeWidget(label, width - 20, 90);
+	WMResizeWidget(label, width - 20, 80);
 	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"
@@ -914,11 +913,6 @@ 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);
@@ -931,12 +925,6 @@ static ItemData *parseCommand(WMPropList * item)
 		 * |pipe
 		 */
 		p = parameter;
 		if (p == NULL) {
 			wfree(data);
 			return NULL;
 		}
 		while (isspace(*p) && *p)
 			p++;
 		if (*p == '|') {
@@ -1447,12 +1435,12 @@ static WEditMenu *buildSubmenu(_Panel * panel, WMPropList * pl)
 					WSetEditMenuItemImage(item, panel->markerPix[data->type]);
 				WSetEditMenuItemData(item, data, (WMCallback *) freeItemData);
 			} else {
-				char buf[256];
+				char *buf = wmalloc(1024);
-
+				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);
 			}
 		}
@@ -1494,8 +1482,7 @@ static WMPropList *getDefaultMenu(_Panel * panel)
 static void showData(_Panel * panel)
 {
 	const char *gspath;
-	char *menuPath, *labelText;
+	char *menuPath;
 	char buf[1024];
 	WMPropList *pmenu;
 	gspath = wusergnusteppath();
@@ -1506,45 +1493,6 @@ 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;
@@ -1569,14 +1517,6 @@ 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);
@@ -1617,12 +1557,15 @@ 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);
@@ -3,12 +3,12 @@
 				  ==========
 		  The WindowMaker Prerefences Application
-
+    WPrefs.app is the preferences "editor" for the WindowMaker window 
    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 its applications menu. It also can change some settings
+and define it's applications menu. It also can change some settings 
-that do not belong to WindowMaker.
+that do not belong to WindowMaker. 
    Although WPrefs.app is designed to be easy to use, you should read the
 user guide to be fully aware of all available options and other features
@@ -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 its application icon. The dock will automatically detect its
+Then, dock it's application icon. The dock will automatically detect it's
 icon and use it.
    If you change configuration often, you might want to leave WPrefs
@@ -26,7 +26,7 @@ option in the attributes panel for the WPrefs window. Of course, it will
 use some memory, but by leaving it hidden it'll probably be swapped out and
 stay there until you unhide it.
-    WPrefs is still under development. Some of the configuration options are
+    WPrefs is still under development. Some of the configuration options are 
 not yet configurable from WPrefs, notably the appearance related options.
 It might contain bugs that can corrupt your configuration files, so backup
 the contents of the ~/GNUstep/Defaults directory before using it.
@@ -37,19 +37,19 @@ License
 -------
    Like Window Maker, WPrefs is distributed with through the General Public
-License (as stated in the file COPYING).
+License (as stated in the file COPYING). 
 Notes
 -----
-The mouse speed configuration is saved as a call for xset in
+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 its section (or if you do open it, do not Save), or WPrefs will
+open it's 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
+Only options that have different values than what is found in the 
 system-wide configuration file is saved.
 WPrefs only supports property list menus. If you have a plain text file
@@ -68,13 +68,13 @@ WPrefs will be built automatically and installed with the rest of WindowMaker.
 Customized Installation
 -----------------------
-By default, WPrefs.app will be installed in the GNUstep applications directory,
+By default, WPrefs.app will be installed in the GNUstep applications directory, 
-which is /usr/local/GNUstep/Applications. If you want to install it somewhere
+which is /usr/local/GNUstep/Applications. If you want to install it somewhere 
 else, like in /some_weird_path/Applications, set the GNUSTEP_LOCAL_ROOT
 environment variable to some_weird_path before running configure for
 WindowMaker. You can also configure Window Maker supplying the --with-gnustepdir
 option to configure, like ./configure --with-gnustepdir=/usr/GNUstep/Applications
-If you change your mind after installing, you can move the .app directory
+If you change your mind after installing, you can move the .app directory 
 to one of the following GNUstep/Applications directories:
 /usr/GNUstep/Applications
@@ -93,7 +93,7 @@ Credits
 -------
 User interface design, programming and a few icons:
-    Alfredo K. Kojima <kojima@windowmaker.info>
+    Alfredo K. Kojima <kojima@windowmaker.info>		
 Additional programming:
    James Thompson <jamest@math.ksu.edu>
@@ -108,7 +108,7 @@ Icon and image artwork:
 WindowMaker
 -----------
-    If for some weird reason you end up with this preferences program and
+    If for some weird reason you end up with this preferences program and 
 don't have Window Maker yet, you can get more information about it at
 http://windowmaker.info and download it at ftp://ftp.windowmaker.info
@@ -116,6 +116,6 @@ http://windowmaker.info and download it at ftp://ftp.windowmaker.info
 Contact
 -------
-Send comments and bug reports to kojima@windowmaker.info
+Send comments and bug reports to kojima@windowmaker.info 
 Use the WindowMaker BUGFORM to report bugs.
@@ -117,21 +117,16 @@ typedef struct _TexturePanel {
 } _TexturePanel;
-enum {
+#define TYPE_SOLID	0
-	TYPE_SOLID,
+#define TYPE_GRADIENT	1
-	TYPE_GRADIENT,
+#define TYPE_SGRADIENT	2
-	TYPE_SGRADIENT,
+#define TYPE_TGRADIENT	3
-	TYPE_TGRADIENT,
+#define TYPE_PIXMAP	4
 	TYPE_PIXMAP
 };
-enum {
+#define PTYPE_TILE	0
-	PTYPE_TILE,
+#define PTYPE_SCALE	1
-	PTYPE_SCALE,
+#define PTYPE_CENTER	2
-	PTYPE_CENTER,
+#define PTYPE_MAXIMIZE	3
 	PTYPE_MAXIMIZE,
 	PTYPE_FILL
 };
 /*
 *--------------------------------------------------------------------------
@@ -141,7 +136,7 @@ enum {
 /************/
-static void updateGradButtons(TexturePanel *panel)
+static void updateGradButtons(TexturePanel * panel)
 {
 	RImage *image;
 	WMPixmap *pixmap;
@@ -185,7 +180,7 @@ static void updateGradButtons(TexturePanel *panel)
 	}
 }
-static void updateTGradImage(TexturePanel *panel)
+static void updateTGradImage(TexturePanel * panel)
 {
 	RImage *image, *gradient;
 	WMPixmap *pixmap;
@@ -206,17 +201,19 @@ static void updateTGradImage(TexturePanel *panel)
 	to.green = WMGreenComponentOfColor(color) >> 8;
 	to.blue = WMBlueComponentOfColor(color) >> 8;
-	if (panel->image->width < 141 || panel->image->height < 91)
+	if (panel->image->width < 141 || panel->image->height < 91) {
 		image = RMakeTiledImage(panel->image, 141, 91);
-	else
+	} else {
 		image = RCloneImage(panel->image);
 	}
-	if (WMGetButtonSelected(panel->dirhB))
+	if (WMGetButtonSelected(panel->dirhB)) {
 		gradient = RRenderGradient(image->width, image->height, &from, &to, RHorizontalGradient);
-	else if (WMGetButtonSelected(panel->dirvB))
+	} else if (WMGetButtonSelected(panel->dirvB)) {
 		gradient = RRenderGradient(image->width, image->height, &from, &to, RVerticalGradient);
-	else
+	} else {
 		gradient = RRenderGradient(image->width, image->height, &from, &to, RDiagonalGradient);
 	}
 	RCombineImagesWithOpaqueness(image, gradient, WMGetSliderValue(panel->topaS));
 	RReleaseImage(gradient);
@@ -228,7 +225,7 @@ static void updateTGradImage(TexturePanel *panel)
 	RReleaseImage(image);
 }
-static void updateSGradButtons(TexturePanel *panel)
+static void updateSGradButtons(TexturePanel * panel)
 {
 	RImage *image;
 	WMPixmap *pixmap;
@@ -267,7 +264,7 @@ static void updateSGradButtons(TexturePanel *panel)
 /*********** Gradient ************/
-static void updateSVSlider(WMSlider *sPtr, Bool saturation, WMFont *font, RHSVColor *hsv)
+static void updateSVSlider(WMSlider * sPtr, Bool saturation, WMFont * font, RHSVColor * hsv)
 {
 	RImage *image;
 	WMPixmap *pixmap;
@@ -315,7 +312,7 @@ static void updateSVSlider(WMSlider *sPtr, Bool saturation, WMFont *font, RHSVCo
 	WMReleasePixmap(pixmap);
 }
-static void updateHueSlider(WMSlider *sPtr, WMFont *font, RHSVColor *hsv)
+static void updateHueSlider(WMSlider * sPtr, WMFont * font, RHSVColor * hsv)
 {
 	RColor *colors[8];
 	RImage *image;
@@ -356,7 +353,7 @@ static void updateHueSlider(WMSlider *sPtr, WMFont *font, RHSVColor *hsv)
 		wfree(colors[i]);
 }
-static void sliderChangeCallback(WMWidget *w, void *data)
+static void sliderChangeCallback(WMWidget * w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	RHSVColor hsv;
@@ -420,8 +417,9 @@ static void sliderChangeCallback(WMWidget *w, void *data)
 	}
 	colors[i] = NULL;
-	if (panel->gimage != None)
+	if (panel->gimage != None) {
 		XFreePixmap(WMScreenDisplay(scr), panel->gimage);
 	}
 	image = RRenderMultiGradient(30, i * WMGetListItemHeight(panel->gcolL), colors, RVerticalGradient);
 	RConvertImage(WMScreenRContext(scr), image, &panel->gimage);
@@ -434,7 +432,7 @@ static void sliderChangeCallback(WMWidget *w, void *data)
 	updateGradButtons(panel);
 }
-static void paintGradListItem(WMList *lPtr, int index, Drawable d, char *text, int state, WMRect *rect)
+static void paintGradListItem(WMList * lPtr, int index, Drawable d, char *text, int state, WMRect * rect)
 {
 	TexturePanel *panel = (TexturePanel *) WMGetHangedData(lPtr);
 	WMScreen *scr = WMWidgetScreen(lPtr);
@@ -467,7 +465,7 @@ static void paintGradListItem(WMList *lPtr, int index, Drawable d, char *text, i
 	WMReleaseColor(gray);
 }
-static void gradAddCallback(WMWidget *w, void *data)
+static void gradAddCallback(WMWidget * w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	WMListItem *item;
@@ -491,7 +489,7 @@ static void gradAddCallback(WMWidget *w, void *data)
 	WMSetButtonEnabled(panel->okB, WMGetListNumberOfRows(panel->gcolL) > 1);
 }
-static void gradClickCallback(WMWidget *w, void *data)
+static void gradClickCallback(WMWidget * w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	WMListItem *item;
@@ -513,7 +511,7 @@ static void gradClickCallback(WMWidget *w, void *data)
 	sliderChangeCallback(panel->gsatS, panel);
 }
-static void gradDeleteCallback(WMWidget *w, void *data)
+static void gradDeleteCallback(WMWidget * w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	WMListItem *item;
@@ -547,7 +545,7 @@ static void gradDeleteCallback(WMWidget *w, void *data)
 /*************** Simple Gradient ***************/
-static void colorWellObserver(void *self, WMNotification *n)
+static void colorWellObserver(void *self, WMNotification * n)
 {
 	/* Parameter not used, but tell the compiler that it is ok */
 	(void) n;
@@ -555,7 +553,7 @@ static void colorWellObserver(void *self, WMNotification *n)
 	updateSGradButtons(self);
 }
-static void opaqChangeCallback(WMWidget *w, void *data)
+static void opaqChangeCallback(WMWidget * w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
@@ -567,7 +565,7 @@ static void opaqChangeCallback(WMWidget *w, void *data)
 /****************** Image ******************/
-static void updateImage(TexturePanel *panel, const char *path)
+static void updateImage(TexturePanel * panel, const char *path)
 {
 	WMScreen *scr = WMWidgetScreen(panel->win);
 	RImage *image;
@@ -615,12 +613,12 @@ static void updateImage(TexturePanel *panel, const char *path)
 	}
 }
-static void browseImageCallback(WMWidget *w, void *data)
+static void browseImageCallback(WMWidget * w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	WMOpenPanel *opanel;
 	WMScreen *scr = WMWidgetScreen(w);
-	static char *ipath;
+	static char *ipath = NULL;
 	opanel = WMGetOpenPanel(scr);
 	WMSetFilePanelCanChooseDirectories(opanel, False);
@@ -672,17 +670,18 @@ static void browseImageCallback(WMWidget *w, void *data)
 	}
 }
-static void buttonCallback(WMWidget *w, void *data)
+static void buttonCallback(WMWidget * w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
-	if (w == panel->okB)
+	if (w == panel->okB) {
 		(*panel->okAction) (panel->okData);
-	else
+	} else {
 		(*panel->cancelAction) (panel->cancelData);
 	}
 }
-static void changeTypeCallback(WMWidget *w, void *data)
+static void changeTypeCallback(WMWidget * w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	int newType;
@@ -732,7 +731,7 @@ static void changeTypeCallback(WMWidget *w, void *data)
 * Public functions
 *--------------------------------------------------------------------------
 */
-void ShowTexturePanel(TexturePanel *panel)
+void ShowTexturePanel(TexturePanel * panel)
 {
 	Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win));
 	Screen *scr = DefaultScreenOfDisplay(dpy);
@@ -743,24 +742,24 @@ void ShowTexturePanel(TexturePanel *panel)
 	WMMapWidget(panel->win);
 }
-void HideTexturePanel(TexturePanel *panel)
+void HideTexturePanel(TexturePanel * panel)
 {
 	WMUnmapWidget(panel->win);
 }
-void SetTexturePanelOkAction(TexturePanel *panel, WMCallback *action, void *clientData)
+void SetTexturePanelOkAction(TexturePanel * panel, WMCallback * action, void *clientData)
 {
 	panel->okAction = action;
 	panel->okData = clientData;
 }
-void SetTexturePanelCancelAction(TexturePanel *panel, WMCallback *action, void *clientData)
+void SetTexturePanelCancelAction(TexturePanel * panel, WMCallback * action, void *clientData)
 {
 	panel->cancelAction = action;
 	panel->cancelData = clientData;
 }
-void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *texture)
+void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList * texture)
 {
 	WMScreen *scr = WMWidgetScreen(panel->win);
 	char *str, *type;
@@ -776,8 +775,9 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
 		return;
 	p = WMGetFromPLArray(texture, 0);
-	if (!p)
+	if (!p) {
 		goto bad_texture;
 	}
 	type = WMGetFromPLString(p);
 	/*............................................... */
@@ -786,10 +786,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
 		WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_SOLID);
 		p = WMGetFromPLArray(texture, 1);
-		if (!p)
+		if (!p) {
 			str = "black";
-		else
+		} else {
 			str = WMGetFromPLString(p);
 		}
 		color = WMCreateNamedColor(scr, str, False);
 		WMSetColorWellColor(panel->defcW, color);
@@ -802,10 +803,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
 		WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_SGRADIENT);
 		p = WMGetFromPLArray(texture, 1);
-		if (!p)
+		if (!p) {
 			str = "black";
-		else
+		} else {
 			str = WMGetFromPLString(p);
 		}
 		color = WMCreateNamedColor(scr, str, False);
 		WMSetColorWellColor(panel->tcol1W, color);
@@ -813,10 +815,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
 		WMReleaseColor(color);
 		p = WMGetFromPLArray(texture, 2);
-		if (!p)
+		if (!p) {
 			str = "black";
-		else
+		} else {
 			str = WMGetFromPLString(p);
 		}
 		color = WMCreateNamedColor(scr, str, False);
 		WMSetColorWellColor(panel->tcol2W, color);
@@ -843,10 +846,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
 		WMSetSliderValue(panel->topaS, i);
 		p = WMGetFromPLArray(texture, 3);
-		if (!p)
+		if (!p) {
 			str = "black";
-		else
+		} else {
 			str = WMGetFromPLString(p);
 		}
 		color = WMCreateNamedColor(scr, str, False);
 		WMSetColorWellColor(panel->tcol1W, color);
@@ -854,10 +858,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
 		WMReleaseColor(color);
 		p = WMGetFromPLArray(texture, 4);
-		if (!p)
+		if (!p) {
 			str = "black";
-		else
+		} else {
 			str = WMGetFromPLString(p);
 		}
 		color = WMCreateNamedColor(scr, str, False);
 		WMSetColorWellColor(panel->tcol2W, color);
@@ -868,9 +873,9 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
 		if (panel->imageFile)
 			wfree(panel->imageFile);
-		panel->imageFile = wfindfileinarray(panel->pathList,
+		if ((panel->imageFile = wfindfileinarray(panel->pathList,
-						    WMGetFromPLString(WMGetFromPLArray(texture, 1)));
+							 WMGetFromPLString(WMGetFromPLArray(texture, 1)))) !=
-		if (panel->imageFile != NULL) {
+		    NULL) {
 			panel->image = RLoadImage(WMScreenRContext(scr), panel->imageFile, 0);
 			updateTGradImage(panel);
@@ -894,10 +899,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
 		WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_GRADIENT);
 		p = WMGetFromPLArray(texture, 1);
-		if (!p)
+		if (!p) {
 			str = "black";
-		else
+		} else {
 			str = WMGetFromPLString(p);
 		}
 		color = WMCreateNamedColor(scr, str, False);
 		WMSetColorWellColor(panel->defcW, color);
@@ -909,10 +915,11 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
 			XColor xcolor;
 			p = WMGetFromPLArray(texture, i);
-			if (!p)
+			if (!p) {
 				str = "black";
-			else
+			} else {
 				str = WMGetFromPLString(p);
 			}
 			XParseColor(WMScreenDisplay(scr), WMScreenRContext(scr)->cmap, str, &xcolor);
@@ -946,9 +953,6 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
 		case 'M':
 			WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_MAXIMIZE);
 			break;
 		case 'F':
 			WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_FILL);
 			break;
 		default:
 		case 'T':
 			WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_TILE);
@@ -997,13 +1001,13 @@ void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *t
 }
-char *GetTexturePanelTextureName(TexturePanel *panel)
+char *GetTexturePanelTextureName(TexturePanel * panel)
 {
 	return WMGetTextFieldText(panel->nameT);
 }
-WMPropList *GetTexturePanelTexture(TexturePanel *panel)
+WMPropList *GetTexturePanelTexture(TexturePanel * panel)
 {
 	WMPropList *prop = NULL;
 	WMColor *color;
@@ -1034,10 +1038,6 @@ WMPropList *GetTexturePanelTexture(TexturePanel *panel)
 			prop = WMCreatePLArray(WMCreatePLString("mpixmap"),
 					       WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
 			break;
 		case PTYPE_FILL:
 			prop = WMCreatePLArray(WMCreatePLString("fpixmap"),
 					       WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
 			break;
 		case PTYPE_CENTER:
 			prop = WMCreatePLArray(WMCreatePLString("cpixmap"),
 					       WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
@@ -1104,12 +1104,13 @@ WMPropList *GetTexturePanelTexture(TexturePanel *panel)
 		color = WMGetColorWellColor(panel->defcW);
 		str = WMGetColorRGBDescription(color);
-		if (WMGetButtonSelected(panel->dirdB))
+		if (WMGetButtonSelected(panel->dirdB)) {
 			prop = WMCreatePLArray(WMCreatePLString("mdgradient"), WMCreatePLString(str), NULL);
-		else if (WMGetButtonSelected(panel->dirvB))
+		} else if (WMGetButtonSelected(panel->dirvB)) {
 			prop = WMCreatePLArray(WMCreatePLString("mvgradient"), WMCreatePLString(str), NULL);
-		else
+		} else {
 			prop = WMCreatePLArray(WMCreatePLString("mhgradient"), WMCreatePLString(str), NULL);
 		}
 		wfree(str);
 		for (i = 0; i < WMGetListNumberOfRows(panel->gcolL); i++) {
@@ -1130,12 +1131,12 @@ WMPropList *GetTexturePanelTexture(TexturePanel *panel)
 	return prop;
 }
-void SetTexturePanelPixmapPath(TexturePanel *panel, WMPropList *array)
+void SetTexturePanelPixmapPath(TexturePanel * panel, WMPropList * array)
 {
 	panel->pathList = array;
 }
-TexturePanel *CreateTexturePanel(WMWindow *keyWindow)
+TexturePanel *CreateTexturePanel(WMWindow * keyWindow)
 /*CreateTexturePanel(WMScreen *scr)*/
 {
 	TexturePanel *panel;
@@ -1406,7 +1407,6 @@ TexturePanel *CreateTexturePanel(WMWindow *keyWindow)
 	WMAddPopUpButtonItem(panel->arrP, _("Scale"));
 	WMAddPopUpButtonItem(panel->arrP, _("Center"));
 	WMAddPopUpButtonItem(panel->arrP, _("Maximize"));
 	WMAddPopUpButtonItem(panel->arrP, _("Fill"));
 	WMSetPopUpButtonSelectedItem(panel->arrP, 0);
 	WMMapSubwidgets(panel->imageF);
@@ -1475,7 +1475,7 @@ TexturePanel *CreateTexturePanel(WMWindow *keyWindow)
 char *ProgName = "test";
-void testOKButton(WMWidget *self, void *data)
+void testOKButton(WMWidget * self, void *data)
 {
 	char *test;
 	Display *dpy;
@@ -1504,13 +1504,13 @@ void testOKButton(WMWidget *self, void *data)
 }
-void testCancelButton(WMWidget *self, void *data)
+void testCancelButton(WMWidget * self, void *data)
 {
 	wwarning("Exiting test....");
 	exit(0);
 }
-void wAbort(void)
+void wAbort()
 {
 	exit(1);
 }
@@ -602,7 +602,7 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
 	char *path;
 	FILE *file;
 	char buffer[1024];
-	char mbuf[1069]; /* Size of buffer and extra characters for the sprintfs */
+	char mbuf[1024];
 	int v1, v2, v3;
 	path = wdefaultspathfordomain("WindowMaker");
@@ -66,6 +66,19 @@ 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;
@@ -151,6 +164,9 @@ 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"));
@@ -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 tr.po uk.po zh_CN.po zh_TW.po
+	it.po ja.po ko.po nl.po pt.po ru.po sk.po uk.po zh_CN.po zh_TW.po
 POTFILES  = \
 	$(top_srcdir)/WPrefs.app/Appearance.c \
@@ -37,7 +37,7 @@ POTFILES  = \
 SUFFIXES = .po .mo
-.po.mo:
+.po.mo: 
 	$(AM_V_GEN)$(MSGFMT) -c -o $@ $<
@@ -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>
@@ -819,7 +819,7 @@ msgstr "Clip in den Vor-/Hintergrund"
 #: ../../WPrefs.app/KeyboardShortcuts.c:518
 msgid "Toggle keyboard language"
-msgstr "Tastaturbelegung ändern"
+msgstr "Tastatursbelegung ändern"
 #: ../../WPrefs.app/KeyboardShortcuts.c:532
 msgid "Shortcut"
@@ -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 its titlebar, press Control+Esc (or the\n"
+"without it's titlebar, press Control+Esc (or the\n"
 "equivalent shortcut, if you changed the default\n"
 "settings)."
 msgstr ""
@@ -1,4 +1,4 @@
-# French Message file for WPrefs.app
+# French Message file for WPrefs.app 
 #
 # Update History:
 # Antoine Hulin <antoine.hulin@origan.fdn.org>
@@ -1168,88 +1168,88 @@ msgid "could not initialize application"
 msgstr "ne mogu inicijalizirati aplikaciju"
 # msgid "could not extract version information from WindowMaker"
 # msgstr "ne mogu izvuči informaciju o verziji WindowMaker-a"
-#
+# 
 # msgid "Could not load WindowMaker domain (%s) from defaults database."
 # msgstr "Ne mogu učitati WindowMaker domenu (%s) iz početne baze."
-#
+# 
 # msgid "Version %s for WindowMaker %s"
 # msgstr "Verzija %s za WindowMaker %s"
-#
+# 
 # msgid "Could not extract version from WindowMaker. Make sure it is correctly installed."
 # msgstr "Ne mogu izvuči verziju WindowMakera. Provjerite da je ispravno instaliran."
-#
+# 
 # msgid ""
 # "Programming/Design: Alfredo K. Kojima\n"
 # "Artwork: Marco van Hylckama Vlieg"
 # msgstr ""
 # "Programiranje/Dizajn: Alfredo K. Kojima\n"
 # "Artwork: Marco van Hylckama Vlieg"
-#
+# 
 # msgid "WindowMaker domain (%s) is corrupted!"
 # msgstr "WindowMaker domena (%s) je oštećena!"
-#
+# 
 # msgid "WindowMaker %i.%i.%i, which is installed in your system, is not fully supported by this version of WPrefs."
 # msgstr "WindowMaker %i.%i.%i, koji je instaliran na vašem sistemu, nije potpuno podržan ovom verzijom WPrefs-a."
-#
+# 
 # msgid "WindowMaker Preferences"
 # msgstr "Postavke WindowMaker-a"
-#
+# 
 # msgid "Make sure WindowMaker is in your search path."
 # msgstr "Provjerite da je WindowMaker u vašoj search stazi."
-#
+# 
 # msgid "...do not resize over dock"
 # msgstr "ne pokrivati dock"
-#
+# 
 # msgid ""
 # "WPrefs only supports WindowMaker 0.18.0 or newer.\n"
 # "The version installed is %i.%i.%i\n"
 # msgstr ""
 # "WPrefs podržava samo WindowMaker 0.18.0 ili noviji.\n"
 # "Instalirana je verzija %i.%i.%i\n"
-#
+# 
 # msgid "Could not load global WindowMaker domain (%s)."
 # msgstr "Ne mogu učitati globlanu WindowMaker domenu (%s)."
-#
+# 
 # msgid "Loading WindowMaker configuration files..."
 # msgstr "Učitavam WindowMaker konfiguracijske datoteke..."
-#
+# 
 # msgid "Aplications Menu Definition"
 # msgstr "Definiranje izbornika Aplikacije"
-#
+# 
 # msgid "The command supplied must generate and output a valid menu definition to stdout. This definition should be in the plain text menu file format, described in the menu files included with WindowMaker, probably at ~/GNUstep/Library/WindowMaker/menu"
 # msgstr "Ponuđena naredba mora generirati i ispisati važeću definicuju izbornika na stdout. Ova bi definicja trebala biti u čistom tekst menu formatu koji je opisan u menu datotekama iz distribucije, vjerojatno u ~/GNUstep/Library/WindowMaker/menu"
-#
+# 
 # msgid ""
 # "bad speed value for option %s.\n"
 # "Using default Medium"
 # msgstr ""
 # "kriva vrijednost za brzinu za opciju %s.\n"
 # "Koristm Medium"
-#
+# 
 # msgid "The format of the current menu file (%s) is not supported by WPrefs. A new menu will be created."
 # msgstr "Format trenutne datoteke izbornika (%s) nije podržan od strane WPrefs-a. Kreirat ću novi izbornik."
-#
+# 
 # msgid "Omnipresent miniwindows"
 # msgstr "SvugdjePrisutni mini prozori"
-#
+# 
 # msgid "Error extracting version from WindowMaker. Make sure it is correctly installed."
 # msgstr "Greška pri izvlačenju verzije WindowMakera. Provjerite da je ispravno instaliran."
-#
+# 
 # msgid "Auto-arrange icons"
 # msgstr "Auto-pospremanje ikona"
-#
+# 
 # msgid "Open submenus to the left if they don't fit inside the screen."
 # msgstr "Otvoriti podizbornike na lijevo ako ne stanu unutar ekrana."
-#
+# 
 # msgid "Use SaveUnders in icons, menus and other objects"
 # msgstr "Koristi SnimiIspod u ikonama, izbornicima i drugim objektima"
-#
+# 
-# msgid "Type the path for the directory. You can type more than one path by separating them with spaces."
+# msgid "Type the path for the directory. You can type more than one path by separating them with spaces." 
 # msgstr "Upišite stazu za direktorij. Možete upisati više od jedne staze odvajajući ih razmacima."
-#
+# 
 # msgid "invalid data in option WindowPlacementOrigin. Using default (0,0)"
 # msgstr "krivi podaci u opciji WindowPlacementOrigin. Koristim (0,0)"
-#
+# 
 # msgid "Icon Size"
 # msgstr "Veličina ikone"
-#
+# 
@@ -1,5 +1,5 @@
 #
-# Mensagens do WPrefs.app traduzidas p/ Português
+# Mensagens do WPrefs.app traduzidas p/ Português 
 #
 # Update History:
 # Alfredo K. Kojima
@@ -380,71 +380,45 @@ msgstr ""
 "параметров и количества цветов для резервирования за\n"
 "Window Maker'ом при работе с 8bit'ным цветом (8bpp)."
-#: ../../WPrefs.app/Expert.c:44
+#: ../../WPrefs.app/Expert.c:75
-msgid  "Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."
+msgid ""
-msgstr "Запретить миниокна иконки для минимизированных окон. Для использования с KDE/GNOME."
+"Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."
 msgstr ""
 "Запретить миниокна (иконки для минимизированных окон). Для использования с "
 "KDE/GNOME."
-#: ../../WPrefs.app/Expert.c:47
+#: ../../WPrefs.app/Expert.c:76
 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:56
+#: ../../WPrefs.app/Expert.c:77
 msgid "Automatically save session when exiting Window Maker."
 msgstr "Автоматически сохранять сессию при выходе из Window Maker'а."
-#: ../../WPrefs.app/Expert.c:59
+#: ../../WPrefs.app/Expert.c:78
 msgid "Use SaveUnder in window frames, icons, menus and other objects."
 msgstr "Использовать SaveUnder для окон, иконок, меню и других объектов."
-#: ../../WPrefs.app/Expert.c:62
+#: ../../WPrefs.app/Expert.c:79
 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 "Запретить анимацию выбора для выбранных иконок."
-msgid "Show switch panel when cycling windows."
+#: ../../WPrefs.app/Expert.c:115
 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:330
+#: ../../WPrefs.app/Expert.c:117
 msgid ""
 "Options for people who know what they're doing...\n"
 "Also have some other misc. options."
@@ -649,11 +623,6 @@ msgstr ""
 "Параметры обработки иконок и миниокон.  Размещение иконок,\n"
 "размер иконок, в каком стиле анимировать сворачивание."
 #: ../../WPrefs.app/Icons.c:414
 msgid "Single click activation"
 msgstr "Одинарный щелчок мыши"
 #: ../../WPrefs.app/imagebrowser.c:95
 msgid "View"
 msgstr ""
@@ -1932,10 +1901,6 @@ msgstr ""
 msgid "Resist"
 msgstr "Упираться"
 #: ../../WPrefs.app/WindowHandling.c:406
 msgid "Opaque Move/Resize"
 msgstr "Перемещ/Измен.разм."
 #: ../../WPrefs.app/WindowHandling.c:407
 msgid "Attract"
 msgstr "Притягиваться"
@@ -1958,22 +1923,6 @@ 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 "Навигация по рабочим пространствам"
@@ -73,5 +73,5 @@ dist_tiffdata_DATA = \
 	windowfocus.tiff \
 	workspace.tiff \
 	workspacename.tiff \
-	xis.tiff
+	xis.tiff 
 endif
@@ -72,5 +72,5 @@ dist_xpmdata_DATA = \
 	windowfocus.xpm \
 	workspace.xpm \
 	workspacename.xpm \
-	xis.xpm
+	xis.xpm 
 endif
@@ -1,6 +1,6 @@
 defsdatadir = $(pkgdatadir)/Backgrounds
-defsdata_DATA = BlueImage.jpeg
+defsdata_DATA = BlueImage.jpeg 
 EXTRA_DIST = $(defsdata_DATA)
@@ -1,3 +1,6 @@
 defsdatadir = $(sysconfdir)/WindowMaker
 defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
 wpexecbindir = @wprefs_bindir@
@@ -12,8 +15,7 @@ WMWindowAttributes: $(srcdir)/WMWindowAttributes.in
 	chmod 644 WMWindowAttributes
 WindowMaker: $(srcdir)/WindowMaker.in
-	$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
+	$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
 		-e "s:#pixmapdir#:$(pixmapdir):" $(srcdir)/WindowMaker.in \
 		> WindowMaker ; \
 	chmod 644 WindowMaker
@@ -21,5 +23,5 @@ WMState: $(srcdir)/WMState.in
 	$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in > WMState ; \
 	chmod 644 WMState
-WMRootMenu: ./../plmenu
+WMRootMenu: $(srcdir)/../plmenu
-	$(AM_V_GEN)cp -f ./../plmenu WMRootMenu
+	$(AM_V_GEN)cp -f $(srcdir)/../plmenu WMRootMenu
@@ -1,251 +1,139 @@
 {
-	ColormapSize = 4;
+  SmoothWorkspaceBack = NO;
-	DisableDithering = NO;
+  PopupSwitchMenu = NO;
-	IconSize = 64;
+  MenuStyle = normal;
-	ModifierKey = Mod1;
+  DisableMiniwindows = NO;
-	FocusMode = manual;
+  DisableWorkspacePager = NO;
-	NewStyle = new;
+  OpenTransientOnOwnerWorkspace = NO;
-	DisableDock = NO;
+  EdgeResistance = 30;
-	DisableClip = NO;
+  WorkspaceBorderSize = 0;
-	DisableDrawers = NO;
+  WorkspaceBorder = None;
-	ClipMergedInDock = NO;
+  IconificationStyle = Zoom;
-	DisableMiniwindows = NO;
+  IconPath = (
-	EnableWorkspacePager = NO;
+    "~/GNUstep/Library/Icons",
-	IconPosition = blh;
+    "#pkgdatadir#/Icons",
-	IconificationStyle = Zoom;
+    "#pkgdatadir#/Pixmaps",
-	DisableWSMouseActions = NO;
+    "/usr/include/X11/pixmaps",
-	MouseLeftButtonAction = SelectWindows;
+    "~/GNUstep/Library/WindowMaker/Pixmaps",
-	MouseMiddleButtonAction = OpenWindowListMenu;
+    "~/GNUstep/Library/WindowMaker/CachedPixmaps",
-	MouseRightButtonAction = OpenApplicationsMenu;
+    "/usr/share/icons",
-	MouseBackwardButtonAction = None;
+    "/usr/local/share/pixmaps",
-	MouseForwardButtonAction = None;
+    "/usr/share/pixmaps"
-	MouseWheelAction = None;
+  );
-	MouseWheelTiltAction = None;
+  PixmapPath = (
-	PixmapPath = (
+    "~/GNUstep/Library/WindowMaker/Pixmaps",
-		"~/GNUstep/Library/WindowMaker/Pixmaps",
+    "~/GNUstep/Library/WindowMaker/Backgrounds",
-		"~/GNUstep/Library/WindowMaker/Backgrounds",
+    "~/GNUstep/Library/WindowMaker/CachedPixmaps",
-		"~/GNUstep/Library/WindowMaker/CachedPixmaps",
+    "#pkgdatadir#/Pixmaps",
-		"~/pixmaps",
+    "#pkgdatadir#/Backgrounds",
-		"#pkgdatadir#/Pixmaps",
+    "/usr/include/X11/pixmaps",
-		"#pkgdatadir#/Backgrounds",
+    "/usr/local/share/pixmaps",
-		"#pixmapdir#"
+    "/usr/share/pixmaps"
-	);
+  );
-	IconPath =  (
+  WindowTitleBalloons = YES;
-		"~/GNUstep/Library/Icons",
+  IconSize = 64;
-		"~/GNUstep/Library/WindowMaker/Pixmaps",
+  FocusMode = manual;
-		"~/GNUstep/Library/WindowMaker/CachedPixmaps",
+  DisableWSMouseActions = NO;
-		"~/pixmaps",
+  MouseLeftButtonAction = SelectWindows;
-		"#pkgdatadir#/Icons",
+  MouseMiddleButtonAction = OpenWindowListMenu;
-		"#pkgdatadir#/Pixmaps",
+  MouseRightButtonAction = OpenApplicationsMenu;
-		"#pixmapdir#"
+  MouseWheelAction = None;
-	);
+  ColormapSize = 4;
-	ColormapMode = auto;
+  DisableDithering = NO;
-	AutoFocus = YES;
+  ModifierKey = Mod1;
-	RaiseDelay = 0;
+  NewStyle = "new";
-	CirculateRaise = NO;
+  DisableDock = NO;
-	Superfluous = YES;
+  DisableClip = NO;
-	AdvanceToNewWorkspace = NO;
+  DisableDrawers = NO;
-	CycleWorkspaces = NO;
+  Superfluous = YES;
-	WorkspaceNameDisplayPosition = center;
+  StickyIcons = NO;
-	WorkspaceBorder = None;
+  SaveSessionOnExit = NO;
-	WorkspaceBorderSize = 0;
+  ColormapMode = auto;
-	StickyIcons = NO;
+  RaiseDelay = 0;
-	SaveSessionOnExit = NO;
+  AutoFocus = YES;
-	WrapMenus = NO;
+  WindowPlacement = auto;
-	ScrollableMenus = YES;
+  WindowPlaceOrigin = (64, 0);
-	MenuScrollSpeed = fast;
+  UseSaveUnders = NO;
-	IconSlideSpeed = fast;
+  DisableSound = NO;
-	ShadeSpeed = fast;
+  DisableAnimations = NO;
-	BounceAppIconsWhenUrgent = YES;
+  DontLinkWorkspaces = YES;
-	RaiseAppIconsWhenBouncing = NO;
+  AutoArrangeIcons = NO;
-	DoNotMakeAppIconsBounce = NO;
+  AdvanceToNewWorkspace = NO;
-	DoubleClickTime = 250;
+  CycleWorkspaces = NO;
-	ClipAutoraiseDelay = 600;
+  ResizeDisplay = center;
-	ClipAutolowerDelay = 1000;
+  MoveDisplay = floating;
-	ClipAutoexpandDelay = 600;
+  OpaqueMove = YES;
-	ClipAutocollapseDelay = 1000;
+  IconPosition = "blh";
-	WrapAppiconsInDock = YES;
+  WrapMenus = NO;
-	AlignSubmenus = NO;
+  ScrollableMenus = YES;
-	ViKeyMenus = NO;
+  MenuScrollSpeed = fast;
-	OpenTransientOnOwnerWorkspace = NO;
+  IconSlideSpeed = fast;
-	WindowPlacement = auto;
+  ShadeSpeed = fast;
-	IgnoreFocusClick = NO;
+  DoubleClickTime = 250;
-	UseSaveUnders = NO;
+  AlignSubmenus = NO;
-	OpaqueMove = YES;
+  NoWindowOverIcons = NO;
-	OpaqueResize = NO;
+  IgnoreFocusClick = NO;
-	OpaqueMoveResizeKeyboard = NO;
+  CloseKey = None;
-	DisableAnimations = NO;
+  MaximizeKey = None;
-	DontLinkWorkspaces = YES;
+  VMaximizeKey = None;
-	WindowSnapping = NO;
+  RaiseLowerKey = None;
-	SnapEdgeDetect = 1;
+  DontConfirmKill = NO;
-	SnapCornerDetect = 10;
+  ShadeKey = None;
-	SnapToTopMaximizesFullscreen = NO;
+  NextWorkspaceKey = "Mod1+Control+Right";
-	DragMaximizedWindow = Move;
+  PrevWorkspaceKey = "Mod1+Control+Left";
-	MoveHalfMaximizedWindowsBetweenScreens = NO;
+  RootMenuKey = F12;
-	AlternativeHalfMaximized = NO;
+  WindowListKey = F11;
-	PointerWithHalfMaxWindows = NO;
+  WindowMenuKey = "Control+Escape";
-	HighlightActiveApp = YES;
+  RaiseKey = "Mod1+Up";
-	AutoArrangeIcons = NO;
+  LowerKey = "Mod1+Down";
-	NoWindowOverDock = NO;
+  FocusNextKey = "Mod1+Tab";
-	NoWindowOverIcons = NO;
+  FocusPrevKey = "Mod1+Shift+Tab";
-	WindowPlaceOrigin = (64, 0);
+  Workspace1Key = "Mod1+1";
-	ResizeDisplay = center;
+  Workspace2Key = "Mod1+2";
-	MoveDisplay = floating;
+  Workspace3Key = "Mod1+3";
-	DontConfirmKill = NO;
+  Workspace4Key = "Mod1+4";
-	WindowTitleBalloons = YES;
+  Workspace5Key = "Mod1+5";
-	MiniwindowTitleBalloons = NO;
+  Workspace6Key = "Mod1+6";
-	MiniwindowPreviewBalloons = NO;
+  Workspace7Key = "Mod1+7";
-	AppIconBalloons = NO;
+  Workspace8Key = "Mod1+8";
-	HelpBalloons = NO;
+  Workspace9Key = "Mod1+9";
-	EdgeResistance = 30;
+  Workspace10Key = "Mod1+0";
-	ResizeIncrement = 0;
+  HideKey = "Mod1+H";
-	Attraction = NO;
+  SelectKey = None;
-	DisableBlinking = NO;
+  MiniaturizeKey = "Mod1+M";
-	SingleClickLaunch = NO;
+  NextWorkspaceLayerKey = None;
-	StrictWindozeCycle = YES;
+  PrevWorkspaceLayerKey = None;
-	SwitchPanelOnlyOpen = NO;
+  ConstrainWindowSize = NO;
-	MiniPreviewSize = 128;
+  DockRaiseLowerKey = None;
-	IgnoreGtkHints = NO;
+  ClipRaiseLowerKey = None;
-	MenuStyle = normal;
+  TitleJustify = center;
-	WidgetColor = (solid, gray);
+  WindowTitleFont = "Sans:bold:pixelsize=12";
-	WorkspaceSpecificBack = ();
+  MenuTitleFont = "Sans:bold:pixelsize=12";
-	WorkspaceBack =  (solid, "rgb:50/50/75");
+  MenuTextFont = "Sans:pixelsize=12";
-	SmoothWorkspaceBack = NO;
+  IconTitleFont = "Sans:pixelsize=9";
-	IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  ClipTitleFont = "Sans:bold:pixelsize=10";
-	TitleJustify = center;
+  LargeDisplayFont = "Sans:pixelsize=24";
-	WindowTitleFont = "Sans:bold:pixelsize=12";
+  HighlightColor = white;
-	WindowTitleExtendSpace = 0;
+  HighlightTextColor = black;
-	WindowTitleMinHeight = 0;
+  ClipTitleColor = black;
-	WindowTitleMaxHeight = 0x7fffffff;
+  CClipTitleColor = "rgb:61/61/61";
-	MenuTitleExtendSpace = 0;
+  FTitleColor = white;
-	MenuTitleMinHeight = 0;
+  PTitleColor = white;
-	MenuTitleMaxHeight = 0x7fffffff;
+  UTitleColor = black;
-	MenuTextExtendSpace = 0;
+  MenuTitleColor = white;
-	MenuTitleFont = "Sans:bold:pixelsize=12";
+  MenuTextColor = black;
-	MenuTextFont = "Sans:pixelsize=12";
+  MenuDisabledColor = gray50;
-	IconTitleFont = "Sans:pixelsize=9";
+  WorkspaceBack = (solid, "rgb:50/50/75");
-	ClipTitleFont = "Sans:bold:pixelsize=10";
+  MenuTextColor = black;
-	ShowClipTitle = YES;
+  FTitleBack = (solid, black);
-	LargeDisplayFont = "Sans:pixelsize=24";
+  UTitleBack = (solid, "rgb:aa/aa/aa");
-	HighlightColor = white;
+  ResizebarBack = (solid, "rgb:aa/aa/aa");
-	HighlightTextColor = black;
+  PTitleBack = (solid, gray40);
-	ClipTitleColor = black;
+  MenuTitleBack = (solid, black);
-	CClipTitleColor = "rgb:61/61/61";
+  MenuTextBack = (solid, "rgb:aa/aa/aa");
-	FTitleColor = white;
+  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
-	PTitleColor = white;
+  ClipAutocollapseDelay = 1000;
-	UTitleColor = black;
+  ClipAutolowerDelay = 1000;
-	FTitleBack = (solid, black);
+  ClipAutoexpandDelay = 600;
-	PTitleBack = (solid, gray40);
+  ClipAutoraiseDelay = 600;
 	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";
 	Workspace4Key = "Mod1+4";
 	Workspace5Key = "Mod1+5";
 	Workspace6Key = "Mod1+6";
 	Workspace7Key = "Mod1+7";
 	Workspace8Key = "Mod1+8";
 	Workspace9Key = "Mod1+9";
 	Workspace10Key = "Mod1+0";
 	MoveToWorkspace1Key = None;
 	MoveToWorkspace2Key = None;
 	MoveToWorkspace3Key = None;
 	MoveToWorkspace4Key = None;
 	MoveToWorkspace5Key = None;
 	MoveToWorkspace6Key = None;
 	MoveToWorkspace7Key = None;
 	MoveToWorkspace8Key = None;
 	MoveToWorkspace9Key = None;
 	MoveToWorkspace10Key = None;
 	MoveToNextWorkspaceKey = None;
 	MoveToPrevWorkspaceKey = None;
 	MoveToLastWorkspaceKey = None;
 	MoveToNextWorkspaceLayerKey = None;
 	MoveToPrevWorkspaceLayerKey = None;
 	WindowShortcut1Key = None;
 	WindowShortcut2Key = None;
 	WindowShortcut3Key = None;
 	WindowShortcut4Key = None;
 	WindowShortcut5Key = None;
 	WindowShortcut6Key = None;
 	WindowShortcut7Key = None;
 	WindowShortcut8Key = None;
 	WindowShortcut9Key = None;
 	WindowShortcut10Key = None;
 	WindowRelaunchKey = None;
 	ScreenSwitchKey = None;
 	RunKey = None;
 	NormalCursor = (builtin, left_ptr);
 	ArrowCursor = (builtin, top_left_arrow);
 	MoveCursor = (builtin, fleur);
 	ResizeCursor = (builtin, sizing);
 	TopLeftResizeCursor = (builtin, top_left_corner);
 	TopRightResizeCursor = (builtin, top_right_corner);
 	BottomLeftResizeCursor = (builtin, bottom_left_corner);
 	BottomRightResizeCursor = (builtin, bottom_right_corner);
 	VerticalResizeCursor = (builtin, sb_v_double_arrow);
 	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;
 }
@@ -3,7 +3,7 @@ defsdatadir = $(pkgdatadir)/IconSets
 defsdata_DATA = Default.iconset
-EXTRA_DIST =
+EXTRA_DIST = 
 CLEANFILES = Default.iconset
@@ -74,5 +74,5 @@ defsdata_DATA = \
 	xv.xpm
-EXTRA_DIST = $(defsdata_DATA)
+EXTRA_DIST = $(defsdata_DATA) 
@@ -1,29 +1,52 @@
-SUBDIRS = Backgrounds . Defaults IconSets Icons Pixmaps Styles Themes
+SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes
 prefsdatadir = $(pkgdatadir)
-wpexecbindir = @wprefs_bindir@
+prefsdata_DATA =\
 # menus which need generated to have correct path to WPrefs or data directory
 GENERATED_MENUS =\
 	appearance.menu\
-	appearance.menu.fy\
+	autostart.sh\
-	appearance.menu.nl\
+	background.menu\
 	exitscript.sh\
 	menu\
 	menu.bg\
 	menu.ca\
 	menu.cz\
 	menu.da\
 	menu.de\
 	menu.el\
 	menu.es\
 	menu.fi\
 	menu.fr\
 	menu.fy\
 	menu.gl\
 	menu.he\
 	menu.hr\
 	menu.hu\
 	menu.it\
 	menu.ja\
 	menu.ko\
 	menu.nl\
 	menu.no\
 	menu.pl\
 	menu.pt\
 	menu.ro\
 	menu.ru\
 	menu.se\
 	menu.sk\
 	menu.sl\
 	menu.tr\
 	menu.zh_CN\
 	menu.zh_TW\
 	plmenu\
 	plmenu.bg\
 	plmenu.da\
 	plmenu.de\
 	plmenu.es\
 	plmenu.fi\
 	plmenu.fr\
 	plmenu.fy\
 	plmenu.hr\
 	plmenu.it\
 	plmenu.ja\
 	plmenu.ko\
 	plmenu.nl\
@@ -32,52 +55,10 @@ GENERATED_MENUS =\
 	plmenu.sk\
 	plmenu.zh_CN\
 	plmenu.zh_TW\
 	wmmacros
 # menus which do not mention WPrefs or data directory
 NONGENERATED_MENUS =\
 	menu.ca\
 	menu.cz\
 	menu.da\
 	menu.de\
 	menu.el\
 	menu.es\
 	menu.fr\
 	menu.gl\
 	menu.he\
 	menu.hr\
 	menu.it\
 	menu.ja\
 	menu.no\
 	menu.pl\
 	menu.pt\
 	menu.ru\
 	menu.se\
 	menu.sl\
 	menu.tr\
 	menu.zh_CN\
 	plmenu.da\
 	plmenu.de\
 	plmenu.fr\
 	plmenu.hr\
 	plmenu.it
 dist_prefsdata_DATA =\
 	autostart.sh\
 	background.menu\
 	background.menu.fy\
 	background.menu.nl\
 	exitscript.sh\
 	README\
 	README.themes\
-	$(NONGENERATED_MENUS)
+	wmmacros
-nodist_prefsdata_DATA = $(GENERATED_MENUS)
+EXTRA_DIST = $(prefsdata_DATA) mkMakefile
 EXTRA_DIST = $(addsuffix .in, $(GENERATED_MENUS))
 CLEANFILES = $(GENERATED_MENUS)
 $(GENERATED_MENUS):
 	$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" \
 		-e "s:#wmdatadir#:$(pkgdatadir):" $(srcdir)/$@.in > $@
@@ -17,10 +17,10 @@ in double quotes ("). Ex: "~/GNUstep/Library/WindowMaker/menu"
 Instructions for editing the plain text menus can be found in the menu
 file itself, kindly translated to your tongue for your convenience, by
-the translation contributors.
+the translation contributors. 
 There is a script to convert plain text menus to property list menus
-in the utils directory, named wm-oldmenu2new.
+in the utils directory, named wm-oldmenu2new. 
 If you are unsure to wich format to use, stick with the plain text menus
 as they are more flexible. If for some psychological reason you are
@@ -32,11 +32,11 @@ Localized menu file translators:
 File    Language        Maintainer
 ------------------------------------------------------------------------------
-menu.ja Japanese        MANOME Tomonori <manome@itlb.te.noda.sut.ac.jp>
+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>
@@ -5,21 +5,21 @@ Themes For Window Maker
 =======================
 Note: the information contained in this file is only valid for themes
-in the .themed (for theme directory) format, supported in
+in the .themed (for theme directory) format, supported in 
 Window Maker 0.20.4 or newer.
 How To Install a Theme Pack
 ===========================
-To install a theme, unpack your theme into your WindowMaker directory
+To install a theme, unpack your theme into your WindowMaker directory 
 (the same as old-style themes), usually ~/GNUstep/Library/WindowMaker
 cd ~/GNUstep/Library/WindowMaker
 gzip -dc "xyztheme.tar.gz" | tar xvf -
 You can also do this in your system-wide WindowMaker directory (usually
-/usr/local/share/WindowMaker) to have the themes be available to all
+/usr/local/share/WindowMaker) to have the themes be available to all 
 your users. This will probably need to be done with root access.
@@ -46,10 +46,10 @@ getstyle -p ~/GNUstep/Library/WindowMaker/Themes/MyTheme
 This will create a theme pack (a new directory in either the current
 directory or a directory you specify) named MyTheme.themed, containing
 everything it requires, including all pixmap files. In this example,
-the new theme pack would be made in your themes directory and be
+the new theme pack would be made in your themes directory and be 
 immediately available in your Themes menu.
-Additionally, you can put a text file named MyTheme.lsm in the MyTheme.themed
+Additionally, you can put a text file named MyTheme.lsm in the MyTheme.themed 
 directory. This file can contain info like copyrights, credits or whatever.
 To distribute your theme, just make a .tar.gz of the .themed directory.
@@ -1,35 +0,0 @@
 {
  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";
 }
@@ -2,7 +2,6 @@
 prefsdatadir = $(pkgdatadir)/Styles
 prefsdata_DATA =\
 	Adwaita.style\
 	Autumn.style\
 	Black.style\
 	BlackTexture.style\
@@ -0,0 +1,11 @@
 #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 
@@ -1,12 +0,0 @@
 #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
@@ -1,12 +0,0 @@
 #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
@@ -1,12 +0,0 @@
 #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
@@ -5,7 +5,6 @@
                "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")'
@@ -23,10 +22,7 @@
 		"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
        "Gradient" END
        "Images" MENU
-            "Tiled" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
+            "Tiled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -t
-            "Scaled" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
+            "Scaled" OPEN_MENU LOCAL_BACKGROUNDS_DIR BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -s
-            "Centered" OPEN_MENU  BACKGROUNDS_DIR USER_BACKGROUNDS_DIR WITH wmsetbg -u -e
+        "Image" END
            "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
@@ -1,32 +0,0 @@
 #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
@@ -1,32 +0,0 @@
 #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
@@ -7,20 +7,20 @@
 *
 * <Title> is any string to be used as title. Must be enclosed with " if it
 * 	has spaces
- *
+ * 
 * SHORTCUT specifies a shortcut for that item. <Shortcut> has the
- * same syntax of the shortcuts key options in the
+ * same syntax of the shortcuts key options in the 
 * $HOME/GNUstep/Defaults/WindowMaker file, such as RootMenuKey or MiniaturizeKey.
 *
 * You can't specify a shortcut for a MENU or OPEN_MENU entry.
- *
+ * 
- * <Command> one of the valid commands:
+ * <Command> one of the valid commands: 
 *	MENU - starts (sub)menu definition
 *	END  - end (sub)menu definition
 *	OPEN_MENU - opens a menu from a file, pipe or directory(ies) contents
 *		    and eventually precede each with a command.
 *	WORKSPACE_MENU - adds a submenu for workspace operations. Only one
- *		    workspace_menu is allowed.
+ *		    workspace_menu is allowed. 		
 *	EXEC <program> - executes an external program
 *	SHEXEC <command> - executes a shell command (like gimp > /dev/null)
 *	EXIT - exits the window manager
@@ -74,11 +74,6 @@
 * 			-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:
@@ -87,7 +82,7 @@
 *			optional prompt	and do substitution with what you typed
 * %w - substitute with XID for the current focused window
 * %W - substitute with the number of the current workspace
- *
+ * 
 * You can override special characters (as % and ") with the \ character:
 * ex: xterm -T "\"Hello World\""
 *
@@ -122,7 +117,7 @@
 		"Manual Browser" EXEC xman
 	"Info" END
 	"Run..." SHEXEC %a(Run,Type command to run:)
-	"XTerm" EXEC xterm -sb
+	"XTerm" EXEC xterm -sb 
 	"Mozilla Firefox" EXEC firefox
 	"Workspaces" WORKSPACE_MENU
 	"Applications" MENU
@@ -137,12 +132,12 @@
 			"Spreadsheet" EXEC oocalc
 			"Draw" EXEC oodraw
 			"Impress" EXEC ooimpress
-		"OpenOffice.org" END
+		"OpenOffice.org" END 
 		"Editors" MENU
 			"XEmacs" EXEC xemacs
 			"Emacs" EXEC emacs
-			"XJed" EXEC xjed
+			"XJed" EXEC xjed 
 			"VI" EXEC xterm -e vi
 			"GVIM" EXEC gvim
 			"NEdit" EXEC nedit
@@ -184,7 +179,37 @@
 		"Lock" EXEC xlock -allowroot -usefirst
 	"Commands" END
-	"Appearance" OPEN_MENU "appearance.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 /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
 	"Appearance" END
 	"Session" MENU
 		"Save Session" SAVE_SESSION
@@ -209,7 +209,7 @@
 		"Фон" END
 		"Запази темата" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
 		"Запази колекцията иконки" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
-		"Пособие за настройки" EXEC #wprefs#
+		"Пособие за настройки" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
 	"Изглед" END
 	"Изход"	MENU
@@ -18,11 +18,11 @@
 * No es pot especificar una combinació de tecles per a un MENU o un
 * OPEN_MENU
 *
- * <Comanda> pot ser un d'aquests comandes:
+ * <Comanda> pot ser un d'aquests comandes: 
 *      MENU - Comença la definició d'un submenú
 *      END  - Acaba la definició d'un submenú
 *      OPEN_MENU - Obre el contingut d'un menú desde un fitxer, una
- *                  canonada (pipe), o desde el contingut de un(s)
+ *                  canonada (pipe), o desde el contingut de un(s) 
 *                  directori(s) i eventualment pot precedir-li algun
 *                  comanda
 *      WORKSPACE_MENU - Afageix el menú de operacions del escriptori. Tan
@@ -38,16 +38,16 @@
 *      HIDE_OTHERS - Oculta totes les finestres de l'escriptori excepte la
 *                  actual (o la darrera que ha estat activa)
 *      SAVE_SESSION - Guarda l'estat actual de l'escriptori, que inclou
- *                  totes les aplicacions en execució, la seva geometria, la
+ *                  totes les aplicacions en execució, la seva geometria, la 
- *                  posició en pantalla, l'escriptori en que estaven, el dock
+ *                  posició en pantalla, l'escriptori en que estaven, el dock 
- *                  o el clip desde on van ser executades, i si estaven
+ *                  o el clip desde on van ser executades, i si estaven 
 *                  minimitzades, ocultes o plegades. També guarda l'escriptori
- *                  que és usat en aquest moment. Tot això serà restaurat el
+ *                  que és usat en aquest moment. Tot això serà restaurat el 
 *                  pròxim cop que s'arrenqui Window Maker fins que es faci un
 *                  altre SAVE_SESSION o CLEAR_SESSION. Si SaveSessionOnExit =
 *                  Yes; el fitxer de domini de Window Maker, llavors la sessió
- *                  es guardarà cada cop que es surt de Window Maker,
+ *                  es guardarà cada cop que es surt de Window Maker, 
- *                  sobreescribint qualsevol SAVE_SESSION o CLEAR_SESSION
+ *                  sobreescribint qualsevol SAVE_SESSION o CLEAR_SESSION 
 *                  (veure avall)
 *      CLEAR_SESSION - Borra qualsevol sessió guardada anteriorment. No té
 *                  cap efecte si SaveSessionOnExit és verdader
@@ -115,7 +115,7 @@
                "Llista de Processos" EXEC xterm -e top
                "Manual d'instruccions" EXEC xman
        "Informació" END
-        "XTerm" EXEC xterm -sb
+        "XTerm" EXEC xterm -sb 
        "Rxvt" EXEC rxvt -bg black -fg white -fn fixed
        "Escriptoris" WORKSPACE_MENU
        "Aplicacions" MENU
@@ -128,7 +128,7 @@
                "X File Manager" EXEC xfm
                "OffiX Files" EXEC files
                "LyX" EXEC lyx
-                "Netscape" EXEC netscape
+                "Netscape" EXEC netscape 
                "Ghostview" EXEC ghostview %a(Enter file to view)
                "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)
                "TkDesk" EXEC tkdesk
@@ -136,7 +136,7 @@
        "Editors" MENU
                "XFte" EXEC xfte
                "XEmacs" SHEXEC xemacs || emacs
-                "XJed" EXEC xjed
+                "XJed" EXEC xjed 
                "NEdit" EXEC nedit
                "Xedit" EXEC xedit
                "VI" EXEC xterm -e vi
@@ -9,7 +9,7 @@
 // <Titulek> je jakýkoli řetěz znaků. Pokud obsahuje mezery musí být
 // 	uzavřen do uvozovek (")
 //
-// <Příkaz> může být jeden z následujících:
+// <Příkaz> může být jeden z následujících: 
 //	MENU - definice nové (sub)menu
 //	END  - konec definice nového menu
 //	EXEC <program> - provede se program
@@ -24,18 +24,18 @@
 //                    bylo naposledy zaměřeno)
 //
 // <Parameters> je program, který bude proveden.
-//
+// 
-// Každý příkaz MENU musí mít odpovídající END.
+// Každý příkaz MENU musí mít odpovídající END. 
 // následující text je česky, kódován ISO8859-2.
 #include <wmmacros>
 "Hlavní menu" MENU
-	"Správce oken" MENU
+	"Správce oken" MENU	
 		"Editace menu" SHEXEC xterm -T 'Editace menu' -e joe $HOME/GNUstep/Library/WindowMaker/menu
 	"Správce oken" END
 	"Info" MENU
 		"Info Panel..." INFO_PANEL
-		"Legal" LEGAL_PANEL
+		"Legal" LEGAL_PANEL	
 //		"Xosview" EXEC xosview
 		"Top"	EXEC xterm -e top
 		"Manuál" EXEC xman
@@ -7,13 +7,13 @@
 *
 * <Titel> er en tekst som anvendes som titel i menuen. Teksten
 * skal omgives med " hvis den indeholder mellemrum.
- *
+ * 
 * SHORTCUT angiver en genvej for menuobjektet. <Genvej> har samme
 * syntaks som genvejene i filen $HOME/GNUStep/Defaults/WindowMaker.
 *
 * Man kan ikke angive en genvej for kommandoerne MENU og OPEN_MENU.
- *
+ * 
- * <Kommando> kan være et af følgende:
+ * <Kommando> kan være et af følgende: 
 *      MENU - starter (under)menu definition.
 *      END  - afslutter (under)menu definition.
 *      OPEN_MENU - åbner en menu fra en fil, pipe eller indholdet af
@@ -109,8 +109,8 @@
                "Manualer" EXEC xman
        "Info" END
 	"Kør..." SHEXEC "%a(Kør,Indtast kommando der skal udføres:)"
-        "XTerm" EXEC xterm -sb
+        "XTerm" EXEC xterm -sb 
-        "Rxvt" EXEC rxvt -bg black -fg white
+        "Rxvt" EXEC rxvt -bg black -fg white 
        "Arbejdsborde" WORKSPACE_MENU
        "Applikationer" MENU
                "Grafik" MENU
@@ -122,7 +122,7 @@
                "X Filhåndtering" EXEC xfm
                "OffiX Files" EXEC files
                "LyX" EXEC lyx
-                "Netscape" EXEC netscape
+                "Netscape" EXEC netscape 
                "Ghostview" EXEC ghostview %a(GhostView,Indtast filnavn)
                "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)
                "TkDesk" EXEC tkdesk
@@ -130,7 +130,7 @@
        "Tekstbehandling" MENU
                "XFte" EXEC xfte
                "Emacs" SHEXEC xemacs || emacs
-                "XJed" EXEC xjed
+                "XJed" EXEC xjed 
                "NEdit" EXEC nedit
                "Xedit" EXEC xedit
                "VI" EXEC xterm -e vi
@@ -8,7 +8,7 @@
 // <Title> ist ein Text, der als Titel benutzt werden soll. Falls er
 //	Leerzeichen enthält, muss er von " umgeben sein.
 //
-// <Command> eine der folgenden gültigen Anweisungen:
+// <Command> eine der folgenden gültigen Anweisungen: 
 //	MENU - beginnt (Unter)menüdefinition
 //	END  - beendet (Unter)menüdefinition
 //	EXEC <program> - führt ein externes Programm aus
--- a/Show More
+++ b/Show More
`@@ -74,5 +74,5 @@ defsdata_DATA = \`
	`xv.xpm`	`xv.xpm`


	`EXTRA_DIST = $(defsdata_DATA)`	`EXTRA_DIST = $(defsdata_DATA)`