WindowMaker 0.95.0-crm

debian: problem with spaces and forget autogenerated files
debian: Version bump in nightly build script.
2026-03-11 20:15:54 +01:00 · 2011-10-11 14:32:55 +01:00 · 2011-10-09 17:59:24 +01:00 · 2011-10-07 19:54:11 +01:00 · 2011-10-07 10:01:57 +01:00 · 2011-10-05 19:24:01 +01:00
714 changed files with 149223 additions and 157744 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,8 +0,0 @@
-Makefile Makefile.in
-aclocal.m4
-configure config.log config.cache config.guess config.status config.sub
-libtool ltconfig ltmain.sh
-autom4te.cache
-.psrc .inslog2 tca.map tca.log pchdir *.rpt
-update
-WindowMaker*.tar.gz
--- a/.cvsnotify
+++ b/.cvsnotify
@@ -1,6 +0,0 @@
-#
-# You can add here extra email addresses (one per line) where notifications
-# should be sent on cvs commit.
-# This is easier than to modify CVSROOT/loginfo to add extra addresses there.
-# Lines that start with # or empty lines are ignored.
-#
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,77 @@
+*.lo
+*.o
+*Makefile
+*Makefile.in
+.deps/
+.libs/
+INSTALL
+aclocal.m4
+autom4te.cache*
+config-paths.h
+config.guess
+config.h
+config.h.in
+config.h.in~
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+mkinstalldirs
+stamp-h1
+contrib/WindowMaker.spec
+m4/
+src/wconfig.h
+src/wmaker
+test/wtest
+util/convertfonts
+util/geticonset
+util/getstyle
+util/seticons
+util/setstyle
+util/wdread
+util/wdwrite
+util/wmagnify
+util/wmaker.inst
+util/wmgenmenu
+util/wmmenugen
+util/wmsetbg
+util/wmsetup
+util/wxcopy
+util/wxpaste
+wrlib/get-wraster-flags
+wrlib/libwraster.la
+wrlib/tests/testdraw
+wrlib/tests/testgrad
+wrlib/tests/testrot
+wrlib/tests/view
+wrlib/wrlib.pc
+WINGs/Examples/colorpick
+WINGs/Examples/connect
+WINGs/Examples/fontl
+WINGs/Examples/puzzle
+WINGs/Examples/server
+WINGs/Extras/libExtraWINGs.a
+WINGs/Extras/libExtraWINGs.la
+WINGs/Extras/test
+WINGs/Tests/testmywidget
+WINGs/Tests/wmfile
+WINGs/Tests/wmquery
+WINGs/Tests/wtest
+WINGs/WINGs.pc
+WINGs/get-wings-flags
+WINGs/get-wutil-flags
+WINGs/libWINGs.a
+WINGs/libWINGs.la
+WINGs/libWUtil.a
+WINGs/libWUtil.la
+WPrefs.app/WPrefs
+WindowMaker/Defaults/WMRootMenu
+WindowMaker/Defaults/WMState
+WindowMaker/Defaults/WMWindowAttributes
+WindowMaker/Defaults/WindowMaker
+WindowMaker/IconSets/Default.iconset
--- a/8
+++ b/8
@@ -107,10 +107,10 @@ made autoarrange icons a runtime option, SHADOW_RESIZEBAR c-time option,
 no workspace switch to the same workspace, dashed icon selection,
 misclellaneous bug fixes, definable cursors, --no-polling command line option.

-The JED Text Editor <xjed@windowmaker.org>
+The JED Text Editor <xjed@windowmaker.info>
 Project maintainer

-Alfredo K. Kojima <kojima@windowmaker.org>
+Alfredo K. Kojima <kojima@windowmaker.info>
 The guy who types random keys to feed JED with the necessary entropy

 Jay Kominek <jkominek@xtn.net>
@@ -149,7 +149,7 @@ Fix for unassociated alpha tiff
 Craig Nellist <crn@ozemail.com.au>
 selection in textfield

-Dan Pascu <dan@windowmaker.org>
+Dan Pascu <dan@windowmaker.info>
 dock ghost (superfluous mode) fix, enhancement for scrollable menus,
 clip, numerous other stuff, project maintainer

@@ -217,7 +217,7 @@ FRBall <frb@umr.edu>
 dgradient fix


-"]d" <id@windowmaker.org>
+"]d" <id@windowmaker.info>
 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,
--- a/9
+++ b/9
@@ -4,11 +4,11 @@


 	If you find a bug please fill this form and send it to 
-developers@windowmaker.org Please, USE THIS FORM!!!
+wmaker-dev@lists.windowmaker.org Please, USE THIS FORM!!!

 	You can also report a bug in the WWW bug tracker at
-http://windowmaker.org/cgi-bin/bugs or by sending this report 
-to bugs@windowmaker.org
+http://bugs.windowmaker.org/projects/wmaker/issues or by sending this report to
+bugs@windowmaker.org


 0. Before reporting this bug I already:
@@ -35,9 +35,6 @@ to bugs@windowmaker.org
 [ ]  --enable-kanji
 [ ]  --disable-shape   
 [ ]  --enable-single-icon
-[ ]  --enable-kde
-[ ]  --enable-gnome
-[ ]  --enable-openlook
 [ ]  --enable-modelock
 [ ]  Others: .......................

--- a/8
+++ b/8
@@ -1,8 +1,12 @@
+Newly added
+- 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
+
 - wmaker will not stop managing a screen even if another window manager
  requests that, through the ICCCM 2.0 manager selection stuff
 - stacking code is buggy (or XFree is buggy)
- after restart focus is losed or switched to another window. May be related
-  to the one above.
 - save session doesnt work on some platforms (Alpha and Sparc)
 - texture pixmaps are being incorrectly freed somewhere. Either
  fix bug (to support broken MetroX servers) or remove all useless references
--- a/31
+++ b/31
@@ -1,9 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 		59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -16,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
@@ -56,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

@@ -111,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -169,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -226,7 +225,7 @@ impose that choice.

 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -279,8 +278,8 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

 		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
+
+	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -292,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>

    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
@@ -304,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 Also add information on how to contact you by electronic and paper mail.

 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:

-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
--- a/COPYING.OPL
+++ b/COPYING.OPL
@@ -1,91 +0,0 @@
-
-     OpenContent License (OPL)
-     Version 1.0, July 14, 1998.
-
-     This document outlines the principles underlying the OpenContent
-     (OC) movement and may be redistributed provided it remains
-     unaltered. For legal purposes, this document is the license under
-     which OpenContent is made available for use.
-
-     The original version of this document may be found at
-     http://www.opencontent.org/opl.shtml
-
-     LICENSE
-
-     Terms and Conditions for Copying, Distributing, and Modifying
-
-     Items other than copying, distributing, and modifying the Content
-     with which this license was distributed (such as using, etc.) are
-     outside the scope of this license.
-
-     1. You may copy and distribute exact replicas of the OpenContent
-     (OC) as you receive it, in any medium, provided that you
-     conspicuously and appropriately publish on each copy an appropriate
-     copyright notice and disclaimer of warranty; keep intact all the
-     notices that refer to this License and to the absence of any
-     warranty; and give any other recipients of the OC a copy of this
-     License along with the OC. You may at your option charge a fee for
-     the media and/or handling involved in creating a unique copy of the
-     OC for use offline, you may at your option offer instructional
-     support for the OC in exchange for a fee, or you may at your option
-     offer warranty in exchange for a fee. You may not charge a fee for
-     the OC itself. You may not charge a fee for the sole service of
-     providing access to and/or use of the OC via a network (e.g. the
-     Internet), whether it be via the world wide web, FTP, or any other
-     method.
-
-     2. You may modify your copy or copies of the OpenContent or any
-     portion of it, thus forming works based on the Content, and
-     distribute such modifications or work under the terms of Section 1
-     above, provided that you also meet all of these conditions:
-
-     a) You must cause the modified content to carry prominent notices
-     stating that you changed it, the exact nature and content of the
-     changes, and the date of any change.
-
-     b) You must cause any work that you distribute or publish, that in
-     whole or in part contains or is derived from the OC or any part
-     thereof, to be licensed as a whole at no charge to all third
-     parties under the terms of this License, unless otherwise permitted
-     under applicable Fair Use law.
-
-     These requirements apply to the modified work as a whole. If
-     identifiable sections of that work are not derived from the OC, and
-     can be reasonably considered independent and separate works in
-     themselves, then this License, and its terms, do not apply to those
-     sections when you distribute them as separate works. But when you
-     distribute the same sections as part of a whole which is a work
-     based on the OC, the distribution of the whole must be on the terms
-     of this License, whose permissions for other licensees extend to
-     the entire whole, and thus to each and every part regardless of who
-     wrote it. Exceptions are made to this requirement to release
-     modified works free of charge under this license only in compliance
-     with Fair Use law where applicable.
-
-     3. You are not required to accept this License, since you have not
-     signed it. However, nothing else grants you permission to copy,
-     distribute or modify the OC. These actions are prohibited by law if
-     you do not accept this License. Therefore, by distributing or
-     translating the OC, or by deriving works herefrom, you indicate
-     your acceptance of this License to do so, and all its terms and
-     conditions for copying, distributing or translating the OC.
-
-     NO WARRANTY
-
-     4. BECAUSE THE OPENCONTENT (OC) IS LICENSED FREE OF CHARGE, THERE
-     IS NO WARRANTY FOR THE OC, TO THE EXTENT PERMITTED BY APPLICABLE
-     LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
-     AND/OR OTHER PARTIES PROVIDE THE OC "AS IS" WITHOUT WARRANTY OF ANY
-     KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-     THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-     PARTICULAR PURPOSE. THE ENTIRE RISK OF USE OF THE OC IS WITH YOU.
-     SHOULD THE OC PROVE FAULTY, INACCURATE, OR OTHERWISE UNACCEPTABLE
-     YOU ASSUME THE COST OF ALL NECESSARY REPAIR OR CORRECTION.
-
-     5. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-     WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
-     MIRROR AND/OR REDISTRIBUTE THE OC AS PERMITTED ABOVE, BE LIABLE TO
-     YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-     CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
-     THE OC, EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-     POSSIBILITY OF SUCH DAMAGES.
--- a/172
+++ b/172
@@ -1,3 +1,103 @@
+Changes since version 0.92.0:
+.............................
+
+- added check for --with-gnustepdir option to configure to verify that its
+  argument is an absolute path
+- updated german translations (Torsten Marek <shlomme@gmx.net>)
+- fixed WPrefs.app to find its icons when not installed under GNUstep paths
+- fixed gcc-4 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
+- fixed amd64 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
+- eliminated gcc-4 compilation warnings
+- small fix for compilation in a different directory than the source
+  (Balaton Zoltan <balaton@eik.bme.hu>)
+- fixed some warnings on 64bit platforms (Balaton Zoltan <balaton@eik.bme.hu>)
+- fixed issue with invisible modal windows from Qt and Gtk applications
+  on 64bit platforms (Max Loparyev <max@city.veganet.ru>)
+- fixed issue with icon colors on big endian platforms
+  (Max Loparyev <max@city.veganet.ru>)
+- release colors to avoid issues with the reference count overflowing a
+  small integer and causing unexpected color releases that can crash
+  Window Maker (Martin Frydl <martin.frydl@systinet.com>)
+- fixed a small memory leak in WINGs/wview.c caused by not releasing the
+  background color of a view (Martin Frydl <martin.frydl@systinet.com>)
+- updated estonian translation (Ivar Smolin <okul@linux.ee>)
+- updated the XDND code in WINGs to work with GDK based applications.
+  WINGs based applications should now work with both KDE and GNOME
+  applications (Sylvain Reynal <sreynal@nerim.net>)
+- better check for the XDND protocol version when interoperating with other
+  applications. As it seems xdnd version 3 (which WINGs supports) and newer
+  are not backward compatible with xdnd version 1 and 2. This is why WINGs
+  applications cannot interoperate with GNUstep applications (which uses
+  xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
+  version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
+- Improved Info panel layout and fonts.
+- Fixed missing library paths when linking some binaries on certain
+  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 
+  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.
+- Fixed segfault when unhiding an application in certain conditions (seen
+  with KDE applications with transient windows)
+
+
+Changes since version 0.91.0:
+.............................
+
+- fixed crash with info panel and alt-tabbing
+- updated Japanese translations (Takeo Hashimoto <HashimotoTakeo@mac.com>)
+- allow disable of switch panel when SwitchPanelImages=None
+- added X Input Methods support in WINGs
+- fixed issues with compiling on Solaris with openwin
+- reduced minimum required version number for the Xft library to 2.1.0
+- fixed some compilation issues with gcc-2.9x
+- removed --with-appsdir option and replaced it with --with-gnustepdir. Also,
+  default installation path (for non GNUstep users) is now $(prefix)/bin
+- fixed bug with infinite loop in some circumstances in fitText() in WINGs
+- fixed to allow parallel builds on SMP systems using make -j
+- updated Italian translation (Marco Colombo <m.colombo@ed.ac.uk>)
+- applied .AppInfo --> Library path rename patch (Alex Perez <aperez@student.santarosa.edu>)
+- added code to automatically update the icon paths from the old .AppInfo
+  style to the new Library/WindowMaker style in WMWindowAttributes when
+  Window Maker starts to make transition transparent for users.
+- fixed issue with window being moved by 1 pixel up and left when the window
+  move was initiated by the client
+- improved hide/unhide animation for applications with multiple windows
+  (only animate the active window hiding/unhiding, which makes Window Maker
+  faster and more responsive for such applications). This also makes the
+  restart operation much faster.
+- fixed bug with windows shrinking to very small sizes when Unmaximize was
+  used on them, after they were closed in a maximized state.
+- fixed bug with restoring maximized state from NetWM atoms.
+- fixed issue with GNUstep applications losing focus when all their windows
+  are closed and there remains only their menu (Matt Rice <ratmice@yahoo.com>)
+- try fixed font for the technical drawing font if helvetica-12 is not
+  available to avoid crashing (Timo Juhani Lindfors <timo.lindfors@iki.fi>)
+- new algorithm for placing miniwindows after unhiding the application they
+  belong to, that works without auto-arranging the icons, while still avoiding
+  multiple icons in the same spot by moving the miniwindows to a new slot if
+  their old slot was occupied in the meantime.
+- double clicking an appicon will also raise the miniwindows that belong to
+  that application to the front (along with the normal windows).
+
+
+Changes since version 0.90.0:
+.............................
+
+- added _NET_WM_NAME, _NET_WM_ICON_NAME and _NET_WM_ICON to WINGs
+- new WPrefs icon (thanks to Largo)
+- replaced VirtualEdgeThickness option, with EnableVirtualDesktop (boolean)
+- enhanced alt-tab panel, added theming ability
+- fixed issues with broken crash dialog
+- removed obsoleted options from wconfig.h
+- changed animation delay constants to fix issues with 2.6.x linux kernels
+  (patch provided by Eric Piel <Eric.Piel@lifl.fr>)
+- fixed several broken po files
+- increased libwraster version number to 3.1.0 (added a RCopyArea function)
+
+
 Changes since version 0.80.2:
 .............................

@@ -16,7 +116,7 @@ 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 Xft 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 
  <cavassin@conectiva.com.br>)
@@ -110,13 +210,69 @@ Changes since version 0.80.2:
  (Marcelo E. Magallon <marcelo.magallon@bigfoot.com>)
 - Do not use the disabled clip color for the clip's workspace navigation arrows
  when the clip is collapsed (it made them look like disabled)
- Fixed the 'focus flicker' problem, seen with GTK2 applications.
+- Fixed bug with incorrect un-escaping if there is a dot in wm_class.
+- Updated Catalan translations (Ernest Adrogue <eadrogue@gmx.net>)
+- Updated Spanish translation of WPrefs (Alberto Gimenez <algibe@teleline.es>)
+- Fixed synchronization problem between hair cursor and mouse cursor in
+  wmagnify with mouse cursor at the screen edge (Jon Diercks <jon@diercks.net>)
+- Fixed 2 focus switching related bugs (Allan Peramaki <aperamak@cc.hut.fi>)
+- Fixed a bug that made the crash panel to be shown again and again when the
+  'Restart Window Maker' option was selected, under some circumstances.
+- Added workaround in global WMWindowAttributes, to avoid creating a second
+  appicon when a KDE3 application opens a config panel.
+- Updated slovak translation (Jan Tomka <judas@linux.sk>)
+- Added xdnd v3 support in WINGs (Sylvain Reynal <sreynal@nerim.net>)
+- Check whether libXft is at least version 2.1.2 else refuse to compile.
+- Fixed bug in icon chooser dialog that could cause a segmentation fault
+  in some cases (Pascal Hofstee <caelian@gmail.com>)
+- Fixed crash in asm code in wrlib, with new versions of gcc.
+- Fixed bug in the x86_PseudoColor_32_to_8() function which incorrectly
+  used the r, g, b fields in the conversion.
+- Fixed x86 ASM code in wrlib to work on 64 bit architectures.
+- Fixed the focus flicker seen with some apps (notably gtk2)
+  (Alexey Spiridonov <snarkmaster@gmail.com>)
+- Fixed all crashing bugs that were generated by wmaker starting with the
+  WMState file missing.
+- Added NetWM support (a modified version of the patch originaly written
+  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 
+    <a.p.zijlstra@chello.nl>)
+- Fixed memory leak in dock code.
+- Fixed and enhanced the text wrapping in WINGs.
+- Fixed the layout of some elements in WPrefs.app
+- Added workaround for aplications that don't set the required hints on the
+  client leader window, but they set them on normal windows (observer with
+  KDE 3.3.0 mainly). This will allow these apps to get an appicon again.
+  (they should be fixed still)
+- Added workaround for applications that do not set a command with
+  XSetCommand(), but instead they set the _NET_WM_PID property. This works
+  with operating systems that offer a /proc interface similar to what linux
+  has. (This also is to fix problems with KDE 3.3.0 apps, but not only them).
+- Fixed bug with autostart and exit scripts not being executed if user
+  GNUstep path was different from ~/GNUstep (when setting GNUSTEP_USER_ROOT)
+- Removed legacy OFFIX_DND support code
+- Fixed the signal handler for crashes (ie, removed it) and made wmaker
+  restarting be made automatically by a monitoring process.
+- Made NetWM support be enabled by default
+- Removed old code to store/restore workspace state (now relies on netwm)
+- Added a (simple) Font Configuration for fontconfig fonts
+- 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 
+  made it support fontsets
+- Converted all menu and po files to UTF-8
+- Updated de.po (Thomas Otto <3.1415926535897932384626433832@gmx.net>)
+- Fixed a crash bug when switching workspaces
+- Removed obsoleted scripts from util: wsetfont, wmchlocale, wcopy, wpaste


 Changes since version 0.80.1:
 .............................

- Fixed a buffer overflow when allocating an RImage struct.
+- Fixed a buffer overflow when allocating a RImage struct.


 Changes since version 0.80.0:
@@ -674,9 +830,9 @@ Changes since version 0.51.2:
 - fixed focus problem with unfocusable windows
 - fixed bug in WPrefs that changed EXIT to SHUTDOWN
 - fixed menu title messup bug in WPrefs
- added a dot to mark hidden applications (compile time) (id@windowmaker.org)
- enhancements to the modelock patch (id@windowmaker.org)
- show kbd mode for modelock  (id@windowmaker.org)
+- added a dot to mark hidden applications (compile time) (id@windowmaker.info)
+- enhancements to the modelock patch (id@windowmaker.info)
+- show kbd mode for modelock  (id@windowmaker.info)
 - enhanced positioning of transient windows
 - added dynamically loadable texture renderer code
  from Tobias Gloth <gloth@online.de>
@@ -1517,7 +1673,7 @@ Changes since version 0.14.1:
  They are icons for dock, clip, defaultAppIcon, sound server and for xterm.
  All the rest needed for apps that can be started from menu, and have entries
  in WMWindowAttributes, are in WindowMaker-data.tar.gz which can be found on
-  http://windowmaker.org/ or ftp://ftp.windowmaker.org/pub/contrib/icons
+  http://windowmaker.info/ or ftp://ftp.windowmaker.info/pub/contrib/icons
 - Changed the SlideWindow() function to better adapt to slow machines. Also
  the animation constants are now run time. They are IconSlideDelay = 0;
  IconSlideStep = 5; and IconSlideSlowDown = 50; See NEWS for a more in depth
@@ -1585,7 +1741,7 @@ Changes since version 0.14.0:
  or exiting, while an Attribute Editor panel is open.
 - Put clip.tif, clip.png, clip.xpm, clip2.tif, clip2.xpm, Cone.xpm and
  Penguin.xpm in WindowMaker-data_tar.gz. These are icons intended for fiend.
-  It can be found on ftp://ftp.windowmaker.org/pub/wmaker/contrib/icons
+  It can be found on ftp://ftp.windowmaker.info/pub/wmaker/contrib/icons



--- a/90
+++ b/90
@@ -143,10 +143,9 @@ here for example screenshots.
 1.2 Where can I get Window Maker? 
 ----------------------------------
 The official site to get new developmental versions from is
-ftp://ftp.windowmaker.org/pub/beta/srcs/. 
+http://windowmaker.org/pub/source/beta/

-NOTE: Also see http://wm.current.nu/downloads.html for the latest 
-Stable and Development versions. 
+The mercurial repository is available at https://hg.windowmaker.org/wmaker

 The development versions are usually very stable themselves, so if you
 want to have all the newest features, you can rather safetly go with the
@@ -158,23 +157,15 @@ crash.

 1.3 Where are the mailing list archives? 
 ----------------------------------------
-Phillip Smith from Netplex, our wonderful provider of windowmaker.org, has set
-up some new lists from the domain.  Please read the information on the web
-pages at http://www.windowmaker.org/lists.html for information on how to
-subscribe, the posting guidelines, and how to access the web archives.
-
-Many thanks to Ed Orcutt who hosted the original lists from his own machine
-for many years and Caldera who graciously allowed Ed to continue hosting
-from them when he moved to his new position with them.  Ed provided a very
-valuable service for many years and we are sad to see him go.
+Please read the information on the web pages at http://lists.windowmaker.org/
+for information on how to subscribe, the posting guidelines, and how to access
+the web archives.


 1.4 Where is more documentation on configuring Window Maker? 
 ----------------------------------
 Besides the mailing list archives, there are nice documents in
-ftp://ftp.windowmaker.org/pub/docs/, at
-http://wm.current.nu/downloads.html on my download page and at 
-http://wm.current.nu/user-guide/index.htm in the online user-guide. 
+http://windowmaker.org/documentation.php


 1.5 What is an appicon? 
@@ -182,51 +173,33 @@ http://wm.current.nu/user-guide/index.htm in the online user-guide.
 An appicon is the icon (without the tiny titlebar a minimized application icon
 has) produced by most applications that initially is in the bottom left corner
 of the screen while an application is running. For an example, run xterm and
-notice the icon in the corner. (Make sure that you use xterm and not a
-default older rxvt because older versions of rxvt do not properly set their
-window attributes.) 
+notice the icon in the corner.


 1.6. How can I get a question added to the FAQ? 
 ----------------------------------
-Right now, the only method is to mail Chris Green <sprout@dok.org> or
-myself <largo@current.nu> the question or post it on the Window Maker
-Mailing list, and see if enough people have the same problem. 
+Ask on the mailing list, or send your request to faqs@windowmaker.org

-If you are a developer and would like to be able to edit the official FAQ on
-Chris's site, let him know at <sprout@dok.org>
-
-He is currently pondering writing a front end that allows everyone to add
-entries and only require a moderator approval before being posted. 
+Other avenues are the Window Maker wiki
+  http://bugs.windowmaker.org/projects/wmaker/wiki
+and the forums
+  http://bugs.windowmaker.org/projects/wmaker/boards


 1.7. How do I report bugs? 
 ----------------------------------
 You can look at the BUGFORM file in your tarball of Window Maker.
 Alternatively, you can use the Window Maker Bugtracker at
-http://windowmaker.org/cgi-bin/bugs. 
+http://bugs.windowmaker.org/projects/wmaker/issues


-1.8. Is there an anomymous cvs server? 
+1.8. Is there a public source code repository?
 ----------------------------------
-Yes there is. To check out from cvs, first 
-
-            export CVSROOT=":pserver:anoncvs@cvs.net-community.com:/gnustep"
-            cvs login
-          
-'anoncvs' is the password. 
-
-Then issue the command. "wm" is the name of the module. 
-
-            cvs -z3 checkout -d WindowMaker wm
-          
-
-To update your source tree, cd to the WindowMaker directory and type 
-
-            cvs -z3 update 
-          
-inside the WindowMaker directory. 
+Yes there is. To check out from mercurial use:
+  hg clone http://hg.windowmaker.org/wmaker wmaker

+To update your source tree, cd to the wmaker directory and type
+  hg pull
          


@@ -365,8 +338,8 @@ for your convenience.


 2.8 Can I use WindowMaker with KDE or GNOME or CDE? 
----------------------------------
-Contrary to a lot of people thinks, KDE is NOT a window manager. KDE is
+---------------------------------------------------
+Contrary to what a lot of people think, KDE is NOT a window manager. KDE is
 a suite of various applications that includes a custom window manager (kwm).
 The same is true for CDE. 

@@ -386,7 +359,7 @@ mouse.


 2.9 How do I get Window Maker working with xdm in Redhat 5.[01]? 
----------------------------------
+----------------------------------------------------------------
 After running wmaker.inst and letting it write to .xinitrc,
 cp .xinitrc .xsession
 and make sure that /usr/local/bin is in your $PATH for the Xserver. You can
@@ -1102,7 +1075,7 @@ keep-on-top options for the dock and clip.
 4.18 How do I restore the configuration app to the dock?
 ----------------------------------]
 You should start it from a terminal using its full path name, which is
-/usr/local/GNUstep/Apps/WPrefs.app/WPrefs
+/usr/local/GNUstep/Applications/WPrefs.app/WPrefs
 by default.


@@ -1192,10 +1165,10 @@ Several Nice applications are available:
     http://www.geocities.com/SiliconValley/Vista/2471/linux.htm#xapps 

     ascd,WMRack,asmixer,asmodem, and others
-     ftp://ftp.windowmaker.org/pub/wmaker/contrib/srcs/apps/ 
+     ftp://ftp.windowmaker.info/pub/wmaker/contrib/srcs/apps/ 

     wmavgload, wmmount, and wmload
-     ftp://ftp.windowmaker.org/pub/wmaker/contrib/srcs/utils/ 
+     ftp://ftp.windowmaker.info/pub/wmaker/contrib/srcs/utils/ 

     wmppp-wmifs, wmtime, wmmon and other nifty apps
     http://windowmaker.mezaway.org/ 
@@ -1311,14 +1284,8 @@ in routines/xsci/jpc_SGraph.c
 5.12 Netscape shows black and white icons
 ----------------------------------

-This is because Netscape uses monochrome icons when running under olwm
-and you are using the OPEN LOOK emulation option. If you do not use any XView
-apps anyway, recompile Window Maker without the --enable-openlook option.
-If you need OPEN LOOK emulation, you will have to get used to the monochrome
-icons or change then manually in the Attributes panel for each window.
-I have also seen this happen on some systems if you run Netscape in a high
-colour depth (32bpp) regardless of whether you're using openlook or not.
-That is a Netscape bug.  Therefore, bug Netscape.
+I have seen this happen on some systems if you run Netscape in a high
+colour depth (32bpp). That is a Netscape bug. Therefore, bug Netscape.


 5.13 Snow flakes from xsnow don't acumulate on titlebars!
@@ -1470,11 +1437,14 @@ the files manually. Or download the whole distribution.


 7.5 Will you add GNOME or KDE support?
----------------------------------
+--------------------------------------

 Support for GNOME (and KDE) hints is included since 0.50.0.  You have to
 enable them at compile-time using the appropriate arguments to ./configure.
 Please read the INSTALL file for more details.
+Note: starting with version 0.90.0, support for legacy Gnome-1.x and KDE-2.x
+was dropped in favor of NETWM support (used by both Gnome-2.x and KDE-3.x)
+

 -=-=-=-=-
 Themes:
--- a/FAQ.I18N
+++ b/FAQ.I18N
@@ -32,24 +32,35 @@ If I18N support does not work for you, check these:
 		here:
 		ftp://ftp.linux.or.jp/pub/RPM/glibc

-	- if you'd like to display multibyte characters, set the
-	  MultiByteText option to YES in ~/GNUstep/Defaults/WindowMaker
-	  and ~/GNUstep/Defaults/WMGLOBAL
-
 	- the fonts you're using support your locale. if your font
 	  setting on $HOME/GNUstep/Defaults/WindowMaker is like..

-	  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-	  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+	  WindowTitleFont = "Trebuchet MS:bold:pixelsize=12";
+	  MenuTitleFont   = "Trebuchet MS:bold:pixelsize=12";
 	  ......................................................

-	  then you can't display non iso8859-x charcters by helvetica. 
-	  so quick way to display various languages' font is to change
-	  all the font settings into:
+	  then you can't display asian language (ja,ko,ch) characters using
+          Trebuchet MS. A font that is guaranteed to work for any language is
+          sans (or sans-serif). sans is not a font itself, but an alias which
+          points to multiple fonts and will load the first in that list that
+          has the ability to show glyphs in your language. If you don't know
+          a font that is suited for you language you can always set all your
+          fonts to something like:

-		"-*-*-medium-r-normal-*-14-*-*-*-*-*-*-*"
+		"sans:pixelsize=12"

-	  and also you need to change font settings in style files in
+          However, please note that if your font is something like:
+
+		"Trebuchet MS,sans serif:pixelsize=12"
+
+	  this will not be able to display asian languages if any of the
+          previous fonts before sans are installed. This is because unlike
+          the proper font pickup that sans guarantees for your language,
+          this construct only allows a font fallback mechanism, which tries
+          all the fonts in the list in order, until it finds one that is
+          available, even if it doesn't support your language.
+
+	  Also you need to change font settings in style files in
 	  the "$HOME/Library/WindowMaker/Style" directory.

 	- the LC_CTYPE environment variable is unset or it has the correct
--- a/FAQ.I18N.cs
+++ b/FAQ.I18N.cs
@@ -1,70 +0,0 @@
-                Často kladené otázky na podporu místního nastavení
-                ==================================================
-
-Pokud vám nefunguje podpora I18N, tak zkontrolujte tato nastavení:
-
-        - systémová proměnná LANG musí být nastavená tak, aby odpovídala vašemu
-          místnímu nastavení (čeština = czech), vaše místní nastavení musí být
-          podporovatelné vaším operačním systémem nebo X emulací. Všechny
-          podporovatelné lokalizace zobrazíte příkazem "locale -a". Měli byste
-          také zkontrolovat, zda-li je vaše místní nastavení podporované
-          X emulací. Soubor: "/usr/X11R6/lib/X11/locale/locale.alias" by měl
-          obsahovat podobnou sekvenci (podpora pro češtinu):
-
-                cs                              cs_CZ.ISO8859-2
-                cs_CS                           cs_CZ.ISO8859-2
-                cs_CS.ISO8859-2                 cs_CZ.ISO8859-2
-                cs_CZ                           cs_CZ.ISO8859-2
-                cs_CZ.iso88592                  cs_CZ.ISO8859-2
-                cz                              cz_CZ.ISO8859-2
-                cz_CZ                           cz_CZ.ISO8859-2
-
-        - zkontrolujte použití správných fontů pro vaše místní nastavení.
-          Pokud nepoužíváte správné fonty s kódováním, které je nastaveno v
-          Xlib nebo libc, tak se můžou dít "dost divné věci". Zkuste explicitně
-          zadat kování do proměnné LANG: LANG=cs_CS.ISO8859-2 nebo
-          LANG=cs_CZ.iso88592 a znovu zkontrolujte:
-          "/usr/X11R6/lib/X11/locale/locale.alias"
-
-        - pokud váš operační systém nepodporuje místní nastavení (locales), nebo
-          pokud váš OS nepodporuje místní nastavení pro váš jazyk, můžete
-          použít emulaci místního nastavení X Window Systému. Zprovoznit tuto
-          emulaci je možné spuštěním ./configure s volbou "--witn-x-locale".
-          Pokud používáte nějaký komerční systém jako je například IRIX, AIX,
-          Solaris, ...,tak asi X emulaci nebudete potřebovat. Ovšem pokud je
-          vaším operačním systémem Linux, NetBSD nebo jiný užasný, volně
-          šiřitelný operační systém, tak je možné, že vaše místní nastavení
-          zatím není podporované. Potom použijte volbu "--witn-x-locale".
-
-          Pozn: Aby jste mohli používat X emulaci místních nastavení, tak vaše
-                Xlib musí být zkompilované s touto podporou. Xlib v RedHat 5.0
-                tak zkompilované nejsou (RH4.x jsou OK). Překompilované Xlib
-                s podporou pro emulací místních nastavení pro RH5.0 jsou
-                dostupné na adrese:
-
-                ftp://ftp.linux.or.jp/pub/RPM/glibc
-
-        - pokud chcete zobrazovat multibyte znaky, nastavte volbu MultiByteText
-          na YES v souborech:
-
-                ~/GNUstep/Defaults/WindowMaker
-                ~/GNUstep/Defaults/WMGLOBAL
-
-        - fonty, které používáte by měli být podporované vaším místním nastavením.
-          Jestliže vaše nastavení fontů v souboru ~/GNUstep/Defaults/WindowMaker
-          vypadá takto:
-
-          WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-          MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";  ,
-
-          nemůžete zobrazovat znaky jiné než iso8859-x ve fontu helvetica.
-          Jednoduchý způsob, jak zobrazovat znaky různých jazyků, je nastavit všechny
-          fonty takto:
-
-                "-*-*-medium-r-normal-*-14-*-*-*-*-*-*-*"
-
-          Také je nutné změnit nastavení fontů v souborech stylů v adresáři:
-          ~/Library/WindowMaker/Style.
-
-        - pokud si nejste jisti, zda-li má systémová proměnná LC_TYPE správnou
-          hodnotu, tak ji nenastavujte.
--- a/FAQ.I18N.sk
+++ b/FAQ.I18N.sk
@@ -1,61 +0,0 @@
-(Toto je len preklad dosť starého súboru! Ak by ste mali skutočne problémy
- s Window Makerom a slovenčinou a v tomto súbore by ste nenašli pomoc,
- pošlite popis problému na adresu <judas@linux.sk>.)
-
-Ak vám nefunguje podpora miestnych nastavení, skontrolujte nasledujúce:
-
-	- premenná LANG je nastavená na vaše miestne nastavenia a tieto
-	  sú podporované vašim OS alebo X emuláciou. Zoznam podporovaných
-	  miestnych nastavení získate príkazom "locale -a". Zoznam
-	  miestnych nastvení podporovaných X emuláciou sa nachádza v
-	  súbore "/usr/X11R6/lib/X11/locale/locale.alias".
-
-	- používate správne fonty pre svoje miestne nastavenia. Ak
-	  používate font s odlišným kódovaním ako je nastavené v Xlib
-	  alebo libc, môžu sa diať čudné veci. Skúste explicitne zadať
-	  kókovanie do premennej LANG, teda sk_SK.ISO-8859-2. Znovu,
-	  pozrite si súbor "/usr/X11R6/lib/X11/locale/locale.aliax".
-
-	- ak váš OS nepodporuje žiadne miestne nastavenia alebo váš OS
-	  nepodporuje vaše miestne nastavenia, môžete použiť emuláciu
-	  podpory miestnych nastavení X Window Systému. To urobíte
-	  voľbou "--with-x-locale" skriptu configure. Ak používate
-	  komerčný OS ako Solaris, IRIX, AIX, ..., pravdepodobne
-	  nepotrebujete použiť X emuláciu miestnych nastavení. Ale ak
-	  je váš OS Linux alebo NetBSD alebo ..., je možné, že vaše
-	  miestne nastavenia ešte nie sú podporované. Vtedy použite
-	  "--with-x-locale".
-
-	  Pozor: aby ste mohli používať X emuláciu miestnych nastvení,
-		 vaša Xlib musí byť skompilovaná s touto podporou.
-		 Xlib v Linux RedHat5.0 tak skompilovaná nie je.
-		 (RH4.x je v poriadku). Prekompilovaná Xlib pre
-		 RH5.0 s podporou emulácie miestnych nastavení je
-		 dostupná na adrese
-
-		 ftp://ftp.linux.or.jp/pub/RPM/glibc
-
-	- ak chcete zobrazovať multibyte znaky, nastavte možnosť
-	  MultiByteText YES v ~/GNUstep/Defaults/WindowMaker a
-	  ~/GNUstep/Defaults/WMGLOBAL	
-
-	- fonty, ktoré používate, podporujú vaše miesne nastavenia.
-	  Ak vaše nastavenia fontov v ~/GNUstep/Defaults/WindowMaker
-	  vyzerajú takto:
-
-	  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-	  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-	  ......................................................
-
-	  potom nemôžete zobrazovať znaky iné ako iso8859-x vo fonte
-	  helvetica. Jednoduchý spôsob ako zobrazovať znaky rôznych
-	  jazykov je nastaviť všetky fonty takto:
-	  
-		"-*-*-medium-r-normal-*-14-*-*-*-*-*-*-*"
-
-	  a tiež potrebujete zmeniť nastavenia fontov v súboroch štýlov
-	  v adresári ~/Library/WindowMaker/Style.
-
-	- premenná LC_CTYPE nie je nastavená alebo má správnu hodnotu. Ak
-	  si nie ste istí, nenastavujte ju.
-
--- a/221
+++ b/221
@@ -1,50 +1,16 @@

 		Installation Instructions for Window Maker

+The latest version of Window Maker (-crm) can be found in the
+git repository at
+
+http://repo.or.cz/w/wmaker-crm.git


 SUPPORTED PLATFORMS
 ===================
-(ie: I've heard someone has compiled it on...)

- Intel GNU/Linux Conectiva 5.9 (beta)
- Intel GNU/Linux Slackware
- Intel GNU/Linux Debian
- Intel GNU/Linux other distributions
- Sparc GNU/Linux RedHat 5.1
- PowerPC GNU/MkLinux
- Alpha GNU/Linux RedHat 5.1
- FreeBSD
- NetBSD
- OpenBSD
- BSDI 4.0
- Solaris 2.5.1, 2.5.2
- Solaris 2.6.0
- Solaris 2.7beta
- Solaris 2.8 on Ultra Sparc 10 and E450
- SCO Unix
- SGI Irix 5.x, 6.5
- OSF/1
- HP-UX
- AIX 3.2.5
- AIX 4.1.4 / IBM PowerPC
- AIX 4.3.1 / IBM CC compiler
- AIX 4.3.2 / IBM PowerPC
- AIX 5.3
- DEC Alpha/Digital UNIX 4.x
- XFree86 / OS/2
- Corel NetWinder
- SunOS 4.x
- PowerMac / Power MachTen 4.1.1 over MacOS
- Amiga 3000 running RedHat Linux 5.1 (Rawhide)
- IBM S/390 running Linux
- IBM S/390 running Conectiva Linux (experimental)
- iBook running Darwin
- Darwin PPC / Macos X
- Windows NT with Cygwin/XFree86
- Sony PlayStation2 running Linux
-
-All registered trademarks are registered by their owners. (duh)
+- Intel GNU/Linux Systems in general

 Patches to make it work on other platforms are welcome.

@@ -64,23 +30,18 @@ The following software is required to use Window Maker:
 The following is required to build Window Maker:

 - Basic obvious stuff
-	If you will build Window Maker, make sure you have gcc (or some
-	other ANSI C compiler) and the X header files installed. Specially
-	for newbie Linux users: you must install all X development packages
-	and the gcc suite. Otherwise you won't be able to build any X
-	program, including Window Maker.
+	gcc (or some other ANSI C compiler)
+	glibc development files (usually glibc-devel in Linux distributions)
+	X development files (XFree86-devel or something similar)

 - autoconf, automake and libtool
-	These tools are NOT needed, but IF you have one or
-	more of them installed, make sure you have ALL of the following 
-	with exactly these versions:
 	autoconf 2.54
 	automake 1.4
 	libtool 1.4.2
-	If you have a different version, disable them by temporarily
-	renaming them to something else or uninstalling them from your
-	system. If you don't develop software you don't need them,
-	so you can safely uninstall. 
+
+- Xft2
+	and its dependencies (such as freetype2 and fontconfig)
+	You will also need the development files for it (xft2-devel)


 OPTIONAL:
@@ -125,13 +86,19 @@ might work too.
 CONFIGURE OPTIONS:
 ==================

+If you downloaded the cvs or git versions, type
+
+./autogen.sh
+
+to generate the config files.
+
 These options can be passed to the configure script to enable/disable
 some Window Maker features. Example:

-./configure --enable-kde --enable-gnome
-
-will configure Window Maker with KDE and GNOME supported compiled in.
+./configure --enable-modelock --disable-gif

+will configure Window Maker with modelock supported and disable gif support.
+Normally, you won't need any of them.

 To get a list of other options, run ./configure --help

@@ -153,23 +120,6 @@ To get a list of other options, run ./configure --help
 --disable-motif
 	disable support for mwm window manager hints

--enable-openlook
-	enable support for OPEN LOOK(tm) window manager hints
-
--enable-gnome
-	enable support for GNOME window manager hints
-
--enable-kde
-	enable support for kde/kwm window manager hints
-
--enable-lite
-	remove things that are already supported in desktop environments,
-	like KDE and GNOME. Disabled things are: window list, root
-	applications menu, multiple window selection. Note that you will not
-	be able to exit Window Maker from itself anymore; you will have to
-	use kill with the SIGTERM signal or exit it from KDE. It is not
-	advisable to enable it.
-
 --enable-modelock
 	XKB language status lock support. If you don't know what it is you
 	probably don't need it.
@@ -197,65 +147,6 @@ To get a list of other options, run ./configure --help
 PLATFORM SPECIFIC NOTES:
 ========================

- DEC/Alpha machines
-
-#>>>>>>>>>>>
-From: Anton Ivanov <aivanov@eu.level3.net>
-To: Marcelo E. Magallon <mmagallo@debian.org>
-Subject: Re: Is the WindowMaker package working ok on Alpha?
-
-> Hi,
-> 
->  I was reading some docs on the WindowMaker tarball, and found this:
-> 
->  | - DEC/Alpha machines
->  |         You might need to pass the --disable-shm flag to configure,
->  |         like ./configure --disable-shm
-> 
->  is anyone having problems with WindowMaker on Alpha?  Can someone
->  please test this?  Should the flag be passed when building on Alpha?
-
-Disclaimer: alphas under my command have never run X and are least likely to 
-suddenly start running it anytime soon.
-
-        Alpha used to have some ridiculously low amount of shared memory
-configured. 
-So quite a lot of apps used to barf. Namely - cdrecord, mysql server, etc.
-
-        Check where is yours at the moment and raise it to a more appropriate
-value by either catting to the appropriate /proc entry or changing the
-/usr/src/linux/include/asm/shmparam.h.
-
-        Otherwise the shared memory on alpha should be fully functional and I
-see no reason to disable it. Mine are bumped up to 32 or more on most
-machines.
-
-        And If I recall correctly the comments in that file are actually
-wrong. Value is not bytes, but in machine size word. For alpha *8.
-
-        As I said - I do not run X on them so all #include "stdisclaimer.h"
-apply.
-#<<<<<<<<<<<<
-
-
- SCO Unix - run configure like
-	CFLAGS="-belf -DANSICPP" ./configure 
-
- SunOS, Solaris 
-	If you have gcc installed, run configure as:
-	CPP_PATH="gcc -E -x c" ./configure
-	Sun's cpp lacks some features needed by Window Maker and it can
-	cause problems when parsing the config files.
-	You also might need to use the --with-libs-from and --with-incs-from
-	to supply the directory where libtiff is located.
-	Someone mailed me that you also must make /usr/local/lib be the
-	first path in LD_LIBRARY_PATH to make it work.
-
-	If you have a Ultra Creator 3D or some other machine with high-end
-	graphics, be sure to start the X server with the default visual
-	set to 24bpp or you might experience problems with mangled colors.
-	This is a wmaker bug and will be fixed.
-
 - GNU/Linux in general
 	Make sure you have /usr/local/lib in /etc/ld.so.conf and that you
 	run ldconfig after installing.
@@ -278,27 +169,6 @@ apply.
 	* make sure you have /usr/local/lib in /etc/ld.so.conf before running
 	ldconfig;

-	* if you have problems that mention an error message with --no-reexec
-	uninstall libtool-1.2b and install libtool-1.3 instead. libtool-1.3
-	can be found in ftp.gnu.org  Also read the TROUBLESHOOTING section;
-
-	* if you installed the Window Maker package from RedHat and are
-	installing a new version of it by hand (compiling yourself), uninstall
-	the package from RedHat before.
-
-	* make sure you have a symbolic link from /usr/include/X11 to
-	/usr/X11R6/include/X11 (if not, type ln -s /usr/X11R6/include/X11
-	/usr/include/X11 )
-
-	* make sure you have /lib/cpp pointing to the cpp program
-
-	If you have any doubts in doing any of the stuff above, please
-	don't hesitate to contact the RedHat user support. They will
-	kindly answer to all your questions regarding their system.
-	They also know much more about their own system than us 
-	(we don't use RedHat).
-
-
 - PowerPC MkLinux
 	You will need to have the latest version of Xpmac. Older versions
 	seem to have bugs that cause the system to hang.
@@ -352,9 +222,9 @@ following.
 	to get a complete listing of other options that are available.

 	2. Run configure with the options you want. For example, if you
-	want to use the --enable-kde option, type:
+	want to use the --enable-modelock option, type:

-	./configure --enable-kde
+	./configure --enable-modelock

 	3. (optional) Edit src/wconfig.h with your favorite text editor
 	and browse through it for some options you might want to change.
@@ -401,11 +271,10 @@ Installing the extras package

 Unpack WindowMaker-extra-<version-number>.tar.gz in /usr/local/share

-You can get the file at ftp://ftp.windowmaker.org. This file is optional
-and only have a few icons, and themes. Look for the latest <version-number>
-available.
-Also there is a WindowMaker-extra.readme to instruct you where that package
-should go.
+You can get the file at http://windowmaker.org/pub/source/release/. This file
+is optional and only have a few icons, and themes. Look for the latest
+<version-number> available.  Also there is a WindowMaker-extra.readme to
+instruct you where that package should go.



@@ -415,10 +284,10 @@ I don't have the root password :(
 If you can't get superuser privileges (can't be root) you can install
 wmaker in your own home directory. For that, supply the --prefix option
 when running configure in step 2 of building Window Maker. You will
-also need to supply the --with-appspath option, to specify the path for
+also need to supply the --with-gnustepdir option, to specify the path for
 WPrefs.app Example:

-./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps
+./configure --prefix=/home/jshmoe --with-gnustepdir=/home/jshmoe/GNUstep/Applications


 Then make /home/jshmoe/bin be included in your search PATH, add
@@ -500,7 +369,7 @@ If you're not sure, try renaming ~/GNUstep to ~/GNUtmp and then run wmaker.inst
 == The root menu contains only 2 entries. ("XTerm" and "Exit...")

 * Window Maker is not finding cpp (the C preprocessor). If your cpp is
-not located in /lib/cpp, edit src/config.h and correct the path in
+not located in /lib/cpp, edit config.h and correct the path in
 CPP_PATH.

 == checking lex output file root... configure: error: cannot find output from true; giving up
@@ -565,33 +434,3 @@ following order (for brazilian portuguese, in this case):
 menu.pt_BR
 menu.pt
 menu
-
-
-5 - If you chose a language that uses multi-byte characters, you must
-configure the fonts appropriately. Read the manual page for XCreateFontSet
-to have more details about it. You must change the ~/G/D/WindowMaker file
-for fonts used in titlebars, menus and other things. For fonts used in
-dialog windows, change ~/G/D/WMGLOBAL. The %d in the font names must not be
-removed. You can also use the supplied wsetfont script for the task.
-Read the script itself for instructions.
-
-For example, you can specify the following in ~/G/D/WindowMaker:
-
-WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*,-*-*-medium-r-normal-*-12-*";
-ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*,-*-*-medium-r-normal-*-12-*";
-DisplayFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-12-*";
-
-and in ~/G/D/WMGLOBAL:
-
-SystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-BoldSystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-
-The above 2 fonts are only used by applications that use WINGs (WindowMaker
-and WPrefs.app)
-
-The wsetfont script that's supplied will allow you to change the font
-settings in a easier way. Take a look in the script for details on usage.
-
--- a/INSTALL.cs
+++ b/INSTALL.cs
@@ -1,613 +0,0 @@
-        Instrukce pro instalaci okenního manažera Window Maker
-
-PODPOROVANÉ PLATFORMY
-=====================
-("Podporované" znamená, že už to na dané platformě někdo zprovoznil...)
-
- Intel GNU/Linux Conectiva 5.9 (beta)
- Intel GNU/Linux Slackware
- Intel GNU/Linux Debian
- Intel GNU/Linux ostatní distribuce
- Sparc GNU/Linux RedHat 5.1
- PowerPC GNU/MkLinux
- Alpha GNU/Linux RedHat 5.1
- FreeBSD
- NetBSD
- OpenBSD
- BSDI 4.0
- Solaris 2.5.1, 2.5.2
- Solaris 2.6.0
- Solaris 2.7beta
- SCO Unix
- SGI Irix 5.x, 6.5
- OSF/1
- HP-UX
- AIX 3.2.5
- AIX 4.1.4 / IBM PowerPC
- AIX 4.3.1 / IBM CC compiler
- AIX 4.3.2 / IBM PowerPC
- AIX 5.3
- DEC Alpha/Digital UNIX 4.x
- XFree86 / OS/2
- Corel NetWinder
- SunOS 4.x
- PowerMac / Power MachTen 4.1.1 over MacOS
- Amiga 3000 running RedHat Linux 5.1 (Rawhide)
- IBM S/390 s Linuxem
- iBook s OS Darwin
-
-Patche pro rozběhání na jiných platformách jsou vítané.
-
-POŽADAVKY
-=========
-
-Následující software je potřebný/nezbytný pro běh Window Makeru:
-
- X11R6.x
-        Window Maker může být zkompilován na starších verzích X, jako
-        je X11R5 (Solaris) nebo X11R4 (OpenWindows), ale nebude to pracovat
-        100% spolehlivě. Na těchto systémech nebudou fungovat ikony
-        aplikací a budete mít problémy s používáním doku. Upgrade
-        uživatelských knihoven (Xlib, Xt atd.) zlepší tyto problémy pokud
-        nemůžete aktualizovat váš X server.
-
-Následující software je potřebný ke zkompilování Window Makeru:
-
- Zákládní běžné věci
-        Když budete komplivat Window Maker, tak se ujistěte, že máte gcc
-        (nebo jiný ANCI C kompilátor) a nainstalované hlavičkové soubory
-        pro X. Hlavně pro začátečníky v Linuxu: musíte nainstalovat všechny
-        X-devel balíky a gcc. Jinak nebudete schopni zkompilovat žádný
-        program s grafickým rozhraním, tedy ani Window Maker.
-
- autoconf, automake a libtool
-        Tyto nástroje NEJSOU POTŘEBA, ale když máte jeden nebo dva nebo
-        všechny tři nainstalované, tak se UJISTĚTE, že máte přesně
-        následující VERZE:
-                autoconf 2.54
-                automake 1.4
-                libtool 1.4.2
-        Máte-li odlišnou verzi, tak ji dočasně přejmenujte, nebo ji rovnou
-        odinstalujte z vašeho systému. Pokud nebudete programovat, tak ji
-        stejně nebudete potřebovat, takže ji můžete bezpečně odinstalovat.
-
-Pozn. libProblist už není potřeba ke zkompilování Window Makeru, protože
-        libProblist byl přímo zabudován do WINGs. Z toho důvodu už není
-        potřeba ani lex (flex) a yacc (nebo bison).
-
-
-NEPOVINNÉ
-=========
-
-Tyto knihovny nejsou nutné pro běh Windo Makeru, ale jsou podporované, když
-je budete chtít použít. Tyto verze jsou používané vývojovým týmem, který
-garantuje, že budou fungovat. Ostatní verze by měli fungovat také.
-
- libXPM 4.7 nebo novější
-        Starší verze nemusí fungovat!!!
-        Dostupné na ftp://sunsite.unc.edu/pub/Linux/libs/X/
-
-        Je zde zabudovaná podpora pro soubory XPM, ale nenačte obrázky s
-        nestandardním formátem kódování.
-
- libpng 0.96 nebo novější a zlib
-        Pro podporu PNG obrázků
-        http://www.cdrom.com/pub/png/
-
- libtiff 3.4 nebo novější
-        Pro podporu TIFF obrázků
-        Dostupné na ftp://ftp.sgi.com/graphics/tiff
-
- libjpeg 6.0.1 nebo novější
-        Pro podporu JPEG obrázků
-        http://www.ijg.org/
-
- libgif 2.2 nebo libungif
-        Pro podporu GIF obrázků
-        Dostupné na ftp://prtr-13.ucsc.edu/pub/libungif/
-
-GNU xgettxt
-        Když chcete používat češtinu nebo jiné jazyky kromě angličtiny,
-        tak potřebujete GNU xgettext.
-        Ostatní verze nejsou kompatibilní a nebudou fungovat
-        GNU verze je dostupná na ftp://ftp.gnu.org
-
-
-KONFIGURAČNÍ NASTAVENÍ
-======================
-
-Tyto volby mohou být předané konfiguračnímu skriptu jako argumenty za
-účelem povolení/zakázání určité vlastnosti Window Makera.
-
-Příklad:
-
-./configura --enable-kde --enable-gnome
-
-nakonfiguruje Window Maker s podporou KDE a GNOME
-
-Seznam ostatních možností dostanete spuštěním ./configure --help
-
--with-libs-from
-        specifikuje, které další adresáře s knihovnami se mají 
-        prohledávat. Řetězec -L musí předcházet každému adresáři,
-        např:
-        --with-libs-from="-L/opt/libs -L/usr/local/lib"
-
--with-incs-from
-        určuje, které další adresáře s hlavičkovými soubory se mají
-        prohledat. Řetězec -I musí předcházet každému adresáři,
-        např:
-        --with-incs-from="-I/opt/headers -I/usr/local/include"
-
--enable-single-icon
-        umožňuje skrýt všechny ikony aplikací WM_CLASS+WM_INSTANCE
-        do jedné jediné. Tato vlastnost není podporovaná ze strany vývojářů.
-        Když budete mít s touto funkcí problémy, tak se obraťte na jejího
-        autora: Christopher Seawood <cls@seawood.org>
-
--disable-shm
-        zakáže používání zdílené paměti MIT. To trochu zpomalí generování
-        textur, ale v některých případech se to jeví jako nezbytnost z důvodu
-        chyby, která způsobuje špatné zobrazování ikon a textur.
-
--disable-motif
-        zakáže podporu pokynů pro okenní manažer mwm.
-
--enable-openlook
-        povolí podporu pokynů pro okenní manažer OPEN LOOK(tm).
-
--enable-gnome
-        povolí podporu pokynů pro GNOME.
-
--enable-kde
-        povolí podporu pokynů pro KDE.
-
--enable-lite
-        odstraní nástroje a funkce, které jsou už dostupné v desktopových
-        prosředích KDE a GNOME. Odstraní se: seznam oken, menu aplikací,
-        výběr více oken. Uvědomte si, že takto už nebudete schopni ukončit
-        samotný Window Maker pomocí aplikačního menu. Budete muset zabít Window
-        Maker z textové konzole nebo ho ukončit z KDE nebo GNOME.
-        Nedoporučuje se povolit tuto vlastnost.
-
--enable-modelock
-        podpora pro XKB nastavení jazyka. Když nevíte, o co jde, tak to
-        pravděpodobně nebudete potřebovat.
-
--enable-sound
-        povolí podporu modulu zvukových efektů.
-
--disable-xpm
-        zakáže podporu knihovny XPM, pokud je dostupná na vašem systému.
-
--disable-png
-        zakáže podporu knihovny PNG.
-
--disable-tiff
-        zakáže podporu knihovny TIFF.
-
--disable-gif
-        zakáže podporu knihovny GIF.
-
--disable-jpeg
-        zakáže podporu knihovny JPEG.
-
--disable-shape
-        zakáže tvarovaná okna (pro oclock, xeyes, atd.).
-
-POŽADAVKY PRO SPECIFICKÉ PLATFORMY
-==================================
-
-DEC/Alpha
-
-        Následující mail není přeložen, ale hovoří se v něm, že pravděpodobně
-        není potřeba konfigurovat Window Maker na Alphě s volbou --disable-shm.
-
-------------------------------------------------------------------------------
-        From: Anton Ivanov <aivanov@eu.level3.net>
-        To: Marcelo E. Magallon <mmagallo@debian.org>
-        Subject: Re: Is the WindowMaker package working ok on Alpha?
-
-> Hi,
-> 
->  I was reading some docs on the WindowMaker tarball, and found this:
-> 
->  | - DEC/Alpha machines
->  |         You might need to pass the --disable-shm flag to configure,
->  |         like ./configure --disable-shm
-> 
->  is anyone having problems with WindowMaker on Alpha?  Can someone
->  please test this?  Should the flag be passed when building on Alpha?
-
-Disclaimer: alphas under my command have never run X and are least likely to 
-suddenly start running it anytime soon.
-
-        Alpha used to have some ridiculously low amount of shared memory
-configured. 
-So quite a lot of apps used to barf. Namely - cdrecord, mysql server, etc.
-
-        Check where is yours at the moment and raise it to a more appropriate
-value by either catting to the appropriate /proc entry or changing the
-/usr/src/linux/include/asm/shmparam.h.
-
-        Otherwise the shared memory on alpha should be fully functional and I
-see no reason to disable it. Mine are bumped up to 32 or more on most
-machines.
-
-        And If I recall correctly the comments in that file are actually
-wrong. Value is not bytes, but in machine size word. For alpha *8.
-
-        As I said - I do not run X on them so all #include "stdisclaimer.h"
-apply.
-
-------------------------------------------------------------------------------
-
- SCO Unix - configure spusťte takto:
-        CFLAGS="-belf -DANSICPP" ./configure
-
- SunOS, Solaris
-        Když máte naistalovaný gcc, tak configure spusťte takto:
-        CPP_PATH="gcc -E -x c" ./configure
-        Preprocesoru cpp od Sunu chybějí některé vlastnosti, které Window Maker
-        potřebuje, a to může způsobit problémy během parsování konfiguračních
-        souborů. Je možné, že budete muset použít --with-libs-from a
-        --with-incs-from k nahrazení adresáře s libtiff.
-        Někdo doporučuje použít /usr/local/lib jako první cestu v LD_LIBRARY_PATH.
-
-        Když máte Ultra Creator 3D nebo jinou high-end grafickou kartu, tak se
-        ujistěte, že X server startuje s 24 bitovou barevnou hloubkou, jinak
-        můžete mít problémy s pomícháním barev. Toto je chyba Window Makeru,
-        která bude odstraněna.
-
- GNU/Linux obecně
-        Ujistěte se, že soubor /etc/ld.so.conf obsahuje řádek "/usr/local/lib".
-        Odinstalujte jakoukoliv starší verzi balíčku Window Makeru před instalací
-        novější verze.
-        Nezapomeňte spustit ldconfig po instalaci Window Makeru.
-
- RedHat GNU/Linux
-        RedHat má několik obtěžujících chyb. Pokud ho používáte dodržujte několik
-        následujících kroků, jinak vám Window Maker nebude fungovat.
-
-        * pokud máte nainstalovaný Window Maker z distribuce RedHat, tak ho před
-        upgradem odinstalujte
-
-        * ujistěte se, že nemáte systémové proměnné LANG a LINGUAS nastavené
-        na en_RN
-
-        * ujistěte se, že vaše systémová proměnná PATH obsahuje položku
-        /usr/local/bin
-
-        * ujistěte se, že soubor /etc/ld.so.conf obsahuje řádek "/usr/local/lib"
-        před tím, než spustíte ldconfig (na konci instalace)
-
-        * pokud máte problémy, které se projevují chybovou hláškou, která
-        obsahuje text --no-reexec, tak odinstalujte libtool-1.2b a nainstalujte
-        si novější verzi libtool-1.3. libtool-1.3 můžete nalézt na adrese:
-        ftp.gnu.org  .    Přečtěte si také odstavec ŘEŠENÍ PROBLÉMÚ.
-
-        * pokud máte nainstalovaný balíček Window Maker od RedHatu a nyní
-        instalujete novou verzi "ručně" (kompilováním zdrojových kódů), tak
-        nejprve odinstalujte stávající balíček.
-
-        * ujistěte se, že se na vašem systému nachází symbolický link z
-        /usr/include/X11 na /usr/X11R6/include/X11. Pokud tomu tak není, tak
-        na příkazovou řádku napište:
-
-         ln -s /usr/X11R6/include/X11 /usr/include/X11
-
-        * ujistěte se, že máte symbolický link /lib/cpp ukazující na cpp
-        program
-
-        Pokud pochybujete o nějakém z předcházejích kroků, tak neváhejte
-        kontaktovat uživatelskou podporu distribuce RedHat. Oni vám laskavě
-        zodpoví všechny vaše dotazy zohledňující váš systém. Oni vědí
-        mnohem více o vašem (jejich) systému než my (my nepoužíváme
-        RedHat).
-
- PowerPC MkLinux
-        Budete potřebovat poslední verzi Xpma. Starší verze pravděpodobně 
-        obsahují chybu, která způsobuje zamrznutí systému.
-
- Debian GNU/Linux
-        Pokud chcete podporu JPEG a TIFF, tak se ujistěte, že máte nainstalovány
-        balíčky libtiff-dev a libjpeg-dev.
-
- SuSE GNU/Linux
-        Pokud máte již nainstalován baliček Window Maker od SuSE, tak ho
-        odstraňte než se pustíte do kompilace Window Makeru. když tak
-        neučiníte, budete mít problémy.
-
- MetroX (neznámá verze)
-        Metrox obsahuje chybu, která zapřičiňuje, že obrázky, které jsou
-        nastaveny jako pozadí, jsou poškozeny. Pokud používáte Metrox a
-        máte podivné problémy s texturami, tak nepoužívejte textury v
-        titulcích nebo používejte jiný X server.
-
-INSTALACE
-=========
-
-Nejjednodušší způsob, jak nainstalovat Window Maker, je spustit skript
-Install nebo Install.cs (ten s vámi komunikuje česky). Oba skripty
-vás jednoduše provedou celou instalací.
-
-        su
-        Install.cs
-
-Poznámka: tato metoda neposkytuje všechny možnosti konfigurace a pokud
-          se setkáte s nějakými problémy, tak stejně budete muset
-          použít následující způsob kompilace.
-
-Kompilace Window Makeru
-----------------------
-        Pro osvědčený způsob zadejte následující příkazy v shellu:
-
-        ./configure
-        make
-
-pak se přihlašte jako root a zadejte:
-
-        make install
-        ldconfig
-
-pokud nejste programátor a nebudete ladit Window Maker, tak se můžete zbavit
-ladících symbolů v binárních souborech a zmenšit jejich velikost:
-
-        make install-strip
-        ldconfig
-
-Takto zkompilujete a nainstalujete Window Maker se standartními parametry.
-
-Pokud chcete upravit některé vlastnosti, tak musíte učinit následující:
-
-        1. (volitelné) Podívejte se na část MOŽNOSTI KONFIGURACE, kde jsou
-        uvedené možnosti konfigurace. Nebo spusťte:
-
-        ./configure --help
-
-        tak dostanete kompletní seznam všech dostupných možností konfigurace.
-
-        2. Spusťte ./configure s možností, kterou jste si vybrali. Například,
-        pokud chcete použít možnost --enable-kde, tak zadejte:
-
-        ./configure --enable-kde
-
-        3. (volitelné) Otevřete soubor ./src/wconfig.h vaším oblíbeným editorem
-        a upravte některé možnosti, které si přejete změnit.
-
-        4. Kompilace. Zadejte pouze:
-
-        make
-
-        5. Přihlaste se jako root (pokud tak nemůžetet učinit, tak si přečtěte
-        část "Nemám rootovské helso :-(") a nainstalujte Window Maker na váš
-        systém:
-
-        su root
-        make install
-
-Nastavení specifické pro uživatele
----------------------------------
-
-Tyto instrukce nejsou povinné, pokud upgradujete Window Maker ze starší
-verze na novější a pokud není uvedeno jinak v souboru NEWS.
-
-Každý uživatel na vašem systému, který si přeje používat Window Maker musí
-udělat následující:
-
-        1. Nainsatlovat konfigurační soubory Window Makeru do jeho domovského
-        adresáře:
-
-        wmaker.inst
-
-        wmaker.inst nainstaluje konfigurační soubory a nastaví X server tak,
-        aby automaticky spouštěl Window Maker při jejich spuštění.
-
-        To je všechno, přátelé.
-
-        Informace o konfiguraci a spoustě ostatních věcí vám poskytne:
-
-        man wmaker
-
-Pro hlubší úvod do Window Makeru si přečtěte Uživatelskou příručku (User Guide).
-
-Měli byste se také podívat na FAQ (Frequently Asked Questions = často kladené 
-otázky), pokud budete mít nějaké problémy/potíže jak při samotné kompilaci,
-tak s užíváním Window Makeru.
-
-Instalování speciálního balíčku
-------------------------------
-
-Rozbalte WindowMaker-extra-<číslo_verze>.tar.gz v adresáři /usr/local/share
-
-Tento soubor si můžete sehnat na adrese: ftp://ftp.windowmaker.org. Instalace
-tohoto souboru vůbec není nutná. tento balíček obsahuje několik ikon a témat.
-Hledejte poslední dostupnou verzi. V balíčku také naleznete soubor
-WindowMaker-extra.readme, který vám poradí, co máte udělat.
-
-Nemám rootovské helso :-(
-------------------------
-
-Pokud nemáte superuživatelská privilegia (nemůžete se přihlásit jako root),
-tak nezoufejte, protože můžete nainstalovat Window Maker do vašeho vlastního
-domovského adresáře. K tomu musíte použít volbu --prefix při spuštění
-./configure. Také musíte použít volbu --with-appspath, která specifikuje
-cestu pro WPrefs.app.
-Příklad:
-
-./configure --prefix=/home/karel --with-appspath=/home/karel/GNUstep/Apps
-
-Potom přidejte adresář /home/karel/bin do systémové proměnné PATH a adresář
-/home/karel/lib do sytémové proměnné LD_LIBRARY_PATH a nakonec spusťte
-~/bin/wmaker.inst.
-
-Samozřejmě, že adresář /home/karel bude ve vašem případě nahrazen vaším
-vlastním domovským adresářem.
-
-
-UPGRADE
-=======
-
-Pokud upgradujete ze starší verze Window Makeru:
-
-        1. Nakonfigurujte a zkompilujte Window Maker jako obvykle.
-        2. Nainstalujte Window Maker (ale nespouštějte wmaker.inst).
-        3. Přečtěte si soubor NEWS a aktualizujte vaše konfigurační soubory,
-           pokud je to nezbytné.
-
-ŘEŠENÍ PROBLÉMÚ
-===============
-
-Pokud máte nějaké problémy během konfigurace (když běží configure), jako
-například neschopnost použít knihovnu grafického formátu, o kterém víte, že
-ho máte nainstalován, tak se podívejte do souboru config.log. Možná zde
-najdete příčinu svých problémů.
-
-== Error with loading fonts, even if they exist.
-
-Zkuste kompilaci bez podpory NLS (národního prostředí).
-
-== Error when configuring
-
-ltconfig: unrecognized option `--no-reexec'
-Try `ltconfig --help' for more information.
-configure: error: libtool configure failed
-
-odstraňte volbu --no-reexec ze souboru aclocal.mc a spusťte znovu configure.
-Také zkontrolujte, zda verze autoconfu a automaku, které máte nainsatlované
-odpovídají níže uvedeným hodnotám:
-autoconf 2.13
-automake 1.4
-libtool 1.3
-
-Poznámka: nemůže to být libtool 1.2b, ale musí to být libtool 1.3 ze stránek
-GNU.
-
-== configure doesn't detect libtiff, or other graphic libraries.
-
-Smažte soubor config.cache, pak znovu spusťte configure s následujícími
-volbami (a jinými, které používáte):
--with-libs-from="-L/usr/local/lib"
--with-incs-from="-I/usr/local/include -I/usr/local/include/tiff"
-Na příslušná místa vložte cesty k vaším grafickým knihovnám a odpovídajícím
-hlavičkovým souborům. Můžete zadat několik cest do těchto voleb, jako je to
-ve výše uvedeném příkladě --with-incs-from. Jenom je nezapomeňte oddělit
-mezerou.
-
-== configure doesn't detect libXpm.
-
-* Zkontrolujte, jestli máte symbolický link ze souboru libXpm.so.4.9 na
-  soubor libXpm.so
-
-== Segmentation fault on startup
-
-* Zkontrolujte, jestli verze knihovny libXPM je vyšší než 4.7
-
-* Zkontrolujte, zda-li máte upravenou verzi ~/GNUstep/Defaults/WindowMaker
-  Pokud si nejste jisti, tak zkuste přejmenovat ~/GNUstep na ~/GNUtmp a
-  spusťte wmaker.inst
-
-== "...: your machine is misconfigured. gethostname() returned (none)"
-
-* Jméno vašeho počítače je nastaveno nesprávně, protože začíná uvozovkami.
-  Spusťte man hostname a zde se dozvíte, jak změnit jméno vašeho počítače.
-
-== The root menu contains only 2 entries. ("XTerm" and "Exit...")
-
-* Window Maker nemůže nalézt cpp (preprocesor jazyka C). Pokud se váš cpp
-  nenachází v /lib/cpp, tak otevřte soubor src/config.h a nastavte správně
-  cestu CPP_PATH.
-
-== checking lex output file root... configure: error: cannot find output from true; giving up
-
-* Přečtěte si odstavec POŽADAVKY na začátku tohoto souboru.
-
-MÍSTNÍ NASTAVENÍ / INTERNACIONALIZACE
-=====================================
-
-Window Maker má podporu národních jazyků. Aby jste ji povolili, tak
-musíte zkompilovat Window Maker s několika dalšími parametry.
-Seznam podporovaných jazyků naleznete v souboru ./po/README.
-
-0 - Musíte mít nainstalovaný balíček GNU gettextu. Tento balíček
-    můžete nalézt na ftp://prep.ai.mit.edu/pub/gnu/gettext-nnn.tar.gz
-
-Kroky 1,2 a 3 můžete vynechat, pokud používáte skript Install.cs nebo
-skript Install.
-
-1 - Vyberte si jazyky, které budete chtít používat. Zadejte seznam
-    těchto jazyků do systémové proměnné LINGUAS. Angličtina je
-    podporována vždy. Příklady
-
-    C - shell:
-
-        setenv LINGUAS "pt ja de"
-
-    Bash(sh):
-
-        export LINGUAS
-        LINGUAS="pt ja de"
-
-    Přečtěte si soubor po/README pokud chcete přeložit Window Maker
-    pro nějaký další jazyk.
-
-2 - Navíc, pokud váš jazyk používá multi-byte znaky, například Japonština
-    nebo Korejština, tak musíte nastavit volbu the MultiByteText na YES
-    v souboru ~/GNUstep/Defaults/WMGLOBAL
-
-3 - Nakonfigurujte, zkompilujte a nainstalujte Window Maker jako obvykle.
-
-4 - Národní prostředí si můžete změnit i za běhu Window Makeru. Systémovou
-    proměnnou LANG nastavíte na vámi zvolenou hodnotu. Například, pokud
-    chcete použít portugalské prostředí, musíte spustit:
-
-    C - shell:
-
-        setenv LANG pt
-
-    Bourne shell a podobné:
-
-        export LANG
-        LANG=pt
-
-    Nakonec musíte restartovat/spustit Window Maker.
-
-    Poznámka: Když máte nastavenou systémovou proměnnou LC_TYPE, tak jí
-    musíte zrušit před spuštěním Window Makeru.
-
-    Window Maker hledá soubory s definicí menu v tomto pořadí (pro
-    brazilskou portugalštinu):
-
-        menu.pt_BR
-        menu.pt
-        menu
-
-5 - Pokud si vyberete jazyk, který používá multi-byte znaky, tak musíte
-    příslušným způsobem nastavit fonty. Přečtěte si manuálové stránky
-    o XCreateFontSet k získání většího množství informací o daném
-    problému. Musíte změnit v souboru ~/GNUstep/Default/WindowMaker
-    nastavení fontů pro titulky, menu, atd. Fonty pro dialogy nastavíte
-    v souboru ~/GNUstep/Default/WMGLOBAL. Řetězce %d ve jménech fontů
-    nemusí být odstraněné. Také můžete použít skript wsetfont, který
-    toto vše učiní za vás. Pokud se ho rozhodnote použít, tak si k němu
-    přečtěte instrukce tak, že spustíte wsetfont bez argumentů.
-
-    Příklad části souboru ~/GNUstep/Default/WindowMaker:
-
-        WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-        MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-        MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-        IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*,-*-*-medium-r-normal-*-12-*";
-        ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*,-*-*-medium-r-normal-*-12-*";
-        DisplayFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-12-*";
-
-    a souboru ~/GNUstep/Default/WMGLOBAL:
-
-        SystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-        BoldSystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-
-    Tyto dva fonty jsou používány v aplikacích, které používají WINGs (WindowMaker a
-    WPrefs.app).
-
-    Skript wsetfont vám umožní nastavit fonty mnohem jednoduším způsobem. Podívejte
-    se na jeho manuálové stránku k získání bližších informací.
--- a/INSTALL.es
+++ b/INSTALL.es
@@ -1,603 +0,0 @@
-
-			Instrucciones de Instalación para Window Maker
-
-
-
-PLATAFORMAS SOPORTADAS
-======================
-(obs: Alguien me mencionó que lo compiló en...)
-
- Intel GNU/Linux Conectiva 5.9 (beta)
- Intel GNU/Linux Slackware
- Intel GNU/Linux Debian
- Intel GNU/Linux other distributions
- Sparc GNU/Linux RedHat 5.1
- PowerPC GNU/MkLinux
- Alpha GNU/Linux RedHat 5.1
- FreeBSD
- NetBSD
- OpenBSD
- BSDI 4.0
- Solaris 2.5.1, 2.5.2
- Solaris 2.6.0
- Solaris 2.7beta
- SCO Unix
- SGI Irix 5.x, 6.5
- OSF/1
- HP-UX
- AIX 3.2.5
- AIX 4.1.4 / IBM PowerPC
- AIX 4.3.1 / IBM CC compiler
- AIX 4.3.2 / IBM PowerPC
- AIX 5.3
- DEC Alpha/Digital UNIX 4.x
- XFree86 / OS/2
- Corel NetWinder
- SunOS 4.x
- PowerMac / Power MachTen 4.1.1 over MacOS
- Amiga 3000 running RedHat Linux 5.1 (Rawhide)
- IBM S/390 running Linux
- iBook running Darwin
- Windows NT with Cygwin/XFree86
- Sony PlayStation2 running Linux
-
-Todas las marcas registradas están registradas por sus dueños. (duh)
-
-Los parches que lo hagan funcionar en otras plataformas son bienvenidos.
-
-
-REQUERIMIENTOS:
-==============
-
-El siguiente software se necesita para usar Window Maker:
-
- X11R6.x	
-	Window Maker puede ser compilado en versiones más antiguas de X, 
-	como X11R5 (Solaris) o X11R4 (OpenWindows) pero no funcionará 100%
-	correctamente.
-	En tales servidores no habrá íconos de aplicación y tendrá problemas
-	usando el dock. Actualizar las bibliotecas cliente (Xlib, Xt, etc) 
-	ayudará si no puede actualizar el servidor.
-
-Lo siguiente se necesita para compilar Window Maker:
-
- Requerimientos básicos y obvios
-	Si compila Window Maker, asegúrese de tener gcc (u algún otro
-	compilador ANSI C) y los archivos header de X instalados. Especialmente
-	para los usuarios de Linux principiantes: debe instalar todos los paquetes
-	de desarrollo de X y la suite gcc. De lo contrario no será capaz de 
-	compilar ningún programa X, incluyendo Window Maker.
-
- libPropList
-	Esta biblioteca se puede encontrar en ftp://ftp.windowmaker.org/pub/libs
-	o en ftp://ftp.gnome.org/pub/libPropList
-	Instálela antes de compilar Window Maker.
-
- autoconf, automake y libtool
-	Estas herramientas NO son necesarias, pero SI tiene una o más de ellas
-	instaladas, asegúrese de tener TODO lo siguiente con estas versiones
-	 exactas:
-	 	
-		autoconf 2.54
-		automake 1.4
-		libtool 1.4.2
-	
-	Si tiene una versión distinta, desactívelas temporalemte renombrándolas
-	a otras cosa o desinstalándolas desde su sistema. Si no desarrolla
-	 software no las necesita, así que puede desinstalarla sin peligro.
-
- lex (o flex) y yacc (o bison)
-	Estas son usadas por libPropList. lex en realidad no se necesita ya que
-	su archivo de salida está incluido, pero o yo o automake es tonto,
-	causando que el script configure para libPropList simplemente 
-	aborte sin ningún motivo si lex no es encontrado.
-
-OPCIONAL:
-=========
-Estas bibliotecas no son necesarias para hacer que Window Maker funcione,
- pero están soportadas en caso de que quiera usarlas. Los números de versión
- son aquellos que yo tengo (y por lo tanto, garantizo que funciona), pero 
- otras versiones podría funcionar también.
-
- libXPM 4.7 o más actual.
-	Versiones antiguas pueden no funcionar!!!
-	Disponible en ftp://sunsite.unc.edu/pub/Linux/libs/X/
-
-	Hay soporte nativo para archivos XPM, pero no cargará imagenes de
-	algunos formatos poco comunes.
-	
-libpng 0.96 o más actual y zlib
-	Para soporte de imágenes PNG.
-	http://www.cdrom.com/pub/png/
-
- libtiff 3.4 o más actual.
-	Para soporte de imaen TIFF.
-	Puede obtenerla en ftp://ftp.sgi.com/graphics/tiff
-
- libjpeg 6.0.1 o más actual
-	Para soporte de imagen JPEG
-	http://www.ijg.org/
-
- libgif 2.2 o libungif
-	Para soporte de imagen GIF.
-	ftp://prtr-13.ucsc.edu/pub/libungif/
-
- GNU xgettext
-	Si quiere usar mensajes traducidos, necesitará GNU gettext.
-	Otras versiones de gettext no son compatibles y no funcionarán.
-	Obtenga la versión GNU desde ftp://ftp.gnu.org
-
-OPCIONES DE CONFIGURACIÓN:
-=========================
-Estas opciones pueden ser pasadas al script configure para activar/desactivar
-algunas opciones de Window Maker. Ejemplo:
-
-./configure --enable-kde --enable-gnome
-
-configurará Window Maker para que sea compilado con soporte para KDE y GNOME.
-
-Para obtener una lista de otras opciones, ejecute ./configure --help
-
--with-libs-from
-	especifica rutas adicionales por donde se debe buscar bibliotecas.
-	El -L flag debe preceder a cada ruta, tal como:
-	
-	--with-libs-from="-L/opt/libs -L/usr/local/lib"
-
--with-incs-from
-	especifica rutas adicionales para la búsqueda de archivos header.	
-	El parámetro -I debe preceder a cada ruta, tal como:
-	
-	--with-incs-from="-I/opt/headers -I/usr/local/include"
-
--enable-single-icon
-	activa el agrupamiento de todos los appicons (iconos de aplicaciones)
-	del WM_CLASS+WM_INSTANCE en uno solo. Esta característica no es soportada
-	por todos los desarrolladores. Si tiene algún problema con ella, contacte
-	a su autor:	Christopher Seawood <cls@seawood.org>
-
--disable-shm
-	desactiva el uso de la extensión MIT de memoria compartida. Esto 
-	ralentizará la generación de texturas un poco, pero en algunos casos 
-	parecerá necesario debido a un error que se manifiesta como íconos y
-	texturas desordenadas.
-
--disable-motif 
-	desactiva el soporte para el gestor de ventanas mwm.
-
--enable-openlook
-	activa el soporte para el gestor de ventanas OPEN LOOK(tm)
-
--enable-gnome
-	activa el soporte para el gestor de ventanas GNOME.
-
--enable-kde
-	activa el soporte para el gestor de ventanas kde/kwm.
-
--enable-lite
-	quita cosas que ya están soportadas en los entornos de escritorio, 
-	tal como KDE y Gnome. Desactiva cosas como: lista de ventanas, 
-	menú de aplicaciones raíz, selección de ventanas múltiple. Note 
-	que no podrá salir más desde dentro de Window Maker; tendrá que usar 
-	kill con la señal SIGTERM o salir de KDE. No aconsejo activarlo.
-
--enable-modelock
-	Soporte para bloqueo de estado de lenguaje XKB. Si no sabe que es esto
-	probablemente no lo necesite.
-
--enable-sound	
-	activa el soporte del módulo para efectos sonoros.
-
--disable-xpm   
-	desactiva el uso de la biblioteca XPM aunque este disponible en su
-	 sistema.
-
--disable-png	
-	desactiva el uso de la biblioteca PNG.
-
--disable-tiff
-	desactiva el uso de la biblioteca TIFF.
-
--disable-gif
-	desactiva el uso de la biblioteca GIF.
-
--disable-jpeg
-	desactiva el uso de la biblioteca JPEG.
-
--disable-shape
-	desactiva la forma de ventanas (para oclock, xeyes etc.)
-
-NOTAS ESPECÍFICAS A LA PLATAFORMA:
-=================================
-
- máquinas DEC/Alpha
-
-#>>>>>>>>>>>
-From: Anton Ivanov <aivanov@eu.level3.net>
-To: Marcelo E. Magallon <mmagallo@debian.org>
-Subject: Re: El paquete WindowMaker funciona bien en Alpha?
-
-> Hola,
-> 
->  Estuve leyendo algunos documentos en el tarball de WindowMaker,
->  y encontré esto:
-> 
->  | - máquinas DEC/Alpha
->  |         podría necesitar pasar el parámetro --disable-shm a configure,
->  |         así ./configure --disable-shm
-> 
->  alguien está teniendo problemas con WindowMaker en Alpha?  Puede alguien
->  por favor probar esto?  Debería el parámetro ser pasado al compilar 
->  en Alpha?
-
-Descargo de responsabilidad: alphas bajo mi mando nunca han ejecutado X
-y es poco probable de que las ejecute repentinamente en algún momento.
-
-	Alpha suele tener alguna ridícula poca cantidad de memoria compartida
-configurada.
-
-Así que muchísimas aplicaciones suelen to barf. Concretamente - cdrecord, mysql server, etc.
-	
-	Verifique donde está el suyo en este momento y súbalo a un valor más adecuado catting la entrada
-	adecuada de /proc o cambiando el /usr/src/linux/include/asm/shmparam.h.
-
-	De lo contrario la memoria compartida en alpha debiera ser completamente funcional y no veo razón
-para desactivarla. Las mías están aumentadas a 32 o más en muchas máquinas.
-	
-	Y si recuerdo correctamente los comentarios en aquél archivo están en realidad mal.
-	El valor no está en bytes, pero si en palabra de tamaño máquina. Para alpha *8.
-	
-	Como dije - no ejecuto X en ellas asi que apliqué a todas #include "stdisclaimer.h".
-#<<<<<<<<<<<<
-
- SCO Unix - ejecute configure así
-	CFLAGS="-belf -DANSICPP" ./configure 
-
-SunOS, Solaris
-	Si tiene gcc instalado, ejecute configure como:
-	CPP_PATH="gcc -E -x c" ./configure
-	Sun cpp le falta algunas características que necesita Window Maker y
-	 puede causarle problemas al analizar sintacticamente los archivos config.
-	 También podría necesitar usar el --with-libs-from y --with-incs-from para
-	 suministrarle el directorio donde libtiff se aloja.
-	Alguien me envió un mensaje diciéndome que también debe hacer que /usr/local/lib 
-	sea la primera ruta en LD_LIBRARY_PATH para que funcione.
-	
-	Si tiene un Ultra Creator 3D o alguna otra máquina con gráficos high-end,
-	asegúrese de iniciar el servidor X con el valor visual por defecto a 24bpp o
-	 podría experimentar problemas con colores destrozados.
-	 Este es un error de wmaker y será reparado.
-	
- GNU/Linux en general
-	Asegúrese de tener /usr/local/lib en /etc/ld.so.conf y de ejecutar 
-	ldconfig después de instalar.
-	Desinstale cualquier versión empaquetada de Window Maker antes de 
-	instalar una nueva versión.
-	
- RedHat GNU/Linux
-	Los sistemas RedHat tienen varios problemas molestos. Si lo usa,
-	asegúrese de seguir los pasos de más abajo o Window Maker no funcionará:
-
-	* si instaló el Window Maker que viene con RedHat, desinstálelo antes de
-	actualizar;
-	
-	*asegúrese que no tiene las variables de entorno LANG y LINGUAS establecidas a
-	 en_RN;
-	
-	*asegúrese de tener /usr/local/bin en su variable de entorno PATH;
-
-	* asegúrese de tener /usr/local/lib en /etc/ld.so.conf antes de ejecutar 
-	ldconfig;
-	
-	*si tiene problemas que mencionan un menaje de error con --no-reexec 
-	desinstale libtool-1.2b e instale libtool-1.3 en su lugar. libtool-1.3 
-	se puede encontrar en ftp.gnu.org. También lea la sección TROUBLESHOOTING
-	 (PROBLEMAS);
-	
-	* si instaló el paquete Window Maker desde RedHat y está instalando una
-	nueva versión de WM a mano (compilandolo usted mismo), desinstale antes el 
-	paquete desde RedHat.
-	 
-	*asegúrese de tener un enlace simbólico desde /usr/include/X11 hacia 
-	/usr/X11R6/include/X11 (si no, tipee ln -s /usr/X11R6/include/X11 /usr/include/X11)
-	
-	* asegúrese de tener /lib/cpp apuntando al programa cpp.
-	
-	Si tiene alguna duda en cuanto a hacer algunas de las cosas de arriba, 
-	por favor no dude en contactar el soporte para usuarios de RedHat. Ellos
-	 responderán amablemente a todas sus preguntas en lo que respecta a su sistema.
-	 Ellos también conocen mucho más acerca de su propio sistema que nosotros 
-	 (nosotros no usamos RedHat).
-	
- PowerPC MkLinux
-	Necesitará tener la última version de Xpmac. Las versiones más antiguas
-	parecen tener errores que producen el cuelgue del sistema.
-	
- Debian GNU/Linux
-	Si quiere soporte JPEG y TIFF, asegúrese de tener libtiff-dev y
-	 libjpeg-dev instalados.
-
- SuSE GNU/Linux
-	Si instaló el paquete Window Maker desde SuSE, 
-	desinstálelo antes de instentar compilar wmaker o podría
-	tener problemas.
-	
-
- MetroX (version desconocida)
-	MetroX tiene un error que corrompe pixmaps que se establecen como 
-	fondos de ventana. Si usa MetroX y tuvo problemas raros con texturas, no use 
-	texturas en las barras de títulos. O use un servidor X distinto.
-
-INSTALACIÓN:
-=============
-
-Compilando Window Maker
------------------
-	Para un comienzo rápido, tipee lo siguiente en el prompt del shell:
-
-	./configure
-	make
-
-luego, regístrese como root y tipee:
-
-	make install
-	ldconfig
-
-o si quiere remover los símbolos de depuración desde los binarios y hacerlos más
- pequeños, puede tipear:
-
-	make install-strip
-	ldconfig
-
-Esto compilará e instalará Window Maker con los parámetros por defecto.
-
-Si quiere personalizar algunas opciones de compilación, puede hacer lo siguiente.
-	
-	1. (opcional)Mire en la sección OPCIONES DE CONFIGURACIÓN para ver las
-	 opciones disponibles. También ejecute:
- 
-	./configure --help
-	
-	para obtener un listado completo de otras opciones que están disponibles.
-
-	2. Ejecute configure con las opciones que quiera. Por ejemplo, si quiere 
-	usar la opción --enable-kde, tipee:
-	
-	./configure --enable-kde
-	
-	3. (opcional) Edite src/wconfig.h con su editor de texto favorito y
-	 echele un vistazo por algunas opciones que podría querer cambiar.
-	 
-	4. Compile. Solo tipee:
-
-	make
-	
-	5. Regístrese como root (si no puede hacerlo, lea la sección "No tengo la contraseña de root" :-()
-	 e instale Window Maker en su sistema:
-		su root
-		make install
-
-
-Configuración específica del usuario
------------------------------------
-
-Estas instrucciones no necesitan ser seguidas al actualizar Window Maker 
-desde una versión más antigua, a menos que se indique de otra forma en el archivo
- NEWS.
-
-Todo usuario en su sistema que desee ejecutar Window Maker debe hacer lo siguiente:
-
-	1. Instale los archivos de configuración de Window Maker en su directorio home.
-Tipee:
-	wmaker.inst
-
-	wmaker.inst instalará los archivos de configuración de Window Maker y
-configurará X para que automáticamente lance Window Maker al inicio.
-
-	Eso es todo!
-	
-	Puede tipear "man wmaker" para obtener algo de ayuda general para la 
-configuración y otras cosas.
-Lea la Guia de Usuario para una explicación más a fondo de Window Maker.
-
-Podría querer dar una mirada a la FAQ también.
-
-Instalando el paquete extras
----------------------------
-
-Desempaquete WindowMaker-extra-<número-de-versión>.tar.gz en /usr/local/share
-
-Puede obtener el archivo en ftp://ftp.windowmmaker.org. Este archivo es optativo
- y solo tiene unos pocos íconos, y temas. Busque el último <número-de-versión> 
- disponible.
- También hay un WindowMaker-extra.readme que le enseña donde vería ir ese paquete.
-
-
-No tengo la contraseña de root :(
--------------------------------
-
-Si no puede obtener privilegios de superusuario (no puede ser root) puede 
-instalar wmaker en su propio directorio home. Para esto, proporcione la 
-opción --prefix al ejecutar configure en el paso 2 de compilando Window Maker. 
-También necesitará proporcionar la opción --with-appspath, para especificar la ruta
-para WPrefs.app. Ejemplo:
-
-./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps
-
-Luego haga /home/jshmoe/bin para que se lo incluya en su ruta de búsqueda, agregue
-/home/jshmoe/lib a su variable de entorno LD_LIBRARY_PATH y ejecute bin/wmaker.inst
-
-Por supuesto, /home/jshmoe se supone que va a ser reemplazado con la ruta a su 
-directorio home real.
-
-
-ACTUALIZANDO
-============
-Si está actualizando desde una versión antigua de Window Maker:
-
-	1. Configure y compile Window Maker como siempre.
-	2. Instale Window Maker (pero no ejecute wmaker.inst)
-	3. Lea el archivo NEWS y actualice sus archivos de configuración, 
-	   si es necesario.
-
-PROBLEMAS
-=========
-
-Cuando tenga alguno problemas durante la configuración (al ejecutar configure),
-tal como no poder usar una biblioteca de formato gráfico que piensa tener instalada,
-mire en el archivo config.log para obtener ideas sobre el problema.
-
-== Error al cargar las fuentes, siempre que existan.
-
-Intente recompilar sin el soporte NLS.
-
-== Error al configurar
-
-ltconfig: unrecognized option `--no-reexec'
-Try `ltconfig --help' for more information.
-configure: error: libtool configure failed
-
-quite la opción --no-reexec desde aclocal.m4 y libPropList/aclocal.m4 y
- reconfigure.
-También asegúrese que las versiones de autoconf y automake que tenga instaladas son:
-
-autoconf 2.13
-automake 1.4
-libtool 1.3
-
-Note que ella no debe ser libtool 1.2b, debe ser libtool 1.3, 
-desde los sitios GNU.
-
-== No puedo encontrar proplist.h o libPropList.something
-
-Baje e instale libPropList desde los lugares ya citados en algún lugar 
-de este archivo.
-
-== configure no detecta libtiff, u otras bibliotecas gráficas.
-
-Elimine config.cache, luego vuelva a ejecutar configure añadiendo las siguientes
- opciones a configure (entre sus otras opciones):
-
--with-libs-from="-L/usr/local/lib"
--with-incs-from="-I/usr/local/include -I/usr/local/include/tiff"
-
-Sustituya las rutas donde están localizadas sus bibliotecas gráficas y sus 
-correspondientes archivos header. Puede colocar rutas múltiples en cualquiera de 
-estas opciones, como se muestra en el ejemplo de --with-incs-from . Solo coloque
-un espacio entre ellas.
-
-== configure no detecta libXpm. 
-
-* Verifique si tiene un enlace simbólico desde libXpm.so.4.9 a libXpm.so
-
-== Segmentation fault al inicio.
-
-* Verifique si la versión de libXPM que tiene es por lo menos la 4.7
-
-* Verifique si tiene una versión actualizada de ~/GNUstep/Defaults/WindowMaker
-
-Si no está seguro, intente renombrar ~/GNUstep a ~/GNUtmp y luego ejecute wmaker.inst
-
-== "...: your machine is misconfigured. gethostname() returned (none)"
-
-* el hostname de su máquina está definido a algo inválido, como comenzar con
-	un paréntesis. Haga un man hostname para obtener información acerca de como definirlo.
-
-
-== El menú raíz contiene solo 2 entradas. ("XTerm" y "Exit...")
-
-* Window Maker no está encontrando cpp (el preprocesador de C). Si su 
-cpp no está ubicado en /lib/cpp, edite src/config.h y corrija la ruta en 
-CPP_PATH.
-
-== checking lex output file root... configure: error: cannot find output from true; giving up
-
-* Lea la sección REQUERIMIENTOS de este archivo.
-
-
-LOCALES/INTERNACIONALIZACIÓN
-============================
-
-Window Maker tiene soporte de idioma nacional. Para activar este soporte, 
-debe compilar Window Maker con algunos parámetros adicionales.
-
-0 - Debe tener el paquete GNU gettext instalado. Puede obtenerse en
-ftp://prep.ai.mit.edu/pub/gnu/gettext-nnn.tar.gz
-
-Los pasos 1 al 3 pueden saltearse si usa el script Install.
-
-1 - Debe seleccionar los idiomas que quiere soportar. Defina el
-LINGUAS a la lista de locales que quiera. El Inglés siempre está
-soportado. Ejemplo:
-
-setenv LINGUAS "pt ja de"
-en csh
-
-o
-
-export LINGUAS;LINGUAS="pt ja de"
-en sh
-
-La lista de locales soportados se pueden encontrar en po/README.
-El Inglés es el idioma pr defecto.
-
-Lea po/README si desea traducir y mantener archivos locale para otros 
-idiomas.
-
-2 - Adicionalmente, si su idioma usa caracteres multi-byte, tal como
-Japonés o Coreano, debe definir la opción MultiByteText a YES
-en ~/GNUstep/Defaults/WMGLOBAL
-
-3 - Configure, compile e instale Window Maker normalmente.
-
-4 - Para seleccionar un locale particular en tiempo de ejecución debe definir la
- variable de entorno LANG al locale que quiera. Por ejemplo, si quiere definir
-el locale portugués, debe ejecutar
-
-setenv LANG pt
-
-en csh o
-
-export LANG; LANG=pt
-
-en Bourne sh y similares
-
-Nota: Si tiene definida la variable de entorno LC_CTYPE, debe
-indefinirla antes de ejecutar wmaker.
-
-Window Maker busca los archivos de definición de menú en el siguiente orden:
-(para portugués brasileño, en este caso):
-
-menu.pt_BR
-menu.pt
-menu
-
-5 - Si elige un idioma que usa caracteres multi-byte, debe configurar 
-las fuentes adecuadamente. Lea la página del manual para XCreateFontSet 
-para obtener más detalles sobre esto. Debe cambiar el archivo ~/G/D/Windowmaker
-para las fuentes usadas en barras de título, menús y otras cosas. Para las fuentes
-usadas en ventanas de diálogo, cambie ~/G/D/WMGLOBAL. El %d en los nombres de las
-fuentes no debe ser quitado. Puede también usar el script wsetfont proporcionado para
-esta tarea. Lea el mismo script para obtener instrucciones.
-
-Por ejemplo, puede especificar lo siguiente en ~/G/D/WindowMaker:
-
-WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*,-*-*-medium-r-normal-*-12-*";
-ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*,-*-*-medium-r-normal-*-12-*";
-DisplayFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-12-*";
-
-y en ~/G/D/WMGLOBAL:
-
-SystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-BoldSystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-
-Las 2 fuentes de arriba son usadas únicamente por aplicaciones que usan WINGs
-(WindowMaker y WPrefs.app)
-
-El script wsetfont que se proporciona le permitirá cambiar las definiciones de fuentes
- de una manera fácil. De una mirada al script para detalles de uso.
-
-traducido por Efraín Maximiliano Palermo <max_drake2001@yahoo.com.ar>
--- a/INSTALL.fr
+++ b/INSTALL.fr
@@ -1,645 +0,0 @@
-
-		Instructions pour l'installation de Window Maker
-
-
-
-PLATEFORMES SUPPORTEES
-======================
-(c.a.d : j'ai entendu dire que la compilation a été réalisée avec succès sur..)
-
- Intel GNU/Linux Conectiva 5.9 (beta)
- Intel GNU/Linux Slackware
- Intel GNU/Linux Debian
- Intel GNU/Linux (autres)
- Sparc GNU/Linux RedHat 5.1
- PowerPC GNU/MkLinux
- Alpha GNU/Linux RedHat 5.1
- FreeBSD
- NetBSD
- OpenBSD
- BSDI 4.0
- Solaris 2.5.1, 2.5.2
- Solaris 2.6.0
- Solaris 2.7beta
- Solaris 2.8 sur Ultra Sparc 10 et E450
- SCO Unix
- SGI Irix 5.x, 6.5
- OSF/1
- HP-UX
- AIX 3.2.5
- AIX 4.1.4 / IBM PowerPC
- AIX 4.3.1 / IBM CC compiler
- AIX 4.3.2 / IBM PowerPC
- AIX 5.3
- DEC Alpha/Digital UNIX 4.x
- XFree86 / OS/2
- Corel NetWinder
- SunOS 4.x
- PowerMac / Power MachTen 4.1.1 sous MacOS
- Amiga 3000 sous RedHat Linux 5.1 (Rawhide)
- IBM S/390 sous Linux
- IBM S/390 sous Conectiva Linux (experimental)
- iBook sous Darwin
- Windows NT sous Cygwin/XFree86
- Sony PlayStation2 sous Linux
-
-Toutes les marques déposées sont la propriété de leur propriétaire.
-
-Tout patch qui pourrait faciliter l'adaptation à d'autres plateformes
-est le bienvenu. 
-
-
-PRE-REQUIS
-==========
-
-Les logiciels suivants sont nécessaires à l'utilisation de Window Maker :
-
- X11R6.x	
-	Window Maker peut être compilé avec des versions plus anciennes de X,
-	comme X11R5 (Solaris) ou X11R4 (OpenWindows), mais il ne fonctionnera
-	pas correctement à 100%.
-	Avec ces serveurs X, les icônes des applications n'apparaîtrons pas,
-	et vous aurez des problèmes à l'utilisation du dock. La mise à jour
-	des librairies côté client (Xlib, Xt, etc.) pourront améliorer les
-	choses si vous ne pouvez pas mettre à jour le serveur.
-
-Les éléments suivants sont nécessaires à la compilation de Window Maker :
-
- pré-requis de base
-	Pour compiler Window Maker, assurez-vous que gcc (ou tout autre
-	compilateur de C ANSI) ainsi que les fichiers d'en-têtes de X sont
-	installés. Débutants sous Linux : vous devez installer les paquetages
-	de développement de X ainsi que ceux de la suite gcc. Le cas contraire,
-	vous ne pourrez jamais compiler aucun programme prévu pour X, y compris
-	Window Maker.
-
- autoconf, automake et libtool
-	Ces outils ne sont pas indispensables, mais si au moins l'un d'eux
-	est installé sur votre système, assurez-vous que TOUS le sont, et
-	que les versions de ces outils sont exactement :
-		autoconf 2.54
-		automake 1.4
-		libtool 1.4.2
-	Si les versions installées sur votre système différent, désactivez-les
-	provisoirement, par exemple en les renommant, ou en les désinstallant
-	de votre système. Si vous ne développez ni de compilez de logiciels,
-	vous n'en avez pas besoin et leur désinstallation n'est donc pas un
-	problème.
-
-
-OPTIONNEL
-=========
-
-Ces librairies ne sont pas nécessaires pour utiliser Window Maker, mais
-elles sont supportées, au cas où vous souhaiteriez les utiliser. Les
-versions ci-dessous sont celles dont je dispose (et du coup, il est
-garanti qu'elles fonctionnent), mais des versions différentes peuvent
-fonctionner aussi bien.
-
-
- libXPM 4.7 ou plus récent
-	Les versions plus anciennes peuvent ne pas fonctionner !!!
-	Disponible sur ftp://sunsite.unc.edu/pub/Linux/libs/X/
-
-	Le support des fichiers XPM est intégré, mais il ne prendra
-	pas en compte les images dont le format est exotique.
-
- libpng 0.96 ou plus récent, et zlib     
-	Pour pouvoir utiliser les images au format PNG.
-	http://www.cdrom.com/pub/png/
-
- libtiff 3.4 ou plus récent
-	Pour pouvoir utiliser les images au format TIFF.
-	Vous trouverez ça ici : ftp://ftp.sgi.com/graphics/tiff
-
- libjpeg 6.0.1 ou plus récent
-	Pour pouvoir utiliser les images au format JPEG.
-	http://www.ijg.org/
-
- libgif 2.2 ou libungif
-	Pour pouvoir utiliser les images au format GIF.
-	ftp://prtr-13.ucsc.edu/pub/libungif/
-
- GNU xgettext
-	Si vous voulez disposer des traductions en d'autres langues, GNU gettext
-	est nécessaire. Les autres versions de gettext sont incompatibles et ne
-	fonctionneront pas.
-	If you want to use translated messages, you will need GNU gettext.
-	Other versions of gettext are not compatible and will not work.
-	Vous trouverez la version GNU sur ftp://ftp.gnu.org
-
-
-OPTIONS DE CONFIGURATION
-========================
-
-Ces options peuvent être passées au script de configuration afin d'activer
-ou désactiver des fonctionnalités de Window Maker. Par exemple :
-
-./configure --enable-kde --enable-gnome
-
-configurera Window Maker avec le support intégré pour KDE et GNOME.
-
-
-Afin d'obtenir la liste des autres options, exécutez ./configure --help
-
--with-libs-from
-	ajoute des chemins d"accès pour la recherche des librairies.
-	L'option -L doit précéder chaque chemin d'accès, comme suit :
-	--with-libs-from="-L/opt/libs -L/usr/local/lib"
-
--with-incs-from
-	ajoute des chemins d"accès pour la recherche des fichiers d'en-tête.
-	L'option -I doit précéder chaque chemin d'accès, comme suit :
-	--with-incs-from="-I/opt/headers -I/usr/local/include"
-
--enable-single-icon
-	active le regroupement des toutes les appicons des WM_CLASS et WM_INSTANCE
-	en une seule icône. Aucun support n'est offert par les développeurs pour
-	cette fonctionnalité. Si vous avez des problèmes avec celle-ci, contactez
-	son auteur :
-	Christopher Seawood <cls@seawood.org>
-
--disable-shm
-	désactive l'utilisation de l'extension "MIT shared memory". Cela ralentira
-	un petit peu la génération des textures, mais il semble que cela soit
-	nécessaire dans certains cas pour éviter un bogue se manifestant au niveau
-	des icônes et des textures.
-
--disable-motif 
-	désactive le support pour les fonctionnalités en rapport avec le gestionnaire
-	de fenêtres mwm.
-
--enable-openlook
-	désactive le support pour les fonctionnalités en rapport avec le gestionnaire
-	de fenêtres OPEN LOOK(tm).
-
--enable-gnome
-	désactive le support pour les fonctionnalités en rapport avec le gestionnaire
-	de fenêtres GNOME.
-
--enable-kde
-	désactive le support pour les fonctionnalités en rapport avec le gestionnaire
-	de fenêtres kde/kwm.
-
--enable-lite
-	désactive des fonctionnalités déjà prises en compte par les gestionnaires de
-	bureau tels que KDE et GNOME. Celà concerne : la liste de fenêtres, le menu
-	des applications, la sélection multiple de fenêtres. Attention : vous ne
-	pourrez plus sortir de Window Maker autrement qu'en utilisant kill avec le
-	signal SIGTERM ou en quittant à l'aide de KDE. Il n'est pas conseillé
-	d'utiliser cette option.
-
--enable-modelock
-	active le support pour le verrouillage du "XKB language status". Si vous ne
-	savez pas de quoi il retourne, c'est probablement que vous n'en avez pas
-	utilité.
-
--enable-sound	
-	active le support pour le module de gestion des effets sonores.
-
--disable-xpm   
-	désactive l'utilisation de la librairie XPM même si elle est présente
-	sur votre système.
-
--disable-png	
-	désactive l'utilisation de la librairie PNG.
-
--disable-tiff
-	désactive l'utilisation de la librairie TIFF.
-
--disable-gif
-	désactive l'utilisation de la librairie GIF.
-
--disable-jpeg
-	désactive l'utilisation de la librairie JPEG.
-
--disable-shape
-	désactive l'utilisation de "shaped windows" (pour oclock, xeyes, etc.).
-
-
-NOTES SPECIFIQUES AUX PLATEFORMES
-=================================
-
- machines DEC/Alpha
-
-#>>>>>>>>>>>
-De : Anton Ivanov <aivanov@eu.level3.net>
-A : Marcelo E. Magallon <mmagallo@debian.org>
-Sujet : Re : Est-ce que le paquetage WindowMaker fonctionne correctement sur Alpha?
-
-> Salut,
-> 
->  Je lisais la doc contenue dans l'archive de WindowMaker, quand je suis
->  tombé sur ça :
-> 
->  | - machines DEC/Alpha
->  |         Il est possible que vous deviez utiliser l'option --disable-shm pour
->  |         configurer la compilation, comme suit :
->  |          ./configure --disable-shm
-> 
->  est-ce que quelqu'un a eu des problèmes avec WindowMaker sur Alpha? Est-ce
->  que quelqu'un peut tester cela? Doit-on vraiment utiliser cette option
->  pour compiler sur Alpha?
-
-Notez bien : les Alphas dont je me sers ne sont jamais sous X et ne sont pas près
-de le faire.
-
-		Bien souvent, la configuration des Alphas n'inclut qu'un volume ridiculement
-petit de mémoire partagée. Aussi il n'est pas étonnant qu'un grand nombre
-d'applications comme cdrecord ou mysql server plantent carrément.
-
-		Vérifiez ces réglages sur votre système et modifiez-les en conséquent :
-pour cela, manipulez l'entrée appropriée dans /proc ou modifiez le fichier
-/usr/src/linux/include/asm/shmparam.h.
-
-		En dehors de ce cas, la mémoire partagée sous Alpha est sensée ne pas
-poser de problème et je ne vois aucune raison de la désactiver.
-Pour ma part, elle est à 32 ou plus sur la pluspart des machines.
-
-		De plus, si ma mémoire est exacte, les commentaires dans ce fichier
-sont tout à fait inexacts. La valeur n'est pas exprimée en octets, mais en
-mots, dépendant de la machine. Pour les Alphas, c'est donc *8.
-
-		Je rappelle que je n'utilise pas X sur ces machines, donc ce que j'indique
-est soumis à toutes les réserves habituelles. (#include "standard_disclaimer.h")
-#<<<<<<<<<<<<
-
-
- SCO Unix
-	Lancez configure comme suit :
-		CFLAGS="-belf -DANSICPP" ./configure 
-
- SunOS, Solaris 
-	Si gcc est installé, lancez configure comme suit :
-		CPP_PATH="gcc -E -x c" ./configure
-	Le cpp de Sun ne dispose pas de certaines fonctionnalités nécessaire pour
-	Window Maker et cela peut occasionner des problèmes avec l'utilisation des
-	fichiers de configuration.
-	Il peut être aussi nécessaire d'indiquer le chemin d'accès à la librairie
-	libtiff en utilisant les options --with-libs-from et --with-incs-from
-	avec configure.
-	Quelqu'un m'a rapporté qu'il est nécessaire de faire figurer /usr/local/lib
-	en premier dans la variable d'environnement LD_LIBRARY_PATH.
-
-	Si vous utilisez un Ultra Creator 3D ou une autre machine graphique
-	de haut niveau, faites en sorte de démarrer le serveur X avec le mode
-	graphique par défaut à 24bpp sinon vous pourriez constaer des problèmes
-	au niveau des couleurs.
-	C'est une bogue répertorié au niveau de Window Maker, il sera corrigé.
-
- GNU/Linux en général
-	Assurez-vous que /usr/local/lib figure dans /etc/ld.so.conf et que vous
-	avez lancé ldconfig après l'installation.
-	Désinstallez tout précédent paquetage de Window Maker avant d'installer
-	une nouvelle version. 
-
- RedHat GNU/Linux
-	Il peut y avoir plusieurs problèmes ennuyeux sur les systèmes RedHat.
-	Voici la marche à suivre sous peine de ne pouvoir utiliser Window Maker
-	sur ces systèmes :
-
-	* si la version de Window Maker livrée avec RedHat est installée,
-	désinstallez-la avant de mettre à jour votre système;
-
-	* assurez-vous que ni la variable d'environnement LANG ni LINGUAS ne
-	contiennent "en_RN";
-
-	* vérifiez que /usr/local/bin est présent dans votre variable d'environnement
-	PATH;
-
-	* il faut que /usr/local/lib soit dans /etc/ld.so.conf avant de lancer
-	ldconfig;
-
-	* si vous rencontrez des messages d'erreur en rapport avec "--no-reexec",
-	désinstallez libtool-1.2b et installez libtool-1.3.
-	libtool-1.3 peut être trouvé sur ftp.gnu.org.
-	Consultez aussi la section PROBLEMES;
-
-	* si vous aviez auparavant installé le paquetage de Window Maker livré
-	avec RedHat et que vous voulez installer maintenant manuellement une nouvelle
-	version, vous devez au préalable désinstaller le paquetage provenant de la
-	RedHat;
-
-	* assurez-vous qu'il existe un lien symbolique de from /usr/include/X11 vers
-	/usr/X11R6/include/X11 (le cas échéant, lancez cette commande :
-	ln -s /usr/X11R6/include/X11 /usr/include/X11);
-
-	* assurez-vous que /lib/cpp pointe bien vers le programme cpp
-
-	Si vous avez un doute concernant quoi que ce soit de relatif à l'installation
-	de Window Maker sur une RedHat, n'hésitez pas à contacter le support
-	utilisateur de RedHat. Ils vous renseigneront toujours et tenteront de vous
-	dépanner dans l'utilisation et la configuration de votre système RedHat.
-	D'un autre côté, ils sont plus au fait que nous pour tout ce qui est relatif
-	aux RedHat (nous n'en utilisons pas).
-
- PowerPC MkLinux
-	Installez la version la plus récente de Xpmac. Les versions plus
-	anciennes semblent contenir un bogue qui est susceptible de bloquer
-	le système.
-
- Debian GNU/Linux
-	Si vous voulez bénéficier du support des fichier JPEG et TIFF,
-	assurez-vous que les paquetages libtiff-dev et libjpeg-dev sont installés.
-
- SuSE GNU/Linux
-	Désinstallez tout précédent paquetage de Window Maker avant d'installer
-	une nouvelle version. Le cas échéant, vous pourriez rencontrer des
-	problèmes.
-
- MetroX (version indéterminée)
-	MetroX contient un bogue qui corrompt les pixmaps utilisées en fond
-	de fenêtres. Si vous utilisez MetroX et rencontrer des problèmes
-	avec les textures, n'utilisez pas les textures dans les barres de titre,
-	ou bien utilisez un autre serveur X.
-
-
-INSTALLATION
-============
-
-Compiler Window Maker
---------------------
-	Pour aller vite, tapez ce qui suit sous un prompt shell :
-
-	./configure
-	make
-
-puis, loguez-vous en tant que root and tapez :
-
-	make install
-	ldconfig
-
-ou, si vous voulez ôter les infos de débogage des exécutables et les
-rendre plus petits, tapez plutôt :
-
-	make install-strip
-	ldconfig
-
-Tout ceci compile et installe Window Maker avec les réglages par défaut.
-
-Maintenant, si vous voulez personnaliser des options de compilation, vous
-pouvez faire :
-
-	1. (optionnel) Consulter la section OPTIONS DE CONFIGURATION
-	dans ce même fichier. Exécutez aussi :
- 
-	./configure --help
-
-	pour avoir la liste des autres options disponibles.
-
-	2. Lancez configure avec les options choisies. Par exemple, si vous voulez
-	utiliser l'option --enable-kde, tapez :
-
-	./configure --enable-kde
-
-	3. (optionnel) Editez src/wconfig.h avec votre editeur de texte favori et
-	et modifiez sont contenu à votre guise.
-
-	4. Compilez. Il faut juste taper :
-
-	make
-
-	5. Loguez-vous en tant que root (si vous ne pouvez pas le faire, lisez le
-	paragraphe "Je n'ai pas le mot de passe de root :-(") et installez
-	Window Maker sur votre système :
-		su root
-		make install
-
-
-Réglages pour un utilisateur
----------------------------
-
-Ces instructions suivantes ne sont pas nécessaires si vous mettez à jour
-Window Maker à partir d'une version plus ancienne, à moins que ce soit
-précisé dans le fichier NEWS.
-
-Chaque utilisateur qui veut utiliser Window Maker sur votre système doit
-faire ce qui suit :
-
-	1. Installer les fichiers de configuration de Window Maker dans son
-	répertoire personnel.
-
-	Pour ceci, il doit taper :
-		wmaker.inst
-
-	wmaker.inst installera les fichiers de configuration de Window Maker
-	pour l'utilisateur et configurera ses paramètres de X de façon à ce que
-	Window Maker soit automatiquement lancé au démarrage de X.
-
-	C'est tout!
-	
-Vous pouvez aussi taper "man wmaker" afin d'obtenir plus de renseignements
-sur la configuration et d'autres sujets.
-
-Consultez le Guide de l'utilisateur afin d'obtenir des informationss plus
-en détail sur Window Maker.
-
-Pourquoi ne pas aussi jeter un oeil aux FAQs..
-
-
-
-Installation du paquetage additionnel
-------------------------------------
-
-Décompressez WindowMaker-extra-<version-number>.tar.gz dans /usr/local/share
-
-Vous trouverez le fichier sur ftp://ftp.windowmaker.org. Ce paquetage est optionnel,
-il contient des icônes et des thèmes supplémentaires. Vérifiez que vous avez
-bien la derniere version de ce paquetage.
-Il y a aussi un fichier WindowMaker-extra.readme qui indique comment procéder à
-l'installation de ce paquetage.
-
-
-
-Je n'ai pas le mot de passe de root :-(
---------------------------------------
-
-Si vous n'avez pas acc-s aux privilèges du super-utilisateur (root), vous pouvez
-installer Window Maker dans votre répertoire personnel. Pour ce faire, ajoutez
-l'option --prefix correctement renseignée au moment de l'exécution de ./configure
-(étape 2 de la compilation de Window Maker).
-Il est aussi nécessaire d'utiliser l'option --with-appspath, afin de préciser
-le chemin d'accès à WPrefs.app. Par exemple :
-
-./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps
-
-
-Puis, faites en sorte que /home/jshmoe/bin soit inclus dans votre PATH, ajoutez
-/home/jshmoe/lib à votre variable d'environnement LD_LIBRARY_PATH puis lancez
-bin/wmaker.inst
-
-Bien sûr, /home/jshmoe est supposé être remplacé par votre répertoire personnel.
-
-
-MISE A JOUR
-===========
-
-Si vous mettez à jour une version plus ancienne de Window Maker :
-
-   1. Configurez et compilez Window Maker comme d'habitude
-   2. Installez Window Maker (mais n'exécutez pas wmaker.inst)
-   3. Consultez le fichier NEWS et mettez à jour vos fichiers de configuration
-      si nécessaire.
-
-
-PROBLEMES
-=========
-
-Si vous rencontrez des problèmes pendant la phase de configuration, comme par
-exemple l'impossibilité d'utiliser une librairie de manipulation de format
-graphique alors que vous pensez qu'elle est installée, jetez un oeil au contenu
-du fichier config.log, vous y trouverez peut-être des indices pour résoudre
-ce problème.
-
-
-== erreur de chargement de polices, même si elles existent
-
-Essayez de recompiler sans le support pour le NLS.
-
-
-== erreur à la configuration
-
-ltconfig: unrecognized option `--no-reexec'
-Try `ltconfig --help' for more information.
-configure: error: libtool configure failed
-
-Otez l'option --no-reexec du fichier aclocal.m4 et relancer la configuration.
-Assurez vous aussi que les versions d'autoconf et d'automake correspondent bien
-aux pré-requis :
-	autoconf 2.13
-	automake 1.4
-	libtool 1.3
-
-Notez bien que ce ne doit PAS être libtool 1.2b, mais libtool bien 1.3, 
-disponible sur les sites GNU.
-
-
-== configure ne trouve pas libtiff ou une autre librairie graphique
-
-Effacez le fichier config.cache, et exécutez à nouveau configure avec les options
-suivantes (en plus des options que vous utilisiez déjà) :
-	--with-libs-from="-L/usr/local/lib"
-	--with-incs-from="-I/usr/local/include -I/usr/local/include/tiff"
-Insérez les chemins d'accès aux librairies graphiques et à leurs fichiers d'en-tête.
-Plusieurs chemins d'accès peuvent être ajoutés pour chacune de ces options,
-comme montré pour --with-incs-from. Séparez-les juste par un espace.
-
-
-== configure ne trouve pas libXpm
-
-* Vérifiez que vous avez un lien sympbolique de libXpm.so.4.9 vers libXpm.so
-
-
-== segmentation fault au démarrage
-
-* Vérifiez que la version de libXPM qui est installée est au moins 4.7.
-
-* Vérifiez que votre fichier ~/GNUstep/Defaults/WindowMaker est à jour.
-
-Si vous n'en êtes pas sûr, renommez ~/GNUstep en ~/GNUtmp et lancez wmaker.inst.
-
-
-== "...: your machine is misconfigured. gethostname() returned (none)"
-
-* Le nom d'hôte de votre machine n'est pas indiqué ou est invalide (il commence
-  par une parenthèse par exemple). Consultez les pages du manuel (man hostname) pour
-  savoir comment le positionner correctement.
-
-
-== Le menu des applications ne contient que 2 entrées ("XTerm" et "Exit...")
-
-* Window Maker ne trouve pas cpp (le preprocesseur de C). Si votre cpp n'est pas situé
-dans /lib/cpp, editez src/config.h et modifiez le chemin d'accès dans CPP_PATH en conséquent.
-
-== checking lex output file root... configure: error: cannot find output from true; giving up
-
-* Consultez la section PRE-REQUIS dans ce même fichier.
-
-
-LOCALES/INTERNATIONALISATION
-============================
-
-Window Maker supporte les langues étrangères. Pour activer cette fonctionalité,
-vous devez compiler Window Maker avec des paramètres supplémentaires.
-
-
-0 - GNU gettext doit être installé. Il peut être trouvé ici :
-ftp://prep.ai.mit.edu/pub/gnu/gettext-nnn.tar.gz
-
-Vous pouvez passer à l'étape 4 si vous utilisez le script Install.
-
-1 - Il vous faut choisir les langues que vous voulez rendre disponible. Modifiez
-pour cela la liste des codes de nationalité dans LINGUAS. L'anglais est inclus
-de façon implicite dans cette liste. Par exemple :
-
-setenv LINGUAS "pt ja de"
-sous csh
-
-ou
-
-export LINGUAS;LINGUAS="pt ja de"
-sous sh
-
-La liste de tous les codes de nationalité peut être trouvée dans po/README.
-L'anglais est la langue par défault.
-
-Lisez po/README si vous souhaitez traduire ou maintenir les fichiers propres
-à d'autres adaptations nationales.
-
-2 - De plus, si votre langue utilise des caractères multi-octets, comme
-le japonais ou le coréen, vous devez vous assurer que l'option MultiByteText est à YES
-dans ~/GNUstep/Defaults/WMGLOBAL.
-
-3 - Configurez, compilez et installez Window Maker normalement.
-
-4 - Pour choisir une langue particulière à l'exécution, vous devez positionner la variable
-d'environnement LANG avec la valeur correspondant au code de nationalité adéquat.
-Par exemple, si vous voulez utiliser le portugais, vous devez faire :
-
-setenv LANG pt
-
-sous csh ou
-
-export LANG; LANG=pt
-
-sous Bourne sh et apparentés
-
-Note : si la variable d'environnement LC_CTYPE est positionnée, vous devez l'ôter de
-l'environnement (unset LC_CTYPE), avant d'exécuter Window Maker.
-
-En ce qui concerne les fichiers de configuration des menus, Window Maker procède
-à une recherche suivant cet ordre (pour le portugais brésilien, dans ce cas) :
-
-menu.pt_BR
-menu.pt
-menu
-
-
-5 - Si vous choisissez une langue qui utilise les caractères multi-octets, vous
-devez configurer les polices de façon adéquate. Consultez pour cela les pages
-de manuel de XCreateFontSet. Vous devez modifier dans votre fichier ~/G/D/WindowMaker
-les polices utilisées dans les titres, menus et autres. En ce qui concerne les polices
-utilisées dans les boîte de dialogue, modifiez ~/G/D/WMGLOBAL.
-Le %d dans la définition des polices ne doit PAS être enlevé. Vous pouvez aussi utiliser
-le script wsetfont, fourni à ces fins.
-Consultez le script lui-même pour en connaître les instructions.
-
-Par exemple, vous pouvez mettre ceci dans ~/G/D/WindowMaker :
-
-WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*,-*-*-medium-r-normal-*-12-*";
-ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*,-*-*-medium-r-normal-*-12-*";
-DisplayFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-12-*";
-
-et dans ~/G/D/WMGLOBAL :
-
-SystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-BoldSystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-
-Les 2 polices ci-dessus sont uniquement utilisées par les applications qui utilisent
-WINGs (Window Maker et WPrefs.app).
-
-Le script wsetfont inclus vous permettra de changer les réglages des polices de
-façon plus aisée. Consultez-le afin d'obtenir plus d'informations.
--- a/INSTALL.pt
+++ b/INSTALL.pt
@@ -1,566 +0,0 @@
-		Instruções de Instalação do Window Maker
-
-
-PLATAFORMAS SUPORTADAS
-======================
-(obs: fiquei sabendo que conseguiram compilar nesses sistemas...)
-
- Intel GNU/Linux Slackware 3.5 (plataforma primária)
- outras distribuições do Intel GNU/Linux 
- Sparc GNU/Linux RedHat 5.1
- PowerPC GNU/MkLinux
- Alpha GNU/Linux RedHat 5.1
- FreeBSD
- NetBSD
- OpenBSD
- BSDI 4.0
- Solaris 2.5.1, 2.5.2
- Solaris 2.6.0
- Solaris 2.7beta
- SCO Unix
- SGI Irix 5.x, 6.5
- OSF/1
- HP-UX
- AIX 3.2.5
- AIX 4.1.4 / IBM PowerPC
- AIX 4.3.1 / IBM CC compiler
- AIX 4.3.2 / IBM PowerPC
- AIX 5.3
- DEC Alpha/Digital UNIX 4.x
- XFree86 / OS/2
- Corel NetWinder
- SunOS 4.x
- PowerMac / Power MachTen 4.1.1 em MacOS
- Amiga 3000 rodando RedHat Linux 5.1 (Rawhide)
-
-Patches que possibilitem a execução em outras plataformas serão bem-vindos.
-
-Se a última versão não funcionou para você, tente a 0.53.0,
-que é conhecida por ser bastante estável em várias plataformas.
-
-
-REQUERIMENTOS
-=============
-
-Os softwares a seguir são necessários para o uso do Window Maker:
-
- X11R6.x	
-	O Window Maker pode ser compilado em versões mais antigas do X, como X11R5
-	(Solaris) ou X11R4 (OpenWindows) mas não funcionará 100% corretamente. Em
-	tais servidores não existirão ícones de aplicações e você terá problemas
-	usando o dock. Fazer upgrades das bibliotecas (Xlib Xt etc) ajudará se você
-	não pode fazer upgrade do servidor.
-	
-Para compilar o Window Maker você precisará do seguinte:
-
- Requerimentos básicos e óbvios
-	Se você vai compilar o Window Maker, tenha certeza de que você possui o gcc
-	(ou outro compilador ANSI) e os arquivos headers do X. Especialmente para
-	os iniciantes em Linux: você deve instalar todos os pacotes de desenvolvimento
-	do X e a suite gcc. Do contrário você não será capaz de compilar nenhum
-	programa X, incluindo o Window Maker.
-
- libPropList 
-	Você pode achar esta biblioteca em ftp://ftp.windowmaker.org/pub/libs ou
-	ftp://ftp.gnome.org/pub/libPropList. Você deve instalar corretamente
-	esta biblioteca antes de instalar o Window Maker.
-
- autoconf, automake and libtool
-	Estes pacotes não são necessários, mas se você tiver um ou mais deles instalados,
-	verifique se todos eles são das seguintes versões:
-		autoconf 2.54
-		automake 1.4
-		libtool 1.4.2
-	Se você possui uma versão diferente, desative-os mudando os nomes dos arquivos
-	para outra coisa ou removendo-os do seu sistema. Se você não desenvolve
-	software você não precisa deles, logo, você pode desinstalá-los com segurança.
-
- lex (ou flex) e yacc (ou bison)
-	São usados pelo libPropList. O lex não seria necessário, já que	o seu 
-	arquivo de saída é incluído, mas como ou eu ou o automake é um pouco
-	burro, o script de configuração para o libPropList simplesmente
-	abortará sem motivo caso o lex não seja achado.
-
-
-OPCIONAL:
-=========
-Estas bibliotecas não são necessárias para que o Window Maker funcione, mas elas
-são suportadas caso você deseje usá-las. Os números das versões são os que eu
-possuo (e portanto quase certamente funcionarão), mas outras versões devem funcionar
-também.
-
-
- libXPM 4.7 ou mais atual
-	Versões antigas podem não funcionar.
-	Disponível em ftp://sunsite.unc.edu/pub/Linux/libs/X/
-	Há suporte nativo para arquivos XPM, mas ele não carregará imagens em
-	algumas formatos incomuns.
-
- libpng 0.96 ou mais atual e zlib
-	Para suporte a imagens PNG.
-
- libtiff 3.4 ou mais atual
-	Para suporte a imagens TIFF. Você pode baixar o libtiff em
-	ftp://ftp.sgi.com/graphics/tiff.
-
- libjpeg 6.0.1 ou mais atual
-	Para suporte a imagens JPEG.
-
- libgif 2.2 ou libungif
-	Para suporte a imagens tipo GIF.
-
- GNU xgettext
-	Se você deseja usar mensagens traduzidas, será necessário o GNU gettext. Outras
-	versões do gettext não são compatíveis e não funcionarão. Baixe a versão
-	GNU através do site ftp://ftp.gnu.org
-
-A maioria dos pacotes citados pode ser encontrado em ftp.uu.net/pub/graphics
-
-
-
-OPÇÕES DE CONFIGURAÇÃO
-======================
-
-Estas opções podem ser passadas ao script de configuração para ativar/desativar algumas
-opções do Window Maker. Exemplo:
-
-./configure --enable-kde --enable-gnome
-
-irá configurar o Window Maker para que seja compilado com suporte ao KDE e GNOME.
-
-
-Para obter uma lista com outras opcoes, execute ./configure --help:
-
--with-libs-from
-	Especifica diretórios (paths) adicionais onde se deve achar as bibliotecas.
-	A flag -L deve preceder cada caminho, tal como:
-     	--with-libs-from="-L/opt/libs -L/usr/local/lib"
-
--with-incs-from
-	Especifica diretórios adicionais para os arquivos de cabeçalho (header files)
-	que serão procurados. A flag -l deve preceder cada caminho descrito, tal como:
-	--with-incs-from="-I/opt/headers -I/usr/local/include"
-
--enable-single-icon
-	Permite o agrupamento de todas as aplicações com a mesma WM_CLASS+WM_INSTANCE em
-	uma só.	Esta opção não é suportada por todos os desenvolvedores. Se você tiver algum
-	problema com essa opção, escreva para o seu autor: Christopher Seawood
-	<cls@seawood.org>
-
--disable-shm
-	Desativa o uso da extensão de memória compartilhada do MIT. Isto reduzirá
-	um pouco a geração de texturas, mas em alguns casos se mostrará necessário
-	em virtude de um bug que se manifesta quando manipulam-se ícones e texturas.
-
--disable-motif
-	Desativa compatibilidade com gerenciador de janelas mwm.
-
--enable-openlook
-	Ativa compatibilidade com gerenciador de janelas OPEN LOOK(tm).
-
--enable-gnome
-	Ativa compatibilidade com gerenciador de janelas GNOME.
-
--enable-kde
-	Ativa compatibilidade com gerenciador de janelas kde/kwm.
-
--enable-lite
-	Remove coisas que já são suportadas em ambientes desktops como o KDE
-	e o GNOME. As opções desativadas são: lista de janelas (window list), menu de
-	aplicações root (root applications menu), seleção múltipla de janelas
-	(multiple window selection). Note que não será mais possível sair do Window
-	Maker de dentro; você terá que usar o kill com o sinal SIGTERM ou sair do KDE.
-	Não é aconselhado ativar essa opção.
-
--enable-modelock
-	Suporte ao bloqueio de status de linguagem do XKB. Se você não sabe o que
-	é isto, você provavelmente não precisa.
-
--enable-sound
-	Ativa o suporte ao módulo de efeitos sonoros.
-
--disable-xpm
-	Desativa o uso da biblioteca XPM mesmo se esta estiver disponível no seu sistema.
-
--disable-png
-	Desativa o uso da biblioteca PNG
-
--disable-tiff
-	Desativa o uso da biblioteca TIFF
-
--disable-gif
-	Desativa o uso da biblioteca GIF
-
--disable-jpeg
-	Desativa o uso da biblioteca JPEG
-
--disable-shape
-	Desativa o uso das shaped windows (para oclock, xeyes etc.).
-
--enable-debug
-	Não use esta opção a não ser que saiba realmente o que está fazendo
-
-
-
-NOTAS ESPECÍFICAS PARA AS PLATAFORMAS
-=====================================
-
- máquinas DEC/Alpha
-	Você provavelmente precisará usar a flag --disable-shm para configurar,
-	como ./configure --disable-shm
-
- SCO Unix - execute o configure tal como
-	CFLAGS="-belf -DANSICPP" ./configure
-
- SunOS, Solaris
-	Se você possui o gcc instalado, execute o configure como abaixo:
-	CPP_PATH="gcc -E -x c" ./configure
-	O cpp da Sun não possui agumas funções necessárias ao Window Maker e pode
-	causar problemas quando analisados os arquivos de configuração.
-	Você pode ainda precisar usar --with-libs-from e --with-incs-from
-	para fornecer o diretório onde a libtiff está localizada.
-	Alguem me mandou um email dizendo que você precisará deixar o /usr/local/lib
-	como primeiro caminho (path) no LD_LIBRARY_PATH para que funcione.
-	
-	Se você tem uma Ultra Creator 3D ou outra máquina com gráficos high-end,
-	certifique-se de iniciar o servidor X com o visual padrão definido em 24bpp
-	ou você poderá ter problemas com cores desfiguaradas. Isto é um bug do
-	wmaker e será consertado.
-
- GNU/Linux em geral
-	Confira se você possui /etc/local/lib no /etc/ld.so.conf e rode ldconfig
-	após a instalação.
-	Remova qualquer versão em pacote do Window Maker antes de instalar uma versão
-	mais atual.
-
- RedHat GNU/Linux
-	Os sistemas RedHat apresentam vários incômodos. Se você usa, certifique-se
-	de seguir os passos abaixo ou o Window Maker não funcionará:
-
-	* se você instalou o Window Maker que vem junto com o Red Hat, desinstale-o
-	antes de instalar uma versão mais atual.
-
-	* certifique-se de que você não possui as variáveis de ambiente LANG e LINGUAS
-	configuradas como en_RN;
-
-	* certifique-se de que você possui /usr/local/bin na variável PATH;
-
-	* certifique-se de que você tem /usr/local/lib no /etc/ld.conf.so antes de
-	executar o ldconfig;
-
-	* se você tiver problemas que mencionem uma mensagem de erro com o
-	--no-reexec, remova a libtool-1.2b e instale a libtool-1.3. A libtool-1.3
-	pode ser encontrada em ftp.gnu.org. Também leia a seção TROUBLESHOOTING;
-
-	* se você instalou o pacote Window Maker do RedHat e está instalando uma
-	nova versão na mão (você mesmo está compilando), remova o pacote Window
-	Maker do seu sistema RedHat antes.
-
-	* certifique-se de que você possua o vínculo simbólico do /usr/include/X11
-	ao /usr/X11R6/include/X11 (se não, digite ln -s /usr/X11R6/include/X11
-	/usr/include/X11)
-
-	* certifique-se de que você tem o /lib/cpp apontando para o programa cpp.
-
-	Se você possui alguma dúvida quanto a realizar qualquer uma das tarefas acima,
-	por favor não hesite em contatar o suporte ao usuário RedHat. Eles gentilmente
-	irão responder a todas as suas dúvidas relacionadas ao sistema. Eles sabem
-	muito mais sobre o sistema deles do que nós (nós não usamos RedHat).
-
- PowerPC MkLinux
-	Você terá que possuir a última versão do Xpmac. Versões mais antigas
-	parecem ter bugs que fazem com que o sistema trave.
-
- Debian GNU/Linux
-	Se você deseja suporte a JPEG e TIFF, certifique-se que no seu sistema estão
-	instaladas as bibliotecas libtiff-dev e libjpeg-dev.
-
- SuSE GNU/Linux
-	Se você instalou o pacote Window Maker do SuSE, certifique-se de
-	removê-lo do seu sistema antes de compilar o wmaker ou você poderá
-	ter problemas.
-
- MetroX (versão desconhecida)
-	O MetroX possui uma falha que corrompe os pixmaps que são definidos
-	como backgrounds de janelas. Se você usa MetroX e está tendo problemas
-	estranhos com texturas, não use texturas nas titlebars. Ou use
-	um servidor X diferente.
-
-INSTALAÇÃO:
-===========
-
-Desempacote o WindowMaker-extra-<numero-da-versao>.tar.gz no /usr/local/share. 
-
-Você pode pegar o arquivo no site ftp://ftp.windowmaker.org. Este arquivo
-é opcional e possui alguns ícones e temas. Procure pelo último <número-da-versão>
-disponível.
-Ainda há o WindowMaker-extra.readme para instruí-lo sobre onde o pacote deve ir.
-
-
-Compilando o Window Maker
-------------------------
-	Se você quer fazer de modo rápido e simples, digite o seguinte no seu prompt:
-
-	./configure
-	make
-
-depois entre como root e digite:
-
-	make install
-	ldconfig
-
-ou se você quiser remover os símbolos de depuração dos seus binários para
-que eles se tornem menores, você pode digitar:
-
-	make install-strip
-	ldconfig
-
-Estes comandos irão compilar e instalar o Window Maker com parâmetros padrões. 
-
-Se você deseja configurar algumas opções de compilação, você pode fazer o seguinte:
-
-	1.(opcional) Olhe na seção OPÇÕES DE CONFIGURAÇÃO acima para ver as
-	opções disponíveis. Execute também:
-
-	./configure --help
-
-	para obter uma lista completa das outras opções.
-
-	2. Rode o configure com as opções que você deseja. Por exemplo, se
-	deseja usar a opção --enable-kde, você deve digitar:
-
-	./configure --enable-kde
-
-	3. (opcional) Edite o arquivo src/wconfig.h com seu editor de texto
-	preferido e procure por alguma opção que deseja mudar
-
-	4. Compile. Só digite:
-
-	make
-
-	5. Entre como root (se você não pode fazer isso, leia a seção "Eu não tenho a
-	senha de root") e instale o Window Maker no seu sistema:
-
-		su root
-		make install
-
-
-Configurações Específicas
-------------------------
-
-Estas instruções não precisam ser seguidas quando for feito o upgrade do
-Window Maker em cima de uma versão antiga, a menos que o arquivo NEWS diga
-algo diferente.
-
-Todo usuário no seu sistema que desejar rodar o Window Maker deverá fazer o seguinte:
-
-	1. Instalar os arquivos de configuração do Window Maker no diretório home.
-Digite:
-	wmaker.inst
-
-	wmaker.inst vai instalar os arquivos de configuração do Window Maker e fazer
-	com que o X rode o Window Maker quando executado.
-
-	É isso!
-
-	Você pode digitar "man wmaker" para ver uma ajuda geral sobre configuração
-e outras coisas.
-
-Leia o Manual do Usuário para explicações mais profundas sobre o Window Maker.
-
-Você deve dar uma olhada no FAQ também.
-
-
-
-Eu não tenho a senha de root
----------------------------
-
-Se você não pode obter privilégios de super-usuário (não pode ser root) você
-pode instalar o wmaker no seu diretório home. Para isso, forneça a opção
--prefix quando for rodar o configure, como explicado no passo 2 da seção
-Compilando o Window Maker.
-Você ainda precisará fornecer a opção --with-appspath, para especificar o
-caminho do WPrefs.app. Exemplo:
-
-./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps
-
-Depois faça com que /home/jshome/bin seja incluído na variável PATH, adicione
-/home/jshome/lib na variável de ambiente LD_LIBRARY_PATH e rode bin/wmaker.inst
-
-É claro, substitua /home/jshome com o seu diretório home.
-
-
-UPGRADE
-=======
-
-Se você está fazendo um upgrade de uma versão antiga do Window maker:
-	
-	1. Configure e compile o Window Maker como sempre
-	2. Instale o Window Maker (mas não rode o wmaker.inst)
-	3. Leia o arquivo NEWS e atualize seus arquivos de configuração,
-	se necessário.
-
-TROUBLESHOOTING
-===============
-
-Quando você tiver problemas na configuração (enquanto roda o configure),
-tal como não conseguir usar uma biblioteca de gráficos que você acha que tem
-instalada, olhe no arquivo config.log para obter dicas sobre o que pode estar
-errado.
-
-== Erro ao carregar as fontes, mesmo quando elas existem
-
-Tente reconstruir sem suporte NLS.
-
-== Erro ao configurar
-
-ltconfig: unrecognized option `--no-reexec'
-Try `ltconfig --help' for more information.
-configure: error: libtool configure failed
-
-remova a opção --no-reexec do aclocal.m4 e da libPropList/aclocal.m4
-e reconfigure.
-Também verifique se as versões do autoconf e do automake que você tem
-instaladas são:
-autoconf 2.13
-automake 1.4
-libtool 1.3
-
-Note que não deve ser libtool 1.2b, deve ser libtool 1.3.
-
-== Não acha a proplist.h ou libPropList.algumacoisa
-
-Baixe e instale a libPropList dos sites já citados neste arquivo.
-
-== o configure não detecta a libtiff, ou outras bibliotecas gráficas.
-
-Delete o config.cache, depois rode de novo o configure adicionando as
-seguintes opções ao configure (e as outras opções que você usa):
--with-libs-from="-L/usr/local/lib"
--with-incs-from="-I/usr/local/include -I/usr/local/include/tiff"
-Substitua o caminho para onde estão localizadas as suas bibliotecas gráficas
-e os correspondentes arquivos de cabeçalho. Você pode colocar caminhos múltiplos
-em qualquer uma dessas opções, como no exemplo do --with-incs-from. Só ponha um
-espaço entre eles.
-
-== o configure não detecta libXpm. 
-
-* Confira se você possui um vínculo simbólico da libXpm.so.4.9 para libXpm.so
-
-
-== Segmentation fault na inicialização
-
-* Confira se a versão da libXPM é a 4.7 ou mais atual
-
-* Confira se você tem uma versão atualizada do ~/GNUstep/Defaults/WindowMaker
-
-Se você não tem certeza, tente renomear ~/GNUstep para ~/GNUtmp e depois rode
-o wmaker.inst
-
-== "...: your machine is misconfigured. gethostname() returned (none)"
-
-* o hostname da sua máquina está definido incorretamente. Execute um man hostname
-para obter informações de como resolver isto.
-
-== O menu do root possui só 2 entradas. ("XTerm" e "Exit...")
-
-* O Window Maker não está achando o cpp (o pré-processador C). Se o seu cpp
-não está localizado em /lib/cpp, edite src/config.h e corrija o caminho
-no CPP_PATH.
-
-== checking lex output file root... configure: error: cannot find output from
-true; giving up
-
-* Leia a seção REQUERIMENTOS deste arquivo.
-
-
-LOCALES/INTERNACIONALIZAÇÃO
-===========================
-
-o Window Maker tem suporte a linguagem nacional. Para ativar esse suporte,
-você precisa compilar o Window Maker com parâmetros adicionais.
-
-0 - Você deve Ter o pacote do GNU gettext instalado. Este pode ser obtido
-pelo ftp://prep.ai.mit.edu/pub/gnu/gettext-nnn.tar.gz
-
-Os passos 1,2 e 3 podem ser pulados se você usa o script Install.
-
-1 - Você deve selecionar as linguagens que deseja suportar. Defina a LINGUAS
-para a lista dos locales que você deseja. O Inglês é sempre suportado. Exemplo:
-
-setenv LINGUAS "pt ja de"
-na csh
-
-ou
-
-export LINGUAS;LINGUAS="pt ja de"
-na sh
-
-A lista dos locales suportados pode ser achado no arquivo po/README.
-O inglês é a língua oficial.
-
-Leia o arquivo po/README se você deseja traduzir e manter os arquivos 
-locales para outras linguagens.
-
-2 - Adicionalmente, se a sua linguagem usa caracteres multi-bytes, tais 
-como as línguas japonesas e koreanas, você deve definir a opção MultiByteText
-para YES nos arquivos ~/GNUstep/Defaults/WMGLOBAL e ~/GNUstep/Defaults/WindowMaker
-
-3 - Configure, compile e instale o Window Maker normalmente.
-
-4 - Para selecionar um locale particular você deve definir a variável de
-ambiente LANG para o locale que você quer. Por exemplo, se você quer definir o
-locale português, você deve rodar
-
-setenv LANG pt
-
-na csh ou
-
-export LANG; LANG=pt
-
-nas Bourne sh e similares
-
-Nota: Se você tem a variável de ambiente LC_CTYPE definida, você deve
-indefiní-la antes de rodar o wmaker.
-
-O Window Maker procura os arquivos de definições de menu na seguinte
-ordem (para o português brasileiro, neste caso):
-
-menu.pt_BR
-menu.pt
-menu
-
-
-5 -  Se você escolheu uma linguagem que usa caracteres multi-bytes, você
-deve configurar as fontes adequadamente. Leia a página de manual para o
-XcreateFontSet para obter mais detalhes sobre isto. Você deve mudar o arquivo
-~/G/D/WindowMaker para as fontes usadas nas barras de título, menus e
-outras coisas. Para as fontes usadas nas janelas de diálogo, mude o arquivo
-~/G/D/WMGLOBAL. O %d no font names não deve ser removido. Você pode ainda usar
-o wsetfont script para esta tarefa. Leia o próprio script para maiores instruções.
-
-Por exemplo, você pode especificar o seguinte no ~/G/D/WindowMaker:
-
-WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*,-*-*-medium-r-normal-*-12-*";
-ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*,-*-*-medium-r-normal-*-12-*";
-DisplayFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-12-*";
-
-e no ~/G/D/WMGLOBAL:
-
-SystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-BoldSystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-
-
-As duas fontes acima são usadas somente por aplicações que
-usem WINGs (o Window Maker e WPrefs.app)
-
-O script wsetfont que é fornecido vai permitir com que você mude as
-definições de fonte do modo mais fácil. Dê uma olhada no script para maiores
-detalhes sobre o uso.
-
-
-
-Traduzido por Ricardo Sartori <sartori@inf.ufsc.br>
--- a/INSTALL.sk
+++ b/INSTALL.sk
@@ -1,610 +0,0 @@
-
-		In¹trukcie pre in¹taláciu Window Makera
-
-
-
-PODPOROVANÉ PLATFORMY
-=====================
-(tzn: vraj to na tom niekto skompiloval...)
-
- Intel GNU/Linux Conectiva 5.9 (beta)
- Intel GNU/Linux Slackware
- Intel GNU/Linux Debian
- Intel GNU/Linux other distributions
- Sparc GNU/Linux RedHat 5.1
- PowerPC GNU/MkLinux
- Alpha GNU/Linux RedHat 5.1
- FreeBSD
- NetBSD
- OpenBSD
- BSDI 4.0
- Solaris 2.5.1, 2.5.2
- Solaris 2.6.0
- Solaris 2.7beta
- SCO Unix
- SGI Irix 5.x, 6.5
- OSF/1
- HP-UX
- AIX 3.2.5
- AIX 4.1.4 / IBM PowerPC
- AIX 4.3.1 / IBM CC compiler
- AIX 4.3.2 / IBM PowerPC
- AIX 5.3
- DEC Alpha/Digital UNIX 4.x
- XFree86 / OS/2
- Corel NetWinder
- SunOS 4.x
- PowerMac / Power MachTen 4.1.1 over MacOS
- Amiga 3000 running RedHat Linux 5.1 (Rawhide)
- IBM S/390 running Linux
- iBook running Darwin
-
-Patche na rozbehanie na iných platformách sú vítané.
-
-
-PO®IADAVKY:
-===========
-
-Nasledovný softvér je potrebný pre beh Window Makera:
-
- X11R6.x	
-	Window Maker mô¾e by» skompilovaný na star¹ích verziách X, ako
-	X11R5 (Solaris) alebo X11R4 (OpenWindows) ale nebude pracova»
-	100% korektne. Na takých serveroch nebudú ikony aplikácií a budete
-	ma» problémy s pou¾ívaním doku. Upgrade klientských kni¾níc (Xlib,
-	Xt, atï.) pomô¾e, ak u¾ nemô¾ete spravi» upgrade servera.
-
-Nasledovné je potrebné k skompilovaniu Window Makera:
-
- Základné be¾né veci
-	Ak chcete kompilova» Window Maker, uistite sa, ¾e máte gcc (alebo
-	iný ANSI C kompilátor) a hlavièkové súbory iXov. Hlavne pre zaèia-
-	toèníkov v Linuxe: musíte nain¹talova» v¹etky X-devel balíky a gcc.
-	Inak nebudete schopní skompilova» ¾iadny program pre X, teda ani
-	Window Maker.
-
- libPropList
-	Túto kni¾nicu mo¾no nájs» na ftp://ftp.windowmaker.org/pub/libs alebo
-	ftp://ftp.gnome.org/pub/libPropList. Nain¹talujte ju pred kompiláciou
-	Window Makera.
-
- autoconf, automake a libtool
-	Tieto nástroje NIE sú potrebné, ale ak máte niektoré z nich nain¹talo-
-	vané, uistite sa, ¾e V©ETKY sú presne nasledovné verzie:
-		autoconf 2.54
-		automake 1.4
-		libtool 1.4.2
-	Ak máte odli¹né verzie, odin¹talujte ich alebo ich doèasne premenujte.
-	Ak neprogramujete, nebudete ich potrebova» a teda ich mô¾ete
-	odin¹talova».
-
- lex (alebo flex) a yacc (alebo bison)
-	Tieto sú vyu¾ívané z libPropList. Lex v skutoènosti nie je nutný,
-	lebo jeho výstupný súbor je prítomný, ale buï ja alebo automake je
-	hlupák, lebo configuraèný skript pre libPropList sa jednoducho
-	ukonèí z neznámych dôvodov ak lex nie je prítomný.
-
-
-
-NEPOVINNÉ:
-==========
-
-Tieto kni¾nice nie sú nutné pre beh Window Makera, ale sú podporované
-v prípade, ¾e ich chcete pou¾íva». Èísla verzií sú tie, ktoré som pou¾il
-ja (teda urèite fungujú), ale aj iné verzie mô¾u pracova» správne.
-
-
- libXPM 4.7 alebo nov¹ia
-	Star¹ie verzie nemusia fungova»!!!
-	Dostupné na ftp://sunsite.unc.edu/pub/Linux/libs/X/
-
-	Podpora XPM je aj vstavaná, ale nenaèíta obrázky v
-	ne¹tandardných kódovaniach.
-
- libpng 0.96 alebo nov¹ia a zlib
-	Pre podporu obrázkov PNG.
-	http://www.cdrom.com/pub/png/
-
- libtiff 3.4 alebo nov¹ia
-	Pre podporu obrázkov TIFF.
-	ftp://ftp.sgi.com/graphics/tiff
-
- libjpeg 6.0.1 alebo nov¹ia
-	Pre podporu obrázkov JPEG.
-	http://www.ijg.org/
-
- libgif 2.2 alebo libungif
-	Pre podporu obrázkov GIF.
-	ftp://prtr-13.ucsc.edu/pub/libungif/
-
- GNU xgettext
-	Ak chcete pou¾íva» prelo¾ené hlásenia, potrebujete GNU gettext.
-	Iné verzie gettext nie sú kompatibilné a nebudú fungova».
-	Stiahnite si GNU verziu z ftp://ftp.gnu.org
-
-
-
-MO®NOSTI CONFIGURE:
-===================
-
-Tieto mo¾nosti mô¾u by» dané skriptu configure ako argumenty za úèelom
-povolenia/zakázania urèitých vlastností Window Makera. Príklad:
-
-./configure --enable-kde --enable-gnome
-
-nakonfiguruje Window Maker s podporou KDE a GNOME.
-
-
-Zoznam v¹etkých mo¾ností vypí¹e príkaz ./configure --help
-
--with-libs-from
-	cesty, kde sa majú hµada» kni¾nice. Re»azec -L musí predchádza»
-	ka¾dú cestu, napr.:
-	--with-libs-from="-L/opt/libs -L/usr/local/lib"
-
--with-incs-from
-	cesty, kde sa majú hµada» hlavièkové súbory. Re»azec -I musí
-	predchádza» ka¾dú cestu, napr.:
-	--with-incs-from="-I/opt/headers -I/usr/local/include"
-
--enable-single-icon
-	umo¾òuje zrolovanie v¹etký ikon aplikácií WM_CLASS+WM_INSTANCE do
-	jedinej. Táto vlastnos» nie je podporovaná zo strany vývojárov.
-	V prípade problémov s òou, kontaktujte autora:
-	Christopher Seawood <cls@seawood.org>
-
--disable-shm
-	zaká¾e pou¾itie roz¹írenia zdieµanej pamäte MIT. Toto trochu spomalí
-	generovanie textúr, ale v niektorých prípadoch je táto voµba potrebná
-	kvôli chybe, ktorá spôsobuje nesprávne zobrazovanie ikon a textúr.
-
--disable-motif 
-	zaká¾e podporu pre pokyny mana¾éra okien wmw 
-
--enable-openlook
-	povolí podporu pre pokyny mana¾éra okien OPEN LOOK(tm)
-
--enable-gnome
-	povolí podporu pre pokyny mana¾éra okien GNOME
-
--enable-kde
-	povolí podporu pre pokyny mana¾éra okien kde/kwm
-
--enable-lite
-	odstráni veci, ktoré sa u¾ nachádzajú v desktopových prostrediach
-	ako KDE a GNOME. Odstránené veci sú: zoznam okien, menu aplikácií,
-	výber viacerých okien. Vedzte, ¾e u¾ nebudete schopní ukonèi»
-	Window Maker; budete ho musie» zabi» pou¾itím signálu SIGTERM alebo
-	ho ukonèi» z KDE. Neodporúèa sa povoli» túto vlastnos».
-
--enable-modelock
-	podpora pre XKB nastavenie jazyka. Ak neviete, èo to je, pravdepo-
-	dobne to nepotrebujete. (Slú¾i to na prepínanie rozlo¾enia kláves
-	pomocou nového tlaèidla na hornom paneli okien.)
-
--enable-sound	
-	povolí podporu pre modul zvukových efektov
-
--disable-xpm   
-	zaká¾e podporu pre kni¾nicu XPM aj keï je dostupná na va¹om systéme.
-
--disable-png	
-	zaká¾e pou¾itie kni¾nice PNG
-
--disable-tiff
-	zaká¾e pou¾itie kni¾nice TIFF
-
--disable-gif
-	zaká¾e pou¾itie kni¾nice GIF
-
--disable-jpeg
-	zaká¾e pou¾itie kni¾nice JPEG
-
--disable-shape
-	zaká¾e tvarované okná (pre oclock, xeyes atï.)
-
-
-POZNÁMKY PRE ©PECIFICKÉ PLATFORMY:
-==================================
-
- DEC/Alpha
-
-	Nasledovný mail nie je prelo¾ený, ale hovorí sa v òom, ¾e
-	_pravdepodobne_ nie je nutné konfigurova» Window Maker na
-	Alphe s voµbou --disable-shm.
-
-#>>>>>>>>>>>
-From: Anton Ivanov <aivanov@eu.level3.net>
-To: Marcelo E. Magallon <mmagallo@debian.org>
-Subject: Re: Is the WindowMaker package working ok on Alpha?
-
-> Hi,
-> 
->  I was reading some docs on the WindowMaker tarball, and found this:
-> 
->  | - DEC/Alpha machines
->  |         You might need to pass the --disable-shm flag to configure,
->  |         like ./configure --disable-shm
-> 
->  is anyone having problems with WindowMaker on Alpha?  Can someone
->  please test this?  Should the flag be passed when building on Alpha?
-
-Disclaimer: alphas under my command have never run X and are least likely to 
-suddenly start running it anytime soon.
-
-        Alpha used to have some ridiculously low amount of shared memory
-configured. 
-So quite a lot of apps used to barf. Namely - cdrecord, mysql server, etc.
-
-        Check where is yours at the moment and raise it to a more appropriate
-value by either catting to the appropriate /proc entry or changing the
-/usr/src/linux/include/asm/shmparam.h.
-
-        Otherwise the shared memory on alpha should be fully functional and I
-see no reason to disable it. Mine are bumped up to 32 or more on most
-machines.
-
-        And If I recall correctly the comments in that file are actually
-wrong. Value is not bytes, but in machine size word. For alpha *8.
-
-        As I said - I do not run X on them so all #include "stdisclaimer.h"
-apply.
-#<<<<<<<<<<<<
-
-
- SCO Unix - spustite configure takto
-	CFLAGS="-belf -DANSICPP" ./configure 
-
- SunOS, Solaris 
-	Ak máte nain¹alované gcc, spustite configure takto:
-	CPP_PATH="gcc -E -x c" ./configure
-	Cpp od Sunu chýbajú niektoré vlastnosti, ktoré Window Maker potrebuje,
-	a to mô¾e spôsobi» problémy pri parsovaní konfiguraèných súborov.
-	Je tie¾ mo¾né, ¾e budete musie» pou¾i» --with-libs-from a
-	--with-incs-from na urèenie ciest k libtiff.
-	Niekto mi mailoval, ¾e tie¾ /usr/local/lib musí by» prvá cesta v
-	premennej LD_LIBRARY_PATH, aby to fungovalo.
-	Ak máte Ultra Creator 3D alebo iný stroj s high-end grafikou,
-	uistite sa, ¾e spú¹»ate iXy s 24-bitovou farebnou håbkou alebo
-	mô¾ete ma» problémy s pomie¹anými farbami. Toto je chyba wmakera
-	a bude opravená.
-
- GNU/Linux vo v¹eobecnosti
-	Uistite sa, ¾e máte /usr/local/lib v /etc/ld.so.conf a ¾e ste
-	po in¹talácii spustili ldconfig.
-	Odin¹talujte v¹etky balíkované verzie Window Makera pred in¹talovaním
-	novej verzie.
-
- RedHat GNU/Linux
-	Systémy RedHat majú niekoµko nepríjemných problémov. Ak ich pou¾ívate,
-	dodr¾ujte nasledovné kroky, alebo vám Window Maker nebude fungova»:
-
-	* ak máte nain¹alovaný Window Maker, ktorý je dodaný s RedHatom,
-	pred upgadom ho odin¹talujte;
-
-	* uistite sa, ¾e nemáte premenné LANG a LINGUAS nastavené na en_RN;
-
-	* uistite sa, ¾e máte /usr/local/bin v premennej PATH;
-
-	* uistite sa, ¾e máte /usr/local/lib v /etc/ld.so.conf pred
-	spustením ldconfig;
-
-	* ak máte problémy, v ktorých sa spomína chyba s --no-reexec,
-	odin¹talujte libtool-1.2b a nain¹talujte libtool-1.3. libtool-1.3
-	nájdete na ftp.gnu.org. Tie¾ si preèítajte èas» RIE©ENIE PROBLÉMOV.  
-
-
-	* uistite sa, ¾e máte symbolický odkaz z /usr/include/X11 na
-	/usr/X11R6/include/X11 (ak nie, zadajte ln -s /usr/X11R6/include/X11
-	/usr/include/X11 )
-
-	* uistite sa, ¾e /lib/cpp odkazuje na program cpp
-
-	Ak máte akékoµvek pochybnosti, prosím, neotáµajte a spojte sa
-	s u¾ívateµskou podporou RedHatu. Radi vám odpovedia na v¹etky
-	va¹e otázky týkajúce sa ich systému. Vedia toho o svojom
-	systéme viac ako my (nepou¾ívame RedHat).
-
-
- PowerPC MkLinux
-	Musíte ma» poslednú verziu Xpmac. Star¹ie verzie majú asi chyby,
-	ktoré spôsobujú zmrznutie celého systému.
-
- Debian GNU/Linux
-	Ak chcete podporu JPEG a TIFF, uistite sa, ¾e máte nain¹talované
-	libiff-dev a libjpeg-dev.
-
- SuSE GNU/Linux
-	Ak ste si nain¹talovali balík Window Makera od SuSE, odin¹talujte
-	ho pred pokusmi o skompilovanie wmakera, alebo mô¾ete ma» problémy.
-
- MetroX (neznáma verzia)
-	MetroX má chybu, ktorá kazí obrázky, ktoré sú nastavené ako pozadie
-	okien. Ak pou¾ívate MetroX a máte èudné problémy s textúrami,
-	nepou¾ívajte textúry v horných li¹tách. Alebo pou¾ite iný X server.
-
-
-IN©TALÁCIA:
-===========
-
-Kompilácia Window Makera
------------------------
-	Pre rýchly ¹tart, zadajte nasledovné príkazy v shelly:
-
-	./configure
-	make
-
-potom sa prihláste ako root a zadajte:
-
-	make install
-	ldconfig
-
-alebo ak chcete z binárnych súborov odstráni» symboly pre debugger a urobi»
-ich men¹ie, napí¹te miesto toho
-
-	make install-strip
-	ldconfig
-
-Toto skompiluje a nain¹taluje Window Maker so ¹tandardnými parametrami.
-
-Ak si chcete prispôsobi» nastavenia kompilácie, mo¾ete to urobi» nasledovne:
-
-	1. (voliteµne) Pozrite sa na èas» MO®NOSTI CONFIGURE, kde sú
-	uvedené mo¾nosti. Tie¾ spustite:
-
-	./configure --help
-
-	ktorý vám vypí¹e kompletný zoznam ostatných mo¾ných nastavení.
-
-	2. Spustite configure s nastaveniami, ktoré chcete. Napríklad,
-	ak chcete pou¾íva» podporu pre KDE, zadajte:
-
-	./configure --enable-kde
-
-	3. (voliteµne) Otvorte si súbor src/wconfig.h vo svojom obµúbenom
-	textovom editore a prejdite si ho, èi nenájdete nejaké nastavenia,
-	ktoré chcete zmeni».
-
-	4. Kompilácia. Zadajte len:
-
-	make
-	
-	5. Prihláste sa ako root (ak to nie je mo¾né, èítajte èas» "Nemám
-	rootove heslo :-( ") a nain¹talujte Window Maker:
-
-	su root
-	make install
-	
-
-Nastavenia ¹pecifické pre u¾ívateµov
------------------------------------
-
-Nemusíte sa dr¾a» týchto in¹trukcií, ak robíte upgrade Window Makera zo
-star¹ej verzie, pokiaµ to nie je uvedené v súbore NEWS.
-
-Ka¾dý u¾ívateµ na va¹om systéme, ktorý chce pou¾íva» Window Maker, musí
-urobi» nasledovné:
-
-	1. Nain¹talova» konfiguraèné súbory Window Makera do svojho
-	domovského adresára:
-
-	wmaker.inst
-
-	wmaker.inst nain¹taluje konfiguraèné súbory Window Makera a nastaví
-	iXy aby sa pri ¹tarte automaticky spustil Window Maker.
-
-	To je v¹etko!
-
-	Základné informácie o konfigurácii a iných veciach vám poskytne
-	"man wmaker".
-
-Pre hlb¹í úvod do Window Makera si preèítajte si U¾ívateµký manuál.
-
-Tie¾ sa mô¾te pozrie» na FAQ.
-
-
-
-Installing the extras package
-----------------------------
-
-Unpack WindowMaker-extra-<version-number>.tar.gz in /usr/local/share
-        
-You can get the file at ftp://ftp.windowmaker.org. This file is optional
-and only have a few icons, and themes. Look for the latest <version-number>
-available.
-Also there is a WindowMaker-extra.readme to instruct you where that package
-should go.
-
-
-
-Nemám rootove heslo :(
----------------------
-
-Ak nemáte práva roota, mô¾ete si nain¹talova» Window Maker do svojho
-domovského adresára. Na to musíte pou¾i» voµbu --prefix pre configure
-v druhom kroku kompilácie Window Makera. Tie¾ musíte pou¾i» voµbu
--with-appspath, pomocou ktorej ¹pecifikujete cestu pre WPrefs.app.
-Príklad:
-
-./configure --prefix=/home/jshome --with-appspath=/home/jshome/GNUstep/Apps
-
-Poto pridajte adresár /home/jshome/bin do premennej PATH, /home/jshome/lib
-do premennej LD_LIBRARY_PATH a spustite bin/wmaker.inst
-
-Samozrejme, predpokladá sa, ¾e /home/jshome nahradíte va¹im skutoèným
-domovským adresárom.
-
-
-UPGRADE
-=======
-
-Ak robíte upgrade zo star¹ej verzie Window Makera:
-
-	1. Skofigurujte a skompilujte Window Maker ako v¾dy
-	2. Nain¹talujte Window Maker (ale nespustite wmaker.inst)
-	3. Preèítajte si súbor NEWS a ak je to potrebné, upravte
-	   svoje konfiguraèné súbory.
-
-
-RIE©ENIA PROBLÉMOV
-==================
-
-Ak máte problémy poèas konfigurácie (spú¹»ania configure), napríklad
-nemo¾nos» pou¾i» grafickú kni¾nicu, o ktorej viete, ¾e ju máte nain¹talovanú,
-v súbore config.log nájdete príèinu problému.
-
-== Error with loading fonts, even if they exist.
-
-Skúste kompiláciu bez podpory NLS.
-
-== Error when configuring
-
-ltconfig: unrecognized option `--no-reexec'
-Try `ltconfig --help' for more information.
-configure: error: libtool configure failed
-
-Odstáòte voµbu --no-reexec zo súborov aclocal.m4 a libPropList/aclocal.m4
-a spustite configure.
-Tie¾ sa uistite, ¾e autoconf a automake, ktoré máte nain¹talované, sú v
-týchto verziách:
-autoconf 2.13
-automake 1.4
-libtool 1.3
-
-Nesmie to by» libtool 1.2b, ale libtool 1.3, zo stránok GNU.
-
-== Cant find proplist.h or libPropList.something
-
-Stiahnite a nain¹talujte si libPropList zo stránok uvedených
-niekde v tomto súbore.
-
-
-== configure doesn't detect libtiff, or other graphic libraries.
-
-Odstráòte config.cache, spustite configure s pridanými nasledovnými voµbami
-(okrem iných, ktoré pou¾ívate):
--with-libs-from="-L/usr/local/lib"
--with-incs-from="-I/usr/local/include -I/usr/local/include/tiff"
-Vlo¾te cesty k va¹im grafickým kni¾niciam a zodpovedajúcim hlavièkovým
-súborom. Mô¾ete vlo¾i» viac ciest do ka¾dej z týchto volieb, ako je to
-uvedené v príklade --with-incs-from. Len ich oddeµte medzerou.
-
-
-== configure doesn't detect libXpm. 
-
-* Skontrolujte, èi máte symbolický odkaz z libXpm.so.4.9 na libXpm.so
-
-
-== Segmentation fault on startup
-
-* Skontrolujte verziu libXpm, musíte ma» aspoò 4.7
-
-* Skontrolujte, èi máte upravenú verziu ~/GNUstep/Defaults/WindowMaker
-
-Ak si nie ste istí, skúste premenova» ~/GNUstep na ~/GNUtmp a spustite
-wmaker.inst
-
-
-== "...: your machine is misconfigured. gethostname() returned (none)"
-
-* Meno va¹eho poèítaèa je nastavené na nieèo nesprávne, èo zaèína
-úvodzovkami. Preèítajte si man hostname a dozviete sa, ako to nastavi».
-
-
-== The root menu contains only 2 entries. ("XTerm" and "Exit...")
-
-* Window Maker nevie nájs» cpp (C preprocesor). Ak sa vá¹ cpp nenachádza
-v /lib/cpp, upravte src/config.h a vlo¾te správnu cestu do CPP_PATH.
-
-
-== checking lex output file root... configure: error: cannot find output from true; giving up
-
-* Preèítajte si èas» PO®IADAVKY v tomto súbore.
-
-
-MIESTNE NASTAVENIA/INTERNACIONALIZÁCIA
-======================================
-
-Window Maker má podporu pre národné jazyky. Aby ste ju povolili, musíte
-skompilova» Window Maker s niekoµkými prídavnými parametrami.
-
-
-0 - Musíte ma» nain¹talovaný balík GNU gettext. Mô¾ete ho nájs» na
-adrese ftp://prep.ai.mit.edu/pub/gnu/gettext-nnn.tar.gz
-
-Kroky 1 a¾ 3 mô¾ete vynecha», ak pou¾ívate skript Install
-
-1 - Musíte urèi» jazyky, pre ktoré chcete podporu. Nastavte premennú
-LINGUAS na zoznam miestnych nastavení, ktoré chcete. Angliètina je
-podporovaná v¾dy. Príklad:
-
-setenv LINGUAS "pt ja de"
-(csh)
-
-alebo
-
-export LINGUAS;LINGUAS="pt ja de"
-(sh)
-
-Zoznam podporovaných miestnych nastavení nájdete v súbore po/README.
-Angliètina je implicitným jazykom.
-
-Ak chcete preklada» a udr¾iava» súbory s miestnymi nastaveniami, preèítajte
-si súbor po/README.
-
-2 - Naviac, ak vá¹ jazyk pou¾íva multi-byte znaky, napríklad Japonèina
-alebo Kórejèina, musíte nastaveniu MultiByteText priradi» YES v súbore
-~/GNUstep/Defaults/WMGLOBAL
-
-3 - Konfigurujte, kompilujte a in¹talujte Window Maker ako zvyèajne.
-
-4 - Urèité miesne nastavenia si zvolíte nastavením premennej LANG na
-to, ktoré chcete. Napríklad, ak chcete nastavi» slovenské miestne
-nastavenia, musíte spusti»
-
-setenv LANG pt
-
-(csh)
-
-export LANG; LANG=pt
-
-(Bourne sh a podobné)
-
-Pozor: Ak máte nastavenú premennú LC_CTYPE, musíte ju zru¹i» pred
-spustením wmaker.
-
-Window Maker hµadá súbory s definíciou menu v nasledovnom poradí
-(v tomto prípade pre brazílsku portugalèinu):
-
-menu.pt_BR
-menu.pt
-menu
-
-
-5 - Ak si zvolíte jazyk, ktorý pou¾íva multi-byte znaky, musíte poriadne
-nastavi» svoje fonty. Preèítajte si manuálovú stránku k XCreateFontSet,
-kde nájdete viac detailov. Musíte v súbore ~/G/D/WindowMaker upravi» fonty
-pre horné li¹ty, menu a iné veci. Pre fonty pou¾ité v dialógových oknách
-upravte súbor ~/G/D/WMGLOBAL. Re»azce %d v menách fontov nesmú by»
-odstránené. Tie¾ mô¾ete pou¾i» skript wsetfont, ktorý to urobí za vás.
-
-Napríklad mô¾e zada» v súbore ~/G/D/WindowMaker nasledovné:
-
-WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*";
-IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*,-*-*-medium-r-normal-*-12-*";
-ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*,-*-*-medium-r-normal-*-12-*";
-DisplayFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-12-*";
-
-a v ~/G/D/WMGLOBAL:
-
-SystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-BoldSystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-
-Tieto dva fonty sa pou¾ijú len v aplikáciách, ktoré pou¾ívajú WINGs
-(Window Maker a WPrefs.app)
-
-Skript wsetfont vám umo¾ní nastavi» fonty jednoduch¹ím spôsobom. Pozrite
-sa priamo do jeho súboru pre bli¾¹ie informácie.
-
--- a/300
+++ b/300
@@ -1,300 +0,0 @@
-#!/bin/sh
-#
-# WindowMaker configuration and compilation script.
-#
-# Copyright (c) 1997, 1998, 1999 Alfredo K. Kojima
-#
-
-export LINGUAS;LINGUAS=""
-if test "$NLSDIR" = ""; then
-export NLSDIR;NLSDIR="/usr/lib/locale"
-fi
-
-
-OPTIONS=""
-PREFIX="/usr/local"
-
-perai() {
-	echo "Type <Return> to continue"
-	read nada
-}
-
-
-perform() {
-	if ! $* ; then
-		echo
-		echo "Window Maker installation failed or aborted by user."
-		exit 1
-	fi
-}
-
-help() {
-	echo "Usage: $(basename $0) <switch>"
-	echo "Where switches are:"
-	echo "    -s   --quiet  make silent build"
-	echo "    -h   --help   show this message"
-	echo ""
-	exit $1
-}
-
-
-OPTIONS=""
-MAKE_OPTIONS=""
-while [ -n "$1" ]
-do
-	case "$1" in
-		"-s"|"--quiet")	OPTIONS="--quiet"
-				MAKE_OPTIONS="-s";;
-		"-h"|"--help")	help 0;;
-		*)		echo "bad command-line parameter $1"
-				help 1;;
-	esac
-	shift
-done
-
-trap "echo Window Maker installation aborted. ; exit 1" 2 3
-
-echo
-echo "========================="
-echo "Window Maker Installation"
-echo "========================="
-echo
-echo "NOTE: If this script fails, read the INSTALL file and"
-echo "install by hand."
-echo
-echo "Please read the README, INSTALL and FAQ files before e-mailing "
-echo "questions. We will IGNORE any questions that are already"
-echo "answered in the documentation."
-echo
-perai
-echo "Did you read the INSTALL file?"
-echo -n "<y/n> "
-read rtfm
-if [ "$rtfm" != y ]; then
-	echo "Please read the INSTALL file before installing"
-	exit
-fi
-echo "Are you sure?"
-echo -n "<y/n> "
-read rtfm
-if [ "$rtfm" != y ]; then
-	echo "Please read the INSTALL file before installing"
-	exit
-fi
-echo "Are you lying?"
-echo -n "<y/n> "
-read rtfm
-if [ "$rtfm" != n ]; then
-	echo "What a shame!"
-	echo "Please read the INSTALL file before installing"
-	exit
-fi
-echo "Do you *swear* that you really read the INSTALL file?"
-echo -n "<y/n> "
-read rtfm
-if [ "$rtfm" != y ]; then
-	echo "Please read the INSTALL file before installing"
-	exit
-fi
-echo "Last chance. You will not get help if you have some problem"
-echo "because you didn't read that file. Even if your computer explodes."
-echo "Do you *really* read it?"
-echo -n "<y/n> "
-read rtfm
-if [ "$rtfm" != y ]; then
-	echo "Please read the INSTALL file before installing"
-	exit
-fi
-echo
-echo "Ok, you have been warned."
-echo
-perai
-
-
-if test "$USER" != "root"; then
-	echo
-	echo "Warning: you must run this script as root to install"
-	echo "Window Maker. Hit <Control>-<C> to quit this script."
-	perai
-	echo
-fi
-
-
-echo
-echo "Option Selection"
-echo "================"
-
-######################## KDE
-echo
-echo "Do you want KDE support?"
-echo -n "<y/n> [n] "
-read kde
-if [ "$kde" = y -o "$kde" = Y ]; then
-	OPTIONS="$OPTIONS --enable-kde"
-fi
-
-######################## GNOME
-echo
-echo "Do you want GNOME support?"
-echo -n "<y/n> [n] "
-read gnome
-if [ "$gnome" = y -o "$gnome" = Y ]; then
-	OPTIONS="$OPTIONS --enable-gnome"
-fi
-
-######################## OLWM
-echo
-echo "Do you want OPEN LOOK(tm)/olwm support?"
-echo -n "<y/n> [n] "
-read olwm
-if [ "$olwm" = y -o "$olwm" = Y ]; then
-	OPTIONS="$OPTIONS --enable-openlook"
-fi
-
-######################## NLS
-echo
-echo "Do you want National Language Support?"
-echo -n "<y/n> [n] "
-read NLS
-
-if [ "$NLS" = "y" -o "$NLS" = "Y" ]; then
-	NLS="Y"
-	echo "The supported locales are:"
-	ling=` (cd po; /bin/ls *.po) `
-	ALL_LINGUAS=""
-	for l in $ling; do
-		lname=`(cd po; grep Language-Team $l|cut -f2- -d:|cut -f1 -d\\\\|cut -f1 -d\<)`
-		lname=`echo $lname`
-		lcode=`basename $l .po`
-		ALL_LINGUAS="$ALL_LINGUAS $lcode"
-		echo "$lcode $lname"
-	done
-	echo "Type in the locales you want (all will install everything) [none]"
-	read foo
-	if test "$foo" = "all"; then
-		LINGUAS="$ALL_LINGUAS"
-	else
-		LINGUAS="$foo"
-	fi
-	echo "Selected locales are: $LINGUAS"
-
-	MB=""
-	for i in $LINGUAS; do
-		ok=0
-		for b in $ALL_LINGUAS; do
-			if test "$b" = "$i"; then
-				ok=1
-				break
-			fi
-		done
-		if test "$ok" = "0"; then
-			echo
-			echo "$i is not a supported locale"
-			perai
-			continue
-		fi
-
-	done
-	echo
-	echo "Where do you want to put the message files? [$NLSDIR]"
-	echo -n "? "
-	read foo
-	if test "x$foo" != "x"; then
-		NLSDIR=$foo
-	fi
-fi
-##################### Installation path
-
-done=0
-while [ $done = 0 ]; do
-    echo
-    echo "Where do you want to install Window Maker? [$PREFIX]"
-    echo "Don't change it if you don't know what you're doing."
-    if test "$USER" != "root"; then
-	echo "Make sure to specify a path where you have write permission."
-    fi
-    echo "(The default will put Window Maker in $PREFIX/bin, $PREFIX/lib etc.)"
-    echo -n "? "
-    read foo
-    if test "x$foo" != "x"; then
-	if [ "$foo" = "y" -o "$foo" = "n" ]; then
-	    echo
-	    echo "Hmm... I don't think you really want to install Window Maker into \"$foo\""
-	    echo
-	else
-	    done=1	
-	    PREFIX=$foo
-	fi
-    else
-    	done=1
-    fi
-    echo
-    echo "   $PREFIX/bin must be in the PATH environment variable"
-    echo "of all users who will use Window Maker"
-    perai
-done
-
-OPTIONS="$OPTIONS --prefix=$PREFIX"
-
-
-##################### Install stripped binaries?
-
-INSTALL="install"
-echo "Do you want stripped binaries to be installed?"
-echo "Installed binaries will be smaller (with debug info removed)."
-echo -n "<y/n> [n] "
-read foo
-if [ "$foo" = y -o "$foo" = Y ]; then
-	INSTALL="install-strip"
-fi
-
-
-#####################  Configure
-echo "--------------------------"
-echo "Configuring Window Maker..."
-echo "--------------------------"
-if [ `uname -s` = "SCO_SV" ]; then
-	echo "CFLAGS=\"$CFLAGS -belf -DANSICPP\" ./configure $OPTIONS"
-
-	CFLAGS="$CFLAGS -belf -DANSICPP" 
-
-	perform ./configure $OPTIONS
-else
-	echo "CFLAGS=\"$CFLAGS $GCCFLAGS\" ./configure $OPTIONS"
-
-	CFLAGS="$CFLAGS $GCCFLAGS" 
-
-	perform ./configure $OPTIONS
-fi
-
-
-#################### Compile
-echo "-------------------------"
-echo "Compiling Window Maker..."
-echo "-------------------------"
-(cd src; perform make $MAKE_OPTIONS clean)
-perform make $MAKE_OPTIONS
-
-echo "--------------------------"
-echo "Installing Window Maker..."
-echo "--------------------------"
-
-perform make $MAKE_OPTIONS $INSTALL
-
-if [ `uname -s` = "Linux" ]; then
-    echo
-    echo "   Make sure $PREFIX/lib is in the /etc/ld.so.conf file"
-	/sbin/ldconfig
-fi
-
-echo 
-echo "Installation Finished!"
-echo
-echo "Now, each user that wishes to use WindowMaker must run the wmaker.inst"
-echo "script that was just installed."
-
-
-if test "$NLS" = "Y"; then
-	echo "Don't forget to set the LANG environment variable to your locale"
-fi
-
--- a/90
+++ b/90
@@ -1,90 +0,0 @@
-
-Window Maker FTP Mirror Sites
-=======-=====================
-
-Official Site (USA):
--------------------
-ftp://ftp.windowmaker.org/
-
-
-Australia:
----------
-ftp://ftp.goldweb.com.au/pub/WindowMaker/
-Contact: Matthew Hawkins <matt@goldweb.com.au>
-
-
-France:
-------
-ftp://ftp.ensm-ales.fr/pub/mirrors/ftp.windowmaker.org
-Contact: Laurent PELLISSIER <Laurent.Pellissier@ensm-ales.fr>
-
-
-Germany:
--------
-ftp://ftp.freenews.de/pub/windowmaker/
-Contact: Jonas Luster <jonas@cabal.arnooo.de>
-
-
-United States of America:
-------------------------
-ftp://ftp.io.com/pub/mirror/windowmaker/
-Contact: Bobby <bobby@mezaway.org>
-
-http://jgo.local.net/cool_downloads/wm/
-Contact: Joshua Go <joshuago@usa.net>
-
-ftp://ftp.cybertrails.com/pub/windowmaker/
-Contact: Adam Jacob <adam@cybertrails.com>
-
- 
-Provider: Ameth Technologies
-http://www.ameth.org/windowmaker/
-ftp://ftp.ameth.org/pub/mirrors/ftp.windowmaker.org/
-Contact: Chase Phillips <shepard@ameth.org>
-
-
-Third Party Window Maker Distribution Packages
-==============================================
-
-Debian GNU/Linux (deb)
----------------------
-
-Contact: Marcelo Magallon <mmagallo@efis.ucr.ac.cr>
-Sites:
-http://master.debian.org/~mmagallo/packages/wmaker/
-
-
-RedHat GNU/Linux (RPM)
----------------------
-
-For Intel:
-
-Contact: Jim Knoble <jmknoble@pobox.com>
-Sites:
-ftp://ftp.windowmaker.org/pub/beta/compiled/linux/rpms/
-ftp://ftp.redhat.com/pub/contrib/SRPMS/
-ftp://ftp.redhat.com/pub/contrib/i386/
-
-For Alpha:
-
-Contact: Peter Petrakis <peterpan@wn.net>
-Site:
-http://math.stcc.mass.edu/petrakis/downloads/X11
-
-
-HP-UX
-----
-
-Sites:
-          UK: http://hpux.csc.liv.ac.uk/
-     Germany: http://hpux.ask.uni-karlsruhe.de/
-     US (WI): http://hpux.cae.wisc.edu/
-      France: http://hpux.cict.fr/
- Netherlands: http://hpux.tn.tudelft.nl/
-      Canada: http://hpux.ee.ualberta.ca/
-       Italy: http://hpux.dsi.unimi.it/
-South Africa: http://hpux.petech.ac.za/
-       Japan: http://hpux.u-aizu.ac.jp/
-     US (UT): http://hpux.cs.utah.edu/
-
-
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,53 @@
 ## Process this file with automake to produce Makefile.in

-SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc\
-	contrib
+AUTOMAKE_OPTIONS =

-EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N FAQ.I18N.cs FAQ.I18N.sk \
-	Install INSTALL.cs INSTALL.fr INSTALL.es INSTALL.pt INSTALL.sk \
-	README.antialiasing README.definable-cursor README.pt \
-	README.KDE README.GNOME Sample.XftConfig \
-	MIRRORS COPYING.WTFPL mkpatch WindowMaker.lsm.in
-#	libwmfun-0.0.3.tar.gz
+BUILT_SOURCES = config-paths.h

-WindowMaker.lsm: WindowMaker.lsm.in
-	size=`wc -c $(distdir).tar.gz|cut -d\  -f1`;\
-	size=`echo scale=2\;$$size/1048576|bc`;\
-	sed -e "s/VERSION/"$(VERSION)"/" \
-		-e "s/DATE/`date +%d%b%Y|tr a-z A-Z`/"\
-		-e "s/SIZE/$$size M/"\
-		WindowMaker.lsm.in > WindowMaker-$(VERSION).lsm
+DISTCLEANFILES = config-paths.h

+config.h: config-paths.h
+
+config-paths.h: Makefile
+	@echo "Generating $@"
+	@echo '/* define to the path to cpp */' > $@
+	@echo '#define CPP_PATH "$(CPP_PATH)"' >> $@
+	@echo '' >> $@
+	@echo '/* gettext domain used for menu translations */' >> $@
+	@if test -z "$(menutextdomain)"; then \
+	  echo '/* #undef MENU_TEXTDOMAIN "$(menutextdomain)" */' >> $@; \
+	else \
+	  echo '#define MENU_TEXTDOMAIN "$(menutextdomain)"' >> $@; \
+	fi
+	@echo '' >> $@
+	@echo '/* define an extra path for pixmaps */' >> $@
+	@echo '#define PIXMAPDIR "$(pixmapdir)"' >> $@
+	@echo '' >> $@
+	@echo '/* where shared data is stored */' >> $@
+	@echo '#define PKGDATADIR "$(datadir)/WindowMaker"' >> $@
+	@echo '' >> $@
+	@echo '/* where the configuration is stored */' >> $@
+	@echo '#define SYSCONFDIR "$(sysconfdir)"' >> $@
+
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = wrlib WINGs src util po WindowMaker WPrefs.app doc
+
+EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N INSTALL \
+	INSTALL-WMAKER README.definable-cursor \
+	The-perfect-Window-Maker-patch.txt \
+	README COPYING.WTFPL autogen.sh
+
+if USE_LCOV
+coverage-reset:
+	find . -type f -name '*.gcda' -exec rm -f '{}' ';'
+	lcov --directory . --zerocounters
+
+coverage:
+	rm -rf coverage @lcov_output_directory@
+	-mkdir -p coverage @lcov_output_directory@
+	lcov --compat-libtool --capture --directory . --output-file coverage/coverage.info
+	genhtml --output-directory @lcov_output_directory@ coverage/coverage.info
+
+.PHONY:	coverage-reset coverage
+endif
--- a/240
+++ b/240
@@ -2,34 +2,188 @@
 NEWS for veteran Window Maker users
 -----------------------------------

--- 0.81.0
+--- 0.94.0-crm
+
+New Resizing functionality
+--------------------------
+
+You can now use the mouse wheel and modifier keys to resize windows.
+MOD+Wheel will resize windows vertically and CTRL+Wheel will resize
+windows horizontally. MOD+CTRL+Wheel will resize both at the same time.
+The resize step, or increment can be set in WPrefs in the "Window Handling"
+page, or in the config file with "ResizeIncrement". If this intrudes into
+a specific application's functionality, you can disable it on an application-
+by-application basis by setting the "Do not bind mouse clicks" attribute in
+"Advanced Options".
+
+New Maximize functionality
+--------------------------
+
+Maximus/Maximumize. A new tiled maximization, configured with a keyboard
+shortcut. Using it will maximize the window to the greatest area such that it
+will not overlap any other window of the same workspace. This can be configured
+in WPrefs in the "Keyboard Shortcuts" page, or in the config file with
+"MaximusKey".
+
+Left/right maximization. Now wmaker supports maximizing a window to the
+left or right half of the screen, making it occupy 50% of the area. This is
+useful on widescreen displays where you want to bring up two windows side-by-
+side. The shortcut keys for this can be configured in WPrefs in the "Keyboard
+Shortcuts" page, or in the config file with "LHMaximizeKey" and "RHMaximizeKey"
+
+History and AutoComplete in the run dialog
+------------------------------------------
+
+The "Run..." dialog now autocompletes executables in your path (triggered by
+the TAB key) and records the history of past commands (last 500 by default).
+It can also complete folder names if you start the complete with a "/"
+To use it replace %a with %A in the "Run..." entry in your WMRootMenu file.
+See commit 05720d97076ffc1569e5 for more details.
+
+Automatic menu generator (wmgenmenu)
+-----------------------------------
+
+There is now a new utility to generate the Window Maker menu automatically,
+called wmgenmenu. It searches from a list of pre-defined applications the
+ones which exist in your $PATH and adds them to the corresponding submenus
+("Internet", "Terminals", "Editors" etc) of your WM menu. It also supports
+localization (currently English and German). You can use it like:
+
+$ wmgenmenu > WMRootMenu-new
+$ cp WMRootMenu-new $HOME/GNUstep/Defaults/WMRootMenu
+
+and WM will automatically detect the new menu file and use it without
+restarting wmaker (made possible by the 'inotify' mechanism)
+
+Automatic detection of menu changes (via inotify)
+-------------------------------------------------
+
+Window Maker now uses the 'inotify' mechanism from the linux kernel
+to automatically detect changes in the WMRootMenu file. So the
+--no-polling option is now gone and Window Maker does not wake up
+your CPU unnecessarily (0 wakeups when idle, instead of 4).
+So if you edit the WMRootMenu file by hand (or by using 'wmgenmenu'),
+there is no need to restart wmaker for the changes to take effect.
+
+DockApp recognition
+-------------------
+
+In addition to applications with only Withdrawn windows, Window Maker
+will now treat any application with its WM_CLASS res_class set as
+"DockApp". This provides an easy workaround for toolkits like gtk+ that
+do not allow creation of windows with the initial_state member of
+XWMHints set to WithdrawnState.
+
+
+--- 0.92.0
+
+GNUstep Installation Directory
+------------------------------
+
+WPrefs is now installed in /usr/local/bin and /usr/local/share by default.
+If you use GNUstep and want it to install in /usr/GNUstep/Applications,
+you may specify --with-gnustepdir=/usr/GNUstep
+If the GNUSTEP_LOCAL_ROOT environment variable is defined when configure is
+executed, it will be used (and you don't need to use --with-gnustepdir)
+
+Cached Pixmaps Directory
+------------------------
+
+The directory where Window Maker stores the cached application pixmaps for
+its later use has changed from ~/GNUstep/.AppInfo/WindowMaker to
+~/GNUstep/Library/WindowMaker/CachedPixmaps for better compatibility with
+the GNUstep path structure.
+Also WPrefs now stores internal data in ~/GNUstep/Library/WindowMaker/WPrefs
+(it was ~/GNUstep/.AppInfo/WPrefs before)
+
+X Input Methods support in WINGs
+--------------------------------
+
+Preliminary support for X Input Methods was added to textfield and text
+widgets in WINGs. Input for text in other languages than English should
+work now (except for kanji which will most likely not work, even though
+it wasn't tested).
+
+
+Disabling the switch panel
+--------------------------
+
+To disable the panel shown during Alt-tabbing, you may put the following in
+~/GNUstep/Defaults/WindowMaker
+
+SwitchPanelImages= None;
+
+
+
+--- 0.91.0
+
+Alt-Tab Window Switching
+------------------------
+
+You can change the appearance of the panel shown during Alt-Tab window switching
+with the SwitchPanelImages option:
+
+ (selected_icon_tile_image, background_image, width, height)
+
+selected_icon_tile_image is the image used to highlight the currently selected
+window icon. It must be 64x64 pixels.
+
+background_image is the image used in the background of the panel. It must
+be at least 64x80.
+
+width and height are the width and size of the central part of the image.
+When drawing the panel, the image will be split as:
+                           |W |
+			+--+--+--+
+			|  |  |  |
+			+--+--+--+ -
+			|  |  |  | H
+			+--+--+--+ -
+			|  |  |  |
+			+--+--+--+
+
+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 
+to use it.
+
+
+--- 0.90.0
+
+
+NetWM / EWMH Support
+--------------------
+
+Support for the EWMH standard has been added. Applications from GNOME 2.x and
+KDE 3.x should now interoperate better with Window Maker.
+
+Support for the obsolete/legacy GNOME 1.x, KDE 1.x and OpenLook(!) hints was
+wiped out for the sake of sanity.
+

 Antialiased font support
 ------------------------

-With the addition of support for antialiased fonts in the WINGs library, now
-Window Maker can also support antialiased fonts. However enabling them may
-prove not to be a trivial task to do. This is because enabling antialiased
-fonts doesn't depend solely on Window Maker and its configuration files. It
-also depends on the X server, the X server extension modules and their
-specific configuration files.
+With the addition of Xft2 support in the WINGs library, now
+Window Maker can display antialiased text with TrueType or any scalable fonts.

-For a description of all the steps required to get antialiased fonts on
-screen please check the README.antialiasing file which describes all the
-things you need to do on a step by step basis. In addition it has extra
-useful hints and idea to make your antialiased fonts look nice in different
-contexts.
+You can pick fonts for Window Maker in the Font configuration section of 
+WPrefs.

-After you have done all the steps described there, you can enable antialiased
-fonts either by adding AntialiasedText = Yes; in ~/GNUstep/Defaults/WindowMaker
-or by launching WPrefs and checking the "Smooth font edges" in the Expert User
-Preferences panel.
+Antialiased text is enabled by default, but can be disabled by adding

-As a general note you should always use a True Type font for your fonts if
-antialiasing is enabled, or alias a normal font to a True Type in the Xft
-configuration (read the details in README.antialiasing). Else you may get
-unepleasant results in the look of your screen :P
+AntialiasedText = NO; in ~/GNUstep/Defaults/WMGLOBAL

+This will disable antialiased text for any WINGs based application. If you
+only want to disable them for a specific application only, like WindowMaker
+for example, then add the same option in the applications configuration file,
+in this case ~/GNUstep/Defaults/WindowMaker
+For WindowMaker, this can also be achieved from the Expert panel in WPrefs.
+
+Note that bitmapped fonts look much better than TrueType when antialiasing is
+disabled.

 Global Submenus
 ---------------
@@ -54,6 +208,31 @@ or, in case you want a submenu:
 	("Blabla", EXEC, blabla)))


+UTF-8 Support
+-------------
+
+Window Maker now uses UTF-8 internally (and thus can display UTF-8 text
+in window titles and other places). Menus and po files must now be
+encoded in UTF-8. If your menus contain non ASCII characters, you can convert
+them to UTF-8 with the following command:
+
+iconv -f <current-file-encoding> -t utf-8 <filename> > <filename>.utf8
+
+For example:
+
+iconv -f iso-8859-1 -t utf-8 menu > menu.utf
+mv menu.utf menu
+
+
+Icon Panel for Alt-Tabbing
+--------------------------
+
+A panel with icons for the windows that you can switch to will appear
+when you press Alt-Tab. You can navigate through the windows with Alt-Tab
+(Alt-Shift-Tab) or with the left/right keys once the panel is shown.
+
+
+
 --- 0.80.0

 Shading/Unshading windows using mouse wheel on their titlebar
@@ -245,9 +424,10 @@ behavior regarding workspaces you can now (use WPrefs.app to do this).
 Client supplied icons
 ---------------------

-Window Maker saves the client supplied icons in ~/GNUstep/.AppInfo/WindowMaker
-in XPM format for later use when the app is no longer running (to have the
-image to display for docked icons for example).
+Window Maker saves the client supplied icons in 
+~/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 
+icons for example).

 Until recently the XPM images saved by Window Maker were incorrect, but a
 recent fix in the code to save XPM's fixed them. But with this fix, all
@@ -255,12 +435,12 @@ 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 
-and removing all references to icons in ~/GNUstep/.AppInfo/WindowMaker which
-can be annoying, new code was added to Window Maker to permit the regeneration
-of images in ~/GNUstep/.AppInfo/WindowMaker if they are missing.
+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 
+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
-delete all *.xpm files from ~/GNUstep/.AppInfo/WindowMaker. Next time the
+delete all *.xpm files from ~/GNUstep/Library/WindowMaker/CachedPixmaps. Next time the
 application that is supplying an icon image will start the icon will be
 recreated if missing, but this time it will be saved with the new XPM save
 code which produces good XPM images.
@@ -670,7 +850,7 @@ Themes

 Removed all themes from the source tree, and moved them in a separate package.
 You can download the new package from the same place as this package:
-ftp://ftp.windowmaker.org/pub/beta/srcs/
+ftp://ftp.windowmaker.info/pub/beta/srcs/
 Look after WindowMaker-extra-<version-number>.tar.gz
 Also WindowMaker-extra pack include the old WindowMaker-data.tar.gz which only
 contained icons.
@@ -765,7 +945,7 @@ libPropList

 WARNING!!! libPropList was removed from the Window Maker distribution
 and is being distributed separately. If you dont have it installed yet,
-get it from ftp.windowmaker.org/pub/libs and install before building
+get it from ftp.windowmaker.info/pub/libs and install before building
 Window Maker.


@@ -1126,7 +1306,7 @@ Persistent Program Suplied Icons

 Application supplied icons are now stored, so that the dock will keep
 showing them after the app is exited. The icons are stored at
-~/GNUstep/.AppInfo/WindowMaker/
+~/GNUstep/Library/WindowMaker/CachedPixmaps


 Sound support
--- a/244
+++ b/244
@@ -5,7 +5,6 @@
 		       	       X11 Window Manager

 			    <http://windowmaker.org>
-		 	 <ftp://ftp.windowmaker.org>

 				     by

@@ -41,25 +40,25 @@
 Description
 ===========

-Window Maker 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. It's
-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).
+Window Maker 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. It's 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).

 Window Maker was designed keeping integration with GNUstep in mind and is the
 "official" window manager for it. It is also part of the GNU project
 (www.gnu.org) Read more about GNUstep further on this file.

 Hints (information given by applications to integrate well with the window
-manager) for Motif(tm), OPEN LOOK(tm), KDE and GNOME are also supported. 
-So you can replace any of the window managers for these environments
-with Window Maker while keeping most, if not all, of the native window manager
-functionality.
+manager) for Motif(tm) and NETWM are also supported (NETWM is used by KDE and
+GNOME, so they are automatically supported as a result).  So you can replace any
+of the window managers for these environments with Window Maker while keeping
+most, if not all, of the native window manager functionality.

 Window Maker was previously called WindowMaker.

-Window Maker has no connection with Windowmaker, the software for
-making windows and doors.
+Window Maker has no connection with Windowmaker, the software for making windows
+and doors.


 Documentation
@@ -71,8 +70,8 @@ Read before asking.
 in the directories. 

 * INSTALL has installation instructions and some troubleshooting tips.
-You're meant to read it before installing. it was not written just to 
-fill up space in the package...
+You're meant to read it before installing. it was not written just to fill up
+space in the package.

 * FAQ: Frequently Asked Questions. READ IT!!! FAQ.I18N is for
 internationalization related questions.
@@ -80,14 +79,10 @@ internationalization related questions.
 * NEWS: list user visible changes from the previous version. Read it if
 you are upgrading.

-* MIRRORS: some alternative places where you can get Window Maker,
-including platform specific packages of Window Maker.
-
 * BUGFORM: use it to send bug reports. Please do use it.

 * ChangeLog: what changed from the previous version?

-
 * BUGS: list of known bugs

 *** Tutorial
@@ -101,8 +96,6 @@ http://www.linuxfocus.org/~georges.t/

 The Window Maker User's Guide can be downloaded from the official ftp
 or web sites.
-It can also be viewed in HTML format in:
-http://people.delphi.com/crc3419/WMUserGuide/index.htm

 The User Guide explains how to use Window Maker, the configuration files
 and options.
@@ -118,29 +111,29 @@ Directories & Files in the Source Tree
 ======================================

 * Install is a script for configuring and compiling Window Maker in a easy
-way (not that the normal way is difficult, but...).
+  way (not that the normal way is difficult, but...).

 * AUTHORS: the credits

 * TODO: plans for the future

 * contrib/ has some contributed patches that are not supported by Window Maker
-  because they conflict with design filosophies of the developers or some 
-  other reason.
+  because they conflict with design philosophies of the developers or some other
+  reason.

 * util/ has various utility programs.

 * WPrefs.app/ is the configuration program. 

 * src/wconfig.h has compile time options you can change to select some
-options/features and other stuff. 
+  options/features and other stuff.

 * WINGs/ NEXTSTEP lookalike widget library

 * wrlib/ image processing library

 * po/ has message catalogs wich are the translated versions of the messages
-displayed by Window Maker.
+  displayed by Window Maker.

 * docklib-x.x.tar.gz  a library for writing dockapps

@@ -149,137 +142,96 @@ HELP ME!!!
 ==========

 There is a mailing list for discussing Window Maker at
-wm-user@windowmaker.org To subscribe to it, send a message containing:
-	subscribe 
-in the subject of the message to wm-user-request@windowmaker.org
+wmaker-user@lists.windowmaker.org To subscribe to it, send a message to
+wmaker-user-subscribe@lists.windowmaker.info

-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 reports use the BUGFORM.
+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
+reports use the BUGFORM.

-If you have a problem with a precompiled version of Window Maker 
-(rpm, deb etc), first ask the person who made the package.
+If you have a problem with a precompiled version of Window Maker (rpm, deb etc),
+first ask the person who made the package.

-IMPORTANT NOTE: when asking for help (in the mailing list or to the
-developerts, directly) *always* send information about the system you are
-using. You can use the system information section at the end of BUGFORM as a
-guideline. Another thing: please don't send HTML mail.
+IMPORTANT NOTE: when asking for help (in the mailing list or to the developerts,
+directly) *always* send information about the system you are using. You can use
+the system information section at the end of BUGFORM as a guideline. Another
+thing: please don't send HTML mail.


-There is also a #windowmaker IRC channel at openprojects. To join there,
-connect your irc client to irc.openprojects.net, irc.linux.com or some other
-server of that network.
+There is also a #windowmaker IRC channel at freenode. To join there, connect
+your irc client to irc.freenode.net. irc.windowmaker.org will direct you to the
+correct IRC network.


 GNUstep
 =======

-GNUstep is a complete object-oriented development system, based on the
-OpenStep specification released by NeXT(tm) (now Apple(tm)) and Sun(tm). It
-will provide everything one needs to produce cross-platform, object-oriented,
-graphical (and non-graphical) applications; providing among other things,
-base system libraries, a high-level GUI application framework that uses a
-Display PostScript(tm)-like imaging model (DGS), objects for accessing
-relational databases, distributed objects and a graphical development
-environment, with tools like interface modeller, a project management system
-(project center) and other tools.
+GNUstep is a complete object-oriented development system, based on the OpenStep
+specification released by NeXT(tm) (now Apple(tm)) and Sun(tm). It will provide
+everything one needs to produce cross-platform, object-oriented, graphical (and
+non-graphical) applications; providing among other things, base system
+libraries, a high-level GUI application framework that uses a Display
+PostScript(tm)-like imaging model (DGS), objects for accessing relational
+databases, distributed objects and a graphical development environment, with
+tools like interface modeller, a project management system (project center) and
+other tools.

-The GNUstep development system will be used to create a user environment,
-with everything needed for a complete graphical user interface, such as a
-file viewer, text editors and other applications. Note that the user
-environment (or "desktop environment") is only a small part of the whole
-GNUstep project and therefore it does not "compete" with other projects like
-KDE or GNOME, simply because they are completely different things.
+The GNUstep development system will be used to create a user environment, with
+everything needed for a complete graphical user interface, such as a file
+viewer, text editors and other applications. Note that the user environment (or
+"desktop environment") is only a small part of the whole GNUstep project and
+therefore it does not "compete" with other projects like KDE or GNOME, simply
+because they are completely different things.

 For more information on the GNUstep project, visit: http://www.gnustep.org
-and http://gnustep.current.nu


 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 behaviour when Window Maker
-updates it's configuration files.
+from the same user (so that wmaker will use the same configuration files) at the
+same time. You might get unexpected behaviour when Window Maker updates it's
+configuration files.

-If you really desire to do this, try running Window Maker with the 
-command line option --static so that it will not update or change
-any of the configuration files.
-
-Sound support
-=============
-
-Sound is supported for Linux and FreeBSD systems with the use of a
-separately distributed module called WSoundServer. There is also a graphical
-configuration tool for setting up your sounds called WSoundPrefs.
-You can download these at:
-http://shadowmere.student.utwente.nl/
-
-Note that you must compile Window Maker with the --enable-sound configure
-flag and set the DisableSound option to NO.
-
-
-OpenL**k support
-================
-
-I guess many users, mainly from the academic world, have to use
-applications written using the OpenL**k toolkits, so having support
-for these apps must be of some use.
-
-To enable, use --enable-openlook when doing the configure. Note that
-not everything is implemented. 
-
-Implemented stuff include decoration hints and the push-pin. Not implemented
-stuff include _SUN_WINDOW_STATE (the compose led state stuff), drag and drop
-interest stuff, header (not sure what's it) and footer strings.
-
-Please give me feedback if something doesn't work. If the feature is
-already implemented, but is not working because of a bug, I'll try to
-have that fixed. If it's a non-implemented feature and you mention that
-it's important (ie: not just cosmetical), I'll consider implementing it.
-
-The "out" state of the pushpin is emulated as a pushed-in close button.
-Just click on the button to make it pushed-out, which corresponds
-to the pinned-in state of the pushpin. If you push again in the pushed-out
-close button, it will act as a normal close button: it will close the window.
+If you really desire to do this, try running Window Maker with the command line
+option --static so that it will not update or change any of the configuration
+files.


 Performance Tuning
 ==================

 If you want to diminish Window Maker's memory usage and improve performance,
-while keeping a nice appearance and good functionality, follow the items
-bellow:
+while keeping a nice appearance and good functionality, follow the items bellow:

- use solid textures for everything, mainly titlebars and menus. If you
-  want a nice looking desktop, use the Traditional style.
+- use solid textures for everything, mainly titlebars and menus. If you want a
+  nice looking desktop, use the Traditional style.
 - turn NewStyle and Superfluous off
- do not bind many shortcuts in the menu and keep only the essential items
-  in the menu
+- do not bind many shortcuts in the menu and keep only the essential items in
+  the menu
 - turn on DisableClip
- edit wconfig.h and disable the NUMLOCK_HACK and the features you
-  don't use anyway (keep in mind that some of the #defines might not
-  work, as they are not fully supported). Make sure to always keep
-  NumLock and ScrollLock turned off.
+- edit wconfig.h and disable the NUMLOCK_HACK and the features you don't use
+  anyway (keep in mind that some of the #defines might not work, as they are not
+  fully supported). Make sure to always keep NumLock and ScrollLock turned off.
 - turn on DisableAnimations. You can also #undefine ANIMATIONS in wconfig.h
 - strip down the default IconPath and PixmapPath entries to contain only 
  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 it's value to a value like the number of different
-  icons you use. Also, disable anti-aliased text support in ~/GNUstep/Defaults/WMGLOBAL.
+  environment variable to 0. If you want to increase performance at the cost of
+  memory usage, set it's value to a value like the number of different icons you
+  use. Also, disable anti-aliased text support in ~/GNUstep/Defaults/WMGLOBAL.


 Keyboard Mouse Control
 ======================

-Many people ask about adding keyboard control of mouse, like in fvwm,
-but Window Maker will not have such feature. The XKB extension supports
-mouse simulation from the keyboard, in a much more powerfull fashion than
-any simulation done by a window manager. 
+Many people ask about adding keyboard control of mouse, like in fvwm, but Window
+Maker will not have such feature. The XKB extension supports mouse simulation
+from the keyboard, in a much more powerfull fashion than any simulation done by
+a window manager.

 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.
@@ -307,28 +259,27 @@ milleage may vary.
 How to make a gdb backtrace
 ===========================

-Backtraces can help us fix bugs that make Window Maker crash. If you
-find a bug that crashes Window Maker, please send a backtrace with your
-bug report.
+Backtraces can help us fix bugs that make Window Maker crash. If you find a bug
+that crashes Window Maker, please send a backtrace with your bug report.

-To make a usefull backtrace, you need a core file with debugging
-information produced by Window Maker when it crashes. It should 
-have been installed without stripping too. 
+To make a usefull backtrace, you need a core file with debugging information
+produced by Window Maker when it crashes. It should have been installed without
+stripping too.

 To compile wmaker with debugging information:

-./configure
-make CFLAGS=-g
+  ./configure
+  make CFLAGS=-g

-If you get the dialog window telling you that wmaker crashed and 
-asks you what to do, tell it to "Abort and leave a core file".
+If you get the dialog window telling you that wmaker crashed and asks you what
+to do, tell it to "Abort and leave a core file".

-script
-cd src
-gdb .libs/wmaker path_to_the_core_file
+  script
+  cd src
+  gdb .libs/wmaker path_to_the_core_file

-Then, in the gdb prompt type "bt". Quit from gdb by typing "quit"
-and then, in the shell prompt, type "exit".
+Then, in the gdb prompt type "bt". Quit from gdb by typing "quit" and then, in
+the shell prompt, type "exit".

 The file named typescript will contain the backtrace.

@@ -337,20 +288,19 @@ The file named typescript will contain the backtrace.
 Copyrights & Disclaimers
 ========================

-Window Maker is copyrighted by Alfredo K. Kojima and is licensed through the
-GNU General Public License. Read the COPYING file for the complete license.
+Window Maker is copyrighted by Alfredo K. Kojima and is licensed through the GNU
+General Public License. Read the COPYING file for the complete license.

 The icons that are distributed with this program and were made by Marco van
 Hylckama Vlieg, are licensed through the GNU General Public License. Read the
 COPYING file for the complete license.

-The icons listed in COPYING.WTFPL and are distributed in this 
-program and were made by Banlu Kemiyatorn (]d), are licensed through the
-"do What The Fuck you want to Public License". Read the COPYING.WTFPL
-file for the complete license.
+The icons listed in COPYING.WTFPL and are distributed in this program and were
+made by Banlu Kemiyatorn (]d), are licensed through the "do What The Fuck you
+want to Public License". Read the COPYING.WTFPL file for the complete license.

-NeXT, OpenStep and NEXTSTEP are a trademarks of NeXT Computer, Inc.
-All other trademarks are property of their respective owners.
+NeXT, OpenStep and NEXTSTEP are a trademarks of NeXT Computer, Inc.  All other
+trademarks are property of their respective owners.

 The authors reserve the right to make changes in the software without prior
 notice.
@@ -359,19 +309,19 @@ notice.
 Authors
 =======

-Alfredo K. Kojima <kojima@windowmaker.org>
-Dan Pascu <dan@windowmaker.org>
-]d <id@windowmaker.org>
+Alfredo K. Kojima <kojima@windowmaker.info>
+Dan Pascu <dan@windowmaker.info>
+]d <id@windowmaker.info>

-Please don't ask us questions before reading the documentation (esp. the
-FAQ, this file and INSTALL files) and about "cool" things you see in
-people's desktop screenshots.
+Please don't ask us questions before reading the documentation (esp. the FAQ,
+this file and INSTALL files) and about "cool" things you see in people's desktop
+screenshots.


 The AUTHORS file contains a list of the people who have contributed to the
-project. The name of people who have helped with localization (translation)
-can be found in po/README and Window Maker/README
+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 developers@windowmaker.org
+to wmaker-dev@lists.windowmaker.org

--- a/README.GNOME
+++ b/README.GNOME
@@ -1,53 +0,0 @@
-
-Information on Using Window Maker with GNOME
--------------------------------------------
-
-
-Status of GNOME support
-----------------------
-
-
-GNOME window manager protocols seem to be a work in progress.
-Things still change fairly frequently, so, the stuff implemented
-may not reflect the latest protocol. If something doesn't work, 
-that's probably because the protocols have changed again and I still
-didn't have time to reimplement everything or noticed that it
-changed.  If that happens, please tell me exactly what doesn't work.
-
-Other than that, the so called "GNOME Window Manager Compliance - How to
-write a GNOME compliant Window Manager" document, says this:
-
-	"There are currently a set of other hints available that are, at the
-	current time, not essential and therefore not documented here. It is,
-	however envisaged that they will be finalized and added to this
-	document, but for now are not needed."
-
-Since they are non-essential and undocumented they are not yet implemented.
-
-
-Implemented stuff:
-
- GNOME window manager hints
- Motif window manager hints
-
-On the works:
-
- R6 style session management
-
-
-Compilation/Installation
------------------------
-
-To compile Window Maker with GNOME support, just configure it as:
-./configure --enable-gnome
-
-before compiling.
-
-Also, do not disable mwm hints support (they are enabled by default).
-
-
-Configuration
-------------
-
-In WPrefs, go to the last section and toggle the "Disable miniwindows" option.
-
--- a/README.KDE
+++ b/README.KDE
@@ -1,125 +0,0 @@
-
-
-Information on Using Window Maker with KDE
------------------------------------------
-
-
-Window Maker supports almost all KDE/KWM specific client
-communication protocols, so you can simply replace kwm with 
-Window Maker, if you think these advantages are worthy:
-
-		Window Maker			KWM
-=============================================================================
-Looks		NEXTSTEP(tm)/NEXTSTEP(tm) 	Original, but reminds
-				enhanced	Windows(tm)
-
-Decoration	solid, gradient, multi-color	solid, vertical and
-Textures	gradient, pixmaps, textured	horizontal gradient,
-		gradient - all gradients are	pixmap
-		supported in horizontal,
-		vertical and diagonal 
-		directions
-
-Configurable	No				Yes, but not totally
-Titlebar Buttons
-
-Mini CLI        Yes, but limited                Yes
-
-Window Specific	Yes				In KDE 1.1, yes.
-Configuration                                   In KDE 1.0, no.
-
-Quick Keyboard	Yes				In KDE 1.1, yes
-Navigation                                      In KDE 1.0, no.
-
-Pager		KDE pagers will work as 	Yes
-		well as GNOME pagers
-
-Session		Not yet supported, but		Yes, old (pre-X11R6) style
-Management	X11R6 style SM is being worked.
-
-Dock		kpanel, GNOME panel and Dock	kpanel
-
-Built-in	Yes				No
-    krootbgwm
-
-GNOME support	Yes				No
-
-Memory Usage(1)	1.85Mb		 		In KDE 1.0, 3.13Mb
-						In KDE 1.1, probably more
-
-
-(1) Memory usage was tested by running wmaker and kwm at the same machine
-with the same windows, on the same screen and similar window texture
-configurations (at different times, of course). I looked in the output of
-ps -m, in the SIZE field, right after starting the window managers.
-
-
-
-Enabling KDE Support
--------------------
-
-To enable KDE support in Window Maker, you must compile it after
-configuring it as follows:
-./configure --enable-kde
-
-Then, just replace kwm with wmaker in your startkde script.
-If you are going to use Window Makers sound server, comment out
-kwmsound in startkde.  Also if wmaker sets your root window
-background, comment out kbgndwm, kde's wallpaper setter.
-
-Make sure to disable workspace background setting in KDE. If you
-wont be using Window Maker themes anyway, you can set
-WorkspaceBack = (none);
-
-in ~/GNUstep/Defaults/WindowMaker
-
-
-Enhancing Integration
---------------------
-
-Window Maker adds some extensions to KDE's messaging stuff, so you can run
-Window Maker specific commands from places like kpanel, krootwm or even
-kwmcom. Recently KDE developers have kindly added support for these extensions
-in the more recent KDE versions from CVS. The added stuff are the following 
-kwm like commands:
-
-wm:wmaker - select Window Maker support mode
-wmaker:info - show info panel
-wmaker:legal - show legal panel
-wmaker:arrangeIcons - arrange icons
-wmaker:showAll - show all windows
-wmaker:hideOthers - hide others
-wmaker:restart - restart wmaker
-wmaker:exit - exit wmaker
-
-You can test them with kwmcom, like:
-kwmcom wmaker:info
-
-
-Problems
--------
-
-* kpanel will not be kept always on top. That's because kpanel is an
-OverrideRedirect window, so Window Maker can't do anything about that.
-
-Before requesting for a hack to work around that in Window Maker, please
-request the kpanel author to fix it.
-
-* because the KDE protocol for letting the window manager know the usable
-window region is broken, you might find some problems with the window
-positioning/maximization code and kpanel's position.
-
-* It seems kpanel (and maybe KDE in general) doesn't like dynamically
-changing the number of workspaces. So, don't create or destroy workspaces
-while running on KDE, unless you really need.
-
-* If kpanel, kwmpager or kpager becomes confused about the number of
-windows present, restart them.
-
-* Wmaker opens windows by default under/over the panel, when the panel is
-at top or left of screen.  Use the GUI configuration tool WPrefs to change
-this.
-
-* Some commands, such as cascade windows and rearrange windows are not
-yet implemented.
-
--- a/README.antialiasing
+++ b/README.antialiasing
@@ -1,154 +0,0 @@
-
-Here is a step by step mini-HOWTO of the things needed to be done to get
-antialiased fonts in Window Maker quickly:
-
-1. Make sure you have a recent XFree server (4.x or newer, but 4.2.x or newer
-   is preferable). Also make sure it supports the RENDER extension (you can
-   see this in the output of xdpyinfo) and it has the freetype extension
-   module (you should have a /usr/X11R6/lib/modules/fonts/libfreetype.a file).
-2. Make sure you have the following lines in your XF86Config file in the
-   "Module" section:
-     Load "type1"
-     Load "freetype"
-     Load "extmod"
-   (Not sure if extmod is really required for antialiased fonts, but it won't
-    hurt).
-3. Install some True Type fonts say in /usr/X11R6/lib/X11/fonts/TrueType
-4. To generate the fonts.scale and fonts.dir files in the directory where the
-   True Type fonts were installed you need an utility named ttmkfdir. There is
-   also an utility named mkttfdir but that only supports ISO8859-1 and JIS
-   encodings. From my experience ttmkfdir will recognize more fonts and works
-   better so I recommend using this one. You should issue these commands to
-   generate the fonts.scale and fonts.dir files:
-     cd /usr/X11R6/lib/X11/fonts/TrueType
-     ttmkfdir -o fonts.scale
-     mkfontdir
-5. Now add /usr/X11R6/lib/X11/fonts/TrueType to your font path in the
-   XF86Config file. It goes in the "Files" section as:
-     FontPath "/usr/X11R6/lib/X11/fonts/TrueType"
-   I recommend to put this at the top of your font path list.
-6. You can restart the X server at this point, to make all these changes take
-   effect.
-7. Edit your /etc/X11/XftConfig file (or ~/.xftconfig if you don't have
-   access to edit the global file). Make sure that the True Type font path is
-   _before_ the Type1 font path. You should have something like this:
-     dir "/usr/X11R6/lib/X11/fonts/TrueType"
-     dir "/usr/X11R6/lib/X11/fonts/Type1"
-   If you add extra True type paths, add them before the Type1 path
-   If the Type1 path is first, and the Xft library fails to find/load the font
-   you asked for, it will load some very ugly defaults.
-   A sample XftConfig file is included with the Window Maker source at
-   toplevel as Sample.XftConfig. You can use that as reference and for ideas.
-8. Compile and install Window Maker. No special switches are needed. However
-   watch the ./configure output and check if it says that Antialiased text
-   support is enabled in WINGs. If not, probably it failed to find libXft.
-   Check that you have the development files for your X server installed.
-9. Edit ~/GNUstep/Defaults/WMGLOBAL and add entries for the following:
-     AntialiasedSystemFont = "-*-trebuchet ms-medium-r-normal-*-%d-*-*-*-*-*-*-*";
-     AntialiasedBoldSystemFont = "-*-trebuchet ms-bold-r-normal-*-%d-*-*-*-*-*-*-*";
-     AntialiasedText = Yes;
-   Use a font that you have installed on your system (arial and "trebuchet ms"
-   are good choices).
-   If AntialiasedText is enabled in WMGLOBAL, all WINGs based application will
-   use antialiased fonts by default (this includes Window Maker).
-   You can then disable the antialiased fonts on the per application basis by
-   adding an AntialiasedText = No; entry in their specific configuration files
-   The entry in the application's configuration file will always overwrite the
-   global setting from WMGLOBAL.
-   However if you want most of your WINGs applications to use normal fonts,
-   but just a few to use antialiased fonts, then put AntialiasedText = No; in
-   WMGLOBAL, and enable antialiased fonts only in the applications you want,
-   by adding the AntialiasedText = Yes; in their own configuration files
-
-At this point all WINGs based application should be able to use antialiased
-fonts. You can check this by enabling antialiasing and starting WPrefs. It
-should show nice antialiased text everywhere.
-
-Now to enable antialiased fonts in Window Maker, there are 2 possibilities:
-
-10a. Add entries for all font options in ~/GNUstep/Defaults/WindowMaker
-     containing True Type fonts ("trebuchet ms", arial or verdana should work
-     fine). Don't use non True Type fonts like Helvetica, because Xft won't
-     load them, instead will load some defaults. Depending on the TrueTupe vs
-     Type1 path order in your XftConfig file and the options declared there,
-     it can range from "Extremely ugly" (if path to Type1 is before the path
-     to True Type fonts), to "Acceptable" (if the True Type path comes first).
-     Also modify all your themes to hold True Type fonts for all the font
-     options
-
-10b. Leave the fonts as they are (for example leave the default Helvetica) in
-     ~/GNUstep/Defaults/WindowMaker, and add an alias (or more) in the 
-     XftConfig file. This alias should look something like:
-       match any family == "Helvetica"         edit family += "Trebuchet MS";
-       match any family == "Courier"           edit family += "Courier New";
-       ...
-     Which means that every time the Xft library (which is used the WINGs) gets
-     a request to load a Helvetica font, it will load the "trebuchet ms" font
-     instead, keeping all the other font parameters unchanged.
-
-Each of these 2 methods have advantages and disadvantages.
-
-Case 10a:
---------
-With the first method, you do more work and you will not be able to use
-existing themes by just enabling antialiasing, because it will load default
-fonts which may not look as you want. You will need to change the fonts in
-every theme you want to use by replacing them with True Type fonts.
-
-If you plan to switch antialiasing on/off, this method has a big disadvantage:
-you need to edit your configuration/themes with every switch (at least if you
-want Helvetica or other Type1 font for the non-antialiased case). This is
-because if you have a font set to (say) Arial and want to switch antialiasing
-off, you will get the normal version of Arial and you need to edit your font
-options again to see Helvetica.
-If you are happy with how the non-antialiased version of your True Type fonts
-looks this disadvantage goes away. In this case you will use the same font
-(say arial) with both antialiased/normal fonts.
-
-OTOH this method gives you fine tune over the fonts used in Window Maker and
-you will be able to set each individual font as you like. 
-
-Case 10b:
---------
-With the second method, you have almost nothing to do. Just define the proper
-aliases in the XftConfig file, and whenever some of the fonts you aliased is
-requested  it's True Type alias will be loaded. 
-This way you can use all your old themes and all you have to do except adding
-the aliases to the XftConfig file, is to enable or disable antialiasing the
-the configuration file.
-
-For example if Helvetica is aliased to Arial, if you have antialiasing
-disabled, Helvetica will be used, but if you enable antialiasing Arial will
-be used instead. This method is very handy if you want to use existing themes
-you don't want to modify, or if you want to switch antialiasing on/off and
-don't want to edit your font options with every such switch.
-
-The downside of this method is that if you don't have some font aliased in
-the XftConfig file, it will load some default instead.
-Also another downside is that you cannot fine tune your fonts. They will be
-translated by the alias rules in XftConfig from whatever they are defined in
-the theme. Sometimes this is not optimal.
-
-For example if you aliased Helvetica to "Trebuchet MS" and all your screen
-fonts are Helvetica (at different sizes). With antialiasing disabled the
-Helvetica fonts everywhere looks good. However with antialiasing enabled the
-10pt font used by the miniwindow titles looks better if Arial is used. Also
-the 10pt font used by the clip looks better with Verdana. Same for the 12pt
-font used by balloons which is also better if Arial is used. But with this
-method you cannot do such fine tuning, unless you edit your font options in
-the Window Maker configuration file, in which case there will be a mix of the
-2 methods.
-
-11. At this point if all was properly done, all you have to do is either add
-    an AntialiasedText = Yes; entry to ~/GNUstep/Defaults/WindowMaker, or
-    start WPrefs, goto the Expert Settings panel, and check the 
-    "Smooth font edges" option. Currently you need to restart if you switch 
-    antialiasing on/off (this may change in the future)
-
-
-Final note: antialiased text only looks good if a True Type font is
-used for it. Either by directly specifying it, or providing an alias in
-the XftConfig file. The idea is that the font Xft loads (after all the
-aliases have beed resolved) should point to a True Type font. Else
-unpleasant results may show on your screen :P
-
--- a/README.es
+++ b/README.es
@@ -1,370 +0,0 @@
-
-
-
-		       		GNU Window Maker
-		       	       X11 Window Manager
-
-	  	   	   <http://windowmaker.org>
-		 	 <ftp://ftp.windowmaker.org>
-
-				     por
-
-		      	     Alfredo K. Kojima 
-
-			 	 Dan Pascu
-
-				    ]d
-
-
-			       Web/FTP Master
-
-			       Phillip Smith
-
-
-
-		¡Felicitaciones! Ha adquirido un dispositivo
-	excelentísimo que le proporcionará miles de años de uso sin
-	problemas, si no fuera porque indudablemente lo destruirá a
-	través de alguna maniobra estúpida típica de consumidor. Por
-	eso le pedimos por EL AMOR DE DIOS LEA ESTE MANUAL DEL
-	PROPIETARIO CUIDADOSAMENTE ANTES DE DESEMPAQUETAR EL
-	DISPOSITIVO. ¿YA LO DESEMPAQUETÓ, NO?  LO DESEMPAQUETÓ Y LO
-	ENCHUFÓ Y LO ENCENDIÓ Y TOQUETEÓ LAS PERILLAS, Y AHORA SU
-	CHICO, EL MISMO CHICO QUE UNA VEZ METIÓ UNA SALCHICHA EN SU
-	VIDEOCASETERA Y ACCIONÓ "AVANCE RÁPIDO", ESTE CHICO
-	TAMBIÉN ESTÁ TUOQUETEANDO LAS PERILLAS, ¿CIERTO? Y RECIÉN
-	AHORA ESTÁ COMENZANDO A LEER LAS INSTRUCCIONES, ¿¿¿CIERTO???
-	NOSOTROS PODRÍAMOS SIMPLEMENTE ROMPER ESTOS DISPOSITIVOS EN LA
-	FÁBRICA ANTES DE DESPACHARLOS, ¿SABE?
-				-- Dave	Barry, "¡Lea Esto Primero!"
-
-
-Descripción
-===========
-
-Window Maker es el gestor de ventanas GNU para el Sistema de Ventanas X. Fue
-diseñado para emular la apariencia y funcionalidad de parte del GUI de NEXTSTEP(mr).
-Procura ser relativamente rápido y pequeño, rico en características, fácil de configurar
-y usar, con una simple y elegante apariencia sacada desde NEXTSTEP(mr).
-
-Window Maker fue diseñado teniendo en mente la integración con GNUstep y por eso
-es el gestor de ventanas "oficial". Es también parte del proyecto GNU (www.gnu.org)
-. Lea mas sobre GNUstep más adelante en este archivo.
-
-
-Pistas (información dada por las aplicaciones para integrarse bien con el gestor de
-ventanas) para Motif(tm), OPEN LOOK(tm), KDE y GNOME también son soportados. 
-Entonces puede reemplazar cualquiera de los gestores de ventana para estos entornos
-con Window Maker manteniendo la mayoría, si no todo, de la funcionalidad del
-gestor de ventanas nativo.
-
-Window Maker antes se llamaba WindowMaker.
-
-Window Maker no tiene relación con Windowmaker, el software para
-hacer ventanas y puertas.
-
-
-Documentación
-=============
-
-Lea antes de preguntar.
-
-* Los archivos README distribuidos por todas partes del árbol de fuentes 
-contienen información relacionada al contenido en los directorios. 
-
-* INSTALL tiene instrucciones de instalación y algunos consejos cuando tenga
-algún problema. Significa que debería leerlo antes de la instalación.
-No fue escrito solo para ocupar espacio en el paquete...
-
-* FAQ: Preguntas Frecuentes. LEALO!!! FAQ.I18N es para
-preguntas relacionadas con la internacionalización.
-
-* NEWS: lista los cambios visibles por el usuario desde la versión anterior. 
-Léalo si está actualizando.
-
-* MIRRORS: algunos lugares alternativos donde puede obtener Window Maker, 
-incluyendo paquetes de Window Maker específicos para ciertas plataformas.
-
-* BUGFORM: uselo para enviar reportes de errores. Por favor uselo.
-
-* ChangeLog: ¿que cambió desde la versión anterior?
-
-* BUGS: lista de errores conocidos.
-
-*** Tutorial
-
-Hay un tutorial mantenido por Georges Tarbouriech en:
-
-http://www.linuxfocus.org/~georges.t/
-
-*** Guía del Usuario
-
-La Guía del Usuario de Window Maker puede ser bajada desde el ftp oficial
-o por sitios web.
-Puede también ser vista en formato HTML en:
-
-http://people.delphi.com/crc3419/WMUserGuide/index.htm
-
-La Guía del Usuario explica como usar Window Maker, los archivos de configuración 
-y opciones.
-
-*** man pages
-
-Tipee "man wmaker" en el prompt del shell para obtener ayuda general sobre Window Maker.
-
-
-Directorios y Archivos en el Árbol de Fuentes
-=============================================
-
-* Install es un script para configurar y compilar Window Maker de una forma
-fácil (no es que la forma normal sea difícil, pero...).
-
-* AUTORES: los créditos
-
-* TODO: planes para el futuro.
-
-* contrib/ tiene algunos parches aportados que no están soportados por Window Maker
-  porque entran en conflicto con la filosofía de diseño de los desarrolladores o por
-  alguna otra razón.
-
-* util/ tiene varios programas utilitarios.
-
-* WPrefs.app/ es el programa de configuración.
-
-* src/wconfig.h posee opciones de compilación que puede cambiar para 
-  seleccionar algunas opciones/caracteristicas y otras cosas.
-
-* WINGs/ biblioteca widget para imitación de NEXTSTEP.
-
-* wrlib/ biblioteca de procesamiento de imagen.
-
-* po/ posee catálogos de mensajes  que son las versiones traducidas de los mensajes
-mostrados por Window Maker.
-
-* docklib-x.x.tar.gz es una biblioteca para escribir dockapps.
-
-SOCORRO!!!
-==========
-
-Hay una lista de correo para discutir sobre Window Maker en
-wm-user@windowmaker.org. Para suscribirse, envie un mensaje que contenga:
-
-	subscribe
-en el tema del mensaje a wm-user-request@windowmaker.org
-
-Si tiene algun problema, pregunte aquí (después de leer los docs, por supuesto). Es
-más probable que las personas de la lista sepan contestar sus preguntas
-que nosotros. Para reportes de errores use el BUGFORM.
-
-Si tiene un problema con una versión precompilada de Window Maker 
-(rpm, deb etc), primero pregunte a la persona que hizo el paquete.
-
-NOTA IMPORTANTE: cuando pida ayuda (en la lista de correo o a los desarrolladores,
-directamente) *siempre* envie información sobre el sistema que está usando. Puede
-usar la sección de información del sistema al final del BUGFORM como una guía. 
-Otra cosa: por favor no envie correo HTML.
-
-También hay un canal de IRC #windowmaker en openprojects. Únase aquí, 
-conecte su cliente de irc a irc.openprojects.net, irc.linux.com o algún otro
-servidor de esa red.
-
-GNUstep
-=======
-
-GNUStep es un completo sistema de desarrollo orientado a objetos, basado en la 
-especificación OpenStep liberada por NeXT(tm) (ahora Apple(tm) y Sun(tm)). Ello
-proveerá todo lo que se necesita para producir aplicaciones multiplataforma, 
-orientadas a objetos, gráficas (y no gráficas); suministrando dentro de otras cosas,
-bibliotecas base del sistema, una estructura de alto nivel para aplicaciones GUI que
-usan un modelo de imagenes de tipo Display PostScript(tm) (DGS), objetos para acceso
-a bases de datos relacionales, objetos distribuidos y un entorno de desarrollo gráfico,
-con herramientas como un modelador de interfaces, un sistema para administración del 
-proyecto (central de proyecto) y otras herramientas.
-
-El sistema de desarrollo de GNUStep será usado para crear un entorno de usuario,
-con todo lo necesario para una completa interface gráfica de usuario, tal como 
-un visualizador de archivos, editores de texto y otras aplicaciones. Note que el
-entorno de usuario (o "entorno de escritorio") es solo un pequeña parte de todo
-el proyecto GNUStep y por lo tanto no "compite" con otros proyectos como KDE o GNOME,
-simplemente porque son cosas completamente diferentes.
-
-Para más información sobre el proyecto GNUStep, visite: http://www.gnustep.org y
-http://gnustep.current.nu
-
-
-Ejecutando multiples instancias de Window Maker
-===============================================
-
-No es una buena idea eejcutar más de una instancia de Window Maker desde
-el mismo usuario (ya que wmaker usará los mismos archivos de configuración)
-al mismo tiempo. Podría obtener un comportamiento inesperado cuando Window
-Maker actualiza sus archivos de configuración.
-
-Si de verdad desea hacer esto, intente ejecutar Window Maker con la opción
-de linea de comando --static ya que así no actualizará o cambiará ninguno de los
-archivos de configuración.
-
-Soporte para Sonido
-===================
-
-El sonido es soportado por los sistemas Linux y FreeBSD con el uso de 
-un módulo distribuido separadamente llamado WSoundServer. Hay también 
-una herramienta de configuracion gráfica para definir sus sonidos llamada
-WSoundPref.
-Puede bajar esto en:
-http://shadowmere.student.utwente.nl/
-
-Note que debe compilar Window Maker con el parámetro --enable-sound
-y definir la opción DisableSound a NO.
-
-Soporte para OpenL**k
-=====================
-
-Calculo que muchos usuarios, principalmente del mundo académico, 
-tienen que usar aplicaciones escritas usando los toolkits OpenL**k,
-así que tener soporte para estas aplicaciones debe ser de algún uso.
-
-Para activarlo, use  --enable-openlook al hacer el configure. Note que
-no todo está implementado.
-
-Las cosas implementadas incluyen consejos de adorno y el push-pin. Las cosas 
-no implementadas incluyen _SUN_WINDOW_STATE (la cosa compuesta que lleva el estado),
-cosas que interesan sobre arrastrar y soltar, cabecera (no estoy seguro de que sea así)
-y cadenas footer.
-
-Por favor hágame saber si algo no funciona. Si la característica ya está implimentada,
-pero no funciona por un error, intentaré arreglarlo. Si esta es una característica no
-implementada y menciona que es importante (obs: no solo superficial), consideraré 
-implementarlo.
-
-El estado "out" del pushpin es emular un botón presionado. Solo cliquee 
-en el botón para hacer que se libere, lo cuál corresponde al estado 
-pinned-in del pushpin. Si pulsa otra vez en el boton liberado, servirá de
-botón normal de cerrado: cerrará la ventana.
-
-
-Ajuste de Rendimiento.
-=====================
-Si quiere disminuir el uso de memoria por parte de Window Maker y mejorar el 
-rendimiento, manteniendo una linda apariencia y buena funcionalidad, siga los
-items de abajo:
-
- use texturas sólidas para todo, principalmente barras de título y menúes.
-  Si quiere un escritorio de aspecto lindo, use el estilo Tradicional.
- Apague NewStyle y Superfluous
- No una muchos atajos al menú y mantenga solo los items esenciales en el menú.
- Active DisableClip
- edite wconfig.h y desactive el NUMLOCK_HACK y lo mismo con las características
-  que no use (tenga en mente que algunos de los #defines podrían no funcionar,
-  ya que ellos no están completamente soportados). Asegúrese de mantener siempre
-  Numlock y ScrollLock apagados.
- Active DisableAnimations. Puede también #undefine ANIMATIONS en wconfig.h
- quite las entradas por defecto IconPath y PixmapPath para contener solo las
-  rutas que en verdad tiene en su sistema.
- no use imágenes grandes en el fondo raíz.
- quite el soporte para los formatos de imagen que no use.
- para reducir el uso de la memoria, desactive el caché de ícono, definiendo 
-  la variable de entorno RIMAGE_CACHE a 0. Si quiere aumentar el rendimiento 
-  a expensas del uso de la memoria, defina este valor a un valor igual al 
-  número de íconos distintos que use.
-
-Control del Mouse por Teclado
-=============================
-
-Muchas personas preguntan sobre agregar control por teclado al mouse, como
-en fvwm, pero Window Maker no tendrá tal característica. La extensión XKB 
-soporta simulación de mouse desde el teclado, de una manera mucho más poderosa
-que cualquier otra simulación hecha por un administrador de ventanas.
-
-Para activarlo, presione la combinación de teclas Control+Shift+NumLock o 
-Shift+NumLock. Debiera escuchar el beep del parlante. Para desactivarlo,
-haga lo mismo.
-
-Para controlar el mouse el teclado numérico se usa así:
- 4 (flecha izquierda), 7 (Home), 8 (flecha arriba), 9 (PgUP), 6 (flecha derecha),
-  3 (PgDn), 2 (flecha abajo) y 1 (Fin) mueve el mouse a la correspondiente 
-  dirección;
- sosteniendo una de las teclas de arriba y luego sosteniendo la tecla 5 moverá
-el puntero más rápido;
- / seleccionará el primer botón del mouse (botón izquierdo);
- * seleccionará el segundo botón del mouse (botón del medio);
- - seleccionará el tercer botón del mouse (botón derecho);
- 5 hará un click con el botón actualmente seleccionado del mouse;
- + hará un doble click con el botón actualmente seleccionado;
- 0 (Ins) cliqueará y mantendrá el botón seleccionado actualmente;
- . (Del) liberará el botón seleccionado actualmente que fue anteriormente
-  cliqueado con la tecla 0 (Ins).
-
-Los valores anteriores de las teclas funcionarán en un servidor X XFree86 3.2
-(X11R6.1) pero su alcance puede variar.
-
-Como hacer un gdb backtrace
-===========================
-
-Backtraces pueden ayudarnos a arreglar errores que hicieron que Window Maker falle.
-Si encuentra un bug que hace fallar a Window Maker, por favor envie un backtrace con su
-reporte de error.
-
-Para hacer un backtrace útil, necesita un archivo core con información de depuración
-producida por Window Maker cuando falló. Debería haber sido instalado sin stripping también.
-
-Para compilar wmaker con información de depuración:
-
-./configure
-make CFLAGS=-g
-
-Si obtiene el cuadro de diálogo que le dice que wmaker falló y le 
-pregunta que hacer, respóndale "Abortar y dejar un archivo core"
-
-script
-cd src
-gdb .libs/wmaker path_to_the_core_file
-
-Luego, en el prompt gdb escriba "bt". Salga de gdb escribiendo "quit"
-y luego, en el prompt del shell, scriba "exit"
-
-El archivo llamado typescript contendrá el backtrace.
-
-Derechos de Autor y Descargo de Responsabilidad
-===============================================
-
-Window Maker está registrado por Alfredo K. Kojima y está licensiado por la 
-Licensia Pública General GNU. Lea el archivo COPYING para leer la licensia
-completa.
-
-Los íconos que son distribuidos con este programa y fueron hechos por Marco
-van Hylckama Vlieg, están licenciados por la Licencia Pública General GNU. 
-Lea el archivo COPYING para leer la licencia completa.
-
-Los íconos listados en COPYING.WTFPL y son distribuidos en este programa
-fueron hechos por Banlu Kemiyatorn (]d), están licenciados por la 
-"do What The Fuck you want to Public License". Lea el archivo COPYING.WTFPL
-para leer la licencia completa.
-
-NeXT, OpenStep y NEXTSTEP son marcas registradas de NeXT Computer, Inc.
-Todas las otras marcas registradas son propiedad de sus respectivos dueños.
-
-Los autores se reservan el derecho de hacer cambios en el software sin previo
-aviso.
-
-Autores
-=======
-
-Alfredo K. Kojima <kojima@windowmaker.org>
-Dan Pascu <dan@windowmaker.org>
-]d <id@windowmaker.org>
-
-Por favor no nos haga preguntas antes de leer la documentación (especialmente 
-la FAQ, este archivo y los archivos INSTALL) y sobre cosas "cool" que ve en
-las capturas de pantalla del escritorio de las personas.
-
-El archivo AUTHORS contiene una lista de las personas que han contribuido 
-con el proyecto. El nombre de las personas que han ayudado con localization 
-(traducción) se puede encontrar en po/README y Window Maker/README
-
-Si tiene algún comentario, arreglos y reportes de errores (complete BUGFORMs)
-y enviémelos a developers@windowmaker.org
-
-
-
-traducido por Efraín Maximiliano Palermo <max_drake2001@yahoo.com.ar>
--- a/README.pt
+++ b/README.pt
@@ -1,379 +0,0 @@
-
-
-		            GNU Window Maker
-                  	Gerenciador de Janelas X11
-	
-	  	   	  <http://windowmaker.org>
-		 	 <ftp://ftp.windowmaker.org>
-
-				     por
-
-		      		Alfredo K. Kojima 
-
-			           Dan Pascu
-
-		       	         Matthew Hawkins
-
-                 			]d
-
-
-	             		    Web/FTP Master
-
-				    Phillip Smith
-
-
-
-		Parabéns! Você acabou de adquirir um dispositivo muito
-      bom que lhe proporcionaria milhares de anos de uso sem problemas,
-      exceto por que, você, com vai certeza destruí-lo com algum procedimento
-      idiota típico dos consumidores. Por isso nós pedimos POR FAVOR,
-      PELO AMOR DE DEUS LEIA O MANUAL DO DONO COM MUITA ATENÇÃO ANTES
-      DE DESEMBRULHAR O DISPOSITIVO. VOCÊ JÁ O DESEMPACOTOU, NÃO FOI?
-      VOCÊ DESEMPACOTOU-O, CONECTOU-O, LIGOU-O E ENCHEU-O DE COISAS,
-      E AGORA A SUA CRIANÇA, A MESMA CRIANÇA QUE UMA VEZ ENFIOU UMA
-      SALSICHA NO SEU VIDEOCASSETE E APERTOU NO "FAST FORWARD", ESTA
-      CRIANÇA ESTÁ BRINCANDO COM OS BOTÕES TAMBÉM CERTO? E SÓ AGORA VOCÊ
-      ESTÁ COMEÇANDO A LER AS INSTRUÇÕES CERTO??? NÓS PODEMOS ENTÃO QUEBRAR 
-      ESTES DISPOSITIVOS NA FÁBRICA ANTES DE DESPACHÁ-LOS, VOCÊ
-      SABIA DISSO?
-				-- Dave	Barry, "Read This First!"
-
-
-Descrição
-=========
-
-O Window Maker é o gerenciador de janelas GNU para o X Window System. Ele foi
-desenvolvido para emular o visual e a sensação de parte da GUI NEXTSTEP(tm).
-Procura ser relativamente rápido e pequeno, rico em opções, fácil de 
-configurar e usar, com uma aparência simples e elegante emprestada do
-NEXTSTEP(tm).
-
-O Window Maker foi projetado tendo em mente a integração com o GNUStep e
-é o gerenciador de janelas "oficial" dele. É ainda parte do projeto GNU
-(www.gnu.org).
-Leia mais sobre o GNUstep neste arquivo.
-
-Hints (informações dadas pelas aplicações para que se integrem bem com o 
-gerenciador de janelas) para Motif(tm), OPEN LOOK(tm), KDE e GNOME também
-são suportados. Logo, você pode substituir os gerenciadores de janela desses
-ambientes pelo Window Maker e manter muito, senão toda a funcionalidade do 
-gerenciador de janelas nativo.
-
-O Window Maker antes se chamava WindowMaker.
-
-O Window Maker não tem relação com o Windowmaker, o software para construção
-de janelas e portas.
-
-
-Documentação
-============
-
-Leia antes de perguntar.
-
-* Os arquivos README distribuídos por toda a árvore dos fontes contêm
-  informações relacionadas ao conteúdo dos diretórios.
-
-* O INSTALL possui instruções para instalação e algumas dicas quando há 
-  algum problema. Você deveria lê-lo antes da instalação. Ele não foi escrito
-  somente para ocupar espaço no pacote...
-
-* FAQ: Frequently Asked Questions. LEIA! O FAQ.I18N é sobre questões 
-  relacionadas à internacionalização.
-
-* NEWS: lista as mudanças de uma versão para outra e que são visíveis ao
-  usuário. Leia-o se você estiver fazendo uma atualização.
-
-* MIRRORS: alguns locais alternativos onde você pode pegar o Window Maker, 
-  incluindo pacotes do Window Maker específicos para certas plataformas.
-
-* BUGFORM: use-o para enviar relatos de bug. Use-o por favor.
-
-* ChangeLog: o que foi mudado a partir da última versão?
-
-* BUGS: lista dos bugs conhecidos
-
-
-*** Guia do Usuário
-
-O Guia do Usuário Window Maker pode ser baixado do ftp oficial ou por 
-sites web. Pode ser visto ainda no formato HTML no:
-http://people.delphi.com/crc3419/WMUserGuide/index.htm
-
-O Guia do Usuário explica como usar o Window Maker, fala sobre os 
-arquivos de configuração e as opções.
-
-*** man pages
-
-Digite "man wmaker" no prompt da shell para obter uma ajuda geral sobre
-o Window Maker.
-
-
-Diretórios & Arquivos na Árvore dos Fontes
-==========================================
-
-* O Install é um script para configurar e compilar o Window Maker de 
-  um modo fácil (não que o modo normal seja difícil, mas...).
-
-* AUTHORS: os créditos
-
-* TODO: planos para o futuro
-
-* O contrib/ possui alguns patches enviados e que não foram suportados 
-  pelo Window Maker por entrarem em conflito com a filosofia de projeto dos 
-  desenvolvedores ou por algum outro motivo.
-
-* O util/ possui vários programas utilitários.
-
-* O WPrefs.app/ é o programa de configuração. 
-
-* O src/wconfig.h possui opções de compilação que você pode mudar para 
-  selecionar algumas opções/aspectos e outras coisas mais.
-
-* O WINGs/ é a biblioteca de widget NEXTSTEP lookalike
-
-* A wrlib/ é a biblioteca de processamento de imagens
-
-* O po/ possui catálogos de mensagens, que são versões traduzidas das 
-  mensagens mostradas pelo Window Maker
-
-* A docklib-x.x.tar.gz é a biblioteca para desenvolvimento de dockapps
-
-
-SOCORRO!!!
-==========
-
-Há uma lista de discussão para debate de questões sobre o Window Maker
-no wm-user@windowmaker.org. Para inscrever-se, mande uma mensagem
-contendo:
-	subscribe
-no campo de assunto da mensagem para wm-user-request@windowmaker.org
-
-Se você tiver algum problema, pergunte lá (somente depois de ter lido os
-documentos, é claro). As pessoas da lista estão mais preparadas para 
-resolver o seu problema do que nós. Para relatar BUGS, use o BUGFORM.
-
-Se você tiver problemas com uma versão pré-compilada do Window
-Maker (rpm, deb etc), primeiro questione a pessoa que criou o pacote.
-
-NOTA IMPORTANTE: quando for pedir ajuda (seja na lista de discussão ou 
-diretamente aos desenvolvedores) *sempre* envie informações sobre o sistema
-que você está usando. Você pode usar a seção system information no final
-do BUGFORM como guia. Outra coisa: não mande mensagens em HTML.
-
-Há ainda o canal de IRC #windowmaker na EFNET. Para entrar lá, conecte
-seu cliente de irc no irc.concentric.net, irc.prison.net ou outro 
-servidor dessa rede.
-
-
-GNUstep
-=======
-
-O GNUstep é um completo sistema de desenvolvimento orientado a objetos,
-baseado na especificação OpenStep lançada pela NeXT(tm) (agora Apple(tm) e
-Sun(tm)). Ele irá fornecer tudo que é necessário para desenvolver aplicações
-orientadas a objetos,  gráficas (e não gráficas), cross-platform; fornecendo,
-dentre outras coisas, bibliotecas bases do sistema, uma estrutura de alto
-nível para aplicações GUI que usa um modelo de imagens do tipo Display
-PostScript(tm), objetos para acesso a bancos de dados relacional, objetos
-distribuídos e um ambiente de desenvolvimento gráfico, com ferramentas como
-um modelador de interfaces, um projeto de gerenciamento de sistema (central
-de projetos) e outras ferramentas.
-
-O sistema de desenvolvimento GNUstep será usado para criar um ambiente
-de usuário, com tudo necessário para uma interface gráfica, tais como
-visualizador de arquivos, editores de texto e outras aplicações. Note que o
-ambiente do usuário (ou "ambiente desktop") é somente uma pequena parte de
-todo o projeto GNUstep e não "compete" com projetos como o KDE e o GNOME,
-simplesmente por que eles são coisas completamente diferentes.
-
-Para mais informação sobre o projeto GNUstep, visite http://www.gnustep.org
-e http://gnustep.current.nu
-
-
-Executando múltiplas instâncias do Window Maker
-===============================================
-
-Não é uma boa idéia rodar mais de uma instância do Window Maker sob
-um mesmo usuário ao mesmo tempo (já que o wmaker usa os mesmos arquivos 
-de configuração). Você pode obter comportamentos inesperados quando o 
-Window Maker atualizar os seus arquivos de configuração.
-
-
-Suporte para som
-================
-
-O Som é suportado nos sistemas Linux e FreeBSD com o uso de módulos
-distribuídos separadamente. Você pode baixá-los no: 
-http://www.frontiernet.net/~southgat/wmsound
-
-Observe que você deve compilar o Window Maker usando o configure com a
-flag --enable-sound e definindo a opção DisableSound para NO.
-
-
-Suporte ao OpenL**k
-===================
-
-Acredito que muitos usuários, principalmente os do mundo acadêmico,
-tenham que usar aplicações escritas em toolkits OpenL**k, então o suporte
-para estes aplicativos deve ser de algum uso.
-
-Para ativar, use o --enable-openlook quando rodar o configure. Note
-que nem tudo está implementado.
-
-As opções implementadas incluem hints de decoração e o push-pin.
-Coisas não implementadas incluem _SUN_WINDOW_STATE (the compose led 
-state stuff), coisas relacionadas ao "drag and drop", cabeçalho (não 
-tenho certeza do que é) e o string footer.
-
-Por favor me dêem retorno se algo não funcionar. Se a opção já está
-implementada, mas não está funcionando por causa de um bug, eu tentarei
-corrigí-la. Se é uma característica ainda não implementada e você mencionar
-que é importante (ie: não somente cosmética), eu considerarei a sua 
-implementação.
-
-O estado "out" do pushpin é emulado como um botão de fechar pressionado.
-Clique no botão para fazer com que ele fique despressionado, o que 
-corresponde ao estado "pinned-in" do pushpin. Se você pressionar de novo
-o botão de fechar despressionado, ele vai agir como um botão de fechar
-normal: vai fechar a janela.
-
-
-Ajuste da Performance
-====================
-
-Se você deseja diminuir o uso de memória pelo Window Maker, aumentar a 
-performance, e ainda manter uma boa aparência e funcionalidade, siga os
-itens abaixo:
-
- use texturas sólidas para tudo, barras de títulos e menus. Se você quer
-  um desktop com um belo visual, use o estilo "Traditional".
- desligue o "NewStyle" e o "Superfluous"
- não vincule muitos atalhos ao seu menu e guarde somente coisas essenciais
-  no menu
- ative o "DisableClip"
- edite o wconfig.h e desative o NUMLOCK_HACK e as opções que você não
-  usa mesmo (tenha em mente que alguns dos #defines podem não funcionar,
-  já que eles não estão completamente suportados). Certifique-se de sempre
-  manter o NumLock e o ScrollLock desligados.
- ligue a opção "DisableAnimations". Você pode também usar o #undefine
-  ANIMATIONS no arquivo config.h
- verifique as entradas padrão "IconPath" e "PixmapPath" para que contenham
-  somente os paths que você realmente possua no seu sistema.
- não use imagens grandes no seu background root
- remova o suporte para formatos de imagens que você não usa
- para reduzir o uso de memória, desative o cache de ícones, definindo a
-  variável de ambiente RIMAGE_CACHE para 0. Se você deseja melhorar o
-  desempenho perdendo só um pouco de memória, defina essa variável para
-  o valor correspondente ao número de ícones que você usa.
-
-
-Controle de Mouse pelo Teclado
-==============================
-
-Muitas pessoas perguntam sobre adicionar o controle do mouse pelo teclado,
-como no fvwm, mas o Window Maker não possui tal opção. A extensão XKB
-suporta a simulação do mouse pelo teclado, de uma maneira muito mais 
-poderosa do que qualquer outra simulação realizada por um gerenciador de 
-janelas.
-
-Para ativá-la, aperte a combinação Control+Shift+NumLock ou Shift+NumLock.
-Você deve então ouvir um beep. Para desativá-la, faça a mesma coisa.
-
-Para controlar com o mouse, use as seguintes teclas do keypad:
- 4 (seta esquerda), 7 (Home), 8 (seta para cima), 9 (PgUp), 6 (seta direita), 
-3 (PgDn), 2 (seta para baixo) e 1 (End) move o mouse para as direções
-correspondentes;
- segurar as teclas acima e depois segurar a tecla 5 vai fazer o ponteiro
-se mover mais rápido;
- / vai selecionar o primeiro botão do mouse (botão esquerdo);
- * vai selecionar o segundo botão do mouse (botão do meio);
- - vai selecionar o terceiro botão do mouse (botão direito);
- 5 vai fazer um clique com o botão do mouse que foi selecionado;
- + vai fazer um duplo-clique com o botão do mouse que foi selecionado;
- 0 (Ins) vai clicar e segurar o botão do mouse selecionado;
- . (Del) vai liberar o botão do mouse selecionado que foi previamente
-clicado com a tecla 0 (Ins).
-
-Os valores das teclas acima funcionam com um servidor X XFree86 3.2 (X11R6.1)
-mas nosso alcance pode variar.
-
-
-Como fazer um backtrace com o gdb
-=================================
-
-Os backtraces nos ajudam a arrumar bugs que fazem com que o Window Maker
-trave. Se você achar um bug que trave o Window Maker, por favor envie o
-backtrace com o relato do bug.
-
-Para fazer um backtrace útil, você precisa de um arquivo core
-com informações de depuração produzidas pelo Window Maker quando ele
-travar.  O padrão do Window Maker é iniciar um outro gerenciador
-de janelas quando ele travar, o que não gerará um arquivo core. Você
-precisa editar o arquivo src/wconfig.h *depois* de ter rodado o configure
-e mudar a linha que se parece com o seguinte:
-
-#undef NO_EMERGENCY_AUTORESTART
-
-para:
-
-#define NO_EMERGENCY_AUTORESTART
-
-Depois, no diretório src, digite:
-make clean
-make CFLAGS=-g
-make install
-
-e espere o Window Maker ser instalado.
-
-Depois de instalado o Window Maker, inicie o X e reproduza o bug fazendo
-com que o Window Maker trave. Quando ele travar, vá até o diretório
-onde você compilou o wmaker e digite o seguinte comando na sua shell:
-
-script
-cd src
-gdb .libs/wmaker path_ao_arquivo_core
-
-Depois, no prompt do gdb, digite "bt". Saia do gdb digitando "quit"
-e depois no prompt da shell, digite "exit".
-
-O arquivo chamado typescript conterá o backtrace.
-
-
-
-Direitos Autorais & Disclaimers
-===============================
-
-O Window Maker é registrado por Alfredo K. Kojima e é licenciado pela Licença
-Pública Geral GNU. Leia o arquivo COPYING para ler a licença completa.
-
-Os ícones que são distribuídos com esse programa foram criados por Marco
-van Hylckama Vlieg são licenciados pela OpenContent License. Leia o
-arquivo COPYING.OPL para a licença completa.
-
-NeXT, OpenStep e NEXTSTEP são marcas da NeXT Computer, Inc.
-Todas as outras marcas são propriedade dos respectivos donos.
-
-Os autores se reservam no direito de fazer alterações no software sem
-qualquer aviso prévio.
-
-
-Autores
-=======
-
-Alfredo K. Kojima <kojima@windowmaker.org>
-Dan Pascu <dan@windowmaker.org>
-]d <id@windowmaker.org>
-
-Por favor não nos perguntem coisas antes de ler a documentação (o FAQ,
-este arquivo e os arquivos INSTALL), ou sobre coisas "legais" que você
-viu em screenshots de desktops.
-
-O arquivo AUTHORS contem uma lista de pessoas que contribuíram com o projeto.
-O nome das pessoas que ajudaram com a tradução pode ser achado no po/README e
-Window Maker/README
-
-Se você tem algum comentário, correção ou deseja relatar bugs (junto com
-o BUGFORM) mande-os para developers@windowmaker.org
-
-
-Traduzido por: Ricardo Sartori <sartori@inf.ufsc.br>
--- a/Sample.XftConfig
+++ b/Sample.XftConfig
@@ -1,79 +0,0 @@
-# $XFree86: xc/lib/Xft/XftConfig.cpp,v 1.8 2001/11/21 23:41:12 keithp Exp $
-
-dir "/usr/share/fonts/truetype"
-dir "/usr/X11R6/lib/X11/fonts/TrueType"
-dir "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
-dir "/usr/X11R6/lib/X11/fonts/Type1"
-
-#
-# alias 'fixed' for 'mono'
-#
-match any family == "fixed"		edit family =+ "mono";
-
-#
-# Check users config file
-#
-includeif	"~/.xftconfig"
-
-#
-# Substitute TrueType fonts for Type1 versions
-#
-match any family == "Times"             edit family += "Times New Roman";
-#match any family == "Helvetica"         edit family += "Verdana";
-#match any family == "Helvetica"         edit family += "Arial";
-match any family == "Helvetica"         edit family += "Trebuchet MS";
-match any family == "Courier"           edit family += "Courier New";
-
-#
-# Use TrueType fonts for defaults
-#
-match any family == "serif"             edit family += "Times New Roman";
-match any family == "sans"              edit family += "Verdana";
-
-#
-# Use monotype.com (andale) face where possible
-#
-match
-        any family == "mono" 
-        all slant == roman
-        all weight < bold
-edit
-        family += "monotype.com";
-#
-# otherwise, use courier
-#
-match any family == "mono"              edit family += "Courier New";
-
-#
-# Alias between XLFD families and font file family name, prefer local fonts
-#
-match any family == "charter"		edit family += "bitstream charter";
-match any family == "bitstream charter" edit family =+ "charter";
-
-match any family == "Charter"           edit family += "Bitstream Charter";
-match any family == "Bitstream Charter" edit family =+ "Charter";
-
-match any family == "Lucidux Serif"     edit family += "LuciduxSerif";
-match any family == "LuciduxSerif"      edit family =+ "Lucidux Serif";
-
-match any family == "Lucidux Sans"      edit family += "LuciduxSans";
-match any family == "LuciduxSans"       edit family =+ "Lucidux Sans";
-
-match any family == "Lucidux Mono"      edit family += "LuciduxMono";
-match any family == "LuciduxMono"       edit family =+ "Lucidux Mono";
-    
-#
-# TrueType font aliases
-#
-match any family == "Comic Sans"        edit family += "Comic Sans MS";
-match any family == "Comic Sans MS"     edit family =+ "Comic Sans";
-match any family == "Trebuchet"         edit family += "Trebuchet MS";
-match any family == "Trebuchet MS"      edit family =+ "Trebuchet";
-match any family == "Monotype"          edit family =+ "Monotype.com";
-match any family == "Andale Mono"       edit family += "Monotype.com";
-match any family == "Monotype.com"      edit family =+ "Andale Mono";
-
-#
-#
-match any family == "webdings"		edit encoding += "glyphs-fontspecific";
-match any family == "symbol"		edit encoding += "glyphs-fontspecific";
--- a/11
+++ b/11
@@ -7,13 +7,14 @@ Do ASAP:
 - fix RemakeStackList() to account for transient windows
 - blink border of clients with UrgencyHint set between red and black
 - finish session stuff
- add multiline support for balloons
 - remove colors_per_channel stuff from wmaker after?
 + finish the ability to browse for files/dirs in the WPrefs menu editor
-+ finish selections and DND stuff in WINGs
+- check whether window states are being saved/restored properly via netwm
+  on restart/crash-restart (grep for XXX/TODO)

 Need to do:
 ===========
+- figure out a better gnustep path for wprefs.app installation
 - impelment a generic pixmap type, which receives attributes
  (scaled/maxscaled/centered/tiled, smoothed, size/position, ...)
 - allow user to select/restore default root menu from wprefs
@@ -61,3 +62,9 @@ sample implementation (twm?) it might be supported. Maybe dtwm supports
 it? I dont know...


+After 1.0.0 is released
+=======================
+- rework/redesign the appicon/dock/clip concept
+- maybe rewrite the main code in obj-c or c++
+- major clean up in theming/texturing stuff
+
--- a/The-perfect-Window-Maker-patch.txt
+++ b/The-perfect-Window-Maker-patch.txt
@@ -0,0 +1,87 @@
+____________
+Introduction
+------------
+
+This short tutorial is meant to help you help me in the task
+of having a maintainable and bug-free Window Maker.
+
+It assumes you have 'git' correctly installed and you have set
+the most basic configuration options via 'git config' (or by
+editing the $HOME/.gitconfig file yourself). See the end
+of this file for an example .gitconfig (which is the one
+I use).
+
+You should probably by now have already cloned my repository,
+but here is how you can do it just in case:
+
+# this is the preferred method (ie faster, native implementation)
+git clone git://repo.or.cz/wmaker-crm.git
+
+# use the http method only if are behind a firewall which blocks git://
+git clone http://repo.or.cz/r/wmaker-crm.git
+
+__________________________________
+How to submit patches the git way
+----------------------------------
+
+Suppose you have a working copy of the git repo and you found
+a bug in Window Maker and you know how to fix it. This is
+what you can do to submit your patch in a way which will allow
+me to apply it quickly.
+
+# Optional: Create a new branch (just to be safe in case you screw up)
+git checkout -b my-new-branch
+
+Now you edit and save the files to fix the bug...
+
+# Optional: Check what you did, review etc
+git diff
+
+# if it looks good, commit your changes
+git commit -a
+
+# git will pop up the editor which you configured in .gitconfig so
+# that you will be able to write a commit log. It will use the 'vi'
+# editor otherwise.
+
+(write a _good_ and succinct commit log, explaining what you fixed etc)
+
+# Prepare the patch to submit to the mailing-list. This step will create
+# a file named 0001-subject-of-your-patch.patch from the last commit
+# (use HEAD~2 if you want patches for the last 2 commits etc)
+git format-patch HEAD~1
+
+After the above steps, you are ready to send the created .patch file
+to the mailing-list: wmaker-dev@lists.windowmaker.org
+
+Just send it as-is, and I will be able to apply it with
+
+# this is how I am going to apply your patch
+git am 0001-subject-of-your-patch.patch
+
+and it will automatically append your commit to the repo, with the
+proper authorship, date, subject, commit log etc.
+
+___________________
+Example .gitconfig
+-------------------
+
+[user]
+        name = Erwin Schrodinger
+        email = schrodinger@gmail.com
+[core]
+        editor = xjed
+[status]
+        showUntrackedFiles = no
+[color]
+        branch = auto
+        status = auto
+        diff = auto
+        ui = auto
+[apply]
+        whitespace = fix
+	
+
+
+
+
--- a/WINGs/.cvsignore
+++ b/WINGs/.cvsignore
@@ -1,4 +0,0 @@
-Makefile Makefile.in
-get-wings-flags get-wutil-flags
-.libs *.pc
-.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/ChangeLog
+++ b/WINGs/ChangeLog
@@ -1,8 +1,26 @@
+Changes since wmaker 0.92.0:
+............................
+
+- updated the XDND code in to work with GDK based applications.
+  WINGs based applications should now work with both KDE and GNOME
+  applications (Sylvain Reynal <sreynal@nerim.net>)
+- better check for the XDND protocol version when interoperating with other
+  applications. As it seems xdnd version 3 (which WINGs supports) and newer
+  are not backward compatible with xdnd version 1 and 2. This is why WINGs
+  applications cannot interoperate with GNUstep applications (which uses
+  xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
+  version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
+- removed dependency on rgb.txt from X11 and issues with locating it on the
+  filesystem for different systems/distributions.
+- Removed dependency on rgb.txt (from X11) and issues with locating it on the
+  filesystem for different systems/distributions.
+
+
 Changes since wmaker 0.80.1:
 ............................

- added WMSetConnectionShutdownOnClose()
- added an extra member to the ConnectionDelegate: canResumeSending
+- Added WMSetConnectionShutdownOnClose()
+- Added an extra member to the ConnectionDelegate: canResumeSending
  see NEWS for details.
 - WMDrawString() and WMDrawImageString() now take WMColor instead of GC as
  arguments. WMDrawImageString() receives 2 colors (text & background).
@@ -11,31 +29,20 @@ Changes since wmaker 0.80.1:
 - Added alpha channel to WMColor. 2 new functions also:
  WMCreateRGBAColor() and WMSetColorAlpha()
 - Miscelaneous code cleanups in wtext.c
- Added Xft support in WINGs (for drawing antialiased fonts with transparency).
- Added a new function: WMCreateAntialiasedFont() to create a font which will
-  be drawn antialiased using Xft (if available, else function returns NULL)
- New options in WMGLOBAL: AntialiasedText, AntialiasedSystemFont and
-  AntialiasedBoldSystemFont. Check NEWS for details.
+- Added Xft2 support in WINGs (for drawing antialiased fonts with transparency).
+- New options in WMGLOBAL: AntialiasedText. Check NEWS for details.
 - Fixed some improper calls to snprintf in wfont.c
 - Added double buffering when drawing a WMFrame title with an antialiased font
  to avoid flickering.
 - Added double buffering when drawing WMList items to avoid flickering.
  Double buffering for list also works for user drawn lists. Read NEWS for
  details and incompatibilities introduced by this change.
- Added WMIsAntialiasedFont(WMFont *font) to check if a font is antialiased.
 - Added WMGetColorAlpha(WMColor *color)
 - Better outline when drawing balloons.
- Added WMCreateFontWithFlags()
+- Added WMCreateFontWithAttributes()
 - You can now pass "SystemFont", "BoldSystemFont", "SystemFont-##" or
  "BoldSystemFont-##", with ## being the font size to any font creating
  function to create a font with the (bold) system font font specification.
- Added WMCreateAntialiasedFontSet() (like WMCreateAntialiasedFont() but for
-  languages with multibyte text). Note however that these specific font
-  creating functions (as well as WMCreateNormalFont() and WMCreateFontSet())
-  are not meant to be called directly except in very special cases.
-  The more generic WMCreateFont() or WMCreateFontWithFlags() should be used.
- Multibyte languages can now render antialiased text too (only tested on
-  russian since this is the only multibyte language I can test).
 - Added WMCopyFontWithChanges(). This is a more generic and powerful function
  meant to replaces the obsoleted WMEmphasizeFont(), WMNormalizeFont(),
  WMStrenghtenFont() and the other similar functions. To get the same effect
@@ -45,8 +52,6 @@ Changes since wmaker 0.80.1:
 - Added WMGetWidgetBackgroundColor()
 - Code cleanup in wtext.c
 - Fixed a memory leak in wfontpanel.c
- Added a check that only %d is used in a font specification in WMGLOBAL and at
-  most once for each font in a fontset (eliminates a possible security exploit)
 - Fixed WMGetTextDefaultColor() not to retain the returned color. It returns
  only a reference to the internal color, which you shouldn't release
 - Added wstrndup()
@@ -58,13 +63,15 @@ 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 (Vitaly Ovtchinnikov
-  <ov@rbcmail.ru>)
- fixed bug in tableview (clicked row callback got incorrect row) (Carlos Torres 
-  <vlaadbrain@operamail.com>)
+- 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>)
 - Fixed bug in resizing a scrollview
 - Fixed bug with wrong text wrapping (Alexey Voinov <voins@voins.program.ru>)
 - Added wmkrect()
+- Added xdnd v3 support (Sylvain Reynal <sreynal@nerim.net>)
+- Fixed and enhanced text wrapping.


 Changes since wmaker 0.80.0:
--- a/WINGs/Documentation/.cvsignore
+++ b/WINGs/Documentation/.cvsignore
@@ -1,2 +0,0 @@
-Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/Documentation/Makefile.am
+++ b/WINGs/Documentation/Makefile.am
@@ -1,6 +1,6 @@
 ## automake input file for WINGs - Documentation

-AUTOMAKE_OPTIONS = no-dependencies
+AUTOMAKE_OPTIONS =

-EXTRA_DIST = README.connection
+EXTRA_DIST =

--- a/WINGs/Documentation/README.connection
+++ b/WINGs/Documentation/README.connection
@@ -1,51 +0,0 @@
-Methods of handling WMConnectionDidDieNotification notification events
-(same for WMConnectionDidTimeoutNotification)
----------------------------------------------------------------------
-
-Once your program got this notification (you need to install an observer for 
-it), there are some ways to handle it:
-
-1. Make your observer enqueue a new notification in the ASAP queue, and the 
-   observer for this new notification (it can be the same function if you 
-   arrange to distinguish between the two cases), should remove the connection. 
-   You can also close the connection before enqueuing the new notification to
-   the ASAP queue, but is not strictly necessarily, since it will be closed 
-   when the observer for the new enqueued notification will be called and you 
-   will call the close/remove function there. This is just to make sure your 
-   connection will be silent, and won't generate new events until you reach 
-   that point.
-   This is by far the best method, since it will assure you that if you 
-   enqueue more than one notification to remove the same connection, they will
-   be coalesced, and called only once.
-
-2. In your observer, put the died/closed connection in an array or bag, and
-   destroy all the connections present in the array/bag, in your main loop,
-   after you call the  WHandleEvents()/WMHandleEvent(). Also closing the
-   connection can be done before putting the connection in the array/bag, but
-   is optional as noted above. In this case you need to make sure you don't
-   put in the array/bag the same connection more than once, in case the
-   DieNotification is sent more that once to you. This is automagically solved
-   by method 1.
-
-3. In case it's your only connection, and you plan to exit if it was closed or
-   died, then you can safely close/remove it, and exit. As long as you no 
-   longer access it, there is no problem.
-
-4. Make you observer remove the connection. Then make sure that after that
-   point your code no longer tries to access that connection (this usually
-   means until your code gets back to the main loop). This is almost always
-   very hard to achive and subject to hidden errors. I do not recommend this
-   way of handling the died notification. It is ugly and very complicated to
-   handle if the program is in a very deeply nested function when it finds out
-   that the connection died. If you use it and get plenty of SIGSEGVs then you
-   know why. This method was not presented here to be used, but to show what
-   should be avoided in dealing with the died notification, in case someone
-   gets the idea to try it this way.
-
-
-Note:  read/write operations means to use our read/write functions (like 
-       WMGetMessage()/WMSendMessage()), not the C library ones read()/write().
-Note2: removing a connection is done by WMDestroyConnection(), while
-       WMCloseConnection() only closes the socket, and removed any pending
-       queues and timers on the connection.
-
--- a/WINGs/Examples/.cvsignore
+++ b/WINGs/Examples/.cvsignore
@@ -1,4 +0,0 @@
-Makefile Makefile.in
-connect server fontl puzzle UserTime.plist
-.libs
-.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/Examples/Makefile.am
+++ b/WINGs/Examples/Makefile.am
@@ -1,31 +1,40 @@
 ## automake input file for WINGs - Examples

-AUTOMAKE_OPTIONS = no-dependencies
+AUTOMAKE_OPTIONS =


-noinst_PROGRAMS = connect server fontl puzzle
+noinst_PROGRAMS = connect server fontl puzzle colorpick


-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@

+colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la

-fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la

-puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la

-connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
+connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la

-connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
-	@NETLIBS@ @INTLIBS@
+connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@

-server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
+server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la

-server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
-	@NETLIBS@ @INTLIBS@
+server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@


 INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG

+LIBTOOL = $(QUIET) $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG)

+.c.o:
+	$(QUIET)$(COMPILE) -c $<
+
+.c.obj:
+	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(QUIET)$(LTCOMPILE) -c -o $@ $<
--- a/WINGs/Examples/colorpick.c
+++ b/WINGs/Examples/colorpick.c
@@ -0,0 +1,39 @@
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <WINGs/WINGs.h>
+
+void showSelectedColor(void *self, void *cdata)
+{
+	WMColorPanel *panel = (WMColorPanel *) self;
+
+	printf("Selected Color: %s\n", WMGetColorRGBDescription(WMGetColorPanelColor(panel)));
+}
+
+int main(int argc, char **argv)
+{
+	Display *dpy;
+	WMScreen *scr;
+
+	WMInitializeApplication("wmcolorpick", &argc, argv);
+
+	dpy = XOpenDisplay("");
+	if (!dpy) {
+		printf("could not open display\n");
+		exit(1);
+	}
+
+	scr = WMCreateScreen(dpy, DefaultScreen(dpy));
+
+	{
+		WMColorPanel *panel = WMGetColorPanel(scr);
+
+		WMSetColorPanelAction(panel, showSelectedColor, NULL);
+
+		WMShowColorPanel(panel);
+	}
+
+	WMScreenMainLoop(scr);
+
+	return 0;
+}
--- a/WINGs/Examples/connect.c
+++ b/WINGs/Examples/connect.c
@@ -1,198 +0,0 @@
-/*
- *  WINGs connect.c: example how to create a network client using WMConnection
- * 
- *  Copyright (c) 1999-2003 Dan Pascu
- * 
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <WINGs/WINGs.h>
-
-
-
-static int initialized = 0;
-
-
-
-static void didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr);
-
-static void connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr);
-
-static void didInitialize(ConnectionDelegate *self, WMConnection *cPtr);
-
-
-
-static ConnectionDelegate socketDelegate = {
-    NULL,              /* data */
-    NULL,              /* canResumeSending */
-    NULL,              /* didCatchException */
-    connectionDidDie,  /* didDie */
-    didInitialize,     /* didInitialize */
-    didReceiveInput,   /* didReceiveInput */
-    NULL               /* didTimeout */
-};
-
-
-
-void
-wAbort(Bool foo)
-{
-    exit(1);
-}
-
-
-static char*
-getMessage(WMConnection *cPtr)
-{
-    char *buffer;
-    WMData *aData;
-    int length;
-
-    aData = WMGetConnectionAvailableData(cPtr);
-    if (!aData)
-        return NULL;
-    if ((length=WMGetDataLength(aData))==0) {
-        WMReleaseData(aData);
-        return NULL;
-    }
-
-    buffer = (char*)wmalloc(length+1);
-    WMGetDataBytes(aData, buffer);
-    buffer[length]= '\0';
-    WMReleaseData(aData);
-
-    return buffer;
-}
-
-
-static void
-inputHandler(int fd, int mask, void *clientData)
-{
-    WMConnection *cPtr = (WMConnection*)clientData;
-    WMData *aData;
-    char buf[4096];
-    int n;
-
-    if (!initialized)
-        return;
-
-    n = read(fd, buf, 4096);
-    if (n>0) {
-        aData = WMCreateDataWithBytes(buf, n);
-        WMSendConnectionData(cPtr, aData);
-        WMReleaseData(aData);
-    }
-}
-
-
-static void
-didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr)
-{
-    char *buffer;
-
-    buffer = getMessage(cPtr);
-    if (!buffer) {
-        fprintf(stderr, "Connection closed by peer.\n");
-        exit(0);
-    }
-
-    printf("%s", buffer);
-
-    wfree(buffer);
-}
-
-
-static void
-connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr)
-{
-    WMCloseConnection(cPtr);
-
-    fprintf(stderr, "Connection closed by peer.\n");
-    exit(0);
-}
-
-
-static void
-didInitialize(ConnectionDelegate *self, WMConnection *cPtr)
-{
-    int state = WMGetConnectionState(cPtr);
-    WMHost *host;
-
-    if (state == WCConnected) {
-        host = WMGetHostWithAddress(WMGetConnectionAddress(cPtr));
-        fprintf(stderr, "connected to '%s:%s'\n",
-                host?WMGetHostName(host):WMGetConnectionAddress(cPtr),
-                WMGetConnectionService(cPtr));
-        initialized = 1;
-        if (host)
-            WMReleaseHost(host);
-        return;
-    } else {
-        wsyserrorwithcode(WCErrorCode, "Unable to connect");
-        exit(1);
-    }
-}
-
-
-int
-main(int argc, char **argv)
-{
-    char *ProgName, *host, *port;
-    int i;
-    WMConnection *sPtr;
-
-    wsetabort(wAbort);
-
-    WMInitializeApplication("connect", &argc, argv);
-
-    ProgName = strrchr(argv[0],'/');
-    if (!ProgName)
-        ProgName = argv[0];
-    else
-        ProgName++;
-
-    host = NULL;
-    port = "34567";
-
-    if (argc>1) {
-        for (i=1; i<argc; i++) {
-            if (strcmp(argv[i], "--help")==0 || strcmp(argv[i], "-h")==0) {
-                printf("usage: %s [host [port]]\n\n", ProgName);
-                exit(0);
-            } else {
-                if (!host)
-                    host = argv[i];
-                else
-                    port = argv[i];
-            }
-        }
-    }
-
-    printf("Trying to make connection to '%s:%s'\n",
-           host?host:"localhost", port);
-
-    sPtr = WMCreateConnectionToAddressAndNotify(host, port, NULL);
-    if (!sPtr) {
-        wfatal("could not create connection. exiting");
-        exit(1);
-    }
-
-    WMSetConnectionDelegate(sPtr, &socketDelegate);
-
-    /* watch what user types and send it over the connection */
-    WMAddInputHandler(0, WIReadMask, inputHandler, sPtr);
-
-    while (1) {
-        WHandleEvents();
-    }
-
-    return 0;
-
-}
-
-
--- a/WINGs/Examples/fontl.c
+++ b/WINGs/Examples/fontl.c
@@ -13,49 +13,43 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
- *  USA.
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-
-
-
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <WINGs/WINGs.h>
 #include <WINGs/WUtil.h>

-void
-wAbort()
+void wAbort()
 {
 	exit(0);
 }

-void show(WMWidget *self, void *data)
+void show(WMWidget * self, void *data)
 {
 	char buf[60];
 	void *d;
-    WMLabel *l = (WMLabel*)data;
+	WMLabel *l = (WMLabel *) data;
 	d = WMGetHangedData(self);
 	sprintf(buf, "%i -  0x%x - 0%o", (int)d, (int)d, (int)d);
 	WMSetLabelText(l, buf);
 }

-void quit(WMWidget *self, void *data)
+void quit(WMWidget * self, void *data)
 {
 	exit(0);
 }

-
-int
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	Display *dpy;
 	WMWindow *win;
 	WMScreen *scr;
-    WMButton *lab, *l0=NULL;
+	WMButton *lab, *l0 = NULL;
 	WMLabel *pos;
 	int x, y, c;
 	char buf[20];
@@ -71,24 +65,24 @@ main(int argc, char **argv)
 	scr = WMCreateSimpleApplicationScreen(dpy);

 	win = WMCreateWindow(scr, "main");
-    WMResizeWidget(win, 20*33, 20+20*9);
+	WMResizeWidget(win, 20 * 33, 20 + 20 * 9);
 	WMSetWindowTitle(win, "Font Chars");
 	WMSetWindowCloseAction(win, quit, NULL);
 	pos = WMCreateLabel(win);
-    WMResizeWidget(pos, 20*33, 20);
+	WMResizeWidget(pos, 20 * 33, 20);
 	WMMoveWidget(pos, 10, 5);

 	c = 0;
-    for (y=0; y<8; y++) {
-	for (x=0; x<32; x++, c++) {
+	for (y = 0; y < 8; y++) {
+		for (x = 0; x < 32; x++, c++) {
 			lab = WMCreateCustomButton(win, WBBStateLightMask);
 			WMResizeWidget(lab, 20, 20);
-	    WMMoveWidget(lab, 10+x*20, 30+y*20);
+			WMMoveWidget(lab, 10 + x * 20, 30 + y * 20);
 			sprintf(buf, "%c", c);
 			WMSetButtonText(lab, buf);
 			WMSetButtonAction(lab, show, pos);
-	    WMHangData(lab, (void*)c);
-	    if (c>0) {
+			WMHangData(lab, (void *)(uintptr_t) c);
+			if (c > 0) {
 				WMGroupButtons(l0, lab);
 			} else {
 				l0 = lab;
@@ -101,4 +95,3 @@ main(int argc, char **argv)
 	WMScreenMainLoop(scr);
 	return 0;
 }
-
--- a/WINGs/Examples/puzzle.c
+++ b/WINGs/Examples/puzzle.c
@@ -1,18 +1,14 @@

-
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <WINGs/WINGs.h>
-
-
+#include <stdint.h>

 #define MAX_SIZE 	10*10

-
 WMWindow *win;
 WMButton *Button[MAX_SIZE];
-char Map[MAX_SIZE];
+signed char Map[MAX_SIZE];
 int Size = 4;
 int MoveCount;

@@ -20,12 +16,11 @@ int MoveCount;

 int WinSize = 120;

-
 Bool CheckWin(void)
 {
 	int i;

-    for (i = 0; i < Size*Size-1; i++) {
+	for (i = 0; i < Size * Size - 1; i++) {
 		if (Map[i] != i)
 			return False;
 	}
@@ -33,21 +28,19 @@ Bool CheckWin(void)
 	return True;
 }

-
 void MoveButton(int button, int x, int y)
 {
-    WMMoveWidget(Button[button], x*(WinSize/Size), y*(WinSize/Size));
+	WMMoveWidget(Button[button], x * (WinSize / Size), y * (WinSize / Size));
 }

-
 Bool SlideButton(int button)
 {
-    int x, y, done = 0;
+	int x = 0, y = 0, done = 0;

 	/* locate the button */
 	for (y = 0; y < Size; y++) {
 		for (x = 0; x < Size; x++) {
-	    if (MAP(x,y) == button) {
+			if (MAP(x, y) == button) {
 				done = 1;
 				break;
 			}
@@ -56,63 +49,73 @@ Bool SlideButton(int button)
 			break;
 	}

-    if (x > 0 && MAP(x-1, y) < 0) {
-	MAP(x,y) = -1;
-	MoveButton(button, x-1, y);
-	MAP(x-1,y) = button;
-    } else if (x < Size-1 && MAP(x+1, y) < 0) {
-	MAP(x,y) = -1;
-	MoveButton(button, x+1, y);
-	MAP(x+1,y) = button;
-    } else if (y > 0 && MAP(x, y-1) < 0) {
-	MAP(x,y) = -1;
-	MoveButton(button, x, y-1);
-	MAP(x,y-1) = button;
-    } else if (y < Size-1 && MAP(x, y+1) < 0) {
-	MAP(x,y) = -1;
-	MoveButton(button, x, y+1);
-	MAP(x,y+1) = button;
+	if (x > 0 && MAP(x - 1, y) < 0) {
+		MAP(x, y) = -1;
+		MoveButton(button, x - 1, y);
+		MAP(x - 1, y) = button;
+	} else if (x < Size - 1 && MAP(x + 1, y) < 0) {
+		MAP(x, y) = -1;
+		MoveButton(button, x + 1, y);
+		MAP(x + 1, y) = button;
+	} else if (y > 0 && MAP(x, y - 1) < 0) {
+		MAP(x, y) = -1;
+		MoveButton(button, x, y - 1);
+		MAP(x, y - 1) = button;
+	} else if (y < Size - 1 && MAP(x, y + 1) < 0) {
+		MAP(x, y) = -1;
+		MoveButton(button, x, y + 1);
+		MAP(x, y + 1) = button;
 	} else {
 		return False;
 	}
 	return True;
 }

-
 #define SWAP(a,b) {int tmp; tmp=a; a=b; b=tmp;}

 void ResetGame(void)
 {
 	int i, x, y, ox, oy;

-    
 	MoveCount = 0;

-    for (i = 0; i < Size*Size-1; i++) {
+	for (i = 0; i < Size * Size - 1; i++) {
 		Map[i] = i;
 	}
 	Map[i] = -1;
-    ox = x = Size-1;
-    oy = y = Size-1;
+	ox = x = Size - 1;
+	oy = y = Size - 1;
 	for (i = 0; i < 1000; i++) {
 		int ok;
 		ok = 1;
-	switch (rand()%4) {
+		switch (rand() % 4) {
 		case 0:
-	    if (x > 0) x--; else ok = 0;
+			if (x > 0)
+				x--;
+			else
+				ok = 0;
 			break;
 		case 2:
-	    if (x < Size-1) x++; else ok = 0;
+			if (x < Size - 1)
+				x++;
+			else
+				ok = 0;
 			break;
 		case 1:
-	    if (y > 0) y--; else ok = 0;
+			if (y > 0)
+				y--;
+			else
+				ok = 0;
 			break;
 		case 3:
-	    if (y < Size-1) y++; else ok = 0;
+			if (y < Size - 1)
+				y++;
+			else
+				ok = 0;
 			break;
 		}
 		if (ok) {
-	    MoveButton(MAP(x,y), ox, oy);
+			MoveButton(MAP(x, y), ox, oy);

 			SWAP(MAP(ox, oy), MAP(x, y));

@@ -127,12 +130,11 @@ void ResetGame(void)
 	}
 }

-
-void buttonClick(WMWidget *w, void *ptr)
+void buttonClick(WMWidget * w, void *ptr)
 {
 	char buffer[300];

-    if (SlideButton((int)ptr)) {
+	if (SlideButton((uintptr_t)ptr)) {
 		MoveCount++;

 		if (CheckWin()) {
@@ -148,8 +150,7 @@ void buttonClick(WMWidget *w, void *ptr)
 	}
 }

-
-static void resizeObserver(void *self, WMNotification *notif)
+static void resizeObserver(void *self, WMNotification * notif)
 {
 	WMSize size = WMGetViewSize(WMWidgetView(win));
 	int x, y;
@@ -157,18 +158,15 @@ static void resizeObserver(void *self, WMNotification *notif)
 	WinSize = size.width;
 	for (y = 0; y < Size; y++) {
 		for (x = 0; x < Size; x++) {
-	    if (MAP(x,y) >= 0) {
-		WMResizeWidget(Button[(int)MAP(x,y)],
-			       WinSize/Size, WinSize/Size);
-		WMMoveWidget(Button[(int)MAP(x,y)],
-			     x*(WinSize/Size), y*(WinSize/Size));
+			if (MAP(x, y) >= 0) {
+				WMResizeWidget(Button[(int)MAP(x, y)], WinSize / Size, WinSize / Size);
+				WMMoveWidget(Button[(int)MAP(x, y)], x * (WinSize / Size), y * (WinSize / Size));
 			}
 		}
 	}

 }

-
 int main(int argc, char **argv)
 {
 	Display *dpy;
@@ -177,7 +175,6 @@ int main(int argc, char **argv)

 	WMInitializeApplication("Puzzle", &argc, argv);

-    
 	dpy = XOpenDisplay("");
 	if (!dpy) {
 		printf("could not open display\n");
@@ -193,36 +190,31 @@ int main(int argc, char **argv)
 	WMSetWindowAspectRatio(win, 2, 2, 2, 2);
 	WMSetWindowResizeIncrements(win, Size, Size);
 	WMSetViewNotifySizeChanges(WMWidgetView(win), True);
-    WMAddNotificationObserver(resizeObserver, NULL,
-			      WMViewSizeDidChangeNotification,
-			      WMWidgetView(win));
+	WMAddNotificationObserver(resizeObserver, NULL, WMViewSizeDidChangeNotification, WMWidgetView(win));

-			      
-    
-    for (i = y = 0; y < Size && i < Size*Size-1; y++) {
-	for (x = 0; x < Size && i < Size*Size-1; x++) {
+	for (i = y = 0; y < Size && i < Size * Size - 1; y++) {
+		for (x = 0; x < Size && i < Size * Size - 1; x++) {
 			char buf[32];
 			WMColor *color;
 			RColor col;
 			RHSVColor hsv;

-	    hsv.hue = i*360/(Size*Size-1);
+			hsv.hue = i * 360 / (Size * Size - 1);
 			hsv.saturation = 120;
 			hsv.value = 200;

 			RHSVtoRGB(&hsv, &col);

-	    color = WMCreateRGBColor(scr, col.red<<8, col.green<<8,
-				     col.blue<<8, False);
+			color = WMCreateRGBColor(scr, col.red << 8, col.green << 8, col.blue << 8, False);

-	    MAP(x,y) = i;
+			MAP(x, y) = i;
 			Button[i] = WMCreateButton(win, WBTMomentaryLight);
 			WMSetWidgetBackgroundColor(Button[i], color);
 			WMReleaseColor(color);
-	    WMSetButtonAction(Button[i], buttonClick, (void*)i);
-	    WMResizeWidget(Button[i], WinSize/Size, WinSize/Size);
-	    WMMoveWidget(Button[i], x*(WinSize/Size), y*(WinSize/Size));
-	    sprintf(buf, "%i", i+1);
+			WMSetButtonAction(Button[i], buttonClick, (void *)(uintptr_t) i);
+			WMResizeWidget(Button[i], WinSize / Size, WinSize / Size);
+			WMMoveWidget(Button[i], x * (WinSize / Size), y * (WinSize / Size));
+			sprintf(buf, "%i", i + 1);
 			WMSetButtonText(Button[i], buf);
 			WMSetButtonTextAlignment(Button[i], WACenter);
 			i++;
--- a/WINGs/Examples/server.c
+++ b/WINGs/Examples/server.c
@@ -1,740 +0,0 @@
-/*
- *  WINGs server.c: example how to create a network server using WMConnection
- *
- *  Copyright (c) 2001-2003 Dan Pascu
- *
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <WINGs/WINGs.h>
-
-
-#define _(P)         P
-#define MAXCMD_SIZE  512
-
-
-char *SEConnectionShouldBeRemovedNotification = "SEConnectionShouldBeRemovedNotification";
-
-
-
-
-static void didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr);
-
-static void connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr);
-
-static void connectionDidTimeout(ConnectionDelegate *self, WMConnection *cPtr);
-
-
-extern char *SEConnectionShouldBeRemovedNotification;
-
-static WMUserDefaults *timeDB = NULL;
-static char *ServerAddress = NULL;
-static char *ServerPort = NULL;
-static WMArray *allowedHostList = NULL;
-static WMArray *clientConnections = NULL;
-static WMConnection *serverPtr = NULL;
-
-
-
-static ConnectionDelegate socketDelegate = {
-    NULL,                 /* client data */
-    NULL,                 /* canResumeSending */
-    NULL,                 /* didCatchException */
-    connectionDidDie,     /* didDie */
-    NULL,                 /* didInitialize */
-    didReceiveInput,      /* didReceiveInput */
-    connectionDidTimeout  /* didTimeout */
-};
-
-
-
-void
-wAbort(Bool foo)
-{
-    exit(1);
-}
-
-
-static void
-printHelp(char *progname)
-{
-    printf(_("usage: %s [options]\n\n"), progname);
-    puts(_(" --help				print this message"));
-    puts(_(" --listen [address:]port	only listen on the specified address/port"));
-    puts(_(" --allow host1[,host2...]	only allow connections from listed hosts\n"));
-    puts(_(" By default server listens on all interfaces and port 34567, unless"
-           " something\nelse is specified with the --listen option. If address is"
-           " omitted or the keyword\n'Any' is used, it will listen on all interfaces else"
-           " only on the specified one.\n\nFor example --listen localhost: will"
-           " listen on the default port 34567, but only\non connections comming"
-           " in through the loopback interface.\n\n Also by default the server"
-           " listens to incoming connections from any host,\nunless a list of"
-           " hosts is given with the --allow option, in which case it will\nreject"
-           " connections not comming from those hosts.\nThe list of hosts is comma"
-           " separated and should NOT contain ANY spaces."));
-}
-
-
-static void
-enqueueConnectionForRemoval(WMConnection *cPtr)
-{
-    WMNotification *notif;
-
-    /*don't release notif here. it will be released by queue after processing */
-    notif = WMCreateNotification(SEConnectionShouldBeRemovedNotification,
-                                 cPtr, NULL);
-    WMEnqueueNotification(WMGetDefaultNotificationQueue(), notif, WMPostASAP);
-}
-
-
-static int
-sendMessage(WMConnection *cPtr, char *message)
-{
-    WMData *aData;
-    int res;
-
-    if (WMGetConnectionState(cPtr)!=WCConnected)
-        return -1;
-
-    aData = WMCreateDataWithBytes(message, strlen(message));
-    res = WMSendConnectionData(cPtr, aData);
-    WMReleaseData(aData);
-
-    return res;
-}
-
-
-static Bool
-enqueueMessage(WMConnection *cPtr, char *message)
-{
-    WMData *aData;
-    Bool res;
-
-    if (WMGetConnectionState(cPtr)!=WCConnected)
-        return False;
-
-    aData = WMCreateDataWithBytes(message, strlen(message));
-    res = WMEnqueueConnectionData(cPtr, aData);
-    WMReleaseData(aData);
-
-    return res;
-}
-
-
-static unsigned char*
-findDelimiter(unsigned char *data, unsigned const char *endPtr)
-{
-    wassertrv(data < endPtr, NULL);
-
-    while (data<endPtr && *data!='\n' && *data!='\r' && *data!=';' && *data!='\0')
-        data++;
-
-    if (data < endPtr)
-        return data;
-
-    return NULL;
-}
-
-
-static WMArray*
-getAvailableMessages(WMConnection *cPtr)
-{
-    char *ptr, *crtPos, *buffer;
-    const char *bytes, *endPtr;
-    WMData *aData, *receivedData, *holdData;
-    WMRange range;
-    WMArray *messages;
-    int length;
-
-    receivedData = WMGetConnectionAvailableData(cPtr);
-    if (!receivedData)
-        return NULL;
-    if ((length=WMGetDataLength(receivedData))==0) {
-        WMReleaseData(receivedData);
-        return NULL;
-    }
-
-    holdData = (WMData*)WMGetConnectionClientData(cPtr);
-    if (holdData) {
-        WMAppendData(holdData, receivedData);
-        WMReleaseData(receivedData);
-        WMSetConnectionClientData(cPtr, NULL);
-        aData = holdData;
-    } else {
-        aData = receivedData;
-    }
-
-    length = WMGetDataLength(aData);
-    bytes = (char*)WMDataBytes(aData);
-    endPtr = bytes + length;
-
-    messages = WMCreateArrayWithDestructor(1, wfree);
-    crtPos = (char*)bytes;
-    while (crtPos<endPtr && (ptr = findDelimiter(crtPos, endPtr))!=NULL) {
-        range.position = (crtPos - bytes);
-        range.count = (ptr - crtPos);
-        if (range.count > MAXCMD_SIZE) {
-            /* Hmmm... The message is too long. Possibly that someone is
-             * flooding us, or there is a dumb client which do not know
-             * who is talking to. */
-            sendMessage(cPtr, "Command too long\n\r");
-            WMFreeArray(messages);
-            WMReleaseData(aData);
-            WMCloseConnection(cPtr);
-            enqueueConnectionForRemoval(cPtr);
-            return NULL;
-        }
-        buffer = wmalloc(range.count+1);
-        WMGetDataBytesWithRange(aData, buffer, range);
-        buffer[range.count] = '\0';
-        WMAddToArray(messages, buffer);
-        crtPos = ptr;
-        while (crtPos<endPtr && (*crtPos=='\n' || *crtPos=='\r' ||
-                                 *crtPos=='\t' || *crtPos=='\0' ||
-                                 *crtPos==';' || *crtPos==' ')) {
-            crtPos++;
-        }
-    }
-
-    if (crtPos<endPtr) {
-        range.position = (crtPos - bytes);
-        range.count = (endPtr - crtPos);
-        if (range.count > MAXCMD_SIZE) {
-            /* Flooooooding!!!! */
-            sendMessage(cPtr, "Message too long\n\r");
-            WMFreeArray(messages);
-            WMReleaseData(aData);
-            WMCloseConnection(cPtr);
-            enqueueConnectionForRemoval(cPtr);
-            return NULL;
-        }
-        holdData = WMGetSubdataWithRange(aData, range);
-        WMSetConnectionClientData(cPtr, holdData);
-    }
-    WMReleaseData(aData);
-
-    if (WMGetArrayItemCount(messages)==0) {
-        WMFreeArray(messages);
-        messages = NULL;
-    }
-    return messages;
-}
-
-
-
-static void
-complainAboutBadArgs(WMConnection *cPtr, char *cmdName, char *badArgs)
-{
-    char *buf = wmalloc(strlen(cmdName) + strlen(badArgs) + 100);
-
-    sprintf(buf, _("Invalid parameters '%s' for command %s. Use HELP for"
-                   " a list of commands.\n"), badArgs, cmdName);
-    sendMessage(cPtr, buf);
-    wfree(buf);
-}
-
-
-static void
-sendUpdateMessage(WMConnection *cPtr, char *id, int time)
-{
-    char *buf = wmalloc(strlen(id) + 100);
-
-    sprintf(buf, "%s has %i minutes left\n", id, time);
-    sendMessage(cPtr, buf);
-    wfree(buf);
-}
-
-
-static void
-showId(WMConnection *cPtr)
-{
-    sendMessage(cPtr, "Server example based on WMConnection\n");
-}
-
-
-static void
-showHelp(WMConnection *cPtr)
-{
-    char *buf = wmalloc(strlen(WMGetApplicationName()) + 16);
-
-    sprintf(buf, _("%s commands:\n\n"), WMGetApplicationName());
-
-    enqueueMessage(cPtr, _("\n"));
-    enqueueMessage(cPtr, buf);
-    enqueueMessage(cPtr, _("GET <id>\t- return time left (in minutes) "
-                           "for user with id <id>\n"));
-    enqueueMessage(cPtr, _("SET <id> <time>\t- set time limit to <time> "
-                           "minutes for user with id <id>\n"));
-    enqueueMessage(cPtr, _("ADD <id> <time>\t- add <time> minutes "
-                           "for user with id <id>\n"));
-    enqueueMessage(cPtr, _("SUB <id> <time>\t- subtract <time> minutes "
-                           "for user with id <id>\n"));
-    enqueueMessage(cPtr, _("REMOVE <id>\t- remove time limitations for "
-                           "user with id <id>\n"));
-    enqueueMessage(cPtr, _("LIST\t\t- list all users and their "
-                           "corresponding time limit\n"));
-    enqueueMessage(cPtr, _("ID\t\t- returns the Time Manager "
-                           "identification string\n"));
-    enqueueMessage(cPtr, _("EXIT\t\t- exits session\n"));
-    enqueueMessage(cPtr, _("QUIT\t\t- exits session\n"));
-    enqueueMessage(cPtr, _("HELP\t\t- show this message\n\n"));
-    /* Just flush the queue we made before */
-    WMFlushConnection(cPtr);
-    wfree(buf);
-}
-
-
-static void
-listUsers(WMConnection *cPtr)
-{
-    WMPropList *userList;
-    char *id;
-    int i, time;
-
-    userList = WMGetUDKeys(timeDB);
-
-    for (i=0; i<WMGetPropListItemCount(userList); i++) {
-        id = WMGetFromPLString(WMGetFromPLArray(userList, i));
-        time = WMGetUDIntegerForKey(timeDB, id);
-        sendUpdateMessage(cPtr, id, time);
-    }
-
-    WMReleasePropList(userList);
-}
-
-
-static void
-setTimeForUser(WMConnection *cPtr, char *cmdArgs)
-{
-    char *id;
-    int i, time;
-
-    id = wmalloc(strlen(cmdArgs));
-    if (sscanf(cmdArgs, "%s %d", id, &time)!=2) {
-        complainAboutBadArgs(cPtr, "SET", cmdArgs);
-        wfree(id);
-        return;
-    }
-    if (time<0)
-        time = 0;
-
-    WMSetUDIntegerForKey(timeDB, time, id);
-
-    for (i=0; i<WMGetArrayItemCount(clientConnections); i++) {
-        cPtr = WMGetFromArray(clientConnections, i);
-        sendUpdateMessage(cPtr, id, time);
-    }
-    wfree(id);
-}
-
-
-static void
-addTimeToUser(WMConnection *cPtr, char *cmdArgs)
-{
-    char *id;
-    int i, time, newTime;
-
-    id = wmalloc(strlen(cmdArgs));
-    if (sscanf(cmdArgs, "%s %d", id, &time)!=2) {
-        complainAboutBadArgs(cPtr, "ADD", cmdArgs);
-        wfree(id);
-        return;
-    }
-
-    newTime = WMGetUDIntegerForKey(timeDB, id) + time;
-    if (newTime<0)
-        newTime = 0;
-
-    WMSetUDIntegerForKey(timeDB, newTime, id);
-
-    for (i=0; i<WMGetArrayItemCount(clientConnections); i++) {
-        cPtr = WMGetFromArray(clientConnections, i);
-        sendUpdateMessage(cPtr, id, newTime);
-    }
-    wfree(id);
-}
-
-
-static void
-subTimeFromUser(WMConnection *cPtr, char *cmdArgs)
-{
-    char *id;
-    int i, time, newTime;
-
-    id = wmalloc(strlen(cmdArgs));
-    if (sscanf(cmdArgs, "%s %d", id, &time)!=2) {
-        complainAboutBadArgs(cPtr, "SUB", cmdArgs);
-        wfree(id);
-        return;
-    }
-
-    newTime = WMGetUDIntegerForKey(timeDB, id) - time;
-    if (newTime<0)
-        newTime = 0;
-
-    WMSetUDIntegerForKey(timeDB, newTime, id);
-
-    for (i=0; i<WMGetArrayItemCount(clientConnections); i++) {
-        cPtr = WMGetFromArray(clientConnections, i);
-        sendUpdateMessage(cPtr, id, newTime);
-    }
-    wfree(id);
-}
-
-
-static void
-removeTimeForUser(WMConnection *cPtr, char *cmdArgs)
-{
-    char *ptr;
-    int i;
-
-    if (cmdArgs[0]=='\0') {
-        sendMessage(cPtr, _("Missing parameter for command REMOVE."
-                            " Use HELP for a list of commands.\n"));
-        return;
-    }
-
-    ptr = cmdArgs;
-    while (*ptr && *ptr!=' ' && *ptr!='\t')
-        ptr++;
-    *ptr = '\0';
-
-    WMRemoveUDObjectForKey(timeDB, cmdArgs);
-
-    for (i=0; i<WMGetArrayItemCount(clientConnections); i++) {
-        cPtr = WMGetFromArray(clientConnections, i);
-        sendUpdateMessage(cPtr, cmdArgs, -1);
-    }
-}
-
-
-static void
-getTimeForUser(WMConnection *cPtr, char *cmdArgs)
-{
-    char *ptr;
-    int time;
-
-    if (cmdArgs[0]=='\0') {
-        sendMessage(cPtr, _("Missing parameter for command GET."
-                            " Use HELP for a list of commands.\n"));
-        return;
-    }
-
-    ptr = cmdArgs;
-    while (*ptr && *ptr!=' ' && *ptr!='\t')
-        ptr++;
-    *ptr = '\0';
-
-    if (WMGetUDObjectForKey(timeDB, cmdArgs)!=NULL)
-        time = WMGetUDIntegerForKey(timeDB, cmdArgs);
-    else
-        time = -1;
-
-    sendUpdateMessage(cPtr, cmdArgs, time);
-}
-
-
-static void
-handleConnection(WMConnection *cPtr)
-{
-    char *command, *ptr, *cmdArgs, *buffer;
-    WMArray *commands;
-    int i;
-
-    commands = getAvailableMessages(cPtr);
-    if (!commands)
-        return;
-
-    for (i=0; i<WMGetArrayItemCount(commands); i++) {
-        command = WMGetFromArray(commands, i);
-        while (*command && (*command==' ' || *command=='\t'))
-            command++;
-        ptr = command;
-        while(*ptr && *ptr!=' ' && *ptr!='\t')
-            ptr++;
-        if (*ptr) {
-            *ptr = '\0';
-            ptr++;
-        }
-        while (*ptr && (*ptr==' ' || *ptr=='\t'))
-            ptr++;
-
-        cmdArgs = ptr;
-
-        fprintf(stderr, "Command: '%s', args: '%s'\n", command, cmdArgs);
-
-        if (strcasecmp(command, "quit")==0 || strcasecmp(command, "exit")==0) {
-            sendMessage(cPtr, "Bye\n");
-            WMCloseConnection(cPtr);
-            enqueueConnectionForRemoval(cPtr);
-            WMFreeArray(commands);
-            return;
-        } else if (strcasecmp(command, "id")==0) {
-            showId(cPtr);
-        } else if (strcasecmp(command, "help")==0) {
-            showHelp(cPtr);
-        } else if (strcasecmp(command, "list")==0) {
-            listUsers(cPtr);
-        } else if (strcasecmp(command, "set")==0) {
-            setTimeForUser(cPtr, cmdArgs);
-        } else if (strcasecmp(command, "add")==0) {
-            addTimeToUser(cPtr, cmdArgs);
-        } else if (strcasecmp(command, "sub")==0) {
-            subTimeFromUser(cPtr, cmdArgs);
-        } else if (strcasecmp(command, "remove")==0) {
-            removeTimeForUser(cPtr, cmdArgs);
-        } else if (strcasecmp(command, "get")==0) {
-            getTimeForUser(cPtr, cmdArgs);
-        } else {
-            buffer = wmalloc(strlen(command) + 100);
-            sprintf(buffer, _("Unknown command '%s'. Try HELP for"
-                              " a list of commands.\n"), command);
-            sendMessage(cPtr, buffer);
-            wfree(buffer);
-        }
-    }
-
-    WMFreeArray(commands);
-}
-
-
-static Bool
-isAllowedToConnect(WMConnection *cPtr)
-{
-    WMHost *hPtr;
-    int i;
-
-    if (allowedHostList == NULL)
-        return True; /* No list. Allow all by default */
-
-    hPtr = WMGetHostWithAddress(WMGetConnectionAddress(cPtr));
-    for (i=0; i<WMGetArrayItemCount(allowedHostList); i++) {
-        if (WMIsHostEqualToHost(hPtr, WMGetFromArray(allowedHostList, i))) {
-            WMReleaseHost(hPtr);
-            return True;
-        }
-    }
-
-    WMReleaseHost(hPtr);
-
-    return False;
-}
-
-
-static void
-didReceiveInput(ConnectionDelegate *self, WMConnection *cPtr)
-{
-    if (cPtr == serverPtr) {
-        WMConnection *newPtr = WMAcceptConnection(cPtr);
-
-        if (newPtr) {
-            if (isAllowedToConnect(newPtr)) {
-                WMSetConnectionDelegate(newPtr, &socketDelegate);
-                WMSetConnectionSendTimeout(newPtr, 120);
-                WMAddToArray(clientConnections, newPtr);
-            } else {
-                sendMessage(newPtr, "Sorry, you are not allowed to connect.\n");
-                WMDestroyConnection(newPtr);
-            }
-        }
-    } else {
-        /* Data arriving on an already-connected socket */
-        handleConnection(cPtr);
-    }
-}
-
-
-static void
-connectionDidTimeout(ConnectionDelegate *self, WMConnection *cPtr)
-{
-    WMHost *hPtr;
-
-    if (cPtr == serverPtr) {
-        wfatal(_("The server listening socket did timeout. Exiting."));
-        exit(1);
-    }
-
-    hPtr = WMGetHostWithAddress(WMGetConnectionAddress(cPtr));
-    wwarning(_("Connection with %s did timeout. Closing connection."),
-             WMGetHostName(hPtr));
-    WMReleaseHost(hPtr);
-
-    enqueueConnectionForRemoval(cPtr);
-}
-
-
-static void
-connectionDidDie(ConnectionDelegate *self, WMConnection *cPtr)
-{
-    if (cPtr == serverPtr) {
-        /* trouble. server listening port itself died!!! */
-        wfatal(_("The server listening socket died. Exiting."));
-        exit(1);
-    }
-
-    enqueueConnectionForRemoval(cPtr);
-}
-
-
-static void
-removeConnection(void *observer, WMNotification *notification)
-{
-    WMConnection *cPtr = (WMConnection*)WMGetNotificationObject(notification);
-    WMData *data;
-
-    WMRemoveFromArray(clientConnections, cPtr);
-    if ((data = (WMData*)WMGetConnectionClientData(cPtr))!=NULL)
-        WMReleaseData(data);
-    WMDestroyConnection(cPtr);
-}
-
-static void
-updatedDomain(void *observer, WMNotification *notification)
-{
-    wmessage("defaults domain file changed on disk. synchronizing.");
-}
-
-
-#if 0
-static Bool
-isDifferent(char *str1, char *str2)
-{
-    if ((!str1 && !str2) || (str1 && str2 && strcmp(str1, str2)==0))
-        return False;
-
-    return True;
-}
-#endif
-
-
-int
-main(int argc, char **argv)
-{
-    int i;
-
-    wsetabort(wAbort);
-
-    WMInitializeApplication("server", &argc, argv);
-
-    if (argc>1) {
-        for (i=1; i<argc; i++) {
-            if (strcmp(argv[i], "--help")==0) {
-                printHelp(argv[0]);
-                exit(0);
-            } else if (strcmp(argv[i], "--listen")==0) {
-                char *p;
-
-                if ((p = strchr(argv[++i], ':')) != NULL) {
-                    *p = 0;
-                    ServerAddress = wstrdup(argv[i]);
-                    ServerPort = wstrdup(p+1);
-                    *p = ':';
-                    if (ServerAddress[0] == 0) {
-                        wfree(ServerAddress);
-                        ServerAddress = NULL;
-                    }
-                    if (ServerPort[0] == 0) {
-                        wfree(ServerPort);
-                        ServerPort = "34567";
-                    }
-                } else if (argv[i][0]!=0) {
-                    ServerPort = argv[i];
-                }
-            } else if (strcmp(argv[i], "--allow")==0) {
-                char *p, *ptr;
-                int done;
-                WMHost *hPtr;
-
-                ptr = argv[++i];
-                done = 0;
-                while (!done) {
-                    if ((p = strchr(ptr, ',')) != NULL) {
-                        *p = 0;
-                    }
-                    if (*ptr != 0) {
-                        hPtr = WMGetHostWithName(ptr);
-                        if (hPtr) {
-                            if (!allowedHostList)
-                                allowedHostList = WMCreateArray(4);
-                            WMAddToArray(allowedHostList, hPtr);
-                        } else {
-                            wwarning(_("Unknown host '%s'. Ignored."), ptr);
-                        }
-                    }
-
-                    if (p!=NULL) {
-                        *p = ',';
-                        ptr = p+1;
-                    } else {
-                        done = 1;
-                    }
-                }
-            } else {
-                printf(_("%s: invalid argument '%s'\n"), argv[0], argv[i]);
-                printf(_("Try '%s --help' for more information\n"), argv[0]);
-                exit(1);
-            }
-        }
-    }
-
-    timeDB = WMGetDefaultsFromPath("./UserTime.plist");
-    WMAddNotificationObserver(updatedDomain, NULL,
-                              WMUserDefaultsDidChangeNotification, NULL);
-
-    clientConnections = WMCreateArray(4);
-
-    /* A NULL ServerAddress means to listen on any address the host has.
-     * Else if ServerAddress points to a specific address (like "localhost",
-     * "host.domain.com" or "192.168.1.1"), then it will only listen on that
-     * interface and ignore incoming connections on the others. */
-    if (ServerAddress && strcasecmp(ServerAddress, "Any")==0)
-        ServerAddress = NULL;
-    if (ServerPort==NULL)
-        ServerPort = "34567";
-
-    printf("Server will listen on '%s:%s'\n", ServerAddress?ServerAddress:"Any",
-           ServerPort);
-    printf("This server will allow connections from:");
-    if (allowedHostList) {
-        int i;
-        char *hName;
-
-        for (i=0; i<WMGetArrayItemCount(allowedHostList); i++) {
-            hName = WMGetHostName(WMGetFromArray(allowedHostList, i));
-            printf("%s'%s'", i==0?" ":", ", hName);
-        }
-        printf(".\n");
-    } else {
-        printf(" any host.\n");
-    }
-
-    serverPtr = WMCreateConnectionAsServerAtAddress(ServerAddress, ServerPort,
-                                                    NULL);
-
-    if (!serverPtr) {
-        wfatal("could not create server on `%s:%s`. Exiting.",
-               ServerAddress ? ServerAddress : "localhost", ServerPort);
-        exit(1);
-    }
-
-    WMSetConnectionDelegate(serverPtr, &socketDelegate);
-
-    WMAddNotificationObserver(removeConnection, NULL,
-                              SEConnectionShouldBeRemovedNotification, NULL);
-
-    while (1) {
-        /* The ASAP notification queue is called at the end of WHandleEvents()
-         * There's where died connections we get while running through
-         * WHandleEvents() get removed. */
-        WHandleEvents();
-    }
-
-    return 0;
-}
-
-
--- a/WINGs/Extras/.cvsignore
+++ b/WINGs/Extras/.cvsignore
@@ -1,4 +0,0 @@
-Makefile Makefile.in
-.libs
-test
-.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/Extras/Makefile.am
+++ b/WINGs/Extras/Makefile.am
@@ -1,8 +1,6 @@
 ## automake input file for WINGs

-AUTOMAKE_OPTIONS = no-dependencies
-
-
+AUTOMAKE_OPTIONS =

 # is this a kluge? if so, how should i do it?
 includedir = @includedir@/WINGs
@@ -10,24 +8,23 @@ includedir = @includedir@/WINGs
 include_HEADERS = wtableview.h wtabledelegates.h 


-lib_LIBRARIES = libExtraWINGs.a 
+lib_LTLIBRARIES = libExtraWINGs.la

 noinst_PROGRAMS = test

 EXTRA_DIST = 

-libExtraWINGs_a_SOURCES = 	\
+libExtraWINGs_la_SOURCES = 	\
 	wtableview.c \
 	wtabledelegates.c \
 	wtableview.h \
 	wtabledelegates.h 

-
 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG

-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@

 test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
-
--- a/WINGs/Extras/test.c
+++ b/WINGs/Extras/test.c
@@ -1,15 +1,14 @@

-
 #include <WINGs/WINGs.h>
 #include <stdio.h>
+#include <stdint.h>
 #include "wtableview.h"
 #include "wtabledelegates.h"

+static char *col1[20] = { 0 };

-static char *col1[20] = {0};
 static int col2[20];

-
 static char *options[] = {
 	"Option1",
 	"Option2",
@@ -18,16 +17,14 @@ static char *options[] = {
 	"Option5"
 };

-
-int numberOfRows(WMTableViewDelegate *self, WMTableView *table)
+int numberOfRows(WMTableViewDelegate * self, WMTableView * table)
 {
 	return 20;
 }

-
-void *valueForCell(WMTableViewDelegate *self, WMTableColumn *column, int row)
+void *valueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row)
 {
-    /*WMTableView *table = (WMTableView*)WMGetTableColumnTableView(column);*/
+	/*WMTableView *table = (WMTableView*)WMGetTableColumnTableView(column); */
 	int i;
 	if (col1[0] == 0) {
 		for (i = 0; i < 20; i++) {
@@ -39,23 +36,20 @@ void *valueForCell(WMTableViewDelegate *self, WMTableColumn *column, int row)
 			col2[i] = 0;
 		}
 	}
-    if ((int)WMGetTableColumnId(column) == 1)
+	if ((uintptr_t)WMGetTableColumnId(column) == 1)
 		return col1[row];
 	else
-	return (void*)col2[row];
+		return (void *)(uintptr_t) col2[row];
 }

-
-void setValueForCell(WMTableViewDelegate *self, WMTableColumn *column, int row,
-		     void *data)
+void setValueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row, void *data)
 {
-    if ((int)WMGetTableColumnId(column) == 1)
+	if ((uintptr_t)WMGetTableColumnId(column) == 1)
 		col1[row] = data;
 	else
-	col2[row] = (int)data;
+		col2[row] = (uintptr_t) data;
 }

-
 static WMTableViewDelegate delegate = {
 	NULL,
 	numberOfRows,
@@ -63,19 +57,14 @@ static WMTableViewDelegate delegate = {
 	setValueForCell
 };

-
-
-void clickedTable(WMWidget *w, void *self)
+void clickedTable(WMWidget * w, void *self)
 {
-    int row = WMGetTableViewClickedRow((WMTableView*)self);
+	int row = WMGetTableViewClickedRow((WMTableView *) self);

 	WMEditTableViewRow(self, row);
 }

-
-
-int
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	WMScreen *scr;
 	WMWindow *win;
@@ -97,7 +86,7 @@ main(int argc, char **argv)
 	WMSetTableViewHasHorizontalScroller(table, 0);
 	WMSetViewExpandsToParent(WMWidgetView(table), 10, 10, 10, 10);
 	WMSetTableViewBackgroundColor(table, WMWhiteColor(scr));
-    /*WMSetTableViewGridColor(table, WMGrayColor(scr));*/
+	/*WMSetTableViewGridColor(table, WMGrayColor(scr)); */
 	WMSetTableViewHeaderHeight(table, 20);
 	WMSetTableViewDelegate(table, &delegate);
 	WMSetTableViewAction(table, clickedTable, table);
@@ -108,7 +97,7 @@ main(int argc, char **argv)
 	WMSetTableColumnWidth(col, 180);
 	WMAddTableViewColumn(table, col);
 	WMSetTableColumnDelegate(col, colDeleg);
-    WMSetTableColumnId(col, (void*)1);
+	WMSetTableColumnId(col, (void *)1);

 	colDeleg = WTCreateEnumSelectorDelegate(table);
 	WTSetEnumSelectorOptions(colDeleg, options, 5);
@@ -117,7 +106,7 @@ main(int argc, char **argv)
 	WMSetTableColumnWidth(col, 140);
 	WMAddTableViewColumn(table, col);
 	WMSetTableColumnDelegate(col, colDeleg);
-    WMSetTableColumnId(col, (void*)2);	
+	WMSetTableColumnId(col, (void *)2);

 	colDeleg = WTCreateBooleanSwitchDelegate(table);

@@ -125,7 +114,7 @@ main(int argc, char **argv)
 	WMSetTableColumnWidth(col, 50);
 	WMAddTableViewColumn(table, col);
 	WMSetTableColumnDelegate(col, colDeleg);
-    WMSetTableColumnId(col, (void*)2);
+	WMSetTableColumnId(col, (void *)2);

 	WMMapWidget(table);
 	WMRealizeWidget(win);
--- a/WINGs/Extras/wtabledelegates.c
+++ b/WINGs/Extras/wtabledelegates.c
@@ -1,5 +1,5 @@

-
+#include <stdint.h>
 #include <WINGs/WINGsP.h>

 #include "wtableview.h"
@@ -14,14 +14,11 @@ typedef struct {
 	WMColor *textColor;
 } StringData;

-
 typedef struct {
 	WMTableView *table;
 	GC selGc;
 } PixmapData;

-
-
 typedef struct {
 	WMTextField *widget;
 	WMTableView *table;
@@ -31,7 +28,6 @@ typedef struct {
 	WMColor *textColor;
 } StringEditorData;

-
 typedef struct {
 	WMPopUpButton *widget;
 	WMTableView *table;
@@ -43,7 +39,6 @@ typedef struct {
 	WMColor *textColor;
 } EnumSelectorData;

-
 typedef struct {
 	WMButton *widget;
 	WMTableView *table;
@@ -52,57 +47,49 @@ typedef struct {
 	GC selGC;
 } BooleanSwitchData;

-
 static char *SelectionColor = "#bbbbcc";

-
-
-static void stringDraw(WMScreen *scr, Drawable d, GC gc, GC sgc,
-                       WMColor *textColor, WMFont *font, void *data,
-		       WMRect rect, Bool selected)
+static void
+stringDraw(WMScreen * scr, Drawable d, GC gc, GC sgc, WMColor * textColor,
+	   WMFont * font, void *data, WMRect rect, Bool selected)
 {
 	int x, y;
 	XRectangle rects[1];
 	Display *dpy = WMScreenDisplay(scr);

 	x = rect.pos.x + 5;
-    y = rect.pos.y + (rect.size.height - WMFontHeight(font))/2;
+	y = rect.pos.y + (rect.size.height - WMFontHeight(font)) / 2;

-    rects[0].x = rect.pos.x+1;
-    rects[0].y = rect.pos.y+1;
-    rects[0].width = rect.size.width-1;
-    rects[0].height = rect.size.height-1;
+	rects[0].x = rect.pos.x + 1;
+	rects[0].y = rect.pos.y + 1;
+	rects[0].width = rect.size.width - 1;
+	rects[0].height = rect.size.height - 1;
 	XSetClipRectangles(dpy, gc, 0, 0, rects, 1, YXSorted);

 	if (!selected) {
 		XFillRectangles(dpy, d, gc, rects, 1);

-	WMDrawString(scr, d, textColor, font, x, y,
-		     data, strlen(data));	
+		WMDrawString(scr, d, textColor, font, x, y, data, strlen(data));
 	} else {
 		XFillRectangles(dpy, d, sgc, rects, 1);

-	WMDrawString(scr, d, textColor, font, x, y,
-		     data, strlen(data));
+		WMDrawString(scr, d, textColor, font, x, y, data, strlen(data));
 	}

 	XSetClipMask(dpy, gc, None);
 }

-
-
-static void pixmapDraw(WMScreen *scr, Drawable d, GC gc, GC sgc,
-		       WMPixmap *pixmap, WMRect rect, Bool selected)
+static void pixmapDraw(WMScreen * scr, Drawable d, GC gc, GC sgc, WMPixmap * pixmap, WMRect rect, Bool selected)
 {
 	int x, y;
 	XRectangle rects[1];
 	Display *dpy = WMScreenDisplay(scr);
 	WMSize size;

-    rects[0].x = rect.pos.x+1;
-    rects[0].y = rect.pos.y+1;
-    rects[0].width = rect.size.width-1;
-    rects[0].height = rect.size.height-1;
+	rects[0].x = rect.pos.x + 1;
+	rects[0].y = rect.pos.y + 1;
+	rects[0].width = rect.size.width - 1;
+	rects[0].height = rect.size.height - 1;
 	XSetClipRectangles(dpy, gc, 0, 0, rects, 1, YXSorted);

 	if (!selected) {
@@ -130,77 +117,60 @@ static void pixmapDraw(WMScreen *scr, Drawable d, GC gc, GC sgc,
 	XSetClipMask(dpy, gc, None);
 }

-
 /* ---------------------------------------------------------------------- */

-
-
-static void SECellPainter(WMTableColumnDelegate *self,
-			WMTableColumn *column, int row, Drawable d)
+static void SECellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
-    StringEditorData *strdata = (StringEditorData*)self->data;
+	StringEditorData *strdata = (StringEditorData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);

 	stringDraw(WMWidgetScreen(table), d,
 		   strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
-	       WMTableViewDataForCell(table, column, row),
-	       WMTableViewRectForCell(table, column, row),
-	       False);
+		   WMTableViewDataForCell(table, column, row), WMTableViewRectForCell(table, column, row), False);
 }

-
-static void selectedSECellPainter(WMTableColumnDelegate *self,
-				WMTableColumn *column, int row, Drawable d)
+static void selectedSECellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
-    StringEditorData *strdata = (StringEditorData*)self->data;
+	StringEditorData *strdata = (StringEditorData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);

 	stringDraw(WMWidgetScreen(table), d,
 		   strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
-	       WMTableViewDataForCell(table, column, row),
-	       WMTableViewRectForCell(table, column, row),
-	       True);
+		   WMTableViewDataForCell(table, column, row), WMTableViewRectForCell(table, column, row), True);
 }

-
-static void beginSECellEdit(WMTableColumnDelegate *self,
-			  WMTableColumn *column, int row)
+static void beginSECellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
 {
-    StringEditorData *strdata = (StringEditorData*)self->data;    
+	StringEditorData *strdata = (StringEditorData *) self->data;
 	WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
 	void *data = WMTableViewDataForCell(strdata->table, column, row);

-    WMSetTextFieldText(strdata->widget, (char*)data);
+	WMSetTextFieldText(strdata->widget, (char *)data);
 	WMMoveWidget(strdata->widget, rect.pos.x, rect.pos.y);
-    WMResizeWidget(strdata->widget, rect.size.width+1, rect.size.height+1);
+	WMResizeWidget(strdata->widget, rect.size.width + 1, rect.size.height + 1);

 	WMMapWidget(strdata->widget);
 }

-
-static void endSECellEdit(WMTableColumnDelegate *self,
-			WMTableColumn *column, int row)
+static void endSECellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
 {
-    StringEditorData *strdata = (StringEditorData*)self->data;
+	StringEditorData *strdata = (StringEditorData *) self->data;
 	char *text;

 	WMUnmapWidget(strdata->widget);

 	text = WMGetTextFieldText(strdata->widget);
-    WMSetTableViewDataForCell(strdata->table, column, row, (void*)text);
+	WMSetTableViewDataForCell(strdata->table, column, row, (void *)text);
 }

-
-WMTableColumnDelegate *WTCreateStringEditorDelegate(WMTableView *parent)
+WMTableColumnDelegate *WTCreateStringEditorDelegate(WMTableView * parent)
 {
 	WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
 	WMScreen *scr = WMWidgetScreen(parent);
 	StringEditorData *data = wmalloc(sizeof(StringEditorData));

 	data->widget = WMCreateTextField(parent);
-    W_ReparentView(WMWidgetView(data->widget), 
-		   WMGetTableViewDocumentView(parent), 
-		   0, 0);
+	W_ReparentView(WMWidgetView(data->widget), WMGetTableViewDocumentView(parent), 0, 0);
 	data->table = parent;
 	data->font = WMSystemFontOfSize(scr, 12);
 	data->gc = WMColorGC(WMWhiteColor(scr));
@@ -216,82 +186,65 @@ WMTableColumnDelegate *WTCreateStringEditorDelegate(WMTableView *parent)
 	return delegate;
 }

-
-
 /* ---------------------------------------------------------------------- */

-
-static void ESCellPainter(WMTableColumnDelegate *self,
-			WMTableColumn *column, int row, Drawable d)
+static void ESCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
-    EnumSelectorData *strdata = (EnumSelectorData*)self->data;
+	EnumSelectorData *strdata = (EnumSelectorData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+	uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row);

 	stringDraw(WMWidgetScreen(table), d,
 		   strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
-	       strdata->options[i],
-	       WMTableViewRectForCell(table, column, row), 
-	       False);
+		   strdata->options[i], WMTableViewRectForCell(table, column, row), False);
 }

-
-static void selectedESCellPainter(WMTableColumnDelegate *self,
-				WMTableColumn *column, int row, Drawable d)
+static void selectedESCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
-    EnumSelectorData *strdata = (EnumSelectorData*)self->data;
+	EnumSelectorData *strdata = (EnumSelectorData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+	uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row);

 	stringDraw(WMWidgetScreen(table), d,
 		   strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
-	       strdata->options[i], 
-	       WMTableViewRectForCell(table, column, row), 
-	       True);
+		   strdata->options[i], WMTableViewRectForCell(table, column, row), True);
 }

-
-static void beginESCellEdit(WMTableColumnDelegate *self,
-			  WMTableColumn *column, int row)
+static void beginESCellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
 {
-    EnumSelectorData *strdata = (EnumSelectorData*)self->data;    
+	EnumSelectorData *strdata = (EnumSelectorData *) self->data;
 	WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
-    int data = (int)WMTableViewDataForCell(strdata->table, column, row);
+	uintptr_t data = (uintptr_t)WMTableViewDataForCell(strdata->table, column, row);

 	wassertr(data < strdata->count);

 	WMSetPopUpButtonSelectedItem(strdata->widget, data);

 	WMMoveWidget(strdata->widget, rect.pos.x, rect.pos.y);
-    WMResizeWidget(strdata->widget, rect.size.width, rect.size.height+1);
+	WMResizeWidget(strdata->widget, rect.size.width, rect.size.height + 1);

 	WMMapWidget(strdata->widget);
 }

-
-static void endESCellEdit(WMTableColumnDelegate *self,
-			WMTableColumn *column, int row)
+static void endESCellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
 {
-    EnumSelectorData *strdata = (EnumSelectorData*)self->data;
+	EnumSelectorData *strdata = (EnumSelectorData *) self->data;
 	int option;

 	WMUnmapWidget(strdata->widget);

 	option = WMGetPopUpButtonSelectedItem(strdata->widget);
-    WMSetTableViewDataForCell(strdata->table, column, row, (void*)option);
+	WMSetTableViewDataForCell(strdata->table, column, row, (void *)(uintptr_t) option);
 }

-
-WMTableColumnDelegate *WTCreateEnumSelectorDelegate(WMTableView *parent)
+WMTableColumnDelegate *WTCreateEnumSelectorDelegate(WMTableView * parent)
 {
 	WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
 	WMScreen *scr = WMWidgetScreen(parent);
 	EnumSelectorData *data = wmalloc(sizeof(EnumSelectorData));

 	data->widget = WMCreatePopUpButton(parent);
-    W_ReparentView(WMWidgetView(data->widget), 
-		   WMGetTableViewDocumentView(parent), 
-		   0, 0);
+	W_ReparentView(WMWidgetView(data->widget), WMGetTableViewDocumentView(parent), 0, 0);
 	data->table = parent;
 	data->font = WMSystemFontOfSize(scr, 12);
 	data->gc = WMColorGC(WMWhiteColor(scr));
@@ -309,16 +262,12 @@ WMTableColumnDelegate *WTCreateEnumSelectorDelegate(WMTableView *parent)
 	return delegate;
 }

-
-void WTSetEnumSelectorOptions(WMTableColumnDelegate *delegate,
-			      char **options, int count)
+void WTSetEnumSelectorOptions(WMTableColumnDelegate * delegate, char **options, int count)
 {
-    EnumSelectorData *data = (EnumSelectorData*)delegate->data;
+	EnumSelectorData *data = (EnumSelectorData *) delegate->data;
 	int i;

-    for (i = 0;
-	 i < WMGetPopUpButtonNumberOfItems(data->widget);
-	 i++) {
+	for (i = 0; i < WMGetPopUpButtonNumberOfItems(data->widget); i++) {
 		WMRemovePopUpButtonItem(data->widget, 0);
 	}

@@ -330,16 +279,13 @@ void WTSetEnumSelectorOptions(WMTableColumnDelegate *delegate,
 	}
 }

-
-
 /* ---------------------------------------------------------------------- */

-static void BSCellPainter(WMTableColumnDelegate *self,
-			WMTableColumn *column, int row, Drawable d)
+static void BSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
-    BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;
+	BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+	uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row);
 	WMScreen *scr = WMWidgetScreen(table);

 	if (i) {
@@ -348,18 +294,15 @@ static void BSCellPainter(WMTableColumnDelegate *self,
 			   WMTableViewRectForCell(table, column, row), False);
 	} else {
 		pixmapDraw(scr, d,
-		   strdata->gc, strdata->selGC, NULL,
-		   WMTableViewRectForCell(table, column, row), False);
+			   strdata->gc, strdata->selGC, NULL, WMTableViewRectForCell(table, column, row), False);
 	}
 }

-
-static void selectedBSCellPainter(WMTableColumnDelegate *self,
-				WMTableColumn *column, int row, Drawable d)
+static void selectedBSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
-    BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;
+	BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+	uintptr_t i = (uintptr_t)WMTableViewDataForCell(table, column, row);
 	WMScreen *scr = WMWidgetScreen(table);

 	if (i) {
@@ -368,41 +311,34 @@ static void selectedBSCellPainter(WMTableColumnDelegate *self,
 			   WMTableViewRectForCell(table, column, row), True);
 	} else {
 		pixmapDraw(scr, d,
-		   strdata->gc, strdata->selGC, NULL,
-		   WMTableViewRectForCell(table, column, row), True);
+			   strdata->gc, strdata->selGC, NULL, WMTableViewRectForCell(table, column, row), True);
 	}
 }

-
-
-static void beginBSCellEdit(WMTableColumnDelegate *self,
-			  WMTableColumn *column, int row)
+static void beginBSCellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
 {
-    BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;    
+	BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
 	WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
-    int data = (int)WMTableViewDataForCell(strdata->table, column, row);
+	uintptr_t data = (uintptr_t)WMTableViewDataForCell(strdata->table, column, row);

 	WMSetButtonSelected(strdata->widget, data);
-    WMMoveWidget(strdata->widget, rect.pos.x+1, rect.pos.y+1);
-    WMResizeWidget(strdata->widget, rect.size.width-1, rect.size.height-1);
+	WMMoveWidget(strdata->widget, rect.pos.x + 1, rect.pos.y + 1);
+	WMResizeWidget(strdata->widget, rect.size.width - 1, rect.size.height - 1);

 	WMMapWidget(strdata->widget);
 }

-
-static void endBSCellEdit(WMTableColumnDelegate *self,
-			  WMTableColumn *column, int row)
+static void endBSCellEdit(WMTableColumnDelegate * self, WMTableColumn * column, int row)
 {
-    BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;    
+	BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
 	int value;

 	value = WMGetButtonSelected(strdata->widget);
-    WMSetTableViewDataForCell(strdata->table, column, row, (void*)value);
+	WMSetTableViewDataForCell(strdata->table, column, row, (void *)(uintptr_t) value);
 	WMUnmapWidget(strdata->widget);
 }

-
-WMTableColumnDelegate *WTCreateBooleanSwitchDelegate(WMTableView *parent)
+WMTableColumnDelegate *WTCreateBooleanSwitchDelegate(WMTableView * parent)
 {
 	WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
 	WMScreen *scr = WMWidgetScreen(parent);
@@ -410,9 +346,7 @@ WMTableColumnDelegate *WTCreateBooleanSwitchDelegate(WMTableView *parent)
 	WMColor *color;

 	data->widget = WMCreateSwitchButton(parent);
-    W_ReparentView(WMWidgetView(data->widget), 
-		   WMGetTableViewDocumentView(parent), 
-		   0, 0);
+	W_ReparentView(WMWidgetView(data->widget), WMGetTableViewDocumentView(parent), 0, 0);
 	WMSetButtonText(data->widget, NULL);
 	WMSetButtonImagePosition(data->widget, WIPImageOnly);
 	WMSetButtonImage(data->widget, NULL);
@@ -433,39 +367,29 @@ WMTableColumnDelegate *WTCreateBooleanSwitchDelegate(WMTableView *parent)
 	return delegate;
 }

-
 /* ---------------------------------------------------------------------- */

-
-static void SCellPainter(WMTableColumnDelegate *self,
-			WMTableColumn *column, int row, Drawable d)
+static void SCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
-    StringData *strdata = (StringData*)self->data;
+	StringData *strdata = (StringData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);

 	stringDraw(WMWidgetScreen(table), d,
 		   strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
-	       WMTableViewDataForCell(table, column, row),
-	       WMTableViewRectForCell(table, column, row),
-	       False);
+		   WMTableViewDataForCell(table, column, row), WMTableViewRectForCell(table, column, row), False);
 }

-
-static void selectedSCellPainter(WMTableColumnDelegate *self,
-				WMTableColumn *column, int row, Drawable d)
+static void selectedSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
-    StringData *strdata = (StringData*)self->data;
+	StringData *strdata = (StringData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);

 	stringDraw(WMWidgetScreen(table), d,
 		   strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
-	       WMTableViewDataForCell(table, column, row),
-	       WMTableViewRectForCell(table, column, row),
-	       True);
+		   WMTableViewDataForCell(table, column, row), WMTableViewRectForCell(table, column, row), True);
 }

-
-WMTableColumnDelegate *WTCreateStringDelegate(WMTableView *parent)
+WMTableColumnDelegate *WTCreateStringDelegate(WMTableView * parent)
 {
 	WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
 	WMScreen *scr = WMWidgetScreen(parent);
@@ -486,39 +410,31 @@ WMTableColumnDelegate *WTCreateStringDelegate(WMTableView *parent)
 	return delegate;
 }

-
 /* ---------------------------------------------------------------------- */

-
-static void PCellPainter(WMTableColumnDelegate *self,
-			WMTableColumn *column, int row, Drawable d)
+static void PCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
-    StringData *strdata = (StringData*)self->data;
+	StringData *strdata = (StringData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);

 	pixmapDraw(WMWidgetScreen(table), d,
 		   strdata->gc, strdata->selGC,
-	       (WMPixmap*)WMTableViewDataForCell(table, column, row),
-	       WMTableViewRectForCell(table, column, row),
-	       False);
+		   (WMPixmap *) WMTableViewDataForCell(table, column, row),
+		   WMTableViewRectForCell(table, column, row), False);
 }

-
-static void selectedPCellPainter(WMTableColumnDelegate *self,
-				WMTableColumn *column, int row, Drawable d)
+static void selectedPCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
-    StringData *strdata = (StringData*)self->data;
+	StringData *strdata = (StringData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);

 	pixmapDraw(WMWidgetScreen(table), d,
 		   strdata->gc, strdata->selGC,
-	       (WMPixmap*)WMTableViewDataForCell(table, column, row),
-	       WMTableViewRectForCell(table, column, row),
-	       True);
+		   (WMPixmap *) WMTableViewDataForCell(table, column, row),
+		   WMTableViewRectForCell(table, column, row), True);
 }

-
-WMTableColumnDelegate *WTCreatePixmapDelegate(WMTableView *table)
+WMTableColumnDelegate *WTCreatePixmapDelegate(WMTableView * table)
 {
 	WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
 	WMScreen *scr = WMWidgetScreen(table);
@@ -537,14 +453,11 @@ WMTableColumnDelegate *WTCreatePixmapDelegate(WMTableView *table)
 	return delegate;
 }

-
 /* ---------------------------------------------------------------------- */

-
-static void drawPSCell(WMTableColumnDelegate *self, Drawable d,
-		       WMTableColumn *column, int row, Bool selected)
+static void drawPSCell(WMTableColumnDelegate * self, Drawable d, WMTableColumn * column, int row, Bool selected)
 {
-    StringData *strdata = (StringData*)self->data;
+	StringData *strdata = (StringData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);
 	void **data;
 	WMPixmap *pix;
@@ -554,8 +467,8 @@ static void drawPSCell(WMTableColumnDelegate *self, Drawable d,

 	data = WMTableViewDataForCell(table, column, row);

-    str = (char*)data[0];    
-    pix = (WMPixmap*)data[1];
+	str = (char *)data[0];
+	pix = (WMPixmap *) data[1];

 	rect = WMTableViewRectForCell(table, column, row);

@@ -567,33 +480,27 @@ static void drawPSCell(WMTableColumnDelegate *self, Drawable d,

 		pixmapDraw(WMWidgetScreen(table),
 			   WMViewXID(WMGetTableViewDocumentView(table)),
-		   strdata->gc, strdata->selGC, pix, rect, 
-		   selected);
+			   strdata->gc, strdata->selGC, pix, rect, selected);

-	rect.pos.x += size.width-1;
-	rect.size.width = owidth-size.width+1;
+		rect.pos.x += size.width - 1;
+		rect.size.width = owidth - size.width + 1;
 	}

 	stringDraw(WMWidgetScreen(table), d, strdata->gc, strdata->selGC,
 		   strdata->textColor, strdata->font, str, rect, selected);
 }

-
-static void PSCellPainter(WMTableColumnDelegate *self,
-			  WMTableColumn *column, int row, Drawable d)
+static void PSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
 	drawPSCell(self, d, column, row, False);
 }

-
-static void selectedPSCellPainter(WMTableColumnDelegate *self,
-				  WMTableColumn *column, int row, Drawable d)
+static void selectedPSCellPainter(WMTableColumnDelegate * self, WMTableColumn * column, int row, Drawable d)
 {
 	drawPSCell(self, d, column, row, True);
 }

-
-WMTableColumnDelegate *WTCreatePixmapStringDelegate(WMTableView *parent)
+WMTableColumnDelegate *WTCreatePixmapStringDelegate(WMTableView * parent)
 {
 	WMTableColumnDelegate *delegate = wmalloc(sizeof(WMTableColumnDelegate));
 	WMScreen *scr = WMWidgetScreen(parent);
@@ -613,5 +520,3 @@ WMTableColumnDelegate *WTCreatePixmapStringDelegate(WMTableView *parent)

 	return delegate;
 }
-
-
--- a/WINGs/Extras/wtableview.c
+++ b/WINGs/Extras/wtableview.c
@@ -1,14 +1,12 @@

-
 #include <WINGs/WINGsP.h>
 #include <X11/cursorfont.h>
+#include <stdint.h>

 #include "wtableview.h"

-
 const char *WMTableViewSelectionDidChangeNotification = "WMTableViewSelectionDidChangeNotification";

-
 struct W_TableColumn {
 	WMTableView *table;
 	WMWidget *titleW;
@@ -25,13 +23,11 @@ struct W_TableColumn {
 	unsigned editable:1;
 };

+static void handleResize(W_ViewDelegate * self, WMView * view);

-static void handleResize(W_ViewDelegate *self, WMView *view);
-
-static void rearrangeHeader(WMTableView *table);
-
-static WMRange rowsInRect(WMTableView *table, WMRect rect);
+static void rearrangeHeader(WMTableView * table);

+static WMRange rowsInRect(WMTableView * table, WMRect rect);

 WMTableColumn *WMCreateTableColumn(char *title)
 {
@@ -55,20 +51,17 @@ WMTableColumn *WMCreateTableColumn(char *title)
 	return col;
 }

-
-void WMSetTableColumnId(WMTableColumn *column, void *id)
+void WMSetTableColumnId(WMTableColumn * column, void *id)
 {
 	column->id = id;
 }

-
-void *WMGetTableColumnId(WMTableColumn *column)
+void *WMGetTableColumnId(WMTableColumn * column)
 {
 	return column->id;
 }

-
-void WMSetTableColumnWidth(WMTableColumn *column, unsigned width)
+void WMSetTableColumnWidth(WMTableColumn * column, unsigned width)
 {
 	if (column->maxWidth == 0)
 		column->width = WMAX(column->minWidth, width);
@@ -80,16 +73,12 @@ void WMSetTableColumnWidth(WMTableColumn *column, unsigned width)
 	}
 }

-
-void WMSetTableColumnDelegate(WMTableColumn *column, 
-			      WMTableColumnDelegate *delegate)
+void WMSetTableColumnDelegate(WMTableColumn * column, WMTableColumnDelegate * delegate)
 {
 	column->delegate = delegate;
 }

-
-void WMSetTableColumnConstraints(WMTableColumn *column, 
-				 unsigned minWidth, unsigned maxWidth)
+void WMSetTableColumnConstraints(WMTableColumn * column, unsigned minWidth, unsigned maxWidth)
 {
 	wassertr(maxWidth == 0 || minWidth <= maxWidth);

@@ -102,20 +91,16 @@ void WMSetTableColumnConstraints(WMTableColumn *column,
 		WMSetTableColumnWidth(column, column->maxWidth);
 }

-
-void WMSetTableColumnEditable(WMTableColumn *column, Bool flag)
+void WMSetTableColumnEditable(WMTableColumn * column, Bool flag)
 {
-    column->editable = ((flag==0) ? 0 : 1);
+	column->editable = ((flag == 0) ? 0 : 1);
 }

-
-WMTableView *WMGetTableColumnTableView(WMTableColumn *column)
+WMTableView *WMGetTableColumnTableView(WMTableColumn * column)
 {
 	return column->table;
 }

-
-
 struct W_TableView {
 	W_Class widgetClass;
 	WMView *view;
@@ -174,7 +159,6 @@ struct W_TableView {

 static W_Class tableClass = 0;

-
 static W_ViewDelegate viewDelegate = {
 	NULL,
 	NULL,
@@ -183,16 +167,13 @@ static W_ViewDelegate viewDelegate = {
 	NULL
 };

+static void reorganizeInterior(WMTableView * table);

+static void handleEvents(XEvent * event, void *data);
+static void handleTableEvents(XEvent * event, void *data);
+static void repaintTable(WMTableView * table);

-static void reorganizeInterior(WMTableView *table);
-
-
-static void handleEvents(XEvent *event, void *data);
-static void handleTableEvents(XEvent *event, void *data);
-static void repaintTable(WMTableView *table);
-
-static WMSize getTotalSize(WMTableView *table)
+static WMSize getTotalSize(WMTableView * table)
 {
 	WMSize size;
 	int i;
@@ -213,8 +194,7 @@ static WMSize getTotalSize(WMTableView *table)
 	return size;
 }

-
-static WMRect getVisibleRect(WMTableView *table)
+static WMRect getVisibleRect(WMTableView * table)
 {
 	WMSize size = getTotalSize(table);
 	WMRect rect;
@@ -238,8 +218,7 @@ static WMRect getVisibleRect(WMTableView *table)
 	return rect;
 }

-
-static void scrollToPoint(WMTableView *table, int x, int y)
+static void scrollToPoint(WMTableView * table, int x, int y)
 {
 	WMSize size = getTotalSize(table);
 	int i;
@@ -268,7 +247,6 @@ static void scrollToPoint(WMTableView *table, int x, int y)
 		WMSetScrollerParameters(table->vscroll, value, prop);
 	}

-
 	if (table->editingRow >= 0) {
 		for (i = 0; i < WMGetArrayItemCount(table->columns); i++) {
 			WMTableColumn *column;
@@ -276,16 +254,14 @@ static void scrollToPoint(WMTableView *table, int x, int y)
 			column = WMGetFromArray(table->columns, i);

 			if (column->delegate && column->delegate->beginCellEdit)
-		(*column->delegate->beginCellEdit)(column->delegate, column, 
-						   table->editingRow);
+				(*column->delegate->beginCellEdit) (column->delegate, column, table->editingRow);
 		}
 	}

 	repaintTable(table);
 }

-
-static void adjustScrollers(WMTableView *table)
+static void adjustScrollers(WMTableView * table)
 {
 	WMSize size = getTotalSize(table);
 	WMSize vsize = WMGetViewSize(table->tableView);
@@ -302,8 +278,8 @@ static void adjustScrollers(WMTableView *table)
 				oprop = 1.0;
 			ovalue = WMGetScrollerValue(table->hscroll);

-            prop = (float)vsize.width/(float)size.width;
-            value = prop*ovalue / oprop;
+			prop = (float)vsize.width / (float)size.width;
+			value = prop * ovalue / oprop;
 		}
 		WMSetScrollerParameters(table->hscroll, value, prop);
 	}
@@ -318,17 +294,16 @@ static void adjustScrollers(WMTableView *table)
 				oprop = 1.0;
 			ovalue = WMGetScrollerValue(table->vscroll);

-            prop = (float)vsize.height/(float)size.height;	
-            value = prop*ovalue / oprop;	
+			prop = (float)vsize.height / (float)size.height;
+			value = prop * ovalue / oprop;
 		}
 		WMSetScrollerParameters(table->vscroll, value, prop);
 	}
 }

-
-static void doScroll(WMWidget *self, void *data)
+static void doScroll(WMWidget * self, void *data)
 {
-    WMTableView *table = (WMTableView*)data;
+	WMTableView *table = (WMTableView *) data;
 	float value;
 	float vpsize;
 	float size;
@@ -336,7 +311,7 @@ static void doScroll(WMWidget *self, void *data)

 	value = WMGetScrollerValue(self);

-    if (table->hscroll == (WMScroller *)self) {
+	if (table->hscroll == (WMScroller *) self) {
 		vpsize = W_VIEW_WIDTH(table->tableView);
 		size = ts.width;
 	} else {
@@ -350,8 +325,7 @@ static void doScroll(WMWidget *self, void *data)
 		value -= (float)table->rowHeight / size;
 		if (value < 0)
 			value = 0.0;
-	WMSetScrollerParameters(self, value,
-				WMGetScrollerKnobProportion(self));
+		WMSetScrollerParameters(self, value, WMGetScrollerKnobProportion(self));
 		repaintTable(table);
 		break;

@@ -360,8 +334,7 @@ static void doScroll(WMWidget *self, void *data)
 		value += (float)table->rowHeight / size;
 		if (value > 1.0)
 			value = 1.0;
-	WMSetScrollerParameters(self, value,
-				WMGetScrollerKnobProportion(self));
+		WMSetScrollerParameters(self, value, WMGetScrollerKnobProportion(self));
 		repaintTable(table);
 		break;

@@ -373,8 +346,7 @@ static void doScroll(WMWidget *self, void *data)
 		value -= vpsize / size;
 		if (value < 0.0)
 			value = 0.0;
-	WMSetScrollerParameters(self, value,
-				WMGetScrollerKnobProportion(self));
+		WMSetScrollerParameters(self, value, WMGetScrollerKnobProportion(self));
 		repaintTable(table);
 		break;

@@ -382,12 +354,10 @@ static void doScroll(WMWidget *self, void *data)
 		value += vpsize / size;
 		if (value > 1.0)
 			value = 1.0;
-	WMSetScrollerParameters(self, value,
-				WMGetScrollerKnobProportion(self));
+		WMSetScrollerParameters(self, value, WMGetScrollerKnobProportion(self));
 		repaintTable(table);
 		break;

-
 	case WSNoPart:
 	case WSKnobSlot:
 		break;
@@ -401,12 +371,10 @@ static void doScroll(WMWidget *self, void *data)
 			column = WMGetFromArray(table->columns, i);

 			if (column->delegate && column->delegate->beginCellEdit)
-		(*column->delegate->beginCellEdit)(column->delegate, column, 
-						   table->editingRow);
+				(*column->delegate->beginCellEdit) (column->delegate, column, table->editingRow);
 		}
 	}

-    
 	if (table->hscroll == self) {
 		int x = 0;
 		int i;
@@ -428,11 +396,9 @@ static void doScroll(WMWidget *self, void *data)
 	}
 }

-
-static void
-splitterHandler(XEvent *event, void *data)
+static void splitterHandler(XEvent * event, void *data)
 {
-    WMTableColumn *column = (WMTableColumn*)data;
+	WMTableColumn *column = (WMTableColumn *) data;
 	WMTableView *table = column->table;
 	int done = 0;
 	int cx, ox, offsX;
@@ -449,12 +415,12 @@ splitterHandler(XEvent *event, void *data)

 	ox = cx = offsX;

-    XDrawLine(dpy, w, gc, cx+20, 0, cx+20, h);
+	XDrawLine(dpy, w, gc, cx + 20, 0, cx + 20, h);

 	while (!done) {
 		XEvent ev;

-	WMMaskEvent(dpy, ButtonMotionMask|ButtonReleaseMask, &ev);
+		WMMaskEvent(dpy, ButtonMotionMask | ButtonReleaseMask, &ev);

 		switch (ev.type) {
 		case MotionNotify:
@@ -462,14 +428,13 @@ splitterHandler(XEvent *event, void *data)

 			if (column->width + ev.xmotion.x < column->minWidth)
 				cx = pos.x + column->minWidth;
-	    else if (column->maxWidth > 0 
-		&& column->width + ev.xmotion.x > column->maxWidth)
+			else if (column->maxWidth > 0 && column->width + ev.xmotion.x > column->maxWidth)
 				cx = pos.x + column->maxWidth;
 			else
 				cx = offsX + ev.xmotion.x;

-	    XDrawLine(dpy, w, gc, ox+20, 0, ox+20, h);	    
-	    XDrawLine(dpy, w, gc, cx+20, 0, cx+20, h);
+			XDrawLine(dpy, w, gc, ox + 20, 0, ox + 20, h);
+			XDrawLine(dpy, w, gc, cx + 20, 0, cx + 20, h);
 			break;

 		case ButtonRelease:
@@ -479,19 +444,17 @@ splitterHandler(XEvent *event, void *data)
 		}
 	}

-    XDrawLine(dpy, w, gc, cx+20, 0, cx+20, h);
+	XDrawLine(dpy, w, gc, cx + 20, 0, cx + 20, h);
 	rearrangeHeader(table);
 	repaintTable(table);
 }

-
-static void realizeTable(void *data, WMNotification *notif)
+static void realizeTable(void *data, WMNotification * notif)
 {
 	repaintTable(data);
 }

-
-WMTableView *WMCreateTableView(WMWidget *parent)
+WMTableView *WMCreateTableView(WMWidget * parent)
 {
 	WMTableView *table = wmalloc(sizeof(WMTableView));
 	WMScreen *scr = WMWidgetScreen(parent);
@@ -514,7 +477,7 @@ WMTableView *WMCreateTableView(WMWidget *parent)

 	table->hscroll = WMCreateScroller(table);
 	WMSetScrollerAction(table->hscroll, doScroll, table);
-    WMMoveWidget(table->hscroll, 1, 2+table->headerHeight);
+	WMMoveWidget(table->hscroll, 1, 2 + table->headerHeight);
 	WMMapWidget(table->hscroll);

 	table->hasHScroller = 1;
@@ -522,7 +485,7 @@ WMTableView *WMCreateTableView(WMWidget *parent)
 	table->vscroll = WMCreateScroller(table);
 	WMSetScrollerArrowsPosition(table->vscroll, WSAMaxEnd);
 	WMSetScrollerAction(table->vscroll, doScroll, table);
-    WMMoveWidget(table->vscroll, 1, 2+table->headerHeight);
+	WMMoveWidget(table->vscroll, 1, 2 + table->headerHeight);
 	WMMapWidget(table->vscroll);

 	table->hasVScroller = 1;
@@ -539,20 +502,18 @@ WMTableView *WMCreateTableView(WMWidget *parent)
 	WMSetLabelRelief(table->corner, WRRaised);
 	WMSetWidgetBackgroundColor(table->corner, scr->darkGray);

-
 	table->tableView = W_CreateView(table->view);
 	if (!table->tableView)
 		goto error;
 	table->tableView->self = table;
 	W_MapView(table->tableView);

-    WMAddNotificationObserver(realizeTable, table, WMViewRealizedNotification,
-			      table->tableView);
+	WMAddNotificationObserver(realizeTable, table, WMViewRealizedNotification, table->tableView);

 	table->tableView->flags.dontCompressExpose = 1;

 	table->gridColor = WMCreateNamedColor(scr, "#cccccc", False);
- /*   table->gridColor = WMGrayColor(scr);*/
+	/*   table->gridColor = WMGrayColor(scr); */

 	{
 		XGCValues gcv;
@@ -562,8 +523,7 @@ WMTableView *WMCreateTableView(WMWidget *parent)
 		gcv.foreground = WMColorPixel(table->gridColor);
 		gcv.dashes = 1;
 		gcv.line_style = LineOnOffDash;
-	table->gridGC = XCreateGC(WMScreenDisplay(scr), W_DRAWABLE(scr),
-				  GCForeground, &gcv);
+		table->gridGC = XCreateGC(WMScreenDisplay(scr), W_DRAWABLE(scr), GCForeground, &gcv);
 	}

 	table->editingRow = -1;
@@ -579,17 +539,14 @@ WMTableView *WMCreateTableView(WMWidget *parent)

 	table->selectedRows = WMCreateArray(16);

-    table->splitterCursor = XCreateFontCursor(WMScreenDisplay(scr),
-					      XC_sb_h_double_arrow);
+	table->splitterCursor = XCreateFontCursor(WMScreenDisplay(scr), XC_sb_h_double_arrow);

 	table->canSelectRow = 1;

-    WMCreateEventHandler(table->view, ExposureMask|StructureNotifyMask,
-                         handleEvents, table);
+	WMCreateEventHandler(table->view, ExposureMask | StructureNotifyMask, handleEvents, table);

-    WMCreateEventHandler(table->tableView, ExposureMask|ButtonPressMask|
-			 ButtonReleaseMask|ButtonMotionMask,
-                         handleTableEvents, table);
+	WMCreateEventHandler(table->tableView, ExposureMask | ButtonPressMask |
+			     ButtonReleaseMask | ButtonMotionMask, handleTableEvents, table);

 	WMResizeWidget(table, 50, 50);

@@ -604,8 +561,7 @@ WMTableView *WMCreateTableView(WMWidget *parent)
 	return NULL;
 }

-
-void WMAddTableViewColumn(WMTableView *table, WMTableColumn *column)
+void WMAddTableViewColumn(WMTableView * table, WMTableColumn * column)
 {
 	WMScreen *scr = WMWidgetScreen(table);

@@ -620,8 +576,7 @@ void WMAddTableViewColumn(WMTableView *table, WMTableColumn *column)
 		WMSetLabelTextColor(column->titleW, scr->white);
 		WMSetWidgetBackgroundColor(column->titleW, scr->darkGray);
 		WMSetLabelText(column->titleW, column->title);
-	W_ReparentView(WMWidgetView(column->titleW),
-		       WMWidgetView(table->header), 0, 0);
+		W_ReparentView(WMWidgetView(column->titleW), WMWidgetView(table->header), 0, 0);
 		if (W_VIEW_REALIZED(table->view))
 			WMRealizeWidget(column->titleW);
 		WMMapWidget(column->titleW);
@@ -639,8 +594,7 @@ void WMAddTableViewColumn(WMTableView *table, WMTableColumn *column)
 		W_MapView(splitter);

 		W_SetViewCursor(splitter, table->splitterCursor);
-	WMCreateEventHandler(splitter, ButtonPressMask|ButtonReleaseMask,
-			     splitterHandler, column);
+		WMCreateEventHandler(splitter, ButtonPressMask | ButtonReleaseMask, splitterHandler, column);

 		WMAddToArray(table->splitters, splitter);
 	}
@@ -648,69 +602,56 @@ void WMAddTableViewColumn(WMTableView *table, WMTableColumn *column)
 	rearrangeHeader(table);
 }

-
-void WMSetTableViewHeaderHeight(WMTableView *table, unsigned height)
+void WMSetTableViewHeaderHeight(WMTableView * table, unsigned height)
 {
 	table->headerHeight = height;

 	handleResize(NULL, table->view);
 }

-
-void WMSetTableViewDelegate(WMTableView *table, WMTableViewDelegate *delegate)
+void WMSetTableViewDelegate(WMTableView * table, WMTableViewDelegate * delegate)
 {
 	table->delegate = delegate;
 }

-
-void WMSetTableViewAction(WMTableView *table, WMAction *action, void *clientData)
+void WMSetTableViewAction(WMTableView * table, WMAction * action, void *clientData)
 {
 	table->action = action;

 	table->clientData = clientData;
 }

-
-void *WMGetTableViewClickedColumn(WMTableView *table)
+void *WMGetTableViewClickedColumn(WMTableView * table)
 {
 	return table->clickedColumn;
 }

-
-int WMGetTableViewClickedRow(WMTableView *table)
+int WMGetTableViewClickedRow(WMTableView * table)
 {
 	return table->clickedRow;
 }

-
-WMArray *WMGetTableViewSelectedRows(WMTableView *table)
+WMArray *WMGetTableViewSelectedRows(WMTableView * table)
 {
 	return table->selectedRows;
 }

-
-WMView *WMGetTableViewDocumentView(WMTableView *table)
+WMView *WMGetTableViewDocumentView(WMTableView * table)
 {
 	return table->tableView;
 }

-
-void *WMTableViewDataForCell(WMTableView *table, WMTableColumn *column, 
-			     int row)
+void *WMTableViewDataForCell(WMTableView * table, WMTableColumn * column, int row)
 {
-    return (*table->delegate->valueForCell)(table->delegate, column, row);
+	return (*table->delegate->valueForCell) (table->delegate, column, row);
 }

-
-void WMSetTableViewDataForCell(WMTableView *table, WMTableColumn *column, 
-			       int row, void *data)
+void WMSetTableViewDataForCell(WMTableView * table, WMTableColumn * column, int row, void *data)
 {
-    (*table->delegate->setValueForCell)(table->delegate, column, row, data);
+	(*table->delegate->setValueForCell) (table->delegate, column, row, data);
 }

-
-WMRect WMTableViewRectForCell(WMTableView *table, WMTableColumn *column, 
-			      int row)
+WMRect WMTableViewRectForCell(WMTableView * table, WMTableColumn * column, int row)
 {
 	WMRect rect;
 	int i;
@@ -741,21 +682,17 @@ WMRect WMTableViewRectForCell(WMTableView *table, WMTableColumn *column,
 	return rect;
 }

-
-void WMSetTableViewDataSource(WMTableView *table, void *source)
+void WMSetTableViewDataSource(WMTableView * table, void *source)
 {
 	table->dataSource = source;
 }

-
-void *WMGetTableViewDataSource(WMTableView *table)
+void *WMGetTableViewDataSource(WMTableView * table)
 {
 	return table->dataSource;
 }

-
-
-void WMSetTableViewHasHorizontalScroller(WMTableView *tPtr, Bool flag)
+void WMSetTableViewHasHorizontalScroller(WMTableView * tPtr, Bool flag)
 {
 	if (flag) {
 		if (tPtr->hasHScroller)
@@ -790,7 +727,7 @@ void WMSetTableViewHasHorizontalScroller(WMTableView *tPtr, Bool flag)

 #if 0
 /* not supported by now */
-void WMSetTableViewHasVerticalScroller(WMTableView *tPtr, Bool flag)
+void WMSetTableViewHasVerticalScroller(WMTableView * tPtr, Bool flag)
 {
 	if (flag) {
 		if (tPtr->hasVScroller)
@@ -824,7 +761,7 @@ void WMSetTableViewHasVerticalScroller(WMTableView *tPtr, Bool flag)
 }
 #endif

-void WMSetTableViewBackgroundColor(WMTableView *table, WMColor *color)
+void WMSetTableViewBackgroundColor(WMTableView * table, WMColor * color)
 {
 	W_SetViewBackgroundColor(table->tableView, color);

@@ -836,27 +773,22 @@ void WMSetTableViewBackgroundColor(WMTableView *table, WMColor *color)
 	repaintTable(table);
 }

-
-void WMSetTableViewGridColor(WMTableView *table, WMColor *color)
+void WMSetTableViewGridColor(WMTableView * table, WMColor * color)
 {
 	WMReleaseColor(table->gridColor);
 	table->gridColor = WMRetainColor(color);
-    XSetForeground(WMScreenDisplay(WMWidgetScreen(table)), table->gridGC, 
-		   WMColorPixel(color));
+	XSetForeground(WMScreenDisplay(WMWidgetScreen(table)), table->gridGC, WMColorPixel(color));
 	repaintTable(table);
 }

-
-
-void WMSetTableViewRowHeight(WMTableView *table, int height)
+void WMSetTableViewRowHeight(WMTableView * table, int height)
 {
 	table->rowHeight = height;

 	repaintTable(table);
 }

-
-void WMScrollTableViewRowToVisible(WMTableView *table, int row)
+void WMScrollTableViewRowToVisible(WMTableView * table, int row)
 {
 	WMScroller *scroller;
 	WMRange range;
@@ -875,15 +807,13 @@ void WMScrollTableViewRowToVisible(WMTableView *table, int row)
 	} else {
 		return;
 	}
-    tmp = table->rows*table->rowHeight - rect.size.height;
+	tmp = table->rows * table->rowHeight - rect.size.height;
 	newY = WMAX(0, WMIN(newY, tmp));

 	scrollToPoint(table, rect.pos.x, newY);
 }

-
-
-static void drawGrid(WMTableView *table, WMRect rect)
+static void drawGrid(WMTableView * table, WMRect rect)
 {
 	WMScreen *scr = WMWidgetScreen(table);
 	Display *dpy = WMScreenDisplay(scr);
@@ -895,12 +825,12 @@ static void drawGrid(WMTableView *table, WMRect rect)
 	GC gc = table->gridGC;

 #if 0
-    char dashl[1] = {1};
+	char dashl[1] = { 1 };

 	XSetDashes(dpy, gc, 0, dashl, 1);

-    y1 = (rect.pos.y/table->rowHeight - 1)*table->rowHeight;
-    y2 = y1 + (rect.size.height/table->rowHeight+2)*table->rowHeight;
+	y1 = (rect.pos.y / table->rowHeight - 1) * table->rowHeight;
+	y2 = y1 + (rect.size.height / table->rowHeight + 2) * table->rowHeight;
 #endif
 	y1 = 0;
 	y2 = W_VIEW_HEIGHT(table->tableView);
@@ -922,10 +852,10 @@ static void drawGrid(WMTableView *table, WMRect rect)
 	if (x2 <= x1)
 		return;
 #if 0
-    XSetDashes(dpy, gc, (rect.pos.x&1), dashl, 1);
+	XSetDashes(dpy, gc, (rect.pos.x & 1), dashl, 1);
 #endif

-    y1 = -rect.pos.y%table->rowHeight;
+	y1 = -rect.pos.y % table->rowHeight;
 	y2 = y1 + rect.size.height + table->rowHeight;

 	for (i = y1; i <= y2; i += table->rowHeight) {
@@ -933,8 +863,7 @@ static void drawGrid(WMTableView *table, WMRect rect)
 	}
 }

-
-static WMRange columnsInRect(WMTableView *table, WMRect rect)
+static WMRange columnsInRect(WMTableView * table, WMRect rect)
 {
 	WMTableColumn *column;
 	int pos;
@@ -964,8 +893,7 @@ static WMRange columnsInRect(WMTableView *table, WMRect rect)
 	return range;
 }

-
-static WMRange rowsInRect(WMTableView *table, WMRect rect)
+static WMRange rowsInRect(WMTableView * table, WMRect rect)
 {
 	WMRange range;
 	int rh = table->rowHeight;
@@ -979,30 +907,28 @@ static WMRange rowsInRect(WMTableView *table, WMRect rect)
 	return range;
 }

-
-static void drawRow(WMTableView *table, int row, WMRect clipRect)
+static void drawRow(WMTableView * table, int row, WMRect clipRect)
 {
 	int i;
 	WMRange cols = columnsInRect(table, clipRect);
 	WMTableColumn *column;
 	Drawable d = WMGetPixmapXID(table->viewBuffer);

-    for (i = cols.position; i < cols.position+cols.count; i++) {
+	for (i = cols.position; i < cols.position + cols.count; i++) {
 		column = WMGetFromArray(table->columns, i);

 		if (!column->delegate || !column->delegate->drawCell)
 			continue;

-	if (WMFindInArray(table->selectedRows, NULL, (void*)row) != WANotFound)
-	    (*column->delegate->drawSelectedCell)(column->delegate, column, row, d);
+		if (WMFindInArray(table->selectedRows, NULL, (void *)(uintptr_t) row) != WANotFound)
+			(*column->delegate->drawSelectedCell) (column->delegate, column, row, d);
 		else
-	    (*column->delegate->drawCell)(column->delegate, column, row, d);
+			(*column->delegate->drawCell) (column->delegate, column, row, d);
 	}
 }

-
 #if 0
-static void drawFullRow(WMTableView *table, int row)
+static void drawFullRow(WMTableView * table, int row)
 {
 	int i;
 	WMTableColumn *column;
@@ -1014,38 +940,36 @@ static void drawFullRow(WMTableView *table, int row)
 		if (!column->delegate || !column->delegate->drawCell)
 			continue;

-	if (WMFindInArray(table->selectedRows, NULL, (void*)row) != WANotFound)
-	    (*column->delegate->drawSelectedCell)(column->delegate, column, row, d);
+		if (WMFindInArray(table->selectedRows, NULL, (void *)row) != WANotFound)
+			(*column->delegate->drawSelectedCell) (column->delegate, column, row, d);
 		else
-	    (*column->delegate->drawCell)(column->delegate, column, row, d);
+			(*column->delegate->drawCell) (column->delegate, column, row, d);
 	}
 }
 #endif

-
-static void setRowSelected(WMTableView *table, unsigned row, Bool flag)
+static void setRowSelected(WMTableView * table, unsigned row, Bool flag)
 {
 	int repaint = 0;

-    if (WMFindInArray(table->selectedRows, NULL, (void*)row) != WANotFound) {
+	if (WMFindInArray(table->selectedRows, NULL, (void *)(uintptr_t) row) != WANotFound) {
 		if (!flag) {
-	    WMRemoveFromArray(table->selectedRows, (void*)row);
+			WMRemoveFromArray(table->selectedRows, (void *)(uintptr_t) row);
 			repaint = 1;
 		}
 	} else {
 		if (flag) {
-	    WMAddToArray(table->selectedRows, (void*)row);
+			WMAddToArray(table->selectedRows, (void *)(uintptr_t) row);
 			repaint = 1;
 		}
 	}
 	if (repaint && row < table->rows) {
-	/*drawFullRow(table, row);*/
+		/*drawFullRow(table, row); */
 		repaintTable(table);
 	}
 }

-
-static void repaintTable(WMTableView *table)
+static void repaintTable(WMTableView * table)
 {
 	WMRect rect;
 	WMRange rows;
@@ -1060,15 +984,13 @@ static void repaintTable(WMTableView *table)
 	if (!table->viewBuffer) {
 		table->viewBuffer = WMCreatePixmap(scr,
 						   W_VIEW_WIDTH(table->tableView),
-					   W_VIEW_HEIGHT(table->tableView),
-					   WMScreenDepth(scr), 0);
+						   W_VIEW_HEIGHT(table->tableView), WMScreenDepth(scr), 0);
 	}

 	XFillRectangle(scr->display,
 		       WMGetPixmapXID(table->viewBuffer),
 		       WMColorGC(table->backColor), 0, 0,
-		   W_VIEW_WIDTH(table->tableView),
-		   W_VIEW_HEIGHT(table->tableView));
+		       W_VIEW_WIDTH(table->tableView), W_VIEW_HEIGHT(table->tableView));

 	rect = getVisibleRect(table);

@@ -1077,19 +999,15 @@ static void repaintTable(WMTableView *table)
 	}

 	rows = rowsInRect(table, rect);
-    for (i = rows.position;
-	 i < WMIN(rows.position+rows.count + 1, table->rows);
-	 i++) {
+	for (i = rows.position; i < WMIN(rows.position + rows.count + 1, table->rows); i++) {
 		drawRow(table, i, rect);
 	}

-    XSetWindowBackgroundPixmap(scr->display, table->tableView->window,
-			       WMGetPixmapXID(table->viewBuffer));
+	XSetWindowBackgroundPixmap(scr->display, table->tableView->window, WMGetPixmapXID(table->viewBuffer));
 	XClearWindow(scr->display, table->tableView->window);
 }

-
-static void stopRowEdit(WMTableView *table, int row)
+static void stopRowEdit(WMTableView * table, int row)
 {
 	int i;
 	WMTableColumn *column;
@@ -1099,13 +1017,11 @@ static void stopRowEdit(WMTableView *table, int row)
 		column = WMGetFromArray(table->columns, i);

 		if (column->delegate && column->delegate->endCellEdit)
-	    (*column->delegate->endCellEdit)(column->delegate, column, row);
+			(*column->delegate->endCellEdit) (column->delegate, column, row);
 	}
 }

-
-
-void WMEditTableViewRow(WMTableView *table, int row)
+void WMEditTableViewRow(WMTableView * table, int row)
 {
 	int i;
 	WMTableColumn *column;
@@ -1123,12 +1039,11 @@ void WMEditTableViewRow(WMTableView *table, int row)
 		column = WMGetFromArray(table->columns, i);

 		if (column->delegate && column->delegate->beginCellEdit)
-	    (*column->delegate->beginCellEdit)(column->delegate, column, row);
+			(*column->delegate->beginCellEdit) (column->delegate, column, row);
 	}
 }

-
-void WMSelectTableViewRow(WMTableView *table, int row)
+void WMSelectTableViewRow(WMTableView * table, int row)
 {
 	if (table->clickedRow >= 0)
 		setRowSelected(table, table->clickedRow, False);
@@ -1141,13 +1056,11 @@ void WMSelectTableViewRow(WMTableView *table, int row)
 	table->clickedRow = row;

 	if (table->action)
-	(*table->action)(table, table->clientData);
-    WMPostNotificationName(WMTableViewSelectionDidChangeNotification,
-			   table, NULL);
+		(*table->action) (table, table->clientData);
+	WMPostNotificationName(WMTableViewSelectionDidChangeNotification, table, NULL);
 }

-
-void WMReloadTableView(WMTableView *table)
+void WMReloadTableView(WMTableView * table)
 {
 	if (table->editingRow >= 0)
 		stopRowEdit(table, table->editingRow);
@@ -1159,16 +1072,15 @@ void WMReloadTableView(WMTableView *table)

 	if (table->clickedRow >= 0) {
 		if (table->action)
-	    (*table->action)(table, table->clientData);
-	WMPostNotificationName(WMTableViewSelectionDidChangeNotification,
-			       table, NULL);
+			(*table->action) (table, table->clientData);
+		WMPostNotificationName(WMTableViewSelectionDidChangeNotification, table, NULL);
 		table->clickedRow = -1;
 	}

 	if (table->delegate && table->delegate->numberOfRows) {
 		int rows;

-	rows = (*table->delegate->numberOfRows)(table->delegate, table);
+		rows = (*table->delegate->numberOfRows) (table->delegate, table);

 		if (rows != table->rows) {
 			table->rows = rows;
@@ -1179,16 +1091,14 @@ void WMReloadTableView(WMTableView *table)
 	}
 }

-
-void WMNoteTableViewNumberOfRowsChanged(WMTableView *table)
+void WMNoteTableViewNumberOfRowsChanged(WMTableView * table)
 {
 	WMReloadTableView(table);
 }

-
-static void handleTableEvents(XEvent *event, void *data)
+static void handleTableEvents(XEvent * event, void *data)
 {
-    WMTableView *table = (WMTableView*)data;
+	WMTableView *table = (WMTableView *) data;
 	int row;

 	switch (event->type) {
@@ -1196,7 +1106,7 @@ static void handleTableEvents(XEvent *event, void *data)
 		if (event->xbutton.button == Button1) {
 			WMRect rect = getVisibleRect(table);

-	    row = (event->xbutton.y + rect.pos.y)/table->rowHeight;
+			row = (event->xbutton.y + rect.pos.y) / table->rowHeight;
 			if (row != table->clickedRow) {
 				setRowSelected(table, table->clickedRow, False);
 				setRowSelected(table, row, True);
@@ -1212,7 +1122,7 @@ static void handleTableEvents(XEvent *event, void *data)
 		if (table->dragging && event->xmotion.y >= 0) {
 			WMRect rect = getVisibleRect(table);

-	    row = (event->xmotion.y + rect.pos.y)/table->rowHeight;
+			row = (event->xmotion.y + rect.pos.y) / table->rowHeight;
 			if (table->clickedRow != row && row >= 0 && row < table->rows) {
 				setRowSelected(table, table->clickedRow, False);
 				setRowSelected(table, row, True);
@@ -1224,38 +1134,33 @@ static void handleTableEvents(XEvent *event, void *data)
 	case ButtonRelease:
 		if (event->xbutton.button == Button1) {
 			if (table->action)
-		(*table->action)(table, table->clientData);
-	    WMPostNotificationName(WMTableViewSelectionDidChangeNotification,
-				   table, NULL);
+				(*table->action) (table, table->clientData);
+			WMPostNotificationName(WMTableViewSelectionDidChangeNotification, table, NULL);
 			table->dragging = 0;
 		}
 		break;
 	}
 }

-
-static void handleEvents(XEvent *event, void *data)
+static void handleEvents(XEvent * event, void *data)
 {
-    WMTableView *table = (WMTableView*)data;
+	WMTableView *table = (WMTableView *) data;
 	WMScreen *scr = WMWidgetScreen(table);

 	switch (event->type) {
 	case Expose:
 		W_DrawRelief(scr, W_VIEW_DRAWABLE(table->view), 0, 0,
-		     W_VIEW_WIDTH(table->view), W_VIEW_HEIGHT(table->view),
-		     WRSunken);
+			     W_VIEW_WIDTH(table->view), W_VIEW_HEIGHT(table->view), WRSunken);
 		break;
 	}
 }

-
-static void handleResize(W_ViewDelegate *self, WMView *view)
+static void handleResize(W_ViewDelegate * self, WMView * view)
 {
 	reorganizeInterior(view->self);
 }

-
-static void reorganizeInterior(WMTableView *table)
+static void reorganizeInterior(WMTableView * table)
 {
 	int width;
 	int height;
@@ -1282,11 +1187,11 @@ static void reorganizeInterior(WMTableView *table)

 	if (table->hscroll) {
 		WMMoveWidget(table->hscroll, vsThickness, W_VIEW_HEIGHT(view) - hsThickness - 1);
-        WMResizeWidget(table->hscroll, width-(vsThickness+1), hsThickness);
+		WMResizeWidget(table->hscroll, width - (vsThickness + 1), hsThickness);
 	}

 	if (table->header)
-	WMResizeWidget(table->header, width-(vsThickness+1), table->headerHeight);
+		WMResizeWidget(table->header, width - (vsThickness + 1), table->headerHeight);

 	if (table->viewBuffer) {
 		WMReleasePixmap(table->viewBuffer);
@@ -1296,25 +1201,23 @@ static void reorganizeInterior(WMTableView *table)
 	width -= vsThickness;
 	height -= hsThickness;

-
 	vw = WMIN(size.width, width);
 	vh = WMIN(size.height, height);

-    W_MoveView(table->tableView, vsThickness+1, 1+table->headerHeight+1);
-    W_ResizeView(table->tableView, WMAX(vw, 1), WMAX(vh, 1)+1);
+	W_MoveView(table->tableView, vsThickness + 1, 1 + table->headerHeight + 1);
+	W_ResizeView(table->tableView, WMAX(vw, 1), WMAX(vh, 1) + 1);

 	adjustScrollers(table);

 	repaintTable(table);
 }

-
-static void rearrangeHeader(WMTableView *table)
+static void rearrangeHeader(WMTableView * table)
 {
 	int width;
 	int count;
 	int i;
-    /*WMRect rect = WMGetScrollViewVisibleRect(table->scrollView);*/
+	/*WMRect rect = WMGetScrollViewVisibleRect(table->scrollView); */

 	width = 0;

@@ -1324,10 +1227,10 @@ static void rearrangeHeader(WMTableView *table)
 		WMView *splitter = WMGetFromArray(table->splitters, i);

 		WMMoveWidget(column->titleW, width, 0);
-	WMResizeWidget(column->titleW, column->width-1, table->headerHeight);
+		WMResizeWidget(column->titleW, column->width - 1, table->headerHeight);

 		width += column->width;
-	W_MoveView(splitter, width-1, 0);	
+		W_MoveView(splitter, width - 1, 0);
 	}

 	wassertr(table->delegate && table->delegate->numberOfRows);
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -1,51 +1,32 @@
 ## automake input file for WINGs

-AUTOMAKE_OPTIONS = no-dependencies
+AUTOMAKE_OPTIONS =

-SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
+SUBDIRS = WINGs . po Documentation Resources

-
-
-#libWINGs_la_LDFLAGS = -version-info 1:1:0
+libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@
+libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@

 bin_SCRIPTS = get-wings-flags get-wutil-flags

-lib_LIBRARIES = libWINGs.a libWUtil.a
+lib_LTLIBRARIES = libWUtil.la libWINGs.la


-LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
+LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
+libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@
+libWUtil_la_LIBADD = @LIBBSD@

-
-EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i \
-	python/WINGs.py python/setup.py python/test.py
+EXTRA_DIST = BUGS make-rgb Examples Extras Tests get-wings-flags.in get-wutil-flags.in


 # wbutton.c 
-libWINGs_a_SOURCES = 	\
-	array.c \
-	bagtree.c \
+libWINGs_la_SOURCES = 	\
 	configuration.c \
-	connection.c \
-	data.c \
+	dragcommon.c \
 	dragdestination.c \
 	dragsource.c \
-	error.c \
-	findfile.c \
-	handlers.c \
-	hashtable.c \
-	host.c \
-	international.c \
-	memory.c \
-	misc.c \
-	notification.c \
-	proplist.c \
+	rgb.h \
 	selection.c \
-	snprintf.c \
-	string.c \
-	tree.c \
-	userdefaults.c \
-	usleep.c \
-	wapplication.c \
 	wappresource.c \
 	wballoon.c \
 	wbox.c \
@@ -81,23 +62,18 @@ libWINGs_a_SOURCES = 	\
 	wview.c \
 	wwindow.c

-
-libWUtil_a_SOURCES = 	\
+libWUtil_la_SOURCES = 	\
 	array.c \
 	bagtree.c \
-	connection.c \
 	data.c \
 	error.c \
 	findfile.c \
 	handlers.c \
 	hashtable.c \
-	host.c \
-	international.c \
 	memory.c \
 	misc.c \
 	notification.c \
 	proplist.c \
-	snprintf.c \
 	string.c \
 	tree.c \
 	userdefaults.c \
@@ -107,23 +83,41 @@ libWUtil_a_SOURCES = 	\
 	wutil.c


-CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" -DDEBUG
+AM_CFLAGS =

 INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
+	@XFTFLAGS@ @HEADER_SEARCH_PATH@

+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = WINGs.pc

-wcolorpanel.o: wcolorpanel.c
-	$(COMPILE) -c -DRGBTXT="\"@X_LIBRARY_PATH@/X11/rgb.txt\"" $<
+DISTCLEANFILES = $(pkgconfig_DATA) get-wings-flags get-wutil-flags

-DISTCLEANFILES = WINGs.pc
+WINGs.pc: Makefile
+	@echo "Generating $@"
+	@echo 'Name: WINGs' > $@
+	@echo 'Description: Small widget set with the NeXTStep(TM) look and feel' >> $@
+	@echo 'Version: $(VERSION)' >> $@
+	@echo 'Requires: wrlib' >> $@
+	@echo 'Libs: $(lib_search_path) -lWINGs' >> $@
+	@echo 'Libs.private: $(XFTLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
+	@echo 'Cflags: $(inc_search_path)' >> $@
+
+get-wings-flags: get-wings-flags.in Makefile
+	@echo "Generating $@"
+	@$(SED) -e 's#$${inc_search_path}#$(inc_search_path)#;' \
+	        -e 's#$${lib_search_path}#$(lib_search_path)#;' \
+	        -e 's#$${GFXLIBS}#$(GFXLIBS)#;' \
+	        -e 's#$${XFTLIBS}#$(XFTLIBS)#;' \
+	        -e 's#$${INTLIBS}#$(INTLIBS)#;' \
+	        -e 's#$${XLIBS}#$(XLIBS)#;' < $(dir $<@)get-wings-flags.in > $@
+	@chmod 755 $@
+
+get-wutil-flags: get-wutil-flags.in Makefile
+	@echo "Generating $@"
+	@$(SED) -e 's#$${includedir}#$(includedir)#;' \
+	        -e 's#$${libdir}#$(libdir)#;' \
+	        -e 's#$${INTLIBS}#$(INTLIBS)#;' < $(dir $<@)get-wutil-flags.in > $@
+	@chmod 755 $@

-install-exec-local:
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig
-	@list='WINGs.pc'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \
-	  else :; fi; \
-	done
--- a/WINGs/NEWS
+++ b/WINGs/NEWS
@@ -1,3 +1,160 @@
+** API and ABI modifications since wmaker 0.92.0
+
+** libWINGs **
+<WINGsP.h>
+struct W_DragDestinationInfo: new members added SIZE CHANGE
+
+<WINGs.h>
+WMGetTextFieldCursorPosition ADDED
+WC_Matrix REMOVED from enum.
+WMCreateProgressIndicator REMOVED
+WMSetProgressIndicatorMinValue REMOVED
+WMSetProgressIndicatorMaxValue REMOVED
+WMSetProgressIndicatorValue REMOVED
+WMGetProgressIndicatorMinValue REMOVED
+WMGetProgressIndicatorMaxValue REMOVED
+WMGetProgressIndicatorValue REMOVED
+typedef struct W_Ruler WMRuler REMOVED
+typedef struct WMRulerMargins REMOVED
+WMAppendTextBlock REMOVED
+WMAppendTextStream REMOVED
+WMCreateRuler  REMOVED
+WMCreateTextBlockWithObject REMOVED
+WMCreateTextBlockWithPixmap REMOVED
+WMCreateTextBlockWithText REMOVED
+WMCreateTextForDocumentType REMOVED
+WMDestroyTextBlock REMOVED
+WMFindInTextStream REMOVED
+WMFreezeText REMOVED
+WMGetGrabbedRulerMargin REMOVED
+WMGetReleasedRulerMargin REMOVED
+WMGetRulerMargins REMOVED
+WMGetRulerOffset REMOVED
+WMGetTextBlockProperties REMOVED
+WMGetTextDefaultColor REMOVED
+WMGetTextDefaultFont REMOVED
+WMGetTextEditable REMOVED
+WMGetTextIgnoresNewline REMOVED
+WMGetTextInsertType REMOVED
+WMGetTextObjects REMOVED
+WMGetTextRulerShown REMOVED
+WMGetTextSelectedObjects REMOVED
+WMGetTextSelectedStream REMOVED
+WMGetTextSelectionColor REMOVED
+WMGetTextSelectionFont REMOVED
+WMGetTextSelectionUnderlined REMOVED
+WMGetTextStream REMOVED
+WMGetTextUsesMonoFont REMOVED
+WMIsMarginEqualToMargin REMOVED
+WMPageText REMOVED
+WMPrependTextBlock REMOVED
+WMPrependTextStream REMOVED
+WMRemoveTextBlock REMOVED
+WMReplaceTextSelection REMOVED
+WMScrollText REMOVED
+WMSetRulerMargins REMOVED
+WMSetRulerMoveAction REMOVED
+WMSetRulerOffset REMOVED
+WMSetRulerReleaseAction REMOVED
+WMSetTextAlignment REMOVED
+WMSetTextBackgroundColor REMOVED
+WMSetTextBackgroundPixmap REMOVED
+WMSetTextBlockProperties REMOVED
+WMSetTextDefaultColor REMOVED
+WMSetTextDefaultFont REMOVED
+WMSetTextDelegate REMOVED
+WMSetTextEditable REMOVED
+WMSetTextForegroundColor REMOVED
+WMSetTextHasHorizontalScroller REMOVED
+WMSetTextHasRuler REMOVED
+WMSetTextHasVerticalScroller REMOVED
+WMSetTextIgnoresNewline REMOVED
+WMSetTextIndentNewLines REMOVED
+WMSetTextRelief REMOVED
+WMSetTextSelectionColor REMOVED
+WMSetTextSelectionFont REMOVED
+WMSetTextSelectionUnderlined REMOVED
+WMSetTextUsesMonoFont REMOVED
+WMShowTextRuler REMOVED
+WMThawText REMOVED
+WMRefreshText REMOVED
+WMCreateText REMOVED
+WMClearText REMOVED
+
+
+
+
+** libWutil **
+enum WMConnectionState REMOVED
+enum WMConnectionTimeoutState REMOVED
+struct ConnectionDelegate REMOVED
+__wmessage ADDED
+wstrerror REMOVED
+wmessage converted from function to wrapper macro
+wwarning converted from function to wrapper macro
+wfatal converted from function to wrapper macro
+wsyserror converted from function to wrapper macro
+wsyserror REMOVED (use werror instead)
+werror macro ADDED (replaces wsyserror)
+wsyserrorwithcode removed
+wmkdirhier ADDED
+wrmdirhier ADDED
+wmalloc0 REMOVED
+wnew REMOVED
+wnew0 REMOVED
+wstrlcpy ADDED
+wstrlcat ADDED
+WMPushInArray REMOVED
+WMWritePropListToFile NUMBER OF FUNCTION ARGUMENTS CHANGED
+WMGetCurrentHost
+WMGetHostWithName
+WMGetHostWithAddress
+WMRetainHost
+WMReleaseHost
+WMSetHostCacheEnabled
+WMIsHostCacheEnabled
+WMFlushHostCache
+WMIsHostEqualToHost
+WMGetHostName
+WMGetHostNames
+WMGetHostAddress
+WMCreateConnectionAsServerAtAddress REMOVED
+WMCreateConnectionToAddress REMOVED
+WMCreateConnectionToAddressAndNotify REMOVED
+WMCloseConnection REMOVED
+WMDestroyConnection REMOVED
+WMConnection* WMAcceptConnection REMOVED
+WMGetConnectionAvailableData REMOVED
+WMSendConnectionData REMOVED
+WMEnqueueConnectionData REMOVED
+WMFlushConnection REMOVED
+WMSetConnectionDelegate REMOVED
+WMGetConnectionService REMOVED
+WMGetConnectionProtocol REMOVED
+WMSetConnectionNonBlocking REMOVED
+WMSetConnectionCloseOnExec REMOVED
+WMSetConnectionShutdownOnClose REMOVED
+WMGetConnectionClientData REMOVED
+WMSetConnectionClientData REMOVED
+WMGetConnectionFlags REMOVED
+WMSetConnectionFlags REMOVED
+WMGetConnectionSocket REMOVED
+WMGetConnectionState REMOVED
+WMGetConnectionTimeoutState REMOVED
+WMGetConnectionUnsentData REMOVED
+WMGetConnectionQueuedData REMOVED
+WMSetConnectionDefaultTimeout REMOVED
+WMSetConnectionOpenTimeout REMOVED
+WMSetConnectionSendTimeout REMOVED
+
+WMTreeWalkProc ADDED
+WMTreeWalk ADDED
+wshellquote ADDED
+
+
+
+----------------------------------------------------
+
 *** Mon Oct 14 19:42:42 EEST 2002 - Dan

 Double buffering
@@ -6,38 +163,16 @@ Double buffering
 To avoid flickering caused by redrawing the widgets on Expose events, a
 double buffering tehnique was implemented for most of the widgets.
 This flickering effect has gotten more vizible with the introduction
-of antialiased text. If with normal text one can redraw the text over the
+of antialiased fonts. If with normal text one can redraw the text over the
 old one over and over again without any degradation of the text (new pixels
 simply overwrite old pixels), with antialiased text the situation is
-different.
-The pixels that constitute the antialias around the text are partially
-transparent pixels, which let part of the background be visible through them.
-If antialiased text is drawn over and over again, whithout first erasing the
-old one, the partially transparent pixels of the antialias will no longer
-see the background through them, but some of them will see the old pixels of
-the antialias around the old text that was there before. This for example
-will make a black antialiased text over a white background get thicker as
-the pixels of the antialias around it, combine with semitransparent black
-pixels of the old antialias instead of combining with the white background.
-The result is that the antialias will get darker (in this case) and the text
-will be altered.
+different and text gets quickly corrupted. To avoid this corruption, one
+needs to first erase the area where the text will go, which can cause the
+before mentioned flickering.
+The double buffer is implemented to solve this issue.

-Because of this the area where text is drawn needs to be cleared before
-antialiased text can be drawn again. But between the moment whent he area is
-cleared and the moment when the text is drawn again there is a small time
-gap that results in flickering. This doesn't happen with normal text where
-one doesn't need to clear the area before drawing the text, but instead can
-simply draw over and over again.
-
-To avoid this situation, a double buffering tehnique was used. Instead of
-drawing directly in the wisget's window (which is mapped and will flicker as
-described above), we draw in a pixmap (unmapped) and after all is done we
-XCopyArea() from that pixmap to the real window.
-Since all this takes place off-screen, no flickering will be observed in
-this case.
-
-This is a change that that will be automatically available for your
-applications and will require no change from you.
+This is a change that that will be automatically available for any WINGs
+applications and will require no change in the existing code.
 However there is an exception from this in case of WMList if you delegate
 the drawing of items to userspace (read below for the compelte details).

@@ -57,20 +192,12 @@ the user code doing item drawing, but instead pass this pixmap in which we
 draw before copying to the real window.

 Since one cannot use XClearWindow() or XClearArea() on pixmaps, but only on
-windows, if your list item drawing code used to contain these to clear the
-item area before drawing it needs to change, else the application will die
-when it tires to XClearArea() on a pixmap.
+windows, if the code drawing list items used to call these functions to clear
+the item area before drawing it needs to change to using XFillRectangle()
+instead.

-This means that in your application if you ever used WMSetListUserDrawProc()
-so set a userspace routine which draws WMList items in a particular fashion,
-you need to make sure your function will not call XClearArea() or
-XClearWindow() on the drawable that was passed to draw in.
-
-Instead you should use XFillRectangle().
-
-This change also means that you no longer need to do double buffering in
-your code, if you ever used to do. It is not done by WINGs and you benefit
-from it automatically.
+With this change it also means that there is no longer any need to do any
+double buffering in the user code, since it's already done by WINGs.


 *** Mon Oct 14 19:28:35 EEST 2002 - Dan
@@ -84,7 +211,7 @@ drawn, while WMDrawImageString() takes 2 WMColor* arguments in place of the
 old GC: first for text color and second for background color.

 This change is required to support extending WMFont to allow it to handle
-antialiased fonts through the XFree86 Xft extension.
+antialiased fonts through the XFree86 Xft2 extension.

 This also has the advantage of hiding low level X11 details and use WINGs
 internat objects instead.
@@ -121,81 +248,23 @@ and have the color of the foreground respective the background of the old gc.

 *** Wed Oct  9 07:10:04 EEST 2002 - Dan

-Xft support in WINGs
--------------------
+Antialiased font support
+------------------------

-If Xft is detected when configure it is run, support for drawing antialiased
-fonts with transparency will be compiled into WINGs.
-You need at least Xfree86 version 4.0.x for this but at least 4.1.x is
-recommended.
+With the addition of Xft2 support in the WINGs library, now WINGs can display
+antialiased text with TrueType or any scalable fonts.

-For Xft support there are 2 new functions to create a font that will render
-using antialiasing and transparency: WMCreateAntialiasedFont() and
-WMCreateAntialiasedFontSet(). Later is for multibyte languages.
-Passing such a font to WMDrawString() or WMDrawImageString() will result
-in antialiased text displayed on screen. Modifying the alpha value for the
-WMColor passed to WMDrawString() or WMDrawImageString() will result in text
-being displayed with the appropriate transparency.
+Antialiased text is enabled by default, but can be disabled by adding

-To control antialiased font behavior, there are 3 new options that go into
-WMGLOBAL. Two of them are to set the system font used when an antialiased
-font is required. They operate in a similar way as SystemFont and
-BoldSystemFont, just they are used when antialiased fonts are requested.
-They are named AntialiasedSystemFont respectively AntialiasedBoldSystemFont.
-They are kept separate from SystemFont and BoldSystemFont because the same
-fonts don't render well as both normal and antialiased if they are not
-TrueType fonts. Even though you can specify any font in the XLFD format for
-these new options, it is recomended to use TrueType fonts for the antialiased
-case since other fonts (standard X fonts)  don't render well and give ugly
-results.
+AntialiasedText = NO; in ~/GNUstep/Defaults/WMGLOBAL

-The third option is an option that globally controls if WINGs uses or not
-antialiased fonts. It is named AntialiasedText and it has a boolean Yes/No
-value. If set to Yes, WINGs will try to use antialiased fonts (if support
-was compiled in, and antialiased fonts can be found) then revert to normal
-fonts if not possible. Note that this applies if WMCreateFont(),
-WMSystemFont(), WMSystemFontOfSize(), WMBoldSystemFont() or
-WMBoldSystemFontOFize() are used. If any of the direct creation functions
-are used, such as WMCreateAntialiasedFont() or WMCreateNormalFont(), then
-that kind of font is returned independently of the value of AntialiasedText.
-(However note that an antialiased font cannot be created if Xft support was
-no compiled into WINGs, even if you call WMCreateAntialiasedFont() directly.
-In this case WMCreateAntialiasedFont() will always return NULL)
-
-These 3 options from WMGLOBAL (which apply to all WINGs applications) can be
-overwritten on a per application basis by putting them in the application's 
-specific domain file (usually ~/GNUstep/Defaults/application_name).
-
-There is also another new font creation function available.
-WMCreateFontWithFlags(screen, fontName, flags)
-
-flags will specify what kind of font to create. They are defined in WINGs.h
-as an enum: WMFontFlags
-
-If WFDefaultFont is passed then the function will work exactly like 
-WMCreateFont() by creating a font according to the options from the
-configuration.
-However if some specific flag is passed than that option will be altered. All
-the other options will keep their default values.
-
-There are 2 font options available (at this time):
-1. Font type (if a normal font or a font set)
-2. Font antialiasing (if it's an antialiased font or not)
-
-If flags specifies a value for each of the available options then a specific
-font which only takes into account those flag values will be created and all
-the font options specified in the configuration (like MultiByte or Antialiasing)
-will be ignored.
-However if only some of the options are specified, then for the missing options
-the default values from the configuration will be used.
-
-For example if antialiasing is enabled in the configuration and you pass
-WFNotAntialiased as the flag, then a font with all the properties defined in
-the configuration (except antialiasing) will be created. This means that if 
-MultiByte is defined a fontset will be created, else a normal font will be 
-created and you don't have to worry about the rest of the flags you didn't
-specify.
+This will disable antialiased text for any WINGs based application. If you
+only want to disable them for a specific application only, like WindowMaker
+for example, then add the same option in the applications configuration file,
+in this case ~/GNUstep/Defaults/WindowMaker

+Note that bitmapped fonts look much better than TrueType when antialiasing is
+disabled.


 *** Mon Sep 09 06:58:30 EEST 2002 - Dan
--- a/WINGs/README
+++ b/WINGs/README
@@ -5,7 +5,7 @@

                          Alfredo Kengi Kojima 
                  
-                          kojima@windowmaker.org
+                          kojima@windowmaker.info


   WINGs is a small widget set with the N*XTSTEP look and feel. It's API
@@ -26,7 +26,7 @@ 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 it's functions are designed to support the Window Maker window
-manager (see http://windowmaker.org) In fact, it's 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
--- a/WINGs/Resources/.cvsignore
+++ b/WINGs/Resources/.cvsignore
@@ -1,2 +0,0 @@
-Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/Tests/.cvsignore
+++ b/WINGs/Tests/.cvsignore
@@ -1,4 +0,0 @@
-Makefile Makefile.in
-testtext testcolorpanel testmywidget wmfile wmquery wtest
-.libs
-.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/Tests/Makefile.am
+++ b/WINGs/Tests/Makefile.am
@@ -1,21 +1,22 @@
 ## automake input file for WINGs - Tests

-AUTOMAKE_OPTIONS = no-dependencies
+AUTOMAKE_OPTIONS =

 noinst_PROGRAMS = wtest wmquery wmfile testmywidget 

-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+	$(top_builddir)/WINGs/libWUtil.la \
 	@XFTLIBS@ @INTLIBS@


 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 

-wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la


 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png

 INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
-
+	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ \
+	-DDEBUG
 	
--- a/WINGs/Tests/mywidget.c
+++ b/WINGs/Tests/mywidget.c
@@ -7,7 +7,6 @@
 *
 */

-
 /*
 *
 * Include the WINGs private data header.
@@ -35,19 +34,13 @@ typedef struct W_MyWidget {

 } _MyWidget;

-
-
-
 /* some forward declarations */

-static void destroyMyWidget(_MyWidget *mPtr);
-static void paintMyWidget(_MyWidget *mPtr);
-
-
-static void handleEvents(XEvent *event, void *data);
-static void handleActionEvents(XEvent *event, void *data);
-
+static void destroyMyWidget(_MyWidget * mPtr);
+static void paintMyWidget(_MyWidget * mPtr);

+static void handleEvents(XEvent * event, void *data);
+static void handleActionEvents(XEvent * event, void *data);

 /*
 * Delegates
@@ -62,17 +55,14 @@ static W_ViewDelegate _MyWidgetDelegate = {
 	NULL
 };

-
 /* our widget class ID */
 static W_Class myWidgetClass = 0;

-
 /*
 * Initializer for our widget. Must be called before creating any
 * instances of the widget.
 */
-W_Class
-InitMyWidget(WMScreen *scr)
+W_Class InitMyWidget(WMScreen * scr)
 {
 	/* register our widget with WINGs and get our widget class ID */
 	if (!myWidgetClass) {
@@ -82,12 +72,10 @@ InitMyWidget(WMScreen *scr)
 	return myWidgetClass;
 }

-
 /*
 * Our widget fabrication plant.
 */
-MyWidget*
-CreateMyWidget(WMWidget *parent)
+MyWidget *CreateMyWidget(WMWidget * parent)
 {
 	MyWidget *mPtr;

@@ -121,53 +109,44 @@ CreateMyWidget(WMWidget *parent)
 	 * Intercept some events for our widget, so that we can handle them.
 	 */
 	WMCreateEventHandler(mPtr->view, ExposureMask	/* this allows us to know when we should paint */
-			 |StructureNotifyMask, /* this allows us to know things like when we are destroyed */
+			     | StructureNotifyMask,	/* this allows us to know things like when we are destroyed */
 			     handleEvents, mPtr);

 	/*
 	 * Intercept some other events. This could be merged with the above
 	 * call, but we separate for more organization.
 	 */
-    WMCreateEventHandler(mPtr->view, ButtonPressMask,handleActionEvents, mPtr);
+	WMCreateEventHandler(mPtr->view, ButtonPressMask, handleActionEvents, mPtr);

 	return mPtr;
 }

-
-
 /*
 * Paint our widget contents.
 */
-static void
-paintMyWidget(_MyWidget *mPtr)
+static void paintMyWidget(_MyWidget * mPtr)
 {
 	W_Screen *scr = mPtr->view->screen;
 	WMColor *color;

-
 	if (mPtr->text) {

 		color = WMWhiteColor(scr);

 		W_PaintText(mPtr->view, mPtr->view->window, scr->normalFont, 0, 0,
-		    mPtr->view->size.width, WACenter, color,
-		    False, mPtr->text, strlen(mPtr->text));
+			    mPtr->view->size.width, WACenter, color, False, mPtr->text, strlen(mPtr->text));

 		WMReleaseColor(color);
 	}
 }

-
-
-static void
-handleEvents(XEvent *event, void *data)
+static void handleEvents(XEvent * event, void *data)
 {
-    _MyWidget *mPtr = (_MyWidget*)data;
-
+	_MyWidget *mPtr = (_MyWidget *) data;

 	switch (event->type) {
 	case Expose:
-	if (event->xexpose.count!=0)
+		if (event->xexpose.count != 0)
 			break;
 		paintMyWidget(mPtr);
 		break;
@@ -179,11 +158,9 @@ handleEvents(XEvent *event, void *data)
 	}
 }

-
-static void
-handleActionEvents(XEvent *event, void *data)
+static void handleActionEvents(XEvent * event, void *data)
 {
-    _MyWidget *mPtr = (_MyWidget*)data;
+	_MyWidget *mPtr = (_MyWidget *) data;

 	switch (event->type) {
 	case ButtonPress:
@@ -193,9 +170,7 @@ handleActionEvents(XEvent *event, void *data)
 	}
 }

-
-void
-SetMyWidgetText(MyWidget *mPtr, char *text)
+void SetMyWidgetText(MyWidget * mPtr, char *text)
 {
 	CHECK_CLASS(mPtr, myWidgetClass);

@@ -209,10 +184,7 @@ SetMyWidgetText(MyWidget *mPtr, char *text)
 	}
 }

-
-
-static void
-destroyMyWidget(_MyWidget *mPtr)
+static void destroyMyWidget(_MyWidget * mPtr)
 {
 	/*
 	 * Free all data we allocated for our widget.
@@ -223,5 +195,3 @@ destroyMyWidget(_MyWidget *mPtr)

 	wfree(mPtr);
 }
-
-
--- a/WINGs/Tests/testmywidget.c
+++ b/WINGs/Tests/testmywidget.c
@@ -1,18 +1,14 @@

-
 #include <WINGs/WINGs.h>
 #include <stdlib.h>

 #include "mywidget.h"

-
-void
-wAbort()
+void wAbort()
 {
 	exit(1);
 }

-
 int main(int argc, char **argv)
 {
 	Display *dpy = XOpenDisplay("");
@@ -20,7 +16,6 @@ int main(int argc, char **argv)
 	WMWindow *win;
 	MyWidget *thing;

-
 	WMInitializeApplication("Test", &argc, argv);

 	if (!dpy) {
--- a/WINGs/Tests/wm.html
+++ b/WINGs/Tests/wm.html
@@ -3,8 +3,8 @@
 <Img src=wm.png></b><p>
 <b>GNU Window Maker</B><br>
 <i>X11 Window Manager</i><p>
-<u>http://windowmaker.org<br>
-ftp.windowmaker.org</u></font><Br>
+<u>http://windowmaker.info<br>
+ftp.windowmaker.info</u></font><Br>
 </center>

 <b><i>Window Maker</b>
--- a/WINGs/Tests/wmfile.c
+++ b/WINGs/Tests/wmfile.c
@@ -4,14 +4,12 @@

 /*
 Update: Franck Wolff <frawolff@club-internet.fr>
-----------------------------------------------------------------------
+ -----------------------------------------------------------------------
 List of updated functions :
 - main :
 add -s option for a save panel...
-----------------------------------------------------------------------
-*/
-
-
+ -----------------------------------------------------------------------
+ */

 #include <WINGs/WINGs.h>

@@ -21,11 +19,7 @@

 #include "logo.xpm"

-
-
-
-void
-wAbort()
+void wAbort()
 {
 	exit(1);
 }
@@ -45,11 +39,7 @@ void usage(void)
 		"\n"
 		"information:\n"
 		"\t%s pops up a WindowMaker style file selection panel.\n"
-	  "\n"
-	  "version:\n"
-	  "\t%s\n"
-	  ,ProgName,ProgName,__DATE__
-	  );
+		"\n" "version:\n" "\t%s\n", ProgName, ProgName, __DATE__);
 	exit(0);
 }

@@ -63,7 +53,7 @@ int main(int argc, char **argv)
 	WMPixmap *pixmap;
 	WMOpenPanel *oPanel;
 	WMSavePanel *sPanel;
-/*  RImage *image;*/
+	/*  RImage *image; */
 	char *title = NULL;
 	char *initial = "/";
 	int ch;
@@ -80,9 +70,8 @@ int main(int argc, char **argv)

 	ProgName = argv[0];

-  while((ch = getopt(argc, argv, "si:ht:")) != -1)
-    switch(ch) 
-    { 
+	while ((ch = getopt(argc, argv, "si:ht:")) != -1)
+		switch (ch) {
 		case 's':
 			panelType = SAVE_PANEL_TYPE;
 			break;
@@ -96,27 +85,25 @@ int main(int argc, char **argv)
 			usage();
 		}

-    for(; optind <argc; optind++)
+	for (; optind < argc; optind++)
 		usage();

 	scr = WMCreateSimpleApplicationScreen(dpy);

-
-	
 	pixmap = WMCreatePixmapFromXPMData(scr, GNUSTEP_XPM);
 	WMSetApplicationIconPixmap(scr, pixmap);
 	WMReleasePixmap(pixmap);
 	if (panelType == SAVE_PANEL_TYPE) {
 		sPanel = WMGetSavePanel(scr);
 		if (WMRunModalFilePanelForDirectory(sPanel, NULL, initial,
-					    /*title*/ NULL, NULL) == True)
+						    /*title */ NULL, NULL) == True)
 			printf("%s\n", WMGetFilePanelFileName(sPanel));
 		else
 			printf("\n");
 	} else {
 		oPanel = WMGetOpenPanel(scr);
 		if (WMRunModalFilePanelForDirectory(oPanel, NULL, initial,
-					    /*title*/ NULL, NULL) == True)
+						    /*title */ NULL, NULL) == True)
 			printf("%s\n", WMGetFilePanelFileName(oPanel));
 		else
 			printf("\n");
--- a/WINGs/Tests/wmquery.c
+++ b/WINGs/Tests/wmquery.c
@@ -3,7 +3,6 @@
 * Author: Len Trigg <trigg@cs.waikato.ac.nz>
 */

-
 #include <WINGs/WINGs.h>

 #include <unistd.h>
@@ -12,11 +11,7 @@

 #include "logo.xpm"

-
-
-
-void
-wAbort()
+void wAbort()
 {
 	exit(1);
 }
@@ -36,11 +31,7 @@ void usage(void)
 		"\n"
 		"information:\n"
 		"\t%s pops up a WindowMaker style input panel.\n"
-	  "\n"
-	  "version:\n"
-	  "\t%s\n"
-	  ,ProgName,ProgName,__DATE__
-	  );
+		"\n" "version:\n" "\t%s\n", ProgName, ProgName, __DATE__);
 	exit(0);
 }

@@ -66,9 +57,8 @@ int main(int argc, char **argv)
 		exit(1);
 	}

-  while((ch = getopt(argc, argv, "i:hp:t:")) != -1)
-    switch(ch) 
-    { 
+	while ((ch = getopt(argc, argv, "i:hp:t:")) != -1)
+		switch (ch) {
 		case 'i':
 			initial = optarg;
 			break;
@@ -82,15 +72,15 @@ int main(int argc, char **argv)
 			usage();
 		}

-  for(; optind <argc; optind++)
+	for (; optind < argc; optind++)
 		usage();

-
 	scr = WMCreateSimpleApplicationScreen(dpy);

 	pixmap = WMCreatePixmapFromXPMData(scr, GNUSTEP_XPM);

-  WMSetApplicationIconPixmap(scr, pixmap); WMReleasePixmap(pixmap);
+	WMSetApplicationIconPixmap(scr, pixmap);
+	WMReleasePixmap(pixmap);

 	if ((result = WMRunInputPanel(scr, NULL, title, prompt, initial, "OK", "Cancel")) != NULL)
 		printf("%s\n", result);
--- a/WINGs/Tests/wtest.c
+++ b/WINGs/Tests/wtest.c
@@ -6,7 +6,7 @@

 #include <stdio.h>
 #include <stdlib.h>
-
+#include <string.h>

 /*
 * You need to define this function to link any program to WINGs.
@@ -14,21 +14,16 @@
 * This will be called when the application will be terminated because
 * of a fatal error (only for memory allocation failures ATM).
 */
-void
-wAbort()
+void wAbort()
 {
 	exit(1);
 }

-
-
-
 Display *dpy;

 int windowCount = 0;

-void
-closeAction(WMWidget *self, void *data)
+void closeAction(WMWidget * self, void *data)
 {
 	WMDestroyWidget(self);
 	windowCount--;
@@ -37,9 +32,7 @@ closeAction(WMWidget *self, void *data)
 		exit(0);
 }

-
-void
-testOpenFilePanel(WMScreen *scr)
+void testOpenFilePanel(WMScreen * scr)
 {
 	WMOpenPanel *panel;

@@ -54,30 +47,25 @@ testOpenFilePanel(WMScreen *scr)
 	WMFreeFilePanel(WMGetOpenPanel(scr));
 }

-
-void
-testFontPanel(WMScreen *scr)
+void testFontPanel(WMScreen * scr)
 {
 	WMFontPanel *panel;

-    /*windowCount++;*/
+	/*windowCount++; */

 	panel = WMGetFontPanel(scr);

 	WMShowFontPanel(panel);

-/*    WMFreeFontPanel(panel);*/
+	/*WMFreeFontPanel(panel); */
 }

-
-
-void
-testFrame(WMScreen *scr)
+void testFrame(WMScreen * scr)
 {
 	WMWindow *win;
 	WMFrame *frame;
 	int i;
-    static char* titles[] = {
+	static char *titles[] = {
 		"AboveTop",
 		"AtTop",
 		"BelowTop",
@@ -103,7 +91,7 @@ testFrame(WMScreen *scr)

 	for (i = 0; i < 6; i++) {
 		frame = WMCreateFrame(win);
-	WMMoveWidget(frame, 8+(i%3)*130, 8+(i/3)*130);
+		WMMoveWidget(frame, 8 + (i % 3) * 130, 8 + (i / 3) * 130);
 		WMResizeWidget(frame, 120, 120);
 		WMSetFrameTitle(frame, titles[i]);
 		WMSetFrameTitlePosition(frame, pos[i]);
@@ -115,18 +103,16 @@ testFrame(WMScreen *scr)

 }

-
-static void
-resizedWindow(void *self, WMNotification *notif)
-{
+/*static void
+ resizedWindow(void *self, WMNotification *notif)
+ {
 WMView *view = (WMView*)WMGetNotificationObject(notif);
 WMSize size = WMGetViewSize(view);

 WMResizeWidget((WMWidget*)self, size.width, size.height);
-}
+ }*/

-void
-testBox(WMScreen *scr)
+void testBox(WMScreen * scr)
 {
 	WMWindow *win;
 	WMBox *box, *hbox;
@@ -145,12 +131,12 @@ testBox(WMScreen *scr)
 	WMSetBoxBorderWidth(box, 5);
 	WMSetViewExpandsToParent(WMWidgetView(box), 0, 0, 0, 0);

-    /*WMSetBoxHorizontal(box, True);*/
+	/*WMSetBoxHorizontal(box, True); */
 	for (i = 0; i < 4; i++) {
 		btn = WMCreateCommandButton(box);
 		WMSetButtonText(btn, "bla");
 		WMMapWidget(btn);
-	WMAddBoxSubview(box, WMWidgetView(btn), i&1, True, 20, 0, 5);
+		WMAddBoxSubview(box, WMWidgetView(btn), i & 1, True, 20, 0, 5);
 	}

 	pop = WMCreatePopUpButton(box);
@@ -168,46 +154,35 @@ testBox(WMScreen *scr)
 		btn = WMCreateCommandButton(hbox);
 		WMSetButtonText(btn, "bla");
 		WMMapWidget(btn);
-	WMAddBoxSubview(hbox, WMWidgetView(btn), 1, True, 60, 0, i<3?5:0);
+		WMAddBoxSubview(hbox, WMWidgetView(btn), 1, True, 60, 0, i < 3 ? 5 : 0);
 	}

-    
 	WMRealizeWidget(win);
 	WMMapSubwidgets(win);
 	WMMapWidget(win);

 }

-
-
-static void
-singleClick(WMWidget *self, void *data)
+static void singleClick(WMWidget * self, void *data)
 {
 }

-
-static void
-doubleClick(WMWidget *self, void *data)
+static void doubleClick(WMWidget * self, void *data)
 {
-    WMSelectAllListItems((WMList*)self);
+	WMSelectAllListItems((WMList *) self);
 }

-
-static void
-listSelectionObserver(void *observer, WMNotification *notification)
+static void listSelectionObserver(void *observer, WMNotification * notification)
 {
-    WMLabel *label = (WMLabel*)observer;
-    WMList *lPtr = (WMList*)WMGetNotificationObject(notification);
+	WMLabel *label = (WMLabel *) observer;
+	WMList *lPtr = (WMList *) WMGetNotificationObject(notification);
 	char buf[255];

-    sprintf(buf, "Selected items: %d",
-            WMGetArrayItemCount(WMGetListSelectedItems(lPtr)));
+	sprintf(buf, "Selected items: %d", WMGetArrayItemCount(WMGetListSelectedItems(lPtr)));
 	WMSetLabelText(label, buf);
 }

-
-void
-testList(WMScreen *scr)
+void testList(WMScreen * scr)
 {
 	WMWindow *win;
 	WMList *list;
@@ -239,17 +214,17 @@ testList(WMScreen *scr)
 	WMSetLabelText(mtitle, "Multiple selection list");

 	list = WMCreateList(win);
-    /*WMSetListAllowEmptySelection(list, True);*/
+	/*WMSetListAllowEmptySelection(list, True); */
 	WMMoveWidget(list, 10, 40);
-    for (i=0; i<105; i++) {
+	for (i = 0; i < 105; i++) {
 		sprintf(text, "Item %i", i);
 		WMAddListItem(list, text);
 	}
 	mlist = WMCreateList(win);
 	WMSetListAllowMultipleSelection(mlist, True);
-    /*WMSetListAllowEmptySelection(mlist, True);*/
+	/*WMSetListAllowEmptySelection(mlist, True); */
 	WMMoveWidget(mlist, 210, 40);
-    for (i=0; i<135; i++) {
+	for (i = 0; i < 135; i++) {
 		sprintf(text, "Item %i", i);
 		WMAddListItem(mlist, text);
 	}
@@ -271,20 +246,15 @@ testList(WMScreen *scr)
 	WMSetListAction(mlist, singleClick, mlabel);
 	WMSetListDoubleAction(mlist, doubleClick, mlabel);

-    WMAddNotificationObserver(listSelectionObserver, label,
-			      WMListSelectionDidChangeNotification, list);
-    WMAddNotificationObserver(listSelectionObserver, mlabel,
-			      WMListSelectionDidChangeNotification, mlist);
-
+	WMAddNotificationObserver(listSelectionObserver, label, WMListSelectionDidChangeNotification, list);
+	WMAddNotificationObserver(listSelectionObserver, mlabel, WMListSelectionDidChangeNotification, mlist);

 	WMRealizeWidget(win);
 	WMMapSubwidgets(win);
 	WMMapWidget(win);
 }

-
-void
-testButton(WMScreen *scr)
+void testButton(WMScreen * scr)
 {
 	WMWindow *win;
 	int i;
@@ -311,8 +281,8 @@ testButton(WMScreen *scr)
 		WMButton *b;
 		b = WMCreateButton(win, i);
 		WMResizeWidget(b, 150, 24);
-	WMMoveWidget(b, 20, i*30);
-	WMSetButtonText(b, types[i-1]);
+		WMMoveWidget(b, 20, i * 30);
+		WMSetButtonText(b, types[i - 1]);
 	}

 	WMRealizeWidget(win);
@@ -320,9 +290,7 @@ testButton(WMScreen *scr)
 	WMMapWidget(win);
 }

-
-void
-testGradientButtons(WMScreen *scr)
+void testGradientButtons(WMScreen * scr)
 {
 	WMWindow *win;
 	WMButton *btn;
@@ -340,7 +308,6 @@ testGradientButtons(WMScreen *scr)

 	WMSetWindowCloseAction(win, closeAction, NULL);

-
 	light.red = 0x90;
 	light.green = 0x85;
 	light.blue = 0x90;
@@ -414,9 +381,7 @@ testGradientButtons(WMScreen *scr)
 	WMMapWidget(win);
 }

-
-void
-testScrollView(WMScreen *scr)
+void testScrollView(WMScreen * scr)
 {
 	WMWindow *win;
 	WMScrollView *sview;
@@ -449,10 +414,10 @@ testScrollView(WMScreen *scr)
 	WMResizeWidget(f, 400, 400);
 	WMSetFrameRelief(f, WRFlat);

-    for (i=0; i<20; i++) {
+	for (i = 0; i < 20; i++) {
 		l = WMCreateLabel(f);
 		WMResizeWidget(l, 50, 18);
-	WMMoveWidget(l, 10, 20*i);
+		WMMoveWidget(l, 10, 20 * i);
 		sprintf(buffer, "Label %i", i);
 		WMSetLabelText(l, buffer);
 		WMSetLabelRelief(l, WRSimple);
@@ -475,9 +440,7 @@ testScrollView(WMScreen *scr)
 	WMMapWidget(win);
 }

-
-void
-testColorWell(WMScreen *scr)
+void testColorWell(WMScreen * scr)
 {
 	WMWindow *win;
 	WMColorWell *well1, *well2;
@@ -502,9 +465,7 @@ testColorWell(WMScreen *scr)
 	WMMapWidget(win);
 }

-
-void
-testColorPanel(WMScreen *scr)
+void testColorPanel(WMScreen * scr)
 {
 	WMColorPanel *panel = WMGetColorPanel(scr);

@@ -512,20 +473,17 @@ testColorPanel(WMScreen *scr)
 	   startcolor = WMCreateNamedColor(scr, colorname, False);
 	   WMSetColorPanelColor(panel, startcolor);
 	   WMReleaseColor(startcolor);
-    }*/
+	   } */

 	WMShowColorPanel(panel);
 }

-void
-sliderCallback(WMWidget *w, void *data)
+void sliderCallback(WMWidget * w, void *data)
 {
 	printf("SLIDER == %i\n", WMGetSliderValue(w));
 }

-
-void
-testSlider(WMScreen *scr)
+void testSlider(WMScreen * scr)
 {
 	WMWindow *win;
 	WMSlider *s;
@@ -555,9 +513,7 @@ testSlider(WMScreen *scr)
 	WMMapWidget(win);
 }

-
-void
-testTextField(WMScreen *scr)
+void testTextField(WMScreen * scr)
 {
 	WMWindow *win;
 	WMTextField *field, *field2;
@@ -572,6 +528,7 @@ testTextField(WMScreen *scr)
 	field = WMCreateTextField(win);
 	WMResizeWidget(field, 200, 20);
 	WMMoveWidget(field, 20, 20);
+	WMSetTextFieldText(field, "the little \xc2\xa9 sign");

 	field2 = WMCreateTextField(win);
 	WMResizeWidget(field2, 200, 20);
@@ -584,12 +541,12 @@ testTextField(WMScreen *scr)

 }

-
-void
-testText(WMScreen *scr)
+void testText(WMScreen * scr)
 {
 	WMWindow *win;
 	WMText *text;
+	WMFont *font;
+	void *tb;
 	FILE *file = fopen("wm.html", "rb");

 	windowCount++;
@@ -604,38 +561,40 @@ testText(WMScreen *scr)
 	WMMoveWidget(text, 10, 10);
 	WMSetTextHasVerticalScroller(text, True);
 	WMSetTextEditable(text, False);
+	WMSetTextIgnoresNewline(text, False);

-    {
-        WMFont *font, *ifont;
+#define FNAME "Verdana,sans serif:pixelsize=12"
+#define MSG \
+    "Window Maker 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. It's " \
+    "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)."

-        font = WMDefaultSystemFont(scr);
-        ifont = WMCopyFontWithChanges(scr, font, WFAEmphasized);
-        if (ifont) {
-            WMSetTextDefaultFont(text, ifont);
-            WMReleaseFont(ifont);
-        } else {
+	font = WMCreateFont(scr, FNAME ":autohint=false");
 	WMSetTextDefaultFont(text, font);
-        }
 	WMReleaseFont(font);
-    }

-    if(file) {
+	if (0 && file) {
 		char buf[1024];

 		WMFreezeText(text);
-        while(fgets(buf, 1023, file))
+		while (fgets(buf, 1023, file))
 			WMAppendTextStream(text, buf);

 		fclose(file);
 		WMThawText(text);
 	} else {
-        WMAppendTextStream(text,
-                           "Window Maker 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 easy to use, with a simple "
-                           "and elegant appearance borrowed from NEXTSTEP(tm).");
+		WMAppendTextStream(text, "First paragraph has autohinting turned off, "
+				   "while the second has it turned on:");
+		WMAppendTextStream(text, "\n\n\n");
+		WMAppendTextStream(text, MSG);
+		WMAppendTextStream(text, "\n\n\n");
+		font = WMCreateFont(scr, FNAME ":autohint=true");
+		tb = WMCreateTextBlockWithText(text, MSG, font, WMBlackColor(scr), 0, strlen(MSG));
+		WMAppendTextBlock(text, tb);
+		WMReleaseFont(font);
 	}

 	WMRealizeWidget(win);
@@ -643,9 +602,7 @@ testText(WMScreen *scr)
 	WMMapWidget(win);
 }

-
-void
-testProgressIndicator(WMScreen *scr)
+void testProgressIndicator(WMScreen * scr)
 {
 	WMWindow *win;
 	WMProgressIndicator *pPtr;
@@ -667,9 +624,7 @@ testProgressIndicator(WMScreen *scr)

 }

-
-void
-testPullDown(WMScreen *scr)
+void testPullDown(WMScreen * scr)
 {
 	WMWindow *win;
 	WMPopUpButton *pop, *pop2;
@@ -706,9 +661,7 @@ testPullDown(WMScreen *scr)

 }

-
-void
-testTabView(WMScreen *scr)
+void testTabView(WMScreen * scr)
 {
 	WMWindow *win;
 	WMTabView *tabv;
@@ -734,7 +687,6 @@ testTabView(WMScreen *scr)
 	WMSetLabelText(label, "Label 1");
 	WMMapWidget(label);

-
 	tab = WMCreateTabViewItemWithIdentifier(0);
 	WMSetTabViewItemView(tab, WMWidgetView(frame));
 	WMAddItemInTabView(tabv, tab);
@@ -747,13 +699,11 @@ testTabView(WMScreen *scr)
 	WMSetLabelText(label, "Label 2");
 	WMMapWidget(label);

-
 	tab = WMCreateTabViewItemWithIdentifier(0);
 	WMSetTabViewItemView(tab, WMWidgetView(frame));
 	WMAddItemInTabView(tabv, tab);
 	WMSetTabViewItemLabel(tab, "Classes");

-
 	frame = WMCreateFrame(win);
 	WMSetFrameRelief(frame, WRFlat);
 	label = WMCreateLabel(frame);
@@ -767,7 +717,6 @@ testTabView(WMScreen *scr)
 	WMAddItemInTabView(tabv, tab);
 	WMSetTabViewItemLabel(tab, "Something");

-
 	frame = WMCreateFrame(win);
 	WMSetFrameRelief(frame, WRFlat);
 	label = WMCreateLabel(frame);
@@ -781,8 +730,6 @@ testTabView(WMScreen *scr)
 	WMAddItemInTabView(tabv, tab);
 	WMSetTabViewItemLabel(tab, "Bla!");

-
-
 	frame = WMCreateFrame(win);
 	WMSetFrameRelief(frame, WRFlat);
 	label = WMCreateLabel(frame);
@@ -795,16 +742,12 @@ testTabView(WMScreen *scr)
 	WMAddItemInTabView(tabv, tab);
 	WMSetTabViewItemLabel(tab, "Weee!");

-
 	WMRealizeWidget(win);
 	WMMapSubwidgets(win);
 	WMMapWidget(win);
 }

-
-void
-splitViewConstrainProc(WMSplitView *sPtr, int indView,
-		       int *minSize, int *maxSize)
+void splitViewConstrainProc(WMSplitView * sPtr, int indView, int *minSize, int *maxSize)
 {
 	switch (indView) {
 	case 0:
@@ -822,11 +765,9 @@ splitViewConstrainProc(WMSplitView *sPtr, int indView,
 	}
 }

-
-static void
-resizeSplitView(XEvent *event, void *data)
+static void resizeSplitView(XEvent * event, void *data)
 {
-    WMSplitView *sPtr = (WMSplitView*)data;
+	WMSplitView *sPtr = (WMSplitView *) data;

 	if (event->type == ConfigureNotify) {
 		int width = event->xconfigure.width - 10;
@@ -834,16 +775,14 @@ resizeSplitView(XEvent *event, void *data)
 		if (width < WMGetSplitViewDividerThickness(sPtr))
 			width = WMGetSplitViewDividerThickness(sPtr);

-	if (width != WMWidgetWidth(sPtr) ||
-            event->xconfigure.height != WMWidgetHeight(sPtr))
+		if (width != WMWidgetWidth(sPtr) || event->xconfigure.height != WMWidgetHeight(sPtr))
 			WMResizeWidget(sPtr, width, event->xconfigure.height - 55);
 	}
 }

-void
-appendSubviewButtonAction(WMWidget *self, void *data)
+void appendSubviewButtonAction(WMWidget * self, void *data)
 {
-    WMSplitView *sPtr = (WMSplitView*)data;
+	WMSplitView *sPtr = (WMSplitView *) data;
 	char buf[64];
 	WMLabel *label = WMCreateLabel(sPtr);

@@ -855,34 +794,30 @@ appendSubviewButtonAction(WMWidget *self, void *data)
 	WMMapWidget(label);
 }

-void
-removeSubviewButtonAction(WMWidget *self, void *data)
+void removeSubviewButtonAction(WMWidget * self, void *data)
 {
-    WMSplitView *sPtr = (WMSplitView*)data;
+	WMSplitView *sPtr = (WMSplitView *) data;
 	int count = WMGetSplitViewSubviewsCount(sPtr);

 	if (count > 2) {
-    	WMView *view = WMGetSplitViewSubviewAt(sPtr, count-1);
+		WMView *view = WMGetSplitViewSubviewAt(sPtr, count - 1);
 		WMDestroyWidget(WMWidgetOfView(view));
-    	WMRemoveSplitViewSubviewAt(sPtr, count-1);
+		WMRemoveSplitViewSubviewAt(sPtr, count - 1);
 	}
 }

-void
-orientationButtonAction(WMWidget *self, void *data)
+void orientationButtonAction(WMWidget * self, void *data)
 {
-    WMSplitView *sPtr = (WMSplitView*)data;
+	WMSplitView *sPtr = (WMSplitView *) data;
 	WMSetSplitViewVertical(sPtr, !WMGetSplitViewVertical(sPtr));
 }

-void
-adjustSubviewsButtonAction(WMWidget *self, void *data)
+void adjustSubviewsButtonAction(WMWidget * self, void *data)
 {
-    WMAdjustSplitViewSubviews((WMSplitView*)data);
+	WMAdjustSplitViewSubviews((WMSplitView *) data);
 }

-void
-testSplitView(WMScreen *scr)
+void testSplitView(WMScreen * scr)
 {
 	WMWindow *win;
 	WMSplitView *splitv1, *splitv2;
@@ -905,8 +840,7 @@ testSplitView(WMScreen *scr)
 	WMMoveWidget(splitv1, 5, 50);
 	WMResizeWidget(splitv1, 290, 345);
 	WMSetSplitViewConstrainProc(splitv1, splitViewConstrainProc);
-    WMCreateEventHandler(WMWidgetView(win), StructureNotifyMask,
-                         resizeSplitView, splitv1);
+	WMCreateEventHandler(WMWidgetView(win), StructureNotifyMask, resizeSplitView, splitv1);

 	button = WMCreateCommandButton(frame);
 	WMSetButtonText(button, "+");
@@ -968,278 +902,7 @@ testSplitView(WMScreen *scr)
 	WMMapWidget(win);
 }

-
-/*******************************************************************/
-
-#include <sys/types.h>
-#include <dirent.h>
-#include <string.h>
-
-
-typedef struct {
-    int x, y;
-    Bool mouseDown;
-    char *filename;
-} DNDStuff;
-
-WMPixmap*
-getImage(WMScreen *scr, char *file)
-{
-    char buffer[1000];
-    WMPixmap *pix;
-
-    sprintf(buffer, "../../WindowMaker/Icons/%s", file);
-    pix = WMCreatePixmapFromFile(scr, buffer);
-
-    return pix;
-}
-
-
-
-
-static void
-iconMouseStuff(XEvent *event, void *cdata)
-{
-    WMLabel *label = (WMLabel*)cdata;
-    DNDStuff *stuff = WMGetHangedData(label);
-    WMPoint where;
-
-    switch (event->type) {
-     case ButtonPress:
-	stuff->x = event->xbutton.x;
-	stuff->y = event->xbutton.y;
-	stuff->mouseDown = True;
-	break;
-     case ButtonRelease:
-	stuff->mouseDown = False;
-	break;
-     case MotionNotify:
-	if (!stuff->mouseDown)
-	    break;
-
-	if (abs(stuff->x - event->xmotion.x)>4
-	    || abs(stuff->y - event->xmotion.y)>4) {
-
-	    where = WMGetViewScreenPosition(WMWidgetView(label));
-
-	    WMDragImageFromView(WMWidgetView(label),
-				WMGetLabelImage(label),
-				NULL, /* XXX */
-				where,
-				wmksize(stuff->x, stuff->y),
-				event, True);
-	}
-	break;
-    }
-}
-
-
-static void
-endedDragImage(WMView *self, WMPixmap *image, WMPoint point, Bool deposited)
-{
-    DNDStuff *stuff = WMGetHangedData(WMWidgetOfView(self));
-
-    if (deposited) {
-	WMDestroyWidget(WMWidgetOfView(self));
-    }
-
-    stuff->mouseDown = False;
-}
-
-
-static WMData*
-fetchDragData(WMView *self, char *type)
-{
-    DNDStuff *stuff = WMGetHangedData(WMWidgetOfView(self));
-
-    return WMCreateDataWithBytes(stuff->filename, strlen(stuff->filename)+1);
-}
-
-
-WMDragSourceProcs dragSourceProcs = {
-    NULL,
-    NULL,
-    endedDragImage,
-    fetchDragData
-};
-
-
-/************************/
-
-
-unsigned
-draggingEntered(WMView *self, WMDraggingInfo *info)
-{
-    return WDOperationCopy;
-}
-
-
-unsigned
-draggingUpdated(WMView *self, WMDraggingInfo *info)
-{
-    return WDOperationCopy;
-}
-
-/*
- void (*draggingExited)(WMView *self, WMDraggingInfo *info);
- */
-char*
-prepareForDragOperation(WMView *self, WMDraggingInfo *info)
-{
-    return "application/X-WINGs-Bla";
-}
-
-
-WMLabel* makeDraggableLabel(WMWidget *w, char *file, int x, int y);
-
-Bool
-performDragOperation(WMView *self, WMDraggingInfo *info, WMData *data)
-{
-    char *file = (char*)WMDataBytes(data);
-    WMPoint pos;
-
-    pos = WMGetDraggingInfoImageLocation(info);
-
-    if (file!=NULL) {
-	WMLabel *label;
-	WMPoint pos2 = WMGetViewScreenPosition(self);
-
-
-	label = makeDraggableLabel(WMWidgetOfView(self), file,
-				   pos.x-pos2.x, pos.y-pos2.y);
-	WMRealizeWidget(label);
-	WMMapWidget(label);
-    }
-
-
-    return True;
-}
-
-
-void
-concludeDragOperation(WMView *self, WMDraggingInfo *info)
-{
-
-}
-
-
-
-WMDragDestinationProcs dragDestProcs = {
-    draggingEntered,
-	draggingUpdated,
-	NULL,
-	prepareForDragOperation,
-	performDragOperation,
-	concludeDragOperation
-};
-
-
-
-
-WMLabel*
-makeDraggableLabel(WMWidget *w, char *file, int x, int y)
-{
-    DNDStuff *stuff;
-    WMLabel *label;
-    WMPixmap *image = getImage(WMWidgetScreen(w), file);
-
-    stuff = wmalloc(sizeof(DNDStuff));
-    stuff->mouseDown = False;
-
-    stuff->filename = wstrdup(file);
-
-    label = WMCreateLabel(w);
-    WMResizeWidget(label, 48, 48);
-    WMMoveWidget(label, x, y);
-
-    WMSetViewDragSourceProcs(WMWidgetView(label), &dragSourceProcs);
-
-    WMHangData(label, stuff);
-
-    WMCreateEventHandler(WMWidgetView(label),
-			 ButtonPressMask|ButtonReleaseMask|ButtonMotionMask,
-			 iconMouseStuff, label);
-
-
-    if (image != NULL) {
-	WMSetLabelImagePosition(label, WIPImageOnly);
-	WMSetLabelImage(label, image);
-	WMReleasePixmap(image);
-    } else puts(file);
-
-    return label;
-}
-
-
-
-void
-testDragAndDrop(WMScreen *scr)
-{
-    WMWindow *win;
-    WMFrame *frame;
-    WMLabel *label;
-    int i, j;
-    DIR *dir;
-    struct dirent *ent;
-    char *types[] = {
-	"application/X-WINGs-Bla",
-        NULL
-    };
-
-    windowCount++;
-
-    win = WMCreateWindow(scr, "dragDrop");
-    WMResizeWidget(win, 300, 300);
-    WMSetWindowCloseAction(win, closeAction, NULL);
-    WMSetWindowTitle(win, "Drag and Drop");
-
-
-    frame = WMCreateFrame(win);
-    WMSetFrameRelief(frame, WRSunken);
-    WMResizeWidget(frame, 250, 250);
-    WMMoveWidget(frame, 25, 25);
-
-    WMRegisterViewForDraggedTypes(WMWidgetView(frame), types);
-    WMSetViewDragDestinationProcs(WMWidgetView(frame), &dragDestProcs);
-
-    dir = opendir("../../WindowMaker/Icons");
-    if (!dir) {
-	perror("../../WindowMaker/Icons");
-	return;
-    }
-
-    for (i = 0, j=0; j < 8; i++) {
-	ent = readdir(dir);
-	if (!ent)
-	    break;
-
-	if (strstr(ent->d_name, ".xpm")==NULL) {
-	    continue;
-	}
-
-	label = makeDraggableLabel(frame, ent->d_name,4+(j/4)*64, 4+(j%4)*64);
-
-	j++;
-    }
-
-    closedir(dir);
-
-    WMMapSubwidgets(frame);
-
-    WMMapSubwidgets(win);
-    WMRealizeWidget(win);
-    WMMapWidget(win);
-}
-
-
-
-
-
-/*******************************************************************/
-
-
-void
-testUD()
+void testUD()
 {
 	WMUserDefaults *defs;
 	char str[32];
@@ -1252,14 +915,11 @@ testUD()
 	puts(str);
 }

-
-int
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	WMScreen *scr;
 	WMPixmap *pixmap;

-
 	/* Initialize the application */
 	WMInitializeApplication("Test@eqweq_ewq$eqw", &argc, argv);

@@ -1295,7 +955,10 @@ main(int argc, char **argv)
 	/*
 	 * Makes the logo be used in standard dialog panels.
 	 */
-    WMSetApplicationIconPixmap(scr, pixmap); WMReleasePixmap(pixmap);
+	if (pixmap) {
+		WMSetApplicationIconPixmap(scr, pixmap);
+		WMReleasePixmap(pixmap);
+	}

 	/*
 	 * Do some test stuff.
@@ -1303,12 +966,15 @@ main(int argc, char **argv)
 	 * Put the testSomething() function you want to test here.
 	 */

-
 	testText(scr);
 	testFontPanel(scr);

+	testColorPanel(scr);
+
+	testTextField(scr);

 #if 0
+
 	testBox(scr);
 	testButton(scr);
 	testColorPanel(scr);
--- a/WINGs/WINGs/.cvsignore
+++ b/WINGs/WINGs/.cvsignore
@@ -1 +0,0 @@
-Makefile Makefile.in
--- a/WINGs/WINGs/Makefile.am
+++ b/WINGs/WINGs/Makefile.am
@@ -1,9 +1,8 @@
 ## automake input file for WINGs - Headers subdir

-AUTOMAKE_OPTIONS = no-dependencies
+AUTOMAKE_OPTIONS =

 # is this a kluge? if so, how should i do it?
 includedir = @includedir@/WINGs

 include_HEADERS = WINGs.h WUtil.h WINGsP.h proplist-compat.h
-
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -7,7 +7,7 @@
 #include <WINGs/WUtil.h>
 #include <X11/Xlib.h>

-#define WINGS_H_VERSION  20021124
+#define WINGS_H_VERSION  20041030


 #ifdef __cplusplus
@@ -107,22 +107,6 @@ enum {
 };


-/* Font flags */
-typedef enum {
-    WFDefaultFont    = 0,
-    WFNormalFont     = (1<<0),
-    WFFontSet        = (1<<1),
-    WFAntialiased    = (1<<2),
-    WFNotAntialiased = (1<<3)
-} WMFontFlags;
-
-
-/* Use default system font size in system font name */
-enum {
-    WFDefaultSize = -1
-};
-
-
 /* frame title positions */
 typedef enum {
    WTPNoTitle,
@@ -239,7 +223,7 @@ enum {

 /* drag operations */
 typedef enum {
-    WDOperationNone,
+    WDOperationNone = 0,
    WDOperationCopy,
    WDOperationMove,
    WDOperationLink,
@@ -443,33 +427,13 @@ typedef struct WMInputPanel {
 } WMInputPanel;


-
-#define WFAUnchanged (NULL)
-/* Struct for font change operations */
-typedef struct WMFontAttributes {
-    char *foundry;
-    char *family;
-    char *weight;
-    char *slant;
-    char *setWidth;
-    char *addStyle;
-    char *pixelSize;
-    char *pointSize;
-    char *resolutionX;
-    char *resolutionY;
-    char *spacing;
-    char *averageWidth;
-    char *registry;
-    char *encoding;
-} WMFontAttributes;
-
-/* A few useful constant font attributes masks */
-extern const WMFontAttributes *WFANormal;
-extern const WMFontAttributes *WFABold;
-extern const WMFontAttributes *WFANotBold;
-extern const WMFontAttributes *WFAEmphasized;
-extern const WMFontAttributes *WFANotEmphasized;
-extern const WMFontAttributes *WFABoldEmphasized;
+/* Basic font styles. Used to easily get one style from another */
+typedef enum WMFontStyle {
+    WFSNormal = 0,
+    WFSBold   = 1,
+    WFSItalic = 2,
+    WFSBoldItalic = 3
+} WMFontStyle;


 /* WMRuler: */
@@ -496,12 +460,11 @@ typedef void WMAction(WMWidget *self, void *clientData);
 typedef void WMAction2(void *self, void *clientData);


-typedef void WMDropDataCallback(WMView *view, WMData *data);
-
 /* delegate method like stuff */
 typedef void WMListDrawProc(WMList *lPtr, int index, Drawable d, char *text,
                            int state, WMRect *rect);

+
 /*
 typedef void WMSplitViewResizeSubviewsProc(WMSplitView *sPtr,
                                           unsigned int oldWidth,
@@ -596,29 +559,38 @@ typedef struct WMSelectionProcs {
 typedef struct W_DraggingInfo WMDraggingInfo;


+/* links a label to a dnd operation. */
+typedef struct W_DragOperationtItem WMDragOperationItem;
+
+
 typedef struct W_DragSourceProcs {
-    unsigned (*draggingSourceOperation)(WMView *self, Bool local);
-    void (*beganDragImage)(WMView *self, WMPixmap *image, WMPoint point);
-    void (*endedDragImage)(WMView *self, WMPixmap *image, WMPoint point,
-			   Bool deposited);
+    WMArray* (*dropDataTypes)(WMView *self);
+    WMDragOperationType (*wantedDropOperation)(WMView *self);
+    WMArray* (*askedOperations)(WMView *self);
+    Bool (*acceptDropOperation)(WMView *self, WMDragOperationType operation);
+    void (*beganDrag)(WMView *self, WMPoint *point);
+    void (*endedDrag)(WMView *self, WMPoint *point, Bool deposited);
    WMData* (*fetchDragData)(WMView *self, char *type);
-/*    Bool (*ignoreModifierKeysWhileDragging)(WMView *view);*/
+    /*Bool (*ignoreModifierKeysWhileDragging)(WMView *view);*/
 } WMDragSourceProcs;



 typedef struct W_DragDestinationProcs {
-    unsigned (*draggingEntered)(WMView *self, WMDraggingInfo *info);
-    unsigned (*draggingUpdated)(WMView *self, WMDraggingInfo *info);
-    void (*draggingExited)(WMView *self, WMDraggingInfo *info);
-    Bool (*prepareForDragOperation)(WMView *self, WMDraggingInfo *info);
-    Bool (*performDragOperation)(WMView *self, WMDraggingInfo *info);
-    void (*concludeDragOperation)(WMView *self, WMDraggingInfo *info);
+    void (*prepareForDragOperation)(WMView *self);
+    WMArray* (*requiredDataTypes)(WMView *self, WMDragOperationType request,
+                                  WMArray *sourceDataTypes);
+    WMDragOperationType (*allowedOperation)(WMView *self,
+                                            WMDragOperationType request,
+                                            WMArray *sourceDataTypes);
+    Bool (*inspectDropData)(WMView *self, WMArray *dropData);
+    void (*performDragOperation)(WMView *self, WMArray *dropData,
+                                 WMArray *operations, WMPoint *dropLocation);
+    void (*concludeDragOperation)(WMView *self);
 } WMDragDestinationProcs;


-
-/* ...................................................................... */
+/* ---[ WINGs/wmisc.c ]--------------------------------------------------- */


 WMPoint wmkpoint(int x, int y);
@@ -632,7 +604,7 @@ WMRect wmkrect(int x, int y, unsigned int width, unsigned int height);
 #define wmkpoint(x, y)         (WMPoint){(x), (y)}
 #endif

-/* ....................................................................... */
+/* ---[ WINGs/wapplication.c ]-------------------------------------------- */



@@ -641,11 +613,12 @@ void WMInitializeApplication(char *applicationName, int *argc, char **argv);
 void WMSetResourcePath(char *path);

 /* don't free the returned string */
-char* WMGetApplicationName();
+char* WMGetApplicationName(void);

 /* Try to locate resource file. ext may be NULL */
 char* WMPathForResourceOfType(char *resource, char *ext);

+/* ---[ WINGs/widgets.c ]------------------------------------------------- */

 WMScreen* WMOpenScreen(const char *display);

@@ -668,7 +641,9 @@ Display* WMScreenDisplay(WMScreen *scr);

 int WMScreenDepth(WMScreen *scr);

+void WMSetFocusToWidget(WMWidget *widget);

+/* ---[ WINGs/wappresource.c ]-------------------------------------------- */

 void WMSetApplicationIconImage(WMScreen *app, RImage *image);

@@ -683,7 +658,7 @@ WMPixmap* WMCreateApplicationIconBlendedPixmap(WMScreen *scr, RColor *color);

 void WMSetApplicationIconWindow(WMScreen *scr, Window window);

-void WMSetFocusToWidget(WMWidget *widget);
+/* ---[ WINGs/wevent.c ]-------------------------------------------------- */

 WMEventHook* WMHookEventHandler(WMEventHook *handler);

@@ -705,8 +680,12 @@ void WMNextEvent(Display *dpy, XEvent *event);

 void WMMaskEvent(Display *dpy, long mask, XEvent *event);

+void WMSetViewNextResponder(WMView *view, WMView *responder);

-/* ....................................................................... */
+void WMRelayToNextResponder(WMView *view, XEvent *event);
+
+
+/* ---[ WINGs/selection.c ]----------------------------------------------- */


 Bool WMCreateSelectionHandler(WMView *view, Atom selection, Time timestamp,
@@ -721,46 +700,54 @@ Bool WMRequestSelection(WMView *view, Atom selection, Atom target,

 extern char *WMSelectionOwnerDidChangeNotification;

-/* ....................................................................... */
+/* ---[ WINGs/dragcommon.c ]---------------------------------------------- */
+
+WMArray* WMCreateDragOperationArray(int initialSize);
+
+WMDragOperationItem* WMCreateDragOperationItem(WMDragOperationType type,
+                                               char* text);
+
+WMDragOperationType WMGetDragOperationItemType(WMDragOperationItem* item);
+
+char* WMGetDragOperationItemText(WMDragOperationItem* item);
+
+/* ---[ WINGs/dragsource.c ]---------------------------------------------- */
+
+void WMSetViewDragImage(WMView* view, WMPixmap *dragImage);
+
+void WMReleaseViewDragImage(WMView* view);

 void WMSetViewDragSourceProcs(WMView *view, WMDragSourceProcs *procs);

-void WMDragImageFromView(WMView *view, WMPixmap *image, char *dataTypes[],
-			 WMPoint atLocation, WMSize mouseOffset, XEvent *event,
-			 Bool slideBack);
+Bool WMIsDraggingFromView(WMView *view);

-void WMRegisterViewForDraggedTypes(WMView *view, char *acceptedTypes[]);
+void WMDragImageFromView(WMView *view, XEvent *event);
+
+/* Create a drag handler, associating drag event masks with dragEventProc */
+void WMCreateDragHandler(WMView *view, WMEventProc *dragEventProc, void *clientData);
+
+void WMDeleteDragHandler(WMView *view, WMEventProc *dragEventProc, void *clientData);
+
+/* set default drag handler for view */
+void WMSetViewDraggable(WMView *view, WMDragSourceProcs *procs, WMPixmap *dragImage);
+
+void WMUnsetViewDraggable(WMView *view);
+
+/* ---[ WINGs/dragdestination.c ]----------------------------------------- */
+
+void WMRegisterViewForDraggedTypes(WMView *view, WMArray *acceptedTypes);

 void WMUnregisterViewDraggedTypes(WMView *view);

 void WMSetViewDragDestinationProcs(WMView *view, WMDragDestinationProcs *procs);

-
-WMPoint WMGetDraggingInfoImageLocation(WMDraggingInfo *info);
-
-/* ....................................................................... */
-
-Bool WMHasAntialiasingSupport(WMScreen *scrPtr);
+/* ---[ WINGs/wfont.c ]--------------------------------------------------- */

 Bool WMIsAntialiasingEnabled(WMScreen *scrPtr);

-/* ....................................................................... */
-
-WMFont* WMCreateNormalFont(WMScreen *scrPtr, char *fontName);
-
-WMFont* WMCreateFontSet(WMScreen *scrPtr, char *fontName);
-
-WMFont* WMCreateAntialiasedFont(WMScreen *scrPtr, char *fontName);
-
-WMFont* WMCreateAntialiasedFontSet(WMScreen *scrPtr, char *fontName);
-
 WMFont* WMCreateFont(WMScreen *scrPtr, char *fontName);

-WMFont* WMCreateFontWithFlags(WMScreen *scrPtr, char *fontName,
-                              WMFontFlags flags);
-
-WMFont* WMCopyFontWithChanges(WMScreen *scrPtr, WMFont *font,
-                              const WMFontAttributes *changes);
+WMFont* WMCopyFontWithStyle(WMScreen *scrPtr, WMFont *font, WMFontStyle style);

 WMFont* WMRetainFont(WMFont *font);

@@ -770,15 +757,6 @@ char* WMGetFontName(WMFont *font);

 unsigned int WMFontHeight(WMFont *font);

-Bool WMIsAntialiasedFont(WMFont *font);
-
-/*
-WMFont* WMUserFontOfSize(WMScreen *scrPtr, int size);
-
-WMFont* WMUserFixedPitchFontOfSize(WMScreen *scrPtr, int size);
-*/
-
-
 void WMSetWidgetDefaultFont(WMScreen *scr, WMFont *font);

 void WMSetWidgetDefaultBoldFont(WMScreen *scr, WMFont *font);
@@ -791,9 +769,16 @@ WMFont* WMSystemFontOfSize(WMScreen *scrPtr, int size);

 WMFont* WMBoldSystemFontOfSize(WMScreen *scrPtr, int size);

-XFontSet WMGetFontFontSet(WMFont *font);
+void WMDrawString(WMScreen *scr, Drawable d, WMColor *color, WMFont *font,
+                  int x, int y, char *text, int length);

-/* ....................................................................... */
+void WMDrawImageString(WMScreen *scr, Drawable d, WMColor *color,
+                       WMColor *background, WMFont *font, int x, int y,
+                       char *text, int length);
+
+int WMWidthOfString(WMFont *font, char *text, int length);
+
+/* ---[ WINGs/wpixmap.c ]------------------------------------------------- */

 WMPixmap* WMRetainPixmap(WMPixmap *pixmap);

@@ -829,7 +814,7 @@ Pixmap WMGetPixmapMaskXID(WMPixmap *pixmap);

 WMPixmap* WMGetSystemPixmap(WMScreen *scr, int image);

-/* ....................................................................... */
+/* ---[ WINGs/wcolor.c ]-------------------------------------------------- */


 WMColor* WMDarkGrayColor(WMScreen *scr);
@@ -863,6 +848,8 @@ WMColor* WMCreateRGBAColor(WMScreen *scr, unsigned short red,

 WMColor* WMCreateNamedColor(WMScreen *scr, char *name, Bool exact);

+RColor WMGetRColorFromColor(WMColor *color);
+
 void WMSetColorAlpha(WMColor *color, unsigned short alpha);

 unsigned short WMRedComponentOfColor(WMColor *color);
@@ -875,21 +862,7 @@ unsigned short WMGetColorAlpha(WMColor *color);

 char* WMGetColorRGBDescription(WMColor *color);

-/* ....................................................................... */
-
-
-void WMDrawString(WMScreen *scr, Drawable d, WMColor *color, WMFont *font,
-                  int x, int y, char *text, int length);
-
-void WMDrawImageString(WMScreen *scr, Drawable d, WMColor *color,
-                       WMColor *background, WMFont *font, int x, int y,
-                       char *text, int length);
-
-int WMWidthOfString(WMFont *font, char *text, int length);
-
-
-
-/* ....................................................................... */
+/* ---[ WINGs/widgets.c ]------------------------------------------------- */

 WMScreen* WMWidgetScreen(WMWidget *w);

@@ -935,10 +908,12 @@ unsigned int WMWidgetHeight(WMWidget *w);

 Window WMWidgetXID(WMWidget *w);

-Window WMViewXID(WMView *view);
-
 void WMRedisplayWidget(WMWidget *w);

+/* ---[ WINGs/wview.c ]--------------------------------------------------- */
+
+Window WMViewXID(WMView *view);
+
 void WMSetViewNotifySizeChanges(WMView *view, Bool flag);

 void WMSetViewExpandsToParent(WMView *view, int topOffs, int leftOffs,
@@ -952,10 +927,6 @@ WMPoint WMGetViewScreenPosition(WMView *view);

 WMWidget* WMWidgetOfView(WMView *view);

-void WMSetViewNextResponder(WMView *view, WMView *responder);
-
-void WMRelayToNextResponder(WMView *view, XEvent *event);
-
 /* notifications */
 extern char *WMViewSizeDidChangeNotification;

@@ -963,8 +934,7 @@ extern char *WMViewFocusDidChangeNotification;

 extern char *WMViewRealizedNotification;

-
-/* ....................................................................... */
+/* ---[ WINGs/wballoon.c ]------------------------------------------------ */

 void WMSetBalloonTextForView(char *text, WMView *view);

@@ -979,7 +949,7 @@ void WMSetBalloonDelay(WMScreen *scr, int delay);
 void WMSetBalloonEnabled(WMScreen *scr, Bool flag);


-/* ....................................................................... */
+/* ---[ WINGs/wwindow.c ]------------------------------------------------- */

 WMWindow* WMCreateWindow(WMScreen *screen, char *name);

@@ -996,6 +966,8 @@ void WMSetWindowTitle(WMWindow *wPtr, char *title);

 void WMSetWindowMiniwindowTitle(WMWindow *win, char *title);

+void WMSetWindowMiniwindowImage(WMWindow *win, RImage *image);
+
 void WMSetWindowMiniwindowPixmap(WMWindow *win, WMPixmap *pixmap);

 void WMSetWindowCloseAction(WMWindow *win, WMAction *action, void *clientData);
@@ -1021,7 +993,7 @@ void WMSetWindowDocumentEdited(WMWindow *win, Bool flag);

 void WMCloseWindow(WMWindow *win);

-/* ....................................................................... */
+/* ---[ WINGs/wbutton.c ]------------------------------------------------- */

 void WMSetButtonAction(WMButton *bPtr, WMAction *action, void *clientData);

@@ -1085,7 +1057,7 @@ void WMSetButtonContinuous(WMButton *bPtr, Bool flag);

 void WMSetButtonPeriodicDelay(WMButton *bPtr, float delay, float interval);

-/* ....................................................................... */
+/* ---[ WINGs/wlabel.c ]-------------------------------------------------- */

 WMLabel* WMCreateLabel(WMWidget *parent);

@@ -1111,7 +1083,7 @@ void WMSetLabelFont(WMLabel *lPtr, WMFont *font);

 void WMSetLabelTextColor(WMLabel *lPtr, WMColor *color);

-/* ....................................................................... */
+/* ---[ WINGs/wframe.c ]-------------------------------------------------- */

 WMFrame* WMCreateFrame(WMWidget *parent);

@@ -1121,7 +1093,7 @@ void WMSetFrameRelief(WMFrame *fPtr, WMReliefType relief);

 void WMSetFrameTitle(WMFrame *fPtr, char *title);

-/* ....................................................................... */
+/* ---[ WINGs/wtextfield.c ]---------------------------------------------- */

 WMTextField* WMCreateTextField(WMWidget *parent);

@@ -1154,6 +1126,8 @@ void WMSelectTextFieldRange(WMTextField *tPtr, WMRange range);

 void WMSetTextFieldCursorPosition(WMTextField *tPtr, unsigned int position);

+unsigned WMGetTextFieldCursorPosition(WMTextField *tPtr);
+
 void WMSetTextFieldNextTextField(WMTextField *tPtr, WMTextField *next);

 void WMSetTextFieldPrevTextField(WMTextField *tPtr, WMTextField *prev);
@@ -1166,7 +1140,7 @@ extern char *WMTextDidChangeNotification;
 extern char *WMTextDidBeginEditingNotification;
 extern char *WMTextDidEndEditingNotification;

-/* ....................................................................... */
+/* ---[ WINGs/wscroller.c ]----------------------------------------------- */

 WMScroller* WMCreateScroller(WMWidget *parent);

@@ -1186,7 +1160,7 @@ void WMSetScrollerArrowsPosition(WMScroller *sPtr,

 extern char *WMScrollerDidScrollNotification;

-/* ....................................................................... */
+/* ---[ WINGs/wlist.c ]--------------------------------------------------- */

 WMList* WMCreateList(WMWidget *parent);

@@ -1266,7 +1240,7 @@ Bool WMListAllowsEmptySelection(WMList *lPtr);
 extern char *WMListDidScrollNotification;
 extern char *WMListSelectionDidChangeNotification;

-/* ....................................................................... */
+/* ---[ WINGs/wbrowser.c ]------------------------------------------------ */

 WMBrowser* WMCreateBrowser(WMWidget *parent);

@@ -1334,7 +1308,7 @@ Bool WMBrowserAllowsEmptySelection(WMBrowser *bPtr);

 void WMSetBrowserHasScroller(WMBrowser *bPtr, int hasScroller);

-/* ....................................................................... */
+/* ---[ WINGs/wmenuitem.c ]----------------------------------------------- */


 Bool WMMenuItemIsSeparator(WMMenuItem *item);
@@ -1395,9 +1369,9 @@ WMPixmap* WMGetMenuItemMixedStatePixmap(WMMenuItem *item);
 WMMenu* WMGetMenuItemSubmenu(WMMenuItem *item);

 Bool WMGetMenuItemHasSubmenu(WMMenuItem *item);
- */
+*/

-/* ....................................................................... */
+/* ---[ WINGs/wpopupbutton.c ]-------------------------------------------- */

 WMPopUpButton* WMCreatePopUpButton(WMWidget *parent);

@@ -1428,31 +1402,13 @@ char* WMGetPopUpButtonItem(WMPopUpButton *bPtr, int index);

 WMMenuItem* WMGetPopUpButtonMenuItem(WMPopUpButton *bPtr, int index);

-
 int WMGetPopUpButtonNumberOfItems(WMPopUpButton *bPtr);

 void WMSetPopUpButtonEnabled(WMPopUpButton *bPtr, Bool flag);

 Bool WMGetPopUpButtonEnabled(WMPopUpButton *bPtr);

-/* ....................................................................... */
-
-WMProgressIndicator* WMCreateProgressIndicator(WMWidget *parent);
-
-void WMSetProgressIndicatorMinValue(WMProgressIndicator *progressindicator, int value);
-
-void WMSetProgressIndicatorMaxValue(WMProgressIndicator *progressindicator, int value);
-
-void WMSetProgressIndicatorValue(WMProgressIndicator *progressindicator, int value);
-
-int WMGetProgressIndicatorMinValue(WMProgressIndicator *progressindicator);
-
-int WMGetProgressIndicatorMaxValue(WMProgressIndicator *progressindicator);
-
-int WMGetProgressIndicatorValue(WMProgressIndicator *progressindicator);
-
-
-/* ....................................................................... */
+/* ---[ WINGs/wcolorpanel.c ]--------------------------------------------- */

 WMColorPanel* WMGetColorPanel(WMScreen *scrPtr);

@@ -1472,7 +1428,7 @@ void WMSetColorPanelAction(WMColorPanel *panel, WMAction2 *action, void *data);

 extern char *WMColorPanelColorChangedNotification;

-/* ....................................................................... */
+/* ---[ WINGs/wcolorwell.c ]---------------------------------------------- */

 WMColorWell* WMCreateColorWell(WMWidget *parent);

@@ -1486,7 +1442,7 @@ void WSetColorWellBordered(WMColorWell *cPtr, Bool flag);
 extern char *WMColorWellDidChangeNotification;


-/* ...................................................................... */
+/* ---[ WINGs/wscrollview.c ]--------------------------------------------- */

 WMScrollView* WMCreateScrollView(WMWidget *parent);

@@ -1511,7 +1467,7 @@ void WMSetScrollViewLineScroll(WMScrollView *sPtr, int amount);

 void WMSetScrollViewPageScroll(WMScrollView *sPtr, int amount);

-/* ....................................................................... */
+/* ---[ WINGs/wslider.c ]------------------------------------------------- */

 WMSlider* WMCreateSlider(WMWidget *parent);

@@ -1535,7 +1491,7 @@ void WMSetSliderKnobThickness(WMSlider *sPtr, int thickness);

 void WMSetSliderImage(WMSlider *sPtr, WMPixmap *pixmap);

-/* ....................................................................... */
+/* ---[ WINGs/wsplitview.c ]---------------------------------------------- */


 WMSplitView* WMCreateSplitView(WMWidget *parent);
@@ -1729,8 +1685,7 @@ void* WMRemoveTextBlock(WMText *tPtr);

 void WMDestroyTextBlock(WMText *tPtr, void *vtb);

-/* ....................................................................... */
-
+/* ---[ WINGs/wtabview.c ]------------------------------------------------ */

 WMTabView* WMCreateTabView(WMWidget *parent);

@@ -1785,7 +1740,7 @@ WMView* WMGetTabViewItemView(WMTabViewItem *item);
 void WMDestroyTabViewItem(WMTabViewItem *item);


-/* ....................................................................... */
+/* ---[ WINGs/wbox.c ]---------------------------------------------------- */

 WMBox* WMCreateBox(WMWidget *parent);

@@ -1801,7 +1756,7 @@ void WMRemoveBoxSubview(WMBox *bPtr, WMView *view);

 void WMSetBoxHorizontal(WMBox *box, Bool flag);

-/* ....................................................................... */
+/* ---[ WINGs/wpanel.c ]-------------------------------------------------- */

 int WMRunAlertPanel(WMScreen *app, WMWindow *owner, char *title, char *msg,
                    char *defaultButton, char *alternateButton,
@@ -1830,7 +1785,7 @@ void WMDestroyInputPanel(WMInputPanel *panel);

 void WMDestroyGenericPanel(WMGenericPanel *panel);

-/* ....................................................................... */
+/* ---[ WINGs/wfilepanel.c ]---------------------------------------------- */

 /* only 1 instance per WMScreen */
 WMOpenPanel* WMGetOpenPanel(WMScreen *scrPtr);
@@ -1858,7 +1813,7 @@ void WMSetFilePanelAccessoryView(WMFilePanel *panel, WMView *view);
 WMView* WMGetFilePanelAccessoryView(WMFilePanel *panel);


-/* ...................................................................... */
+/* ---[ WINGs/wfontpanel.c ]---------------------------------------------- */

 /* only 1 instance per WMScreen */
 WMFontPanel* WMGetFontPanel(WMScreen *scr);
@@ -1867,12 +1822,11 @@ void WMShowFontPanel(WMFontPanel *panel);

 void WMHideFontPanel(WMFontPanel *panel);

+void WMFreeFontPanel(WMFontPanel *panel);
+
 void WMSetFontPanelAction(WMFontPanel *panel, WMAction2 *action, void *data);

-void WMSetFontPanelFont(WMFontPanel *panel, WMFont *font);
-
-/* you can free the returned string */
-char* WMGetFontPanelFontName(WMFontPanel *panel);
+void WMSetFontPanelFont(WMFontPanel *panel, char *fontName);

 WMFont* WMGetFontPanelFont(WMFontPanel *panel);

--- a/WINGs/WINGs/WINGsP.h
+++ b/WINGs/WINGs/WINGsP.h
@@ -8,7 +8,7 @@

 #include <WINGs/WINGs.h>

-#if WINGS_H_VERSION < 20021124
+#if WINGS_H_VERSION < 20041030
 #error There_is_an_old_WINGs.h_file_somewhere_in_your_system._Please_remove_it.
 #endif

@@ -16,25 +16,21 @@

 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <stdio.h>

 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

-#define DOUBLE_BUFFER
-

+#define DOUBLE_BUFFER   1

 #define WC_UserWidget	128

-
-
 #define SCROLLER_WIDTH	20

-
-
-#define XDND_VERSION 4
+#define XDND_VERSION    3


 typedef struct W_Application {
@@ -48,17 +44,12 @@ typedef struct W_Application {
 typedef struct W_Font {
    struct W_Screen *screen;

-    union {
-	XFontSet set;
-        XFontStruct *normal;
-        struct _XftFont *xft;
-    } font;
+    struct _XftFont *font;
+
    short height;
    short y;
    short refCount;
    char *name;
-    unsigned int notFontSet:1;
-    unsigned int antialiased:1;
 } W_Font;


@@ -94,28 +85,53 @@ typedef struct W_FocusInfo {



-struct W_DraggingInfo {
+typedef void* W_DndState(WMView *destView, XClientMessageEvent *event,
+                         WMDraggingInfo *info);
+
+
+typedef struct W_DragOperationItem {
+    WMDragOperationType type;
+    char* text;
+} W_DragOperationItem;
+
+
+typedef struct W_DragSourceInfo {
+    WMView *sourceView;
    Window destinationWindow;
-    Window sourceWindow;
-    
-    WMPoint location;
-
-    unsigned sourceOperation;
-    WMPixmap *image;
+    W_DndState *state;
+    WMSelectionProcs *selectionProcs;
+    Window icon;
    WMPoint imageLocation;
+    WMPoint mouseOffset; /* mouse pos in icon */
+    Cursor dragCursor;
+    WMRect noPositionMessageZone;
+    Atom firstThreeTypes[3];
+} W_DragSourceInfo;

-    char **types;

+typedef struct W_DragDestinationInfo {
+    WMView *destView;
+    WMView *xdndAwareView;
+    Window sourceWindow;
+    W_DndState *state;
+    Bool sourceActionChanged;
+    WMArray *sourceTypes;
+    WMArray *requiredTypes;
+    Bool typeListAvailable;
+    WMArray *dropDatas;
+} W_DragDestinationInfo;
+
+
+struct W_DraggingInfo {
+    unsigned char protocolVersion; /* version supported on the other side */
    Time timestamp;

-    int protocolVersion;
+    Atom sourceAction;
+    Atom destinationAction;

-    /* should be treated as internal data */
-    WMView *sourceView;
-    WMView *destView;
-    WMSize mouseOffset;
-    unsigned finished:1;
-};
+    W_DragSourceInfo* sourceInfo;    /* infos needed by source */
+    W_DragDestinationInfo* destInfo; /* infos needed by destination */
+} W_DraggingInfo;


 typedef struct W_Screen {
@@ -139,8 +155,6 @@ typedef struct W_Screen {

    struct _XftDraw *xftdraw;          /* shared XftDraw */

-    Bool hasXftSupport;                /* if it can antialias text */
-
    /* application related */

    W_FocusInfo *focusInfo;
@@ -200,14 +214,6 @@ typedef struct W_Screen {

    WMHashTable *fontCache;

-    WMHashTable *xftFontCache;
-
-    WMHashTable *fontSetCache;
-
-    WMHashTable *xftFontSetCache;
-
-    Bool useMultiByte;
-
    Bool antialiasedText;

    unsigned int ignoredModifierMask; /* modifiers to ignore when typing txt */
@@ -256,7 +262,7 @@ typedef struct W_Screen {
    struct W_Pixmap *altUnmountIcon;

    struct W_Pixmap *magnifyIcon;
-/*    struct W_Pixmap *altMagnifyIcon;*/
+    /*struct W_Pixmap *altMagnifyIcon;*/
    struct W_Pixmap *wheelIcon;
    struct W_Pixmap *grayIcon;
    struct W_Pixmap *rgbIcon;
@@ -289,6 +295,8 @@ typedef struct W_Screen {
    Atom xdndDropAtom;
    Atom xdndFinishedAtom;
    Atom xdndTypeListAtom;
+    Atom xdndActionListAtom;
+    Atom xdndActionDescriptionAtom;
    Atom xdndStatusAtom;

    Atom xdndActionCopy;
@@ -301,6 +309,12 @@ typedef struct W_Screen {

    Atom wmStateAtom;              /* WM_STATE */
    
+    Atom utf8String;
+
+    Atom netwmName;
+    Atom netwmIconName;
+    Atom netwmIcon;
+
    /* stuff for detecting double-clicks */
    Time lastClickTime;            /* time of last mousedown event */
    Window lastClickWindow;        /* window of the last mousedown */
@@ -330,8 +344,7 @@ typedef struct W_ViewDelegate {
 typedef struct W_View {
    struct W_Screen *screen;

-    WMWidget *self;		       /* must point to the widget the
-					* view belongs to */
+    WMWidget *self;     /* must point to the widget the view belongs to */

    W_ViewDelegate *delegate;

@@ -371,8 +384,10 @@ typedef struct W_View {
    Atom *droppableTypes;
    struct W_DragSourceProcs      *dragSourceProcs;
    struct W_DragDestinationProcs *dragDestinationProcs;
+    WMPixmap *dragImage;
    int helpContext;

+    XIC xic;

    struct {
        unsigned int realized:1;
@@ -381,13 +396,13 @@ typedef struct W_View {
        unsigned int dying:1;           /* the view is being destroyed */
        unsigned int topLevel:1;        /* is a top level window */
        unsigned int root:1;            /* is the root window */
-	unsigned int mapWhenRealized:1;/* map the view when it's realized */
+        unsigned int mapWhenRealized:1; /* map the view when it's realized */
        unsigned int alreadyDead:1;     /* view was freed */

        unsigned int dontCompressMotion:1; /* motion notify event compress */
        unsigned int notifySizeChanged:1;
-	unsigned int dontCompressExpose:1;   /* will compress all expose
-					      events into one */
+        unsigned int dontCompressExpose:1; /* expose event compress */
+
        /* toplevel only */
        unsigned int worksWhenModal:1;
        unsigned int pendingRelease1:1;
@@ -416,11 +431,8 @@ typedef struct W_EventHandler {
 typedef struct _WINGsConfiguration {
    char *systemFont;
    char *boldSystemFont;
-    char *antialiasedSystemFont;
-    char *antialiasedBoldSystemFont;
    int  defaultFontSize;
    Bool antialiasedText;
-    Bool useMultiByte;
    char *floppyPath;
    unsigned doubleClickDelay;
    unsigned mouseWheelUp;
@@ -565,8 +577,63 @@ void W_CheckTimerHandlers(void);

 Bool W_HandleInputEvents(Bool waitForInput, int inputfd);

+/* XDnD */
+Atom W_OperationToAction(WMScreen *scr, WMDragOperationType operation);
+
+WMDragOperationType W_ActionToOperation(WMScreen *scr, Atom action);
+
+void W_FreeDragOperationItem(void* item);
+
+Bool W_SendDnDClientMessage(Display *dpy, Window win, Atom message,
+                            unsigned long data1, unsigned long data2,
+                            unsigned long data3, unsigned long data4,
+                            unsigned long data5);
+
+void W_DragSourceStartTimer(WMDraggingInfo *info);
+
+void W_DragSourceStopTimer(void);
+
+void W_DragSourceStateHandler(WMDraggingInfo *info, XClientMessageEvent *event);
+
+void W_DragDestinationStartTimer(WMDraggingInfo *info);
+
+void W_DragDestinationStopTimer(void);
+
+void W_DragDestinationStoreEnterMsgInfo(WMDraggingInfo *info, WMView *toplevel,
+                                        XClientMessageEvent *event);
+
+void W_DragDestinationStorePositionMsgInfo(WMDraggingInfo *info,
+                                           WMView *toplevel,
+                                           XClientMessageEvent *event);
+
+void W_DragDestinationCancelDropOnEnter(WMView *toplevel, WMDraggingInfo *info);
+
+void W_DragDestinationStateHandler(WMDraggingInfo *info,
+                                   XClientMessageEvent *event);
+
+void W_DragDestinationInfoClear(WMDraggingInfo *info);
+
+void W_FreeViewXdndPart(WMView *view);
+
+/* XIM */
+void W_InitIM(WMScreen *scr);
+
+void W_CreateIC(WMView *view);
+
+void W_DestroyIC(WMView *view);
+
+void W_FocusIC(WMView *view);
+
+void W_UnFocusIC(WMView *view);
+
+void W_SetPreeditPositon(W_View *view, int x, int y);
+
+int W_LookupString(W_View *view, XKeyPressedEvent *event, char *buffer,
+                   int buflen, KeySym *keysym, Status *status);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

 #endif /* _WINGSP_H_ */
+
--- a/WINGs/WINGs/WUtil.h
+++ b/WINGs/WINGs/WUtil.h
@@ -28,6 +28,9 @@
 # endif
 #endif

+#ifndef __GNUC__
+#define  __attribute__(x)  /*NOTHING*/
+#endif

 #ifdef NDEBUG

@@ -83,27 +86,6 @@ typedef enum {
 } WMNotificationCoalescing;


-/* The possible states for connections */
-typedef enum {
-    WCNotConnected=0,
-    WCListening,
-    WCInProgress,
-    WCFailed,
-    WCConnected,
-    WCTimedOut,
-    WCDied,
-    WCClosed
-} WMConnectionState;
-
-
-/* The possible states for connection timeouts */
-typedef enum {
-    WCTNone=0,
-    WCTWhileOpening,
-    WCTWhileSending
-} WMConnectionTimeoutState;
-
-

 enum {
    WBNotFound = INT_MIN, /* element was not found in WMBag   */
@@ -135,11 +117,12 @@ typedef void WMInputProc(int fd, int mask, void *clientData);


 typedef int WMCompareDataProc(const void *item1, const void *item2);
+typedef void WMTreeWalkProc(WMTreeNode *aNode, void *data);

 typedef void WMFreeDataProc(void *data);

 /* Used by WMBag or WMArray for matching data */
-typedef int WMMatchDataProc(void *item, void *cdata);
+typedef int WMMatchDataProc(const void *item, const void *cdata);



@@ -174,53 +157,41 @@ typedef int WMArrayIterator;
 typedef void *WMBagIterator;


-#if 0
-typedef struct {
-    char character;		       /* the escape character */
-    char *value;		       /* value to place */
-} WMSEscapes;
-#endif
-
-
-/* The connection callbacks */
-typedef struct ConnectionDelegate {
-    void *data;
-
-    void (*canResumeSending)(struct ConnectionDelegate *self, WMConnection *cPtr);
-
-    void (*didCatchException)(struct ConnectionDelegate *self, WMConnection *cPtr);
-
-    void (*didDie)(struct ConnectionDelegate *self, WMConnection *cPtr);
-
-    void (*didInitialize)(struct ConnectionDelegate *self, WMConnection *cPtr);
-
-    void (*didReceiveInput)(struct ConnectionDelegate *self, WMConnection *cPtr);
-
-    void (*didTimeout)(struct ConnectionDelegate *self, WMConnection *cPtr);
-
-} ConnectionDelegate;
-
-
 typedef void WMNotificationObserverAction(void *observerData,
                                          WMNotification *notification);


+/* ---[ WINGs/memory.c ]-------------------------------------------------- */

-/*......................................................................*/
+void* wmalloc(size_t size);
+void* wrealloc(void *ptr, size_t newsize);
+void wfree(void *ptr);
+
+void wrelease(void *ptr);
+void* wretain(void *ptr);

 typedef void waborthandler(int);

 waborthandler* wsetabort(waborthandler* handler);

+/* ---[ WINGs/error.c ]--------------------------------------------------- */

-/* don't free the returned string */
-char* wstrerror(int errnum);
+enum {
+	WMESSAGE_TYPE_MESSAGE,
+	WMESSAGE_TYPE_WARNING,
+	WMESSAGE_TYPE_ERROR,
+	WMESSAGE_TYPE_FATAL
+};

-void wmessage(const char *msg, ...);
-void wwarning(const char *msg, ...);
-void wfatal(const char *msg, ...);
-void wsyserror(const char *msg, ...);
-void wsyserrorwithcode(int error, const char *msg, ...);
+#define wmessage(fmt, args...) __wmessage( __func__, __FILE__, __LINE__, WMESSAGE_TYPE_MESSAGE, fmt, ## args)
+#define wwarning(fmt, args...) __wmessage( __func__, __FILE__, __LINE__, WMESSAGE_TYPE_WARNING, fmt, ## args)
+#define werror(fmt, args...) __wmessage( __func__, __FILE__, __LINE__, WMESSAGE_TYPE_ERROR, fmt, ## args)
+#define wfatal(fmt, args...) __wmessage( __func__, __FILE__, __LINE__, WMESSAGE_TYPE_FATAL, fmt, ## args)
+
+void __wmessage(const char *func, const char *file, int line, int type, const char *msg, ...)
+	__attribute__((__format__(printf,5,6)));
+
+/* ---[ WINGs/findfile.c ]------------------------------------------------ */

 char* wfindfile(char *paths, char *file);

@@ -231,18 +202,17 @@ char* wfindfileinarray(WMPropList* array, char *file);
 char* wexpandpath(char *path);

 /* don't free the returned string */
-char* wgethomedir();
+char* wgethomedir(void);

-void* wmalloc(size_t size);
-void* wrealloc(void *ptr, size_t newsize);
-void wfree(void *ptr);
+/* ---[ WINGs/proplist.c ]------------------------------------------------ */

+int wmkdirhier(const char *path);
+int wrmdirhier(const char *path);

-void wrelease(void *ptr);
-void* wretain(void *ptr);
+/* ---[ WINGs/string.c ]-------------------------------------------------- */

-char* wstrdup(char *str);
-char* wstrndup(char *str, size_t len);
+char *wstrdup(const char *str);
+char* wstrndup(const char *str, size_t len);

 /* Concatenate str1 with str2 and return that in a newly malloc'ed string.
 * str1 and str2 can be any strings including static and constant strings.
@@ -259,6 +229,9 @@ char* wstrconcat(char *str1, char *str2);
 * so always assign the returned address to avoid dangling pointers. */
 char* wstrappend(char *dst, char *src);

+size_t wstrlcpy(char *, const char *, size_t);
+size_t wstrlcat(char *, const char *, size_t);
+

 void wtokensplit(char *command, char ***argv, int *argc);

@@ -268,27 +241,23 @@ char* wtokenjoin(char **list, int count);

 void wtokenfree(char **tokens, int count);

-char* wtrimspace(char *s);
+char* wtrimspace(const char *s);

+/* transform `s' so that the result is safe to pass to the shell as an argument.
+ * returns a newly allocated string.
+ * with very heavy inspirations from NetBSD's shquote(3).
+ */
+char *wshellquote(const char *s);
+
+/* ---[ WINGs/wmisc.c ]--------------------------------------------------- */

 WMRange wmkrange(int start, int count);
-#ifdef ANSI_C_DOESNT_LIKE_IT_THIS_WAY
-#define wmkrange(position, count) (WMRange){(position), (count)}
-#endif

+/* ---[ WINGs/usleep.c ]-------------------------------------------------- */

-char* wusergnusteppath();
+void wusleep(unsigned int usec);

-char* wdefaultspathfordomain(char *domain);
-
-void wusleep(unsigned int microsec);
-
-#if 0
-int wsprintesc(char *buffer, int length, char *format, WMSEscapes **escapes,
-	       int count);
-#endif
-
-/*......................................................................*/
+/* ---[ WINGs/handlers.c ]------------------------------------------------ */

 /* Event handlers: timer, idle, input */

@@ -317,9 +286,9 @@ void WMDeleteInputHandler(WMHandlerID handlerID);
 * This function will handle all input/timer/idle events, then return.
 */

-void WHandleEvents();
+void WHandleEvents(void);

-/*......................................................................*/
+/* ---[ WINGs/hashtable.c ]----------------------------------------------- */


 WMHashTable* WMCreateHashTable(WMHashTableCallbacks callbacks);
@@ -380,7 +349,7 @@ extern const WMHashTableCallbacks WMStringPointerHashCallbacks;
 /* keys are strings, but they are not copied */


-/*......................................................................*/
+/* ---[ WINGs/array.c ]--------------------------------------------------- */

 /*
 * WMArray use an array to store the elements.
@@ -416,8 +385,6 @@ void WMAppendArray(WMArray *array, WMArray *other);
 /* add will place the element at the end of the array */
 void WMAddToArray(WMArray *array, void *item);

-#define WMPushInArray(array, item) WMAddToArray(array, item)
-
 /* insert will increment the index of elements after it by 1 */
 void WMInsertInArray(WMArray *array, int index, void *item);

@@ -482,7 +449,7 @@ void* WMArrayPrevious(WMArray *array, WMArrayIterator *iter);
    for (var = WMArrayLast(array, &(i)); (i) != WANotFound; \
    var = WMArrayPrevious(array, &(i)))

-/*..........................................................................*/
+/* ---[ WINGs/bagtree.c ]------------------------------------------------- */

 /*
 * Tree bags use a red-black tree for storage.
@@ -574,7 +541,7 @@ int WMBagIndexForIterator(WMBag *bag, WMBagIterator ptr);



-/*-------------------------------------------------------------------------*/
+/* ---[ WINGs/data.c ]---------------------------------------------------- */

 /* WMData handling */

@@ -643,8 +610,7 @@ void WMSetDataFormat(WMData *aData, unsigned format);
 unsigned WMGetDataFormat(WMData *aData);
 /* Storing data */

-
-/*--------------------------------------------------------------------------*/
+/* ---[ WINGs/tree.c ]---------------------------------------------------- */

 /* Generic Tree and TreeNode */

@@ -683,11 +649,17 @@ void WMSortTree(WMTreeNode *aNode, WMCompareDataProc *comparer);
 /* Returns the first node which matches node's data with cdata by 'match' */
 WMTreeNode* WMFindInTree(WMTreeNode *aTree, WMMatchDataProc *match, void *cdata);

+/* Returns the first node where node's data matches cdata by 'match' and node is
+ * at most `limit' depths down from `aTree'. */
+WMTreeNode *WMFindInTreeWithDepthLimit(WMTreeNode * aTree, WMMatchDataProc * match, void *cdata, int limit);
+
 /* Returns first tree node that has data == cdata */
 #define WMGetFirstInTree(aTree, cdata) WMFindInTree(aTree, NULL, cdata)

+/* Walk every node of aNode with `walk' */
+void WMTreeWalk(WMTreeNode *aNode, WMTreeWalkProc * walk, void *data, Bool DepthFirst);

-/*--------------------------------------------------------------------------*/
+/* ---[ WINGs/data.c ]---------------------------------------------------- */


 WMNotification* WMCreateNotification(const char *name, void *object, void *clientData);
@@ -733,7 +705,7 @@ void WMEnqueueCoalesceNotification(WMNotificationQueue *queue,
                                   unsigned coalesceMask);


-/*......................................................................*/
+/* ---[ WINGs/proplist.c ]------------------------------------------------ */

 /* Property Lists handling */

@@ -833,9 +805,15 @@ char* WMGetPropListDescription(WMPropList *plist, Bool indented);

 WMPropList* WMReadPropListFromFile(char *file);

-Bool WMWritePropListToFile(WMPropList *plist, char *path, Bool atomically);
+Bool WMWritePropListToFile(WMPropList *plist, char *path);

-/*......................................................................*/
+/* ---[ WINGs/userdefaults.c ]-------------------------------------------- */
+
+char* wusergnusteppath(void);
+
+char* wdefaultspathfordomain(char *domain);
+
+char* wglobaldefaultspathfordomain(const char *domain);

 WMUserDefaults* WMGetStandardUserDefaults(void);

@@ -888,135 +866,6 @@ extern char *WMUserDefaultsDidChangeNotification;

 /*-------------------------------------------------------------------------*/

-/* WMHost: host handling */
-
-WMHost* WMGetCurrentHost();
-
-WMHost* WMGetHostWithName(char* name);
-
-WMHost* WMGetHostWithAddress(char* address);
-
-WMHost* WMRetainHost(WMHost *hPtr);
-
-void WMReleaseHost(WMHost *hPtr);
-
-/*
- * Host cache management
- * If enabled, only one object representing each host will be created, and
- * a shared instance will be returned by all methods that return a host.
- * Enabled by default.
- */
-void WMSetHostCacheEnabled(Bool flag);
-
-Bool WMIsHostCacheEnabled();
-
-void WMFlushHostCache();
-
-/*
- * Compare hosts: Hosts are equal if they share at least one address
- */
-Bool WMIsHostEqualToHost(WMHost* hPtr, WMHost* anotherHost);
-
-/*
- * Host names.
- * WMGetHostName() will return first name (official) if a host has several.
- * WMGetHostNames() will return a R/O WMArray with all the names of the host.
- */
-char* WMGetHostName(WMHost* hPtr);
-
-/* The returned array is R/O. Do not modify it, and do not free it! */
-WMArray* WMGetHostNames(WMHost* hPtr);
-
-/*
- * Host addresses.
- * Addresses are represented as "Dotted Decimal" strings, e.g. "192.42.172.1"
- * WMGetHostAddress() will return an arbitrary address if a host has several.
- * WMGetHostAddresses() will return a R/O WMArray with all addresses of the host.
- */
-char* WMGetHostAddress(WMHost* hPtr);
-
-/* The returned array is R/O. Do not modify it, and do not free it! */
-WMArray* WMGetHostAddresses(WMHost* hPtr);
-
-
-/*-------------------------------------------------------------------------*/
-
-/* WMConnection functions */
-
-WMConnection* WMCreateConnectionAsServerAtAddress(char *host, char *service,
-                                                  char *protocol);
-
-WMConnection* WMCreateConnectionToAddress(char *host, char *service,
-                                          char *protocol);
-
-WMConnection* WMCreateConnectionToAddressAndNotify(char *host, char *service,
-                                                   char *protocol);
-
-void WMCloseConnection(WMConnection *cPtr);
-
-void WMDestroyConnection(WMConnection *cPtr);
-
-WMConnection* WMAcceptConnection(WMConnection *listener);
-
-/* Release the returned data! */
-WMData* WMGetConnectionAvailableData(WMConnection *cPtr);
-
-int WMSendConnectionData(WMConnection *cPtr, WMData *data);
-
-Bool WMEnqueueConnectionData(WMConnection *cPtr, WMData *data);
-
-#define WMFlushConnection(cPtr)  WMSendConnectionData((cPtr), NULL)
-
-void WMSetConnectionDelegate(WMConnection *cPtr, ConnectionDelegate *delegate);
-
-/* Connection info */
-
-char* WMGetConnectionAddress(WMConnection *cPtr);
-
-char* WMGetConnectionService(WMConnection *cPtr);
-
-char* WMGetConnectionProtocol(WMConnection *cPtr);
-
-Bool WMSetConnectionNonBlocking(WMConnection *cPtr, Bool flag);
-
-Bool WMSetConnectionCloseOnExec(WMConnection *cPtr, Bool flag);
-
-void WMSetConnectionShutdownOnClose(WMConnection *cPtr, Bool flag);
-
-void* WMGetConnectionClientData(WMConnection *cPtr);
-
-void WMSetConnectionClientData(WMConnection *cPtr, void *data);
-
-unsigned int WMGetConnectionFlags(WMConnection *cPtr);
-
-void WMSetConnectionFlags(WMConnection *cPtr, unsigned int flags);
-
-int WMGetConnectionSocket(WMConnection *cPtr);
-
-WMConnectionState WMGetConnectionState(WMConnection *cPtr);
-
-WMConnectionTimeoutState WMGetConnectionTimeoutState(WMConnection *cPtr);
-
-WMArray* WMGetConnectionUnsentData(WMConnection *cPtr);
-
-#define WMGetConnectionQueuedData(cPtr) WMGetConnectionUnsentData(cPtr)
-
-
-/*
- * Passing timeout==0 in the SetTimeout functions below, will reset that
- * timeout to its default value.
- */
-
-/* The default timeout inherited by all WMConnection operations, if none set */
-void WMSetConnectionDefaultTimeout(unsigned int timeout);
-
-/* Global timeout for all WMConnection objects, for opening a new connection */
-void WMSetConnectionOpenTimeout(unsigned int timeout);
-
-/* Connection specific timeout for sending out data */
-void WMSetConnectionSendTimeout(WMConnection *cPtr, unsigned int timeout);
-
-
 /* Global variables */

 extern int WCErrorCode;
@@ -1024,8 +873,6 @@ extern int WCErrorCode;

 /*-------------------------------------------------------------------------*/

-
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/WINGs/WINGs/proplist-compat.h
+++ b/WINGs/WINGs/proplist-compat.h
@@ -115,7 +115,7 @@ typedef WMPropList* proplist_t;
 #define PLGetDataDescription(pl) WMGetPropListDescription(pl, False)

 #define PLGetProplistWithPath(file) WMReadPropListFromFile(file)
-#define PLSave(pl, file, atm) WMWritePropListToFile(pl, file, atm)
+#define PLSave(pl, file, atm) WMWritePropListToFile(pl, file)


 /* Unsupported functions. Do not ask for them. They're evil :P */
--- a/WINGs/array.c
+++ b/WINGs/array.c
@@ -1,24 +1,21 @@
 /*
 * Dynamically Resized Array
 *
- * Authors: Alfredo K. Kojima <kojima@windowmaker.org>
- *          Dan Pascu         <dan@windowmaker.org>
+ * Authors: Alfredo K. Kojima <kojima@windowmaker.info>
+ *          Dan Pascu         <dan@windowmaker.info>
 *
 * This code is released to the Public Domain, but
 * proper credit is always appreciated :)
 */

-
 #include <stdlib.h>
 #include <string.h>

 #include "WUtil.h"

-
 #define INITIAL_SIZE 8
 #define RESIZE_INCREMENT 8

-
 typedef struct W_Array {
 	void **items;		/* the array data */
 	int itemCount;		/* # of items in array */
@@ -26,16 +23,12 @@ typedef struct W_Array {
 	WMFreeDataProc *destructor;	/* the destructor to free elements */
 } W_Array;

-
-WMArray*
-WMCreateArray(int initialSize)
+WMArray *WMCreateArray(int initialSize)
 {
 	return WMCreateArrayWithDestructor(initialSize, NULL);
 }

-
-WMArray*
-WMCreateArrayWithDestructor(int initialSize, WMFreeDataProc *destructor)
+WMArray *WMCreateArrayWithDestructor(int initialSize, WMFreeDataProc * destructor)
 {
 	WMArray *array;

@@ -45,7 +38,7 @@ WMCreateArrayWithDestructor(int initialSize, WMFreeDataProc *destructor)
 		initialSize = INITIAL_SIZE;
 	}

-    array->items = wmalloc(sizeof(void*) * initialSize);
+	array->items = wmalloc(sizeof(void *) * initialSize);

 	array->itemCount = 0;
 	array->allocSize = initialSize;
@@ -54,16 +47,14 @@ WMCreateArrayWithDestructor(int initialSize, WMFreeDataProc *destructor)
 	return array;
 }

-
-WMArray*
-WMCreateArrayWithArray(WMArray *array)
+WMArray *WMCreateArrayWithArray(WMArray * array)
 {
 	WMArray *newArray;

 	newArray = wmalloc(sizeof(WMArray));

-    newArray->items = wmalloc(sizeof(void*) * array->allocSize);
-    memcpy(newArray->items, array->items, sizeof(void*)*array->itemCount);
+	newArray->items = wmalloc(sizeof(void *) * array->allocSize);
+	memcpy(newArray->items, array->items, sizeof(void *) * array->itemCount);

 	newArray->itemCount = array->itemCount;
 	newArray->allocSize = array->allocSize;
@@ -72,9 +63,7 @@ WMCreateArrayWithArray(WMArray *array)
 	return newArray;
 }

-
-void
-WMEmptyArray(WMArray *array)
+void WMEmptyArray(WMArray * array)
 {
 	if (array->destructor) {
 		while (array->itemCount > 0) {
@@ -82,78 +71,65 @@ WMEmptyArray(WMArray *array)
 			array->destructor(array->items[array->itemCount]);
 		}
 	}
-    /*memset(array->items, 0, array->itemCount * sizeof(void*));*/
+	/*memset(array->items, 0, array->itemCount * sizeof(void*)); */
 	array->itemCount = 0;
 }

-
-void
-WMFreeArray(WMArray *array)
+void WMFreeArray(WMArray * array)
 {
 	WMEmptyArray(array);
 	wfree(array->items);
 	wfree(array);
 }

-
-int
-WMGetArrayItemCount(WMArray *array)
+int WMGetArrayItemCount(WMArray * array)
 {
 	return array->itemCount;
 }

-
-void
-WMAppendArray(WMArray *array, WMArray *other)
+void WMAppendArray(WMArray * array, WMArray * other)
 {
 	if (other->itemCount == 0)
 		return;

 	if (array->itemCount + other->itemCount > array->allocSize) {
 		array->allocSize += other->allocSize;
-        array->items = wrealloc(array->items, sizeof(void*)*array->allocSize);
+		array->items = wrealloc(array->items, sizeof(void *) * array->allocSize);
 	}

-    memcpy(array->items+array->itemCount, other->items,
-           sizeof(void*)*other->itemCount);
+	memcpy(array->items + array->itemCount, other->items, sizeof(void *) * other->itemCount);
 	array->itemCount += other->itemCount;
 }

-
-void
-WMAddToArray(WMArray *array, void *item)
+void WMAddToArray(WMArray * array, void *item)
 {
 	if (array->itemCount >= array->allocSize) {
 		array->allocSize += RESIZE_INCREMENT;
-        array->items = wrealloc(array->items, sizeof(void*)*array->allocSize);
+		array->items = wrealloc(array->items, sizeof(void *) * array->allocSize);
 	}
 	array->items[array->itemCount] = item;

 	array->itemCount++;
 }

-
-void
-WMInsertInArray(WMArray *array, int index, void *item)
+void WMInsertInArray(WMArray * array, int index, void *item)
 {
 	wassertr(index >= 0 && index <= array->itemCount);

 	if (array->itemCount >= array->allocSize) {
 		array->allocSize += RESIZE_INCREMENT;
-        array->items = wrealloc(array->items, sizeof(void*)*array->allocSize);
+		array->items = wrealloc(array->items, sizeof(void *) * array->allocSize);
 	}
 	if (index < array->itemCount) {
-        memmove(array->items+index+1, array->items+index,
-                sizeof(void*)*(array->itemCount-index));
+		memmove(array->items + index + 1, array->items + index,
+			sizeof(void *) * (array->itemCount - index));
 	}
 	array->items[index] = item;

 	array->itemCount++;
 }

-
-void*
-WMReplaceInArray(WMArray *array, int index, void *item)
+void *WMReplaceInArray(WMArray * array, int index, void *item)
 {
 	void *old;

@@ -171,9 +147,7 @@ WMReplaceInArray(WMArray *array, int index, void *item)
 	return old;
 }

-
-int
-WMDeleteFromArray(WMArray *array, int index)
+int WMDeleteFromArray(WMArray * array, int index)
 {
 	wassertrv(index >= 0 && index < array->itemCount, 0);

@@ -181,9 +155,9 @@ WMDeleteFromArray(WMArray *array, int index)
 		array->destructor(array->items[index]);
 	}

-    if (index < array->itemCount-1) {
-        memmove(array->items+index, array->items+index+1,
-                sizeof(void*)*(array->itemCount-index-1));
+	if (index < array->itemCount - 1) {
+		memmove(array->items + index, array->items + index + 1,
+			sizeof(void *) * (array->itemCount - index - 1));
 	}

 	array->itemCount--;
@@ -191,15 +165,13 @@ WMDeleteFromArray(WMArray *array, int index)
 	return 1;
 }

-
-int
-WMRemoveFromArrayMatching(WMArray *array, WMMatchDataProc *match, void *cdata)
+int WMRemoveFromArrayMatching(WMArray * array, WMMatchDataProc * match, void *cdata)
 {
 	int i;

 	if (match != NULL) {
 		for (i = 0; i < array->itemCount; i++) {
-            if ((*match)(array->items[i], cdata)) {
+			if ((*match) (array->items[i], cdata)) {
 				WMDeleteFromArray(array, i);
 				return 1;
 			}
@@ -216,9 +188,7 @@ WMRemoveFromArrayMatching(WMArray *array, WMMatchDataProc *match, void *cdata)
 	return 0;
 }

-
-void*
-WMGetFromArray(WMArray *array, int index)
+void *WMGetFromArray(WMArray * array, int index)
 {
 	if (index < 0 || index >= array->itemCount)
 		return NULL;
@@ -226,24 +196,20 @@ WMGetFromArray(WMArray *array, int index)
 	return array->items[index];
 }

-
-void*
-WMPopFromArray(WMArray *array)
+void *WMPopFromArray(WMArray * array)
 {
 	array->itemCount--;

 	return array->items[array->itemCount];
 }

-
-int
-WMFindInArray(WMArray *array, WMMatchDataProc *match, void *cdata)
+int WMFindInArray(WMArray * array, WMMatchDataProc * match, void *cdata)
 {
 	int i;

-    if (match!=NULL) {
+	if (match != NULL) {
 		for (i = 0; i < array->itemCount; i++) {
-            if ((*match)(array->items[i], cdata))
+			if ((*match) (array->items[i], cdata))
 				return i;
 		}
 	} else {
@@ -256,13 +222,11 @@ WMFindInArray(WMArray *array, WMMatchDataProc *match, void *cdata)
 	return WANotFound;
 }

-
-int
-WMCountInArray(WMArray *array, void *item)
+int WMCountInArray(WMArray * array, void *item)
 {
 	int i, count;

-    for (i=0, count=0; i<array->itemCount; i++) {
+	for (i = 0, count = 0; i < array->itemCount; i++) {
 		if (array->items[i] == item)
 			count++;
 	}
@@ -270,29 +234,23 @@ WMCountInArray(WMArray *array, void *item)
 	return count;
 }

-
-void
-WMSortArray(WMArray *array, WMCompareDataProc *comparer)
+void WMSortArray(WMArray * array, WMCompareDataProc * comparer)
 {
 	if (array->itemCount > 1) {	/* Don't sort empty or single element arrays */
-        qsort(array->items, array->itemCount, sizeof(void*), comparer);
+		qsort(array->items, array->itemCount, sizeof(void *), comparer);
 	}
 }

-
-void
-WMMapArray(WMArray *array, void (*function)(void*, void*), void *data)
+void WMMapArray(WMArray * array, void (*function) (void *, void *), void *data)
 {
 	int i;

-    for (i=0; i<array->itemCount; i++) {
-        (*function)(array->items[i], data);
+	for (i = 0; i < array->itemCount; i++) {
+		(*function) (array->items[i], data);
 	}
 }

-
-WMArray*
-WMGetSubarrayWithRange(WMArray* array, WMRange aRange)
+WMArray *WMGetSubarrayWithRange(WMArray * array, WMRange aRange)
 {
 	WMArray *newArray;

@@ -307,16 +265,13 @@ WMGetSubarrayWithRange(WMArray* array, WMRange aRange)
 		aRange.count = array->itemCount - aRange.position;

 	newArray = WMCreateArray(aRange.count);
-    memcpy(newArray->items, array->items+aRange.position,
-           sizeof(void*)*aRange.count);
+	memcpy(newArray->items, array->items + aRange.position, sizeof(void *) * aRange.count);
 	newArray->itemCount = aRange.count;

 	return newArray;
 }

-
-void*
-WMArrayFirst(WMArray *array, WMArrayIterator *iter)
+void *WMArrayFirst(WMArray * array, WMArrayIterator * iter)
 {
 	if (array->itemCount == 0) {
 		*iter = WANotFound;
@@ -327,24 +282,20 @@ WMArrayFirst(WMArray *array, WMArrayIterator *iter)
 	}
 }

-
-void*
-WMArrayLast(WMArray *array, WMArrayIterator *iter)
+void *WMArrayLast(WMArray * array, WMArrayIterator * iter)
 {
 	if (array->itemCount == 0) {
 		*iter = WANotFound;
 		return NULL;
 	} else {
-        *iter = array->itemCount-1;
+		*iter = array->itemCount - 1;
 		return array->items[*iter];
 	}
 }

-
-void*
-WMArrayNext(WMArray *array, WMArrayIterator *iter)
+void *WMArrayNext(WMArray * array, WMArrayIterator * iter)
 {
-    if (*iter >= 0 && *iter < array->itemCount-1) {
+	if (*iter >= 0 && *iter < array->itemCount - 1) {
 		return array->items[++(*iter)];
 	} else {
 		*iter = WANotFound;
@@ -352,9 +303,7 @@ WMArrayNext(WMArray *array, WMArrayIterator *iter)
 	}
 }

-
-void*
-WMArrayPrevious(WMArray *array, WMArrayIterator *iter)
+void *WMArrayPrevious(WMArray * array, WMArrayIterator * iter)
 {
 	if (*iter > 0 && *iter < array->itemCount) {
 		return array->items[--(*iter)];
@@ -363,6 +312,3 @@ WMArrayPrevious(WMArray *array, WMArrayIterator *iter)
 		return NULL;
 	}
 }
-
-
-
--- a/WINGs/bagtree.c
+++ b/WINGs/bagtree.c
@@ -1,13 +1,9 @@

-
-
-
 #include <stdlib.h>
 #include <string.h>

 #include "WUtil.h"

-
 typedef struct W_Node {
 	struct W_Node *parent;
 	struct W_Node *left;
@@ -18,7 +14,6 @@ typedef struct W_Node {
 	int index;
 } W_Node;

-
 typedef struct W_Bag {
 	W_Node *root;

@@ -26,18 +21,13 @@ typedef struct W_Bag {

 	int count;

-    void (*destructor)(void *item);
+	void (*destructor) (void *item);
 } W_Bag;

-
-
 #define IS_LEFT(node) (node == node->parent->left)
 #define IS_RIGHT(node) (node == node->parent->right)

-
-
-static void
-leftRotate(W_Bag *tree, W_Node *node)
+static void leftRotate(W_Bag * tree, W_Node * node)
 {
 	W_Node *node2;

@@ -61,10 +51,7 @@ leftRotate(W_Bag *tree, W_Node *node)
 	node->parent = node2;
 }

-
-
-static void
-rightRotate(W_Bag *tree, W_Node *node)
+static void rightRotate(W_Bag * tree, W_Node * node)
 {
 	W_Node *node2;

@@ -88,9 +75,7 @@ rightRotate(W_Bag *tree, W_Node *node)
 	node->parent = node2;
 }

-
-static void
-treeInsert(W_Bag *tree, W_Node *node)
+static void treeInsert(W_Bag * tree, W_Node * node)
 {
 	W_Node *y = tree->nil;
 	W_Node *x = tree->root;
@@ -111,9 +96,7 @@ treeInsert(W_Bag *tree, W_Node *node)
 		y->right = node;
 }

-
-static void
-rbTreeInsert(W_Bag *tree, W_Node *node)
+static void rbTreeInsert(W_Bag * tree, W_Node * node)
 {
 	W_Node *y;

@@ -165,9 +148,7 @@ rbTreeInsert(W_Bag *tree, W_Node *node)
 	tree->root->color = 'B';
 }

-
-static void
-rbDeleteFixup(W_Bag *tree, W_Node *node)
+static void rbDeleteFixup(W_Bag * tree, W_Node * node)
 {
 	W_Node *w;

@@ -226,27 +207,21 @@ rbDeleteFixup(W_Bag *tree, W_Node *node)

 }

-
-static W_Node*
-treeMinimum(W_Node *node, W_Node *nil)
+static W_Node *treeMinimum(W_Node * node, W_Node * nil)
 {
 	while (node->left != nil)
 		node = node->left;
 	return node;
 }

-
-static W_Node*
-treeMaximum(W_Node *node, W_Node *nil)
+static W_Node *treeMaximum(W_Node * node, W_Node * nil)
 {
 	while (node->right != nil)
 		node = node->right;
 	return node;
 }

-
-static W_Node*
-treeSuccessor(W_Node *node, W_Node *nil)
+static W_Node *treeSuccessor(W_Node * node, W_Node * nil)
 {
 	W_Node *y;

@@ -261,9 +236,7 @@ treeSuccessor(W_Node *node, W_Node *nil)
 	return y;
 }

-
-static W_Node*
-treePredecessor(W_Node *node, W_Node *nil)
+static W_Node *treePredecessor(W_Node * node, W_Node * nil)
 {
 	W_Node *y;

@@ -278,9 +251,7 @@ treePredecessor(W_Node *node, W_Node *nil)
 	return y;
 }

-
-static W_Node*
-rbTreeDelete(W_Bag *tree, W_Node *node)
+static W_Node *rbTreeDelete(W_Bag * tree, W_Node * node)
 {
 	W_Node *nil = tree->nil;
 	W_Node *x, *y;
@@ -319,9 +290,7 @@ rbTreeDelete(W_Bag *tree, W_Node *node)
 	return y;
 }

-
-static W_Node*
-treeSearch(W_Node *root, W_Node *nil, int index)
+static W_Node *treeSearch(W_Node * root, W_Node * nil, int index)
 {
 	if (root == nil || root->index == index) {
 		return root;
@@ -334,9 +303,7 @@ treeSearch(W_Node *root, W_Node *nil, int index)
 	}
 }

-
-static W_Node*
-treeFind(W_Node *root, W_Node *nil, void *data)
+static W_Node *treeFind(W_Node * root, W_Node * nil, void *data)
 {
 	W_Node *tmp;

@@ -352,79 +319,60 @@ treeFind(W_Node *root, W_Node *nil, void *data)
 	return tmp;
 }

-
-
 #if 0
 static char buf[512];

-static void
-printNodes(W_Node *node, W_Node *nil, int depth)
+static void printNodes(W_Node * node, W_Node * nil, int depth)
 {
 	if (node == nil) {
 		return;
 	}

-    printNodes(node->left, nil, depth+1);
+	printNodes(node->left, nil, depth + 1);

-    memset(buf, ' ', depth*2);
-    buf[depth*2] = 0;
+	memset(buf, ' ', depth * 2);
+	buf[depth * 2] = 0;
 	if (IS_LEFT(node))
 		printf("%s/(%2i\n", buf, node->index);
 	else
 		printf("%s\\(%2i\n", buf, node->index);

-    printNodes(node->right, nil, depth+1);
+	printNodes(node->right, nil, depth + 1);
 }

-
-void
-PrintTree(WMBag *bag)
+void PrintTree(WMBag * bag)
 {
-    W_TreeBag *tree = (W_TreeBag*)bag->data;
+	W_TreeBag *tree = (W_TreeBag *) bag->data;

 	printNodes(tree->root, tree->nil, 0);
 }
 #endif

-
-WMBag*
-WMCreateTreeBag(void)
+WMBag *WMCreateTreeBag(void)
 {
 	return WMCreateTreeBagWithDestructor(NULL);
 }

-
-WMBag*
-WMCreateTreeBagWithDestructor(WMFreeDataProc *destructor)
+WMBag *WMCreateTreeBagWithDestructor(WMFreeDataProc * destructor)
 {
 	WMBag *bag;

 	bag = wmalloc(sizeof(WMBag));
-
-    memset(bag, 0, sizeof(WMBag));
-
 	bag->nil = wmalloc(sizeof(W_Node));
-    memset(bag->nil, 0, sizeof(W_Node));
 	bag->nil->left = bag->nil->right = bag->nil->parent = bag->nil;
 	bag->nil->index = WBNotFound;
-
 	bag->root = bag->nil;
-
 	bag->destructor = destructor;

 	return bag;
 }

-
-int
-WMGetBagItemCount(WMBag *self)
+int WMGetBagItemCount(WMBag * self)
 {
 	return self->count;
 }

-
-void
-WMAppendBag(WMBag *self, WMBag *bag)
+void WMAppendBag(WMBag * self, WMBag * bag)
 {
 	WMBagIterator ptr;
 	void *data;
@@ -434,9 +382,7 @@ WMAppendBag(WMBag *self, WMBag *bag)
 	}
 }

-
-void
-WMPutInBag(WMBag *self, void *item)
+void WMPutInBag(WMBag * self, void *item)
 {
 	W_Node *ptr;

@@ -453,9 +399,7 @@ WMPutInBag(WMBag *self, void *item)
 	self->count++;
 }

-
-void
-WMInsertInBag(WMBag *self, int index, void *item)
+void WMInsertInBag(WMBag * self, int index, void *item)
 {
 	W_Node *ptr;

@@ -473,13 +417,10 @@ WMInsertInBag(WMBag *self, int index, void *item)
 		ptr->index++;
 	}

-
 	self->count++;
 }

-
-int
-WMRemoveFromBag(WMBag *self, void *item)
+int WMRemoveFromBag(WMBag * self, void *item)
 {
 	W_Node *ptr = treeFind(self->root, self->nil, item);

@@ -505,9 +446,7 @@ WMRemoveFromBag(WMBag *self, void *item)
 	}
 }

-
-int
-WMEraseFromBag(WMBag *self, int index)
+int WMEraseFromBag(WMBag * self, int index)
 {
 	W_Node *ptr = treeSearch(self->root, self->nil, index);

@@ -520,7 +459,7 @@ WMEraseFromBag(WMBag *self, int index)
 			self->destructor(ptr->data);
 		wfree(ptr);

-        wassertrv(self->count == 0||self->root->index >= 0, 1);
+		wassertrv(self->count == 0 || self->root->index >= 0, 1);

 		return 1;
 	} else {
@@ -528,9 +467,7 @@ WMEraseFromBag(WMBag *self, int index)
 	}
 }

-
-int
-WMDeleteFromBag(WMBag *self, int index)
+int WMDeleteFromBag(WMBag * self, int index)
 {
 	W_Node *ptr = treeSearch(self->root, self->nil, index);

@@ -550,7 +487,7 @@ WMDeleteFromBag(WMBag *self, int index)
 			self->destructor(ptr->data);
 		wfree(ptr);

-        wassertrv(self->count == 0||self->root->index >= 0, 1);
+		wassertrv(self->count == 0 || self->root->index >= 0, 1);

 		return 1;
 	} else {
@@ -558,9 +495,7 @@ WMDeleteFromBag(WMBag *self, int index)
 	}
 }

-
-void*
-WMGetFromBag(WMBag *self, int index)
+void *WMGetFromBag(WMBag * self, int index)
 {
 	W_Node *node;

@@ -571,9 +506,7 @@ WMGetFromBag(WMBag *self, int index)
 		return NULL;
 }

-
-int
-WMGetFirstInBag(WMBag *self, void *item)
+int WMGetFirstInBag(WMBag * self, void *item)
 {
 	W_Node *node;

@@ -584,10 +517,7 @@ WMGetFirstInBag(WMBag *self, void *item)
 		return WBNotFound;
 }

-
-
-static int
-treeCount(W_Node *root, W_Node *nil, void *item)
+static int treeCount(W_Node * root, W_Node * nil, void *item)
 {
 	int count = 0;

@@ -606,17 +536,12 @@ treeCount(W_Node *root, W_Node *nil, void *item)
 	return count;
 }

-
-
-int
-WMCountInBag(WMBag *self, void *item)
+int WMCountInBag(WMBag * self, void *item)
 {
 	return treeCount(self->root, self->nil, item);
 }

-
-void*
-WMReplaceInBag(WMBag *self, int index, void *item)
+void *WMReplaceInBag(WMBag * self, int index, void *item)
 {
 	W_Node *ptr = treeSearch(self->root, self->nil, index);
 	void *old = NULL;
@@ -649,9 +574,7 @@ WMReplaceInBag(WMBag *self, int index, void *item)
 	return old;
 }

-
-void
-WMSortBag(WMBag *self, WMCompareDataProc *comparer)
+void WMSortBag(WMBag * self, WMCompareDataProc * comparer)
 {
 	void **items;
 	W_Node *tmp;
@@ -660,7 +583,7 @@ WMSortBag(WMBag *self, WMCompareDataProc *comparer)
 	if (self->count == 0)
 		return;

-    items = wmalloc(sizeof(void*)*self->count);
+	items = wmalloc(sizeof(void *) * self->count);
 	i = 0;

 	tmp = treeMinimum(self->root, self->nil);
@@ -669,7 +592,7 @@ WMSortBag(WMBag *self, WMCompareDataProc *comparer)
 		tmp = treeSuccessor(tmp, self->nil);
 	}

-    qsort(&items[0], self->count, sizeof(void*), comparer);
+	qsort(&items[0], self->count, sizeof(void *), comparer);

 	i = 0;
 	tmp = treeMinimum(self->root, self->nil);
@@ -682,9 +605,7 @@ WMSortBag(WMBag *self, WMCompareDataProc *comparer)
 	wfree(items);
 }

-
-static void
-deleteTree(WMBag *self, W_Node *node)
+static void deleteTree(WMBag * self, W_Node * node)
 {
 	if (node == self->nil)
 		return;
@@ -699,49 +620,38 @@ deleteTree(WMBag *self, W_Node *node)
 	wfree(node);
 }

-
-void
-WMEmptyBag(WMBag *self)
+void WMEmptyBag(WMBag * self)
 {
 	deleteTree(self, self->root);
 	self->root = self->nil;
 	self->count = 0;
 }

-
-void
-WMFreeBag(WMBag *self)
+void WMFreeBag(WMBag * self)
 {
 	WMEmptyBag(self);
 	wfree(self->nil);
 	wfree(self);
 }

-
-static void
-mapTree(W_Bag *tree, W_Node *node, void (*function)(void*, void*), void *data)
+static void mapTree(W_Bag * tree, W_Node * node, void (*function) (void *, void *), void *data)
 {
 	if (node == tree->nil)
 		return;

 	mapTree(tree, node->left, function, data);

-    (*function)(node->data, data);
+	(*function) (node->data, data);

 	mapTree(tree, node->right, function, data);
 }

-
-void
-WMMapBag(WMBag *self, void (*function)(void*, void*), void *data)
+void WMMapBag(WMBag * self, void (*function) (void *, void *), void *data)
 {
 	mapTree(self, self->root, function, data);
 }

-
-
-static int
-findInTree(W_Bag *tree, W_Node *node, WMMatchDataProc *function, void *cdata)
+static int findInTree(W_Bag * tree, W_Node * node, WMMatchDataProc * function, void *cdata)
 {
 	int index;

@@ -752,23 +662,19 @@ findInTree(W_Bag *tree, W_Node *node, WMMatchDataProc *function, void *cdata)
 	if (index != WBNotFound)
 		return index;

-    if ((*function)(node->data, cdata)) {
+	if ((*function) (node->data, cdata)) {
 		return node->index;
 	}

 	return findInTree(tree, node->right, function, cdata);
 }

-
-int
-WMFindInBag(WMBag *self, WMMatchDataProc *match, void *cdata)
+int WMFindInBag(WMBag * self, WMMatchDataProc * match, void *cdata)
 {
 	return findInTree(self, self->root, match, cdata);
 }

-
-void*
-WMBagFirst(WMBag *self, WMBagIterator *ptr)
+void *WMBagFirst(WMBag * self, WMBagIterator * ptr)
 {
 	W_Node *node;

@@ -783,9 +689,7 @@ WMBagFirst(WMBag *self, WMBagIterator *ptr)
 	}
 }

-
-void*
-WMBagLast(WMBag *self, WMBagIterator *ptr)
+void *WMBagLast(WMBag * self, WMBagIterator * ptr)
 {

 	W_Node *node;
@@ -801,9 +705,7 @@ WMBagLast(WMBag *self, WMBagIterator *ptr)
 	}
 }

-
-void*
-WMBagNext(WMBag *self, WMBagIterator *ptr)
+void *WMBagNext(WMBag * self, WMBagIterator * ptr)
 {
 	W_Node *node;

@@ -821,9 +723,7 @@ WMBagNext(WMBag *self, WMBagIterator *ptr)
 	}
 }

-
-void*
-WMBagPrevious(WMBag *self, WMBagIterator *ptr)
+void *WMBagPrevious(WMBag * self, WMBagIterator * ptr)
 {
 	W_Node *node;

@@ -841,9 +741,7 @@ WMBagPrevious(WMBag *self, WMBagIterator *ptr)
 	}
 }

-
-void*
-WMBagIteratorAtIndex(WMBag *self, int index, WMBagIterator *ptr)
+void *WMBagIteratorAtIndex(WMBag * self, int index, WMBagIterator * ptr)
 {
 	W_Node *node;

@@ -858,11 +756,7 @@ WMBagIteratorAtIndex(WMBag *self, int index, WMBagIterator *ptr)
 	}
 }

-
-int
-WMBagIndexForIterator(WMBag *bag, WMBagIterator ptr)
+int WMBagIndexForIterator(WMBag * bag, WMBagIterator ptr)
 {
-    return ((W_Node*)ptr)->index;
+	return ((W_Node *) ptr)->index;
 }
-
-
--- a/WINGs/configuration.c
+++ b/WINGs/configuration.c
@@ -1,30 +1,20 @@

-
 #include "WINGsP.h"
 #include "wconfig.h"

 #include <X11/Xlocale.h>

-
 _WINGsConfiguration WINGsConfiguration;

-
-
-#define SYSTEM_FONT "-*-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-*-medium-r-*-*-%d-*-*-*-*-*-*-*"
-
-#define BOLD_SYSTEM_FONT "-*-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*,-*-*-bold-r-*-*-%d-*-*-*-*-*-*-*"
-
-#define XFTSYSTEM_FONT "-*-arial-medium-r-normal-*-%d-*-*-*-*-*-*-*"
-
-#define XFTBOLD_SYSTEM_FONT "-*-arial-bold-r-normal-*-%d-*-*-*-*-*-*-*"
+#define SYSTEM_FONT "Trebuchet MS,sans serif"
+#define BOLD_SYSTEM_FONT "Trebuchet MS,sans serif:bold"
+#define DEFAULT_FONT_SIZE 12

 #define FLOPPY_PATH "/floppy"

-
-static unsigned
-getButtonWithName(const char *name, unsigned defaultButton)
+static unsigned getButtonWithName(const char *name, unsigned defaultButton)
 {
-    if (strncmp(name, "Button", 6)==0 && strlen(name)==7) {
+	if (strncmp(name, "Button", 6) == 0 && strlen(name) == 7) {
 		switch (name[6]) {
 		case '1':
 			return Button1;
@@ -44,56 +34,10 @@ getButtonWithName(const char *name, unsigned defaultButton)
 	return defaultButton;
 }

-
-static Bool
-missingOrInvalidXLFD(char *xlfd)
-{
-    char *ptr = xlfd;
-    Bool broken = False;
-    int count = 0;
-
-    if (!xlfd)
-        return True;
-
-    while (*ptr) {
-        if (*ptr=='%') {
-            ptr++;
-            if ((*ptr=='d' || *ptr=='i') && count==0) {
-                count++;
-            } else {
-                broken = True;
-                break;
-            }
-        } else if (*ptr==',') {
-            count = 0;
-        }
-        ptr++;
-    }
-
-    if (broken) {
-        if (xlfd == WINGsConfiguration.systemFont) {
-            ptr = "system font";
-        } else if (xlfd == WINGsConfiguration.boldSystemFont) {
-            ptr = "bold system font";
-        } else if (xlfd == WINGsConfiguration.antialiasedSystemFont) {
-            ptr = "antialiased system font";
-        } else if (xlfd == WINGsConfiguration.antialiasedBoldSystemFont) {
-            ptr = "antialiased bold system font";
-        } else {
-            ptr = "Unknown System Font";
-        }
-        wwarning(_("Invalid %s specification: '%s' (only %%d is allowed and "
-                   "at most once for each font in a fontset)."), ptr, xlfd);
-    }
-
-    return broken;
-}
-
-
-void
-W_ReadConfigurations(void)
+void W_ReadConfigurations(void)
 {
 	WMUserDefaults *defaults;
+	Bool aaIsSet = False;

 	memset(&WINGsConfiguration, 0, sizeof(_WINGsConfiguration));

@@ -101,55 +45,23 @@ W_ReadConfigurations(void)

 	if (defaults) {
 		char *buttonName;
+		WMPropList *val;
 		unsigned button;
-	char *str;

-	WINGsConfiguration.systemFont = 
-	    WMGetUDStringForKey(defaults, "SystemFont");
+		WINGsConfiguration.systemFont = WMGetUDStringForKey(defaults, "SystemFont");

-	WINGsConfiguration.boldSystemFont = 
-	    WMGetUDStringForKey(defaults, "BoldSystemFont");
+		WINGsConfiguration.boldSystemFont = WMGetUDStringForKey(defaults, "BoldSystemFont");

-	WINGsConfiguration.antialiasedSystemFont =
-	    WMGetUDStringForKey(defaults, "AntialiasedSystemFont");
-
-	WINGsConfiguration.antialiasedBoldSystemFont =
-	    WMGetUDStringForKey(defaults, "AntialiasedBoldSystemFont");
-
-#ifdef XFT
+		val = WMGetUDObjectForKey(defaults, "AntialiasedText");
+		if (val && WMIsPLString(val) && WMGetFromPLString(val)) {
+			aaIsSet = True;
 			WINGsConfiguration.antialiasedText =
 				WMGetUDBoolForKey(defaults, "AntialiasedText");
-#else
-        WINGsConfiguration.antialiasedText = False;
-#endif
-
-	WINGsConfiguration.useMultiByte = False;
-	str = WMGetUDStringForKey(defaults, "MultiByteText");
-	if (str) {
-	    if (strcasecmp(str, "YES") == 0) {
-		WINGsConfiguration.useMultiByte = True;
-	    } else if (strcasecmp(str, "AUTO") == 0) {
-		char *locale;
-		
-		/* if it's a multibyte language (japanese, chinese or korean)
-		 * then set it to True */
-		locale = setlocale(LC_CTYPE, NULL);
-		if (locale != NULL 
-		    && (strncmp(locale, "ja", 2) == 0
-			|| strncmp(locale, "zh", 2) == 0
-			|| strncmp(locale, "ru", 2) == 0
-			|| strncmp(locale, "ko", 2) == 0)) {
-
-		    WINGsConfiguration.useMultiByte = True;
-		}
-	    }
 		}

-	WINGsConfiguration.doubleClickDelay = 
-	    WMGetUDIntegerForKey(defaults, "DoubleClickTime");	
+		WINGsConfiguration.doubleClickDelay = WMGetUDIntegerForKey(defaults, "DoubleClickTime");

-	WINGsConfiguration.floppyPath =
-	    WMGetUDStringForKey(defaults, "FloppyPath");
+		WINGsConfiguration.floppyPath = WMGetUDStringForKey(defaults, "FloppyPath");

 		buttonName = WMGetUDStringForKey(defaults, "MouseWheelUp");
 		if (buttonName) {
@@ -169,26 +81,25 @@ W_ReadConfigurations(void)
 		}
 		WINGsConfiguration.mouseWheelDown = button;

-        if (WINGsConfiguration.mouseWheelDown==WINGsConfiguration.mouseWheelUp) {
+		if (WINGsConfiguration.mouseWheelDown == WINGsConfiguration.mouseWheelUp) {
 			WINGsConfiguration.mouseWheelUp = Button4;
 			WINGsConfiguration.mouseWheelDown = Button5;
 		}

-	WINGsConfiguration.defaultFontSize = 
-            WMGetUDIntegerForKey(defaults, "DefaultFontSize");
+		WINGsConfiguration.defaultFontSize = WMGetUDIntegerForKey(defaults, "DefaultFontSize");
 	}

-    if (missingOrInvalidXLFD(WINGsConfiguration.systemFont)) {
+	if (!WINGsConfiguration.systemFont) {
 		WINGsConfiguration.systemFont = SYSTEM_FONT;
 	}
-    if (missingOrInvalidXLFD(WINGsConfiguration.boldSystemFont)) {
+	if (!WINGsConfiguration.boldSystemFont) {
 		WINGsConfiguration.boldSystemFont = BOLD_SYSTEM_FONT;
 	}
-    if (missingOrInvalidXLFD(WINGsConfiguration.antialiasedSystemFont)) {
-	WINGsConfiguration.antialiasedSystemFont = XFTSYSTEM_FONT;
+	if (WINGsConfiguration.defaultFontSize == 0) {
+		WINGsConfiguration.defaultFontSize = DEFAULT_FONT_SIZE;
 	}
-    if (missingOrInvalidXLFD(WINGsConfiguration.antialiasedBoldSystemFont)) {
-	WINGsConfiguration.antialiasedBoldSystemFont = XFTBOLD_SYSTEM_FONT;
+	if (!aaIsSet) {
+		WINGsConfiguration.antialiasedText = True;
 	}
 	if (!WINGsConfiguration.floppyPath) {
 		WINGsConfiguration.floppyPath = FLOPPY_PATH;
@@ -202,9 +113,5 @@ W_ReadConfigurations(void)
 	if (WINGsConfiguration.mouseWheelDown == 0) {
 		WINGsConfiguration.mouseWheelDown = Button5;
 	}
-    if (WINGsConfiguration.defaultFontSize == 0) {
-	WINGsConfiguration.defaultFontSize = 12;
-    }

 }
-
--- a/WINGs/connection.c
+++ b/WINGs/connection.c
--- a/WINGs/data.c
+++ b/WINGs/data.c
@@ -18,12 +18,9 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */

-
-
 #include <string.h>
 #include "WUtil.h"

-
 typedef struct W_Data {
 	unsigned length;	/* How many bytes we have */
 	unsigned capacity;	/* How many bytes it can hold */
@@ -34,25 +31,21 @@ typedef struct W_Data {
 	int format;		/* 0, 8, 16 or 32 */
 } W_Data;

-
-
-
 /* Creating and destroying data objects */

-WMData*
-WMCreateDataWithCapacity(unsigned capacity)
+WMData *WMCreateDataWithCapacity(unsigned capacity)
 {
 	WMData *aData;

-    aData = (WMData*)wmalloc(sizeof(WMData));
+	aData = (WMData *) wmalloc(sizeof(WMData));

-    if (capacity>0)
+	if (capacity > 0)
 		aData->bytes = wmalloc(capacity);
 	else
 		aData->bytes = NULL;

 	aData->capacity = capacity;
-    aData->growth = capacity/2 > 0 ? capacity/2 : 1;
+	aData->growth = capacity / 2 > 0 ? capacity / 2 : 1;
 	aData->length = 0;
 	aData->retainCount = 1;
 	aData->format = 0;
@@ -61,14 +54,12 @@ WMCreateDataWithCapacity(unsigned capacity)
 	return aData;
 }

-
-WMData*
-WMCreateDataWithLength(unsigned length)
+WMData *WMCreateDataWithLength(unsigned length)
 {
 	WMData *aData;

 	aData = WMCreateDataWithCapacity(length);
-    if (length>0) {
+	if (length > 0) {
 		memset(aData->bytes, 0, length);
 		aData->length = length;
 	}
@@ -76,9 +67,7 @@ WMCreateDataWithLength(unsigned length)
 	return aData;
 }

-
-WMData*
-WMCreateDataWithBytes(void *bytes, unsigned length)
+WMData *WMCreateDataWithBytes(void *bytes, unsigned length)
 {
 	WMData *aData;

@@ -89,17 +78,14 @@ WMCreateDataWithBytes(void *bytes, unsigned length)
 	return aData;
 }

-
-WMData*
-WMCreateDataWithBytesNoCopy(void *bytes, unsigned length,
-                            WMFreeDataProc *destructor)
+WMData *WMCreateDataWithBytesNoCopy(void *bytes, unsigned length, WMFreeDataProc * destructor)
 {
 	WMData *aData;

-    aData = (WMData*)wmalloc(sizeof(WMData));
+	aData = (WMData *) wmalloc(sizeof(WMData));
 	aData->length = length;
 	aData->capacity = length;
-    aData->growth = length/2 > 0 ? length/2 : 1;
+	aData->growth = length / 2 > 0 ? length / 2 : 1;
 	aData->bytes = bytes;
 	aData->retainCount = 1;
 	aData->format = 0;
@@ -108,9 +94,7 @@ WMCreateDataWithBytesNoCopy(void *bytes, unsigned length,
 	return aData;
 }

-
-WMData*
-WMCreateDataWithData(WMData *aData)
+WMData *WMCreateDataWithData(WMData * aData)
 {
 	WMData *newData;

@@ -124,100 +108,78 @@ WMCreateDataWithData(WMData *aData)
 	return newData;
 }

-
-WMData*
-WMRetainData(WMData *aData)
+WMData *WMRetainData(WMData * aData)
 {
 	aData->retainCount++;
 	return aData;
 }

-
-void
-WMReleaseData(WMData *aData)
+void WMReleaseData(WMData * aData)
 {
 	aData->retainCount--;
 	if (aData->retainCount > 0)
 		return;
-    if (aData->bytes!=NULL && aData->destructor!=NULL) {
+	if (aData->bytes != NULL && aData->destructor != NULL) {
 		aData->destructor(aData->bytes);
 	}
 	wfree(aData);
 }

-
-
 /* Adjusting capacity */

-void
-WMSetDataCapacity(WMData *aData, unsigned capacity)
+void WMSetDataCapacity(WMData * aData, unsigned capacity)
 {
 	if (aData->capacity != capacity) {
 		aData->bytes = wrealloc(aData->bytes, capacity);
 		aData->capacity = capacity;
-        aData->growth = capacity/2 > 0 ? capacity/2 : 1;
+		aData->growth = capacity / 2 > 0 ? capacity / 2 : 1;
 	}
 	if (aData->length > capacity) {
 		aData->length = capacity;
 	}
 }

-
-void
-WMSetDataLength(WMData *aData, unsigned length)
+void WMSetDataLength(WMData * aData, unsigned length)
 {
 	if (length > aData->capacity) {
 		WMSetDataCapacity(aData, length);
 	}
 	if (length > aData->length) {
-        memset((unsigned char*)aData->bytes + aData->length, 0,
-               length - aData->length);
+		memset((unsigned char *)aData->bytes + aData->length, 0, length - aData->length);
 	}
 	aData->length = length;
 }

-
-void
-WMSetDataFormat(WMData *aData, unsigned format)
+void WMSetDataFormat(WMData * aData, unsigned format)
 {
 	aData->format = format;
 }

-
-void
-WMIncreaseDataLengthBy(WMData *aData, unsigned extraLength)
+void WMIncreaseDataLengthBy(WMData * aData, unsigned extraLength)
 {
 	WMSetDataLength(aData, aData->length + extraLength);
 }

-
 /* Accessing data */

-const void*
-WMDataBytes(WMData *aData)
+const void *WMDataBytes(WMData * aData)
 {
 	return aData->bytes;
 }

-
-void
-WMGetDataBytes(WMData *aData, void *buffer)
+void WMGetDataBytes(WMData * aData, void *buffer)
 {
 	wassertr(aData->length > 0);

 	memcpy(buffer, aData->bytes, aData->length);
 }

-
-unsigned
-WMGetDataFormat(WMData *aData)
+unsigned WMGetDataFormat(WMData * aData)
 {
 	return aData->format;
 }

-
-void
-WMGetDataBytesWithLength(WMData *aData, void *buffer, unsigned length)
+void WMGetDataBytesWithLength(WMData * aData, void *buffer, unsigned length)
 {
 	wassertr(aData->length > 0);
 	wassertr(length <= aData->length);
@@ -225,20 +187,15 @@ WMGetDataBytesWithLength(WMData *aData, void *buffer, unsigned length)
 	memcpy(buffer, aData->bytes, length);
 }

-
-void
-WMGetDataBytesWithRange(WMData *aData, void *buffer, WMRange aRange)
+void WMGetDataBytesWithRange(WMData * aData, void *buffer, WMRange aRange)
 {
 	wassertr(aRange.position < aData->length);
-    wassertr(aRange.count <= aData->length-aRange.position);
+	wassertr(aRange.count <= aData->length - aRange.position);

-    memcpy(buffer, (unsigned char*)aData->bytes + aRange.position,
-           aRange.count);
+	memcpy(buffer, (unsigned char *)aData->bytes + aRange.position, aRange.count);
 }

-
-WMData*
-WMGetSubdataWithRange(WMData *aData, WMRange aRange)
+WMData *WMGetSubdataWithRange(WMData * aData, WMRange aRange)
 {
 	void *buffer;
 	WMData *newData;
@@ -254,11 +211,9 @@ WMGetSubdataWithRange(WMData *aData, WMRange aRange)
 	return newData;
 }

-
 /* Testing data */

-Bool
-WMIsDataEqualToData(WMData *aData, WMData *anotherData)
+Bool WMIsDataEqualToData(WMData * aData, WMData * anotherData)
 {
 	if (aData->length != anotherData->length)
 		return False;
@@ -266,20 +221,16 @@ WMIsDataEqualToData(WMData *aData, WMData *anotherData)
 		return True;
 	else if (!aData->bytes || !anotherData->bytes)	/* one of them is empty */
 		return False;
-    return (memcmp(aData->bytes, anotherData->bytes, aData->length)==0);
+	return (memcmp(aData->bytes, anotherData->bytes, aData->length) == 0);
 }

-
-unsigned
-WMGetDataLength(WMData *aData)
+unsigned WMGetDataLength(WMData * aData)
 {
 	return aData->length;
 }

-
 /* Adding data */
-void
-WMAppendDataBytes(WMData *aData, void *bytes, unsigned length)
+void WMAppendDataBytes(WMData * aData, void *bytes, unsigned length)
 {
 	unsigned oldLength = aData->length;
 	unsigned newLength = oldLength + length;
@@ -297,44 +248,35 @@ WMAppendDataBytes(WMData *aData, void *bytes, unsigned length)
 		WMSetDataCapacity(aData, nextCapacity);
 		aData->growth = nextGrowth;
 	}
-    memcpy((unsigned char*)aData->bytes + oldLength, bytes, length);
+	memcpy((unsigned char *)aData->bytes + oldLength, bytes, length);
 	aData->length = newLength;
 }

-
-void
-WMAppendData(WMData *aData, WMData *anotherData)
+void WMAppendData(WMData * aData, WMData * anotherData)
 {
 	if (anotherData->length > 0)
 		WMAppendDataBytes(aData, anotherData->bytes, anotherData->length);
 }

-
-
 /* Modifying data */

-void
-WMReplaceDataBytesInRange(WMData *aData, WMRange aRange, void *bytes)
+void WMReplaceDataBytesInRange(WMData * aData, WMRange aRange, void *bytes)
 {
 	wassertr(aRange.position < aData->length);
-    wassertr(aRange.count <= aData->length-aRange.position);
+	wassertr(aRange.count <= aData->length - aRange.position);

-    memcpy((unsigned char*)aData->bytes + aRange.position, bytes, aRange.count);
+	memcpy((unsigned char *)aData->bytes + aRange.position, bytes, aRange.count);
 }

-
-void
-WMResetDataBytesInRange(WMData *aData, WMRange aRange)
+void WMResetDataBytesInRange(WMData * aData, WMRange aRange)
 {
 	wassertr(aRange.position < aData->length);
-    wassertr(aRange.count <= aData->length-aRange.position);
+	wassertr(aRange.count <= aData->length - aRange.position);

-    memset((unsigned char*)aData->bytes + aRange.position, 0, aRange.count);
+	memset((unsigned char *)aData->bytes + aRange.position, 0, aRange.count);
 }

-
-void
-WMSetData(WMData *aData, WMData *anotherData)
+void WMSetData(WMData * aData, WMData * anotherData)
 {
 	unsigned length = anotherData->length;

@@ -344,7 +286,4 @@ WMSetData(WMData *aData, WMData *anotherData)
 	aData->length = length;
 }

-
 /* Storing data */
-
-
--- a/WINGs/dragcommon.c
+++ b/WINGs/dragcommon.c
@@ -0,0 +1,255 @@
+
+#include "WINGsP.h"
+
+#define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
+#define XDND_DEST_INFO(dragInfo) dragInfo->destInfo
+#define XDND_DEST_VIEW(dragInfo) dragInfo->destInfo->destView
+
+static Bool _WindowExists;
+
+Atom W_OperationToAction(WMScreen * scr, WMDragOperationType operation)
+{
+	switch (operation) {
+	case WDOperationNone:
+		return None;
+
+	case WDOperationCopy:
+		return scr->xdndActionCopy;
+
+	case WDOperationMove:
+		return scr->xdndActionMove;
+
+	case WDOperationLink:
+		return scr->xdndActionLink;
+
+	case WDOperationAsk:
+		return scr->xdndActionAsk;
+
+	case WDOperationPrivate:
+		return scr->xdndActionPrivate;
+
+	default:
+		return None;
+	}
+}
+
+WMDragOperationType W_ActionToOperation(WMScreen * scr, Atom action)
+{
+	if (action == scr->xdndActionCopy) {
+		return WDOperationCopy;
+
+	} else if (action == scr->xdndActionMove) {
+		return WDOperationMove;
+
+	} else if (action == scr->xdndActionLink) {
+		return WDOperationLink;
+
+	} else if (action == scr->xdndActionAsk) {
+		return WDOperationAsk;
+
+	} else if (action == scr->xdndActionPrivate) {
+		return WDOperationPrivate;
+
+	} else if (action == None) {
+
+		return WDOperationNone;
+	} else {
+		char *tmp = XGetAtomName(scr->display, action);
+
+		wwarning("unknown XDND action %s ", tmp);
+		XFree(tmp);
+
+		return WDOperationCopy;
+	}
+}
+
+static void freeDragOperationItem(void *item)
+{
+	wfree(item);
+}
+
+WMArray *WMCreateDragOperationArray(int initialSize)
+{
+	return WMCreateArrayWithDestructor(initialSize, freeDragOperationItem);
+}
+
+WMDragOperationItem *WMCreateDragOperationItem(WMDragOperationType type, char *text)
+{
+	W_DragOperationItem *result = wmalloc(sizeof(W_DragOperationItem));
+
+	result->type = type;
+	result->text = text;
+
+	return (WMDragOperationItem *) result;
+}
+
+WMDragOperationType WMGetDragOperationItemType(WMDragOperationItem * item)
+{
+	return ((W_DragOperationItem *) item)->type;
+}
+
+char *WMGetDragOperationItemText(WMDragOperationItem * item)
+{
+	return ((W_DragOperationItem *) item)->text;
+}
+
+static int handleNoWindowXError(Display * dpy, XErrorEvent * errEvt)
+{
+	if (errEvt->error_code == BadWindow || errEvt->error_code == BadDrawable) {
+		_WindowExists = False;
+		return Success;
+	}
+
+	return errEvt->error_code;
+}
+
+static Bool windowExists(Display * dpy, Window win)
+{
+	void *previousErrorHandler;
+	XWindowAttributes attr;
+
+	XSynchronize(dpy, True);
+	previousErrorHandler = XSetErrorHandler(handleNoWindowXError);
+	_WindowExists = True;
+
+	/* can generate BadDrawable or BadWindow */
+	XGetWindowAttributes(dpy, win, &attr);
+
+	XSetErrorHandler(previousErrorHandler);
+	XSynchronize(dpy, False);
+	return _WindowExists;
+}
+
+Bool
+W_SendDnDClientMessage(Display * dpy, Window win, Atom message,
+		       unsigned long data0,
+		       unsigned long data1, unsigned long data2, unsigned long data3, unsigned long data4)
+{
+	XEvent ev;
+
+#ifdef XDND_DEBUG
+	char *msgName = XGetAtomName(dpy, message);
+
+	printf("sending message %s ... ", msgName);
+	XFree(msgName);
+#endif
+
+	if (!windowExists(dpy, win)) {
+		wwarning("xdnd message target %lu does no longer exist.", win);
+		return False;	/* message not sent */
+	}
+
+	ev.type = ClientMessage;
+	ev.xclient.message_type = message;
+	ev.xclient.format = 32;
+	ev.xclient.window = win;
+	ev.xclient.data.l[0] = data0;
+	ev.xclient.data.l[1] = data1;
+	ev.xclient.data.l[2] = data2;
+	ev.xclient.data.l[3] = data3;
+	ev.xclient.data.l[4] = data4;
+
+	XSendEvent(dpy, win, False, 0, &ev);
+	XFlush(dpy);
+
+#ifdef XDND_DEBUG
+	printf("sent\n");
+#endif
+	return True;		/* message sent */
+}
+
+static void handleLeaveMessage(WMDraggingInfo * info)
+{
+	if (XDND_DEST_INFO(info) != NULL) {
+		/* XDND_DEST_VIEW is never NULL (it's the xdnd aware view) */
+		wassertr(XDND_DEST_VIEW(info) != NULL);
+		if (XDND_DEST_VIEW(info)->dragDestinationProcs != NULL) {
+			XDND_DEST_VIEW(info)->dragDestinationProcs->concludeDragOperation(XDND_DEST_VIEW(info));
+		}
+		W_DragDestinationInfoClear(info);
+	}
+}
+
+void W_HandleDNDClientMessage(WMView * toplevel, XClientMessageEvent * event)
+{
+	WMScreen *scr = W_VIEW_SCREEN(toplevel);
+	WMDraggingInfo *info = &scr->dragInfo;
+	Atom messageType = event->message_type;
+
+#ifdef XDND_DEBUG
+	{
+		char *msgTypeName = XGetAtomName(scr->display, messageType);
+
+		if (msgTypeName != NULL)
+			printf("event type = %s\n", msgTypeName);
+		else
+			printf("pb with event type !\n");
+	}
+#endif
+
+	/* Messages from destination to source */
+	if (messageType == scr->xdndStatusAtom || messageType == scr->xdndFinishedAtom) {
+		W_DragSourceStopTimer();
+		W_DragSourceStateHandler(info, event);
+		return;
+	}
+
+	/* Messages from source to destination */
+	if (messageType == scr->xdndEnterAtom) {
+		Bool positionSent = (XDND_DEST_INFO(info) != NULL);
+
+		W_DragDestinationStopTimer();
+		W_DragDestinationStoreEnterMsgInfo(info, toplevel, event);
+
+		/* Xdnd version 3 and up are not compatible with version 1 or 2 */
+		if (XDND_SOURCE_VERSION(info) > 2) {
+
+			if (positionSent) {
+				/* xdndPosition previously received on xdnd aware view */
+				W_DragDestinationStateHandler(info, event);
+				return;
+			} else {
+				W_DragDestinationStartTimer(info);
+				return;
+			}
+		} else {
+			wwarning("received dnd enter msg with unsupported version %i", XDND_SOURCE_VERSION(info));
+			W_DragDestinationCancelDropOnEnter(toplevel, info);
+			return;
+		}
+	}
+
+	if (messageType == scr->xdndPositionAtom) {
+		W_DragDestinationStopTimer();
+		W_DragDestinationStorePositionMsgInfo(info, toplevel, event);
+		W_DragDestinationStateHandler(info, event);
+		return;
+	}
+
+	if (messageType == scr->xdndSelectionAtom || messageType == scr->xdndDropAtom) {
+		W_DragDestinationStopTimer();
+		W_DragDestinationStateHandler(info, event);
+		return;
+	}
+
+	if (messageType == scr->xdndLeaveAtom) {
+		/* conclude drop operation, and clear dragging info */
+		W_DragDestinationStopTimer();
+		handleLeaveMessage(info);
+	}
+}
+
+/* called in destroyView (wview.c) */
+void W_FreeViewXdndPart(WMView * view)
+{
+	WMUnregisterViewDraggedTypes(view);
+
+	if (view->dragSourceProcs)
+		wfree(view->dragSourceProcs);
+
+	if (view->dragDestinationProcs)
+		wfree(view->dragDestinationProcs);
+
+	if (view->dragImage)
+		WMReleasePixmap(view->dragImage);
+}
--- a/WINGs/dragdestination.c
+++ b/WINGs/dragdestination.c
--- a/WINGs/dragsource.c
+++ b/WINGs/dragsource.c
--- a/WINGs/error.c
+++ b/WINGs/error.c
@@ -18,185 +18,79 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */

-
 #include "wconfig.h"

+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
-#include <errno.h>
+#include <unistd.h>
+
+#include <WUtil.h>

 extern char *_WINGS_progname;

-
-#define MAXLINE	1024
-
-
-/*********************************************************************
- * Returns the system error message associated with error code 'errnum'
- *********************************************************************/
-char*
-wstrerror(int errnum)
-{
-#if defined(HAVE_STRERROR)
-    return strerror(errnum);
-#elif !defined(HAVE_STRERROR) && defined(BSD)
-    extern int errno, sys_nerr;
-#  ifndef __DECC
-    extern char *sys_errlist[];
-#  endif
-    static char buf[] = "Unknown error 12345678901234567890";
-
-    if (errno < sys_nerr)
-        return sys_errlist[errnum];
-
-    sprintf (buf, _("Unknown error %d"), errnum);
-    return buf;
-#else /* no strerror() and no sys_errlist[] */
-    static char buf[] = "Error 12345678901234567890";
-
-    sprintf(buf, _("Error %d"), errnum);
-    return buf;
-#endif
-}
-
-
-/*********************************************************************
- * Prints a message with variable arguments
- * 
- * msg - message to print with optional formatting
- * ... - arguments to use on formatting
- *********************************************************************/
-void
-wmessage(const char *msg, ...)
+void __wmessage(const char *func, const char *file, int line, int type, const char *msg, ...)
 {
 	va_list args;
-    char buf[MAXLINE];
+	char *buf;
+	static int linemax = 0;
+	int truncated = 0;
+
+	if (linemax == 0) {
+#ifdef HAVE_SYSCONF
+		linemax = sysconf(_SC_LINE_MAX);
+		if (linemax == -1) {
+			/* I'd like to know of this ever fires */
+			fprintf(stderr, "%s %d: sysconf(_SC_LINE_MAX) returned error\n",
+				__FILE__, __LINE__);
+			linemax = 512;
+		}
+#else /* !HAVE_SYSCONF */
+		fprintf(stderr, "%s %d: Your system does not have sysconf(3); "
+			"let wmaker-dev@windowmaker.org know.\n", __FILE__, __LINE__);
+		linemax = 512;
+#endif /* HAVE_SYSCONF */
+	}
+
+	buf = wmalloc(linemax);
+
+	fflush(stdout);
+
+	/* message format: <wings_progname>(function(file:line): <type?>: <message>"\n" */
+	strncat(buf, _WINGS_progname ? _WINGS_progname : "WINGs", linemax - 1);
+	snprintf(buf + strlen(buf), linemax - strlen(buf), "(%s(%s:%d))", func, file, line);
+	strncat(buf, ": ", linemax - 1 - strlen(buf));
+
+	switch (type) {
+		case WMESSAGE_TYPE_FATAL:
+			strncat(buf, _("fatal error: "), linemax - 1 - strlen(buf));
+		break;
+		case WMESSAGE_TYPE_ERROR:
+			strncat(buf, _("error: "), linemax - 1 - strlen(buf));
+		break;
+		case WMESSAGE_TYPE_WARNING:
+			strncat(buf, _("warning: "), linemax - 1 - strlen(buf));
+		break;
+		case WMESSAGE_TYPE_MESSAGE:
+			/* FALLTHROUGH */
+		default:	/* should not happen, but doesn't hurt either */
+		break;
+	}

 	va_start(args, msg);
-
-    vsnprintf(buf, MAXLINE-3, msg, args);
-    strcat(buf,"\n");
-    fflush(stdout);
-    fputs(_WINGS_progname ? _WINGS_progname : "WINGs", stderr);
-    fputs(": ",stderr);
-    fputs(buf, stderr);
-    fflush(stdout);
-    fflush(stderr);
+	if (vsnprintf(buf + strlen(buf), linemax - strlen(buf), msg, args) >= linemax - strlen(buf))
+		truncated = 1;

 	va_end(args);
-}

-
-/*********************************************************************
- * Prints a warning message with variable arguments 
- * 
- * msg - message to print with optional formatting
- * ... - arguments to use on formatting
- *********************************************************************/
-void 
-wwarning(const char *msg, ...)
-{
-    va_list args;
-    char buf[MAXLINE];
-    
-    va_start(args, msg);
-    
-    vsnprintf(buf, MAXLINE-3, msg, args);
-    strcat(buf,"\n");
-    fflush(stdout);
-    fputs(_WINGS_progname ? _WINGS_progname : "WINGs", stderr);
-    fputs(_(" warning: "),stderr);
 	fputs(buf, stderr);
-    fflush(stdout);
-    fflush(stderr);

-    va_end(args);
-}
+	if (truncated)
+		fputs("*** message truncated ***", stderr);

-
-/**************************************************************************
- * Prints a fatal error message with variable arguments and terminates
- * 
- * msg - message to print with optional formatting
- * ... - arguments to use on formatting 
- **************************************************************************/
-void 
-wfatal(const char *msg, ...)
-{
-    va_list args;
-    char buf[MAXLINE];
-
-    va_start(args, msg);
-
-    vsnprintf(buf, MAXLINE-3, msg, args);
-    strcat(buf,"\n");
-    fflush(stdout);
-    fputs(_WINGS_progname ? _WINGS_progname : "WINGs", stderr);
-    fputs(_(" fatal error: "),stderr);
-    fputs(buf, stderr);
-    fflush(stdout);
-    fflush(stderr);
-
-    va_end(args);
-}
-
-
-/*********************************************************************
- * Prints a system error message with variable arguments 
- * 
- * msg - message to print with optional formatting
- * ... - arguments to use on formatting
- *********************************************************************/
-void 
-wsyserror(const char *msg, ...)
-{
-    va_list args;
-    char buf[MAXLINE];
-    int error=errno;
-
-    va_start(args, msg);
-    vsnprintf(buf, MAXLINE-3, msg, args);
-    fflush(stdout);
-    fputs(_WINGS_progname ? _WINGS_progname : "WINGs", stderr);
-    fputs(_(" error: "), stderr);
-    fputs(buf, stderr);
-    fputs(": ", stderr);
-    fputs(wstrerror(error), stderr);
 	fputs("\n", stderr);
-    fflush(stderr);
-    fflush(stdout);
-    va_end(args);
+
+	wfree(buf);
 }

-
-/*********************************************************************
- * Prints a system error message with variable arguments, being given
- * the error code.
- * 
- * error - the error code foe which to print the message
- * msg   - message to print with optional formatting
- * ...   - arguments to use on formatting
- *********************************************************************/
-void 
-wsyserrorwithcode(int error, const char *msg, ...)
-{
-    va_list args;
-    char buf[MAXLINE];
-
-    va_start(args, msg);
-    vsnprintf(buf, MAXLINE-3, msg, args);
-    fflush(stdout);
-    fputs(_WINGS_progname ? _WINGS_progname : "WINGs", stderr);
-    fputs(_(" error: "), stderr);
-    fputs(buf, stderr);
-    fputs(": ", stderr);
-    fputs(wstrerror(error), stderr);
-    fputs("\n", stderr);
-    fflush(stderr);
-    fflush(stdout);
-    va_end(args);
-}
-
-
--- a/WINGs/findfile.c
+++ b/WINGs/findfile.c
@@ -18,11 +18,11 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */

-
 #include "wconfig.h"

 #include "WUtil.h"

+#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -33,121 +33,147 @@
 #define PATH_MAX  1024
 #endif

-
-char*
-wgethomedir()
+char *wgethomedir()
 {
-    char *home = getenv("HOME");
+	static char *home = NULL;
+	char *tmp;
 	struct passwd *user;

 	if (home)
 		return home;

+	tmp = getenv("HOME");
+	if (tmp) {
+		home = wstrdup(tmp);
+		return home;
+	}
+
 	user = getpwuid(getuid());
 	if (!user) {
-	wsyserror(_("could not get password entry for UID %i"), getuid());
-	return "/";
-    }
-    if (!user->pw_dir) {
-	return "/";
-    } else {
-	return user->pw_dir;
+		werror(_("could not get password entry for UID %i"), getuid());
+		home = "/";
 	}
+
+	if (!user->pw_dir)
+		home = "/";
+	else
+		home = wstrdup(user->pw_dir);
+
+	return home;
 }

-
-static char*
-getuserhomedir(char *username)
+static char *getuserhomedir(const char *username)
 {
+	static char *home = NULL;
 	struct passwd *user;

+	if (home)
+		return home;
+
 	user = getpwnam(username);
 	if (!user) {
-	wsyserror(_("could not get password entry for user %s"), username);
+		werror(_("could not get password entry for user %s"), username);
 		return NULL;
 	}
-    if (!user->pw_dir) {
-	return "/";
-    } else {
-	return user->pw_dir;
-    }
+	if (!user->pw_dir)
+		home = "/";
+	else
+		home = wstrdup(user->pw_dir);
+
+	return home;
 }

-
-
-
-char*
-wexpandpath(char *path)
+char *wexpandpath(char *path)
 {
-    char buffer2[PATH_MAX+2];
-    char buffer[PATH_MAX+2];
+	char *origpath = path;
+	char buffer2[PATH_MAX + 2];
+	char buffer[PATH_MAX + 2];
 	int i;

-    memset(buffer, 0, PATH_MAX+2);
+	memset(buffer, 0, PATH_MAX + 2);

-    if (*path=='~') {
+	if (*path == '~') {
 		char *home;

 		path++;
-	if (*path=='/' || *path==0) {
+		if (*path == '/' || *path == 0) {
 			home = wgethomedir();
-	    strcat(buffer, home);
+			if (strlen(home) > PATH_MAX ||
+			    wstrlcpy(buffer, home, sizeof(buffer)) >= sizeof(buffer))
+				goto error;
 		} else {
 			int j;
 			j = 0;
-	    while (*path!=0 && *path!='/') {
+			while (*path != 0 && *path != '/') {
+				if (j > PATH_MAX)
+					goto error;
 				buffer2[j++] = *path;
 				buffer2[j] = 0;
 				path++;
 			}
 			home = getuserhomedir(buffer2);
-	    if (!home)
-		return NULL;
-	    strcat(buffer, home);
+			if (!home || wstrlcat(buffer, home, sizeof(buffer)) >= sizeof(buffer))
+				goto error;
 		}
 	}

 	i = strlen(buffer);

-    while (*path!=0) {
+	while (*path != 0 && i <= PATH_MAX) {
 		char *tmp;

-	if (*path=='$') {
+		if (*path == '$') {
 			int j = 0;
 			path++;
 			/* expand $(HOME) or $HOME style environment variables */
-	    if (*path=='(') {
+			if (*path == '(') {
 				path++;
-		while (*path!=0 && *path!=')') {
+				while (*path != 0 && *path != ')') {
+					if (j > PATH_MAX)
+						goto error;
 					buffer2[j++] = *(path++);
 					buffer2[j] = 0;
 				}
-                if (*path==')')
+				if (*path == ')') {
 					path++;
 					tmp = getenv(buffer2);
+				} else {
+					tmp = NULL;
+				}
 				if (!tmp) {
+					if ((i += strlen(buffer2) + 2) > PATH_MAX)
+						goto error;
 					buffer[i] = 0;
-		    strcat(buffer, "$(");
-		    strcat(buffer, buffer2);
-		    strcat(buffer, ")");
-		    i += strlen(buffer2)+3;
-		} else {
-		    strcat(buffer, tmp);
-		    i += strlen(tmp);
+					if (wstrlcat(buffer, "$(", sizeof(buffer)) >= sizeof(buffer) ||
+					    wstrlcat(buffer, buffer2, sizeof(buffer)) >= sizeof(buffer))
+						goto error;
+					if (*(path-1)==')') {
+						if (++i > PATH_MAX ||
+						    wstrlcat(buffer, ")", sizeof(buffer)) >= sizeof(buffer))
+							goto error;
 					}
 				} else {
-		while (*path!=0 && *path!='/') {
+					if ((i += strlen(tmp)) > PATH_MAX ||
+					    wstrlcat(buffer, tmp, sizeof(buffer)) >= sizeof(buffer))
+						goto error;
+				}
+			} else {
+				while (*path != 0 && *path != '/') {
+					if (j > PATH_MAX)
+						goto error;
 					buffer2[j++] = *(path++);
 					buffer2[j] = 0;
 				}
 				tmp = getenv(buffer2);
 				if (!tmp) {
-		    strcat(buffer, "$");
-		    strcat(buffer, buffer2);
-		    i += strlen(buffer2)+1;
+					if ((i += strlen(buffer2) + 1) > PATH_MAX ||
+					    wstrlcat(buffer, "$", sizeof(buffer)) >= sizeof(buffer) ||
+					    wstrlcat(buffer, buffer2, sizeof(buffer)) >= sizeof(buffer))
+						goto error;
 				} else {
-		    strcat(buffer, tmp);
-		    i += strlen(tmp);
+					if ((i += strlen(tmp)) > PATH_MAX ||
+					    wstrlcat(buffer, tmp, sizeof(buffer)) >= sizeof(buffer))
+						goto error;
 				}
 			}
 		} else {
@@ -156,32 +182,36 @@ wexpandpath(char *path)
 		}
 	}

-    return wstrdup(buffer);
-}
+	if (*path!=0)
+		goto error;

+	return wstrdup(buffer);
+
+error:
+	errno = ENAMETOOLONG;
+	werror(_("could not expand %s"), origpath);
+
+	return NULL;
+}

 /* return address of next char != tok or end of string whichever comes first */
-static char*
-skipchar(char *string, char tok)
+static char *skipchar(char *string, char tok)
 {
-    while(*string!=0 && *string==tok)
+	while (*string != 0 && *string == tok)
 		string++;

 	return string;
 }

-
 /* return address of next char == tok or end of string whichever comes first */
-static char*
-nextchar(char *string, char tok)
+static char *nextchar(char *string, char tok)
 {
-    while(*string!=0 && *string!=tok)
+	while (*string != 0 && *string != tok)
 		string++;

 	return string;
 }

-
 /*
 *----------------------------------------------------------------------
 * findfile--
@@ -197,8 +227,7 @@ nextchar(char *string, char tok)
 *
 *----------------------------------------------------------------------
 */
-char*
-wfindfile(char *paths, char *file)
+char *wfindfile(char *paths, char *file)
 {
 	char *path;
 	char *tmp, *tmp2;
@@ -208,13 +237,13 @@ wfindfile(char *paths, char *file)
 	if (!file)
 		return NULL;

-    if (*file=='/' || *file=='~' || *file=='$' || !paths || *paths==0) {
-	if (access(file, F_OK)<0) {
+	if (*file == '/' || *file == '~' || *file == '$' || !paths || *paths == 0) {
+		if (access(file, F_OK) < 0) {
 			fullpath = wexpandpath(file);
 			if (!fullpath)
 				return NULL;

-	    if (access(fullpath, F_OK)<0) {
+			if (access(fullpath, F_OK) < 0) {
 				wfree(fullpath);
 				return NULL;
 			} else {
@@ -229,20 +258,29 @@ wfindfile(char *paths, char *file)
 	tmp = paths;
 	while (*tmp) {
 		tmp = skipchar(tmp, ':');
-        if (*tmp==0)
+		if (*tmp == 0)
 			break;
 		tmp2 = nextchar(tmp, ':');
 		len = tmp2 - tmp;
-        path = wmalloc(len+flen+2);
+		path = wmalloc(len + flen + 2);
 		path = memcpy(path, tmp, len);
-        path[len]=0;
-        if (path[len-1] != '/')
-            strcat(path, "/");
-        strcat(path, file);
+		path[len] = 0;
+		if (path[len - 1] != '/' &&
+		    wstrlcat(path, "/", len + flen + 2) >= len + flen + 2) {
+			wfree(path);
+			return NULL;
+		}
+
+		if (wstrlcat(path, file, len + flen + 2) >= len + flen + 2) {
+			wfree(path);
+			return NULL;
+		}
+
 		fullpath = wexpandpath(path);
 		wfree(path);
+
 		if (fullpath) {
-            if (access(fullpath, F_OK)==0) {
+			if (access(fullpath, F_OK) == 0) {
 				return fullpath;
 			}
 			wfree(fullpath);
@@ -253,9 +291,7 @@ wfindfile(char *paths, char *file)
 	return NULL;
 }

-
-char*
-wfindfileinlist(char **path_list, char *file)
+char *wfindfileinlist(char **path_list, char *file)
 {
 	int i;
 	char *path;
@@ -265,13 +301,13 @@ wfindfileinlist(char **path_list, char *file)
 	if (!file)
 		return NULL;

-    if (*file=='/' || *file=='~' || !path_list) {
-	if (access(file, F_OK)<0) {
+	if (*file == '/' || *file == '~' || !path_list) {
+		if (access(file, F_OK) < 0) {
 			fullpath = wexpandpath(file);
 			if (!fullpath)
 				return NULL;

-	    if (access(fullpath, F_OK)<0) {
+			if (access(fullpath, F_OK) < 0) {
 				wfree(fullpath);
 				return NULL;
 			} else {
@@ -283,31 +319,32 @@ wfindfileinlist(char **path_list, char *file)
 	}

 	flen = strlen(file);
-    for (i=0; path_list[i]!=NULL; i++) {
+	for (i = 0; path_list[i] != NULL; i++) {
 		len = strlen(path_list[i]);
-	path = wmalloc(len+flen+2);
+		path = wmalloc(len + flen + 2);
 		path = memcpy(path, path_list[i], len);
-	path[len]=0;
-	strcat(path, "/");
-	strcat(path, file);
+		path[len] = 0;
+		if (wstrlcat(path, "/", len + flen + 2) >= len + flen + 2 ||
+		    wstrlcat(path, file, len + flen + 2) >= len + flen + 2) {
+			wfree(path);
+			return NULL;
+		}
 		/* expand tilde */
 		fullpath = wexpandpath(path);
 		wfree(path);
 		if (fullpath) {
 			/* check if file exists */
-	    if (access(fullpath, F_OK)==0) {
+			if (access(fullpath, F_OK) == 0) {
 				return fullpath;
 			}
 			wfree(fullpath);
 		}
 	}
+
 	return NULL;
 }

-
-
-char*
-wfindfileinarray(WMPropList *array, char *file)
+char *wfindfileinarray(WMPropList * array, char *file)
 {
 	int i;
 	char *path;
@@ -317,13 +354,13 @@ wfindfileinarray(WMPropList *array, char *file)
 	if (!file)
 		return NULL;

-    if (*file=='/' || *file=='~' || !array) {
-	if (access(file, F_OK)<0) {
+	if (*file == '/' || *file == '~' || !array) {
+		if (access(file, F_OK) < 0) {
 			fullpath = wexpandpath(file);
 			if (!fullpath)
 				return NULL;

-	    if (access(fullpath, F_OK)<0) {
+			if (access(fullpath, F_OK) < 0) {
 				wfree(fullpath);
 				return NULL;
 			} else {
@@ -335,7 +372,7 @@ wfindfileinarray(WMPropList *array, char *file)
 	}

 	flen = strlen(file);
-    for (i=0; i<WMGetPropListItemCount(array); i++) {
+	for (i = 0; i < WMGetPropListItemCount(array); i++) {
 		WMPropList *prop;
 		char *p;

@@ -345,17 +382,20 @@ wfindfileinarray(WMPropList *array, char *file)
 		p = WMGetFromPLString(prop);

 		len = strlen(p);
-	path = wmalloc(len+flen+2);
+		path = wmalloc(len + flen + 2);
 		path = memcpy(path, p, len);
-	path[len]=0;
-	strcat(path, "/");
-	strcat(path, file);
+		path[len] = 0;
+		if (wstrlcat(path, "/", len + flen + 2) >= len + flen + 2 ||
+		    wstrlcat(path, file, len + flen + 2) >= len + flen + 2) {
+			wfree(path);
+			return NULL;
+		}
 		/* expand tilde */
 		fullpath = wexpandpath(path);
 		wfree(path);
 		if (fullpath) {
 			/* check if file exists */
-	    if (access(fullpath, F_OK)==0) {
+			if (access(fullpath, F_OK) == 0) {
 				return fullpath;
 			}
 			wfree(fullpath);
@@ -363,7 +403,3 @@ wfindfileinarray(WMPropList *array, char *file)
 	}
 	return NULL;
 }
-
-
-
-
--- a/WINGs/get-wings-flags.in
+++ b/WINGs/get-wings-flags.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+WCFLAGS="${inc_search_path}"
+WLFLAGS="${lib_search_path}"
+WLIBS="-lWINGs -lWUtil -lwraster ${GFXLIBS} ${XFTLIBS} ${XLIBS} -lm ${INTLIBS}"
+
+usage="Usage: get-wings-flags [--cflags] [--ldflags] [--libs]"
+
+if test $# -eq 0; then
+      echo "${usage}" 1>&2
+      exit 1
+fi
+
+while test $# -gt 0; do
+  case $1 in
+    --cflags)
+	echo $WCFLAGS
+        ;;
+    --ldflags|--lflags)
+	echo $WLFLAGS
+        ;;
+    --libs)
+	echo $WLIBS
+        ;;
+    *)
+	echo "${usage}" 1>&2
+	exit 1
+	;;
+  esac
+  shift
+done
--- a/WINGs/get-wutil-flags.in
+++ b/WINGs/get-wutil-flags.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+WCFLAGS="-I${includedir}"
+WLFLAGS="-L${libdir}"
+WLIBS="-lWUtil ${INTLIBS}"
+
+usage="Usage: get-wutil-flags [--cflags] [--ldflags] [--libs]"
+
+if test $# -eq 0; then
+      echo "${usage}" 1>&2
+      exit 1
+fi
+
+while test $# -gt 0; do
+  case $1 in
+    --cflags)
+	echo $WCFLAGS
+        ;;
+    --ldflags|--lflags)
+	echo $WLFLAGS
+        ;;
+    --libs)
+	echo $WLIBS
+        ;;
+    *)
+	echo "${usage}" 1>&2
+	exit 1
+	;;
+  esac
+  shift
+done
--- a/WINGs/handlers.c
+++ b/WINGs/handlers.c
@@ -3,10 +3,9 @@
 * WINGs internal handlers: timer, idle and input handlers
 */

+#include "wconfig.h"
 #include "WINGsP.h"

-#include "../src/config.h"
-
 #include <sys/types.h>
 #include <unistd.h>

@@ -22,9 +21,6 @@
 #define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
 #endif

-
-
-
 typedef struct TimerHandler {
 	WMCallback *callback;	/* procedure to call */
 	struct timeval when;	/* when to call the callback */
@@ -33,13 +29,11 @@ typedef struct TimerHandler {
 	int nextDelay;		/* 0 if it's one-shot */
 } TimerHandler;

-
 typedef struct IdleHandler {
 	WMCallback *callback;
 	void *clientData;
 } IdleHandler;

-
 typedef struct InputHandler {
 	WMInputProc *callback;
 	void *clientData;
@@ -47,20 +41,17 @@ typedef struct InputHandler {
 	int mask;
 } InputHandler;

-
 /* queue of timer event handlers */
-static TimerHandler *timerHandler=NULL;
+static TimerHandler *timerHandler = NULL;

-static WMArray *idleHandler=NULL;
+static WMArray *idleHandler = NULL;

-static WMArray *inputHandler=NULL;
+static WMArray *inputHandler = NULL;

 #define timerPending()	(timerHandler)

-
-
-static void
-rightNow(struct timeval *tv) {
+static void rightNow(struct timeval *tv)
+{
 	X_GETTIMEOFDAY(tv);
 }

@@ -73,18 +64,15 @@ rightNow(struct timeval *tv) {

 #define SET_ZERO(tv) tv.tv_sec = 0, tv.tv_usec = 0

-static void
-addmillisecs(struct timeval *tv, int milliseconds)
+static void addmillisecs(struct timeval *tv, int milliseconds)
 {
-    tv->tv_usec += milliseconds*1000;
+	tv->tv_usec += milliseconds * 1000;

-    tv->tv_sec += tv->tv_usec/1000000;
-    tv->tv_usec = tv->tv_usec%1000000;
+	tv->tv_sec += tv->tv_usec / 1000000;
+	tv->tv_usec = tv->tv_usec % 1000000;
 }

-
-static void
-enqueueTimerHandler(TimerHandler *handler)
+static void enqueueTimerHandler(TimerHandler * handler)
 {
 	TimerHandler *tmp;

@@ -103,15 +91,14 @@ enqueueTimerHandler(TimerHandler *handler)
 	}
 }

-
-static void
-delayUntilNextTimerEvent(struct timeval *delay)
+static void delayUntilNextTimerEvent(struct timeval *delay)
 {
 	struct timeval now;
 	TimerHandler *handler;

 	handler = timerHandler;
-    while (handler && IS_ZERO(handler->when)) handler = handler->next;
+	while (handler && IS_ZERO(handler->when))
+		handler = handler->next;

 	if (!handler) {
 		/* The return value of this function is only valid if there _are_
@@ -135,9 +122,7 @@ delayUntilNextTimerEvent(struct timeval *delay)
 	}
 }

-
-WMHandlerID
-WMAddTimerHandler(int milliseconds, WMCallback *callback, void *cdata)
+WMHandlerID WMAddTimerHandler(int milliseconds, WMCallback * callback, void *cdata)
 {
 	TimerHandler *handler;

@@ -156,9 +141,7 @@ WMAddTimerHandler(int milliseconds, WMCallback *callback, void *cdata)
 	return handler;
 }

-
-WMHandlerID
-WMAddPersistentTimerHandler(int milliseconds, WMCallback *callback, void *cdata)
+WMHandlerID WMAddPersistentTimerHandler(int milliseconds, WMCallback * callback, void *cdata)
 {
 	TimerHandler *handler = WMAddTimerHandler(milliseconds, callback, cdata);

@@ -168,10 +151,7 @@ WMAddPersistentTimerHandler(int milliseconds, WMCallback *callback, void *cdata)
 	return handler;
 }

-
-
-void
-WMDeleteTimerWithClientData(void *cdata)
+void WMDeleteTimerWithClientData(void *cdata)
 {
 	TimerHandler *handler, *tmp;

@@ -179,7 +159,7 @@ WMDeleteTimerWithClientData(void *cdata)
 		return;

 	tmp = timerHandler;
-    if (tmp->clientData==cdata) {
+	if (tmp->clientData == cdata) {
 		tmp->nextDelay = 0;
 		if (!IS_ZERO(tmp->when)) {
 			timerHandler = tmp->next;
@@ -187,7 +167,7 @@ WMDeleteTimerWithClientData(void *cdata)
 		}
 	} else {
 		while (tmp->next) {
-            if (tmp->next->clientData==cdata) {
+			if (tmp->next->clientData == cdata) {
 				handler = tmp->next;
 				handler->nextDelay = 0;
 				if (IS_ZERO(handler->when))
@@ -201,12 +181,9 @@ WMDeleteTimerWithClientData(void *cdata)
 	}
 }

-
-
-void
-WMDeleteTimerHandler(WMHandlerID handlerID)
+void WMDeleteTimerHandler(WMHandlerID handlerID)
 {
-    TimerHandler *tmp, *handler=(TimerHandler*)handlerID;
+	TimerHandler *tmp, *handler = (TimerHandler *) handlerID;

 	if (!handler || !timerHandler)
 		return;
@@ -218,13 +195,13 @@ WMDeleteTimerHandler(WMHandlerID handlerID)
 	if (IS_ZERO(handler->when))
 		return;

-    if (tmp==handler) {
+	if (tmp == handler) {
 		timerHandler = handler->next;
 		wfree(handler);
 	} else {
 		while (tmp->next) {
-	    if (tmp->next==handler) {
-		tmp->next=handler->next;
+			if (tmp->next == handler) {
+				tmp->next = handler->next;
 				wfree(handler);
 				break;
 			}
@@ -233,10 +210,7 @@ WMDeleteTimerHandler(WMHandlerID handlerID)
 	}
 }

-
-
-WMHandlerID
-WMAddIdleHandler(WMCallback *callback, void *cdata)
+WMHandlerID WMAddIdleHandler(WMCallback * callback, void *cdata)
 {
 	IdleHandler *handler;

@@ -255,11 +229,9 @@ WMAddIdleHandler(WMCallback *callback, void *cdata)
 	return handler;
 }

-
-void
-WMDeleteIdleHandler(WMHandlerID handlerID)
+void WMDeleteIdleHandler(WMHandlerID handlerID)
 {
-    IdleHandler *handler = (IdleHandler*)handlerID;
+	IdleHandler *handler = (IdleHandler *) handlerID;

 	if (!handler || !idleHandler)
 		return;
@@ -267,10 +239,7 @@ WMDeleteIdleHandler(WMHandlerID handlerID)
 	WMRemoveFromArray(idleHandler, handler);
 }

-
-
-WMHandlerID
-WMAddInputHandler(int fd, int condition, WMInputProc *proc, void *clientData)
+WMHandlerID WMAddInputHandler(int fd, int condition, WMInputProc * proc, void *clientData)
 {
 	InputHandler *handler;

@@ -288,12 +257,9 @@ WMAddInputHandler(int fd, int condition, WMInputProc *proc, void *clientData)
 	return handler;
 }

-
-
-void
-WMDeleteInputHandler(WMHandlerID handlerID)
+void WMDeleteInputHandler(WMHandlerID handlerID)
 {
-    InputHandler *handler = (InputHandler*)handlerID;
+	InputHandler *handler = (InputHandler *) handlerID;

 	if (!handler || !inputHandler)
 		return;
@@ -301,18 +267,16 @@ WMDeleteInputHandler(WMHandlerID handlerID)
 	WMRemoveFromArray(inputHandler, handler);
 }

-
-Bool
-W_CheckIdleHandlers(void)
+Bool W_CheckIdleHandlers(void)
 {
 	IdleHandler *handler;
 	WMArray *handlerCopy;
 	WMArrayIterator iter;

-    if (!idleHandler || WMGetArrayItemCount(idleHandler)==0) {
+	if (!idleHandler || WMGetArrayItemCount(idleHandler) == 0) {
 		W_FlushIdleNotificationQueue();
 		/* make sure an observer in queue didn't added an idle handler */
-        return (idleHandler!=NULL && WMGetArrayItemCount(idleHandler)>0);
+		return (idleHandler != NULL && WMGetArrayItemCount(idleHandler) > 0);
 	}

 	handlerCopy = WMDuplicateArray(idleHandler);
@@ -322,7 +286,7 @@ W_CheckIdleHandlers(void)
 		if (WMGetFirstInArray(idleHandler, handler) == WANotFound)
 			continue;

-	(*handler->callback)(handler->clientData);
+		(*handler->callback) (handler->clientData);
 		WMDeleteIdleHandler(handler);
 	}

@@ -331,13 +295,10 @@ W_CheckIdleHandlers(void)
 	W_FlushIdleNotificationQueue();

 	/* this is not necesarrily False, because one handler can re-add itself */
-    return (WMGetArrayItemCount(idleHandler)>0);
+	return (WMGetArrayItemCount(idleHandler) > 0);
 }

-
-
-void
-W_CheckTimerHandlers(void)
+void W_CheckTimerHandlers(void)
 {
 	TimerHandler *handler;
 	struct timeval now;
@@ -353,7 +314,7 @@ W_CheckTimerHandlers(void)
 	while (handler && IS_AFTER(now, handler->when)) {
 		if (!IS_ZERO(handler->when)) {
 			SET_ZERO(handler->when);
-	    (*handler->callback)(handler->clientData);
+			(*handler->callback) (handler->clientData);
 		}
 		handler = handler->next;
 	}
@@ -374,7 +335,6 @@ W_CheckTimerHandlers(void)
 	W_FlushASAPNotificationQueue();
 }

-
 /*
 * This functions will handle input events on all registered file descriptors.
 * Input:
@@ -409,8 +369,7 @@ W_CheckTimerHandlers(void)
 *   inputfd = -1
 *
 */
-Bool
-W_HandleInputEvents(Bool waitForInput, int inputfd)
+Bool W_HandleInputEvents(Bool waitForInput, int inputfd)
 {
 #if defined(HAVE_POLL) && defined(HAVE_POLL_H) && !defined(HAVE_SELECT)
 	struct poll fd *fds;
@@ -424,12 +383,12 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)
 	else
 		nfds = 0;

-    if (!extrafd && nfds==0) {
+	if (!extrafd && nfds == 0) {
 		W_FlushASAPNotificationQueue();
 		return False;
 	}

-    fds = wmalloc((nfds+extrafd) * sizeof(struct pollfd));
+	fds = wmalloc((nfds + extrafd) * sizeof(struct pollfd));
 	if (extrafd) {
 		/* put this to the end of array to avoid using ranges from 1 to nfds+1 */
 		fds[nfds].fd = inputfd;
@@ -437,7 +396,7 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)
 	}

 	/* use WM_ITERATE_ARRAY() here */
-    for (i = 0; i<nfds; i++) {
+	for (i = 0; i < nfds; i++) {
 		handler = WMGetFromArray(inputHandler, i);
 		fds[i].fd = handler->fd;
 		fds[i].events = 0;
@@ -467,14 +426,14 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)
 		timeout = -1;
 	}

-    count = poll(fds, nfds+extrafd, timeout);
+	count = poll(fds, nfds + extrafd, timeout);

-    if (count>0 && nfds>0) {
+	if (count > 0 && nfds > 0) {
 		WMArray *handlerCopy = WMDuplicateArray(inputHandler);
 		int mask;

 		/* use WM_ITERATE_ARRAY() here */
-        for (i=0; i<nfds; i++) {
+		for (i = 0; i < nfds; i++) {
 			handler = WMGetFromArray(handlerCopy, i);
 			/* check if the handler still exist or was removed by a callback */
 			if (WMGetFirstInArray(inputHandler, handler) == WANotFound)
@@ -483,20 +442,17 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)
 			mask = 0;

 			if ((handler->mask & WIReadMask) &&
-                (fds[i].revents & (POLLIN|POLLRDNORM|POLLRDBAND|POLLPRI)))
+			    (fds[i].revents & (POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI)))
 				mask |= WIReadMask;

-            if ((handler->mask & WIWriteMask) &&
-                (fds[i].revents & (POLLOUT | POLLWRBAND)))
+			if ((handler->mask & WIWriteMask) && (fds[i].revents & (POLLOUT | POLLWRBAND)))
 				mask |= WIWriteMask;

-            if ((handler->mask & WIExceptMask) &&
-                (fds[i].revents & (POLLHUP | POLLNVAL | POLLERR)))
+			if ((handler->mask & WIExceptMask) && (fds[i].revents & (POLLHUP | POLLNVAL | POLLERR)))
 				mask |= WIExceptMask;

-            if (mask!=0 && handler->callback) {
-                (*handler->callback)(handler->fd, mask,
-                                     handler->clientData);
+			if (mask != 0 && handler->callback) {
+				(*handler->callback) (handler->fd, mask, handler->clientData);
 			}
 		}

@@ -522,7 +478,7 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)
 	else
 		nfds = 0;

-    if (inputfd<0 && nfds==0) {
+	if (inputfd < 0 && nfds == 0) {
 		W_FlushASAPNotificationQueue();
 		return False;
 	}
@@ -539,7 +495,7 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)
 	}

 	/* use WM_ITERATE_ARRAY() here */
-    for (i=0; i<nfds; i++) {
+	for (i = 0; i < nfds; i++) {
 		handler = WMGetFromArray(inputHandler, i);
 		if (handler->mask & WIReadMask)
 			FD_SET(handler->fd, &rset);
@@ -565,17 +521,17 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)
 		delayUntilNextTimerEvent(&timeout);
 		timeoutPtr = &timeout;
 	} else {
-        timeoutPtr = (struct timeval*)0;
+		timeoutPtr = (struct timeval *)0;
 	}

 	count = select(1 + maxfd, &rset, &wset, &eset, timeoutPtr);

-    if (count>0 && nfds>0) {
+	if (count > 0 && nfds > 0) {
 		WMArray *handlerCopy = WMDuplicateArray(inputHandler);
 		int mask;

 		/* use WM_ITERATE_ARRAY() here */
-        for (i=0; i<nfds; i++) {
+		for (i = 0; i < nfds; i++) {
 			handler = WMGetFromArray(handlerCopy, i);
 			/* check if the handler still exist or was removed by a callback */
 			if (WMGetFirstInArray(inputHandler, handler) == WANotFound)
@@ -592,9 +548,8 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)
 			if ((handler->mask & WIExceptMask) && FD_ISSET(handler->fd, &eset))
 				mask |= WIExceptMask;

-            if (mask!=0 && handler->callback) {
-                (*handler->callback)(handler->fd, mask,
-                                     handler->clientData);
+			if (mask != 0 && handler->callback) {
+				(*handler->callback) (handler->fd, mask, handler->clientData);
 			}
 		}

@@ -605,9 +560,7 @@ W_HandleInputEvents(Bool waitForInput, int inputfd)

 	return (count > 0);
 #else				/* not HAVE_SELECT, not HAVE_POLL */
-    Neither select nor poll. You lose.
+# error   Neither select nor poll. You lose.
 #endif				/* HAVE_SELECT */
 #endif				/* HAVE_POLL */
 }
-
-
--- a/WINGs/hashtable.c
+++ b/WINGs/hashtable.c
@@ -1,5 +1,4 @@

-
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
@@ -7,19 +6,14 @@

 #include "WUtil.h"

-
-
-
 #define INITIAL_CAPACITY	23

-
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
 # define INLINE inline
 #else
 # define INLINE
 #endif

-
 typedef struct HashItem {
 	const void *key;
 	const void *data;
@@ -27,7 +21,6 @@ typedef struct HashItem {
 	struct HashItem *next;	/* collided item list */
 } HashItem;

-
 typedef struct W_HashTable {
 	WMHashTableCallbacks callbacks;

@@ -37,9 +30,6 @@ typedef struct W_HashTable {
 	HashItem **table;
 } HashTable;

-
-
-
 #define HASH(table, key)  (((table)->callbacks.hash ? \
    (*(table)->callbacks.hash)(key) : hashPtr(key)) % (table)->size)

@@ -49,36 +39,25 @@ typedef struct W_HashTable {
 #define RELKEY(table, key) if ((table)->callbacks.releaseKey) \
    (*(table)->callbacks.releaseKey)(key)

-
-
-
-static INLINE unsigned
-hashString(const char *key)
+static INLINE unsigned hashString(const char *key)
 {
 	unsigned ret = 0;
 	unsigned ctr = 0;

 	while (*key) {
-	ret ^= *(char*)key++ << ctr;
-	ctr = (ctr + 1) % sizeof (char *);
+		ret ^= *(char *)key++ << ctr;
+		ctr = (ctr + 1) % sizeof(char *);
 	}

 	return ret;
 }

-
-
-static INLINE unsigned
-hashPtr(const void *key)
+static INLINE unsigned hashPtr(const void *key)
 {
-    return ((size_t)key / sizeof(char*));
+	return ((size_t) key / sizeof(char *));
 }

-
-
-
-static void
-rellocateItem(WMHashTable *table, HashItem *item)
+static void rellocateItem(WMHashTable * table, HashItem * item)
 {
 	unsigned h;

@@ -88,9 +67,7 @@ rellocateItem(WMHashTable *table, HashItem *item)
 	table->table[h] = item;
 }

-
-static void
-rebuildTable(WMHashTable *table)
+static void rebuildTable(WMHashTable * table)
 {
 	HashItem *next;
 	HashItem **oldArray;
@@ -101,14 +78,13 @@ rebuildTable(WMHashTable *table)
 	oldArray = table->table;
 	oldSize = table->size;

-    newSize = table->size*2;
+	newSize = table->size * 2;

-    table->table = wmalloc(sizeof(char*)*newSize);
-    memset(table->table, 0, sizeof(char*)*newSize);
+	table->table = wmalloc(sizeof(char *) * newSize);
 	table->size = newSize;

 	for (i = 0; i < oldSize; i++) {
-	while (oldArray[i]!=NULL) {
+		while (oldArray[i] != NULL) {
 			next = oldArray[i]->next;
 			rellocateItem(table, oldArray[i]);
 			oldArray[i] = next;
@@ -117,10 +93,7 @@ rebuildTable(WMHashTable *table)
 	wfree(oldArray);
 }

-
-
-WMHashTable*
-WMCreateHashTable(WMHashTableCallbacks callbacks)
+WMHashTable *WMCreateHashTable(WMHashTableCallbacks callbacks)
 {
 	HashTable *table;

@@ -131,15 +104,13 @@ WMCreateHashTable(WMHashTableCallbacks callbacks)

 	table->size = INITIAL_CAPACITY;

-    table->table = wmalloc(sizeof(HashItem*)*table->size);
-    memset(table->table, 0, sizeof(HashItem*)*table->size);
+	table->table = wmalloc(sizeof(HashItem *) * table->size);
+	memset(table->table, 0, sizeof(HashItem *) * table->size);

 	return table;
 }

-
-void
-WMResetHashTable(WMHashTable *table)
+void WMResetHashTable(WMHashTable * table)
 {
 	HashItem *item, *tmp;
 	int i;
@@ -159,14 +130,12 @@ WMResetHashTable(WMHashTable *table)
 	if (table->size > INITIAL_CAPACITY) {
 		wfree(table->table);
 		table->size = INITIAL_CAPACITY;
-	table->table = wmalloc(sizeof(HashItem*)*table->size);
+		table->table = wmalloc(sizeof(HashItem *) * table->size);
 	}
-    memset(table->table, 0, sizeof(HashItem*)*table->size);
+	memset(table->table, 0, sizeof(HashItem *) * table->size);
 }

-
-void
-WMFreeHashTable(WMHashTable *table)
+void WMFreeHashTable(WMHashTable * table)
 {
 	HashItem *item, *tmp;
 	int i;
@@ -184,16 +153,12 @@ WMFreeHashTable(WMHashTable *table)
 	wfree(table);
 }

-
-unsigned
-WMCountHashTable(WMHashTable *table)
+unsigned WMCountHashTable(WMHashTable * table)
 {
 	return table->itemCount;
 }

-
-void*
-WMHashGet(WMHashTable *table, const void *key)
+void *WMHashGet(WMHashTable * table, const void *key)
 {
 	unsigned h;
 	HashItem *item;
@@ -203,7 +168,7 @@ WMHashGet(WMHashTable *table, const void *key)

 	if (table->callbacks.keyIsEqual) {
 		while (item) {
-	    if ((*table->callbacks.keyIsEqual)(key, item->key)) {
+			if ((*table->callbacks.keyIsEqual) (key, item->key)) {
 				break;
 			}
 			item = item->next;
@@ -217,15 +182,12 @@ WMHashGet(WMHashTable *table, const void *key)
 		}
 	}
 	if (item)
-	return (void*)item->data;
+		return (void *)item->data;
 	else
 		return NULL;
 }

-
-Bool
-WMHashGetItemAndKey(WMHashTable *table, const void *key,
-                    void **retItem, void **retKey)
+Bool WMHashGetItemAndKey(WMHashTable * table, const void *key, void **retItem, void **retKey)
 {
 	unsigned h;
 	HashItem *item;
@@ -235,7 +197,7 @@ WMHashGetItemAndKey(WMHashTable *table, const void *key,

 	if (table->callbacks.keyIsEqual) {
 		while (item) {
-	    if ((*table->callbacks.keyIsEqual)(key, item->key)) {
+			if ((*table->callbacks.keyIsEqual) (key, item->key)) {
 				break;
 			}
 			item = item->next;
@@ -250,19 +212,16 @@ WMHashGetItemAndKey(WMHashTable *table, const void *key,
 	}
 	if (item) {
 		if (retKey)
-            *retKey = (void*)item->key;
+			*retKey = (void *)item->key;
 		if (retItem)
-            *retItem = (void*)item->data;
+			*retItem = (void *)item->data;
 		return True;
 	} else {
 		return False;
 	}
 }

-
-
-void*
-WMHashInsert(WMHashTable *table, const void *key, const void *data)
+void *WMHashInsert(WMHashTable * table, const void *key, const void *data)
 {
 	unsigned h;
 	HashItem *item;
@@ -273,7 +232,7 @@ WMHashInsert(WMHashTable *table, const void *key, const void *data)
 	item = table->table[h];
 	if (table->callbacks.keyIsEqual) {
 		while (item) {
-	    if ((*table->callbacks.keyIsEqual)(key, item->key)) {
+			if ((*table->callbacks.keyIsEqual) (key, item->key)) {
 				replacing = 1;
 				break;
 			}
@@ -297,7 +256,7 @@ WMHashInsert(WMHashTable *table, const void *key, const void *data)
 		RELKEY(table, item->key);
 		item->key = DUPKEY(table, key);

-	return (void*)old;
+		return (void *)old;
 	} else {
 		HashItem *nitem;

@@ -310,7 +269,7 @@ WMHashInsert(WMHashTable *table, const void *key, const void *data)
 		table->itemCount++;
 	}

-    /* OPTIMIZE: put this in an idle handler.*/
+	/* OPTIMIZE: put this in an idle handler. */
 	if (table->itemCount > table->size) {
 #ifdef DEBUG0
 		printf("rebuilding hash table...\n");
@@ -324,18 +283,15 @@ WMHashInsert(WMHashTable *table, const void *key, const void *data)
 	return NULL;
 }

-
-static HashItem*
-deleteFromList(HashTable *table, HashItem *item, const void *key)
+static HashItem *deleteFromList(HashTable * table, HashItem * item, const void *key)
 {
 	HashItem *next;

-    if (item==NULL)
+	if (item == NULL)
 		return NULL;

-    if ((table->callbacks.keyIsEqual 
-	 && (*table->callbacks.keyIsEqual)(key, item->key))
-	|| (!table->callbacks.keyIsEqual && key==item->key)) {
+	if ((table->callbacks.keyIsEqual && (*table->callbacks.keyIsEqual) (key, item->key))
+	    || (!table->callbacks.keyIsEqual && key == item->key)) {

 		next = item->next;
 		RELKEY(table, item->key);
@@ -351,9 +307,7 @@ deleteFromList(HashTable *table, HashItem *item, const void *key)
 	return item;
 }

-
-void
-WMHashRemove(WMHashTable *table, const void *key)
+void WMHashRemove(WMHashTable * table, const void *key)
 {
 	unsigned h;

@@ -362,9 +316,7 @@ WMHashRemove(WMHashTable *table, const void *key)
 	table->table[h] = deleteFromList(table, table->table[h], key);
 }

-
-WMHashEnumerator
-WMEnumerateHashTable(WMHashTable *table)
+WMHashEnumerator WMEnumerateHashTable(WMHashTable * table)
 {
 	WMHashEnumerator enumerator;

@@ -375,20 +327,17 @@ WMEnumerateHashTable(WMHashTable *table)
 	return enumerator;
 }

-
-
-void*
-WMNextHashEnumeratorItem(WMHashEnumerator *enumerator)
+void *WMNextHashEnumeratorItem(WMHashEnumerator * enumerator)
 {
 	const void *data = NULL;

 	/* this assumes the table doesn't change between
 	 * WMEnumerateHashTable() and WMNextHashEnumeratorItem() calls */

-    if (enumerator->nextItem==NULL) {
+	if (enumerator->nextItem == NULL) {
 		HashTable *table = enumerator->table;
 		while (++enumerator->index < table->size) {
-	    if (table->table[enumerator->index]!=NULL) {
+			if (table->table[enumerator->index] != NULL) {
 				enumerator->nextItem = table->table[enumerator->index];
 				break;
 			}
@@ -396,26 +345,24 @@ WMNextHashEnumeratorItem(WMHashEnumerator *enumerator)
 	}

 	if (enumerator->nextItem) {
-	data = ((HashItem*)enumerator->nextItem)->data;
-	enumerator->nextItem = ((HashItem*)enumerator->nextItem)->next;
+		data = ((HashItem *) enumerator->nextItem)->data;
+		enumerator->nextItem = ((HashItem *) enumerator->nextItem)->next;
 	}

-    return (void*)data;
+	return (void *)data;
 }

-
-void*
-WMNextHashEnumeratorKey(WMHashEnumerator *enumerator)
+void *WMNextHashEnumeratorKey(WMHashEnumerator * enumerator)
 {
 	const void *key = NULL;

 	/* this assumes the table doesn't change between
 	 * WMEnumerateHashTable() and WMNextHashEnumeratorKey() calls */

-    if (enumerator->nextItem==NULL) {
+	if (enumerator->nextItem == NULL) {
 		HashTable *table = enumerator->table;
 		while (++enumerator->index < table->size) {
-            if (table->table[enumerator->index]!=NULL) {
+			if (table->table[enumerator->index] != NULL) {
 				enumerator->nextItem = table->table[enumerator->index];
 				break;
 			}
@@ -423,25 +370,22 @@ WMNextHashEnumeratorKey(WMHashEnumerator *enumerator)
 	}

 	if (enumerator->nextItem) {
-        key = ((HashItem*)enumerator->nextItem)->key;
-        enumerator->nextItem = ((HashItem*)enumerator->nextItem)->next;
+		key = ((HashItem *) enumerator->nextItem)->key;
+		enumerator->nextItem = ((HashItem *) enumerator->nextItem)->next;
 	}

-    return (void*)key;
+	return (void *)key;
 }

-
-Bool
-WMNextHashEnumeratorItemAndKey(WMHashEnumerator *enumerator,
-                               void **item, void **key)
+Bool WMNextHashEnumeratorItemAndKey(WMHashEnumerator * enumerator, void **item, void **key)
 {
 	/* this assumes the table doesn't change between
 	 * WMEnumerateHashTable() and WMNextHashEnumeratorItemAndKey() calls */

-    if (enumerator->nextItem==NULL) {
+	if (enumerator->nextItem == NULL) {
 		HashTable *table = enumerator->table;
 		while (++enumerator->index < table->size) {
-	    if (table->table[enumerator->index]!=NULL) {
+			if (table->table[enumerator->index] != NULL) {
 				enumerator->nextItem = table->table[enumerator->index];
 				break;
 			}
@@ -450,10 +394,10 @@ WMNextHashEnumeratorItemAndKey(WMHashEnumerator *enumerator,

 	if (enumerator->nextItem) {
 		if (item)
-            *item = (void*)((HashItem*)enumerator->nextItem)->data;
+			*item = (void *)((HashItem *) enumerator->nextItem)->data;
 		if (key)
-            *key = (void*)((HashItem*)enumerator->nextItem)->key;
-        enumerator->nextItem = ((HashItem*)enumerator->nextItem)->next;
+			*key = (void *)((HashItem *) enumerator->nextItem)->key;
+		enumerator->nextItem = ((HashItem *) enumerator->nextItem)->next;

 		return True;
 	}
@@ -461,19 +405,15 @@ WMNextHashEnumeratorItemAndKey(WMHashEnumerator *enumerator,
 	return False;
 }

-
-static Bool
-compareStrings(const char *key1, const char *key2)
+static Bool compareStrings(const char *key1, const char *key2)
 {
-    return strcmp(key1, key2)==0;
+	return strcmp(key1, key2) == 0;
 }

-
-typedef unsigned (*hashFunc)(const void*);
-typedef Bool (*isEqualFunc)(const void*, const void*);
-typedef void* (*retainFunc)(const void*);
-typedef void (*releaseFunc)(const void*);
-
+typedef unsigned (*hashFunc) (const void *);
+typedef Bool(*isEqualFunc) (const void *, const void *);
+typedef void *(*retainFunc) (const void *);
+typedef void (*releaseFunc) (const void *);

 const WMHashTableCallbacks WMIntHashCallbacks = {
 	NULL,
@@ -483,18 +423,15 @@ const WMHashTableCallbacks WMIntHashCallbacks = {
 };

 const WMHashTableCallbacks WMStringHashCallbacks = {
-    (hashFunc)hashString,
-    (isEqualFunc)compareStrings,
-    (retainFunc)wstrdup,
-    (releaseFunc)wfree
+	(hashFunc) hashString,
+	(isEqualFunc) compareStrings,
+	(retainFunc) wstrdup,
+	(releaseFunc) wfree
 };

-
-
 const WMHashTableCallbacks WMStringPointerHashCallbacks = {
-    (hashFunc)hashString,
-    (isEqualFunc)compareStrings,
+	(hashFunc) hashString,
+	(isEqualFunc) compareStrings,
 	NULL,
 	NULL
 };
-
--- a/WINGs/host.c
+++ b/WINGs/host.c
@@ -1,310 +0,0 @@
-/*
- *  WINGs WMHost function library
- *
- *  Copyright (c) 1999-2003 Dan Pascu
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#include "wconfig.h"
-
-#include <unistd.h>
-#include <string.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "WUtil.h"
-
-
-/* For Solaris */
-#ifndef INADDR_NONE
-# define INADDR_NONE  (-1)
-#endif
-
-/* Max hostname length (RFC  1123) */
-#define	W_MAXHOSTNAMELEN	255
-
-
-typedef struct W_Host {
-    char   *name;
-
-    WMArray  *names;
-    WMArray  *addresses;
-
-    int    refCount;
-} W_Host;
-
-
-static WMHashTable *hostCache = NULL;
-
-static Bool hostCacheEnabled = True;
-
-
-
-static WMHost*
-getHostFromCache(char *name)
-{
-    if (!hostCache)
-        return NULL;
-
-    return WMHashGet(hostCache, name);
-}
-
-
-static WMHost*
-getHostWithHostEntry(struct hostent *host, char *name)
-{
-    WMHost *hPtr;
-    struct in_addr in;
-    int i;
-
-    hPtr = (WMHost*)wmalloc(sizeof(WMHost));
-    memset(hPtr, 0, sizeof(WMHost));
-
-    hPtr->names = WMCreateArrayWithDestructor(1, wfree);
-    hPtr->addresses = WMCreateArrayWithDestructor(1, wfree);
-
-    WMAddToArray(hPtr->names, wstrdup(host->h_name));
-
-    for (i=0; host->h_aliases[i]!=NULL; i++) {
-        WMAddToArray(hPtr->names, wstrdup(host->h_aliases[i]));
-    }
-
-    for (i=0; host->h_addr_list[i]!=NULL; i++) {
-        memcpy((void*)&in.s_addr, (const void*)host->h_addr_list[i],
-               host->h_length);
-        WMAddToArray(hPtr->addresses, wstrdup(inet_ntoa(in)));
-    }
-
-    hPtr->refCount = 1;
-
-    if (hostCacheEnabled) {
-        if (!hostCache)
-            hostCache = WMCreateHashTable(WMStringPointerHashCallbacks);
-        hPtr->name = wstrdup(name);
-        wassertr(WMHashInsert(hostCache, hPtr->name, hPtr)==NULL);
-        hPtr->refCount++;
-    }
-
-    return hPtr;
-}
-
-
-WMHost*
-WMGetCurrentHost()
-{
-    char name[W_MAXHOSTNAMELEN+1];
-
-    if (gethostname(name, W_MAXHOSTNAMELEN) < 0) {
-        wsyserror(_("Cannot get current host name"));
-        return NULL;
-    }
-
-    name[W_MAXHOSTNAMELEN] = 0;
-
-    return WMGetHostWithName(name);
-}
-
-
-WMHost*
-WMGetHostWithName(char *name)
-{
-    struct hostent *host;
-    WMHost *hPtr;
-
-    wassertrv(name!=NULL, NULL);
-
-    if (hostCacheEnabled) {
-        if ((hPtr = getHostFromCache(name)) != NULL) {
-            WMRetainHost(hPtr);
-            return hPtr;
-        }
-    }
-
-    host = gethostbyname(name);
-    if (host == NULL) {
-        return NULL;
-    }
-
-    hPtr = getHostWithHostEntry(host, name);
-
-    return hPtr;
-}
-
-
-WMHost*
-WMGetHostWithAddress(char *address)
-{
-    struct hostent *host;
-    struct in_addr in;
-    WMHost *hPtr;
-
-    wassertrv(address!=NULL, NULL);
-
-    if (hostCacheEnabled) {
-        if ((hPtr = getHostFromCache(address)) != NULL) {
-            WMRetainHost(hPtr);
-            return hPtr;
-        }
-    }
-
-#ifndef	HAVE_INET_ATON
-    if ((in.s_addr = inet_addr(address)) == INADDR_NONE)
-        return NULL;
-#else
-    if (inet_aton(address, &in) == 0)
-        return NULL;
-#endif
-
-    host = gethostbyaddr((char*)&in, sizeof(in), AF_INET);
-    if (host == NULL) {
-        return NULL;
-    }
-
-    hPtr = getHostWithHostEntry(host, address);
-
-    return hPtr;
-}
-
-
-WMHost*
-WMRetainHost(WMHost *hPtr)
-{
-    hPtr->refCount++;
-    return hPtr;
-}
-
-
-void
-WMReleaseHost(WMHost *hPtr)
-{
-    hPtr->refCount--;
-
-    if (hPtr->refCount > 0)
-        return;
-
-    WMFreeArray(hPtr->names);
-    WMFreeArray(hPtr->addresses);
-
-    if (hPtr->name) {
-        WMHashRemove(hostCache, hPtr->name);
-        wfree(hPtr->name);
-    }
-
-    wfree(hPtr);
-}
-
-
-void
-WMSetHostCacheEnabled(Bool flag)
-{
-    hostCacheEnabled = ((flag==0) ? 0 : 1);
-}
-
-
-Bool
-WMIsHostCacheEnabled()
-{
-    return hostCacheEnabled;
-}
-
-
-void
-WMFlushHostCache()
-{
-    if (hostCache && WMCountHashTable(hostCache)>0) {
-        WMArray *hostArray = WMCreateArray(WMCountHashTable(hostCache));
-        WMHashEnumerator enumer = WMEnumerateHashTable(hostCache);
-        WMHost *hPtr;
-        int i;
-
-        while ((hPtr = WMNextHashEnumeratorItem(&enumer))) {
-            /* we can't release the host here, because we can't change the
-             * hash while using the enumerator functions. */
-            WMAddToArray(hostArray, hPtr);
-        }
-        for (i=0; i<WMGetArrayItemCount(hostArray); i++)
-            WMReleaseHost(WMGetFromArray(hostArray, i));
-        WMFreeArray(hostArray);
-        WMResetHashTable(hostCache);
-    }
-}
-
-
-static int
-matchAddress(void *item, void *cdata)
-{
-    return (strcmp((char*) item, (char*) cdata)==0);
-}
-
-
-Bool
-WMIsHostEqualToHost(WMHost* hPtr, WMHost* aPtr)
-{
-    char *adr;
-    int i;
-
-    wassertrv(hPtr!=NULL && aPtr!=NULL, False);
-
-    if (hPtr == aPtr)
-        return True;
-
-    for (i=0; i<WMGetArrayItemCount(aPtr->addresses); i++) {
-        adr = WMGetFromArray(aPtr->addresses, i);
-        if (WMFindInArray(hPtr->addresses, matchAddress, adr) != WANotFound) {
-            return True;
-        }
-    }
-
-    return False;
-}
-
-
-char*
-WMGetHostName(WMHost *hPtr)
-{
-    return (WMGetArrayItemCount(hPtr->names) > 0 ?
-            WMGetFromArray(hPtr->names, 0) : NULL);
-    /*return WMGetFromArray(hPtr->names, 0);*/
-}
-
-
-WMArray*
-WMGetHostNames(WMHost *hPtr)
-{
-    return hPtr->names;
-}
-
-
-char*
-WMGetHostAddress(WMHost *hPtr)
-{
-    return (WMGetArrayItemCount(hPtr->addresses) > 0 ?
-            WMGetFromArray(hPtr->addresses, 0) : NULL);
-}
-
-
-WMArray*
-WMGetHostAddresses(WMHost *hPtr)
-{
-    return hPtr->addresses;
-}
-
-
-
-
--- a/WINGs/international.c
+++ b/WINGs/international.c
@@ -1,12 +0,0 @@
-
-
-#include <X11/Xlib.h>
-
-#include "WINGsP.h"
-
-
-void
-InitI18n(Display *dpy)
-{
-    
-}
--- a/WINGs/make-rgb
+++ b/WINGs/make-rgb
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+
+import sys
+import re
+from optparse import OptionParser
+
+parser = OptionParser(version="%prog 1.0")
+parser.add_option("-f", "--file", dest="rgbtxtFile", default='/etc/X11/rgb.txt',
+                  help="rgb.txt file containing X11 colors (/etc/X11/rgb.txt)",
+                  metavar="File")
+
+(options, args) = parser.parse_args()
+
+f = open(options.rgbtxtFile)
+lines = f.readlines()
+f.close()
+
+colorLine = re.compile(r'''\s*
+                           (?P<red>\d+)       # red
+                           \s+
+                           (?P<green>\d+)     # green
+                           \s+
+                           (?P<blue>\d+)      # blue
+                           \s+
+                           (?P<name>[^\s]+)   # name
+                           ''', re.VERBOSE)
+
+print '''
+/* Automatically generated file. Do NOT edit. Regenerate it using make-rgb */
+
+#ifndef RGB_H_
+#define RGB_H_
+
+#include <wraster.h>
+
+typedef struct RGBColor {
+    RColor color;
+    char *name;
+} RGBColor;
+
+RGBColor rgbColors[] = {'''
+
+for line in lines:
+    m = colorLine.match(line)
+    if m:
+        print '''    {{%(red)3s, %(green)3s, %(blue)3s, 0}, "%(name)s"},''' % m.groupdict()
+
+print '''    {{  0,   0,   0, 0}, NULL}
+};
+
+#endif
+'''
+
--- a/WINGs/memory.c
+++ b/WINGs/memory.c
@@ -18,9 +18,7 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */

-
-#include "../src/config.h"
-
+#include "wconfig.h"
 #include "WUtil.h"

 #include <stdlib.h>
@@ -31,9 +29,12 @@
 #include <assert.h>
 #include <signal.h>

-#ifdef TEST_WITH_GC
+#ifdef USE_BOEHM_GC
+#ifndef GC_DEBUG
+#define GC_DEBUG
+#endif /* !GC_DEBUG */
 #include <gc/gc.h>
-#endif
+#endif /* USE_BOEHM_GC */

 #ifndef False
 # define False 0
@@ -42,9 +43,7 @@
 # define True 1
 #endif

-
-static void
-defaultHandler(int bla)
+static void defaultHandler(int bla)
 {
 	if (bla)
 		kill(getpid(), SIGABRT);
@@ -52,14 +51,11 @@ defaultHandler(int bla)
 		exit(1);
 }

-
-static waborthandler *aborthandler = (waborthandler*)defaultHandler;
+static waborthandler *aborthandler = (waborthandler *) defaultHandler;

 #define wAbort(a) (*aborthandler)(a)

-
-waborthandler*
-wsetabort(waborthandler *handler)
+waborthandler *wsetabort(waborthandler * handler)
 {
 	waborthandler *old = aborthandler;

@@ -68,31 +64,26 @@ wsetabort(waborthandler *handler)
 	return old;
 }

-
-
-static int Aborting=0; /* if we're in the middle of an emergency exit */
-
+static int Aborting = 0;	/* if we're in the middle of an emergency exit */

 static WMHashTable *table = NULL;

-
-void*
-wmalloc(size_t size)
+void *wmalloc(size_t size)
 {
 	void *tmp;

 	assert(size > 0);

-#ifdef TEST_WITH_GC
-    tmp = GC_malloc(size);
+#ifdef USE_BOEHM_GC
+	tmp = GC_MALLOC(size);
 #else
 	tmp = malloc(size);
 #endif
 	if (tmp == NULL) {
 		wwarning("malloc() failed. Retrying after 2s.");
 		sleep(2);
-#ifdef TEST_WITH_GC
-        tmp = GC_malloc(size);
+#ifdef USE_BOEHM_GC
+		tmp = GC_MALLOC(size);
 #else
 		tmp = malloc(size);
 #endif
@@ -102,47 +93,45 @@ wmalloc(size_t size)
 				exit(-1);
 			} else {
 				wfatal("virtual memory exhausted");
-		Aborting=1;
+				Aborting = 1;
 				wAbort(False);
 			}
 		}
 	}
+	memset(tmp, 0, size);
 	return tmp;
 }

-
-void*
-wrealloc(void *ptr, size_t newsize)
+void *wrealloc(void *ptr, size_t newsize)
 {
 	void *nptr;

 	if (!ptr) {
 		nptr = wmalloc(newsize);
-    } else if (newsize==0) {
+	} else if (newsize == 0) {
 		wfree(ptr);
 		nptr = NULL;
 	} else {
-#ifdef TEST_WITH_GC
-	nptr = GC_realloc(ptr, newsize);
+#ifdef USE_BOEHM_GC
+		nptr = GC_REALLOC(ptr, newsize);
 #else
 		nptr = realloc(ptr, newsize);
 #endif
-        if (nptr==NULL) {
+		if (nptr == NULL) {
 			wwarning("realloc() failed. Retrying after 2s.");
 			sleep(2);
-#ifdef TEST_WITH_GC
-            nptr = GC_realloc(ptr, newsize);
+#ifdef USE_BOEHM_GC
+			nptr = GC_REALLOC(ptr, newsize);
 #else
 			nptr = realloc(ptr, newsize);
 #endif
 			if (nptr == NULL) {
 				if (Aborting) {
-                    fputs("Really Bad Error: recursive realloc() failure.",
-                          stderr);
+					fputs("Really Bad Error: recursive realloc() failure.", stderr);
 					exit(-1);
 				} else {
 					wfatal("virtual memory exhausted");
-                    Aborting=1;
+					Aborting = 1;
 					wAbort(False);
 				}
 			}
@@ -151,9 +140,7 @@ wrealloc(void *ptr, size_t newsize)
 	return nptr;
 }

-
-void*
-wretain(void *ptr)
+void *wretain(void *ptr)
 {
 	int *refcount;

@@ -179,22 +166,28 @@ wretain(void *ptr)
 	return ptr;
 }

-
-
-void
-wfree(void *ptr)
+void wfree(void *ptr)
 {
-#ifdef TEST_WITH_GC
-    GC_free(ptr);
+	if (ptr)
+#ifdef USE_BOEHM_GC
+		/* This should eventually be removed, once the criss-cross
+		 * of wmalloc()d memory being free()d, malloc()d memory being
+		 * wfree()d, various misuses of calling wfree() on objects
+		 * allocated by libc malloc() and calling libc free() on
+		 * objects allocated by Boehm GC (think external libraries)
+		 * is cleaned up.
+		 */
+		if (GC_base(ptr) != 0)
+			GC_FREE(ptr);
+		else
+			free(ptr);
 #else
 		free(ptr);
 #endif
+	ptr = NULL;
 }

-
-
-void
-wrelease(void *ptr)
+void wrelease(void *ptr)
 {
 	int *refcount;

@@ -218,5 +211,3 @@ wrelease(void *ptr)
 #endif
 	}
 }
-
-
--- a/WINGs/misc.c
+++ b/WINGs/misc.c
@@ -3,9 +3,7 @@

 #include "WINGsP.h"

-
-WMRange
-wmkrange(int start, int count)
+WMRange wmkrange(int start, int count)
 {
 	WMRange range;

@@ -14,5 +12,3 @@ wmkrange(int start, int count)

 	return range;
 }
-
-
--- a/WINGs/notification.c
+++ b/WINGs/notification.c
@@ -6,7 +6,6 @@

 #include "WUtil.h"

-
 typedef struct W_Notification {
 	const char *name;
 	void *object;
@@ -14,50 +13,37 @@ typedef struct W_Notification {
 	int refCount;
 } Notification;

-
 extern void W_FlushASAPNotificationQueue();

-
-const char*
-WMGetNotificationName(WMNotification *notification)
+const char *WMGetNotificationName(WMNotification * notification)
 {
 	return notification->name;
 }

-
-void*
-WMGetNotificationObject(WMNotification *notification)
+void *WMGetNotificationObject(WMNotification * notification)
 {
 	return notification->object;
 }

-
-void*
-WMGetNotificationClientData(WMNotification *notification)
+void *WMGetNotificationClientData(WMNotification * notification)
 {
 	return notification->clientData;
 }

-
-WMNotification*
-WMCreateNotification(const char *name, void *object, void *clientData)
+WMNotification *WMCreateNotification(const char *name, void *object, void *clientData)
 {
 	Notification *nPtr;

 	nPtr = wmalloc(sizeof(Notification));
-    
 	nPtr->name = name;
 	nPtr->object = object;
 	nPtr->clientData = clientData;
-    
 	nPtr->refCount = 1;

 	return nPtr;
 }

-
-void
-WMReleaseNotification(WMNotification *notification)
+void WMReleaseNotification(WMNotification * notification)
 {
 	notification->refCount--;

@@ -66,16 +52,13 @@ WMReleaseNotification(WMNotification *notification)
 	}
 }

-
-WMNotification*
-WMRetainNotification(WMNotification *notification)
+WMNotification *WMRetainNotification(WMNotification * notification)
 {
 	notification->refCount++;

 	return notification;
 }

-
 /***************** Notification Center *****************/

 typedef struct NotificationObserver {
@@ -90,7 +73,6 @@ typedef struct NotificationObserver {
 	struct NotificationObserver *nextAction;	/* for observerTable */
 } NotificationObserver;

-
 typedef struct W_NotificationCenter {
 	WMHashTable *nameTable;	/* names -> observer lists */
 	WMHashTable *objectTable;	/* object -> observer lists */
@@ -99,26 +81,20 @@ typedef struct W_NotificationCenter {
 	WMHashTable *observerTable;	/* observer -> NotificationObserver */
 } NotificationCenter;

-
 /* default (and only) center */
 static NotificationCenter *notificationCenter = NULL;

-
-void
-W_InitNotificationCenter(void)
+void W_InitNotificationCenter(void)
 {
 	notificationCenter = wmalloc(sizeof(NotificationCenter));
-    
 	notificationCenter->nameTable = WMCreateHashTable(WMStringPointerHashCallbacks);
 	notificationCenter->objectTable = WMCreateHashTable(WMIntHashCallbacks);
 	notificationCenter->nilList = NULL;
-    
 	notificationCenter->observerTable = WMCreateHashTable(WMIntHashCallbacks);
 }

-
 void
-WMAddNotificationObserver(WMNotificationObserverAction *observerAction,
+WMAddNotificationObserver(WMNotificationObserverAction * observerAction,
 			  void *observer, const char *name, void *object)
 {
 	NotificationObserver *oRec, *rec;
@@ -131,10 +107,8 @@ WMAddNotificationObserver(WMNotificationObserverAction *observerAction,
 	oRec->next = NULL;
 	oRec->prev = NULL;

-    
 	/* put this action in the list of actions for this observer */
-    rec = (NotificationObserver*)WMHashInsert(notificationCenter->observerTable,
-					     observer, oRec);
+	rec = (NotificationObserver *) WMHashInsert(notificationCenter->observerTable, observer, oRec);

 	if (rec) {
 		/* if this is not the first action for the observer */
@@ -152,16 +126,14 @@ WMAddNotificationObserver(WMNotificationObserverAction *observerAction,
 		notificationCenter->nilList = oRec;
 	} else if (!name) {
 		/* any message coming from object */
-	rec = (NotificationObserver*)WMHashInsert(notificationCenter->objectTable,
-						  object, oRec);
+		rec = (NotificationObserver *) WMHashInsert(notificationCenter->objectTable, object, oRec);
 		oRec->next = rec;
 		if (rec) {
 			rec->prev = oRec;
 		}
 	} else {
 		/* name && (object || !object) */
-	rec = (NotificationObserver*)WMHashInsert(notificationCenter->nameTable, 
-						  name, oRec);
+		rec = (NotificationObserver *) WMHashInsert(notificationCenter->nameTable, name, oRec);
 		oRec->next = rec;
 		if (rec) {
 			rec->prev = oRec;
@@ -169,26 +141,22 @@ WMAddNotificationObserver(WMNotificationObserverAction *observerAction,
 	}
 }

-
-void
-WMPostNotification(WMNotification *notification)
+void WMPostNotification(WMNotification * notification)
 {
 	NotificationObserver *orec, *tmp;

 	WMRetainNotification(notification);

 	/* tell the observers that want to know about a particular message */
-    orec = (NotificationObserver*)WMHashGet(notificationCenter->nameTable, 
-		    notification->name);
+	orec = (NotificationObserver *) WMHashGet(notificationCenter->nameTable, notification->name);

 	while (orec) {
 		tmp = orec->next;

-	if (!orec->object || !notification->object 
-            || orec->object == notification->object) {
+		if (!orec->object || !notification->object || orec->object == notification->object) {
 			/* tell the observer */
 			if (orec->observerAction) {
-		(*orec->observerAction)(orec->observer, notification);
+				(*orec->observerAction) (orec->observer, notification);
 			}
 		}

@@ -196,15 +164,14 @@ WMPostNotification(WMNotification *notification)
 	}

 	/* tell the observers that want to know about an object */
-    orec = (NotificationObserver*)WMHashGet(notificationCenter->objectTable,
-		    notification->object);
+	orec = (NotificationObserver *) WMHashGet(notificationCenter->objectTable, notification->object);

 	while (orec) {
 		tmp = orec->next;

 		/* tell the observer */
 		if (orec->observerAction) {
-	    (*orec->observerAction)(orec->observer, notification);
+			(*orec->observerAction) (orec->observer, notification);
 		}
 		orec = tmp;
 	}
@@ -216,7 +183,7 @@ WMPostNotification(WMNotification *notification)

 		/* tell the observer */
 		if (orec->observerAction) {
-	    (*orec->observerAction)(orec->observer, notification);
+			(*orec->observerAction) (orec->observer, notification);
 		}
 		orec = tmp;
 	}
@@ -224,15 +191,12 @@ WMPostNotification(WMNotification *notification)
 	WMReleaseNotification(notification);
 }

-
-void
-WMRemoveNotificationObserver(void *observer)
+void WMRemoveNotificationObserver(void *observer)
 {
 	NotificationObserver *orec, *tmp, *rec;

 	/* get the list of actions the observer is doing */
-    orec = (NotificationObserver*)WMHashGet(notificationCenter->observerTable,
-		    observer);
+	orec = (NotificationObserver *) WMHashGet(notificationCenter->observerTable, observer);

 	/*
 	 * FOREACH orec IN actionlist for observer
@@ -246,30 +210,26 @@ WMRemoveNotificationObserver(void *observer)

 		if (!orec->name && !orec->object) {
 			/* catch-all */
-	    if (notificationCenter->nilList==orec)
+			if (notificationCenter->nilList == orec)
 				notificationCenter->nilList = orec->next;
 		} else if (!orec->name) {
 			/* any message coming from object */
-	    rec = (NotificationObserver*)WMHashGet(notificationCenter->objectTable, 
-			    orec->object);
-	    if (rec==orec) {
+			rec = (NotificationObserver *) WMHashGet(notificationCenter->objectTable, orec->object);
+			if (rec == orec) {
 				/* replace table entry */
 				if (orec->next) {
-		    WMHashInsert(notificationCenter->objectTable, orec->object,
-				 orec->next);
+					WMHashInsert(notificationCenter->objectTable, orec->object, orec->next);
 				} else {
 					WMHashRemove(notificationCenter->objectTable, orec->object);
 				}
 			}
 		} else {
 			/* name && (object || !object) */
-	    rec = (NotificationObserver*)WMHashGet(notificationCenter->nameTable, 
-			    orec->name);
-	    if (rec==orec) {
+			rec = (NotificationObserver *) WMHashGet(notificationCenter->nameTable, orec->name);
+			if (rec == orec) {
 				/* replace table entry */
 				if (orec->next) {
-		    WMHashInsert(notificationCenter->nameTable, orec->name,
-				 orec->next);
+					WMHashInsert(notificationCenter->nameTable, orec->name, orec->next);
 				} else {
 					WMHashRemove(notificationCenter->nameTable, orec->name);
 				}
@@ -288,15 +248,13 @@ WMRemoveNotificationObserver(void *observer)
 	WMHashRemove(notificationCenter->observerTable, observer);
 }

-
-void
-WMRemoveNotificationObserverWithName(void *observer, const char *name, void *object)
+void WMRemoveNotificationObserverWithName(void *observer, const char *name, void *object)
 {
 	NotificationObserver *orec, *tmp, *rec;
 	NotificationObserver *newList = NULL;

 	/* get the list of actions the observer is doing */
-    orec = (NotificationObserver*)WMHashGet(notificationCenter->observerTable, observer);
+	orec = (NotificationObserver *) WMHashGet(notificationCenter->observerTable, observer);

 	WMHashRemove(notificationCenter->observerTable, observer);

@@ -309,30 +267,30 @@ WMRemoveNotificationObserverWithName(void *observer, const char *name, void *obj
 				if (notificationCenter->nilList == orec)
 					notificationCenter->nilList = orec->next;
 			} else if (!name) {
-		rec = (NotificationObserver*)WMHashGet(notificationCenter->objectTable, orec->object);
-		if (rec==orec) {
-		    assert(rec->prev==NULL);
+				rec =
+				    (NotificationObserver *) WMHashGet(notificationCenter->objectTable,
+								       orec->object);
+				if (rec == orec) {
+					assert(rec->prev == NULL);
 					/* replace table entry */
 					if (orec->next) {
 						WMHashInsert(notificationCenter->objectTable,
 							     orec->object, orec->next);
 					} else {
-			WMHashRemove(notificationCenter->objectTable, 
-				     orec->object);
+						WMHashRemove(notificationCenter->objectTable, orec->object);
 					}
 				}
 			} else {
-		rec = (NotificationObserver*)WMHashGet(notificationCenter->nameTable, 
+				rec = (NotificationObserver *) WMHashGet(notificationCenter->nameTable,
 									 orec->name);
-		if (rec==orec) {
-		    assert(rec->prev==NULL);
+				if (rec == orec) {
+					assert(rec->prev == NULL);
 					/* replace table entry */
 					if (orec->next) {
 						WMHashInsert(notificationCenter->nameTable,
 							     orec->name, orec->next);
 					} else {
-			WMHashRemove(notificationCenter->nameTable, 
-				     orec->name);
+						WMHashRemove(notificationCenter->nameTable, orec->name);
 					}
 				}
 			}
@@ -366,9 +324,7 @@ WMRemoveNotificationObserverWithName(void *observer, const char *name, void *obj
 	}
 }

-
-void
-WMPostNotificationName(const char *name, void *object, void *clientData)
+void WMPostNotificationName(const char *name, void *object, void *clientData)
 {
 	WMNotification *notification;

@@ -379,11 +335,8 @@ WMPostNotificationName(const char *name, void *object, void *clientData)
 	WMReleaseNotification(notification);
 }

-
-
 /**************** Notification Queues ****************/

-
 typedef struct W_NotificationQueue {
 	WMArray *asapQueue;
 	WMArray *idleQueue;
@@ -391,15 +344,12 @@ typedef struct W_NotificationQueue {
 	struct W_NotificationQueue *next;
 } NotificationQueue;

-
 static WMNotificationQueue *notificationQueueList = NULL;

 /* default queue */
 static WMNotificationQueue *notificationQueue = NULL;

-
-WMNotificationQueue*
-WMGetDefaultNotificationQueue(void)
+WMNotificationQueue *WMGetDefaultNotificationQueue(void)
 {
 	if (!notificationQueue)
 		notificationQueue = WMCreateNotificationQueue();
@@ -407,18 +357,13 @@ WMGetDefaultNotificationQueue(void)
 	return notificationQueue;
 }

-
-WMNotificationQueue*
-WMCreateNotificationQueue(void)
+WMNotificationQueue *WMCreateNotificationQueue(void)
 {
 	NotificationQueue *queue;

 	queue = wmalloc(sizeof(NotificationQueue));
-
-    queue->asapQueue =
-        WMCreateArrayWithDestructor(8, (WMFreeDataProc*)WMReleaseNotification);
-    queue->idleQueue =
-        WMCreateArrayWithDestructor(8, (WMFreeDataProc*)WMReleaseNotification);
+	queue->asapQueue = WMCreateArrayWithDestructor(8, (WMFreeDataProc *) WMReleaseNotification);
+	queue->idleQueue = WMCreateArrayWithDestructor(8, (WMFreeDataProc *) WMReleaseNotification);
 	queue->next = notificationQueueList;

 	notificationQueueList = queue;
@@ -426,47 +371,33 @@ WMCreateNotificationQueue(void)
 	return queue;
 }

-
-
-void
-WMEnqueueNotification(WMNotificationQueue *queue, WMNotification *notification,
-		      WMPostingStyle postingStyle)
+void WMEnqueueNotification(WMNotificationQueue * queue, WMNotification * notification, WMPostingStyle postingStyle)
 {
-    WMEnqueueCoalesceNotification(queue, notification, postingStyle,
-				  WNCOnName|WNCOnSender);
+	WMEnqueueCoalesceNotification(queue, notification, postingStyle, WNCOnName | WNCOnSender);
 }

-
 #define NOTIF ((WMNotification*)cdata)
 #define ITEM  ((WMNotification*)item)

-static int
-matchSenderAndName(void *item, void *cdata)
+static int matchSenderAndName(const void *item, const void *cdata)
 {
-    return (NOTIF->object==ITEM->object && strcmp(NOTIF->name, ITEM->name)==0);
+	return (NOTIF->object == ITEM->object && strcmp(NOTIF->name, ITEM->name) == 0);
 }

-
-static int
-matchSender(void *item, void *cdata)
+static int matchSender(const void *item, const void *cdata)
 {
 	return (NOTIF->object == ITEM->object);
 }

-
-static int
-matchName(void *item, void *cdata)
+static int matchName(const void *item, const void *cdata)
 {
-    return (strcmp(NOTIF->name, ITEM->name)==0);
+	return (strcmp(NOTIF->name, ITEM->name) == 0);
 }

 #undef NOTIF
 #undef ITEM

-
-void
-WMDequeueNotificationMatching(WMNotificationQueue *queue, 
-			      WMNotification *notification, unsigned mask)
+void WMDequeueNotificationMatching(WMNotificationQueue * queue, WMNotification * notification, unsigned mask)
 {
 	WMMatchDataProc *matchFunc;

@@ -483,12 +414,9 @@ WMDequeueNotificationMatching(WMNotificationQueue *queue,
 	WMRemoveFromArrayMatching(queue->idleQueue, matchFunc, notification);
 }

-
 void
-WMEnqueueCoalesceNotification(WMNotificationQueue *queue, 
-			      WMNotification *notification,
-			      WMPostingStyle postingStyle,
-			      unsigned coalesceMask)
+WMEnqueueCoalesceNotification(WMNotificationQueue * queue,
+			      WMNotification * notification, WMPostingStyle postingStyle, unsigned coalesceMask)
 {
 	if (coalesceMask != WNCNone)
 		WMDequeueNotificationMatching(queue, notification, coalesceMask);
@@ -509,9 +437,7 @@ WMEnqueueCoalesceNotification(WMNotificationQueue *queue,
 	}
 }

-
-void
-W_FlushASAPNotificationQueue()
+void W_FlushASAPNotificationQueue()
 {
 	WMNotificationQueue *queue = notificationQueueList;

@@ -525,9 +451,7 @@ W_FlushASAPNotificationQueue()
 	}
 }

-
-void
-W_FlushIdleNotificationQueue()
+void W_FlushIdleNotificationQueue()
 {
 	WMNotificationQueue *queue = notificationQueueList;

@@ -540,4 +464,3 @@ W_FlushIdleNotificationQueue()
 		queue = queue->next;
 	}
 }
-
--- a/WINGs/po/.cvsignore
+++ b/WINGs/po/.cvsignore
@@ -1,4 +0,0 @@
-Makefile Makefile.in
-.psrc .inslog2 tca.map tca.log pchdir *.rpt
-*.pot
-*.mo
--- a/WINGs/po/Makefile.am
+++ b/WINGs/po/Makefile.am
@@ -7,10 +7,8 @@ CLEANFILES = $(CATALOGS) WINGs.pot
 EXTRA_DIST = bg.po ca.po cs.po de.po fr.po sk.po

 POTFILES  = \
-	$(top_builddir)/WINGs/connection.c \
 	$(top_builddir)/WINGs/error.c \
 	$(top_builddir)/WINGs/findfile.c \
-	$(top_builddir)/WINGs/host.c \
 	$(top_builddir)/WINGs/proplist.c \
 	$(top_builddir)/WINGs/userdefaults.c \
 	$(top_builddir)/WINGs/wcolor.c \
@@ -24,14 +22,14 @@ POTFILES  = \
 SUFFIXES = .po .mo

 .po.mo: 
-	msgfmt -o $@ $<
+	msgfmt -c -o $@ $<


 all-local: $(CATALOGS)

 WINGs.pot: $(POTFILES)
 	xgettext --default-domain=WINGs \
-	--add-comments --keyword=_ $(POTFILES)
+	--add-comments --keyword=_ --keyword=N_ $(POTFILES)
 	if cmp -s WINGs.po WINGs.pot; then \
 	    rm -f WINGs.po; \
 	else \
--- a/WINGs/po/README
+++ b/WINGs/po/README
@@ -2,17 +2,18 @@
 Instructions for translating po files can be found in the po/README directory
 in the top of the WindowMaker source tree.

+All files are in UTF-8
+
 File	Language	Note	Current Maintainer
 ------------------------------------------------------------------------------
 ca.po	Catalan			Ernest Adrogué <eadrogue@gmx.net>
-cs.po	Czech		1	Jiri Hnidek <Jiri.Hnidek@vslib.cz
-de.po	German		1	Guido Scholz <guido.scholz@bayernline.de>
+cs.po	Czech		 	Jiri Hnidek <Jiri.Hnidek@vslib.cz
+de.po	German		 	Guido Scholz <guido.scholz@bayernline.de>
 fr.po	French			Emmanuel Benoit <tseeker@neptune.fr>
 				Antoine Hulin <antoine@origan.fdn.org>
-sk.po	Slovak		1	Jan 'judas' Tomka <judas@linux.sk>
+sk.po	Slovak		 	Jan 'judas' Tomka <judas@linux.sk>
 bg.po	Bulgarian		Anton Zinoviev <zinoviev@debian.org>

 Notes
 -----
-1. Uses iso8859-2 character set.

--- a/WINGs/po/bg.po
+++ b/WINGs/po/bg.po
@@ -10,58 +10,58 @@ msgstr ""
 "Last-Translator: Anton Zinoviev <zinoviev@debian.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CP1251\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

 #: ../../WINGs/connection.c:461 ../../WINGs/connection.c:526
 #: ../../WINGs/connection.c:569
 msgid "Bad address-service-protocol combination"
-msgstr "Íåïðàâèëíà êîìáèíàöèÿ àäðåñ-óñëóãà-ïðîòîêîë"
+msgstr "Неправилна комбинация адрес-услуга-протокол"

 #: ../../WINGs/error.c:54
 #, c-format
 msgid "Unknown error %d"
-msgstr "Íåïîçíàòà ãðåøêà %d"
+msgstr "Непозната грешка %d"

 #: ../../WINGs/error.c:59
 #, c-format
 msgid "Error %d"
-msgstr "Ãðåøêà %d"
+msgstr "Грешка %d"

 #: ../../WINGs/error.c:110
 msgid " warning: "
-msgstr "âíèìàíèå: "
+msgstr "внимание: "

 #: ../../WINGs/error.c:137
 msgid " fatal error: "
-msgstr " êðèòè÷íà ãðåøêà: "
+msgstr " критична грешка: "

 #: ../../WINGs/error.c:163 ../../WINGs/error.c:192
 msgid " error: "
-msgstr " ãðåøêà: "
+msgstr " грешка: "

 #: ../../WINGs/findfile.c:48
 #, c-format
 msgid "could not get password entry for UID %i"
-msgstr "íå ìîæå äà ñå ïîëó÷è çàïèñúò çà ïàðîëà íà ïîòðåáèòåë ñ íîìåð %i"
+msgstr "не може да се получи записът за парола на потребител с номер %i"

 #: ../../WINGs/findfile.c:66
 #, c-format
 msgid "could not get password entry for user %s"
-msgstr "íå ìîæå äà ñå ïîëó÷è çàïèñúò çà ïàðîëà íà ïîòðåáèòåë %s<"
+msgstr "не може да се получи записът за парола на потребител %s<"

 #: ../../WINGs/host.c:114
 msgid "Cannot get current host name"
-msgstr "Íå ìîæå äà ñå ïîëó÷è èìåòî íà õîñòà"
+msgstr "Не може да се получи името на хоста"

 #: ../../WINGs/proplist.c:91
 #, c-format
 msgid "syntax error in %s %s, line %i: %s"
-msgstr "ñèíòàêòè÷íà ãðåøêà â %s %s, ðåä %i: %s"
+msgstr "синтактична грешка в %s %s, ред %i: %s"

 #: ../../WINGs/proplist.c:150
 msgid "Only string or data is supported for a proplist dictionary key"
-msgstr "Êàòî êëþ÷ çà äîñòúï äî proplist ñå ïîääúðæàò ñàìî íèçîâå èëè äàííè"
+msgstr "Като ключ за достъп до proplist се поддържат само низове или данни"

 #: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
 #: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
@@ -69,153 +69,153 @@ msgstr "
 #: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
 #: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
 msgid "Used proplist functions on non-WMPropLists objects"
-msgstr "Ïîëçâàò ñå proplist-ôóíêöèè çà îáåêòè, êîèòî íå ñà îò òèï WMPropLists"
+msgstr "Ползват се proplist-функции за обекти, които не са от тип WMPropLists"

 #: ../../WINGs/proplist.c:630
 msgid "unterminated PropList string"
-msgstr "íåçàâúðøåí íèç PropList"
+msgstr "незавършен низ PropList"

 #: ../../WINGs/proplist.c:670
 msgid "unterminated PropList data"
-msgstr "íåçàâúðøåíè äàííè PropList"
+msgstr "незавършени данни PropList"

 #: ../../WINGs/proplist.c:678
 msgid "unterminated PropList data (missing hexdigit)"
-msgstr "íåçàâúðøåíè äàííè PropList (ëèïñâà øåñòíàäåñåòè÷íî ÷èñëî)"
+msgstr "незавършени данни PropList (липсва шестнадесетично число)"

 #: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
 msgid "non hexdigit character in PropList data"
-msgstr "çíàê, êîéòî íå å øåñòíàäåñåòè÷íî ÷èñëî, â äàííè PropList"
+msgstr "знак, който не е шестнадесетично число, в данни PropList"

 #: ../../WINGs/proplist.c:729
 msgid "unterminated PropList array"
-msgstr "íåçàâúðøåí ìàñèâ PropList"
+msgstr "незавършен масив PropList"

 #: ../../WINGs/proplist.c:737
 msgid "missing or unterminated PropList array"
-msgstr "ëèïñâàù èëè íåçàâúðøåí ìàñèâ Proplist"
+msgstr "липсващ или незавършен масив Proplist"

 #: ../../WINGs/proplist.c:747
 msgid "could not get PropList array element"
-msgstr "íå ìîæå äà ñå ïîëó÷è åëåìåíò îò ìàñèâ PropList"
+msgstr "не може да се получи елемент от масив PropList"

 #: ../../WINGs/proplist.c:776
 msgid "unterminated PropList dictionary"
-msgstr "íåçàâúðøåí ðå÷íèê PropList"
+msgstr "незавършен речник PropList"

 #: ../../WINGs/proplist.c:793
 msgid "missing PropList dictionary key"
-msgstr "ëèïñâàù êëþ÷ çà äîñòúï äî PropList"
+msgstr "липсващ ключ за достъп до PropList"

 #: ../../WINGs/proplist.c:795
 msgid "missing PropList dictionary entry key or unterminated dictionary"
-msgstr "ëèïñâàù êëþ÷ çà äîñòúï äî PropList èëè íåçàâúðøåí ðå÷íèê"
+msgstr "липсващ ключ за достъп до PropList или незавършен речник"

 #: ../../WINGs/proplist.c:803
 msgid "error parsing PropList dictionary key"
-msgstr "ãðåøêà ïðè ðàçáîð íà êëþ÷ â PropList"
+msgstr "грешка при разбор на ключ в PropList"

 #: ../../WINGs/proplist.c:811
 msgid "missing = in PropList dictionary entry"
-msgstr "ëèïñâà çíàê çà ðàâåíñòâî â åëåìåíò íà PropList"
+msgstr "липсва знак за равенство в елемент на PropList"

 #: ../../WINGs/proplist.c:819
 msgid "error parsing PropList dictionary entry value"
-msgstr "ãðåøêà ïðè ðàçáîð íà ñòîéíîñò íà åëåìåíò â PropList"
+msgstr "грешка при разбор на стойност на елемент в PropList"

 #: ../../WINGs/proplist.c:827
 msgid "missing ; in PropList dictionary entry"
-msgstr "ëèïñâà çíàê òî÷êà è çàïåòàÿ â åëåìåíò íà PropList"
+msgstr "липсва знак точка и запетая в елемент на PropList"

 #: ../../WINGs/proplist.c:888
 msgid ""
 "was expecting a string, data, array or dictionary. If it's a string, try "
 "enclosing it with \"."
-msgstr "î÷àêâàõà ñå íèç, äàííè, ìàñèâ èëè ðå÷íèê. Àêî å ðå÷íèê, ïðîáâàéòå äà ãî îãðàäèòå ñ \"."
+msgstr "очакваха се низ, данни, масив или речник. Ако е речник, пробвайте да го оградите с \"."

 #: ../../WINGs/proplist.c:892
 msgid "Comments are not allowed inside WindowMaker owned domain files."
-msgstr "Íå ñå ïîçâîëÿâàò êîìåíòàðè âúâ ôàéëîâå ñ îáëàñòè, ñîáñòâåíîñò íà Óèíäîó Ìåéêúð"
+msgstr "Не се позволяват коментари във файлове с области, собственост на Уиндоу Мейкър"

 #: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1628
 msgid "extra data after end of property list"
-msgstr "äàííè â ïîâå÷å ñëåä êðàÿ íà ñïèñúê ñâîéñòâà"
+msgstr "данни в повече след края на списък свойства"

 #: ../../WINGs/proplist.c:1606
 #, c-format
 msgid "could not get size for file '%s'"
-msgstr "íå ìîæå äà ñå ïîëó÷è ðàçìåðúò çà ôàéë \"%s\""
+msgstr "не може да се получи размерът за файл \"%s\""

 #: ../../WINGs/proplist.c:1618
 #, c-format
 msgid "error reading from file '%s'"
-msgstr "ãðåøêà ïðè ÷åòåíå îò ôàéë \"%s\""
+msgstr "грешка при четене от файл \"%s\""

 #: ../../WINGs/proplist.c:1669
 #, c-format
 msgid "mkstemp (%s) failed"
-msgstr "mkstemp (%s) íå óñïÿ"
+msgstr "mkstemp (%s) не успя"

 #: ../../WINGs/proplist.c:1680
 #, c-format
 msgid "mktemp (%s) failed"
-msgstr "mktemp (%s) íå óñïÿ"
+msgstr "mktemp (%s) не успя"

 #: ../../WINGs/proplist.c:1691
 #, c-format
 msgid "open (%s) failed"
-msgstr "open (%s) íå óñïÿ"
+msgstr "open (%s) не успя"

 #: ../../WINGs/proplist.c:1698
 #, c-format
 msgid "writing to file: %s failed"
-msgstr "çàïèñúò âúâ ôàéë %s íå óñïÿ"
+msgstr "записът във файл %s не успя"

 #: ../../WINGs/proplist.c:1706
 #, c-format
 msgid "fclose (%s) failed"
-msgstr "fclose (%s) íå óñïÿ"
+msgstr "fclose (%s) не успя"

 #: ../../WINGs/proplist.c:1715
 #, c-format
 msgid "rename ('%s' to '%s') failed"
-msgstr "ïðåèìåíóâàíåòî (îò \"%s\" íà \"%s\") íå óñïÿ"
+msgstr "преименуването (от \"%s\" на \"%s\") не успя"

 #. something happened with the file. just overwrite it
 #: ../../WINGs/userdefaults.c:192 ../../WINGs/userdefaults.c:208
 #, c-format
 msgid "cannot read domain from file '%s' when syncing"
-msgstr "íå ìîæå äà ñå ïðî÷åòå îáëàñòòà îò ôàéë \"%s\" ïðè ñèíõðîíèçèðàíå"
+msgstr "не може да се прочете областта от файл \"%s\" при синхронизиране"

 #: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
 #: ../../WINGs/wcolor.c:291
 #, c-format
 msgid "could not allocate %s color"
-msgstr "íå ìîæå äà ñå çàäåëè öâÿò %s"
+msgstr "не може да се задели цвят %s"

 #: ../../WINGs/wcolor.c:198
 msgid "white"
-msgstr "áÿë"
+msgstr "бял"

 #: ../../WINGs/wcolor.c:211
 msgid "black"
-msgstr "÷åðåí"
+msgstr "черен"

 #: ../../WINGs/wcolor.c:250
 msgid "gray"
-msgstr "ñèâ"
+msgstr "сив"

 #: ../../WINGs/wcolor.c:291
 msgid "dark gray"
-msgstr "òúìíîñèâ"
+msgstr "тъмносив"

 #: ../../WINGs/wcolorpanel.c:415
 msgid "Colors"
-msgstr "Öâåòîâå"
+msgstr "Цветове"

 #: ../../WINGs/wcolorpanel.c:605 ../../WINGs/wcolorpanel.c:2824
 msgid "Brightness"
-msgstr "ßðêîñò"
+msgstr "Яркост"

 #: ../../WINGs/wcolorpanel.c:607 ../../WINGs/wcolorpanel.c:683
 #: ../../WINGs/wcolorpanel.c:716 ../../WINGs/wcolorpanel.c:750
@@ -225,102 +225,102 @@ msgstr "
 #: ../../WINGs/wcolorpanel.c:2862 ../../WINGs/wcolorpanel.c:2898
 #: ../../WINGs/wcolorpanel.c:3746
 msgid "Color Panel: Could not allocate memory"
-msgstr "Color Panel: íå ìîæå äà ñå çàäåëè ïàìåò"
+msgstr "Color Panel: не може да се задели памет"

 #: ../../WINGs/wcolorpanel.c:680 ../../WINGs/wcolorpanel.c:681
 msgid "Red"
-msgstr "×åðâåí"
+msgstr "Червен"

 #: ../../WINGs/wcolorpanel.c:713 ../../WINGs/wcolorpanel.c:714
 msgid "Green"
-msgstr "Çåëåí"
+msgstr "Зелен"

 #: ../../WINGs/wcolorpanel.c:747 ../../WINGs/wcolorpanel.c:748
 msgid "Blue"
-msgstr "Ñèí"
+msgstr "Син"

 #: ../../WINGs/wcolorpanel.c:807 ../../WINGs/wcolorpanel.c:808
 msgid "Cyan"
-msgstr "Ñèíüîçåëåí"
+msgstr "Синьозелен"

 #: ../../WINGs/wcolorpanel.c:841 ../../WINGs/wcolorpanel.c:842
 msgid "Magenta"
-msgstr "Ïóðïóðåí"
+msgstr "Пурпурен"

 #: ../../WINGs/wcolorpanel.c:875 ../../WINGs/wcolorpanel.c:876
 msgid "Yellow"
-msgstr "Æúëò"
+msgstr "Жълт"

 #: ../../WINGs/wcolorpanel.c:910 ../../WINGs/wcolorpanel.c:911
 msgid "Black"
-msgstr "×åðåí"
+msgstr "Черен"

 #: ../../WINGs/wcolorpanel.c:991
 msgid "Spectrum"
-msgstr "Ñïåêòúð"
+msgstr "Спектър"

 #: ../../WINGs/wcolorpanel.c:1021
 msgid "Palette"
-msgstr "Ïàëèòðà"
+msgstr "Палитра"

 #: ../../WINGs/wcolorpanel.c:1027
 msgid "New from File..."
-msgstr "Íîâà îò ôàéë..."
+msgstr "Нова от файл..."

 #: ../../WINGs/wcolorpanel.c:1028 ../../WINGs/wcolorpanel.c:1076
 #: ../../WINGs/wcolorpanel.c:1093
 msgid "Rename..."
-msgstr "Ïðåèìåíóâàé..."
+msgstr "Преименувай..."

 #: ../../WINGs/wcolorpanel.c:1029 ../../WINGs/wcolorpanel.c:1077
 #: ../../WINGs/wcolorpanel.c:1094 ../../WINGs/wcolorpanel.c:3321
 msgid "Remove"
-msgstr "Ïðåìàõíè"
+msgstr "Премахни"

 #: ../../WINGs/wcolorpanel.c:1030
 msgid "Copy"
-msgstr "Êîïèðàé"
+msgstr "Копирай"

 #: ../../WINGs/wcolorpanel.c:1031
 #, fuzzy
 msgid "New from Clipboard"
-msgstr "Íîâà îò Clipboard"
+msgstr "Нова от Clipboard"

 #: ../../WINGs/wcolorpanel.c:1052
 msgid "X11-Colors"
-msgstr "Öâåòîâå îò X11"
+msgstr "Цветове от X11"

 #: ../../WINGs/wcolorpanel.c:1069
 msgid "Color"
-msgstr "Öâÿò"
+msgstr "Цвят"

 #: ../../WINGs/wcolorpanel.c:1075
 msgid "Add..."
-msgstr "Äîáàâè..."
+msgstr "Добави..."

 #: ../../WINGs/wcolorpanel.c:1085
 msgid "List"
-msgstr "Ñïèñúê"
+msgstr "Списък"

 #: ../../WINGs/wcolorpanel.c:1092
 msgid "New..."
-msgstr "Íîâ..."
+msgstr "Нов..."

 #: ../../WINGs/wcolorpanel.c:1231
 #, c-format
 msgid ""
 "Color Panel: Could not create directory %s needed to store configurations"
-msgstr "Color Panel: Íå ìîæå äà ñå ñúçäàäå äèðåêòîðèÿ %s, íåîáõîäèìà çà äà ñå çàïàçÿò íàñòðîéêèòå"
+msgstr "Color Panel: Не може да се създаде директория %s, необходима за да се запазят настройките"

 #. Delete the file, it doesn't belong here
 #: ../../WINGs/wcolorpanel.c:1237 ../../WINGs/wcolorpanel.c:3207
 #: ../../WINGs/wcolorpanel.c:3211
 msgid "File Error"
-msgstr "Ôàéëîâà ãðåøêà"
+msgstr "Файлова грешка"

 #: ../../WINGs/wcolorpanel.c:1238
 msgid "Could not create ColorPanel configuration directory"
-msgstr "Íå ìîæå äà ñå ñúçäàäå êîíôèãóðàöèîííà äèðåêòîðèÿ çà ColorPanel"
+msgstr "Не може да се създаде конфигурационна директория за ColorPanel"

 #: ../../WINGs/wcolorpanel.c:1239 ../../WINGs/wcolorpanel.c:3208
 #: ../../WINGs/wcolorpanel.c:3213 ../../WINGs/wcolorpanel.c:3240
@@ -328,60 +328,60 @@ msgstr "
 #: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
 #: ../../WINGs/wfilepanel.c:971 ../../WINGs/wfontpanel.c:709
 msgid "OK"
-msgstr "Ïðèåìàì"
+msgstr "Приемам"

 #: ../../WINGs/wcolorpanel.c:1245 ../../WINGs/wcolorpanel.c:1281
 #: ../../WINGs/wcolorpanel.c:1299
 msgid "Color Panel: Could not find file"
-msgstr "Color Panel: Íå ìîæå äà ñå îòêðèå ôàéëà"
+msgstr "Color Panel: Не може да се открие файла"

 #: ../../WINGs/wcolorpanel.c:1486 ../../WINGs/wcolorpanel.c:1551
 #: ../../WINGs/wcolorpanel.c:1615
 msgid "Color Panel: X failed request"
-msgstr "Color Panel: íå óñïÿ çàÿâêà êúì X"
+msgstr "Color Panel: не успя заявка към X"

 #: ../../WINGs/wcolorpanel.c:2860
 msgid "Saturation"
-msgstr "Íàñèòåíîñò"
+msgstr "Наситеност"

 #: ../../WINGs/wcolorpanel.c:2896
 msgid "Hue"
-msgstr "Íþàíñ"
+msgstr "Нюанс"

 #: ../../WINGs/wcolorpanel.c:3146
 msgid "Open Palette"
-msgstr "Îòâàðÿíå íà ïàëèòðà"
+msgstr "Отваряне на палитра"

 #: ../../WINGs/wcolorpanel.c:3208
 msgid "Invalid file format !"
-msgstr "Íåïðàâèëåí ôàéëîâ ôîðìàò!"
+msgstr "Неправилен файлов формат!"

 #: ../../WINGs/wcolorpanel.c:3210
 #, c-format
 msgid "can't remove file %s"
-msgstr "íå ìîæå äà ñå èçòðèå ôàéëúò %s"
+msgstr "не може да се изтрие файлът %s"

 #: ../../WINGs/wcolorpanel.c:3212
 msgid "Couldn't remove file from Configuration Directory !"
-msgstr "Íå ìîæå äà ñå èçòðèå ôàéë îò äèðåêòîðèÿòà çà íàñòðîéêè!"
+msgstr "Не може да се изтрие файл от директорията за настройки!"

 #: ../../WINGs/wcolorpanel.c:3239
 msgid "Rename"
-msgstr "Ïðåèìåíóâàíå"
+msgstr "Преименуване"

 #: ../../WINGs/wcolorpanel.c:3239
 msgid "Rename palette to:"
-msgstr "Ïðåèìåíóâàé ïàëèòðàòà íà "
+msgstr "Преименувай палитрата на "

 #: ../../WINGs/wcolorpanel.c:3240 ../../WINGs/wfilepanel.c:259
 #: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
 msgid "Cancel"
-msgstr "Îòìåíÿì"
+msgstr "Отменям"

 #. Careful, this palette exists already
 #: ../../WINGs/wcolorpanel.c:3256 ../../WINGs/wfilepanel.c:760
 msgid "Warning"
-msgstr "Âíèìàíèå"
+msgstr "Внимание"

 #: ../../WINGs/wcolorpanel.c:3257
 msgid ""
@@ -389,26 +389,26 @@ msgid ""
 "\n"
 "Overwrite ?"
 msgstr ""
-"Òàêàâà ïàëèòðà âå÷å ñúùåñòâóâà!\n"
+"Такава палитра вече съществува!\n"
 "\n"
-"Äà áúäå ëè çàìåíåíà ñ íîâàòà?"
+"Да бъде ли заменена с новата?"

 #: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
 msgid "No"
-msgstr "Íå"
+msgstr "Не"

 #: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
 msgid "Yes"
-msgstr "Äà"
+msgstr "Да"

 #: ../../WINGs/wcolorpanel.c:3289
 #, c-format
 msgid "Couldn't rename palette %s to %s\n"
-msgstr "Ïàëèòðàòà %s íå ìîæå äà ñå ïðåèìåíóâà íà %s\n"
+msgstr "Палитрата %s не може да се преименува на %s\n"

 #: ../../WINGs/wcolorpanel.c:3315
 msgid "This will permanently remove the palette "
-msgstr "Òîâà ùå îòñòðàíè ïàëèòðàòà íåîáðàòèìî "
+msgstr "Това ще отстрани палитрата необратимо "

 #: ../../WINGs/wcolorpanel.c:3318
 msgid ""
@@ -418,243 +418,243 @@ msgid ""
 msgstr ""
 ".\n"
 "\n"
-"Óáåäåíè ëè ñòå, ÷å èñêàòå äà îòñòðàíèòå òàçè ïàëèòðà?"
+"Убедени ли сте, че искате да отстраните тази палитра?"

 #: ../../WINGs/wcolorpanel.c:3343
 #, c-format
 msgid "Couldn't remove palette %s\n"
-msgstr "Ïàëèòðàòà %s íå ìîæå äà áúäå îòñòðàíåíà\n"
+msgstr "Палитрата %s не може да бъде отстранена\n"

 #: ../../WINGs/wcolorpanel.c:3648
 #, c-format
 msgid "Could not open %s"
-msgstr "Íå ìîæå äà áúäå îòâîðåí %s"
+msgstr "Не може да бъде отворен %s"

 #: ../../WINGs/wcolorpanel.c:3655
 #, c-format
 msgid "Could not create %s"
-msgstr "Íå ìîæå äà áúäå ñúçäàäåí %s"
+msgstr "Не може да бъде създаден %s"

 #: ../../WINGs/wcolorpanel.c:3666
 #, c-format
 msgid "Write error on file %s"
-msgstr "Ãðåøêà ïðè çàïèñ âúâ ôàéë %s"
+msgstr "Грешка при запис във файл %s"

 #: ../../WINGs/wcolorpanel.c:3711
 msgid "Color Panel: Color unspecified"
-msgstr "Color Panel: Íå å ïîñî÷åí öâÿò"
+msgstr "Color Panel: Не е посочен цвят"

 #: ../../WINGs/wfilepanel.c:235
 msgid "Name:"
-msgstr "Èìå:"
+msgstr "Име:"

 #: ../../WINGs/wfilepanel.c:332 ../../WINGs/wfilepanel.c:396
 msgid "Open"
-msgstr "Îòâîðè"
+msgstr "Отвори"

 #: ../../WINGs/wfilepanel.c:350 ../../WINGs/wfilepanel.c:402
 msgid "Save"
-msgstr "Çàïàçè"
+msgstr "Запази"

 #: ../../WINGs/wfilepanel.c:562
 #, c-format
 msgid "WINGs: could not open directory %s\n"
-msgstr "WINGs: äèðåêòîðèÿòà %s íå ìîæå äà ñå îòâîðè\n"
+msgstr "WINGs: директорията %s не може да се отвори\n"

 #: ../../WINGs/wfilepanel.c:580
 #, c-format
 msgid "WINGs: could not stat %s\n"
-msgstr "WINGs: íå ìîãàò äà ñå ïîëó÷àò àòðèáóòèòå (stat) çà %s\n"
+msgstr "WINGs: не могат да се получат атрибутите (stat) за %s\n"

 #: ../../WINGs/wfilepanel.c:647 ../../WINGs/wfilepanel.c:970
 #: ../../WINGs/wfontpanel.c:708
 msgid "Error"
-msgstr "Ãðåøêà"
+msgstr "Грешка"

 #: ../../WINGs/wfilepanel.c:658
 msgid "Create Directory"
-msgstr "Ñúçäàâàíå íà äèðåêòîðèÿ"
+msgstr "Създаване на директория"

 #: ../../WINGs/wfilepanel.c:659
 msgid "Enter directory name"
-msgstr "Âúâåäåòå èìåòî íà äèðåêòîðèÿòà"
+msgstr "Въведете името на директорията"

 #: ../../WINGs/wfilepanel.c:695 ../../WINGs/wfilepanel.c:734
 #: ../../WINGs/wfilepanel.c:765 ../../WINGs/wfilepanel.c:793
 msgid "Permission denied."
-msgstr "Îòêàçàí äîñòúï"
+msgstr "Отказан достъп"

 #: ../../WINGs/wfilepanel.c:698
 #, c-format
 msgid "'%s' already exists."
-msgstr "âå÷å ñúùåñòâóâà \"%s\"."
+msgstr "вече съществува \"%s\"."

 #: ../../WINGs/wfilepanel.c:701
 msgid "Path does not exist."
-msgstr "Ïúòÿò íå ñúùåñòâóâà."
+msgstr "Пътят не съществува."

 #: ../../WINGs/wfilepanel.c:731 ../../WINGs/wfilepanel.c:790
 #, c-format
 msgid "'%s' does not exist."
-msgstr "Íå ñúùåñòâóâà \"%s\"."
+msgstr "Не съществува \"%s\"."

 #: ../../WINGs/wfilepanel.c:738 ../../WINGs/wfilepanel.c:797
 msgid "Insufficient memory available."
-msgstr "Íå å äîñòúïíà äîñòàòú÷íî ïàìåò."
+msgstr "Не е достъпна достатъчно памет."

 #: ../../WINGs/wfilepanel.c:742 ../../WINGs/wfilepanel.c:801
 #, c-format
 msgid "'%s' is on a read-only filesystem."
-msgstr "\"%s\" ñå íàìèðà âúâ ôàéëîâà ñèñòåìà ñ äîñòúï ñàìî çà ÷åòåíå."
+msgstr "\"%s\" се намира във файлова система с достъп само за четене."

 #: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:777
 #: ../../WINGs/wfilepanel.c:804
 #, c-format
 msgid "Can not delete '%s'."
-msgstr "\"%s\" íå ìîæå äà áúäå èçòðèò."
+msgstr "\"%s\" не може да бъде изтрит."

 #: ../../WINGs/wfilepanel.c:752
 #, c-format
 msgid "Delete directory %s ?"
-msgstr "Äà ñå èçòðèå ëè äèðåêòîðèÿòà %s?"
+msgstr "Да се изтрие ли директорията %s?"

 #: ../../WINGs/wfilepanel.c:756
 #, c-format
 msgid "Delete file %s ?"
-msgstr "Äà ñå èçòðèå ëè ôàéëúò %s?"
+msgstr "Да се изтрие ли файлът %s?"

 #: ../../WINGs/wfilepanel.c:768
 #, c-format
 msgid "Directory '%s' does not exist."
-msgstr "Äèðåêòîðèÿòà \"%s\" íå ñúùåñòâóâà."
+msgstr "Директорията \"%s\" не съществува."

 #: ../../WINGs/wfilepanel.c:771
 #, c-format
 msgid "Directory '%s' is not empty."
-msgstr "Äèðåêòîðèÿòà \"%s\" íå å ïðàçíà."
+msgstr "Директорията \"%s\" не е празна."

 #: ../../WINGs/wfilepanel.c:774
 #, c-format
 msgid "Directory '%s' is busy."
-msgstr "Äèðåêòîðèÿòà \"%s å çàåòà."
+msgstr "Директорията \"%s е заета."

 #: ../../WINGs/wfilepanel.c:787
 #, c-format
 msgid "'%s' is a directory."
-msgstr "\"%s\" å äèðåêòîðèÿ."
+msgstr "\"%s\" е директория."

 #: ../../WINGs/wfilepanel.c:829
 #, c-format
 msgid "An error occured browsing '%s'."
-msgstr "Íàñòúïè ãðåøêà ïðè ïîêàçâàíå íà \"%s\"."
+msgstr "Настъпи грешка при показване на \"%s\"."

 #: ../../WINGs/wfilepanel.c:833
 #, c-format
 msgid "'%s' is not a directory."
-msgstr "\"%s\" íå å äèðåêòîðèÿ."
+msgstr "\"%s\" не е директория."

 #: ../../WINGs/wfilepanel.c:970
 msgid "File does not exist."
-msgstr "Ôàéëúò íå ñúùåñòâóâà."
+msgstr "Файлът не съществува."

 #: ../../WINGs/wfont.c:129
 #, c-format
 msgid "the following character sets are missing in %s:"
-msgstr "â %s ëèïñâàò ñëåäíèòå êîäèðàíèÿ:"
+msgstr "в %s липсват следните кодирания:"

 #: ../../WINGs/wfont.c:136
 #, c-format
 msgid ""
 "the string \"%s\" will be used in place of any characters from those sets."
-msgstr "Âìåñòî êîé äà å ñèìâîë îò òåçè êîäèðàíèÿ ùå ñå èçïîëçâà íèçúò \"%s\"."
+msgstr "Вместо кой да е символ от тези кодирания ще се използва низът \"%s\"."

 #: ../../WINGs/wfont.c:300 ../../WINGs/wfont.c:336
 #, c-format
 msgid "could not load font set %s. Trying fixed."
-msgstr "íå ìîæå äà ñå çàðåäè øðèôòîâà êîìáèíàöèÿ %s. Îïèò çà øðèôò fixed."
+msgstr "не може да се зареди шрифтова комбинация %s. Опит за шрифт fixed."

 #: ../../WINGs/wfont.c:306 ../../WINGs/wfont.c:342
 #, c-format
 msgid "could not load font %s. Trying fixed."
-msgstr "íå ìîæå äà ñå çàðåäè øðèôò %s. Îïèò çà øðèôò fixed."
+msgstr "не може да се зареди шрифт %s. Опит за шрифт fixed."

 #: ../../WINGs/wfont.c:310 ../../WINGs/wfont.c:346
 msgid "could not load fixed font!"
-msgstr "íå ìîæå äà ñå çàðåäè øðèôòúò fixed!"
+msgstr "не може да се зареди шрифтът fixed!"

 #: ../../WINGs/wfont.c:441
 #, c-format
 msgid "font description %s is too large."
-msgstr "øðèôòîâîòî îïèñàíèå %s å òâúðäå äúëãî."
+msgstr "шрифтовото описание %s е твърде дълго."

 #: ../../WINGs/wfontpanel.c:205
 msgid "Test!!!"
-msgstr "Ïðîáà!!! Test!!!"
+msgstr "Проба!!! Test!!!"

 #: ../../WINGs/wfontpanel.c:211
 msgid "Family"
-msgstr "Ãàðíèòóðà"
+msgstr "Гарнитура"

 #: ../../WINGs/wfontpanel.c:222
 msgid "Typeface"
-msgstr "Ñòèë"
+msgstr "Стил"

 #: ../../WINGs/wfontpanel.c:233
 msgid "Size"
-msgstr "Ðàçìåð"
+msgstr "Размер"

 #: ../../WINGs/wfontpanel.c:252
 msgid "Set"
-msgstr "Óñòàíîâè"
+msgstr "Установи"

 #: ../../WINGs/wfontpanel.c:257
 msgid "Revert"
-msgstr "Ïðåäèøíîòî"
+msgstr "Предишното"

 #: ../../WINGs/wfontpanel.c:709
 msgid "Could not retrieve font list"
-msgstr "Íå ìîæå äà ñå ïîëó÷è ñïèñúêà îò øðèôòîâå"
+msgstr "Не може да се получи списъка от шрифтове"

 #: ../../WINGs/wfontpanel.c:721
 #, c-format
 msgid "font name %s is longer than 256, which is invalid."
-msgstr "èìåòî íà øðèôòà %s å ïî-äúëãî îò 256 ñèìâîëà, êîåòî å íåäîïóñòèìî."
+msgstr "името на шрифта %s е по-дълго от 256 символа, което е недопустимо."

 #: ../../WINGs/wfontpanel.c:868
 msgid "Roman"
-msgstr "Èçïðàâåí"
+msgstr "Изправен"

 #: ../../WINGs/wfontpanel.c:871
 msgid "Italic"
-msgstr "Êóðñèâ"
+msgstr "Курсив"

 #: ../../WINGs/wfontpanel.c:873
 msgid "Oblique"
-msgstr "Íàêëîíåí"
+msgstr "Наклонен"

 #: ../../WINGs/wfontpanel.c:875
 msgid "Rev Italic"
-msgstr "Îáðàòåí êóðñèâ"
+msgstr "Обратен курсив"

 #: ../../WINGs/wfontpanel.c:877
 msgid "Rev Oblique"
-msgstr "Îáðàòíî íàêëîíåí"
+msgstr "Обратно наклонен"

 #: ../../WINGs/wfontpanel.c:883
 msgid "Normal"
-msgstr "Íîðìàëåí"
+msgstr "Нормален"

 #: ../../WINGs/widgets.c:415
 #, c-format
 msgid "WINGs: could not load widget images file: %s"
-msgstr "WINGs: íå ìîæå äà ñå çàðåäè èçîáðàæåíèåòî %s íà áèáëèîòåêàòà."
+msgstr "WINGs: не може да се зареди изображението %s на библиотеката."

 #: ../../WINGs/widgets.c:763
 msgid ""
 "could not load any fonts. Make sure your font installation and locale "
 "settings are correct."
-msgstr "íå ìîæå äà ñå çàðåäè íèêàêúâ øðèôò. Óáåäåòå ñå, ÷å èìàòå ïðàâèëíî èíñòàëèðàíè øðèôòîâå è ïîñî÷åí åçèêîâ ëîêàë."
+msgstr "не може да се зареди никакъв шрифт. Убедете се, че имате правилно инсталирани шрифтове и посочен езиков локал."

 #: ../../WINGs/wruler.c:189
 msgid "0   inches"
-msgstr "0   öîëà"
+msgstr "0   цола"
--- a/WINGs/po/ca.po
+++ b/WINGs/po/ca.po
@@ -1,27 +1,27 @@
 # Catalan messages for WINGs.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This file is distributed under the same license as GNU Window Maker.
-# Ernest Adrogué <eadrogue@gmx.net>, 2003.
+# Copyright (C) 2003 Ernest Adrogué <eadrogue@gmx.net>.
+# This file is distributed under the terms of the GNU General Public License.
 #
 # Version history:
 # 	WM-ver		author		email			date
-# 	0.80.2	Ernest Adrogué		eadrogue@gmx.net	23 Feb 2003
+# 	0.80.2		Ernest Adrogué	eadrogue@gmx.net	23 Feb 2003
+# 	CVS-20030914	Ernest Adrogué	eadrogue@gmx.net	15 Set 2003
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: WINGs 0.80.2\n"
-"POT-Creation-Date: 2003-02-23 16:54+0100\n"
-"PO-Revision-Date: 2002-12-06 14:15+0100\n"
-"Last-Translator: Ernest Adrogué <eadrogue@gmx.net>\n"
+"POT-Creation-Date: 2003-09-16 22:59+0200\n"
+"PO-Revision-Date: 2003-09-16 23:16+0200\n"
+"Last-Translator: Ernest Adrogué <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: ../../WINGs/connection.c:461 ../../WINGs/connection.c:526
-#: ../../WINGs/connection.c:569
+#: ../../WINGs/connection.c:467 ../../WINGs/connection.c:532
+#: ../../WINGs/connection.c:575
 msgid "Bad address-service-protocol combination"
-msgstr "Combinació adreça-servei-protocol incorrecta"
+msgstr "Combinació adreça-servei-protocol incorrecta"

 #: ../../WINGs/error.c:54
 #, c-format
@@ -35,39 +35,40 @@ msgstr "Error %d"

 #: ../../WINGs/error.c:110
 msgid " warning: "
-msgstr " atenció: "
+msgstr ": atenció: "

 #: ../../WINGs/error.c:137
 msgid " fatal error: "
-msgstr " error fatal: "
+msgstr ": error fatal: "

 #: ../../WINGs/error.c:163 ../../WINGs/error.c:192
 msgid " error: "
-msgstr " error: "
+msgstr ": error: "

 #: ../../WINGs/findfile.c:48
 #, c-format
 msgid "could not get password entry for UID %i"
-msgstr "no s'ha pogut obtenir l'informació d'usuari per l'UID %i"
+msgstr "no s'ha pogut obtenir l'informació de compte de l'UID %i"

 #: ../../WINGs/findfile.c:66
 #, c-format
 msgid "could not get password entry for user %s"
-msgstr "no s'ha pogut obtenir l'informació d'usuari per l'usuari %s"
+msgstr "no s'ha pogut obtenir l'informació de compte de l'usuari %s"

 #: ../../WINGs/host.c:114
 msgid "Cannot get current host name"
 msgstr "No s'ha pogut obtenir el nom de host actual"

+# falten coses per traduïr en el codi font. eac
 #: ../../WINGs/proplist.c:91
 #, c-format
 msgid "syntax error in %s %s, line %i: %s"
-msgstr "error de sintaxi en %s %s, línia %i: %s"
+msgstr "error de sintaxi a %s %s, línia %i: %s"

 #: ../../WINGs/proplist.c:150
 msgid "Only string or data is supported for a proplist dictionary key"
 msgstr ""
-"Les entrades de diccionari PropList només poden contenir dades o una cadena"
+"Una entrada PropList de diccionari només pot contenir dades o una cadena"

 #: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
 #: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
@@ -75,7 +76,7 @@ msgstr ""
 #: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
 #: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
 msgid "Used proplist functions on non-WMPropLists objects"
-msgstr "S'han usat funcions proplist en objectes no-WMPropLists"
+msgstr "S'han usat funcions PropList en objectes no-WMPropLists"

 #: ../../WINGs/proplist.c:630
 msgid "unterminated PropList string"
@@ -115,23 +116,23 @@ msgstr "falta una entrada PropList de diccionari"

 #: ../../WINGs/proplist.c:795
 msgid "missing PropList dictionary entry key or unterminated dictionary"
-msgstr "falta una entrada PropList de diccionari o bé està incompleta"
+msgstr "falta una entrada PropList de diccionari o bé està incompleta"

 #: ../../WINGs/proplist.c:803
 msgid "error parsing PropList dictionary key"
-msgstr "error analitzant l'entrada PropList de diccionari"
+msgstr "error mentre s'analitzava l'entrada PropList de diccionari"

 #: ../../WINGs/proplist.c:811
 msgid "missing = in PropList dictionary entry"
-msgstr "falta un \"=\" a l'entrada de diccionari PropList"
+msgstr "falta un \"=\" a l'entrada PropList de diccionari"

 #: ../../WINGs/proplist.c:819
 msgid "error parsing PropList dictionary entry value"
-msgstr "error analitzant el valor de l'entrada de diccionari PropList"
+msgstr "error mentre s'analitzava el valor de l'entrada PropList de diccionari"

 #: ../../WINGs/proplist.c:827
 msgid "missing ; in PropList dictionary entry"
-msgstr "falta un \";\" en l'entrada de diccionari PropList"
+msgstr "falta un \";\" a l'entrada PropList de diccionari"

 #: ../../WINGs/proplist.c:888
 msgid ""
@@ -143,283 +144,284 @@ msgstr ""

 #: ../../WINGs/proplist.c:892
 msgid "Comments are not allowed inside WindowMaker owned domain files."
-msgstr "No es permeten comentaris en els fitxers de domini de Window Maker."
+msgstr "No es permeten comentaris en els fitxers de domini de WindowMaker."

-#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1628
+#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1630
 msgid "extra data after end of property list"
-msgstr "sobren dades després de la llista de propietats"
+msgstr "sobren dades després de la llista de propietats"

 #: ../../WINGs/proplist.c:1606
 #, c-format
 msgid "could not get size for file '%s'"
 msgstr "no s'ha pogut obtenir la mida de \"%s\""

-#: ../../WINGs/proplist.c:1618
+#: ../../WINGs/proplist.c:1619
 #, c-format
 msgid "error reading from file '%s'"
-msgstr "error llegint el fitxer \"%s\""
+msgstr "error mentre es llegia el fitxer \"%s\""

-#: ../../WINGs/proplist.c:1669
+#: ../../WINGs/proplist.c:1671
 #, c-format
 msgid "mkstemp (%s) failed"
 msgstr "la rutina mkstemp (%s) ha fallat"

-#: ../../WINGs/proplist.c:1680
+#: ../../WINGs/proplist.c:1682
 #, c-format
 msgid "mktemp (%s) failed"
 msgstr "la rutina mktemp (%s) ha fallat"

-#: ../../WINGs/proplist.c:1691
+#: ../../WINGs/proplist.c:1693
 #, c-format
 msgid "open (%s) failed"
 msgstr "la rutina open (%s) ha fallat"

-#: ../../WINGs/proplist.c:1698
+#: ../../WINGs/proplist.c:1700
 #, c-format
 msgid "writing to file: %s failed"
 msgstr "l'escriptura del fitxer \"%s\" ha fallat"

-#: ../../WINGs/proplist.c:1706
+#: ../../WINGs/proplist.c:1708
 #, c-format
 msgid "fclose (%s) failed"
 msgstr "la rutina fclose (%s) ha fallat"

-#: ../../WINGs/proplist.c:1715
+#: ../../WINGs/proplist.c:1717
 #, c-format
 msgid "rename ('%s' to '%s') failed"
 msgstr "el canvi de nom (\"%s\" a \"%s\") ha fallat"

 #. something happened with the file. just overwrite it
-#: ../../WINGs/userdefaults.c:192 ../../WINGs/userdefaults.c:208
+#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204
 #, c-format
 msgid "cannot read domain from file '%s' when syncing"
 msgstr "no s'ha pogut llegir un domini del fitxer \"%s\" quan es sincronitzava"

-#: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
-#: ../../WINGs/wcolor.c:291
+#: ../../WINGs/wcolor.c:224 ../../WINGs/wcolor.c:236 ../../WINGs/wcolor.c:275
+#: ../../WINGs/wcolor.c:316
 #, c-format
 msgid "could not allocate %s color"
 msgstr "no s'ha pogut assignar espai pel color \"%s\""

-#: ../../WINGs/wcolor.c:198
+#: ../../WINGs/wcolor.c:224
 msgid "white"
 msgstr "blanc"

-#: ../../WINGs/wcolor.c:211
+#: ../../WINGs/wcolor.c:236
 msgid "black"
 msgstr "negre"

-#: ../../WINGs/wcolor.c:250
+#: ../../WINGs/wcolor.c:275
 msgid "gray"
 msgstr "gris"

-#: ../../WINGs/wcolor.c:291
+#: ../../WINGs/wcolor.c:316
 msgid "dark gray"
 msgstr "gris fosc"

-#: ../../WINGs/wcolorpanel.c:415
+#: ../../WINGs/wcolorpanel.c:420
 msgid "Colors"
 msgstr "Colors"

-#: ../../WINGs/wcolorpanel.c:605 ../../WINGs/wcolorpanel.c:2824
+#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
 msgid "Brightness"
 msgstr "Claror"

-#: ../../WINGs/wcolorpanel.c:607 ../../WINGs/wcolorpanel.c:683
-#: ../../WINGs/wcolorpanel.c:716 ../../WINGs/wcolorpanel.c:750
-#: ../../WINGs/wcolorpanel.c:810 ../../WINGs/wcolorpanel.c:844
-#: ../../WINGs/wcolorpanel.c:878 ../../WINGs/wcolorpanel.c:913
-#: ../../WINGs/wcolorpanel.c:2164 ../../WINGs/wcolorpanel.c:2826
-#: ../../WINGs/wcolorpanel.c:2862 ../../WINGs/wcolorpanel.c:2898
-#: ../../WINGs/wcolorpanel.c:3746
+#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
+#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
+#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849
+#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918
+#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831
+#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
+#: ../../WINGs/wcolorpanel.c:3745
 msgid "Color Panel: Could not allocate memory"
-msgstr "Panell de color: No s'ha pogut assignar memòria"
+msgstr "Panell de color: No s'ha pogut assignar memòria"

-#: ../../WINGs/wcolorpanel.c:680 ../../WINGs/wcolorpanel.c:681
+#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
 msgid "Red"
 msgstr "Roig"

-#: ../../WINGs/wcolorpanel.c:713 ../../WINGs/wcolorpanel.c:714
+#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719
 msgid "Green"
 msgstr "Verd"

-#: ../../WINGs/wcolorpanel.c:747 ../../WINGs/wcolorpanel.c:748
+#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753
 msgid "Blue"
 msgstr "Blau"

-#: ../../WINGs/wcolorpanel.c:807 ../../WINGs/wcolorpanel.c:808
+#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813
 msgid "Cyan"
 msgstr "Cian"

-#: ../../WINGs/wcolorpanel.c:841 ../../WINGs/wcolorpanel.c:842
+#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847
 msgid "Magenta"
 msgstr "Magenta"

-#: ../../WINGs/wcolorpanel.c:875 ../../WINGs/wcolorpanel.c:876
+#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881
 msgid "Yellow"
 msgstr "Groc"

-#: ../../WINGs/wcolorpanel.c:910 ../../WINGs/wcolorpanel.c:911
+#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916
 msgid "Black"
 msgstr "Negre"

-#: ../../WINGs/wcolorpanel.c:991
+#: ../../WINGs/wcolorpanel.c:996
 msgid "Spectrum"
 msgstr "Espectre"

-#: ../../WINGs/wcolorpanel.c:1021
+#: ../../WINGs/wcolorpanel.c:1026
 msgid "Palette"
 msgstr "Paleta"

-#: ../../WINGs/wcolorpanel.c:1027
+#: ../../WINGs/wcolorpanel.c:1032
 msgid "New from File..."
-msgstr "Obté d'un fitxer..."
+msgstr "Obtenir d'un fitxer..."

-#: ../../WINGs/wcolorpanel.c:1028 ../../WINGs/wcolorpanel.c:1076
-#: ../../WINGs/wcolorpanel.c:1093
+#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
+#: ../../WINGs/wcolorpanel.c:1098
 msgid "Rename..."
-msgstr "Reanomena..."
+msgstr "Reanomenar..."

-#: ../../WINGs/wcolorpanel.c:1029 ../../WINGs/wcolorpanel.c:1077
-#: ../../WINGs/wcolorpanel.c:1094 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082
+#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326
 msgid "Remove"
-msgstr "Elimina"
+msgstr "Eliminar"

-#: ../../WINGs/wcolorpanel.c:1030
+#: ../../WINGs/wcolorpanel.c:1035
 msgid "Copy"
-msgstr "Copia"
+msgstr "Copiar"

-#: ../../WINGs/wcolorpanel.c:1031
+#: ../../WINGs/wcolorpanel.c:1036
 msgid "New from Clipboard"
-msgstr "Obté del porta-retalls..."
+msgstr "Obtenir del porta-retalls..."

-#: ../../WINGs/wcolorpanel.c:1052
+#: ../../WINGs/wcolorpanel.c:1057
 msgid "X11-Colors"
 msgstr "Colors-X11"

-#: ../../WINGs/wcolorpanel.c:1069
+#: ../../WINGs/wcolorpanel.c:1074
 msgid "Color"
 msgstr "Color"

-#: ../../WINGs/wcolorpanel.c:1075
+#: ../../WINGs/wcolorpanel.c:1080
 msgid "Add..."
 msgstr "Afegeix..."

-#: ../../WINGs/wcolorpanel.c:1085
+#: ../../WINGs/wcolorpanel.c:1090
 msgid "List"
 msgstr "Llista"

-#: ../../WINGs/wcolorpanel.c:1092
+#: ../../WINGs/wcolorpanel.c:1097
 msgid "New..."
 msgstr "Nou..."

-#: ../../WINGs/wcolorpanel.c:1231
+#: ../../WINGs/wcolorpanel.c:1236
 #, c-format
 msgid ""
 "Color Panel: Could not create directory %s needed to store configurations"
 msgstr ""
 "Panell de color: No s'ha pogut crear el directori \"%s\" necessari per desar "
-"la configuració"
+"la configuració"

 #. Delete the file, it doesn't belong here
-#: ../../WINGs/wcolorpanel.c:1237 ../../WINGs/wcolorpanel.c:3207
-#: ../../WINGs/wcolorpanel.c:3211
+#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212
+#: ../../WINGs/wcolorpanel.c:3216
 msgid "File Error"
 msgstr "Error de fitxer"

-#: ../../WINGs/wcolorpanel.c:1238
+#: ../../WINGs/wcolorpanel.c:1243
 msgid "Could not create ColorPanel configuration directory"
-msgstr "No s'ha pogut crear el directori de configuració del Panell de color"
+msgstr "No s'ha pogut crear el directori de configuració del Panell de color"

-#: ../../WINGs/wcolorpanel.c:1239 ../../WINGs/wcolorpanel.c:3208
-#: ../../WINGs/wcolorpanel.c:3213 ../../WINGs/wcolorpanel.c:3240
-#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:647
-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
-#: ../../WINGs/wfilepanel.c:971 ../../WINGs/wfontpanel.c:709
+#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
+#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
+#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650
+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
+#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:751
 msgid "OK"
 msgstr "D'acord"

-#: ../../WINGs/wcolorpanel.c:1245 ../../WINGs/wcolorpanel.c:1281
-#: ../../WINGs/wcolorpanel.c:1299
+#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
+#: ../../WINGs/wcolorpanel.c:1304
 msgid "Color Panel: Could not find file"
 msgstr "Panell de color: No s'ha trobat el fitxer"

-#: ../../WINGs/wcolorpanel.c:1486 ../../WINGs/wcolorpanel.c:1551
-#: ../../WINGs/wcolorpanel.c:1615
+#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
+#: ../../WINGs/wcolorpanel.c:1620
 msgid "Color Panel: X failed request"
-msgstr "Panell de color: petició X fallida"
+msgstr "Panell de color: petició X fallida"

-#: ../../WINGs/wcolorpanel.c:2860
+#: ../../WINGs/wcolorpanel.c:2865
 msgid "Saturation"
-msgstr "Saturació"
+msgstr "Saturació"

-#: ../../WINGs/wcolorpanel.c:2896
+#: ../../WINGs/wcolorpanel.c:2901
 msgid "Hue"
-msgstr "Matís"
+msgstr "Matís"

-#: ../../WINGs/wcolorpanel.c:3146
+# és el títol d'un quadre de diàleg. eac
+#: ../../WINGs/wcolorpanel.c:3151
 msgid "Open Palette"
 msgstr "Obrir paleta"

-#: ../../WINGs/wcolorpanel.c:3208
+#: ../../WINGs/wcolorpanel.c:3213
 msgid "Invalid file format !"
-msgstr "El format del fitxer no és vàlid !"
+msgstr "El format del fitxer no és vàlid !"

-#: ../../WINGs/wcolorpanel.c:3210
+#: ../../WINGs/wcolorpanel.c:3215
 #, c-format
 msgid "can't remove file %s"
 msgstr "no s'ha pogut eliminar el fitxer \"%s\""

-#: ../../WINGs/wcolorpanel.c:3212
+#: ../../WINGs/wcolorpanel.c:3217
 msgid "Couldn't remove file from Configuration Directory !"
-msgstr "No s'ha pogut eliminar el fitxer del directori de configuració !"
+msgstr "No s'ha pogut eliminar el fitxer del directori de configuració !"

-#: ../../WINGs/wcolorpanel.c:3239
+#: ../../WINGs/wcolorpanel.c:3244
 msgid "Rename"
 msgstr "Reanomena"

-#: ../../WINGs/wcolorpanel.c:3239
+#: ../../WINGs/wcolorpanel.c:3244
 msgid "Rename palette to:"
-msgstr "Reanomenar la paleta a:"
+msgstr "Reanomena la paleta com a:"

-#: ../../WINGs/wcolorpanel.c:3240 ../../WINGs/wfilepanel.c:259
-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
+#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259
+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
 msgid "Cancel"
-msgstr "Cancel·la"
+msgstr "Cancel·la"

 #. Careful, this palette exists already
-#: ../../WINGs/wcolorpanel.c:3256 ../../WINGs/wfilepanel.c:760
+#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763
 msgid "Warning"
-msgstr "Atenció"
+msgstr "Atenció"

-#: ../../WINGs/wcolorpanel.c:3257
+#: ../../WINGs/wcolorpanel.c:3262
 msgid ""
 "Palette already exists !\n"
 "\n"
 "Overwrite ?"
 msgstr ""
-"La paleta existeix!\n"
+"Ja existia una paleta amb aquest nom!\n"
 "\n"
 "La voleu sobreescriure?"

-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
 msgid "No"
 msgstr "No"

-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
 msgid "Yes"
-msgstr "Sí"
+msgstr "Sí"

-#: ../../WINGs/wcolorpanel.c:3289
+#: ../../WINGs/wcolorpanel.c:3294
 #, c-format
 msgid "Couldn't rename palette %s to %s\n"
-msgstr "No s'ha pogut reanomenar la paleta %s a %s\n"
+msgstr "No s'ha pogut reanomenar la paleta %s com a %s\n"

-#: ../../WINGs/wcolorpanel.c:3315
+#: ../../WINGs/wcolorpanel.c:3320
 msgid "This will permanently remove the palette "
-msgstr "Això eliminarà la paleta per sempre "
+msgstr "Això eliminarà la paleta per sempre "

-#: ../../WINGs/wcolorpanel.c:3318
+#: ../../WINGs/wcolorpanel.c:3323
 msgid ""
 ".\n"
 "\n"
@@ -429,27 +431,27 @@ msgstr ""
 "\n"
 "Esteu segurs que voleu eliminar aquesta paleta?"

-#: ../../WINGs/wcolorpanel.c:3343
+#: ../../WINGs/wcolorpanel.c:3348
 #, c-format
 msgid "Couldn't remove palette %s\n"
 msgstr "No s'ha pogut eliminar la paleta %s\n"

-#: ../../WINGs/wcolorpanel.c:3648
+#: ../../WINGs/wcolorpanel.c:3647
 #, c-format
 msgid "Could not open %s"
 msgstr "No s'ha pogut obrir %s"

-#: ../../WINGs/wcolorpanel.c:3655
+#: ../../WINGs/wcolorpanel.c:3654
 #, c-format
 msgid "Could not create %s"
 msgstr "No s'ha pogut crear %s"

-#: ../../WINGs/wcolorpanel.c:3666
+#: ../../WINGs/wcolorpanel.c:3665
 #, c-format
 msgid "Write error on file %s"
 msgstr "Error d'escriptura en el fitxer %s"

-#: ../../WINGs/wcolorpanel.c:3711
+#: ../../WINGs/wcolorpanel.c:3710
 msgid "Color Panel: Color unspecified"
 msgstr "Panell de color: Color no especificat"

@@ -465,211 +467,270 @@ msgstr "Obre"
 msgid "Save"
 msgstr "Desa"

-#: ../../WINGs/wfilepanel.c:562
+#: ../../WINGs/wfilepanel.c:565
 #, c-format
 msgid "WINGs: could not open directory %s\n"
 msgstr "WINGs: no s'ha pogut obrir el directori %s\n"

-#: ../../WINGs/wfilepanel.c:580
+#: ../../WINGs/wfilepanel.c:583
 #, c-format
 msgid "WINGs: could not stat %s\n"
 msgstr "WINGs: no s'ha pogut determinar l'estat de %s\n"

-#: ../../WINGs/wfilepanel.c:647 ../../WINGs/wfilepanel.c:970
-#: ../../WINGs/wfontpanel.c:708
+#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
+#: ../../WINGs/wfontpanel.c:750
 msgid "Error"
 msgstr "Error"

-#: ../../WINGs/wfilepanel.c:658
+# és el nom d'un quadre de diàleg. eac
+#: ../../WINGs/wfilepanel.c:661
 msgid "Create Directory"
 msgstr "Crear directori"

-#: ../../WINGs/wfilepanel.c:659
+#: ../../WINGs/wfilepanel.c:662
 msgid "Enter directory name"
 msgstr "Entreu el nom del directori"

-#: ../../WINGs/wfilepanel.c:695 ../../WINGs/wfilepanel.c:734
-#: ../../WINGs/wfilepanel.c:765 ../../WINGs/wfilepanel.c:793
+#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
+#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
 msgid "Permission denied."
-msgstr "Permís denegat."
-
-#: ../../WINGs/wfilepanel.c:698
-#, c-format
-msgid "'%s' already exists."
-msgstr "\"%s\" existia prèviament."
+msgstr "Permís denegat."

 #: ../../WINGs/wfilepanel.c:701
-msgid "Path does not exist."
-msgstr "El camí no existeix."
+#, c-format
+msgid "'%s' already exists."
+msgstr "\"%s\" existia prèviament."

-#: ../../WINGs/wfilepanel.c:731 ../../WINGs/wfilepanel.c:790
+#: ../../WINGs/wfilepanel.c:704
+msgid "Path does not exist."
+msgstr "L'ubicació no existeix."
+
+#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793
 #, c-format
 msgid "'%s' does not exist."
 msgstr "\"%s\" no existeix."

-#: ../../WINGs/wfilepanel.c:738 ../../WINGs/wfilepanel.c:797
+#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
 msgid "Insufficient memory available."
-msgstr "No hi ha prou memòria disponible."
+msgstr "No hi ha prou memòria disponible."

-#: ../../WINGs/wfilepanel.c:742 ../../WINGs/wfilepanel.c:801
+#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
 #, c-format
 msgid "'%s' is on a read-only filesystem."
-msgstr "\"%s\" es troba en un sistema de fitxers de només lectura."
+msgstr "\"%s\" es troba en un sistema de fitxers de només lectura."

-#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:777
-#: ../../WINGs/wfilepanel.c:804
+#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
+#: ../../WINGs/wfilepanel.c:807
 #, c-format
 msgid "Can not delete '%s'."
 msgstr "No s'ha pogut eliminar \"%s\"."

-#: ../../WINGs/wfilepanel.c:752
+#: ../../WINGs/wfilepanel.c:755
 #, c-format
 msgid "Delete directory %s ?"
-msgstr "Eliminar el directori %s ?"
+msgstr "Voleu eliminar el directori %s ?"

-#: ../../WINGs/wfilepanel.c:756
+#: ../../WINGs/wfilepanel.c:759
 #, c-format
 msgid "Delete file %s ?"
-msgstr "Eliminar el fitxer %s ?"
+msgstr "Voleu eliminar el fitxer %s ?"

-#: ../../WINGs/wfilepanel.c:768
+#: ../../WINGs/wfilepanel.c:771
 #, c-format
 msgid "Directory '%s' does not exist."
 msgstr "El directori \"%s\" no existeix."

-#: ../../WINGs/wfilepanel.c:771
+#: ../../WINGs/wfilepanel.c:774
 #, c-format
 msgid "Directory '%s' is not empty."
-msgstr "El directori \"%s\" no està buit."
+msgstr "El directori \"%s\" no està buit."

-#: ../../WINGs/wfilepanel.c:774
+#: ../../WINGs/wfilepanel.c:777
 #, c-format
 msgid "Directory '%s' is busy."
 msgstr "El directori \"%s\" es troba ocupat."

-#: ../../WINGs/wfilepanel.c:787
+#: ../../WINGs/wfilepanel.c:790
 #, c-format
 msgid "'%s' is a directory."
-msgstr "\"%s\" és un directori."
+msgstr "\"%s\" és un directori."

-#: ../../WINGs/wfilepanel.c:829
+#: ../../WINGs/wfilepanel.c:832
 #, c-format
 msgid "An error occured browsing '%s'."
-msgstr "S'ha produït un error mentre s'explorava \"%s\"."
+msgstr "S'ha produït un error mentre s'explorava \"%s\"."

-#: ../../WINGs/wfilepanel.c:833
+#: ../../WINGs/wfilepanel.c:836
 #, c-format
 msgid "'%s' is not a directory."
-msgstr "\"%s\" no és un directori."
+msgstr "\"%s\" no és un directori."

-#: ../../WINGs/wfilepanel.c:970
+#: ../../WINGs/wfilepanel.c:973
 msgid "File does not exist."
 msgstr "El fitxer no existeix."

-#: ../../WINGs/wfont.c:129
+#: ../../WINGs/wfont.c:324 ../../WINGs/wfont.c:344
+#, c-format
+msgid "could not load font %s."
+msgstr "no s'ha pogut carregar el tipus de lletra %s."
+
+#: ../../WINGs/wfont.c:375 ../../WINGs/wfont.c:420 ../../WINGs/wfont.c:475
+#: ../../WINGs/wfont.c:1337 ../../WINGs/wfont.c:1398 ../../WINGs/wfont.c:1469
+#, c-format
+msgid ""
+"Conversion to widechar failed (possible invalid multibyte sequence): '%s':"
+"(pos %d)\n"
+msgstr ""
+"Ha fallat la conversió a caràcter estès (possible seqüència no vàlida): '%"
+"s': (pos %d)\n"
+
+#. // remove warning later. or maybe not
+#: ../../WINGs/wfont.c:591 ../../WINGs/wfont.c:1568
+#, c-format
+msgid "Invalid font specification: '%s'\n"
+msgstr "Especificació de font no vàlida: \"%s\"\n"
+
+#: ../../WINGs/wfont.c:770 ../../WINGs/wfont.c:780
+#, c-format
+msgid "Invalid size specification '%s' in %s. Using default %d\n"
+msgstr ""
+"La mida \"%s\" especificada a %s no és vàlida. S'usa el valor per omissió %"
+"d\n"
+
+#: ../../WINGs/wfont.c:824
 #, c-format
 msgid "the following character sets are missing in %s:"
-msgstr "els següents conjunts de caràcters falten a %s:"
+msgstr "els següents conjunts de caràcters falten a %s:"

-#: ../../WINGs/wfont.c:136
+#: ../../WINGs/wfont.c:830
 #, c-format
 msgid ""
 "the string \"%s\" will be used in place of any characters from those sets."
 msgstr ""
-"la cadena \"%s\" s'usarà en lloc dels caràcters d'aquests conjunts de "
-"caràcters."
+"la cadena \"%s\" s'usarà en lloc dels caràcters d'aquests conjunts de "
+"caràcters."

-#: ../../WINGs/wfont.c:300 ../../WINGs/wfont.c:336
+#. is arial a good fallback for multibyte?
+#: ../../WINGs/wfont.c:1232 ../../WINGs/wfont.c:1247
 #, c-format
-msgid "could not load font set %s. Trying fixed."
+msgid "could not load font %s. Trying arial."
+msgstr "no s'ha pogut carregar el tipus de lletra %s. Provant amb \"arial\"."
+
+#: ../../WINGs/wfont.c:1239
+msgid "could not load antialiased font set. Reverting to standard font sets."
+msgstr ""
+"no s'ha pogut carregar el conjunt de fonts amb allisat. S'usarà l'estàndard."
+
+#: ../../WINGs/wfont.c:1242
+#, c-format
+msgid "could not load FontSet %s. Trying fixed."
 msgstr "no s'ha pogut carregar el tipus de lletra %s. Provant amb \"fixed\"."

-#: ../../WINGs/wfont.c:306 ../../WINGs/wfont.c:342
+#: ../../WINGs/wfont.c:1254
+msgid "could not load antialiased fonts. Reverting to normal fonts."
+msgstr "no s'han pogut carregar fonts allisades. S'usaran fonts normals."
+
+#: ../../WINGs/wfont.c:1257 ../../WINGs/wfont.c:1268
 #, c-format
 msgid "could not load font %s. Trying fixed."
-msgstr "no s'ha pogut carregar el tipus de lletra %s. Provant amb \"fixed\"."
+msgstr "no s'ha pogut carregar la font %s. Provant amb \"fixed\"."

-#: ../../WINGs/wfont.c:310 ../../WINGs/wfont.c:346
+#: ../../WINGs/wfont.c:1262
+#, c-format
+msgid "could not load font set %s. Trying fixed."
+msgstr "no s'ha pogut carregar el conjunt de fonts %s. Provant amb \"fixed\"."
+
+#: ../../WINGs/wfont.c:1272
 msgid "could not load fixed font!"
 msgstr "no s'ha pogut carregar el tipus de lletra \"fixed\" !"

-#: ../../WINGs/wfont.c:441
+#: ../../WINGs/wfont.c:1520
 #, c-format
 msgid "font description %s is too large."
-msgstr "la descripció de tipus de lletra %s és massa gran."
+msgstr "la descripció de tipus de lletra %s és massa gran."

-#: ../../WINGs/wfontpanel.c:205
+#: ../../WINGs/wfontpanel.c:235
 msgid "Test!!!"
 msgstr "Prova!!!"

-#: ../../WINGs/wfontpanel.c:211
+#: ../../WINGs/wfontpanel.c:241
 msgid "Family"
 msgstr "Familia"

-#: ../../WINGs/wfontpanel.c:222
+#: ../../WINGs/wfontpanel.c:252
 msgid "Typeface"
 msgstr "Fosa"

-#: ../../WINGs/wfontpanel.c:233
+#: ../../WINGs/wfontpanel.c:263
 msgid "Size"
 msgstr "Mida"

-#: ../../WINGs/wfontpanel.c:252
+#: ../../WINGs/wfontpanel.c:282
 msgid "Set"
 msgstr "Conjunt"

-#: ../../WINGs/wfontpanel.c:257
+#: ../../WINGs/wfontpanel.c:288
 msgid "Revert"
 msgstr "Torna"

-#: ../../WINGs/wfontpanel.c:709
+#: ../../WINGs/wfontpanel.c:751
 msgid "Could not retrieve font list"
 msgstr "No s'ha pogut obtenir la llista de tipus de lletra"

-#: ../../WINGs/wfontpanel.c:721
+#: ../../WINGs/wfontpanel.c:765
 #, c-format
 msgid "font name %s is longer than 256, which is invalid."
 msgstr ""
-"el nom de tipus de lletra %s ocupa més de 256 caràcters, per tant no és "
-"vàlid."
+"el nom de tipus de lletra %s ocupa més de 256 caràcters, per tant no és "
+"vàlid."

-#: ../../WINGs/wfontpanel.c:868
+#: ../../WINGs/wfontpanel.c:913
 msgid "Roman"
 msgstr "Romana"

-#: ../../WINGs/wfontpanel.c:871
+#: ../../WINGs/wfontpanel.c:916
 msgid "Italic"
-msgstr "Itàlica"
+msgstr "Itàlica"

-#: ../../WINGs/wfontpanel.c:873
+#: ../../WINGs/wfontpanel.c:918
 msgid "Oblique"
 msgstr "Obliqua"

-#: ../../WINGs/wfontpanel.c:875
+#: ../../WINGs/wfontpanel.c:920
 msgid "Rev Italic"
-msgstr "Itàlica rev"
+msgstr "Itàlica inv"

-#: ../../WINGs/wfontpanel.c:877
+#: ../../WINGs/wfontpanel.c:922
 msgid "Rev Oblique"
-msgstr "Obliqua rev"
+msgstr "Obliqua inv"

-#: ../../WINGs/wfontpanel.c:883
+#: ../../WINGs/wfontpanel.c:928
 msgid "Normal"
 msgstr "Normal"

-#: ../../WINGs/widgets.c:415
+#: ../../WINGs/widgets.c:419
 #, c-format
 msgid "WINGs: could not load widget images file: %s"
-msgstr "WINGs: no s'ha pogut carregar el fitxer d'imatges dels elements: %s"
+msgstr "WINGs: no s'ha pogut carregar el fitxer d'imatges: %s"

-#: ../../WINGs/widgets.c:763
+#: ../../WINGs/widgets.c:772
 msgid ""
 "could not load any fonts. Make sure your font installation and locale "
 "settings are correct."
 msgstr ""
-"no s'ha pogut carregar cap font. Assegureu-vos que l'instal·lació dels tipus "
-"de lletra i la configuració del local és adquada."
+"no s'ha pogut carregar cap font. Assegureu-vos que heu instal·lat i "
+"configurat correctament les fonts i el local."

-#: ../../WINGs/wruler.c:189
+#: ../../WINGs/wruler.c:192
 msgid "0   inches"
 msgstr "0   polzades"
+
+#~ msgid ""
+#~ "Text antialiasing is enabled in the configuration but the X server "
+#~ "doesn't have the required capabilities (missing RENDER extension). "
+#~ "Disabling text antialiasing."
+#~ msgstr ""
+#~ "L'allisat de text està habilitat a la configuració però el servidor X no\n"
+#~ "té la capacitat necessària (falta l'extensió RENDER) de manera que "
+#~ "l'allisat\n"
+#~ "de text es deshabilitarà."
--- a/WINGs/po/cs.po
+++ b/WINGs/po/cs.po
@@ -1,66 +1,66 @@
 # Czech messages for WINGs
-# (C) 2001 Jiøí Hnídek
+# (C) 2001 Jiří Hnídek
 # Special thanks to Jan "judas" Tomka
 #
-# Original translation by Jiøí Hnídek on Oct 11 2001
-# Currently maintained by Jiøí Hnídek <jiri.hnidek@vslib.cz>
+# Original translation by Jiří Hnídek on Oct 11 2001
+# Currently maintained by Jiří Hnídek <jiri.hnidek@vslib.cz>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: WINGs 0.70.0\n"
 "POT-Creation-Date: 2001-10-11 19:10+0100\n"
 "PO-Revision-Date: 2001-10-11 22:00+0100\n"
-"Last-Translator: Jiøí Hnídek <jiri.hnidek@vslib.cz>\n"
+"Last-Translator: Jiří Hnídek <jiri.hnidek@vslib.cz>\n"
 "Language-Team: Czech <cz@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: unknown\n"

 #: ../../WINGs/connection.c:451 ../../WINGs/connection.c:516
 #: ../../WINGs/connection.c:559
 msgid "Bad address-service-protocol combination"
-msgstr "Nesprávná kombinace adresa-slu¾ba-protokol"
+msgstr "Nesprávná kombinace adresa-služba-protokol"

 #: ../../WINGs/dragsource.c:541
 msgid "DND selection lost during drag operation..."
-msgstr "DND výbìr se ztratil bìhem opere táhnutí..."
+msgstr "DND výběr se ztratil během opere táhnutí..."

 #: ../../WINGs/dragsource.c:610
 #, c-format
 msgid "drag & drop timed out while waiting for response from 0x%x\n"
-msgstr "èas pro drag & drop vypr¹el bìhem èekání na odpoveï z 0x%x\n"
+msgstr "čas pro drag & drop vypršel během čekání na odpoveď z 0x%x\n"

 #: ../../WINGs/dragsource.c:728
 msgid "could not get ownership or DND selection"
-msgstr "nemo¾né získat vlastnictví nebo DND výbìr"
+msgstr "nemožné získat vlastnictví nebo DND výběr"

 #: ../../WINGs/dragsource.c:898
 #, c-format
 msgid "drag source received unexpected XdndFinished message from %x"
-msgstr "zdroj tahání pøijal neoèekávanou zprávu XdndFinished z %x"
+msgstr "zdroj tahání přijal neočekávanou zprávu XdndFinished z %x"

 #: ../../WINGs/dragsource.c:1040
 #, c-format
 msgid "unknown XDND action %s from 0x%x"
-msgstr "neznámá XDND akce %s z 0x%x"
+msgstr "neznámá XDND akce %s z 0x%x"

 #: ../../WINGs/dragsource.c:1073
 msgid "received invalid drag & drop type list"
-msgstr "pøijatý nesprávný seznam typù drag & drop"
+msgstr "přijatý nesprávný seznam typů drag & drop"

 #: ../../WINGs/dragsource.c:1161
 msgid "received Enter event in bad order"
-msgstr "pøijatá událost Enter v nesprávném poøadí"
+msgstr "přijatá událost Enter v nesprávném pořadí"

 #: ../../WINGs/dragsource.c:1168
 #, c-format
 msgid "received drag & drop request with unsupported version %i"
-msgstr "pøijatý po¾adavek drag & drop s nepodporovanou verzí %i"
+msgstr "přijatý požadavek drag & drop s nepodporovanou verzí %i"

 #: ../../WINGs/error.c:56
 #, c-format
 msgid "Unknown error %d"
-msgstr "Neznámá chyba %d"
+msgstr "Neznámá chyba %d"

 #: ../../WINGs/error.c:61
 #, c-format
@@ -69,11 +69,11 @@ msgstr "Chyba %d"

 #: ../../WINGs/error.c:112
 msgid " warning: "
-msgstr " varovíní: "
+msgstr " varovíní: "

 #: ../../WINGs/error.c:139
 msgid " fatal error: "
-msgstr " fatální chyba: "
+msgstr " fatální chyba: "

 #: ../../WINGs/error.c:165 ../../WINGs/error.c:194
 msgid " error: "
@@ -82,76 +82,76 @@ msgstr " chyba: "
 #: ../../WINGs/findfile.c:50
 #, c-format
 msgid "could not get password entry for UID %i"
-msgstr "nemo¾né zjistit informaci o UID %i"
+msgstr "nemožné zjistit informaci o UID %i"

 #: ../../WINGs/findfile.c:68
 #, c-format
 msgid "could not get password entry for user %s"
-msgstr "nemo¾né zjistit informaci o u¾ivatelovi %s"
+msgstr "nemožné zjistit informaci o uživatelovi %s"

 #: ../../WINGs/hashtable.c:275
 msgid "rebuilding hash table...\n"
-msgstr "pøepis tabulky hashovských funkcí...\n"
+msgstr "přepis tabulky hashovských funkcí...\n"

 #: ../../WINGs/hashtable.c:279
 msgid "finished rebuild.\n"
-msgstr "konec pøepisu.\n"
+msgstr "konec přepisu.\n"

 #: ../../WINGs/host.c:116
 msgid "Cannot get current host name"
-msgstr "Nemo¾né zjistit aktuální jméno poèítaèe"
+msgstr "Nemožné zjistit aktuální jméno počítače"

 #: ../../WINGs/memory.c:94
 msgid "malloc() failed. Retrying after 2s."
-msgstr "chyba malloc(). Nový pokus o 2s."
+msgstr "chyba malloc(). Nový pokus o 2s."

 #: ../../WINGs/memory.c:103
 msgid "Really Bad Error: recursive malloc() failure."
-msgstr "Skuteènì o¹klivá chyba: rekurzivní chyba malloc()."
+msgstr "Skutečně ošklivá chyba: rekurzivní chyba malloc()."

 #: ../../WINGs/memory.c:106 ../../WINGs/memory.c:146
 msgid "virtual memory exhausted"
-msgstr "virtuální pamì» vyèerpaná"
+msgstr "virtuální paměť vyčerpaná"

 #: ../../WINGs/memory.c:133
 msgid "realloc() failed. Retrying after 2s."
-msgstr "chyba realloc(). Nový pokus o 2s."
+msgstr "chyba realloc(). Nový pokus o 2s."

 #: ../../WINGs/memory.c:142
 msgid "Really Bad Error: recursive realloc() failure."
-msgstr "Skuteènì o¹klivá chyba: rekurzivní chyba realloc()."
+msgstr "Skutečně ošklivá chyba: rekurzivní chyba realloc()."

 #: ../../WINGs/memory.c:205
 #, c-format
 msgid "trying to release unexisting data %p"
-msgstr "pokus uvolnit neexistujícá data %p"
+msgstr "pokus uvolnit neexistujícá data %p"

 #: ../../WINGs/memory.c:210
 #, c-format
 msgid "RELEASING %p\n"
-msgstr "UVOLNÌNÍ %p\n"
+msgstr "UVOLNĚNÍ %p\n"

 #: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
 #: ../../WINGs/wcolor.c:291
 #, c-format
 msgid "could not allocate %s color"
-msgstr "nemo¾né alokovat %s barvu"
+msgstr "nemožné alokovat %s barvu"

 #: ../../WINGs/wcolor.c:198
 msgid "white"
-msgstr "bílou"
+msgstr "bílou"

 #: ../../WINGs/wcolor.c:211
 msgid "black"
-msgstr "èernou"
+msgstr "černou"

 #: ../../WINGs/wcolor.c:250
 msgid "gray"
-msgstr "¹edou"
+msgstr "šedou"

 #: ../../WINGs/wcolor.c:291
 msgid "dark gray"
-msgstr "tmavì ¹edou"
+msgstr "tmavě šedou"

 #: ../../WINGs/wcolorpanel.c:410
 msgid "Colors"
@@ -159,7 +159,7 @@ msgstr "Barvy"

 #: ../../WINGs/wcolorpanel.c:600 ../../WINGs/wcolorpanel.c:2819
 msgid "Brightness"
-msgstr "Svìtlost"
+msgstr "Světlost"

 #: ../../WINGs/wcolorpanel.c:602 ../../WINGs/wcolorpanel.c:678
 #: ../../WINGs/wcolorpanel.c:711 ../../WINGs/wcolorpanel.c:745
@@ -169,19 +169,19 @@ msgstr "Sv
 #: ../../WINGs/wcolorpanel.c:2857 ../../WINGs/wcolorpanel.c:2893
 #: ../../WINGs/wcolorpanel.c:3741
 msgid "Color Panel: Could not allocate memory"
-msgstr "Panel barev: Nemo¾né alokovat pamì»"
+msgstr "Panel barev: Nemožné alokovat paměť"

 #: ../../WINGs/wcolorpanel.c:675 ../../WINGs/wcolorpanel.c:676
 msgid "Red"
-msgstr "Èervená"
+msgstr "Červená"

 #: ../../WINGs/wcolorpanel.c:708 ../../WINGs/wcolorpanel.c:709
 msgid "Green"
-msgstr "Zelená"
+msgstr "Zelená"

 #: ../../WINGs/wcolorpanel.c:742 ../../WINGs/wcolorpanel.c:743
 msgid "Blue"
-msgstr "Modrá"
+msgstr "Modrá"

 #: ../../WINGs/wcolorpanel.c:802 ../../WINGs/wcolorpanel.c:803
 msgid "Cyan"
@@ -193,11 +193,11 @@ msgstr ""

 #: ../../WINGs/wcolorpanel.c:870 ../../WINGs/wcolorpanel.c:871
 msgid "Yellow"
-msgstr "®lutá"
+msgstr "Žlutá"

 #: ../../WINGs/wcolorpanel.c:905 ../../WINGs/wcolorpanel.c:906
 msgid "Black"
-msgstr "Èerná"
+msgstr "Černá"

 #: ../../WINGs/wcolorpanel.c:986
 msgid "Spectrum"
@@ -209,12 +209,12 @@ msgstr "Paleta"

 #: ../../WINGs/wcolorpanel.c:1022
 msgid "New from File..."
-msgstr "Nová ze souboru..."
+msgstr "Nová ze souboru..."

 #: ../../WINGs/wcolorpanel.c:1023 ../../WINGs/wcolorpanel.c:1071
 #: ../../WINGs/wcolorpanel.c:1088
 msgid "Rename..."
-msgstr "Pøejmenovat..."
+msgstr "Přejmenovat..."

 #: ../../WINGs/wcolorpanel.c:1024 ../../WINGs/wcolorpanel.c:1072
 #: ../../WINGs/wcolorpanel.c:1089 ../../WINGs/wcolorpanel.c:3316
@@ -223,11 +223,11 @@ msgstr "Odstranit"

 #: ../../WINGs/wcolorpanel.c:1025
 msgid "Copy"
-msgstr "Kopírovat"
+msgstr "Kopírovat"

 #: ../../WINGs/wcolorpanel.c:1026
 msgid "New from Clipboard"
-msgstr "Nová ze schránky"
+msgstr "Nová ze schránky"

 #: ../../WINGs/wcolorpanel.c:1047
 msgid "X11-Colors"
@@ -239,7 +239,7 @@ msgstr "Barva"

 #: ../../WINGs/wcolorpanel.c:1070
 msgid "Add..."
-msgstr "Pøidat..."
+msgstr "Přidat..."

 #: ../../WINGs/wcolorpanel.c:1080
 msgid "List"
@@ -247,14 +247,14 @@ msgstr "Seznam"

 #: ../../WINGs/wcolorpanel.c:1087
 msgid "New..."
-msgstr "Nový..."
+msgstr "Nový..."

 #: ../../WINGs/wcolorpanel.c:1226
 #, c-format
 msgid ""
 "Color Panel: Could not create directory %s needed to store configurations"
 msgstr ""
-"Panel barev: Nemo¾né vytvoøit adresáø %s potøebný k ulo¾ení nastavení"
+"Panel barev: Nemožné vytvořit adresář %s potřebný k uložení nastavení"

 #. Delete the file, it doesn't belong here
 #: ../../WINGs/wcolorpanel.c:1232 ../../WINGs/wcolorpanel.c:3202
@@ -264,7 +264,7 @@ msgstr "Chyba souboru"

 #: ../../WINGs/wcolorpanel.c:1233
 msgid "Could not create ColorPanel configuration directory"
-msgstr "Nemo¾né vytvoøit konfiguraèní adresáø panelu barev"
+msgstr "Nemožné vytvořit konfigurační adresář panelu barev"

 #: ../../WINGs/wcolorpanel.c:1234 ../../WINGs/wcolorpanel.c:3203
 #: ../../WINGs/wcolorpanel.c:3208 ../../WINGs/wcolorpanel.c:3235
@@ -277,12 +277,12 @@ msgstr "OK"
 #: ../../WINGs/wcolorpanel.c:1240 ../../WINGs/wcolorpanel.c:1276
 #: ../../WINGs/wcolorpanel.c:1294
 msgid "Color Panel: Could not find file"
-msgstr "Panel barev: Nemo¾né nalézt soubor"
+msgstr "Panel barev: Nemožné nalézt soubor"

 #: ../../WINGs/wcolorpanel.c:1481 ../../WINGs/wcolorpanel.c:1546
 #: ../../WINGs/wcolorpanel.c:1610
 msgid "Color Panel: X failed request"
-msgstr "Panel barev: chyba po¾adavku X"
+msgstr "Panel barev: chyba požadavku X"

 #: ../../WINGs/wcolorpanel.c:2855
 msgid "Saturation"
@@ -290,42 +290,42 @@ msgstr "Saturace"

 #: ../../WINGs/wcolorpanel.c:2891
 msgid "Hue"
-msgstr "Odteï"
+msgstr "Odteď"

 #: ../../WINGs/wcolorpanel.c:3141
 msgid "Open Palette"
-msgstr "Otevøít paletu"
+msgstr "Otevřít paletu"

 #: ../../WINGs/wcolorpanel.c:3203
 msgid "Invalid file format !"
-msgstr "Nesprávný souborový formát!"
+msgstr "Nesprávný souborový formát!"

 #: ../../WINGs/wcolorpanel.c:3205
 #, c-format
 msgid "can't remove file %s"
-msgstr "nemo¾né odstranit soubor %s"
+msgstr "nemožné odstranit soubor %s"

 #: ../../WINGs/wcolorpanel.c:3207
 msgid "Couldn't remove file from Configuration Directory !"
-msgstr "Nemo¾né odstranit soubor z konfiguraèního adresáøe!"
+msgstr "Nemožné odstranit soubor z konfiguračního adresáře!"

 #: ../../WINGs/wcolorpanel.c:3234
 msgid "Rename"
-msgstr "Pøejmenovat"
+msgstr "Přejmenovat"

 #: ../../WINGs/wcolorpanel.c:3234
 msgid "Rename palette to:"
-msgstr "Pøejmenovat paletu:"
+msgstr "Přejmenovat paletu:"

 #: ../../WINGs/wcolorpanel.c:3235 ../../WINGs/wfilepanel.c:252
 #: ../../WINGs/wfilepanel.c:653 ../../WINGs/wfilepanel.c:752
 msgid "Cancel"
-msgstr "Zru¹it"
+msgstr "Zrušit"

 #. Careful, this palette exists already
 #: ../../WINGs/wcolorpanel.c:3251 ../../WINGs/wfilepanel.c:752
 msgid "Warning"
-msgstr "Varování"
+msgstr "Varování"

 #: ../../WINGs/wcolorpanel.c:3252
 msgid ""
@@ -333,9 +333,9 @@ msgid ""
 "\n"
 "Overwrite ?"
 msgstr ""
-"Paleta u¾ existuje!\n"
+"Paleta už existuje!\n"
 "\n"
-"Pøepsat?"
+"Přepsat?"

 #: ../../WINGs/wcolorpanel.c:3252 ../../WINGs/wcolorpanel.c:3316
 msgid "No"
@@ -348,11 +348,11 @@ msgstr "Ano"
 #: ../../WINGs/wcolorpanel.c:3284
 #, c-format
 msgid "Couldn't rename palette %s to %s\n"
-msgstr "Nemo¾né pøejmenovat paletu %s na %s\n"
+msgstr "Nemožné přejmenovat paletu %s na %s\n"

 #: ../../WINGs/wcolorpanel.c:3310
 msgid "This will permanently remove the palette "
-msgstr "Paleta bude natrvalo smazaná"
+msgstr "Paleta bude natrvalo smazaná"

 #: ../../WINGs/wcolorpanel.c:3313
 msgid ""
@@ -362,53 +362,53 @@ msgid ""
 msgstr ""
 ".\n"
 "\n"
-"Jste si jisti, ¾e chcete odstranit tuto paletu?"
+"Jste si jisti, že chcete odstranit tuto paletu?"

 #: ../../WINGs/wcolorpanel.c:3338
 #, c-format
 msgid "Couldn't remove palette %s\n"
-msgstr "Nemo¾né odstranit paletu %s\n"
+msgstr "Nemožné odstranit paletu %s\n"

 #: ../../WINGs/wcolorpanel.c:3643
 #, c-format
 msgid "Could not open %s"
-msgstr "Nemo¾né otevøít %s"
+msgstr "Nemožné otevřít %s"

 #: ../../WINGs/wcolorpanel.c:3650
 #, c-format
 msgid "Could not create %s"
-msgstr "Nemo¾né vytvoøit %s"
+msgstr "Nemožné vytvořit %s"

 #: ../../WINGs/wcolorpanel.c:3661
 #, c-format
 msgid "Write error on file %s"
-msgstr "Chyba pøi zápisu do souboru %s"
+msgstr "Chyba při zápisu do souboru %s"

 #: ../../WINGs/wcolorpanel.c:3706
 msgid "Color Panel: Color unspecified"
-msgstr "Panel barev: Nespecifikovaná barva"
+msgstr "Panel barev: Nespecifikovaná barva"

 #: ../../WINGs/wfilepanel.c:228
 msgid "Name:"
-msgstr "Jméno:"
+msgstr "Jméno:"

 #: ../../WINGs/wfilepanel.c:325 ../../WINGs/wfilepanel.c:390
 msgid "Open"
-msgstr "Otevøít"
+msgstr "Otevřít"

 #: ../../WINGs/wfilepanel.c:343 ../../WINGs/wfilepanel.c:396
 msgid "Save"
-msgstr "Ulo¾it"
+msgstr "Uložit"

 #: ../../WINGs/wfilepanel.c:556
 #, c-format
 msgid "WINGs: could not open directory %s\n"
-msgstr "WINGs: nemo¾né otevøít adresáø %s\n"
+msgstr "WINGs: nemožné otevřít adresář %s\n"

 #: ../../WINGs/wfilepanel.c:574
 #, c-format
 msgid "WINGs: could not stat %s\n"
-msgstr "WINGs: nemo¾né zjistit informace o %s\n"
+msgstr "WINGs: nemožné zjistit informace o %s\n"

 #: ../../WINGs/wfilepanel.c:641 ../../WINGs/wfilepanel.c:962
 #: ../../WINGs/wfontpanel.c:716
@@ -417,21 +417,21 @@ msgstr "Chyba"

 #: ../../WINGs/wfilepanel.c:652
 msgid "Create Directory"
-msgstr "Vytvoøit adresáø"
+msgstr "Vytvořit adresář"

 #: ../../WINGs/wfilepanel.c:653
 msgid "Enter directory name"
-msgstr "Jméno adresáøe"
+msgstr "Jméno adresáře"

 #: ../../WINGs/wfilepanel.c:689 ../../WINGs/wfilepanel.c:728
 #: ../../WINGs/wfilepanel.c:757 ../../WINGs/wfilepanel.c:785
 msgid "Permission denied."
-msgstr "Pøístup odmítnut."
+msgstr "Přístup odmítnut."

 #: ../../WINGs/wfilepanel.c:692
 #, c-format
 msgid "'%s' already exists."
-msgstr "'%s' u¾ existuje"
+msgstr "'%s' už existuje"

 #: ../../WINGs/wfilepanel.c:695
 msgid "Path does not exist."
@@ -444,23 +444,23 @@ msgstr "'%s' neexistuje."

 #: ../../WINGs/wfilepanel.c:732 ../../WINGs/wfilepanel.c:789
 msgid "Insufficient memory available."
-msgstr "Nedostatek pamìti."
+msgstr "Nedostatek paměti."

 #: ../../WINGs/wfilepanel.c:736 ../../WINGs/wfilepanel.c:793
 #, c-format
 msgid "'%s' is on a read-only filesystem."
-msgstr "'%s' je na souborovém systému jen pro ètení."
+msgstr "'%s' je na souborovém systému jen pro čtení."

 #: ../../WINGs/wfilepanel.c:739 ../../WINGs/wfilepanel.c:769
 #: ../../WINGs/wfilepanel.c:796
 #, c-format
 msgid "Can not delete '%s'."
-msgstr "Nemo¾né odstranit '%s'."
+msgstr "Nemožné odstranit '%s'."

 #: ../../WINGs/wfilepanel.c:745
 #, c-format
 msgid "Delete directory %s ?"
-msgstr "Odstranit adresáø %s?"
+msgstr "Odstranit adresář %s?"

 #: ../../WINGs/wfilepanel.c:748
 #, c-format
@@ -470,32 +470,32 @@ msgstr "Odstranit soubor %s?"
 #: ../../WINGs/wfilepanel.c:760
 #, c-format
 msgid "Directory '%s' does not exist."
-msgstr "Adresáø '%s' neexistuje."
+msgstr "Adresář '%s' neexistuje."

 #: ../../WINGs/wfilepanel.c:763
 #, c-format
 msgid "Directory '%s' is not empty."
-msgstr "Adresáø '%s' není prázdný."
+msgstr "Adresář '%s' není prázdný."

 #: ../../WINGs/wfilepanel.c:766
 #, c-format
 msgid "Directory '%s' is busy."
-msgstr "Adresáø '%s' je pou¾ívaný."
+msgstr "Adresář '%s' je používaný."

 #: ../../WINGs/wfilepanel.c:779
 #, c-format
 msgid "'%s' is a directory."
-msgstr "'%s' je adresáø."
+msgstr "'%s' je adresář."

 #: ../../WINGs/wfilepanel.c:821
 #, c-format
 msgid "An error occured browsing '%s'."
-msgstr "Pøi prohlí¾ení '%s' nastala chyba."
+msgstr "Při prohlížení '%s' nastala chyba."

 #: ../../WINGs/wfilepanel.c:825
 #, c-format
 msgid "'%s' is not a directory."
-msgstr "'%s' není adresáø."
+msgstr "'%s' není adresář."

 #: ../../WINGs/wfilepanel.c:962
 msgid "File does not exist."
@@ -504,37 +504,37 @@ msgstr "Soubor neexistuje."
 #: ../../WINGs/wfont.c:129
 #, c-format
 msgid "the following character sets are missing in %s:"
-msgstr "nasledující sady znakù chybí v %s:"
+msgstr "nasledující sady znaků chybí v %s:"

 #: ../../WINGs/wfont.c:136
 #, c-format
 msgid ""
 "the string \"%s\" will be used in place of any characters from those sets."
 msgstr ""
-"øetìzec \"%s\" bude pou¾itý namísto znakù z tìchto sad."
+"řetězec \"%s\" bude použitý namísto znaků z těchto sad."

 #: ../../WINGs/wfont.c:282 ../../WINGs/wfont.c:318
 #, c-format
 msgid "could not load font set %s. Trying fixed."
-msgstr "nemo¾né naèíst font %s. Zkou¹í se naèíst fixed."
+msgstr "nemožné načíst font %s. Zkouší se načíst fixed."

 #: ../../WINGs/wfont.c:288 ../../WINGs/wfont.c:324
 #, c-format
 msgid "could not load font %s. Trying fixed."
-msgstr "nemo¾no naèíst font %s. Zko¹í se naèíst fixed."
+msgstr "nemožno načíst font %s. Zkoší se načíst fixed."

 #: ../../WINGs/wfont.c:292 ../../WINGs/wfont.c:328
 msgid "could not load fixed font!"
-msgstr "nemo¾né naèíst font fixed!"
+msgstr "nemožné načíst font fixed!"

 #: ../../WINGs/wfont.c:423
 #, c-format
 msgid "font description %s is too large."
-msgstr "popis fontu %s je pøíli¹ velký."
+msgstr "popis fontu %s je příliš velký."

 #: ../../WINGs/wfontpanel.c:205
 msgid "Test!!!"
-msgstr "Zkou¹ka!!!"
+msgstr "Zkouška!!!"

 #: ../../WINGs/wfontpanel.c:211
 msgid "Family"
@@ -554,16 +554,16 @@ msgstr "Sada"

 #: ../../WINGs/wfontpanel.c:257
 msgid "Revert"
-msgstr "Zpìt"
+msgstr "Zpět"

 #: ../../WINGs/wfontpanel.c:717
 msgid "Could not retrieve font list"
-msgstr "Nemo¾né obdr¾et seznam fontù"
+msgstr "Nemožné obdržet seznam fontů"

 #: ../../WINGs/wfontpanel.c:729
 #, c-format
 msgid "font name %s is longer than 256, which is invalid."
-msgstr "jméno fontu %s je del¹í ne¾ 256, co¾ je ¹patnì."
+msgstr "jméno fontu %s je delší než 256, což je špatně."

 #: ../../WINGs/wfontpanel.c:880
 msgid "Roman"
@@ -587,37 +587,37 @@ msgstr ""

 #: ../../WINGs/wfontpanel.c:895
 msgid "Normal"
-msgstr "Normílní"
+msgstr "Normílní"

 #: ../../WINGs/widgets.c:414
 #, c-format
 msgid "WINGs: could not load widget images file: %s"
-msgstr "WINGs: nemo¾né naèíst soubor s obrázky pro widgety: %s"
+msgstr "WINGs: nemožné načíst soubor s obrázky pro widgety: %s"

 #: ../../WINGs/widgets.c:525
 #, c-format
 msgid "WINGs: could not open display %s"
-msgstr "WINGs: nemo¾né otevøít display %s"
+msgstr "WINGs: nemožné otevřít display %s"

 #: ../../WINGs/widgets.c:717
 msgid ""
 "could not load any fonts. Make sure your font installationand locale "
 "settings are correct."
 msgstr ""
-"nemo¾né naèíst ¾ádný font. Ubezpeète se, ¾e instalace fontù a místního "
-"nastavení jsou v poøádku."
+"nemožné načíst žádný font. Ubezpečte se, že instalace fontů a místního "
+"nastavení jsou v pořádku."

 #: ../../WINGs/wruler.c:189
 msgid "0   inches"
-msgstr "0    palcù"
+msgstr "0    palců"

 #: ../../WINGs/wtext.c:1212
 msgid "...for this app will surely crash :-)\n"
-msgstr "...pro tuto aplikaci to urèitì spadne :-)\n"
+msgstr "...pro tuto aplikaci to určitě spadne :-)\n"

 #: ../../WINGs/wtext.c:2084
 msgid "didn't get it\n"
-msgstr "nedosa¾eno\n"
+msgstr "nedosaženo\n"

 #: ../../WINGs/wtext.c:2726
 #, c-format
@@ -626,15 +626,15 @@ msgstr "typ je [%s]\n"

 #: ../../WINGs/wtext.c:2797
 msgid "could not request data for dropped data"
-msgstr "nemohou být vy¾ádána data pro polo¾ená data"
+msgstr "nemohou být vyžádána data pro položená data"

 #: ../../WINGs/wtext.c:2995
 msgid "could not create text's view\n"
-msgstr "nemo¾né zobrazit text\n"
+msgstr "nemožné zobrazit text\n"

 #: ../../WINGs/wview.c:219
 msgid "trying to realize widget of unrealized parent"
-msgstr "snaha vytvoøit widget neexistujícího rodièe objektu"
+msgstr "snaha vytvořit widget neexistujícího rodiče objektu"

 #: ../../WINGs/wview.c:267
 msgid "trying to reparent realized view to unrealized parent"
@@ -642,22 +642,22 @@ msgstr ""

 #: ../../WINGs/wtextfield.c:490
 msgid "only left alignment is supported in textfields"
-msgstr "pro textové pole je povolené jen levé zarovnání"
+msgstr "pro textové pole je povolené jen levé zarovnání"

 #pozor, co je STRING?
 #: ../../WINGs/wwindow.c:222
 msgid "window title conversion error... using STRING encoding"
-msgstr "chyba konverze titulku okna... pou¾ije se kódovaní STRING"
+msgstr "chyba konverze titulku okna... použije se kódovaní STRING"

 #: ../../WINGs/wwindow.c:313
 msgid "could not allocate memory for window size hints"
-msgstr "nemo¾né alokovat pamì» pro pokyny velikosti okna"
+msgstr "nemožné alokovat paměť pro pokyny velikosti okna"

 #: ../../WINGs/wwindow.c:586
 msgid "could not allocate memory for WM hints"
-msgstr "nemo¾né alokovat pamì» pro pokyny WM"
+msgstr "nemožné alokovat paměť pro pokyny WM"

 #: ../../WINGs/wwindow.c:627
 msgid "icon title conversion error..using STRING encoding"
-msgstr "chyba konverze titulku ikony... pou¾ije se kódovaní STRING"
+msgstr "chyba konverze titulku ikony... použije se kódovaní STRING"

--- a/WINGs/po/de.po
+++ b/WINGs/po/de.po
@@ -1,24 +1,28 @@
-# KTranslator Generated File
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
+# German Message Catalog for WINGs
+#
+# Initial translation
+#   Gudio Scholz <guido.scholz@bayernline.de>
+# 
+# Adapted to versions 0.80 ff.
+#   Torsten Marek <shlomme@gmx.net>
+# 
+
 msgid ""
 msgstr ""
-"Project-Id-Version: WINGs 0.80.0\n"
-"POT-Creation-Date: 2002-01-09 21:06+0100\n"
-"PO-Revision-Date: 2002-01-09 21:20+0100\n"
-"Last-Translator: Guido Scholz <guido.scholz@bayernline.de>\n"
-"Language-Team: Deutsch <de@li.org>\n"
+"Project-Id-Version: WINGs\n"
+"POT-Creation-Date: 2004-11-01 16:24+0100\n"
+"PO-Revision-Date: 2004-11-05 23:48+0100\n"
+"Last-Translator: shlomme@gmx.net\n"
+"Language-Team: German\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: unknown\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"

-#: ../../WINGs/connection.c:461 ../../WINGs/connection.c:526
-#: ../../WINGs/connection.c:569
+#: ../../WINGs/connection.c:471 ../../WINGs/connection.c:536
+#: ../../WINGs/connection.c:579
 msgid "Bad address-service-protocol combination"
-msgstr "Ungültige Adress-Dienst-Protokoll Kombination"
+msgstr "Ungültige Kombination von Adresse und Dienstprotokoll"

 #: ../../WINGs/error.c:54
 #, c-format
@@ -45,346 +49,349 @@ msgstr " Fehler: "
 #: ../../WINGs/findfile.c:48
 #, c-format
 msgid "could not get password entry for UID %i"
-msgstr "konnte Passwort nicht ermitteln für UID %i"
+msgstr "Passworteintrag für UID %i konnte nicht ermittelt werden"

 #: ../../WINGs/findfile.c:66
 #, c-format
 msgid "could not get password entry for user %s"
-msgstr "konnte Passwort nicht ermitteln für Benutzer %s"
+msgstr "Passworteintrag für Benutzer %s konnte nicht ermittelt werden"

 #: ../../WINGs/host.c:114
 msgid "Cannot get current host name"
-msgstr "Kann aktuellen Hostnamen nicht ermitteln"
+msgstr "Aktueller Hostname kann nicht ermittelt werden"
+
+#: ../../WINGs/proplist.c:91
+#, c-format
+msgid "syntax error in %s %s, line %i: %s"
+msgstr "Syntaxfehler in %s %s, Zeile %i: %s"

 #: ../../WINGs/proplist.c:150
 msgid "Only string or data is supported for a proplist dictionary key"
 msgstr ""
-"Nur string oder data wird als Schlüssel für ein proplist dictionary "
-"unterstützt"
+"Nur Zeichenketten oder Binärdaten werden als Schlüssel für ein PropList-Dictionary "
+"unterstützt"

 #: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
 #: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
-#: ../../WINGs/proplist.c:1071 ../../WINGs/proplist.c:1123
-#: ../../WINGs/proplist.c:1289 ../../WINGs/proplist.c:1368
-#: ../../WINGs/proplist.c:1489 ../../WINGs/proplist.c:1536
+#: ../../WINGs/proplist.c:1075 ../../WINGs/proplist.c:1127
+#: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
+#: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
 msgid "Used proplist functions on non-WMPropLists objects"
-msgstr ""
+msgstr "PropList-Funktionen werden auf nicht-WMPropList-Objekte angewendet"

 #: ../../WINGs/proplist.c:630
 msgid "unterminated PropList string"
-msgstr "nicht terminierter PropList string"
+msgstr "nicht terminierte PropList-Zeichenkette"

 #: ../../WINGs/proplist.c:670
 msgid "unterminated PropList data"
-msgstr "nicht terminiertes PropList data"
+msgstr "nicht terminierte PropList-Binärdaten"

 #: ../../WINGs/proplist.c:678
 msgid "unterminated PropList data (missing hexdigit)"
-msgstr "nicht terminiertes PropList data (fehlendes hex-Zeichen)"
+msgstr "nicht terminierte PropList-Binärdaten (fehlendes Hex-Zeichen)"

-#: ../../WINGs/proplist.c:690
+#: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
 msgid "non hexdigit character in PropList data"
-msgstr "falsches hex-Zeichen in PropList data"
+msgstr "falsches Hex-Zeichen in PropList-Binärdaten"

-#: ../../WINGs/proplist.c:725
+#: ../../WINGs/proplist.c:729
 msgid "unterminated PropList array"
-msgstr "nicht terminiertes PropList array"
+msgstr "nicht terminiertes PropList-Array"

-#: ../../WINGs/proplist.c:733
+#: ../../WINGs/proplist.c:737
 msgid "missing or unterminated PropList array"
-msgstr "fehlendes oder nicht terminiertes PropList array"
+msgstr "fehlendes oder nicht terminiertes PropList-Array"

-#: ../../WINGs/proplist.c:743
+#: ../../WINGs/proplist.c:747
 msgid "could not get PropList array element"
-msgstr ""
+msgstr "PropList-Array-Element konnte nicht gelesen werden"

-#: ../../WINGs/proplist.c:772
+#: ../../WINGs/proplist.c:776
 msgid "unterminated PropList dictionary"
-msgstr ""
+msgstr "nicht terminiertes PropList-Dictionary"

-#: ../../WINGs/proplist.c:789
+#: ../../WINGs/proplist.c:793
 msgid "missing PropList dictionary key"
-msgstr ""
+msgstr "fehlender Schlüssel in PropList-Dictionary"

-#: ../../WINGs/proplist.c:791
+#: ../../WINGs/proplist.c:795
 msgid "missing PropList dictionary entry key or unterminated dictionary"
-msgstr ""
+msgstr "fehlender Schlüssel in PropList-Dictionary oder fehlende Terminierung"

-#: ../../WINGs/proplist.c:799
+#: ../../WINGs/proplist.c:803
 msgid "error parsing PropList dictionary key"
-msgstr ""
+msgstr "Fehler beim Parsen eines PropList-Dictionary-Schlüssels"

-#: ../../WINGs/proplist.c:807
+#: ../../WINGs/proplist.c:811
 msgid "missing = in PropList dictionary entry"
-msgstr ""
+msgstr "fehlendes \"=\" in PropList-Dictionary-Schlüssel"

-#: ../../WINGs/proplist.c:815
+#: ../../WINGs/proplist.c:819
 msgid "error parsing PropList dictionary entry value"
-msgstr ""
+msgstr "Fehler beim Parsen eines PropList-Dictionary-Wertes"

-#: ../../WINGs/proplist.c:823
+#: ../../WINGs/proplist.c:827
 msgid "missing ; in PropList dictionary entry"
-msgstr ""
+msgstr "fehlendes \";\" in PropList-Dictionary-Eintrag"

-#: ../../WINGs/proplist.c:884
+#: ../../WINGs/proplist.c:888
 msgid ""
 "was expecting a string, data, array or dictionary. If it's a string, try "
 "enclosing it with \"."
 msgstr ""
-"string, data, array oder dictionary wurde erwartet. Zeichenketten mit \" "
+"Zeichenkette, Binärdaten, Array oder Dictionary erwartet. Zeichenketten ggf. mit \" "
 "einklammern."

-#: ../../WINGs/proplist.c:888
+#: ../../WINGs/proplist.c:892
 msgid "Comments are not allowed inside WindowMaker owned domain files."
-msgstr "Kommentare sind in Domaindaten von WindowMaker nicht erlaubt."
+msgstr "Kommentare sind in Domänendaten von WindowMaker nicht erlaubt."

-#: ../../WINGs/proplist.c:1559 ../../WINGs/proplist.c:1624
+#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1630
 msgid "extra data after end of property list"
-msgstr "zusätzliche Daten hinter dem Ende der Propertyliste"
+msgstr "zusätzliche Daten hinter dem Ende der Propertyliste"

-#: ../../WINGs/proplist.c:1602
+#: ../../WINGs/proplist.c:1606
 #, c-format
 msgid "could not get size for file '%s'"
-msgstr "konnte Dateigrösse von '%s' nicht ermitteln"
+msgstr "Dateigröße von '%s' konnte nicht ermittelt werden"

-#: ../../WINGs/proplist.c:1614
+#: ../../WINGs/proplist.c:1619
 #, c-format
 msgid "error reading from file '%s'"
 msgstr "Fehler beim Lesen der Datei '%s'"

-#: ../../WINGs/proplist.c:1665
+#: ../../WINGs/proplist.c:1671
 #, c-format
 msgid "mkstemp (%s) failed"
-msgstr "mkstemp (%s) schlug fehl"
+msgstr "mkstemp (%s) fehlgeschlagen"

-#: ../../WINGs/proplist.c:1676
+#: ../../WINGs/proplist.c:1682
 #, c-format
 msgid "mktemp (%s) failed"
-msgstr "mktemp (%s) schlug fehl"
+msgstr "mktemp (%s) fehlgeschlagen"

-#: ../../WINGs/proplist.c:1687
+#: ../../WINGs/proplist.c:1693
 #, c-format
 msgid "open (%s) failed"
-msgstr "open (%s) schlug fehl"
+msgstr "open (%s) fehlgeschlagen"

-#: ../../WINGs/proplist.c:1694
+#: ../../WINGs/proplist.c:1700
 #, c-format
 msgid "writing to file: %s failed"
-msgstr "Schreiben in Datei: %s schlug fehl"
+msgstr "Schreiben in Datei: %s fehlgeschlagen"

-#: ../../WINGs/proplist.c:1702
+#: ../../WINGs/proplist.c:1708
 #, c-format
 msgid "fclose (%s) failed"
-msgstr "fclose (%s) schlug fehl"
+msgstr "fclose (%s) fehlgeschlagen"

-#: ../../WINGs/proplist.c:1711
+#: ../../WINGs/proplist.c:1717
 #, c-format
 msgid "rename ('%s' to '%s') failed"
-msgstr "rename ('%s' to '%s') schlug fehl"
+msgstr "rename ('%s' nach '%s') fehlgeschlagen"

 #. something happened with the file. just overwrite it
-#: ../../WINGs/userdefaults.c:192 ../../WINGs/userdefaults.c:208
+#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204
 #, c-format
 msgid "cannot read domain from file '%s' when syncing"
-msgstr "Kannn bei der Synchronisation nicht aus Datei '%s' lesen"
+msgstr "Bei der Synchronisation konnte nicht aus der Datei '%s' gelesen werden"

-#: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
-#: ../../WINGs/wcolor.c:291
+#: ../../WINGs/wcolor.c:237 ../../WINGs/wcolor.c:249 ../../WINGs/wcolor.c:288
+#: ../../WINGs/wcolor.c:329
 #, c-format
 msgid "could not allocate %s color"
-msgstr "konnte die Farbe %s nicht erzeugen"
+msgstr "Farbe %s konnte nicht erzeugt werden"

-#: ../../WINGs/wcolor.c:198
+#: ../../WINGs/wcolor.c:237
 msgid "white"
-msgstr "weiß"
+msgstr "Weiß"

-#: ../../WINGs/wcolor.c:211
+#: ../../WINGs/wcolor.c:249
 msgid "black"
-msgstr "schwarz"
+msgstr "Schwarz"

-#: ../../WINGs/wcolor.c:250
+#: ../../WINGs/wcolor.c:288
 msgid "gray"
-msgstr "grau"
+msgstr "Grau"

-#: ../../WINGs/wcolor.c:291
+#: ../../WINGs/wcolor.c:329
 msgid "dark gray"
-msgstr "dunkelgrau"
+msgstr "Dunkelgrau"

-#: ../../WINGs/wcolorpanel.c:415
+#: ../../WINGs/wcolorpanel.c:420
 msgid "Colors"
 msgstr "Farben"

-#: ../../WINGs/wcolorpanel.c:605 ../../WINGs/wcolorpanel.c:2824
+#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
 msgid "Brightness"
 msgstr "Helligkeit"

-#: ../../WINGs/wcolorpanel.c:607 ../../WINGs/wcolorpanel.c:683
-#: ../../WINGs/wcolorpanel.c:716 ../../WINGs/wcolorpanel.c:750
-#: ../../WINGs/wcolorpanel.c:810 ../../WINGs/wcolorpanel.c:844
-#: ../../WINGs/wcolorpanel.c:878 ../../WINGs/wcolorpanel.c:913
-#: ../../WINGs/wcolorpanel.c:2164 ../../WINGs/wcolorpanel.c:2826
-#: ../../WINGs/wcolorpanel.c:2862 ../../WINGs/wcolorpanel.c:2898
-#: ../../WINGs/wcolorpanel.c:3746
+#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
+#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
+#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849
+#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918
+#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831
+#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
+#: ../../WINGs/wcolorpanel.c:3745
 msgid "Color Panel: Could not allocate memory"
-msgstr "Color Panel: Konnte keinen Speicher reservieren"
+msgstr "Farb-Panel: Speicher konnte nicht reserviert werden"

-#: ../../WINGs/wcolorpanel.c:680 ../../WINGs/wcolorpanel.c:681
+#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
 msgid "Red"
 msgstr "Rot"

-#: ../../WINGs/wcolorpanel.c:713 ../../WINGs/wcolorpanel.c:714
+#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719
 msgid "Green"
-msgstr "Grün"
+msgstr "Grün"

-#: ../../WINGs/wcolorpanel.c:747 ../../WINGs/wcolorpanel.c:748
+#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753
 msgid "Blue"
 msgstr "Blau"

-#: ../../WINGs/wcolorpanel.c:807 ../../WINGs/wcolorpanel.c:808
+#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813
 msgid "Cyan"
 msgstr ""

-#: ../../WINGs/wcolorpanel.c:841 ../../WINGs/wcolorpanel.c:842
+#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847
 msgid "Magenta"
 msgstr ""

-#: ../../WINGs/wcolorpanel.c:875 ../../WINGs/wcolorpanel.c:876
+#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881
 msgid "Yellow"
 msgstr "Gelb"

-#: ../../WINGs/wcolorpanel.c:910 ../../WINGs/wcolorpanel.c:911
+#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916
 msgid "Black"
 msgstr "Schwarz"

-#: ../../WINGs/wcolorpanel.c:991
+#: ../../WINGs/wcolorpanel.c:996
 msgid "Spectrum"
 msgstr "Spektrum"

-#: ../../WINGs/wcolorpanel.c:1021
+#: ../../WINGs/wcolorpanel.c:1026
 msgid "Palette"
 msgstr ""

-#: ../../WINGs/wcolorpanel.c:1027
+#: ../../WINGs/wcolorpanel.c:1032
 msgid "New from File..."
 msgstr "Neu aus Datei..."

-#: ../../WINGs/wcolorpanel.c:1028 ../../WINGs/wcolorpanel.c:1076
-#: ../../WINGs/wcolorpanel.c:1093
+#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
+#: ../../WINGs/wcolorpanel.c:1098
 msgid "Rename..."
 msgstr "Umbenennen..."

-#: ../../WINGs/wcolorpanel.c:1029 ../../WINGs/wcolorpanel.c:1077
-#: ../../WINGs/wcolorpanel.c:1094 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082
+#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326
 msgid "Remove"
 msgstr "Entfernen"

-#: ../../WINGs/wcolorpanel.c:1030
+#: ../../WINGs/wcolorpanel.c:1035
 msgid "Copy"
 msgstr "Kopieren"

-#: ../../WINGs/wcolorpanel.c:1031
+#: ../../WINGs/wcolorpanel.c:1036
 msgid "New from Clipboard"
 msgstr "Neu aus Zwischenablage"

-#: ../../WINGs/wcolorpanel.c:1052
+#: ../../WINGs/wcolorpanel.c:1057
 msgid "X11-Colors"
 msgstr "X11-Farben"

-#: ../../WINGs/wcolorpanel.c:1069
+#: ../../WINGs/wcolorpanel.c:1074
 msgid "Color"
 msgstr "Farbe"

-#: ../../WINGs/wcolorpanel.c:1075
+#: ../../WINGs/wcolorpanel.c:1080
 msgid "Add..."
-msgstr "Hinzufügen..."
+msgstr "Hinzufügen..."

-#: ../../WINGs/wcolorpanel.c:1085
+#: ../../WINGs/wcolorpanel.c:1090
 msgid "List"
 msgstr "Liste"

-#: ../../WINGs/wcolorpanel.c:1092
+#: ../../WINGs/wcolorpanel.c:1097
 msgid "New..."
 msgstr "Neu..."

-#: ../../WINGs/wcolorpanel.c:1231
+#: ../../WINGs/wcolorpanel.c:1236
 #, c-format
-msgid ""
-"Color Panel: Could not create directory %s needed to store configurations"
-msgstr ""
-"Color Panel: Konnte das Verzeichnis %s zum Speichern der Konfiguration nicht erzeugen"
+msgid "Color Panel: Could not create directory %s needed to store configurations"
+msgstr "Farb-Panel: Verzeichnis %s konnte zum Speichern der Konfiguration nicht erzeugt werden"

 #. Delete the file, it doesn't belong here
-#: ../../WINGs/wcolorpanel.c:1237 ../../WINGs/wcolorpanel.c:3207
-#: ../../WINGs/wcolorpanel.c:3211
+#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212
+#: ../../WINGs/wcolorpanel.c:3216
 msgid "File Error"
 msgstr "Dateifehler"

-#: ../../WINGs/wcolorpanel.c:1238
+#: ../../WINGs/wcolorpanel.c:1243
 msgid "Could not create ColorPanel configuration directory"
-msgstr "Konnte Konfigurationsverzeichnis für Farbdialog nicht erzeugen"
+msgstr "Konfigurationsverzeichnis für Farb-Panel konnte nicht erzeugt werden"

-#: ../../WINGs/wcolorpanel.c:1239 ../../WINGs/wcolorpanel.c:3208
-#: ../../WINGs/wcolorpanel.c:3213 ../../WINGs/wcolorpanel.c:3240
-#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:647
-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
-#: ../../WINGs/wfilepanel.c:971 ../../WINGs/wfontpanel.c:709
+#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
+#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
+#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650
+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
+#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:591
 msgid "OK"
-msgstr "OK"
+msgstr ""

-#: ../../WINGs/wcolorpanel.c:1245 ../../WINGs/wcolorpanel.c:1281
-#: ../../WINGs/wcolorpanel.c:1299
+#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
+#: ../../WINGs/wcolorpanel.c:1304
 msgid "Color Panel: Could not find file"
-msgstr "Color Panel: Konnte Datei nicht finden"
+msgstr "Farb-Panel: Datei konnte nicht gefunden werden"

-#: ../../WINGs/wcolorpanel.c:1486 ../../WINGs/wcolorpanel.c:1551
-#: ../../WINGs/wcolorpanel.c:1615
+#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
+#: ../../WINGs/wcolorpanel.c:1620
 msgid "Color Panel: X failed request"
-msgstr "Color Panel: X Anfrage schlug fehl"
+msgstr "Farb-Panel: X-Anfrage fehlgeschlagen"

-#: ../../WINGs/wcolorpanel.c:2860
+#: ../../WINGs/wcolorpanel.c:2865
 msgid "Saturation"
-msgstr "Sättigung"
+msgstr "Sättigung"

-#: ../../WINGs/wcolorpanel.c:2896
+#: ../../WINGs/wcolorpanel.c:2901
 msgid "Hue"
 msgstr "Farbton"

-#: ../../WINGs/wcolorpanel.c:3146
+#: ../../WINGs/wcolorpanel.c:3151
 msgid "Open Palette"
-msgstr "Palette öffnen"
+msgstr "Palette öffnen"

-#: ../../WINGs/wcolorpanel.c:3208
+#: ../../WINGs/wcolorpanel.c:3213
 msgid "Invalid file format !"
-msgstr "Ungültiges Dateiformat!"
+msgstr "Ungültiges Dateiformat!"

-#: ../../WINGs/wcolorpanel.c:3210
+#: ../../WINGs/wcolorpanel.c:3215
 #, c-format
 msgid "can't remove file %s"
-msgstr "kann Datei %s nicht entfernen"
+msgstr "Datei %s konnte nicht entfert werden"

-#: ../../WINGs/wcolorpanel.c:3212
+#: ../../WINGs/wcolorpanel.c:3217
 msgid "Couldn't remove file from Configuration Directory !"
-msgstr "Konnte Datei nicht aus Konfigurationsverzeichnis entfernen!"
+msgstr "Datei konnte nicht aus Konfigurationsverzeichnis entfernt werden!"

-#: ../../WINGs/wcolorpanel.c:3239
+#: ../../WINGs/wcolorpanel.c:3244
 msgid "Rename"
 msgstr "Umbenennen"

-#: ../../WINGs/wcolorpanel.c:3239
+#: ../../WINGs/wcolorpanel.c:3244
 msgid "Rename palette to:"
 msgstr "Palette umbenennen in:"

-#: ../../WINGs/wcolorpanel.c:3240 ../../WINGs/wfilepanel.c:259
-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
+#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259
+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
 msgid "Cancel"
 msgstr "Abbrechen"

 #. Careful, this palette exists already
-#: ../../WINGs/wcolorpanel.c:3256 ../../WINGs/wfilepanel.c:760
+#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763
 msgid "Warning"
 msgstr "Warnung"

-#: ../../WINGs/wcolorpanel.c:3257
+#: ../../WINGs/wcolorpanel.c:3262
 msgid ""
 "Palette already exists !\n"
 "\n"
@@ -392,26 +399,26 @@ msgid ""
 msgstr ""
 "Palette existiert bereits!\n"
 "\n"
-"Überschreiben?"
+"Überschreiben?"

-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
 msgid "No"
 msgstr "Nein"

-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
 msgid "Yes"
 msgstr "Ja"

-#: ../../WINGs/wcolorpanel.c:3289
+#: ../../WINGs/wcolorpanel.c:3294
 #, c-format
 msgid "Couldn't rename palette %s to %s\n"
-msgstr "Konnte Palette %s nicht in %s umbenennen\n"
+msgstr "Palette %s konnte nicht nach %s umbenannt werden\n"

-#: ../../WINGs/wcolorpanel.c:3315
+#: ../../WINGs/wcolorpanel.c:3320
 msgid "This will permanently remove the palette "
-msgstr "Das wird die Palette unwiderruflich löschen "
+msgstr "Hiermit wird die Palette unwiderruflich gelöscht "

-#: ../../WINGs/wcolorpanel.c:3318
+#: ../../WINGs/wcolorpanel.c:3323
 msgid ""
 ".\n"
 "\n"
@@ -419,31 +426,31 @@ msgid ""
 msgstr ""
 ".\n"
 "\n"
-"Sind Sie sicher, dass Sie die Palette löschen wollen?"
+"Sind Sie sicher, dass Sie die Palette löschen wollen?"

-#: ../../WINGs/wcolorpanel.c:3343
+#: ../../WINGs/wcolorpanel.c:3348
 #, c-format
 msgid "Couldn't remove palette %s\n"
-msgstr "Konnte Palette %s nicht löschen\n"
+msgstr "Palette %s konnte nicht gelöscht werden\n"

-#: ../../WINGs/wcolorpanel.c:3648
+#: ../../WINGs/wcolorpanel.c:3647
 #, c-format
 msgid "Could not open %s"
-msgstr "Konnte %s nicht öffnen"
+msgstr "%s konnte nicht geöffnet werden"

-#: ../../WINGs/wcolorpanel.c:3655
+#: ../../WINGs/wcolorpanel.c:3654
 #, c-format
 msgid "Could not create %s"
-msgstr "Konnte %s nicht erzeugen"
+msgstr "%s konnte nicht erzeugt werden"

-#: ../../WINGs/wcolorpanel.c:3666
+#: ../../WINGs/wcolorpanel.c:3665
 #, c-format
 msgid "Write error on file %s"
 msgstr "Schreibfehler bei Datei %s"

-#: ../../WINGs/wcolorpanel.c:3711
+#: ../../WINGs/wcolorpanel.c:3710
 msgid "Color Panel: Color unspecified"
-msgstr "Color Panel: Farbe nicht spezifiziert"
+msgstr "Farb-Panel: Farbe nicht spezifiziert"

 #: ../../WINGs/wfilepanel.c:235
 msgid "Name:"
@@ -451,214 +458,170 @@ msgstr "Name:"

 #: ../../WINGs/wfilepanel.c:332 ../../WINGs/wfilepanel.c:396
 msgid "Open"
-msgstr "Öffnen"
+msgstr "Öffnen"

 #: ../../WINGs/wfilepanel.c:350 ../../WINGs/wfilepanel.c:402
 msgid "Save"
 msgstr "Speichern"

-#: ../../WINGs/wfilepanel.c:562
+#: ../../WINGs/wfilepanel.c:565
 #, c-format
 msgid "WINGs: could not open directory %s\n"
-msgstr "WINGs: Konnte Verzeichnis %s nicht öffen\n"
+msgstr "WINGs: Verzeichnis %s konnte nicht geöffnet werden\n"

-#: ../../WINGs/wfilepanel.c:580
+#: ../../WINGs/wfilepanel.c:583
 #, c-format
 msgid "WINGs: could not stat %s\n"
-msgstr "WINGs: Dateistatus von %s nicht bestimmbar\n"
+msgstr "WINGs: Dateistatus von %s unbestimmbar\n"

-#: ../../WINGs/wfilepanel.c:647 ../../WINGs/wfilepanel.c:970
-#: ../../WINGs/wfontpanel.c:708
+#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
+#: ../../WINGs/wfontpanel.c:590
 msgid "Error"
 msgstr "Fehler"

-#: ../../WINGs/wfilepanel.c:658
+#: ../../WINGs/wfilepanel.c:661
 msgid "Create Directory"
 msgstr "Verzeichnis anlegen"

-#: ../../WINGs/wfilepanel.c:659
+#: ../../WINGs/wfilepanel.c:662
 msgid "Enter directory name"
 msgstr "Verzeichnisname eingeben"

-#: ../../WINGs/wfilepanel.c:695 ../../WINGs/wfilepanel.c:734
-#: ../../WINGs/wfilepanel.c:765 ../../WINGs/wfilepanel.c:793
+#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
+#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
 msgid "Permission denied."
 msgstr "Zugriff verweigert."

-#: ../../WINGs/wfilepanel.c:698
+#: ../../WINGs/wfilepanel.c:701
 #, c-format
 msgid "'%s' already exists."
 msgstr "'%s' existiert bereits."

-#: ../../WINGs/wfilepanel.c:701
+#: ../../WINGs/wfilepanel.c:704
 msgid "Path does not exist."
 msgstr "Pfad existiert nicht."

-#: ../../WINGs/wfilepanel.c:731 ../../WINGs/wfilepanel.c:790
+#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793
 #, c-format
 msgid "'%s' does not exist."
 msgstr "'%s' existiert nicht."

-#: ../../WINGs/wfilepanel.c:738 ../../WINGs/wfilepanel.c:797
+#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
 msgid "Insufficient memory available."
-msgstr "Nicht genügend Speicher verfügbar."
+msgstr "Nicht genügend Speicher verfügbar."

-#: ../../WINGs/wfilepanel.c:742 ../../WINGs/wfilepanel.c:801
+#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
 #, c-format
 msgid "'%s' is on a read-only filesystem."
-msgstr "'%s' liegt auf einem read-only Dateisystem."
+msgstr "'%s' liegt auf einem nur lesbaren Dateisystem."

-#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:777
-#: ../../WINGs/wfilepanel.c:804
+#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
+#: ../../WINGs/wfilepanel.c:807
 #, c-format
 msgid "Can not delete '%s'."
-msgstr "Kann %s nicht löschen."
+msgstr "Kann %s nicht löschen."

-#: ../../WINGs/wfilepanel.c:752
+#: ../../WINGs/wfilepanel.c:755
 #, c-format
 msgid "Delete directory %s ?"
-msgstr "Verzeichnis % s löschen?"
+msgstr "Verzeichnis %s löschen?"

-#: ../../WINGs/wfilepanel.c:756
+#: ../../WINGs/wfilepanel.c:759
 #, c-format
 msgid "Delete file %s ?"
-msgstr "Datei %s löschen?"
+msgstr "Datei %s löschen?"

-#: ../../WINGs/wfilepanel.c:768
+#: ../../WINGs/wfilepanel.c:771
 #, c-format
 msgid "Directory '%s' does not exist."
 msgstr "Verzeichnis '%s' existiert nicht."

-#: ../../WINGs/wfilepanel.c:771
+#: ../../WINGs/wfilepanel.c:774
 #, c-format
 msgid "Directory '%s' is not empty."
 msgstr "Verzeichnis '%s' ist nicht leer."

-#: ../../WINGs/wfilepanel.c:774
+#: ../../WINGs/wfilepanel.c:777
 #, c-format
 msgid "Directory '%s' is busy."
-msgstr "Verzeichnis '%s' ist belegt."
+msgstr "Verzeichnis '%s' wird benutz."

-#: ../../WINGs/wfilepanel.c:787
+#: ../../WINGs/wfilepanel.c:790
 #, c-format
 msgid "'%s' is a directory."
 msgstr "'%s' ist ein Verzeichnis."

-#: ../../WINGs/wfilepanel.c:829
+#: ../../WINGs/wfilepanel.c:832
 #, c-format
 msgid "An error occured browsing '%s'."
 msgstr "Fehler beim Lesen von '%s'."

-#: ../../WINGs/wfilepanel.c:833
+#: ../../WINGs/wfilepanel.c:836
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' ist kein Verzeichnis."

-#: ../../WINGs/wfilepanel.c:970
+#: ../../WINGs/wfilepanel.c:973
 msgid "File does not exist."
 msgstr "Datei existiert nicht."

-#: ../../WINGs/wfont.c:129
+#: ../../WINGs/wfont.c:40
 #, c-format
-msgid "the following character sets are missing in %s:"
-msgstr "die folgenden Zeichensätze fehlen in %s:"
+msgid "invalid font: %s. Trying '%s'"
+msgstr "Ungültige Schriftart: %s. Wird ersetzt durch %s."

-#: ../../WINGs/wfont.c:136
+#: ../../WINGs/wfont.c:257 ../../WINGs/wfont.c:277
 #, c-format
-msgid ""
-"the string \"%s\" will be used in place of any characters from those sets."
+msgid "could not load font: %s."
+msgstr "Schriftart konnte nicht geladen werden: %s"
+
+#. WMSetWidgetBackgroundColor(panel->win, WMWhiteColor(scr));
+#: ../../WINGs/wfontpanel.c:203
+msgid "Font Panel"
+msgstr "Schrift-Panel"
+
+#: ../../WINGs/wfontpanel.c:239
+msgid "The quick brown fox jumps over the lazy dog"
 msgstr ""
-"die Zeichenkette \"%s\" ersetzt alle anderen Zeichen dieser Zeichensätze."

-#: ../../WINGs/wfont.c:287 ../../WINGs/wfont.c:323
-#, c-format
-msgid "could not load font set %s. Trying fixed."
-msgstr "konnte Fonts nicht laden. Nehme fixed-Font."
-
-#: ../../WINGs/wfont.c:293 ../../WINGs/wfont.c:329
-#, c-format
-msgid "could not load font %s. Trying fixed."
-msgstr "Konnte Font %s nicht laden. Nehme fixed-Font."
-
-#: ../../WINGs/wfont.c:297 ../../WINGs/wfont.c:333
-msgid "could not load fixed font!"
-msgstr "konnte fixed-Font nicht laden!"
-
-#: ../../WINGs/wfont.c:428
-#, c-format
-msgid "font description %s is too large."
-msgstr "Fontbeschreibung ist zu groß."
-
-#: ../../WINGs/wfontpanel.c:205
-msgid "Test!!!"
-msgstr "Test!"
-
-#: ../../WINGs/wfontpanel.c:211
+#: ../../WINGs/wfontpanel.c:245
 msgid "Family"
 msgstr "Familie"

-#: ../../WINGs/wfontpanel.c:222
+#: ../../WINGs/wfontpanel.c:256
 msgid "Typeface"
 msgstr "Schriftart"

-#: ../../WINGs/wfontpanel.c:233
+#: ../../WINGs/wfontpanel.c:267
 msgid "Size"
-msgstr "Größe"
+msgstr "Größe"

-#: ../../WINGs/wfontpanel.c:252
+#: ../../WINGs/wfontpanel.c:286
 msgid "Set"
 msgstr "Setzen"

-#: ../../WINGs/wfontpanel.c:257
+#: ../../WINGs/wfontpanel.c:292
 msgid "Revert"
-msgstr "Zurückn."
+msgstr "Zurücksetzen"

-#: ../../WINGs/wfontpanel.c:709
-msgid "Could not retrieve font list"
-msgstr "Konnte Fontliste nicht wiederherstellen"
+#: ../../WINGs/wfontpanel.c:591
+msgid "Could not init font config library\n"
+msgstr "\"font-config\"-Bibliothek konnte nicht initialisiert werden\n"

-#: ../../WINGs/wfontpanel.c:721
-#, c-format
-msgid "font name %s is longer than 256, which is invalid."
-msgstr "Fontname %s ist ungültig, da länger als 256 Zeichen."
-
-#: ../../WINGs/wfontpanel.c:868
-msgid "Roman"
-msgstr "Roman"
-
-#: ../../WINGs/wfontpanel.c:871
-msgid "Italic"
-msgstr "Kursiv"
-
-#: ../../WINGs/wfontpanel.c:873
-msgid "Oblique"
-msgstr "Schräg"
-
-#: ../../WINGs/wfontpanel.c:875
-msgid "Rev Italic"
-msgstr ""
-
-#: ../../WINGs/wfontpanel.c:877
-msgid "Rev Oblique"
-msgstr ""
-
-#: ../../WINGs/wfontpanel.c:883
-msgid "Normal"
-msgstr "Normal"
-
-#: ../../WINGs/widgets.c:415
+#: ../../WINGs/widgets.c:419
 #, c-format
 msgid "WINGs: could not load widget images file: %s"
-msgstr "WINGs: Konnte Widget-Bildatei %s nicht laden."
+msgstr "WINGs: Widget-Bilderdatei konnte nicht geladen werden: %s"

-#: ../../WINGs/widgets.c:763
+#: ../../WINGs/widgets.c:767
 msgid ""
-"could not load any fonts. Make sure your font installationand locale "
+"could not load any fonts. Make sure your font installation and locale "
 "settings are correct."
 msgstr ""
-"Konnte keine Fonts laden. Überprüfen Sie, ob Ihre Fontinstallation und "
-"-einstellungen korrekt sind."
+"Keine Schrifen konnten geladen werden. Überprüfen Sie, ob Ihre Schrifteninstallation und -"
+"Lokalisierungseinstellungen korrekt sind."

-#: ../../WINGs/wruler.c:189
+#: ../../WINGs/wruler.c:192
 msgid "0   inches"
 msgstr "0   Inch"
+
--- a/WINGs/po/fr.po
+++ b/WINGs/po/fr.po
@@ -9,9 +9,9 @@ msgstr ""
 "POT-Creation-Date: 2003-05-02 15:39+0200\n"
 "PO-Revision-Date: 2002-01-09 21:20+0100\n"
 "Last-Translator: Emmanuel Benoit <tseeker@neptune.fr>\n"
-"Language-Team: Français <fr@li.org>\n"
+"Language-Team: Français <fr@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: unknown\n"

 #: ../../WINGs/connection.c:467 ../../WINGs/connection.c:532
@@ -31,15 +31,15 @@ msgstr "Erreur %d"

 #: ../../WINGs/error.c:110
 msgid " warning: "
-msgstr " Avertissement : "
+msgstr " Avertissement : "

 #: ../../WINGs/error.c:137
 msgid " fatal error: "
-msgstr " erreur fatale : "
+msgstr " erreur fatale : "

 #: ../../WINGs/error.c:163 ../../WINGs/error.c:192
 msgid " error: "
-msgstr " erreur : "
+msgstr " erreur : "

 #: ../../WINGs/findfile.c:48
 #, c-format
@@ -49,22 +49,22 @@ msgstr "Impossible de lire le mot de passe de l'UID %i"
 #: ../../WINGs/findfile.c:66
 #, c-format
 msgid "could not get password entry for user %s"
-msgstr "Impossible de lire le mot de passe de l'utilisateur %i"
+msgstr "Impossible de lire le mot de passe de l'utilisateur %s"

 #: ../../WINGs/host.c:114
 msgid "Cannot get current host name"
-msgstr "Impossible de déterminer le nom de la machine"
+msgstr "Impossible de déterminer le nom de la machine"

 # TODO pas de traduction correcte possible, cf source.
 #: ../../WINGs/proplist.c:91
 #, c-format
 msgid "syntax error in %s %s, line %i: %s"
-msgstr "Faute de syntaxe dans %s %s, ligne %i : %s"
+msgstr "Faute de syntaxe dans %s %s, ligne %i : %s"

 #: ../../WINGs/proplist.c:150
 msgid "Only string or data is supported for a proplist dictionary key"
 msgstr ""
-"Seuls les types string ou data sont supportés pour une clé de dictionnaire "
+"Seuls les types string ou data sont supportés pour une clé de dictionnaire "
 "Proplist"

 #: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
@@ -73,23 +73,23 @@ msgstr ""
 #: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
 #: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
 msgid "Used proplist functions on non-WMPropLists objects"
-msgstr "Une fonction Proplist a été utilisée sur des objets non-WMPropList"
+msgstr "Une fonction Proplist a été utilisée sur des objets non-WMPropList"

 #: ../../WINGs/proplist.c:630
 msgid "unterminated PropList string"
-msgstr "chaîne PropList sans fin"
+msgstr "chaîne PropList sans fin"

 #: ../../WINGs/proplist.c:670
 msgid "unterminated PropList data"
-msgstr "données PropList sans fin"
+msgstr "données PropList sans fin"

 #: ../../WINGs/proplist.c:678
 msgid "unterminated PropList data (missing hexdigit)"
-msgstr "données PropList sans fin (il manque un chiffre hexadécimal)"
+msgstr "données PropList sans fin (il manque un chiffre hexadécimal)"

 #: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
 msgid "non hexdigit character in PropList data"
-msgstr "caractère non-hexadécimal dans les données PropList"
+msgstr "caractère non-hexadécimal dans les données PropList"

 #: ../../WINGs/proplist.c:729
 msgid "unterminated PropList array"
@@ -101,7 +101,7 @@ msgstr "tableau PropList manquant ou sans fin"

 #: ../../WINGs/proplist.c:747
 msgid "could not get PropList array element"
-msgstr "impossible de lire l'élément du tableau PropList"
+msgstr "impossible de lire l'élément du tableau PropList"

 #: ../../WINGs/proplist.c:776
 msgid "unterminated PropList dictionary"
@@ -121,39 +121,39 @@ msgstr "erreur lors de l'analyse de la clef de dictionnaire PropList"

 #: ../../WINGs/proplist.c:811
 msgid "missing = in PropList dictionary entry"
-msgstr "signe '=' manquant dans l'entrée du dictionnaire PropList"
+msgstr "signe '=' manquant dans l'entrée du dictionnaire PropList"

 #: ../../WINGs/proplist.c:819
 msgid "error parsing PropList dictionary entry value"
 msgstr ""
-"erreur lors de l'analyse de la valeur de l'entrée du dictionnaire PropList"
+"erreur lors de l'analyse de la valeur de l'entrée du dictionnaire PropList"

 #: ../../WINGs/proplist.c:827
 msgid "missing ; in PropList dictionary entry"
-msgstr "signe ';' manquant dans l'entrée du dictionnaire PropList"
+msgstr "signe ';' manquant dans l'entrée du dictionnaire PropList"

 #: ../../WINGs/proplist.c:888
 msgid ""
 "was expecting a string, data, array or dictionary. If it's a string, try "
 "enclosing it with \"."
 msgstr ""
-"une chaine, des données, un tableau ou un dictionnaire étaient attendus. "
-"S'il s'agit d'une chaîne, essayez de la délimiter grâce à '\"'."
+"une chaine, des données, un tableau ou un dictionnaire étaient attendus. "
+"S'il s'agit d'une chaîne, essayez de la délimiter grâce à '\"'."

 #: ../../WINGs/proplist.c:892
 msgid "Comments are not allowed inside WindowMaker owned domain files."
 msgstr ""
-"Les commentaires ne sont pas autorisés dans les fichiers appartenant au "
+"Les commentaires ne sont pas autorisés dans les fichiers appartenant au "
 "domaine de Window Maker."

 #: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1628
 msgid "extra data after end of property list"
-msgstr "données excédentaires après la fin de la liste de propriétés"
+msgstr "données excédentaires après la fin de la liste de propriétés"

 #: ../../WINGs/proplist.c:1606
 #, c-format
 msgid "could not get size for file '%s'"
-msgstr "impossible de déterminer la taille du fichier '%s'"
+msgstr "impossible de déterminer la taille du fichier '%s'"

 #: ../../WINGs/proplist.c:1618
 #, c-format
@@ -163,22 +163,22 @@ msgstr "erreur pendant la lecture du fichier '%s'"
 #: ../../WINGs/proplist.c:1669
 #, c-format
 msgid "mkstemp (%s) failed"
-msgstr "mkstemp (%s) a échoué"
+msgstr "mkstemp (%s) a échoué"

 #: ../../WINGs/proplist.c:1680
 #, c-format
 msgid "mktemp (%s) failed"
-msgstr "mktemp (%s) a échoué"
+msgstr "mktemp (%s) a échoué"

 #: ../../WINGs/proplist.c:1691
 #, c-format
 msgid "open (%s) failed"
-msgstr "open (%s) a échoué"
+msgstr "open (%s) a échoué"

 #: ../../WINGs/proplist.c:1698
 #, c-format
 msgid "writing to file: %s failed"
-msgstr "erreur pendant l'écriture dans le fichier '%s'"
+msgstr "erreur pendant l'écriture dans le fichier '%s'"

 #: ../../WINGs/proplist.c:1706
 #, c-format
@@ -226,7 +226,7 @@ msgstr "Couleurs"

 #: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
 msgid "Brightness"
-msgstr "Luminosité"
+msgstr "Luminosité"

 #: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
 #: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
@@ -236,7 +236,7 @@ msgstr "Luminosit
 #: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
 #: ../../WINGs/wcolorpanel.c:3745
 msgid "Color Panel: Could not allocate memory"
-msgstr "Panneau de Sélection des Couleur: impossible d'allouer la mémoire"
+msgstr "Panneau de Sélection des Couleur: impossible d'allouer la mémoire"

 #: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
 msgid "Red"
@@ -276,7 +276,7 @@ msgstr "Palette"

 #: ../../WINGs/wcolorpanel.c:1032
 msgid "New from File..."
-msgstr "Nouveau d'après le fichier..."
+msgstr "Nouveau d'après le fichier..."

 #: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
 #: ../../WINGs/wcolorpanel.c:1098
@@ -294,7 +294,7 @@ msgstr "Copier"

 #: ../../WINGs/wcolorpanel.c:1036
 msgid "New from Clipboard"
-msgstr "Nouveau d'après le presse-papier"
+msgstr "Nouveau d'après le presse-papier"

 #: ../../WINGs/wcolorpanel.c:1057
 msgid "X11-Colors"
@@ -321,7 +321,7 @@ msgstr "Nouveau..."
 msgid ""
 "Color Panel: Could not create directory %s needed to store configurations"
 msgstr ""
-"Panneau de sélection des couleurs : impossible de créer le répertoire %s "
+"Panneau de sélection des couleurs : impossible de créer le répertoire %s "
 "requis pour enregistrer les configurations."

 #. Delete the file, it doesn't belong here
@@ -333,8 +333,8 @@ msgstr "Erreur de fichier"
 #: ../../WINGs/wcolorpanel.c:1243
 msgid "Could not create ColorPanel configuration directory"
 msgstr ""
-"Impossible de créer le répertoire pour la configuration du panneau de "
-"sélection des couleurs."
+"Impossible de créer le répertoire pour la configuration du panneau de "
+"sélection des couleurs."

 #: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
 #: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
@@ -347,12 +347,12 @@ msgstr "OK"
 #: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
 #: ../../WINGs/wcolorpanel.c:1304
 msgid "Color Panel: Could not find file"
-msgstr "Panneau de sélection des couleurs : Impossible de trouver le fichier."
+msgstr "Panneau de sélection des couleurs : Impossible de trouver le fichier."

 #: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
 #: ../../WINGs/wcolorpanel.c:1620
 msgid "Color Panel: X failed request"
-msgstr "Panneau de sélection des couleurs : échec d'une requête X"
+msgstr "Panneau de sélection des couleurs : échec d'une requête X"

 #: ../../WINGs/wcolorpanel.c:2865
 msgid "Saturation"
@@ -377,7 +377,7 @@ msgstr "Impossible de supprimer le fichier %s."

 #: ../../WINGs/wcolorpanel.c:3217
 msgid "Couldn't remove file from Configuration Directory !"
-msgstr "Impossible de supprimer le fichier du répertoire de configuration !"
+msgstr "Impossible de supprimer le fichier du répertoire de configuration !"

 #: ../../WINGs/wcolorpanel.c:3244
 msgid "Rename"
@@ -403,9 +403,9 @@ msgid ""
 "\n"
 "Overwrite ?"
 msgstr ""
-"La palette existe déjà !\n"
+"La palette existe déjà !\n"
 "\n"
-"Écraser ?"
+"Écraser ?"

 #: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
 msgid "No"
@@ -422,7 +422,7 @@ msgstr "Impossible de renommer la palette %s en %s.\n"

 #: ../../WINGs/wcolorpanel.c:3320
 msgid "This will permanently remove the palette "
-msgstr "Ceci détruira définitivement la palette "
+msgstr "Ceci détruira définitivement la palette "

 #: ../../WINGs/wcolorpanel.c:3323
 msgid ""
@@ -432,12 +432,12 @@ msgid ""
 msgstr ""
 ".\n"
 "\n"
-"Êtes-vous sûr de vouloir supprimer cette palette ?"
+"Êtes-vous sûr de vouloir supprimer cette palette ?"

 #: ../../WINGs/wcolorpanel.c:3348
 #, c-format
 msgid "Couldn't remove palette %s\n"
-msgstr "Impossible de détruire la palette %s.\n"
+msgstr "Impossible de détruire la palette %s.\n"

 #: ../../WINGs/wcolorpanel.c:3647
 #, c-format
@@ -447,16 +447,16 @@ msgstr "Impossible d'ouvrir %s."
 #: ../../WINGs/wcolorpanel.c:3654
 #, c-format
 msgid "Could not create %s"
-msgstr "Impossible de créer %s."
+msgstr "Impossible de créer %s."

 #: ../../WINGs/wcolorpanel.c:3665
 #, c-format
 msgid "Write error on file %s"
-msgstr "Erreur d'écriture dans le fichier %s."
+msgstr "Erreur d'écriture dans le fichier %s."

 #: ../../WINGs/wcolorpanel.c:3710
 msgid "Color Panel: Color unspecified"
-msgstr "Panneau de sélection des couleurs: couleur non spécifiée."
+msgstr "Panneau de sélection des couleurs: couleur non spécifiée."

 #: ../../WINGs/wfilepanel.c:235
 msgid "Name:"
@@ -473,12 +473,12 @@ msgstr "Enregistrer"
 #: ../../WINGs/wfilepanel.c:565
 #, c-format
 msgid "WINGs: could not open directory %s\n"
-msgstr "WINGs : Impossible d'ouvrir le répertoire %s.\n"
+msgstr "WINGs : Impossible d'ouvrir le répertoire %s.\n"

 #: ../../WINGs/wfilepanel.c:583
 #, c-format
 msgid "WINGs: could not stat %s\n"
-msgstr "WINGs : impossible de lire l'état du fichier %s.\n"
+msgstr "WINGs : impossible de lire l'état du fichier %s.\n"

 #: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
 #: ../../WINGs/wfontpanel.c:750
@@ -487,21 +487,21 @@ msgstr "Erreur"

 #: ../../WINGs/wfilepanel.c:661
 msgid "Create Directory"
-msgstr "Créer un répertoire"
+msgstr "Créer un répertoire"

 #: ../../WINGs/wfilepanel.c:662
 msgid "Enter directory name"
-msgstr "Saisissez le nom du répertoire"
+msgstr "Saisissez le nom du répertoire"

 #: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
 #: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
 msgid "Permission denied."
-msgstr "Permission refusée."
+msgstr "Permission refusée."

 #: ../../WINGs/wfilepanel.c:701
 #, c-format
 msgid "'%s' already exists."
-msgstr "'%s' existe déjà."
+msgstr "'%s' existe déjà."

 #: ../../WINGs/wfilepanel.c:704
 msgid "Path does not exist."
@@ -514,12 +514,12 @@ msgstr "'%s' n'existe pas."

 #: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
 msgid "Insufficient memory available."
-msgstr "Mémoire disponible insuffisante."
+msgstr "Mémoire disponible insuffisante."

 #: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
 #, c-format
 msgid "'%s' is on a read-only filesystem."
-msgstr "'%s' est sur un système de fichiers en lecture seule."
+msgstr "'%s' est sur un système de fichiers en lecture seule."

 #: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
 #: ../../WINGs/wfilepanel.c:807
@@ -530,7 +530,7 @@ msgstr "Impossible de supprimer '%s'."
 #: ../../WINGs/wfilepanel.c:755
 #, c-format
 msgid "Delete directory %s ?"
-msgstr "Supprimer le répertoire %s ?"
+msgstr "Supprimer le répertoire %s ?"

 #: ../../WINGs/wfilepanel.c:759
 #, c-format
@@ -540,22 +540,22 @@ msgstr "Supprimer le fichier %s ?"
 #: ../../WINGs/wfilepanel.c:771
 #, c-format
 msgid "Directory '%s' does not exist."
-msgstr "Le répertoire '%s' n'existe pas."
+msgstr "Le répertoire '%s' n'existe pas."

 #: ../../WINGs/wfilepanel.c:774
 #, c-format
 msgid "Directory '%s' is not empty."
-msgstr "Le répertoire '%s' n'est pas vide."
+msgstr "Le répertoire '%s' n'est pas vide."

 #: ../../WINGs/wfilepanel.c:777
 #, c-format
 msgid "Directory '%s' is busy."
-msgstr "Le répertoire '%s' est occupé."
+msgstr "Le répertoire '%s' est occupé."

 #: ../../WINGs/wfilepanel.c:790
 #, c-format
 msgid "'%s' is a directory."
-msgstr "'%s' est un répertoire."
+msgstr "'%s' est un répertoire."

 #: ../../WINGs/wfilepanel.c:832
 #, c-format
@@ -565,7 +565,7 @@ msgstr "Une erreur s'est produite pendant le parcours de '%s'."
 #: ../../WINGs/wfilepanel.c:836
 #, c-format
 msgid "'%s' is not a directory."
-msgstr "'%s' n'est pas un répertoire."
+msgstr "'%s' n'est pas un répertoire."

 #: ../../WINGs/wfilepanel.c:973
 msgid "File does not exist."
@@ -575,63 +575,63 @@ msgstr "Le fichier n'existe pas."
 #, c-format
 msgid "Invalid size specification '%s' in %s. Using default %d\n"
 msgstr ""
-"Taille invalide dans %2$s : '%1$s'. Utilisation de la valeur par défaut %3"
+"Taille invalide dans %2$s : '%1$s'. Utilisation de la valeur par défaut %3"
 "$d\n"

 #: ../../WINGs/wfont.c:187
 #, c-format
 msgid "the following character sets are missing in %s:"
-msgstr "Les jeux de caractères suivants manquent dans %s :"
+msgstr "Les jeux de caractères suivants manquent dans %s :"

 #: ../../WINGs/wfont.c:193
 #, c-format
 msgid ""
 "the string \"%s\" will be used in place of any characters from those sets."
 msgstr ""
-"La chaîne « %s » sera utilisée à la place de tous les caractères de ces jeux."
+"La chaîne « %s » sera utilisée à la place de tous les caractères de ces jeux."

 #. is arial a good fallback for multibyte?
 #: ../../WINGs/wfont.c:599 ../../WINGs/wfont.c:614
 #, c-format
 msgid "could not load font %s. Trying arial."
 msgstr ""
-"Impossible de charger la police de caractères %s, essai de la police "
-"« arial »."
+"Impossible de charger la police de caractères %s, essai de la police "
+"« arial »."

 #: ../../WINGs/wfont.c:606
 msgid "could not load antialiased font set. Reverting to standard font sets."
 msgstr ""
-"Impossible de charger les polices lissées, utilisation des polices normales."
+"Impossible de charger les polices lissées, utilisation des polices normales."

 #: ../../WINGs/wfont.c:609
 #, c-format
 msgid "could not load FontSet %s. Trying fixed."
 msgstr ""
 "Impossible de charger la famille de polices %s, essai de la famille "
-"« fixed »."
+"« fixed »."

 #: ../../WINGs/wfont.c:621
 msgid "could not load antialiased fonts. Reverting to normal fonts."
 msgstr ""
-"Impossible de charger les polices lissées, utilisation des polices normales."
+"Impossible de charger les polices lissées, utilisation des polices normales."

 #: ../../WINGs/wfont.c:624 ../../WINGs/wfont.c:635
 #, c-format
 msgid "could not load font %s. Trying fixed."
 msgstr ""
-"Impossible de charger la police de caractères %s, essai de la police "
-"« fixed »."
+"Impossible de charger la police de caractères %s, essai de la police "
+"« fixed »."

 #: ../../WINGs/wfont.c:629
 #, c-format
 msgid "could not load font set %s. Trying fixed."
 msgstr ""
 "Impossible de charger la famille de polices %s, essai de la famille "
-"« fixed »."
+"« fixed »."

 #: ../../WINGs/wfont.c:639
 msgid "could not load fixed font!"
-msgstr "Impossible de charger la police de caractères « fixed » !"
+msgstr "Impossible de charger la police de caractères « fixed » !"

 #: ../../WINGs/wfont.c:704 ../../WINGs/wfont.c:765 ../../WINGs/wfont.c:836
 #, c-format
@@ -639,19 +639,19 @@ msgid ""
 "Conversion to widechar failed (possible invalid multibyte sequence): '%s':"
 "(pos %d)\n"
 msgstr ""
-"Échec de la conversion en widechar (probablement une séquence d'octets "
-"erronée) : « %s » (pos %d)\n"
+"Échec de la conversion en widechar (probablement une séquence d'octets "
+"erronée) : « %s » (pos %d)\n"

 #: ../../WINGs/wfont.c:887
 #, c-format
 msgid "font description %s is too large."
-msgstr "La description de la police de caractères %s est trop volumineuse."
+msgstr "La description de la police de caractères %s est trop volumineuse."

 #. // remove warning later. or maybe not
 #: ../../WINGs/wfont.c:935
 #, c-format
 msgid "Invalid font specification: '%s'\n"
-msgstr "Déclaration de police invalide : « %s »\n"
+msgstr "Déclaration de police invalide : « %s »\n"

 #: ../../WINGs/wfontpanel.c:235
 msgid "Test!!!"
@@ -663,7 +663,7 @@ msgstr "Famille"

 #: ../../WINGs/wfontpanel.c:252
 msgid "Typeface"
-msgstr "Caractère"
+msgstr "Caractère"

 #: ../../WINGs/wfontpanel.c:263
 msgid "Size"
@@ -679,13 +679,13 @@ msgstr "Revenir"

 #: ../../WINGs/wfontpanel.c:751
 msgid "Could not retrieve font list"
-msgstr "Impossible de lire la liste des polices de caractères."
+msgstr "Impossible de lire la liste des polices de caractères."

 #: ../../WINGs/wfontpanel.c:765
 #, c-format
 msgid "font name %s is longer than 256, which is invalid."
 msgstr ""
-"Le nom de police %s a plus de 256 caractères et est par conséquent invalide."
+"Le nom de police %s a plus de 256 caractères et est par conséquent invalide."

 #: ../../WINGs/wfontpanel.c:913
 msgid "Roman"
@@ -697,7 +697,7 @@ msgstr "Italique"

 #: ../../WINGs/wfontpanel.c:918
 msgid "Oblique"
-msgstr "Penché"
+msgstr "Penché"

 #: ../../WINGs/wfontpanel.c:920
 msgid "Rev Italic"
@@ -705,7 +705,7 @@ msgstr "Italique inverse"

 #: ../../WINGs/wfontpanel.c:922
 msgid "Rev Oblique"
-msgstr "Penché inverse"
+msgstr "Penché inverse"

 #: ../../WINGs/wfontpanel.c:928
 msgid "Normal"
@@ -722,8 +722,8 @@ msgid ""
 "have the required capabilities (missing RENDER extension). Disabling text "
 "antialiasing."
 msgstr ""
-"Le lissage du texte est activé dans la configuration mais le serveur X ne "
-"dispose pas de l'extension adéquate (extension RENDER). Desactivation du "
+"Le lissage du texte est activé dans la configuration mais le serveur X ne "
+"dispose pas de l'extension adéquate (extension RENDER). Desactivation du "
 "lissage."

 #: ../../WINGs/widgets.c:787
@@ -731,8 +731,8 @@ msgid ""
 "could not load any fonts. Make sure your font installation and locale "
 "settings are correct."
 msgstr ""
-"Aucune police n'a pu être chargée. Veuillez vérifier que vos polices sont "
-"correctement installées et que votre langue est bien configurée."
+"Aucune police n'a pu être chargée. Veuillez vérifier que vos polices sont "
+"correctement installées et que votre langue est bien configurée."

 #: ../../WINGs/wruler.c:192
 msgid "0   inches"
--- a/WINGs/po/sk.po
+++ b/WINGs/po/sk.po
@@ -10,27 +10,28 @@
 # 	0.70.0	Jan "judas" Tomka	<judas@linux.sk>	Oct 15 2001
 # 	0.70.1	Jan "judas" Tomka	<judas@linux.sk>	Nov 02 2001
 # 	0.80.0	Jan "judas" Tomka	<judas@linux.sk>	Dec 20 2001
+# 	0.80.2	Jan "judas" Tomka	<judas@linux.sk>	Jan 31 2004
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: WINGs 0.80.0\n"
-"POT-Creation-Date: 2001-12-20 03:50+0100\n"
+"POT-Creation-Date: 2004-01-31 18:36+0100\n"
 "PO-Revision-Date: 2001-12-20 04:00+0100\n"
 "Last-Translator: Jan \"judas\" Tomka <judas@linux.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: ../../WINGs/connection.c:461 ../../WINGs/connection.c:526
-#: ../../WINGs/connection.c:569
+#: ../../WINGs/connection.c:467 ../../WINGs/connection.c:532
+#: ../../WINGs/connection.c:575
 msgid "Bad address-service-protocol combination"
-msgstr "Nesprávna kombinácia adresa-slu¾ba-protokol"
+msgstr "Nesprávna kombinácia adresa-služba-protokol"

 #: ../../WINGs/error.c:54
 #, c-format
 msgid "Unknown error %d"
-msgstr "Nezmána chyba %d"
+msgstr "Nezmána chyba %d"

 #: ../../WINGs/error.c:59
 #, c-format
@@ -43,7 +44,7 @@ msgstr " varovanie: "

 #: ../../WINGs/error.c:137
 msgid " fatal error: "
-msgstr " fatálna chyba: "
+msgstr " fatálna chyba: "

 #: ../../WINGs/error.c:163 ../../WINGs/error.c:192
 msgid " error: "
@@ -52,371 +53,376 @@ msgstr " chyba: "
 #: ../../WINGs/findfile.c:48
 #, c-format
 msgid "could not get password entry for UID %i"
-msgstr "nemo¾no zisti» informácie o UID %i"
+msgstr "nemožno zistiť informácie o UID %i"

 #: ../../WINGs/findfile.c:66
 #, c-format
 msgid "could not get password entry for user %s"
-msgstr "nemo¾no zisti» informácie o u¾ívateµovi %s"
+msgstr "nemožno zistiť informácie o užívateľovi %s"

 #: ../../WINGs/host.c:114
 msgid "Cannot get current host name"
-msgstr "Nemo¾no zisti» aktuálne meno poèítaèa"
+msgstr "Nemožno zistiť aktuálne meno počítača"
+
+#: ../../WINGs/proplist.c:91
+#, c-format
+msgid "syntax error in %s %s, line %i: %s"
+msgstr "chyba syntaxe v %s %s, riadok %i: %s"

 #: ../../WINGs/proplist.c:150
 msgid "Only string or data is supported for a proplist dictionary key"
-msgstr "Pre kµúè slovníka proplist je podporovaný len re»azec alebo dáta"
+msgstr "Pre kľúč slovníka proplist je podporovaný len reťazec alebo dáta"

 #: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
 #: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
-#: ../../WINGs/proplist.c:1071 ../../WINGs/proplist.c:1123
-#: ../../WINGs/proplist.c:1251 ../../WINGs/proplist.c:1330
-#: ../../WINGs/proplist.c:1451 ../../WINGs/proplist.c:1498
+#: ../../WINGs/proplist.c:1075 ../../WINGs/proplist.c:1127
+#: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
+#: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
 msgid "Used proplist functions on non-WMPropLists objects"
-msgstr "Pou¾itá proplist funkcia na iných ako WMPropLists objektoch"
+msgstr "Použitá proplist funkcia na iných ako WMPropLists objektoch"

 #: ../../WINGs/proplist.c:630
 msgid "unterminated PropList string"
-msgstr "neukonèený PropList re»azec"
+msgstr "neukončený PropList reťazec"

 #: ../../WINGs/proplist.c:670
 msgid "unterminated PropList data"
-msgstr "neukonèené PropList dáta"
+msgstr "neukončené PropList dáta"

 #: ../../WINGs/proplist.c:678
 msgid "unterminated PropList data (missing hexdigit)"
-msgstr "neukonèené PropList dáta (chýbajúca hex èíslica)"
+msgstr "neukončené PropList dáta (chýbajúca hex číslica)"

-#: ../../WINGs/proplist.c:690
+#: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
 msgid "non hexdigit character in PropList data"
-msgstr "v PropList dátach je znak, ktorý nie je hex èíslicou"
+msgstr "v PropList dátach je znak, ktorý nie je hex číslicou"

-#: ../../WINGs/proplist.c:725
+#: ../../WINGs/proplist.c:729
 msgid "unterminated PropList array"
-msgstr "neukonèené PropList pole"
+msgstr "neukončené PropList pole"

-#: ../../WINGs/proplist.c:733
+#: ../../WINGs/proplist.c:737
 msgid "missing or unterminated PropList array"
-msgstr "chýbajúce alebo neukonèené PropList pole"
+msgstr "chýbajúce alebo neukončené PropList pole"

-#: ../../WINGs/proplist.c:743
+#: ../../WINGs/proplist.c:747
 msgid "could not get PropList array element"
-msgstr "nemo¾no zisti» prvok PropList poµa"
+msgstr "nemožno zistiť prvok PropList poľa"

-#: ../../WINGs/proplist.c:772
+#: ../../WINGs/proplist.c:776
 msgid "unterminated PropList dictionary"
-msgstr "neukonèený PropList slovník"
+msgstr "neukončený PropList slovník"

-#: ../../WINGs/proplist.c:789
+#: ../../WINGs/proplist.c:793
 msgid "missing PropList dictionary key"
-msgstr "chýbajúci kµúè PropList slovníka"
+msgstr "chýbajúci kľúč PropList slovníka"

-#: ../../WINGs/proplist.c:791
+#: ../../WINGs/proplist.c:795
 msgid "missing PropList dictionary entry key or unterminated dictionary"
-msgstr "chýbajúci kµúè polo¾ky PropList slovníka alebo neukonèený slovník"
+msgstr "chýbajúci kľúč položky PropList slovníka alebo neukončený slovník"

-#: ../../WINGs/proplist.c:799
+#: ../../WINGs/proplist.c:803
 msgid "error parsing PropList dictionary key"
-msgstr "chyba pri parsovaní kµúèa PropList slovníka"
+msgstr "chyba pri parsovaní kľúča PropList slovníka"

-#: ../../WINGs/proplist.c:807
+#: ../../WINGs/proplist.c:811
 msgid "missing = in PropList dictionary entry"
-msgstr "chýbajúce = v polo¾ke PropList slovníka"
+msgstr "chýbajúce = v položke PropList slovníka"

-#: ../../WINGs/proplist.c:815
+#: ../../WINGs/proplist.c:819
 msgid "error parsing PropList dictionary entry value"
-msgstr "chyba pri parsovaní hodnoty polo¾ky PropList slovníka"
+msgstr "chyba pri parsovaní hodnoty položky PropList slovníka"

-#: ../../WINGs/proplist.c:823
+#: ../../WINGs/proplist.c:827
 msgid "missing ; in PropList dictionary entry"
-msgstr "chýbajúca ; v polo¾ke PropList slovníka"
+msgstr "chýbajúca ; v položke PropList slovníka"

-#: ../../WINGs/proplist.c:884
+#: ../../WINGs/proplist.c:888
 msgid ""
 "was expecting a string, data, array or dictionary. If it's a string, try "
 "enclosing it with \"."
 msgstr ""
-"oèakávaný bol re»azec, dáta, pole alebo slovník. Ak je to re»azec, skúste ho "
-"uzavrie» medzi \"."
+"očakávaný bol reťazec, dáta, pole alebo slovník. Ak je to reťazec, skúste ho "
+"uzavrieť medzi \"."

-#: ../../WINGs/proplist.c:888
+#: ../../WINGs/proplist.c:892
 msgid "Comments are not allowed inside WindowMaker owned domain files."
-msgstr "Komentáre v doménových súboroch Window Makera nie sú povolené."
+msgstr "Komentáre v doménových súboroch Window Makera nie sú povolené."

-#: ../../WINGs/proplist.c:1521 ../../WINGs/proplist.c:1586
+#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1630
 msgid "extra data after end of property list"
-msgstr "prebytoèné dáta na konci property listu"
+msgstr "prebytočné dáta na konci property listu"

-#: ../../WINGs/proplist.c:1564
+#: ../../WINGs/proplist.c:1606
 #, c-format
 msgid "could not get size for file '%s'"
-msgstr "nemo¾no zisti» veµkos» súboru '%s'"
+msgstr "nemožno zistiť veľkosť súboru '%s'"

-#: ../../WINGs/proplist.c:1576
+#: ../../WINGs/proplist.c:1619
 #, c-format
 msgid "error reading from file '%s'"
-msgstr "chyba pri èítaní zo súboru '%s'"
+msgstr "chyba pri čítaní zo súboru '%s'"

-#: ../../WINGs/proplist.c:1627
+#: ../../WINGs/proplist.c:1671
 #, c-format
 msgid "mkstemp (%s) failed"
 msgstr "chyba mkstemp (%s)"

-#: ../../WINGs/proplist.c:1638
+#: ../../WINGs/proplist.c:1682
 #, c-format
 msgid "mktemp (%s) failed"
 msgstr "chyba mktemp(%s)"

-#: ../../WINGs/proplist.c:1649
+#: ../../WINGs/proplist.c:1693
 #, c-format
 msgid "open (%s) failed"
-msgstr "chyba pri otváraní (%s)"
+msgstr "chyba pri otváraní (%s)"

-#: ../../WINGs/proplist.c:1656
+#: ../../WINGs/proplist.c:1700
 #, c-format
 msgid "writing to file: %s failed"
-msgstr "chyba pri zápise do súboru: %s"
+msgstr "chyba pri zápise do súboru: %s"

-#: ../../WINGs/proplist.c:1664
+#: ../../WINGs/proplist.c:1708
 #, c-format
 msgid "fclose (%s) failed"
 msgstr "chyba fclose (%s)"

-#: ../../WINGs/proplist.c:1673
+#: ../../WINGs/proplist.c:1717
 #, c-format
 msgid "rename ('%s' to '%s') failed"
 msgstr "chyba rename ('%s' na '%s')"

 #. something happened with the file. just overwrite it
-#: ../../WINGs/userdefaults.c:192 ../../WINGs/userdefaults.c:208
+#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204
 #, c-format
 msgid "cannot read domain from file '%s' when syncing"
-msgstr "nemo¾no èíta» doménu zo súboru '%s' pri synchronizácii"
+msgstr "nemožno čítať doménu zo súboru '%s' pri synchronizácii"

-#: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
-#: ../../WINGs/wcolor.c:291
+#: ../../WINGs/wcolor.c:224 ../../WINGs/wcolor.c:236 ../../WINGs/wcolor.c:275
+#: ../../WINGs/wcolor.c:316
 #, c-format
 msgid "could not allocate %s color"
-msgstr "nemo¾no alokova» %s farbu"
+msgstr "nemožno alokovať %s farbu"

-#: ../../WINGs/wcolor.c:198
+#: ../../WINGs/wcolor.c:224
 msgid "white"
 msgstr "bielu"

-#: ../../WINGs/wcolor.c:211
+#: ../../WINGs/wcolor.c:236
 msgid "black"
-msgstr "èiernu"
+msgstr "čiernu"

-#: ../../WINGs/wcolor.c:250
+#: ../../WINGs/wcolor.c:275
 msgid "gray"
-msgstr "¹edú"
+msgstr "šedú"

-#: ../../WINGs/wcolor.c:291
+#: ../../WINGs/wcolor.c:316
 msgid "dark gray"
-msgstr "tmavo¹edú"
+msgstr "tmavošedú"

-#: ../../WINGs/wcolorpanel.c:415
+#: ../../WINGs/wcolorpanel.c:420
 msgid "Colors"
 msgstr "Farby"

-#: ../../WINGs/wcolorpanel.c:605 ../../WINGs/wcolorpanel.c:2824
+#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
 msgid "Brightness"
-msgstr "Svetlos»"
+msgstr "Svetlosť"

-#: ../../WINGs/wcolorpanel.c:607 ../../WINGs/wcolorpanel.c:683
-#: ../../WINGs/wcolorpanel.c:716 ../../WINGs/wcolorpanel.c:750
-#: ../../WINGs/wcolorpanel.c:810 ../../WINGs/wcolorpanel.c:844
-#: ../../WINGs/wcolorpanel.c:878 ../../WINGs/wcolorpanel.c:913
-#: ../../WINGs/wcolorpanel.c:2164 ../../WINGs/wcolorpanel.c:2826
-#: ../../WINGs/wcolorpanel.c:2862 ../../WINGs/wcolorpanel.c:2898
-#: ../../WINGs/wcolorpanel.c:3746
+#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
+#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
+#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849
+#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918
+#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831
+#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
+#: ../../WINGs/wcolorpanel.c:3745
 msgid "Color Panel: Could not allocate memory"
-msgstr "Panel farieb: Nemo¾no alokova» pamä»"
+msgstr "Panel farieb: Nemožno alokovať pamäť"

-#: ../../WINGs/wcolorpanel.c:680 ../../WINGs/wcolorpanel.c:681
+#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
 msgid "Red"
-msgstr "Èervená"
+msgstr "Červená"

-#: ../../WINGs/wcolorpanel.c:713 ../../WINGs/wcolorpanel.c:714
+#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719
 msgid "Green"
-msgstr "Zelená"
+msgstr "Zelená"

-#: ../../WINGs/wcolorpanel.c:747 ../../WINGs/wcolorpanel.c:748
+#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753
 msgid "Blue"
-msgstr "Modrá"
+msgstr "Modrá"

-#: ../../WINGs/wcolorpanel.c:807 ../../WINGs/wcolorpanel.c:808
+#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813
 msgid "Cyan"
-msgstr "Azúrová"
+msgstr "Azúrová"

-#: ../../WINGs/wcolorpanel.c:841 ../../WINGs/wcolorpanel.c:842
+#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847
 msgid "Magenta"
-msgstr "Purpurová"
+msgstr "Purpurová"

-#: ../../WINGs/wcolorpanel.c:875 ../../WINGs/wcolorpanel.c:876
+#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881
 msgid "Yellow"
-msgstr "®ltá"
+msgstr "Žltá"

-#: ../../WINGs/wcolorpanel.c:910 ../../WINGs/wcolorpanel.c:911
+#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916
 msgid "Black"
-msgstr "Èierna"
+msgstr "Čierna"

-#: ../../WINGs/wcolorpanel.c:991
+#: ../../WINGs/wcolorpanel.c:996
 msgid "Spectrum"
 msgstr "Spektrum"

-#: ../../WINGs/wcolorpanel.c:1021
+#: ../../WINGs/wcolorpanel.c:1026
 msgid "Palette"
 msgstr "Paleta"

-#: ../../WINGs/wcolorpanel.c:1027
+#: ../../WINGs/wcolorpanel.c:1032
 msgid "New from File..."
-msgstr "Nová zo súboru..."
+msgstr "Nová zo súboru..."

-#: ../../WINGs/wcolorpanel.c:1028 ../../WINGs/wcolorpanel.c:1076
-#: ../../WINGs/wcolorpanel.c:1093
+#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
+#: ../../WINGs/wcolorpanel.c:1098
 msgid "Rename..."
-msgstr "Premenova»..."
+msgstr "Premenovať..."

-#: ../../WINGs/wcolorpanel.c:1029 ../../WINGs/wcolorpanel.c:1077
-#: ../../WINGs/wcolorpanel.c:1094 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082
+#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326
 msgid "Remove"
-msgstr "Odstráni»"
+msgstr "Odstrániť"

-#: ../../WINGs/wcolorpanel.c:1030
+#: ../../WINGs/wcolorpanel.c:1035
 msgid "Copy"
-msgstr "Kopírova»"
+msgstr "Kopírovať"

-#: ../../WINGs/wcolorpanel.c:1031
+#: ../../WINGs/wcolorpanel.c:1036
 msgid "New from Clipboard"
-msgstr "Nová z nástenky"
+msgstr "Nová z nástenky"

-#: ../../WINGs/wcolorpanel.c:1052
+#: ../../WINGs/wcolorpanel.c:1057
 msgid "X11-Colors"
 msgstr "Farby X11"

-#: ../../WINGs/wcolorpanel.c:1069
+#: ../../WINGs/wcolorpanel.c:1074
 msgid "Color"
 msgstr "Farba"

-#: ../../WINGs/wcolorpanel.c:1075
+#: ../../WINGs/wcolorpanel.c:1080
 msgid "Add..."
-msgstr "Prida»..."
+msgstr "Pridať..."

-#: ../../WINGs/wcolorpanel.c:1085
+#: ../../WINGs/wcolorpanel.c:1090
 msgid "List"
 msgstr "Zoznam"

-#: ../../WINGs/wcolorpanel.c:1092
+#: ../../WINGs/wcolorpanel.c:1097
 msgid "New..."
-msgstr "Nový..."
+msgstr "Nový..."

-#: ../../WINGs/wcolorpanel.c:1231
+#: ../../WINGs/wcolorpanel.c:1236
 #, c-format
 msgid ""
 "Color Panel: Could not create directory %s needed to store configurations"
 msgstr ""
-"Panel farieb: Nemo¾no vytvori» adresár %s potrebný na ulo¾enie nastavení"
+"Panel farieb: Nemožno vytvoriť adresár %s potrebný na uloženie nastavení"

 #. Delete the file, it doesn't belong here
-#: ../../WINGs/wcolorpanel.c:1237 ../../WINGs/wcolorpanel.c:3207
-#: ../../WINGs/wcolorpanel.c:3211
+#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212
+#: ../../WINGs/wcolorpanel.c:3216
 msgid "File Error"
-msgstr "Chyba súboru"
+msgstr "Chyba súboru"

-#: ../../WINGs/wcolorpanel.c:1238
+#: ../../WINGs/wcolorpanel.c:1243
 msgid "Could not create ColorPanel configuration directory"
-msgstr "Nemo¾no vytvori» konfiguraèný adresár panelu farieb"
+msgstr "Nemožno vytvoriť konfiguračný adresár panelu farieb"

-#: ../../WINGs/wcolorpanel.c:1239 ../../WINGs/wcolorpanel.c:3208
-#: ../../WINGs/wcolorpanel.c:3213 ../../WINGs/wcolorpanel.c:3240
-#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:647
-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
-#: ../../WINGs/wfilepanel.c:971 ../../WINGs/wfontpanel.c:709
+#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
+#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
+#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650
+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
+#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:751
 msgid "OK"
 msgstr "OK"

-#: ../../WINGs/wcolorpanel.c:1245 ../../WINGs/wcolorpanel.c:1281
-#: ../../WINGs/wcolorpanel.c:1299
+#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
+#: ../../WINGs/wcolorpanel.c:1304
 msgid "Color Panel: Could not find file"
-msgstr "Panel farieb: Nemo¾no nájs» súbor"
+msgstr "Panel farieb: Nemožno nájsť súbor"

-#: ../../WINGs/wcolorpanel.c:1486 ../../WINGs/wcolorpanel.c:1551
-#: ../../WINGs/wcolorpanel.c:1615
+#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
+#: ../../WINGs/wcolorpanel.c:1620
 msgid "Color Panel: X failed request"
-msgstr "Panel farieb: chyba po¾iadavky X"
+msgstr "Panel farieb: chyba požiadavky X"

-#: ../../WINGs/wcolorpanel.c:2860
+#: ../../WINGs/wcolorpanel.c:2865
 msgid "Saturation"
-msgstr "Saturácia"
+msgstr "Saturácia"

-#: ../../WINGs/wcolorpanel.c:2896
+#: ../../WINGs/wcolorpanel.c:2901
 msgid "Hue"
-msgstr "Odtieò"
+msgstr "Odtieň"

-#: ../../WINGs/wcolorpanel.c:3146
+#: ../../WINGs/wcolorpanel.c:3151
 msgid "Open Palette"
-msgstr "Otvori» paletu"
+msgstr "Otvoriť paletu"

-#: ../../WINGs/wcolorpanel.c:3208
+#: ../../WINGs/wcolorpanel.c:3213
 msgid "Invalid file format !"
-msgstr "Nesprávny súborový formát!"
+msgstr "Nesprávny súborový formát!"

-#: ../../WINGs/wcolorpanel.c:3210
+#: ../../WINGs/wcolorpanel.c:3215
 #, c-format
 msgid "can't remove file %s"
-msgstr "namo¾no odstráni» súbor %s"
+msgstr "namožno odstrániť súbor %s"

-#: ../../WINGs/wcolorpanel.c:3212
+#: ../../WINGs/wcolorpanel.c:3217
 msgid "Couldn't remove file from Configuration Directory !"
-msgstr "Nemo¾no odstráni» súbor z konfiguraèného adresára!"
+msgstr "Nemožno odstrániť súbor z konfiguračného adresára!"

-#: ../../WINGs/wcolorpanel.c:3239
+#: ../../WINGs/wcolorpanel.c:3244
 msgid "Rename"
-msgstr "Premenova»"
+msgstr "Premenovať"

-#: ../../WINGs/wcolorpanel.c:3239
+#: ../../WINGs/wcolorpanel.c:3244
 msgid "Rename palette to:"
-msgstr "Premenova» paletu:"
+msgstr "Premenovať paletu:"

-#: ../../WINGs/wcolorpanel.c:3240 ../../WINGs/wfilepanel.c:259
-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
+#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259
+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
 msgid "Cancel"
-msgstr "Zru¹i»"
+msgstr "Zrušiť"

 #. Careful, this palette exists already
-#: ../../WINGs/wcolorpanel.c:3256 ../../WINGs/wfilepanel.c:760
+#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763
 msgid "Warning"
 msgstr "Varovanie"

-#: ../../WINGs/wcolorpanel.c:3257
+#: ../../WINGs/wcolorpanel.c:3262
 msgid ""
 "Palette already exists !\n"
 "\n"
 "Overwrite ?"
 msgstr ""
-"Paleta u¾ existuje!\n"
+"Paleta už existuje!\n"
 "\n"
-"Prepísa»?"
+"Prepísať?"

-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
 msgid "No"
 msgstr "Nie"

-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
 msgid "Yes"
-msgstr "Áno"
+msgstr "Áno"

-#: ../../WINGs/wcolorpanel.c:3289
+#: ../../WINGs/wcolorpanel.c:3294
 #, c-format
 msgid "Couldn't rename palette %s to %s\n"
-msgstr "Nemo¾no premenova» paletu %s na %s\n"
+msgstr "Nemožno premenovať paletu %s na %s\n"

-#: ../../WINGs/wcolorpanel.c:3315
+#: ../../WINGs/wcolorpanel.c:3320
 msgid "This will permanently remove the palette "
-msgstr "Paleta bude natrvalo zmazaná"
+msgstr "Paleta bude natrvalo zmazaná"

-#: ../../WINGs/wcolorpanel.c:3318
+#: ../../WINGs/wcolorpanel.c:3323
 msgid ""
 ".\n"
 "\n"
@@ -424,31 +430,31 @@ msgid ""
 msgstr ""
 ".\n"
 "\n"
-"Ste si istý, ¾e chcete odstráni» túto paletu?"
+"Ste si istý, že chcete odstrániť túto paletu?"

-#: ../../WINGs/wcolorpanel.c:3343
+#: ../../WINGs/wcolorpanel.c:3348
 #, c-format
 msgid "Couldn't remove palette %s\n"
-msgstr "Nemo¾no odstráni» paletu %s\n"
+msgstr "Nemožno odstrániť paletu %s\n"

-#: ../../WINGs/wcolorpanel.c:3648
+#: ../../WINGs/wcolorpanel.c:3647
 #, c-format
 msgid "Could not open %s"
-msgstr "Nemo¾no otvori» %s"
+msgstr "Nemožno otvoriť %s"

-#: ../../WINGs/wcolorpanel.c:3655
+#: ../../WINGs/wcolorpanel.c:3654
 #, c-format
 msgid "Could not create %s"
-msgstr "Nemo¾no vytvori» %s"
+msgstr "Nemožno vytvoriť %s"

-#: ../../WINGs/wcolorpanel.c:3666
+#: ../../WINGs/wcolorpanel.c:3665
 #, c-format
 msgid "Write error on file %s"
-msgstr "Chyba zápisu do súboru %s"
+msgstr "Chyba zápisu do súboru %s"

-#: ../../WINGs/wcolorpanel.c:3711
+#: ../../WINGs/wcolorpanel.c:3710
 msgid "Color Panel: Color unspecified"
-msgstr "Panel farieb: Ne¹pecifikovaná farba"
+msgstr "Panel farieb: Nešpecifikovaná farba"

 #: ../../WINGs/wfilepanel.c:235
 msgid "Name:"
@@ -456,213 +462,258 @@ msgstr "Meno:"

 #: ../../WINGs/wfilepanel.c:332 ../../WINGs/wfilepanel.c:396
 msgid "Open"
-msgstr "Otvori»"
+msgstr "Otvoriť"

 #: ../../WINGs/wfilepanel.c:350 ../../WINGs/wfilepanel.c:402
 msgid "Save"
-msgstr "Ulo¾i»"
+msgstr "Uložiť"

-#: ../../WINGs/wfilepanel.c:562
+#: ../../WINGs/wfilepanel.c:565
 #, c-format
 msgid "WINGs: could not open directory %s\n"
-msgstr "WINGs: nemo¾no otvori» adresár %s\n"
+msgstr "WINGs: nemožno otvoriť adresár %s\n"

-#: ../../WINGs/wfilepanel.c:580
+#: ../../WINGs/wfilepanel.c:583
 #, c-format
 msgid "WINGs: could not stat %s\n"
-msgstr "WINGs: nemo¾no zisti» informácie o %s\n"
+msgstr "WINGs: nemožno zistiť informácie o %s\n"

-#: ../../WINGs/wfilepanel.c:647 ../../WINGs/wfilepanel.c:970
-#: ../../WINGs/wfontpanel.c:708
+#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
+#: ../../WINGs/wfontpanel.c:750
 msgid "Error"
 msgstr "Chyba"

-#: ../../WINGs/wfilepanel.c:658
+#: ../../WINGs/wfilepanel.c:661
 msgid "Create Directory"
-msgstr "Vytvori» adresár"
+msgstr "Vytvoriť adresár"

-#: ../../WINGs/wfilepanel.c:659
+#: ../../WINGs/wfilepanel.c:662
 msgid "Enter directory name"
-msgstr "Meno adresára"
+msgstr "Meno adresára"

-#: ../../WINGs/wfilepanel.c:695 ../../WINGs/wfilepanel.c:734
-#: ../../WINGs/wfilepanel.c:765 ../../WINGs/wfilepanel.c:793
+#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
+#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
 msgid "Permission denied."
-msgstr "Prístup zamietnutý."
-
-#: ../../WINGs/wfilepanel.c:698
-#, c-format
-msgid "'%s' already exists."
-msgstr "'%s' u¾ existuje"
+msgstr "Prístup zamietnutý."

 #: ../../WINGs/wfilepanel.c:701
+#, c-format
+msgid "'%s' already exists."
+msgstr "'%s' už existuje"
+
+#: ../../WINGs/wfilepanel.c:704
 msgid "Path does not exist."
 msgstr "Cesta neexistuje."

-#: ../../WINGs/wfilepanel.c:731 ../../WINGs/wfilepanel.c:790
+#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793
 #, c-format
 msgid "'%s' does not exist."
 msgstr "'%s' neexistuje."

-#: ../../WINGs/wfilepanel.c:738 ../../WINGs/wfilepanel.c:797
+#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
 msgid "Insufficient memory available."
-msgstr "Nedostatok pamäti."
+msgstr "Nedostatok pamäti."

-#: ../../WINGs/wfilepanel.c:742 ../../WINGs/wfilepanel.c:801
+#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
 #, c-format
 msgid "'%s' is on a read-only filesystem."
-msgstr "'%s' je na súborovom systéme len pre èítanie."
+msgstr "'%s' je na súborovom systéme len pre čítanie."

-#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:777
-#: ../../WINGs/wfilepanel.c:804
+#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
+#: ../../WINGs/wfilepanel.c:807
 #, c-format
 msgid "Can not delete '%s'."
-msgstr "Nemo¾no odstráni» '%s'."
+msgstr "Nemožno odstrániť '%s'."

-#: ../../WINGs/wfilepanel.c:752
+#: ../../WINGs/wfilepanel.c:755
 #, c-format
 msgid "Delete directory %s ?"
-msgstr "Odstráni» adresár %s?"
+msgstr "Odstrániť adresár %s?"

-#: ../../WINGs/wfilepanel.c:756
+#: ../../WINGs/wfilepanel.c:759
 #, c-format
 msgid "Delete file %s ?"
-msgstr "Odstráni» súbor %s?"
-
-#: ../../WINGs/wfilepanel.c:768
-#, c-format
-msgid "Directory '%s' does not exist."
-msgstr "Adresár '%s' neexistuje."
+msgstr "Odstrániť súbor %s?"

 #: ../../WINGs/wfilepanel.c:771
 #, c-format
-msgid "Directory '%s' is not empty."
-msgstr "Adresár '%s' nie je prázdny."
+msgid "Directory '%s' does not exist."
+msgstr "Adresár '%s' neexistuje."

 #: ../../WINGs/wfilepanel.c:774
 #, c-format
-msgid "Directory '%s' is busy."
-msgstr "Adresár '%s' je pou¾ívaný."
+msgid "Directory '%s' is not empty."
+msgstr "Adresár '%s' nie je prázdny."

-#: ../../WINGs/wfilepanel.c:787
+#: ../../WINGs/wfilepanel.c:777
+#, c-format
+msgid "Directory '%s' is busy."
+msgstr "Adresár '%s' je používaný."
+
+#: ../../WINGs/wfilepanel.c:790
 #, c-format
 msgid "'%s' is a directory."
-msgstr "'%s' je adresár."
+msgstr "'%s' je adresár."

-#: ../../WINGs/wfilepanel.c:829
+#: ../../WINGs/wfilepanel.c:832
 #, c-format
 msgid "An error occured browsing '%s'."
-msgstr "Pri prehliadaní '%s' nastala chyba."
+msgstr "Pri prehliadaní '%s' nastala chyba."

-#: ../../WINGs/wfilepanel.c:833
+#: ../../WINGs/wfilepanel.c:836
 #, c-format
 msgid "'%s' is not a directory."
-msgstr "'%s' nie je adresár."
+msgstr "'%s' nie je adresár."

-#: ../../WINGs/wfilepanel.c:970
+#: ../../WINGs/wfilepanel.c:973
 msgid "File does not exist."
-msgstr "Súbor neexistuje."
+msgstr "Súbor neexistuje."

-#: ../../WINGs/wfont.c:129
+#: ../../WINGs/wfont.c:324 ../../WINGs/wfont.c:344
+#, c-format
+msgid "could not load font %s."
+msgstr "nemožno načítať font %s."
+
+#: ../../WINGs/wfont.c:375 ../../WINGs/wfont.c:420 ../../WINGs/wfont.c:475
+#: ../../WINGs/wfont.c:1337 ../../WINGs/wfont.c:1398 ../../WINGs/wfont.c:1469
+#, c-format
+msgid ""
+"Conversion to widechar failed (possible invalid multibyte sequence): '%s':"
+"(pos %d)\n"
+msgstr ""
+"Konverzia do widechar zlyhala (možno nesprávna multibyte sekvencia): '%s':"
+"(pos %d)\n"
+
+#. // remove warning later. or maybe not
+#: ../../WINGs/wfont.c:591 ../../WINGs/wfont.c:1568
+#, c-format
+msgid "Invalid font specification: '%s'\n"
+msgstr "Chybná špecifikácia fontu: '%s'\n"
+
+#: ../../WINGs/wfont.c:770 ../../WINGs/wfont.c:780
+#, c-format
+msgid "Invalid size specification '%s' in %s. Using default %d\n"
+msgstr "Chybná špecifikácia veľkosti '%s' v %s. Použije sa implicitná %d\n"
+
+#: ../../WINGs/wfont.c:824
 #, c-format
 msgid "the following character sets are missing in %s:"
-msgstr "nasledujúce sady znakov chýbajú v %s:"
+msgstr "nasledujúce sady znakov chýbajú v %s:"

-#: ../../WINGs/wfont.c:136
+#: ../../WINGs/wfont.c:830
 #, c-format
 msgid ""
 "the string \"%s\" will be used in place of any characters from those sets."
-msgstr "re»azec \"%s\" bude pou¾itý namiesto znakov z týchto sád."
+msgstr "reťazec \"%s\" bude použitý namiesto znakov z týchto sád."

-#: ../../WINGs/wfont.c:282 ../../WINGs/wfont.c:318
+#. is arial a good fallback for multibyte?
+#: ../../WINGs/wfont.c:1232 ../../WINGs/wfont.c:1247
 #, c-format
-msgid "could not load font set %s. Trying fixed."
-msgstr "nemo¾no naèíta» font %s. Skú¹a sa naèíta» fixed."
+msgid "could not load font %s. Trying arial."
+msgstr "nemožno načítať font %s. Skúša sa načítať arial."

-#: ../../WINGs/wfont.c:288 ../../WINGs/wfont.c:324
+#: ../../WINGs/wfont.c:1239
+msgid "could not load antialiased font set. Reverting to standard font sets."
+msgstr "nemožno načítať antialiasovanú sadu fontov. Späť k štandardnej sade fontov."
+
+#: ../../WINGs/wfont.c:1242
+#, c-format
+msgid "could not load FontSet %s. Trying fixed."
+msgstr "nemožno načítať sadu fontov %s. Skúša sa načítať fixed."
+
+#: ../../WINGs/wfont.c:1254
+msgid "could not load antialiased fonts. Reverting to normal fonts."
+msgstr "nemožno zaviesť antialiasovaný font. Návrat k normálnemu fontu."
+
+#: ../../WINGs/wfont.c:1257 ../../WINGs/wfont.c:1268
 #, c-format
 msgid "could not load font %s. Trying fixed."
-msgstr "nemo¾no naèíta» font %s. Skú¹a sa naèíta» fixed."
+msgstr "nemožno načítať font %s. Skúša sa načítať fixed."

-#: ../../WINGs/wfont.c:292 ../../WINGs/wfont.c:328
+#: ../../WINGs/wfont.c:1262
+#, c-format
+msgid "could not load font set %s. Trying fixed."
+msgstr "nemožno načítať font %s. Skúša sa načítať fixed."
+
+#: ../../WINGs/wfont.c:1272
 msgid "could not load fixed font!"
-msgstr "nemo¾no naèíta» font fixed!"
+msgstr "nemožno načítať font fixed!"

-#: ../../WINGs/wfont.c:423
+#: ../../WINGs/wfont.c:1520
 #, c-format
 msgid "font description %s is too large."
-msgstr "popis fontu %s je príli¹ veµký."
+msgstr "popis fontu %s je príliš veľký."

-#: ../../WINGs/wfontpanel.c:205
+#: ../../WINGs/wfontpanel.c:235
 msgid "Test!!!"
-msgstr "Skú¹ka!!!"
+msgstr "Skúška!!!"

-#: ../../WINGs/wfontpanel.c:211
+#: ../../WINGs/wfontpanel.c:241
 msgid "Family"
 msgstr "Rodina"

-#: ../../WINGs/wfontpanel.c:222
-msgid "Typeface"
-msgstr "Vzhµad"
-
-#: ../../WINGs/wfontpanel.c:233
-msgid "Size"
-msgstr "Veµkos»"
-
 #: ../../WINGs/wfontpanel.c:252
+msgid "Typeface"
+msgstr "Vzhľad"
+
+#: ../../WINGs/wfontpanel.c:263
+msgid "Size"
+msgstr "Veľkosť"
+
+#: ../../WINGs/wfontpanel.c:282
 msgid "Set"
 msgstr "Sada"

-#: ../../WINGs/wfontpanel.c:257
+#: ../../WINGs/wfontpanel.c:288
 msgid "Revert"
-msgstr "Obráti»"
+msgstr "Obrátiť"

-#: ../../WINGs/wfontpanel.c:709
+#: ../../WINGs/wfontpanel.c:751
 msgid "Could not retrieve font list"
-msgstr "Nemo¾no obdr¾a» zoznam fontov"
+msgstr "Nemožno obdržať zoznam fontov"

-#: ../../WINGs/wfontpanel.c:721
+#: ../../WINGs/wfontpanel.c:765
 #, c-format
 msgid "font name %s is longer than 256, which is invalid."
-msgstr "meno fontu %s je dlh¹ie ako 256, èo je nesprávne."
+msgstr "meno fontu %s je dlhšie ako 256, čo je nesprávne."

-#: ../../WINGs/wfontpanel.c:868
+#: ../../WINGs/wfontpanel.c:913
 msgid "Roman"
 msgstr "roman"

-#: ../../WINGs/wfontpanel.c:871
+#: ../../WINGs/wfontpanel.c:916
 msgid "Italic"
-msgstr "kurzíva"
+msgstr "kurzíva"

-#: ../../WINGs/wfontpanel.c:873
+#: ../../WINGs/wfontpanel.c:918
 msgid "Oblique"
-msgstr "¹ikmé"
+msgstr "šikmé"

-#: ../../WINGs/wfontpanel.c:875
+#: ../../WINGs/wfontpanel.c:920
 msgid "Rev Italic"
-msgstr "obr. kurzíva"
+msgstr "obr. kurzíva"

-#: ../../WINGs/wfontpanel.c:877
+#: ../../WINGs/wfontpanel.c:922
 msgid "Rev Oblique"
-msgstr "obr. ¹ikmé"
+msgstr "obr. šikmé"

-#: ../../WINGs/wfontpanel.c:883
+#: ../../WINGs/wfontpanel.c:928
 msgid "Normal"
-msgstr "normálne"
+msgstr "normálne"

-#: ../../WINGs/widgets.c:415
+#: ../../WINGs/widgets.c:419
 #, c-format
 msgid "WINGs: could not load widget images file: %s"
-msgstr "WINGs: nemo¾no naèíta» súbor s obrázkami pre widgety: %s"
+msgstr "WINGs: nemožno načítať súbor s obrázkami pre widgety: %s"

-#: ../../WINGs/widgets.c:761
+#: ../../WINGs/widgets.c:772
 msgid ""
-"could not load any fonts. Make sure your font installationand locale "
+"could not load any fonts. Make sure your font installation and locale "
 "settings are correct."
 msgstr ""
-"nemo¾no naèíta» ¾iadny font. Ubezpeète sa, ¾e in¹talácia fontov a miestne "
-"nastavenia sú v poriadku."
+"nemožno načítať žiadny font. Ubezpečte sa, že inštalácia fontov a miestne "
+"nastavenia sú v poriadku."

-#: ../../WINGs/wruler.c:189
+#: ../../WINGs/wruler.c:192
 msgid "0   inches"
 msgstr "0    palcov"
--- a/WINGs/proplist.c
+++ b/WINGs/proplist.c
--- a/WINGs/puzzle.c
+++ b/WINGs/puzzle.c
@@ -1,241 +0,0 @@
-
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <WINGs.h>
-
-
-
-#define MAX_SIZE 	10*10
-
-
-WMWindow *win;
-WMButton *Button[MAX_SIZE];
-char Map[MAX_SIZE];
-int Size = 4;
-int MoveCount;
-
-#define MAP(x,y)  Map[(x)+(y)*Size]
-
-int WinSize = 120;
-
-
-Bool CheckWin(void)
-{
-    int i;
- 
-    for (i = 0; i < Size*Size-1; i++) {
-	if (Map[i] != i)
-	    return False;
-    }
-    
-    return True;
-}
-
-
-void MoveButton(int button, int x, int y)
-{
-    WMMoveWidget(Button[button], x*(WinSize/Size), y*(WinSize/Size));
-}
-
-
-Bool SlideButton(int button)
-{
-    int x, y, done = 0;
-    
-    /* locate the button */
-    for (y = 0; y < Size; y++) {
-	for (x = 0; x < Size; x++) {
-	    if (MAP(x,y) == button) {
-		done = 1;
-		break;
-	    }
-	}
-	if (done)
-	    break;
-    }
-        
-    if (x > 0 && MAP(x-1, y) < 0) {
-	MAP(x,y) = -1;
-	MoveButton(button, x-1, y);
-	MAP(x-1,y) = button;
-    } else if (x < Size-1 && MAP(x+1, y) < 0) {
-	MAP(x,y) = -1;
-	MoveButton(button, x+1, y);
-	MAP(x+1,y) = button;
-    } else if (y > 0 && MAP(x, y-1) < 0) {
-	MAP(x,y) = -1;
-	MoveButton(button, x, y-1);
-	MAP(x,y-1) = button;
-    } else if (y < Size-1 && MAP(x, y+1) < 0) {
-	MAP(x,y) = -1;
-	MoveButton(button, x, y+1);
-	MAP(x,y+1) = button;
-    } else {
-	return False;
-    }
-    return True;
-}
-
-
-#define SWAP(a,b) {int tmp; tmp=a; a=b; b=tmp;}
-
-void ResetGame(void)
-{
-    int i, x, y, ox, oy;
-    
-    
-    MoveCount = 0;
-    
-    for (i = 0; i < Size*Size-1; i++) {
-	Map[i] = i;
-    }
-    Map[i] = -1;
-    ox = x = Size-1;
-    oy = y = Size-1;
-    for (i = 0; i < 5; i++) {
-	int ok;
-	ok = 1;
-	switch (rand()%4) {
-	 case 0:
-	    if (x > 0) x--; else ok = 0;
-	    break;
-	 case 2:
-	    if (x < Size-1) x++; else ok = 0;
-	    break;
-	 case 1:
-	    if (y > 0) y--; else ok = 0;
-	    break;
-	 case 3:
-	    if (y < Size-1) y++; else ok = 0;
-	    break;
-	}
-	if (ok) {
-	    MoveButton(MAP(x,y), ox, oy);
-
-	    SWAP(MAP(ox, oy), MAP(x, y));
-	    
-	    while (XPending(WMScreenDisplay(WMWidgetScreen(win)))) {
-		XEvent ev;
-		WMNextEvent(WMScreenDisplay(WMWidgetScreen(win)), &ev);
-		WMHandleEvent(&ev);
-	    }
-	    ox = x;
-	    oy = y;
-	}
-    }
-}
-
-
-void buttonClick(WMWidget *w, void *ptr)
-{
-    char buffer[300];
-
-    if (SlideButton((int)ptr)) {
-	MoveCount++;
-
-	if (CheckWin()) {
-	    sprintf(buffer, "You finished the game in %i moves.", MoveCount);
-
-	    if (WMRunAlertPanel(WMWidgetScreen(w), win, "You Won!", buffer,
-				"Wee!", "Gah! Lemme retry!", NULL) == WAPRDefault) {
-		exit(0);
-	    }
-	    
-	    ResetGame();
-	}
-    }
-}
-
-
-static void resizeObserver(void *self, WMNotification *notif)
-{
-    WMSize size = WMGetViewSize(WMWidgetView(win));
-    int x, y;
-    
-    WinSize = size.width;
-    for (y = 0; y < Size; y++) {
-	for (x = 0; x < Size; x++) {
-	    if (MAP(x,y) >= 0) {
-		WMResizeWidget(Button[(int)MAP(x,y)],
-			       WinSize/Size, WinSize/Size);
-		WMMoveWidget(Button[(int)MAP(x,y)],
-			     x*(WinSize/Size), y*(WinSize/Size));
-	    }
-	}
-    }
-
-}
-
-
-int main(int argc, char **argv)
-{
-    Display *dpy;
-    WMScreen *scr;
-    int x, y, i;
-    
-    WMInitializeApplication("Puzzle", &argc, argv);
-
-    
-    dpy = XOpenDisplay("");
-    if (!dpy) {
-	printf("could not open display\n");
-	exit(1);
-    }
-    
-    scr = WMCreateScreen(dpy, DefaultScreen(dpy));
-    
-    win = WMCreateWindow(scr, "puzzle");
-    WMResizeWidget(win, WinSize, WinSize);
-    WMSetWindowTitle(win, "zuPzel");
-    WMSetWindowMinSize(win, 80, 80);
-    WMSetWindowAspectRatio(win, 2, 2, 2, 2);
-    WMSetWindowResizeIncrements(win, Size, Size);
-    WMSetViewNotifySizeChanges(WMWidgetView(win), True);
-    WMAddNotificationObserver(resizeObserver, NULL,
-			      WMViewSizeDidChangeNotification,
-			      WMWidgetView(win));
-			      
-			      
-    
-    for (i = y = 0; y < Size && i < Size*Size-1; y++) {
-	for (x = 0; x < Size && i < Size*Size-1; x++) {
-	    char buf[32];
-	    WMColor *color;
-	    RColor col;
-	    RHSVColor hsv;
-	    
-	    hsv.hue = i*360/(Size*Size-1);
-	    hsv.saturation = 120;
-	    hsv.value = 200;
-	    
-	    RHSVtoRGB(&hsv, &col);
-
-	    color = WMCreateRGBColor(scr, col.red<<8, col.green<<8,
-				     col.blue<<8, False);
-
-	    MAP(x,y) = i;
-	    Button[i] = WMCreateButton(win, WBTMomentaryLight);
-	    WMSetWidgetBackgroundColor(Button[i], color);
-	    WMReleaseColor(color);
-	    WMSetButtonAction(Button[i], buttonClick, (void*)i);
-	    WMResizeWidget(Button[i], WinSize/Size, WinSize/Size);
-	    WMMoveWidget(Button[i], x*(WinSize/Size), y*(WinSize/Size));
-	    sprintf(buf, "%i", i+1);
-	    WMSetButtonText(Button[i], buf);
-	    WMSetButtonTextAlignment(Button[i], WACenter);
-	    i++;
-	}
-    }
-        
-    WMMapSubwidgets(win);
-    WMMapWidget(win);
-    WMRealizeWidget(win);
-    
-    ResetGame();
-
-    WMScreenMainLoop(scr);
-    
-    return 0;
-}
--- a/WINGs/python/.cvsignore
+++ b/WINGs/python/.cvsignore
@@ -1,5 +0,0 @@
-build
-WINGs.c
-wings.so
-*.pyc
-*.pyo
--- a/WINGs/python/Makefile
+++ b/WINGs/python/Makefile
@@ -1,17 +0,0 @@
-
-all: WINGs.c
-	python setup.py build
-	ln -sf `find build/ -name wings.so` .
-
-install: WINGs.c
-	python setup.py install
-
-clean:
-	rm -rf build dist WINGs.c *.o *~ *.so MANIFEST wings.py *.pyc *.pyo core
-
-dist:
-	python setup.py sdist
-
-WINGs.c: WINGs.i
-	swig -python -noproxy `get-wings-flags --cflags` -I.. -o WINGs.c WINGs.i
-
--- a/Show More
+++ b/Show More