WindowMaker 0.95.0-crm

debian: problem with spaces and forget autogenerated files
debian: Version bump in nightly build script.
2026-03-15 06:43:32 +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
561 changed files with 39055 additions and 40138 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/.gitignore
+++ b/.gitignore
@@ -1,61 +1,33 @@
+*.lo
+*.o
 *Makefile
 *Makefile.in
-WINGs/get-wings-flags
-WINGs/get-wutil-flags
-WINGs/WINGs.pc
+.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
-contrib/WindowMaker.spec
+depcomp
+install-sh
 libtool
 ltmain.sh
-src/config.h
-src/config.h.in
-src/stamp-h1
+missing
+mkinstalldirs
+stamp-h1
+contrib/WindowMaker.spec
+m4/
 src/wconfig.h
-wmlib/wmlib.pc
-wrlib/get-wraster-flags
-wrlib/wrlib.pc
-*.o
-*.lo
-WINGs/Examples/.libs/colorpick
-WINGs/Examples/.libs/fontl
-WINGs/Examples/.libs/puzzle
-WINGs/Examples/colorpick
-WINGs/Examples/connect
-WINGs/Examples/fontl
-WINGs/Examples/puzzle
-WINGs/Examples/server
-WINGs/Extras/.libs/test
-WINGs/Extras/libExtraWINGs.a
-WINGs/Extras/test
-WINGs/Tests/.libs/testmywidget
-WINGs/Tests/.libs/wmfile
-WINGs/Tests/.libs/wmquery
-WINGs/Tests/.libs/wtest
-WINGs/Tests/testmywidget
-WINGs/Tests/wmfile
-WINGs/Tests/wmquery
-WINGs/Tests/wtest
-WINGs/libWINGs.a
-WINGs/libWUtil.a
-WPrefs.app/.libs/WPrefs
-WPrefs.app/WPrefs
-WindowMaker/Defaults/WMRootMenu
-WindowMaker/Defaults/WMState
-WindowMaker/Defaults/WMWindowAttributes
-WindowMaker/Defaults/WindowMaker
-WindowMaker/IconSets/Default.iconset
-src/.libs/wmaker
 src/wmaker
 test/wtest
-util/.libs/wmagnify
-util/.libs/wmsetbg
-util/.libs/wmsetup
 util/convertfonts
 util/geticonset
 util/getstyle
@@ -65,23 +37,41 @@ util/wdread
 util/wdwrite
 util/wmagnify
 util/wmaker.inst
+util/wmgenmenu
+util/wmmenugen
 util/wmsetbg
 util/wmsetup
 util/wxcopy
 util/wxpaste
-wmlib/libWMaker.a
-wrlib/.libs/libwraster.a
-wrlib/.libs/libwraster.la
-wrlib/.libs/libwraster.lai
-wrlib/.libs/libwraster.so
-wrlib/.libs/libwraster.so.3
-wrlib/.libs/libwraster.so.3.1.0
+wrlib/get-wraster-flags
 wrlib/libwraster.la
-wrlib/tests/.libs/testdraw
-wrlib/tests/.libs/testgrad
-wrlib/tests/.libs/testrot
-wrlib/tests/.libs/view
 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/6
+++ b/6
@@ -4,11 +4,11 @@


 	If you find a bug please fill this form and send it to 
-developers@windowmaker.info 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.info/cgi-bin/bugs or by sending this report 
-to bugs@windowmaker.info
+http://bugs.windowmaker.org/projects/wmaker/issues or by sending this report to
+bugs@windowmaker.org


 0. Before reporting this bug I already:
--- 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/63
+++ b/63
@@ -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.info/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.info, has
-set up some new lists from the domain.  Please read the information on the
-web pages at http://www.windowmaker.info/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.info/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,52 +173,34 @@ 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.info/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 
+Yes there is. To check out from mercurial use:
+  hg clone http://hg.windowmaker.org/wmaker wmaker

-            export CVSROOT=":pserver:anoncvs@cvs.net-community.com:/gnustep"
-            cvs login
+To update your source tree, cd to the wmaker directory and type
+  hg pull
          
-'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. 
-
-


 -=-=-=-=-=-=-
--- a/FAQ.I18N
+++ b/FAQ.I18N
@@ -51,7 +51,7 @@ If I18N support does not work for you, check these:

          However, please note that if your font is something like:

-          	"Trebuchet MS,Luxi Sans,sans:pixelsize=12"
+		"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
--- a/FAQ.I18N.cs
+++ b/FAQ.I18N.cs
@@ -1,64 +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
-
-        - 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,57 +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
-
-	- 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/176
+++ b/176
@@ -1,52 +1,18 @@

 		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
+- Intel GNU/Linux Systems in general

-All registered trademarks are registered by their owners. (duh)
-
-Patches to make it work on other platforms are welcome. 
+Patches to make it work on other platforms are welcome.


 REQUIREMENTS:
@@ -54,7 +20,7 @@ REQUIREMENTS:

 The following software is required to use Window Maker:

- X11R6.x	
+- X11R6.x
 	Window Maker can be compiled in older versions of X, like X11R5
 	(Solaris) or X11R4 (OpenWindows) but it will not work 100% correctly.
 	In such servers there will not be application icons and you'll have
@@ -84,17 +50,17 @@ OPTIONAL:
 These libraries are not required to make Window Maker work, but they
 are supported in case you want to use them. Version numbers are those
 that I have (and therefore, guraranteed to work), but other versions
-might work too. 
+might work too.


 - libXPM 4.7 or newer
-	Older versions may not work!!! 
+	Older versions may not work!!!
 	Available at ftp://sunsite.unc.edu/pub/Linux/libs/X/

 	There is builtin support for XPM files, but it will not
 	load images in some uncommon encodings.

- libpng 0.96 or newer and zlib     
+- libpng 0.96 or newer and zlib
 	For PNG image support.
 	http://www.cdrom.com/pub/png/

@@ -151,26 +117,18 @@ To get a list of other options, run ./configure --help
 	texture generation a little bit, but in some cases it seems to be
 	necessary due to a bug that manifests as messed icons and textures.

--disable-motif 
+--disable-motif
 	disable support for mwm 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.

--disable-xpm   
+--disable-xpm
 	disables use of the XPM library even if it is available on your
 	system.

--disable-png	
+--disable-png
 	disables use of PNG library

 --disable-tiff
@@ -189,73 +147,14 @@ 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.
 	Uninstall any packaged version of Window Maker before installing a new
-	version. 
+	version.

 - RedHat GNU/Linux
-	RedHat systems have several annoying problems. If you use it, 
+	RedHat systems have several annoying problems. If you use it,
 	be sure to follow the steps below or Window Maker will not work:

 	* if you installed the Window Maker that comes with RedHat, uninstall
@@ -275,7 +174,7 @@ apply.
 	seem to have bugs that cause the system to hang.

 - Debian GNU/Linux
-	If you want JPEG and TIFF support, make sure you have libtiff-dev 
+	If you want JPEG and TIFF support, make sure you have libtiff-dev
 	and libjpeg-dev	installed.

 - SuSE GNU/Linux
@@ -313,11 +212,11 @@ smaller, you can instead type:
 This will build and install Window Maker with default parameters.

 If you want to customize some compile-time options, you can do the
-following. 
+following.

-	1. (optional) Look at the CONFIGURE OPTIONS section above for the 
+	1. (optional) Look at the CONFIGURE OPTIONS section above for the
 	options available. Also run:
- 
+
 	./configure --help

 	to get a complete listing of other options that are available.
@@ -327,14 +226,14 @@ following.

 	./configure --enable-modelock

-	3. (optional) Edit src/wconfig.h with your favorite text editor 
+	3. (optional) Edit src/wconfig.h with your favorite text editor
 	and browse through it for some options you might want to change.

 	4. Compile. Just type:

 	make

-	5. Login as root (if you can't do that, read the "I don't have the 
+	5. Login as root (if you can't do that, read the "I don't have the
 	root password :-(" section) and install Window Maker in your system:
 		su root
 		make install
@@ -356,8 +255,8 @@ Type:
 	wmaker.inst will install Window Maker configuration files and will
 setup X to automatically launch Window Maker at startup.

-	That's it! 
-	
+	That's it!
+
 	You can type "man wmaker" to get some general help for configuration
 and other stuff.

@@ -371,12 +270,11 @@ Installing the extras package
 -----------------------------

 Unpack WindowMaker-extra-<version-number>.tar.gz in /usr/local/share
-        
-You can get the file at ftp://ftp.windowmaker.info. 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.



@@ -386,14 +284,14 @@ 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/Applications
+./configure --prefix=/home/jshmoe --with-gnustepdir=/home/jshmoe/GNUstep/Applications


 Then make /home/jshmoe/bin be included in your search PATH, add
-/home/jshmoe/lib to your LD_LIBRARY_PATH environment variable and run 
+/home/jshmoe/lib to your LD_LIBRARY_PATH environment variable and run
 bin/wmaker.inst

 Of course, /home/jshmoe is supposed to be replaced with your actual home
@@ -435,7 +333,7 @@ autoconf 2.13
 automake 1.4
 libtool 1.3

-Note that it must not be libtool 1.2b, it must be libtool 1.3, 
+Note that it must not be libtool 1.2b, it must be libtool 1.3,
 from the GNU sites.

 == configure doesn't detect libtiff, or other graphic libraries.
@@ -449,7 +347,7 @@ located. You can put multiple paths in any of these options, as the example
 of --with-incs-from shows. Just put a space between them.


-== configure doesn't detect libXpm. 
+== configure doesn't detect libXpm.

 * Check if you have a symbolic link from libXpm.so.4.9 to libXpm.so

@@ -471,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
@@ -506,12 +404,12 @@ in sh
 The list of supported locales can be found in po/README.
 English is the default language.

-Read po/README if you wish to translate and maintain locale files 
+Read po/README if you wish to translate and maintain locale files
 for other languages.

 2 - Additionally, if your language uses multi-byte characters, such
 as Japanese or Korean, you must set the MultiByteText option to YES
-in ~/GNUstep/Defaults/WMGLOBAL 
+in ~/GNUstep/Defaults/WMGLOBAL

 3 - Configure, build and install Window Maker normally.

@@ -536,5 +434,3 @@ following order (for brazilian portuguese, in this case):
 menu.pt_BR
 menu.pt
 menu
-
-
--- a/INSTALL.cs
+++ b/INSTALL.cs
@@ -1,604 +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-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.info. 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/Applications
-
-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,594 +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.info/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-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/Applications
-
-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,631 +0,0 @@
-
-		Instructions pour l'installation de Window Maker
-
-
-
-PLATEFORMES SUPPORTÉES
-======================
-(c.à.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. 
-
-
-PRÉ-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.
-	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-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 SPÉCIFIQUES 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 l'être.
-
-		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 PROBLÈMES;
-
-	* 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 dans 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 ainsi 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) Éditez src/wconfig.h avec votre éditeur 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.info. 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/Applications
-
-
-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 À 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.
-
-
-PROBLÈMES
-=========
-
-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, alors qu'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,557 +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.info/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-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.info. 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/Applications
-
-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,601 +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.info/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-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.info. 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/Applications
-
-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/90
+++ b/90
@@ -1,90 +0,0 @@
-
-Window Maker FTP Mirror Sites
-=======-=====================
-
-Official Site (USA):
--------------------
-ftp://ftp.windowmaker.info/
-
-
-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.info/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,10 +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.cs INSTALL.fr INSTALL.es INSTALL.pt INSTALL.sk \
-	README.definable-cursor README.pt MIRRORS COPYING.WTFPL mkpatch 
-#	libwmfun-0.0.3.tar.gz
+BUILT_SOURCES = config-paths.h

+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/73
+++ b/73
@@ -2,6 +2,79 @@
 NEWS for veteran Window Maker users
 -----------------------------------

+--- 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
--- a/222
+++ b/222
@@ -4,8 +4,7 @@
 		       		GNU Window Maker
 		       	       X11 Window Manager

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

 				     by

@@ -41,26 +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) 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.
+Hints (information given by applications to integrate well with the window
+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
@@ -72,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.
@@ -81,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
@@ -102,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.
@@ -119,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

@@ -150,114 +142,98 @@ HELP ME!!!
 ==========

 There is a mailing list for discussing Window Maker at
-wm-user@windowmaker.info To subscribe to it, send a message containing:
-	subscribe 
-in the subject of the message to wm-user-request@windowmaker.info
+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.
+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. 
+To enable it, hit the Control+Shift+NumLock or Shift+NumLock key combination.
 You should hear the speaker beeping. To disable it, do the same thing.

 To control the mouse the numeric keypad is used as follows:
@@ -283,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.

@@ -313,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 
+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.
@@ -339,15 +313,15 @@ 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.info
+to wmaker-dev@lists.windowmaker.org

--- a/README.es
+++ b/README.es
@@ -1,345 +0,0 @@
-
-
-
-		       		GNU Window Maker
-		       	       X11 Window Manager
-
-	  	   	   <http://windowmaker.info>
-		 	 <ftp://ftp.windowmaker.info>
-
-				     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.info. Para suscribirse, envie un mensaje que contenga:
-
-	subscribe
-en el tema del mensaje a wm-user-request@windowmaker.info
-
-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.
-
-
-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.info>
-Dan Pascu <dan@windowmaker.info>
-]d <id@windowmaker.info>
-
-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.info
-
-
-
-traducido por Efraín Maximiliano Palermo <max_drake2001@yahoo.com.ar>
--- a/README.pt
+++ b/README.pt
@@ -1,351 +0,0 @@
-
-
-		            GNU Window Maker
-                  	Gerenciador de Janelas X11
-	
-	  	   	  <http://windowmaker.info>
-		 	 <ftp://ftp.windowmaker.info>
-
-				     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.info. Para inscrever-se, mande uma mensagem
-contendo:
-	subscribe
-no campo de assunto da mensagem para wm-user-request@windowmaker.info
-
-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.
-
-
-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.info>
-Dan Pascu <dan@windowmaker.info>
-]d <id@windowmaker.info>
-
-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.info
-
-
-Traduzido por: Ricardo Sartori <sartori@inf.ufsc.br>
--- a/1
+++ b/1
@@ -67,5 +67,4 @@ 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
- dynamically loadable everything

--- 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/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,5 +0,0 @@
-Makefile Makefile.in
-connect server fontl puzzle UserTime.plist
-colorpick
-.libs
-.psrc .inslog2 tca.map tca.log pchdir *.rpt
--- a/WINGs/Examples/Makefile.am
+++ b/WINGs/Examples/Makefile.am
@@ -1,35 +1,34 @@
 ## automake input file for WINGs - Examples

-AUTOMAKE_OPTIONS = no-dependencies
+AUTOMAKE_OPTIONS =


 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.a
+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_srcdir)/libtool $(LIBTOOL_ARG)
+LIBTOOL = $(QUIET) $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG)

 .c.o:
 	$(QUIET)$(COMPILE) -c $<
--- a/WINGs/Examples/connect.c
+++ b/WINGs/Examples/connect.c
@@ -1,172 +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,10 +13,9 @@
 *  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>
@@ -36,7 +35,7 @@ void show(WMWidget * self, void *data)
 	void *d;
 	WMLabel *l = (WMLabel *) data;
 	d = WMGetHangedData(self);
-	sprintf(buf, "%i -  0x%x - 0%o", (int)(uintptr_t) d, (int)(uintptr_t) d, (int)(uintptr_t) d);
+	sprintf(buf, "%i -  0x%x - 0%o", (int)d, (int)d, (int)d);
 	WMSetLabelText(l, buf);
 }

--- a/WINGs/Examples/puzzle.c
+++ b/WINGs/Examples/puzzle.c
@@ -8,7 +8,7 @@

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

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

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

 		if (CheckWin()) {
--- a/WINGs/Examples/server.c
+++ b/WINGs/Examples/server.c
@@ -1,661 +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 char *findDelimiter(char *data, 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,37 +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_AR = $(QUIET_AR) $(AR) $(ARFLAGS)
-
-libExtraWINGs_a_SOURCES = 	\
+libExtraWINGs_la_SOURCES = 	\
 	wtableview.c \
 	wtabledelegates.c \
 	wtableview.h \
 	wtabledelegates.h 

-AM_CFLAGS = @NOSTRICTALIASING@
-
 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)
-
-LIBTOOL = $(QUIET) $(SHELL) $(top_srcdir)/libtool $(LIBTOOL_ARG)
-
-.c.o:
-	$(QUIET)$(COMPILE) -c $<
-
-.c.obj:
-	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	$(QUIET)$(LTCOMPILE) -c -o $@ $<
--- a/WINGs/Extras/test.c
+++ b/WINGs/Extras/test.c
@@ -36,7 +36,7 @@ void *valueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row)
 			col2[i] = 0;
 		}
 	}
-	if ((int)(uintptr_t) WMGetTableColumnId(column) == 1)
+	if ((uintptr_t)WMGetTableColumnId(column) == 1)
 		return col1[row];
 	else
 		return (void *)(uintptr_t) col2[row];
@@ -44,10 +44,10 @@ void *valueForCell(WMTableViewDelegate * self, WMTableColumn * column, int row)

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

 static WMTableViewDelegate delegate = {
--- a/WINGs/Extras/wtabledelegates.c
+++ b/WINGs/Extras/wtabledelegates.c
@@ -192,7 +192,7 @@ static void ESCellPainter(WMTableColumnDelegate * self, WMTableColumn * column,
 {
 	EnumSelectorData *strdata = (EnumSelectorData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);
-	int i = (int)(uintptr_t) 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,
@@ -203,7 +203,7 @@ static void selectedESCellPainter(WMTableColumnDelegate * self, WMTableColumn *
 {
 	EnumSelectorData *strdata = (EnumSelectorData *) self->data;
 	WMTableView *table = WMGetTableColumnTableView(column);
-	int i = (int)(uintptr_t) 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,
@@ -214,7 +214,7 @@ static void beginESCellEdit(WMTableColumnDelegate * self, WMTableColumn * column
 {
 	EnumSelectorData *strdata = (EnumSelectorData *) self->data;
 	WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
-	int data = (int)(uintptr_t) WMTableViewDataForCell(strdata->table, column, row);
+	uintptr_t data = (uintptr_t)WMTableViewDataForCell(strdata->table, column, row);

 	wassertr(data < strdata->count);

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

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

 	if (i) {
@@ -319,7 +319,7 @@ static void beginBSCellEdit(WMTableColumnDelegate * self, WMTableColumn * column
 {
 	BooleanSwitchData *strdata = (BooleanSwitchData *) self->data;
 	WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
-	int data = (int)(uintptr_t) 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);
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -1,57 +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

-LIBTOOL = $(QUIET) $(SHELL) $(top_srcdir)/libtool $(LIBTOOL_ARG)
-
-libWINGs_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS)
-
-libWUtil_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS)
-
-#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 make-rgb 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 \
@@ -87,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 \
@@ -114,29 +84,40 @@ libWUtil_a_SOURCES = 	\


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

 INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 	@XFTFLAGS@ @HEADER_SEARCH_PATH@

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

-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
+DISTCLEANFILES = $(pkgconfig_DATA) get-wings-flags get-wutil-flags

-.c.o:
-	$(QUIET)$(COMPILE) -c $<
+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)' >> $@

-.c.obj:
-	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+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 $@

-.c.lo:
-	$(QUIET)$(LTCOMPILE) -c -o $@ $<
--- 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
--- 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,16 +1,17 @@
 ## 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
@@ -19,13 +20,3 @@ INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ \
 	-DDEBUG
 	
-LIBTOOL = $(QUIET) $(SHELL) $(top_srcdir)/libtool $(LIBTOOL_ARG)
-
-.c.o:
-	$(QUIET)$(COMPILE) -c $<
-
-.c.obj:
-	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	$(QUIET)$(LTCOMPILE) -c -o $@ $<
--- a/WINGs/Tests/wtest.c
+++ b/WINGs/Tests/wtest.c
@@ -563,7 +563,7 @@ void testText(WMScreen * scr)
 	WMSetTextEditable(text, False);
 	WMSetTextIgnoresNewline(text, False);

-#define FNAME "Verdana,Luxi Sans:pixelsize=12"
+#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 " \
--- 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,17 +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
-
-.c.o:
-	$(QUIET)$(COMPILE) -c $<
-
-.c.obj:
-	$(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	$(QUIET)$(LTCOMPILE) -c -o $@ $<
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -590,7 +590,7 @@ typedef struct W_DragDestinationProcs {
 } WMDragDestinationProcs;


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


 WMPoint wmkpoint(int x, int y);
@@ -604,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 ]-------------------------------------------- */



@@ -613,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);

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

 int WMScreenDepth(WMScreen *scr);

+void WMSetFocusToWidget(WMWidget *widget);

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

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

@@ -655,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);

@@ -677,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,
@@ -693,7 +700,7 @@ Bool WMRequestSelection(WMView *view, Atom selection, Atom target,

 extern char *WMSelectionOwnerDidChangeNotification;

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

 WMArray* WMCreateDragOperationArray(int initialSize);

@@ -704,6 +711,8 @@ WMDragOperationType WMGetDragOperationItemType(WMDragOperationItem* item);

 char* WMGetDragOperationItemText(WMDragOperationItem* item);

+/* ---[ WINGs/dragsource.c ]---------------------------------------------- */
+
 void WMSetViewDragImage(WMView* view, WMPixmap *dragImage);

 void WMReleaseViewDragImage(WMView* view);
@@ -724,18 +733,18 @@ void WMSetViewDraggable(WMView *view, WMDragSourceProcs *procs, WMPixmap *dragIm

 void WMUnsetViewDraggable(WMView *view);

+/* ---[ WINGs/dragdestination.c ]----------------------------------------- */
+
 void WMRegisterViewForDraggedTypes(WMView *view, WMArray *acceptedTypes);

 void WMUnregisterViewDraggedTypes(WMView *view);

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

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

 Bool WMIsAntialiasingEnabled(WMScreen *scrPtr);

-/* ....................................................................... */
-
 WMFont* WMCreateFont(WMScreen *scrPtr, char *fontName);

 WMFont* WMCopyFontWithStyle(WMScreen *scrPtr, WMFont *font, WMFontStyle style);
@@ -760,7 +769,16 @@ WMFont* WMSystemFontOfSize(WMScreen *scrPtr, int size);

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

-/* ....................................................................... */
+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);

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

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

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


 WMColor* WMDarkGrayColor(WMScreen *scr);
@@ -844,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);

@@ -904,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,
@@ -921,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;

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

 extern char *WMViewRealizedNotification;

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

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

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


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

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

@@ -992,7 +993,7 @@ void WMSetWindowDocumentEdited(WMWindow *win, Bool flag);

 void WMCloseWindow(WMWindow *win);

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

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

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

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

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

 WMLabel* WMCreateLabel(WMWidget *parent);

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

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

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

 WMFrame* WMCreateFrame(WMWidget *parent);

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

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

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

 WMTextField* WMCreateTextField(WMWidget *parent);

@@ -1125,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);
@@ -1137,7 +1140,7 @@ extern char *WMTextDidChangeNotification;
 extern char *WMTextDidBeginEditingNotification;
 extern char *WMTextDidEndEditingNotification;

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

 WMScroller* WMCreateScroller(WMWidget *parent);

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

 extern char *WMScrollerDidScrollNotification;

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

 WMList* WMCreateList(WMWidget *parent);

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

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

 WMBrowser* WMCreateBrowser(WMWidget *parent);

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

 void WMSetBrowserHasScroller(WMBrowser *bPtr, int hasScroller);

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


 Bool WMMenuItemIsSeparator(WMMenuItem *item);
@@ -1368,7 +1371,7 @@ WMMenu* WMGetMenuItemSubmenu(WMMenuItem *item);
 Bool WMGetMenuItemHasSubmenu(WMMenuItem *item);
 */

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

 WMPopUpButton* WMCreatePopUpButton(WMWidget *parent);

@@ -1405,24 +1408,7 @@ 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);

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

 extern char *WMColorPanelColorChangedNotification;

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

 WMColorWell* WMCreateColorWell(WMWidget *parent);

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


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

 WMScrollView* WMCreateScrollView(WMWidget *parent);

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

 void WMSetScrollViewPageScroll(WMScrollView *sPtr, int amount);

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

 WMSlider* WMCreateSlider(WMWidget *parent);

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

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

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


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

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

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

 WMTabView* WMCreateTabView(WMWidget *parent);

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


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

 WMBox* WMCreateBox(WMWidget *parent);

@@ -1771,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,
@@ -1800,7 +1785,7 @@ void WMDestroyInputPanel(WMInputPanel *panel);

 void WMDestroyGenericPanel(WMGenericPanel *panel);

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

 /* only 1 instance per WMScreen */
 WMOpenPanel* WMGetOpenPanel(WMScreen *scrPtr);
@@ -1828,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);
--- a/WINGs/WINGs/WINGsP.h
+++ b/WINGs/WINGs/WINGsP.h
@@ -16,6 +16,7 @@

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

 #ifdef __cplusplus
@@ -590,13 +591,13 @@ Bool W_SendDnDClientMessage(Display *dpy, Window win, Atom message,

 void W_DragSourceStartTimer(WMDraggingInfo *info);

-void W_DragSourceStopTimer();
+void W_DragSourceStopTimer(void);

 void W_DragSourceStateHandler(WMDraggingInfo *info, XClientMessageEvent *event);

 void W_DragDestinationStartTimer(WMDraggingInfo *info);

-void W_DragDestinationStopTimer();
+void W_DragDestinationStopTimer(void);

 void W_DragDestinationStoreEnterMsgInfo(WMDraggingInfo *info, WMView *toplevel,
                                        XClientMessageEvent *event);
--- 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,21 +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* wmalloc0(size_t size);
-void* wrealloc(void *ptr, size_t newsize);
-void wfree(void *ptr);
+/* ---[ WINGs/proplist.c ]------------------------------------------------ */

-#define wnew(type, count) wmalloc(sizeof(type)*count)
-#define wnew0(type, count) wmalloc0(sizeof(type)*count)
+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.
@@ -262,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);

@@ -271,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 */

@@ -320,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);
@@ -383,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.
@@ -419,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);

@@ -485,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.
@@ -577,7 +541,7 @@ int WMBagIndexForIterator(WMBag *bag, WMBagIterator ptr);



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

 /* WMData handling */

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

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

 /* Generic Tree and TreeNode */

@@ -686,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);
@@ -736,7 +705,7 @@ void WMEnqueueCoalesceNotification(WMNotificationQueue *queue,
                                   unsigned coalesceMask);


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

 /* Property Lists handling */

@@ -836,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);

@@ -891,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;
@@ -1027,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/bagtree.c
+++ b/WINGs/bagtree.c
@@ -358,16 +358,10 @@ 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;
--- a/WINGs/configuration.c
+++ b/WINGs/configuration.c
@@ -6,8 +6,8 @@

 _WINGsConfiguration WINGsConfiguration;

-#define SYSTEM_FONT "Trebuchet MS,Luxi Sans"
-#define BOLD_SYSTEM_FONT "Trebuchet MS,Luxi Sans:bold"
+#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"
@@ -37,6 +37,7 @@ static unsigned getButtonWithName(const char *name, unsigned defaultButton)
 void W_ReadConfigurations(void)
 {
 	WMUserDefaults *defaults;
+	Bool aaIsSet = False;

 	memset(&WINGsConfiguration, 0, sizeof(_WINGsConfiguration));

@@ -44,13 +45,19 @@ void W_ReadConfigurations(void)

 	if (defaults) {
 		char *buttonName;
+		WMPropList *val;
 		unsigned button;

 		WINGsConfiguration.systemFont = WMGetUDStringForKey(defaults, "SystemFont");

 		WINGsConfiguration.boldSystemFont = WMGetUDStringForKey(defaults, "BoldSystemFont");

-		WINGsConfiguration.antialiasedText = WMGetUDBoolForKey(defaults, "AntialiasedText");
+		val = WMGetUDObjectForKey(defaults, "AntialiasedText");
+		if (val && WMIsPLString(val) && WMGetFromPLString(val)) {
+			aaIsSet = True;
+			WINGsConfiguration.antialiasedText =
+				WMGetUDBoolForKey(defaults, "AntialiasedText");
+		}

 		WINGsConfiguration.doubleClickDelay = WMGetUDIntegerForKey(defaults, "DoubleClickTime");

@@ -91,6 +98,9 @@ void W_ReadConfigurations(void)
 	if (WINGsConfiguration.defaultFontSize == 0) {
 		WINGsConfiguration.defaultFontSize = DEFAULT_FONT_SIZE;
 	}
+	if (!aaIsSet) {
+		WINGsConfiguration.antialiasedText = True;
+	}
 	if (!WINGsConfiguration.floppyPath) {
 		WINGsConfiguration.floppyPath = FLOPPY_PATH;
 	}
--- a/WINGs/connection.c
+++ b/WINGs/connection.c
@@ -1,958 +0,0 @@
-/*
- *  WINGs WMConnection 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.
- */
-
-/*
- * TODO:
- * - decide if we want to support connections with external sockets, else
- *   clean up the structure of the unneeded members.
- * - decide what to do with all wwarning() calls that are still there.
- *
- */
-
-#include "wconfig.h"
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <signal.h>
-#ifdef __FreeBSD__
-#include <sys/signal.h>
-#endif
-
-#include "WINGs.h"
-
-/* Some older systems does not define this (linux libc5, maybe others too) */
-#ifndef SHUT_RDWR
-# define SHUT_RDWR              2
-#endif
-
-/* For SunOS */
-#ifndef SA_RESTART
-# define SA_RESTART             0
-#endif
-
-/* For Solaris */
-#ifndef INADDR_NONE
-# define INADDR_NONE           -1
-#endif
-
-/* Stuff for setting the sockets into non-blocking mode. */
-/*
-#ifdef	__POSIX_SOURCE
-# define NONBLOCK_OPT           O_NONBLOCK
-#else
-# define NONBLOCK_OPT           FNDELAY
-#endif
-*/
-
-#define NONBLOCK_OPT            O_NONBLOCK
-
-#define NETBUF_SIZE             4096
-
-#define DEF_TIMEOUT             600	/* 600 seconds == 10 minutes */
-
-int WCErrorCode = 0;
-
-static Bool SigInitialized = False;
-
-static unsigned int DefaultTimeout = DEF_TIMEOUT;
-static unsigned int OpenTimeout = DEF_TIMEOUT;
-
-typedef struct TimeoutData {
-	unsigned timeout;
-	WMHandlerID *handler;
-} TimeoutData;
-
-typedef struct W_Connection {
-	int sock;		/* the socket we speak through */
-
-	struct {
-		WMHandlerID *read;	/* the input read handler */
-		WMHandlerID *write;	/* the input write handler */
-		WMHandlerID *exception;	/* the input exception handler */
-	} handler;
-
-	ConnectionDelegate *delegate;	/* client delegates */
-	void *clientData;	/* client data */
-	unsigned int uflags;	/* flags for the client */
-
-	WMArray *outputQueue;
-	unsigned bufPos;
-
-	TimeoutData sendTimeout;
-	TimeoutData openTimeout;
-
-	WMConnectionState state;
-	WMConnectionTimeoutState timeoutState;
-
-	char *address;
-	char *service;
-	char *protocol;
-
-	Bool closeOnRelease;
-	Bool shutdownOnClose;
-	Bool wasNonBlocking;
-	Bool isNonBlocking;
-
-} W_Connection;
-
-static void clearOutputQueue(WMConnection * cPtr)
-{
-	cPtr->bufPos = 0;
-	WMEmptyArray(cPtr->outputQueue);
-}
-
-static void openTimeout(void *cdata)
-{
-	WMConnection *cPtr = (WMConnection *) cdata;
-
-	cPtr->openTimeout.handler = NULL;
-	if (cPtr->handler.write) {
-		WMDeleteInputHandler(cPtr->handler.write);
-		cPtr->handler.write = NULL;
-	}
-	if (cPtr->state != WCConnected) {
-		cPtr->state = WCTimedOut;
-		cPtr->timeoutState = WCTWhileOpening;
-		if (cPtr->delegate && cPtr->delegate->didTimeout) {
-			(*cPtr->delegate->didTimeout) (cPtr->delegate, cPtr);
-		} else {
-			WMCloseConnection(cPtr);
-			cPtr->state = WCTimedOut;	/* the above set state to WCClosed */
-		}
-	}
-}
-
-static void sendTimeout(void *cdata)
-{
-	WMConnection *cPtr = (WMConnection *) cdata;
-
-	cPtr->sendTimeout.handler = NULL;
-	if (cPtr->handler.write) {
-		WMDeleteInputHandler(cPtr->handler.write);
-		cPtr->handler.write = NULL;
-	}
-	if (WMGetArrayItemCount(cPtr->outputQueue) > 0) {
-		clearOutputQueue(cPtr);
-		cPtr->state = WCTimedOut;
-		cPtr->timeoutState = WCTWhileSending;
-		/* // should we close it no matter what (after calling the didTimeout
-		   // delegate)? -Dan */
-		if (cPtr->delegate && cPtr->delegate->didTimeout) {
-			(*cPtr->delegate->didTimeout) (cPtr->delegate, cPtr);
-		} else {
-			WMCloseConnection(cPtr);
-			cPtr->state = WCTimedOut;	/* the above set state to WCClosed */
-		}
-	}
-}
-
-static void inputHandler(int fd, int mask, void *clientData)
-{
-	WMConnection *cPtr = (WMConnection *) clientData;
-
-	if (cPtr->state == WCClosed || cPtr->state == WCDied)
-		return;
-
-	if ((mask & WIWriteMask)) {
-		int result;
-
-		if (cPtr->state == WCInProgress) {
-			Bool failed;
-			socklen_t len = sizeof(result);
-
-			WCErrorCode = 0;
-			if (getsockopt(cPtr->sock, SOL_SOCKET, SO_ERROR,
-				       (void *)&result, &len) == 0 && result != 0) {
-				cPtr->state = WCFailed;
-				WCErrorCode = result;
-				failed = True;
-				/* should call wsyserrorwithcode(result, ...) here? */
-			} else {
-				cPtr->state = WCConnected;
-				failed = False;
-			}
-
-			if (cPtr->handler.write) {
-				WMDeleteInputHandler(cPtr->handler.write);
-				cPtr->handler.write = NULL;
-			}
-
-			if (cPtr->openTimeout.handler) {
-				WMDeleteTimerHandler(cPtr->openTimeout.handler);
-				cPtr->openTimeout.handler = NULL;
-			}
-
-			if (cPtr->delegate && cPtr->delegate->didInitialize)
-				(*cPtr->delegate->didInitialize) (cPtr->delegate, cPtr);
-
-			/* we use failed and not cPtr->state here, because cPtr may be
-			 * destroyed by the delegate called above if the connection failed
-			 */
-			if (failed)
-				return;
-		} else if (cPtr->state == WCConnected) {
-			result = WMFlushConnection(cPtr);
-			if (result > 0 && cPtr->delegate && cPtr->delegate->canResumeSending) {
-				(*cPtr->delegate->canResumeSending) (cPtr->delegate, cPtr);
-			}
-		}
-	}
-
-	if (!cPtr->delegate)
-		return;
-
-	/* if the connection died, may get destroyed in the delegate, so retain */
-	wretain(cPtr);
-
-	if ((mask & WIReadMask) && cPtr->delegate->didReceiveInput)
-		(*cPtr->delegate->didReceiveInput) (cPtr->delegate, cPtr);
-
-	if ((mask & WIExceptMask) && cPtr->delegate->didCatchException)
-		(*cPtr->delegate->didCatchException) (cPtr->delegate, cPtr);
-
-	wrelease(cPtr);
-}
-
-static Bool setSocketNonBlocking(int sock, Bool flag)
-{
-	int state;
-	Bool isNonBlock;
-
-	state = fcntl(sock, F_GETFL, 0);
-
-	if (state < 0) {
-		/* set WCErrorCode here? -Dan */
-		return False;
-	}
-
-	isNonBlock = (state & NONBLOCK_OPT) != 0;
-
-	if (flag) {
-		if (isNonBlock)
-			return True;
-		state |= NONBLOCK_OPT;
-	} else {
-		if (!isNonBlock)
-			return True;
-		state &= ~NONBLOCK_OPT;
-	}
-
-	if (fcntl(sock, F_SETFL, state) < 0) {
-		/* set WCErrorCode here? -Dan */
-		return False;
-	}
-
-	return True;
-}
-
-static void setConnectionAddress(WMConnection * cPtr, struct sockaddr_in *socketaddr)
-{
-	wassertr(cPtr->address == NULL);
-
-	cPtr->address = wstrdup(inet_ntoa(socketaddr->sin_addr));
-	cPtr->service = wmalloc(16);
-	sprintf(cPtr->service, "%hu", ntohs(socketaddr->sin_port));
-	cPtr->protocol = wstrdup("tcp");
-}
-
-static struct sockaddr_in *getSocketAddress(char *name, char *service, char *protocol)
-{
-	static struct sockaddr_in socketaddr;
-	struct servent *sp;
-
-	if (!protocol || protocol[0] == 0)
-		protocol = "tcp";
-
-	memset(&socketaddr, 0, sizeof(struct sockaddr_in));
-	socketaddr.sin_family = AF_INET;
-
-	/*
-	 * If we were given a hostname, we use any address for that host.
-	 * Otherwise we expect the given name to be an address unless it is
-	 * NULL (any address).
-	 */
-	if (name && name[0] != 0) {
-		WMHost *host = WMGetHostWithName(name);
-
-		if (!host)
-			return NULL;	/* name is not a hostname nor a number and dot adr */
-
-		name = WMGetHostAddress(host);
-#ifndef	HAVE_INET_ATON
-		if ((socketaddr.sin_addr.s_addr = inet_addr(name)) == INADDR_NONE) {
-#else
-		if (inet_aton(name, &socketaddr.sin_addr) == 0) {
-#endif
-			WMReleaseHost(host);
-			return NULL;
-		}
-		WMReleaseHost(host);
-	} else {
-		socketaddr.sin_addr.s_addr = htonl(INADDR_ANY);
-	}
-
-	if (!service || service[0] == 0) {
-		socketaddr.sin_port = 0;
-	} else if ((sp = getservbyname(service, protocol)) == 0) {
-		char *endptr;
-		unsigned portNumber;
-
-		portNumber = strtoul(service, &endptr, 10);
-
-		if (service[0] != 0 && *endptr == 0 && portNumber < 65536) {
-			socketaddr.sin_port = htons(portNumber);
-		} else {
-			return NULL;
-		}
-	} else {
-		socketaddr.sin_port = sp->s_port;
-	}
-
-	return &socketaddr;
-}
-
-static void dummyHandler(int signum)
-{
-}
-
-static WMConnection *createConnectionWithSocket(int sock, Bool closeOnRelease)
-{
-	WMConnection *cPtr;
-	struct sigaction sig_action;
-
-	cPtr = wmalloc(sizeof(WMConnection));
-	wretain(cPtr);
-	memset(cPtr, 0, sizeof(WMConnection));
-
-	fcntl(sock, F_SETFD, FD_CLOEXEC);	/* by default close on exec */
-
-	cPtr->sock = sock;
-	cPtr->openTimeout.timeout = OpenTimeout;
-	cPtr->openTimeout.handler = NULL;
-	cPtr->sendTimeout.timeout = DefaultTimeout;
-	cPtr->sendTimeout.handler = NULL;
-	cPtr->closeOnRelease = closeOnRelease;
-	cPtr->shutdownOnClose = 1;
-	cPtr->outputQueue = WMCreateArrayWithDestructor(16, (WMFreeDataProc *) WMReleaseData);
-	cPtr->state = WCNotConnected;
-	cPtr->timeoutState = WCTNone;
-
-	/* ignore dead pipe */
-	if (!SigInitialized) {
-		/* Because POSIX mandates that only signal with handlers are reset
-		 * accross an exec*(), we do not want to propagate ignoring SIGPIPEs
-		 * to children. Hence the dummy handler. Philippe Troin <phil@fifi.org>
-		 */
-		sig_action.sa_handler = &dummyHandler;
-		sig_action.sa_flags = SA_RESTART;
-		sigaction(SIGPIPE, &sig_action, NULL);
-		SigInitialized = True;
-	}
-
-	return cPtr;
-}
-
-#if 0
-WMConnection *WMCreateConnectionWithSocket(int sock, Bool closeOnRelease)
-{
-	WMConnection *cPtr;
-	struct sockaddr_in clientname;
-	int size;
-	int n;
-
-	cPtr = createConnectionWithSocket(sock, closeOnRelease);
-	cPtr->wasNonBlocking = WMIsConnectionNonBlocking(cPtr);
-	cPtr->isNonBlocking = cPtr->wasNonBlocking;
-
-	/* some way to find out if it is connected, and binded. can't find
-	   if it listens though!!!
-	 */
-
-	size = sizeof(clientname);
-	n = getpeername(sock, (struct sockaddr *)&clientname, &size);
-	if (n == 0) {
-		/* Since we have a peer, it means we are connected */
-		cPtr->state = WCConnected;
-	} else {
-		size = sizeof(clientname);
-		n = getsockname(sock, (struct sockaddr *)&clientname, &size);
-		if (n == 0) {
-			/* We don't have a peer, but we are binded to an address.
-			 * Assume we are listening on it (we don't know that for sure!)
-			 */
-			cPtr->state = WCListening;
-		} else {
-			cPtr->state = WCNotConnected;
-		}
-	}
-
-	return cPtr;
-}
-#endif
-
-/*
- * host     is the name on which we want to listen for incoming connections,
- *          and it must be a name of this host, or NULL if we want to listen
- *          on any incoming address.
- * service  is either a service name as present in /etc/services, or the port
- *          number we want to listen on. If NULL, a random port between
- *          1024 and 65535 will be assigned to us.
- * protocol is one of "tcp" or "udp". If NULL, "tcp" will be used by default.
- *          currently only "tcp" is supported.
- */
-WMConnection *WMCreateConnectionAsServerAtAddress(char *host, char *service, char *protocol)
-{
-	WMConnection *cPtr;
-	struct sockaddr_in *socketaddr;
-	socklen_t size;
-	int sock, on;
-
-	WCErrorCode = 0;
-
-	if ((socketaddr = getSocketAddress(host, service, protocol)) == NULL) {
-		wwarning(_("Bad address-service-protocol combination"));
-		return NULL;
-	}
-
-	/* Create the actual socket */
-	sock = socket(PF_INET, SOCK_STREAM, 0);
-	if (sock < 0) {
-		WCErrorCode = errno;
-		return NULL;
-	}
-
-	/*
-	 * Set socket options. We try to make the port reusable and have it
-	 * close as fast as possible without waiting in unnecessary wait states
-	 * on close.
-	 */
-	on = 1;
-	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on));
-
-	if (bind(sock, (struct sockaddr *)socketaddr, sizeof(*socketaddr)) < 0) {
-		WCErrorCode = errno;
-		close(sock);
-		return NULL;
-	}
-
-	if (listen(sock, 10) < 0) {
-		WCErrorCode = errno;
-		close(sock);
-		return NULL;
-	}
-
-	/* Find out what is the address/service/protocol we get */
-	/* In case some of address/service/protocol were NULL */
-	size = sizeof(*socketaddr);
-	if (getsockname(sock, (struct sockaddr *)socketaddr, &size) < 0) {
-		WCErrorCode = errno;
-		close(sock);
-		return NULL;
-	}
-
-	cPtr = createConnectionWithSocket(sock, True);
-	cPtr->state = WCListening;
-	WMSetConnectionNonBlocking(cPtr, True);
-
-	setConnectionAddress(cPtr, socketaddr);
-
-	return cPtr;
-}
-
-WMConnection *WMCreateConnectionToAddress(char *host, char *service, char *protocol)
-{
-	WMConnection *cPtr;
-	struct sockaddr_in *socketaddr;
-	int sock;
-
-	WCErrorCode = 0;
-
-	wassertrv(service != NULL && service[0] != 0, NULL);
-
-	if (host == NULL || host[0] == 0)
-		host = "localhost";
-
-	if ((socketaddr = getSocketAddress(host, service, protocol)) == NULL) {
-		wwarning(_("Bad address-service-protocol combination"));
-		return NULL;
-	}
-
-	/* Create the actual socket */
-	sock = socket(PF_INET, SOCK_STREAM, 0);
-	if (sock < 0) {
-		WCErrorCode = errno;
-		return NULL;
-	}
-	/* make socket blocking while we connect. */
-	setSocketNonBlocking(sock, False);
-	if (connect(sock, (struct sockaddr *)socketaddr, sizeof(*socketaddr)) < 0) {
-		WCErrorCode = errno;
-		close(sock);
-		return NULL;
-	}
-
-	cPtr = createConnectionWithSocket(sock, True);
-	cPtr->state = WCConnected;
-	WMSetConnectionNonBlocking(cPtr, True);
-	setConnectionAddress(cPtr, socketaddr);
-
-	return cPtr;
-}
-
-WMConnection *WMCreateConnectionToAddressAndNotify(char *host, char *service, char *protocol)
-{
-	WMConnection *cPtr;
-	struct sockaddr_in *socketaddr;
-	int sock;
-	Bool isNonBlocking;
-
-	WCErrorCode = 0;
-
-	wassertrv(service != NULL && service[0] != 0, NULL);
-
-	if (host == NULL || host[0] == 0)
-		host = "localhost";
-
-	if ((socketaddr = getSocketAddress(host, service, protocol)) == NULL) {
-		wwarning(_("Bad address-service-protocol combination"));
-		return NULL;
-	}
-
-	/* Create the actual socket */
-	sock = socket(PF_INET, SOCK_STREAM, 0);
-	if (sock < 0) {
-		WCErrorCode = errno;
-		return NULL;
-	}
-	isNonBlocking = setSocketNonBlocking(sock, True);
-	if (connect(sock, (struct sockaddr *)socketaddr, sizeof(*socketaddr)) < 0) {
-		if (errno != EINPROGRESS) {
-			WCErrorCode = errno;
-			close(sock);
-			return NULL;
-		}
-	}
-
-	cPtr = createConnectionWithSocket(sock, True);
-	cPtr->state = WCInProgress;
-	cPtr->isNonBlocking = isNonBlocking;
-
-	cPtr->handler.write = WMAddInputHandler(cPtr->sock, WIWriteMask, inputHandler, cPtr);
-
-	cPtr->openTimeout.handler = WMAddTimerHandler(cPtr->openTimeout.timeout * 1000, openTimeout, cPtr);
-
-	setConnectionAddress(cPtr, socketaddr);
-
-	return cPtr;
-}
-
-static void removeAllHandlers(WMConnection * cPtr)
-{
-	if (cPtr->handler.read)
-		WMDeleteInputHandler(cPtr->handler.read);
-	if (cPtr->handler.write)
-		WMDeleteInputHandler(cPtr->handler.write);
-	if (cPtr->handler.exception)
-		WMDeleteInputHandler(cPtr->handler.exception);
-	if (cPtr->openTimeout.handler)
-		WMDeleteTimerHandler(cPtr->openTimeout.handler);
-	if (cPtr->sendTimeout.handler)
-		WMDeleteTimerHandler(cPtr->sendTimeout.handler);
-
-	cPtr->handler.read = NULL;
-	cPtr->handler.write = NULL;
-	cPtr->handler.exception = NULL;
-	cPtr->openTimeout.handler = NULL;
-	cPtr->sendTimeout.handler = NULL;
-}
-
-void WMDestroyConnection(WMConnection * cPtr)
-{
-	if (cPtr->closeOnRelease && cPtr->sock >= 0) {
-		if (cPtr->shutdownOnClose) {
-			shutdown(cPtr->sock, SHUT_RDWR);
-		}
-		close(cPtr->sock);
-	}
-
-	removeAllHandlers(cPtr);
-	WMFreeArray(cPtr->outputQueue);	/* will also free the items with the destructor */
-
-	if (cPtr->address) {
-		wfree(cPtr->address);
-		wfree(cPtr->service);
-		wfree(cPtr->protocol);
-	}
-
-	wrelease(cPtr);
-}
-
-void WMCloseConnection(WMConnection * cPtr)
-{
-	if (cPtr->sock >= 0) {
-		if (cPtr->shutdownOnClose) {
-			shutdown(cPtr->sock, SHUT_RDWR);
-		}
-		close(cPtr->sock);
-		cPtr->sock = -1;
-	}
-
-	removeAllHandlers(cPtr);
-	clearOutputQueue(cPtr);
-
-	cPtr->state = WCClosed;
-}
-
-WMConnection *WMAcceptConnection(WMConnection * listener)
-{
-	struct sockaddr_in clientname;
-	socklen_t size;
-	int newSock;
-	WMConnection *newConnection;
-
-	WCErrorCode = 0;
-	wassertrv(listener && listener->state == WCListening, NULL);
-
-	size = sizeof(clientname);
-	newSock = accept(listener->sock, (struct sockaddr *)&clientname, &size);
-	if (newSock < 0) {
-		WCErrorCode = ((errno != EAGAIN && errno != EWOULDBLOCK) ? errno : 0);
-		return NULL;
-	}
-
-	newConnection = createConnectionWithSocket(newSock, True);
-	WMSetConnectionNonBlocking(newConnection, True);
-	newConnection->state = WCConnected;
-	setConnectionAddress(newConnection, &clientname);
-
-	return newConnection;
-}
-
-char *WMGetConnectionAddress(WMConnection * cPtr)
-{
-	return cPtr->address;
-}
-
-char *WMGetConnectionService(WMConnection * cPtr)
-{
-	return cPtr->service;
-}
-
-char *WMGetConnectionProtocol(WMConnection * cPtr)
-{
-	return cPtr->protocol;
-}
-
-int WMGetConnectionSocket(WMConnection * cPtr)
-{
-	return cPtr->sock;
-}
-
-WMConnectionState WMGetConnectionState(WMConnection * cPtr)
-{
-	return cPtr->state;
-}
-
-WMConnectionTimeoutState WMGetConnectionTimeoutState(WMConnection * cPtr)
-{
-	return cPtr->timeoutState;
-}
-
-Bool WMEnqueueConnectionData(WMConnection * cPtr, WMData * data)
-{
-	wassertrv(cPtr->state != WCNotConnected && cPtr->state != WCListening, False);
-	wassertrv(cPtr->state != WCInProgress && cPtr->state != WCFailed, False);
-
-	if (cPtr->state != WCConnected)
-		return False;
-
-	WMAddToArray(cPtr->outputQueue, WMRetainData(data));
-	return True;
-}
-
-/*
- * Return value:
- * -1 - not connected or connection died while sending
- *  0 - couldn't send the data (or part of it). data is saved in a queue
- *      and will be sent when possible. after it is sent the canResumeSending
- *      callback will be called.
- *  1 - data was succesfully sent
- */
-int WMSendConnectionData(WMConnection * cPtr, WMData * data)
-{
-	int bytes, pos, len;
-	TimeoutData *tPtr = &cPtr->sendTimeout;
-	const unsigned char *dataBytes;
-
-	wassertrv(cPtr->state != WCNotConnected && cPtr->state != WCListening, -1);
-	wassertrv(cPtr->state != WCInProgress && cPtr->state != WCFailed, -1);
-
-	if (cPtr->state != WCConnected)
-		return -1;
-
-	/* If we have no data just flush the queue, else try to send data */
-	if (data && WMGetDataLength(data) > 0) {
-		WMAddToArray(cPtr->outputQueue, WMRetainData(data));
-		/* If there already was something in queue, and also a write input
-		 * handler is established, it means we were unable to send, so
-		 * return and let the write handler notify us when we can send.
-		 */
-		if (WMGetArrayItemCount(cPtr->outputQueue) > 1 && cPtr->handler.write)
-			return 0;
-	}
-
-	while (WMGetArrayItemCount(cPtr->outputQueue) > 0) {
-		data = WMGetFromArray(cPtr->outputQueue, 0);
-		dataBytes = (const unsigned char *)WMDataBytes(data);
-		len = WMGetDataLength(data);
-		pos = cPtr->bufPos;	/* where we're left last time */
-		while (pos < len) {
- again:
-			bytes = write(cPtr->sock, dataBytes + pos, len - pos);
-			if (bytes < 0) {
-				switch (errno) {
-				case EINTR:
-					goto again;
-				case EWOULDBLOCK:
-					/* save the position where we're left and add a timeout */
-					cPtr->bufPos = pos;
-					if (!tPtr->handler) {
-						tPtr->handler = WMAddTimerHandler(tPtr->timeout * 1000,
-										  sendTimeout, cPtr);
-					}
-					if (!cPtr->handler.write) {
-						cPtr->handler.write =
-						    WMAddInputHandler(cPtr->sock, WIWriteMask, inputHandler, cPtr);
-					}
-					return 0;
-				default:
-					WCErrorCode = errno;
-					cPtr->state = WCDied;
-					removeAllHandlers(cPtr);
-					if (cPtr->delegate && cPtr->delegate->didDie)
-						(*cPtr->delegate->didDie) (cPtr->delegate, cPtr);
-					return -1;
-				}
-			}
-			pos += bytes;
-		}
-		WMDeleteFromArray(cPtr->outputQueue, 0);
-		cPtr->bufPos = 0;
-		if (tPtr->handler) {
-			WMDeleteTimerHandler(tPtr->handler);
-			tPtr->handler = NULL;
-		}
-		/*if (cPtr->handler.write) {
-		   WMDeleteInputHandler(cPtr->handler.write);
-		   cPtr->handler.write = NULL;
-		   } */
-	}
-
-	if (cPtr->handler.write) {
-		WMDeleteInputHandler(cPtr->handler.write);
-		cPtr->handler.write = NULL;
-	}
-
-	return 1;
-}
-
-/*
- * WMGetConnectionAvailableData(connection):
- *
- * will return a WMData structure containing the available data on the
- * specified connection. If connection is non-blocking (default) and no data
- * is available when this function is called, an empty WMData is returned.
- *
- * If an error occurs while reading or the other side closed connection,
- * it will return NULL.
- * Also trying to read from an already died or closed connection is
- * considered to be an error condition, and will return NULL.
- */
-WMData *WMGetConnectionAvailableData(WMConnection * cPtr)
-{
-	char buffer[NETBUF_SIZE];
-	int nbytes;
-	WMData *aData;
-
-	wassertrv(cPtr->state != WCNotConnected && cPtr->state != WCListening, NULL);
-	wassertrv(cPtr->state != WCInProgress && cPtr->state != WCFailed, NULL);
-
-	if (cPtr->state != WCConnected)
-		return NULL;
-
-	aData = NULL;
-
- again:
-	nbytes = read(cPtr->sock, buffer, NETBUF_SIZE);
-	if (nbytes < 0) {
-		switch (errno) {
-		case EINTR:
-			goto again;
-		case EWOULDBLOCK:
-			aData = WMCreateDataWithCapacity(0);
-			break;
-		default:
-			WCErrorCode = errno;
-			cPtr->state = WCDied;
-			removeAllHandlers(cPtr);
-			if (cPtr->delegate && cPtr->delegate->didDie)
-				(*cPtr->delegate->didDie) (cPtr->delegate, cPtr);
-			break;
-		}
-	} else if (nbytes == 0) {	/* the other side has closed connection */
-		cPtr->state = WCClosed;
-		removeAllHandlers(cPtr);
-		if (cPtr->delegate && cPtr->delegate->didDie)
-			(*cPtr->delegate->didDie) (cPtr->delegate, cPtr);
-	} else {
-		aData = WMCreateDataWithBytes(buffer, nbytes);
-	}
-
-	return aData;
-}
-
-void WMSetConnectionDelegate(WMConnection * cPtr, ConnectionDelegate * delegate)
-{
-	wassertr(cPtr->sock >= 0);
-	/* Don't try to set the delegate multiple times */
-	wassertr(cPtr->delegate == NULL);
-
-	cPtr->delegate = delegate;
-	if (delegate && delegate->didReceiveInput && !cPtr->handler.read)
-		cPtr->handler.read = WMAddInputHandler(cPtr->sock, WIReadMask, inputHandler, cPtr);
-	if (delegate && delegate->didCatchException && !cPtr->handler.exception)
-		cPtr->handler.exception = WMAddInputHandler(cPtr->sock, WIExceptMask, inputHandler, cPtr);
-}
-
-#if 0
-Bool WMIsConnectionNonBlocking(WMConnection * cPtr)
-{
-#if 1
-	int state;
-
-	state = fcntl(cPtr->sock, F_GETFL, 0);
-
-	if (state < 0) {
-		/* If we can't use fcntl on socket, this probably also means we could
-		 * not use fcntl to set non-blocking mode, and since a socket defaults
-		 * to blocking when created, return False as the best assumption */
-		return False;
-	}
-
-	return ((state & NONBLOCK_OPT) != 0);
-#else
-	return cPtr->isNonBlocking;
-#endif
-}
-#endif
-
-Bool WMSetConnectionNonBlocking(WMConnection * cPtr, Bool flag)
-{
-	wassertrv(cPtr != NULL && cPtr->sock >= 0, False);
-
-	flag = ((flag == 0) ? 0 : 1);
-
-	if (cPtr->isNonBlocking == flag)
-		return True;
-
-	if (setSocketNonBlocking(cPtr->sock, flag) == True) {
-		cPtr->isNonBlocking = flag;
-		return True;
-	}
-
-	return False;
-}
-
-Bool WMSetConnectionCloseOnExec(WMConnection * cPtr, Bool flag)
-{
-	wassertrv(cPtr != NULL && cPtr->sock >= 0, False);
-
-	if (fcntl(cPtr->sock, F_SETFD, ((flag == 0) ? 0 : FD_CLOEXEC)) < 0) {
-		return False;
-	}
-
-	return True;
-}
-
-void WMSetConnectionShutdownOnClose(WMConnection * cPtr, Bool flag)
-{
-	cPtr->shutdownOnClose = ((flag == 0) ? 0 : 1);
-}
-
-void *WMGetConnectionClientData(WMConnection * cPtr)
-{
-	return cPtr->clientData;
-}
-
-void WMSetConnectionClientData(WMConnection * cPtr, void *data)
-{
-	cPtr->clientData = data;
-}
-
-unsigned int WMGetConnectionFlags(WMConnection * cPtr)
-{
-	return cPtr->uflags;
-}
-
-void WMSetConnectionFlags(WMConnection * cPtr, unsigned int flags)
-{
-	cPtr->uflags = flags;
-}
-
-WMArray *WMGetConnectionUnsentData(WMConnection * cPtr)
-{
-	return cPtr->outputQueue;
-}
-
-void WMSetConnectionDefaultTimeout(unsigned int timeout)
-{
-	if (timeout == 0) {
-		DefaultTimeout = DEF_TIMEOUT;
-	} else {
-		DefaultTimeout = timeout;
-	}
-}
-
-void WMSetConnectionOpenTimeout(unsigned int timeout)
-{
-	if (timeout == 0) {
-		OpenTimeout = DefaultTimeout;
-	} else {
-		OpenTimeout = timeout;
-	}
-}
-
-void WMSetConnectionSendTimeout(WMConnection * cPtr, unsigned int timeout)
-{
-	if (timeout == 0) {
-		cPtr->sendTimeout.timeout = DefaultTimeout;
-	} else {
-		cPtr->sendTimeout.timeout = timeout;
-	}
-}
--- a/WINGs/dragcommon.c
+++ b/WINGs/dragcommon.c
@@ -135,7 +135,7 @@ W_SendDnDClientMessage(Display * dpy, Window win, Atom message,
 #endif

 	if (!windowExists(dpy, win)) {
-		wwarning("xdnd message target %d does no longer exist.", win);
+		wwarning("xdnd message target %lu does no longer exist.", win);
 		return False;	/* message not sent */
 	}

--- a/WINGs/dragdestination.c
+++ b/WINGs/dragdestination.c
@@ -311,13 +311,13 @@ void W_DragDestinationStoreEnterMsgInfo(WMDraggingInfo * info, WMView * toplevel
 	XDND_AWARE_VIEW(info) = toplevel;
 	updateSourceWindow(info, event);

-/*
+#if 0
    if (event->data.l[1] & 1)
        /* XdndTypeList property is available */
-/*        XDND_SOURCE_TYPES(info) = getTypesFromTypeList(scr, XDND_SOURCE_WIN(info));
+        XDND_SOURCE_TYPES(info) = getTypesFromTypeList(scr, XDND_SOURCE_WIN(info));
    else
        XDND_SOURCE_TYPES(info) = getTypesFromThreeTypes(scr, event);
-*/
+#endif
 	XDND_SOURCE_TYPES(info) = getTypesFromThreeTypes(scr, event);

 	/* to use if the 3 types are not enough */
--- a/WINGs/dragsource.c
+++ b/WINGs/dragsource.c
@@ -478,7 +478,7 @@ static void registerDescriptionList(WMScreen * scr, WMView * view, WMArray * ope

 	/* size of XA_STRING info */
 	for (i = 0; i < count; i++) {
-		size += strlen(WMGetDragOperationItemText(WMGetFromArray(operationArray, i))) + 1;	/* +1 = +NULL */
+		size += strlen(WMGetDragOperationItemText(WMGetFromArray(operationArray, i))) + 1 /* NULL */;
 	}

 	/* create text list */
@@ -487,7 +487,7 @@ static void registerDescriptionList(WMScreen * scr, WMView * view, WMArray * ope

 	for (i = 0; i < count; i++) {
 		text = WMGetDragOperationItemText(WMGetFromArray(operationArray, i));
-		strcpy(textListItem, text);
+		wstrlcpy(textListItem, text, size);

 		/* to next text offset */
 		textListItem = &(textListItem[strlen(textListItem) + 1]);
--- a/WINGs/error.c
+++ b/WINGs/error.c
@@ -20,167 +20,77 @@

 #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];
-
-	snprintf(buf, sizeof(buf), _("Unknown error %d"), errnum);
-	return buf;
-#else				/* no strerror() and no sys_errlist[] */
-	static char buf[] = "Error 12345678901234567890";
-
-	snprintf(buf, sizeof(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
@@ -35,38 +35,52 @@

 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)
@@ -84,9 +98,9 @@ char *wexpandpath(char *path)
 		path++;
 		if (*path == '/' || *path == 0) {
 			home = wgethomedir();
-			if (strlen(home) > PATH_MAX)
+			if (strlen(home) > PATH_MAX ||
+			    wstrlcpy(buffer, home, sizeof(buffer)) >= sizeof(buffer))
 				goto error;
-			strcat(buffer, home);
 		} else {
 			int j;
 			j = 0;
@@ -98,9 +112,8 @@ char *wexpandpath(char *path)
 				path++;
 			}
 			home = getuserhomedir(buffer2);
-			if (!home || strlen(home) > PATH_MAX)
+			if (!home || wstrlcat(buffer, home, sizeof(buffer)) >= sizeof(buffer))
 				goto error;
-			strcat(buffer, home);
 		}
 	}

@@ -131,17 +144,18 @@ char *wexpandpath(char *path)
 					if ((i += strlen(buffer2) + 2) > PATH_MAX)
 						goto error;
 					buffer[i] = 0;
-					strcat(buffer, "$(");
-					strcat(buffer, buffer2);
+					if (wstrlcat(buffer, "$(", sizeof(buffer)) >= sizeof(buffer) ||
+					    wstrlcat(buffer, buffer2, sizeof(buffer)) >= sizeof(buffer))
+						goto error;
 					if (*(path-1)==')') {
-						if (++i > PATH_MAX)
+						if (++i > PATH_MAX ||
+						    wstrlcat(buffer, ")", sizeof(buffer)) >= sizeof(buffer))
 							goto error;
-						strcat(buffer, ")");
 					}
 				} else {
-					if ((i += strlen(tmp)) > PATH_MAX)
+					if ((i += strlen(tmp)) > PATH_MAX ||
+					    wstrlcat(buffer, tmp, sizeof(buffer)) >= sizeof(buffer))
 						goto error;
-					strcat(buffer, tmp);
 				}
 			} else {
 				while (*path != 0 && *path != '/') {
@@ -152,14 +166,14 @@ char *wexpandpath(char *path)
 				}
 				tmp = getenv(buffer2);
 				if (!tmp) {
-					if ((i += strlen(buffer2) + 1) > PATH_MAX)
+					if ((i += strlen(buffer2) + 1) > PATH_MAX ||
+					    wstrlcat(buffer, "$", sizeof(buffer)) >= sizeof(buffer) ||
+					    wstrlcat(buffer, buffer2, sizeof(buffer)) >= sizeof(buffer))
 						goto error;
-					strcat(buffer, "$");
-					strcat(buffer, buffer2);
 				} else {
-					if ((i += strlen(tmp)) > PATH_MAX)
+					if ((i += strlen(tmp)) > PATH_MAX ||
+					    wstrlcat(buffer, tmp, sizeof(buffer)) >= sizeof(buffer))
 						goto error;
-					strcat(buffer, tmp);
 				}
 			}
 		} else {
@@ -175,9 +189,9 @@ char *wexpandpath(char *path)

 error:
 	errno = ENAMETOOLONG;
-	wsyserror(_("could not expand %s"), origpath);
-	/* FIXME: too many functions handle a return value of NULL incorrectly */
-	exit(1);
+	werror(_("could not expand %s"), origpath);
+
+	return NULL;
 }

 /* return address of next char != tok or end of string whichever comes first */
@@ -251,11 +265,20 @@ char *wfindfile(char *paths, char *file)
 		path = wmalloc(len + flen + 2);
 		path = memcpy(path, tmp, len);
 		path[len] = 0;
-		if (path[len - 1] != '/')
-			strcat(path, "/");
-		strcat(path, file);
+		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) {
 				return fullpath;
@@ -301,8 +324,11 @@ char *wfindfileinlist(char **path_list, char *file)
 		path = wmalloc(len + flen + 2);
 		path = memcpy(path, path_list[i], len);
 		path[len] = 0;
-		strcat(path, "/");
-		strcat(path, file);
+		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);
@@ -314,6 +340,7 @@ char *wfindfileinlist(char **path_list, char *file)
 			wfree(fullpath);
 		}
 	}
+
 	return NULL;
 }

@@ -358,8 +385,11 @@ char *wfindfileinarray(WMPropList * array, char *file)
 		path = wmalloc(len + flen + 2);
 		path = memcpy(path, p, len);
 		path[len] = 0;
-		strcat(path, "/");
-		strcat(path, file);
+		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);
--- 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/hashtable.c
+++ b/WINGs/hashtable.c
@@ -81,7 +81,6 @@ static void rebuildTable(WMHashTable * table)
 	newSize = table->size * 2;

 	table->table = wmalloc(sizeof(char *) * newSize);
-	memset(table->table, 0, sizeof(char *) * newSize);
 	table->size = newSize;

 	for (i = 0; i < oldSize; i++) {
--- a/WINGs/host.c
+++ b/WINGs/host.c
@@ -1,265 +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,9 +0,0 @@
-
-#include <X11/Xlib.h>
-
-#include "WINGsP.h"
-
-void InitI18n(Display * dpy)
-{
-
-}
--- a/WINGs/memory.c
+++ b/WINGs/memory.c
@@ -29,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
@@ -71,16 +74,16 @@ void *wmalloc(size_t size)

 	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
@@ -95,20 +98,10 @@ void *wmalloc(size_t size)
 			}
 		}
 	}
+	memset(tmp, 0, size);
 	return tmp;
 }

-void *wmalloc0(size_t size)
-{
-	void *ptr = wmalloc(size);
-	if (!ptr)
-		return NULL;
-
-	memset(ptr, 0, size);
-
-	return ptr;
-}
-
 void *wrealloc(void *ptr, size_t newsize)
 {
 	void *nptr;
@@ -119,16 +112,16 @@ void *wrealloc(void *ptr, size_t newsize)
 		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) {
 			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
@@ -175,11 +168,23 @@ void *wretain(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);
+		free(ptr);
 #endif
+	ptr = NULL;
 }

 void wrelease(void *ptr)
--- a/WINGs/notification.c
+++ b/WINGs/notification.c
@@ -35,11 +35,9 @@ WMNotification *WMCreateNotification(const char *name, void *object, void *clien
 	Notification *nPtr;

 	nPtr = wmalloc(sizeof(Notification));
-
 	nPtr->name = name;
 	nPtr->object = object;
 	nPtr->clientData = clientData;
-
 	nPtr->refCount = 1;

 	return nPtr;
@@ -89,11 +87,9 @@ static NotificationCenter *notificationCenter = NULL;
 void W_InitNotificationCenter(void)
 {
 	notificationCenter = wmalloc(sizeof(NotificationCenter));
-
 	notificationCenter->nameTable = WMCreateHashTable(WMStringPointerHashCallbacks);
 	notificationCenter->objectTable = WMCreateHashTable(WMIntHashCallbacks);
 	notificationCenter->nilList = NULL;
-
 	notificationCenter->observerTable = WMCreateHashTable(WMIntHashCallbacks);
 }

@@ -366,7 +362,6 @@ WMNotificationQueue *WMCreateNotificationQueue(void)
 	NotificationQueue *queue;

 	queue = wmalloc(sizeof(NotificationQueue));
-
 	queue->asapQueue = WMCreateArrayWithDestructor(8, (WMFreeDataProc *) WMReleaseNotification);
 	queue->idleQueue = WMCreateArrayWithDestructor(8, (WMFreeDataProc *) WMReleaseNotification);
 	queue->next = notificationQueueList;
@@ -384,17 +379,17 @@ void WMEnqueueNotification(WMNotificationQueue * queue, WMNotification * notific
 #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);
 }

-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);
 }
--- 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 \
--- a/WINGs/proplist.c
+++ b/WINGs/proplist.c
@@ -1,12 +1,16 @@

-#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <ftw.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <string.h>
+#include <strings.h>
 #include <unistd.h>
-#include <ctype.h>

 #include "WUtil.h"
 #include "wconfig.h"
@@ -888,7 +892,6 @@ WMPropList *WMCreatePLString(char *str)
 	wassertrv(str != NULL, NULL);

 	plist = (WMPropList *) wmalloc(sizeof(W_PropList));
-
 	plist->type = WPLString;
 	plist->d.string = wstrdup(str);
 	plist->retainCount = 1;
@@ -903,7 +906,6 @@ WMPropList *WMCreatePLData(WMData * data)
 	wassertrv(data != NULL, NULL);

 	plist = (WMPropList *) wmalloc(sizeof(W_PropList));
-
 	plist->type = WPLData;
 	plist->d.data = WMRetainData(data);
 	plist->retainCount = 1;
@@ -918,7 +920,6 @@ WMPropList *WMCreatePLDataWithBytes(unsigned char *bytes, unsigned int length)
 	wassertrv(bytes != NULL, NULL);

 	plist = (WMPropList *) wmalloc(sizeof(W_PropList));
-
 	plist->type = WPLData;
 	plist->d.data = WMCreateDataWithBytes(bytes, length);
 	plist->retainCount = 1;
@@ -933,7 +934,6 @@ WMPropList *WMCreatePLDataWithBytesNoCopy(unsigned char *bytes, unsigned int len
 	wassertrv(bytes != NULL, NULL);

 	plist = (WMPropList *) wmalloc(sizeof(W_PropList));
-
 	plist->type = WPLData;
 	plist->d.data = WMCreateDataWithBytesNoCopy(bytes, length, destructor);
 	plist->retainCount = 1;
@@ -1497,14 +1497,14 @@ WMPropList *WMReadPropListFromFile(char *file)
 	f = fopen(file, "rb");
 	if (!f) {
 		/* let the user print the error message if he really needs to */
-		/*wsyserror(_("could not open domain file '%s' for reading"), file); */
+		/*werror(_("could not open domain file '%s' for reading"), file); */
 		return NULL;
 	}

 	if (stat(file, &stbuf) == 0) {
 		length = (size_t) stbuf.st_size;
 	} else {
-		wsyserror(_("could not get size for file '%s'"), file);
+		werror(_("could not get size for file '%s'"), file);
 		fclose(f);
 		return NULL;
 	}
@@ -1517,7 +1517,7 @@ WMPropList *WMReadPropListFromFile(char *file)

 	if (fread(pldata->ptr, length, 1, f) != 1) {
 		if (ferror(f)) {
-			wsyserror(_("error reading from file '%s'"), file);
+			werror(_("error reading from file '%s'"), file);
 		}
 		plist = NULL;
 		goto cleanup;
@@ -1549,83 +1549,200 @@ WMPropList *WMReadPropListFromFile(char *file)

 /* TODO: review this function's code */

-Bool WMWritePropListToFile(WMPropList * plist, char *path, Bool atomically)
+Bool WMWritePropListToFile(WMPropList * plist, char *path)
 {
 	char *thePath = NULL;
 	char *desc;
 	FILE *theFile;
-
-	if (atomically) {
 #ifdef	HAVE_MKSTEMP
-		int fd, mask;
+	int fd, mask;
 #endif

-		/* Use the path name of the destination file as a prefix for the
-		 * mkstemp() call so that we can be sure that both files are on
-		 * the same filesystem and the subsequent rename() will work. */
-		thePath = wstrconcat(path, ".XXXXXX");
+	if (!wmkdirhier(path))
+		return False;
+
+	/* Use the path name of the destination file as a prefix for the
+	 * mkstemp() call so that we can be sure that both files are on
+	 * the same filesystem and the subsequent rename() will work. */
+	thePath = wstrconcat(path, ".XXXXXX");

 #ifdef  HAVE_MKSTEMP
-		if ((fd = mkstemp(thePath)) < 0) {
-			wsyserror(_("mkstemp (%s) failed"), thePath);
-			goto failure;
-		}
-		mask = umask(0);
-		umask(mask);
-		fchmod(fd, 0644 & ~mask);
-		if ((theFile = fdopen(fd, "wb")) == NULL) {
-			close(fd);
-		}
-#else
-		if (mktemp(thePath) == NULL) {
-			wsyserror(_("mktemp (%s) failed"), thePath);
-			goto failure;
-		}
-		theFile = fopen(thePath, "wb");
-#endif
-	} else {
-		thePath = wstrdup(path);
-		theFile = fopen(thePath, "wb");
+	if ((fd = mkstemp(thePath)) < 0) {
+		werror(_("mkstemp (%s) failed"), thePath);
+		goto failure;
 	}
+	mask = umask(0);
+	umask(mask);
+	fchmod(fd, 0644 & ~mask);
+	if ((theFile = fdopen(fd, "wb")) == NULL) {
+		close(fd);
+	}
+#else
+	if (mktemp(thePath) == NULL) {
+		werror(_("mktemp (%s) failed"), thePath);
+		goto failure;
+	}
+	theFile = fopen(thePath, "wb");
+#endif

 	if (theFile == NULL) {
-		wsyserror(_("open (%s) failed"), thePath);
+		werror(_("open (%s) failed"), thePath);
 		goto failure;
 	}

 	desc = indentedDescription(plist, 0);

 	if (fprintf(theFile, "%s\n", desc) != strlen(desc) + 1) {
-		wsyserror(_("writing to file: %s failed"), thePath);
+		werror(_("writing to file: %s failed"), thePath);
 		wfree(desc);
 		goto failure;
 	}

 	wfree(desc);

+	(void)fsync(fileno(theFile));
 	if (fclose(theFile) != 0) {
-		wsyserror(_("fclose (%s) failed"), thePath);
+		werror(_("fclose (%s) failed"), thePath);
 		goto failure;
 	}

 	/* If we used a temporary file, we still need to rename() it be the
 	 * real file.  Also, we need to try to retain the file attributes of
 	 * the original file we are overwriting (if we are) */
-	if (atomically) {
-		if (rename(thePath, path) != 0) {
-			wsyserror(_("rename ('%s' to '%s') failed"), thePath, path);
-			goto failure;
-		}
+	if (rename(thePath, path) != 0) {
+		werror(_("rename ('%s' to '%s') failed"), thePath, path);
+		goto failure;
 	}

 	wfree(thePath);
 	return True;

 failure:
-	if (atomically) {
-		unlink(thePath);
-		wfree(thePath);
-	}
-
+	unlink(thePath);
+	wfree(thePath);
 	return False;
 }
+
+/*
+ * create a directory hierarchy
+ *
+ * if the last octet of `path' is `/', the full path is
+ * assumed to be a directory; otherwise path is assumed to be a
+ * file, and the last component is stripped off. the rest is the
+ * the hierarchy to be created.
+ *
+ * refuses to create anything outside $GNUSTEP_USER_ROOT
+ *
+ * returns 1 on success, 0 on failure
+ */
+int wmkdirhier(const char *path)
+{
+	char *t, *thePath = NULL, buf[1024];
+	size_t p, plen;
+	struct stat st;
+
+	/* Only create directories under $GNUSTEP_USER_ROOT */
+	if ((t = wusergnusteppath()) == NULL)
+		return 0;
+	if (strncmp(path, t, strlen(t)) != 0)
+		return 0;
+
+	thePath = wstrdup(path);
+	/* Strip the trailing component if it is a file */
+	p = strlen(thePath);
+	while (p && thePath[p] != '/')
+		thePath[p--] = '\0';
+
+	thePath[p] = '\0';
+
+	/* Shortcut if it already exists */
+	if (stat(thePath, &st) == 0) {
+		wfree(thePath);
+		if (S_ISDIR(st.st_mode)) {
+			/* Is a directory alright */
+			return 1;
+		} else {
+			/* Exists, but not a directory, the caller
+			 * might just as well abort now */
+			return 0;
+		}
+	}
+
+	memset(buf, 0, sizeof(buf));
+	strncpy(buf, t, sizeof(buf) - 1);
+	p = strlen(buf);
+	plen = strlen(thePath);
+
+	do {
+		while (p++ < plen && thePath[p] != '/')
+			;
+
+		strncpy(buf, thePath, p);
+		if (mkdir(buf, 0777) == -1 && errno == EEXIST &&
+		    stat(buf, &st) == 0 && !S_ISDIR(st.st_mode)) {
+			werror(_("Could not create component %s"), buf);
+			wfree(thePath);
+			return 0;
+		}
+	} while (p < plen);
+
+	wfree(thePath);
+	return 1;
+}
+
+/* ARGSUSED2 */
+static int wrmdirhier_fn(const char *path, const struct stat *st,
+    int type, struct FTW *ftw)
+{
+	switch(type) {
+	case FTW_D:
+		break;
+	case FTW_DP:
+		return rmdir(path);
+		break;
+	case FTW_F:
+	case FTW_SL:
+	case FTW_SLN:
+		return unlink(path);
+		break;
+	case FTW_DNR:
+	case FTW_NS:
+	default:
+		return EPERM;
+	}
+
+	/* NOTREACHED */
+	return 0;
+}
+
+/*
+ * remove a directory hierarchy
+ *
+ * refuses to remove anything outside $GNUSTEP_USER_ROOT
+ *
+ * returns 1 on success, 0 on failure
+ *
+ * TODO: revisit what's error and what's not
+ *
+ * with inspirations from OpenBSD's bin/rm/rm.c
+ */
+int wrmdirhier(const char *path)
+{
+	struct stat st;
+	int error;
+	char *t;
+
+	/* Only remove directories under $GNUSTEP_USER_ROOT */
+	if ((t = wusergnusteppath()) == NULL)
+		return EPERM;
+	if (strncmp(path, t, strlen(t)) != 0)
+		return EPERM;
+
+	/* Shortcut if it doesn't exist to begin with */
+	if (stat(path, &st) == -1)
+		return ENOENT;
+
+	error = nftw(path, wrmdirhier_fn, 1, FTW_PHYS);
+
+	return error;
+}
--- a/WINGs/puzzle.c
+++ b/WINGs/puzzle.c
@@ -1,232 +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/WINGs/python/README
+++ b/WINGs/python/README
@@ -1,20 +0,0 @@
-
-This is a python wrapper for the WINGs library, that can be used to write python
-based programs with WINGs-based graphic interfaces.
-
-This module in not built by default. To build it you need python2.1 or later
-and swig-1.3.14 or later.
-
-To build it, first compile and install WINGs. after that run 'make' in this
-directory. 'make install' will install the python module into the python tree.
-
-run test.py or WINGs.py for an example.
-
-the code is not finished yet and may fail to work as expected in some cases.
-
-Note: currently the module expects WINGs installed to build. it won't take
-the WINGs libraries and header files from the source tree. You need to
-install WINGs first. Even if an old version of WINGs is already installed,
-you still need to install the newly built WINGs, else the python module will
-be built against the old version.
-
--- a/WINGs/python/WINGs.i
+++ b/WINGs/python/WINGs.i
@@ -1,699 +0,0 @@
-%module wings
-%{
-#include "WINGs/WINGsP.h"
-%}
-
-%include typemaps.i
-
-// This tells SWIG to treat char ** as a special case
-%typemap(python, in) char ** {
-    /* Check if is a list */
-    if (PyList_Check($input)) {
-        int size = PyList_Size($input);
-        int i = 0;
-        $1 = (char **) wmalloc((size+1)*sizeof(char *));
-        for (i = 0; i < size; i++) {
-            PyObject *o = PyList_GetItem($input, i);
-            if (PyString_Check(o))
-                $1[i] = PyString_AsString(PyList_GetItem($input, i));
-            else {
-                PyErr_SetString(PyExc_TypeError, "list must contain strings");
-                wfree($1);
-                return NULL;
-            }
-        }
-        $1[i] = 0;
-    } else {
-        PyErr_SetString(PyExc_TypeError, "not a list");
-        return NULL;
-    }
-}
-// This cleans up the char ** array we malloc-ed before the function call
-%typemap(python, freearg) char ** {
-    wfree($1);
-}
-// This allows a C function to return a char ** as a Python list
-%typemap(python, out) char ** {
-    int len,i;
-    len = 0;
-    while ($1[len]) len++;
-    $result = PyList_New(len);
-    for (i = 0; i < len; i++) {
-        PyList_SetItem($result, i, PyString_FromString($1[i]));
-    }
-}
-
-// Now for some callbacks
-%typemap(python, in) PyObject *pyacArgs {
-    if (PyTuple_Check($input)) {
-        if (PyTuple_Size($input) != 3) {
-            PyErr_SetString(PyExc_ValueError,
-                            "wrong number of parameters in tuple. should be 3.");
-            return NULL;
-        } else {
-            PyObject *func = PyTuple_GetItem($input, 1);
-            if (func!=Py_None && !PyCallable_Check(func)) {
-                PyErr_SetString(PyExc_TypeError,
-                                "'action' needs to be a callable object!");
-                return NULL;
-            }
-        }
-    } else {
-        PyErr_SetString(PyExc_TypeError, "2nd argument not a tuple!");
-        return NULL;
-    }
-    $1 = $input;
-}
-
-%typemap(python, in) PyObject *pycArgs {
-    if (PyTuple_Check($input)) {
-        if (PyTuple_Size($input) != 2) {
-            PyErr_SetString(PyExc_ValueError,
-                            "wrong number of parameters in tuple. should be 2.");
-            return NULL;
-        } else {
-            PyObject *func = PyTuple_GetItem($input, 0);
-            if (func!=Py_None && !PyCallable_Check(func)) {
-                PyErr_SetString(PyExc_TypeError,
-                                "'action' needs to be a callable object!");
-                return NULL;
-            }
-        }
-    } else {
-        PyErr_SetString(PyExc_TypeError, "2nd argument not a tuple!");
-        return NULL;
-    }
-    $1 = $input;
-}
-
-// Type mapping for grabbing a FILE * from Python
-%typemap(python, in) FILE * {
-    if (!PyFile_Check($input)) {
-        PyErr_SetString(PyExc_TypeError, "Need a file!");
-        return NULL;
-    }
-    $1 = PyFile_AsFile($input);
-}
-
-/* These are for free-ing the return of functions that need to be freed
- * before returning control to python. */
-%typemap(python, ret) char* WMGetTextFieldText { wfree($1); };
-
-
-%include exception.i
-
-%exception pyWMScreenMainLoop {
-    $function
-    if (PyErr_Occurred())
-        return NULL;
-}
-
-%exception pyWMRunModalLoop {
-    $function
-    if (PyErr_Occurred())
-        return NULL;
-}
-
-%{
-    static int mainLoopDone = 0;
-%}
-
-
-%inline %{
-    WMScreen *pyWMOpenScreen(const char *display, int simpleapp)
-    {
-        Display *dpy = XOpenDisplay(display);
-
-        if (!dpy) {
-            wwarning("WINGs: could not open display %s", XDisplayName(display));
-            return NULL;
-        }
-
-        if (simpleapp) {
-            return WMCreateSimpleApplicationScreen(dpy);
-        } else {
-            return WMCreateScreen(dpy, DefaultScreen(dpy));
-        }
-    }
-
-    void pyWMScreenMainLoop(WMScreen *scr)
-    {
-        XEvent event;
-
-        while (!PyErr_Occurred() && !mainLoopDone) {
-            WMNextEvent(((W_Screen*)scr)->display, &event);
-            WMHandleEvent(&event);
-        }
-    }
-
-    void pyWMBreakScreenMainLoop(WMScreen *scr)
-    {
-        mainLoopDone = 1;
-    }
-
-    void pyWMRunModalLoop(WMScreen *scr, WMView *view)
-    {
-        int oldModalLoop = scr->modalLoop;
-        WMView *oldModalView = scr->modalView;
-
-        scr->modalView = view;
-
-        scr->modalLoop = 1;
-        while (!PyErr_Occurred() && scr->modalLoop) {
-            XEvent event;
-
-            WMNextEvent(scr->display, &event);
-            WMHandleEvent(&event);
-        }
-
-        scr->modalView = oldModalView;
-        scr->modalLoop = oldModalLoop;
-    }
-%}
-
-
-//%rename WMScreenMainLoop _WMScreenMainLoop;
-//%rename(_WMScreenMainLoop) WMScreenMainLoop;
-//%rename WMRunModalLoop _WMRunModalLoop;
-
-
-%{
-    /* These functions match the prototypes of the normal C callback
-     * functions. However, we use the clientdata pointer for holding a
-     * reference to a Python tuple containing (object, funct, clientData).
-     */
-    static void PythonWMActionCallback(WMWidget *widget, void *cdata)
-    {
-        PyObject *pyobj, *func, *pydata, *arglist, *tuple, *result;
-
-        tuple = (PyObject*) cdata;
-        pyobj = PyTuple_GetItem(tuple, 0);
-        func = PyTuple_GetItem(tuple, 1);
-        if (func && func!=Py_None) {
-            pydata = PyTuple_GetItem(tuple, 2);
-            arglist = Py_BuildValue("(OO)", pyobj, pydata);
-            result = PyEval_CallObject(func, arglist);
-            Py_DECREF(arglist);
-            Py_XDECREF(result);
-        }
-    }
-
-    static void PythonWMCallback(void *data)
-    {
-        PyObject *func, *pydata, *arglist, *tuple, *result;
-
-        tuple = (PyObject*) data;
-        func = PyTuple_GetItem(tuple, 0);
-        if (func && func!=Py_None) {
-            pydata = PyTuple_GetItem(tuple, 1);
-            arglist = Py_BuildValue("(O)", pydata);
-            result = PyEval_CallObject(func, arglist);
-            Py_DECREF(arglist);
-            Py_XDECREF(result);
-        }
-    }
-
-    static void
-    pyTextFieldDidBeginEditing(WMTextFieldDelegate *self, WMNotification *notif)
-    {
-        PyObject *pyobj, *delegate, *func, *pydata, *arglist, *tuple, *result;
-        int action;
-
-        tuple = (PyObject*) self->data;
-        pyobj = PyTuple_GetItem(tuple, 0);
-        delegate = PyTuple_GetItem(tuple, 1);
-        if (delegate != Py_None) {
-            // should we call PyObject_HasAttrString()?? rather not and let
-            // python raise an exception because the object doesn't has the
-            // attribute
-            func = PyObject_GetAttrString(delegate, "didBeginEditing");
-            if (func!=NULL && func!=Py_None) {
-                pydata = PyObject_GetAttrString(delegate, "data");
-                if (!pydata) {
-                    Py_INCREF(Py_None);
-                    pydata = Py_None;
-                }
-                action = (int)WMGetNotificationClientData(notif);
-                arglist = Py_BuildValue("(OOi)", pyobj, pydata, action);
-                result = PyEval_CallObject(func, arglist);
-                Py_DECREF(pydata);
-                Py_DECREF(arglist);
-                Py_XDECREF(result);
-            }
-            Py_XDECREF(func);
-        }
-    }
-
-    static void
-    pyTextFieldDidChange(WMTextFieldDelegate *self, WMNotification *notif)
-    {
-        PyObject *pyobj, *delegate, *func, *pydata, *arglist, *tuple, *result;
-        int action;
-
-        tuple = (PyObject*) self->data;
-        pyobj = PyTuple_GetItem(tuple, 0);
-        delegate = PyTuple_GetItem(tuple, 1);
-        if (delegate != Py_None) {
-            func = PyObject_GetAttrString(delegate, "didChange");
-            if (func!=NULL && func!=Py_None) {
-                pydata = PyObject_GetAttrString(delegate, "data");
-                if (!pydata) {
-                    Py_INCREF(Py_None);
-                    pydata = Py_None;
-                }
-                action = (int)WMGetNotificationClientData(notif);
-                arglist = Py_BuildValue("(OOi)", pyobj, pydata, action);
-                result = PyEval_CallObject(func, arglist);
-                Py_DECREF(pydata);
-                Py_DECREF(arglist);
-                Py_XDECREF(result);
-            }
-            Py_XDECREF(func);
-        }
-    }
-
-    static void
-    pyTextFieldDidEndEditing(WMTextFieldDelegate *self, WMNotification *notif)
-    {
-        PyObject *pyobj, *delegate, *func, *pydata, *arglist, *tuple, *result;
-        int action;
-
-        tuple = (PyObject*) self->data;
-        pyobj = PyTuple_GetItem(tuple, 0);
-        delegate = PyTuple_GetItem(tuple, 1);
-        if (delegate != Py_None) {
-            func = PyObject_GetAttrString(delegate, "didEndEditing");
-            if (func!=NULL && func!=Py_None) {
-                pydata = PyObject_GetAttrString(delegate, "data");
-                if (!pydata) {
-                    Py_INCREF(Py_None);
-                    pydata = Py_None;
-                }
-                action = (int)WMGetNotificationClientData(notif);
-                arglist = Py_BuildValue("(OOi)", pyobj, pydata, action);
-                result = PyEval_CallObject(func, arglist);
-                Py_DECREF(pydata);
-                Py_DECREF(arglist);
-                Py_XDECREF(result);
-            }
-            Py_XDECREF(func);
-        }
-    }
-
-    static Bool
-    pyTextFieldShouldBeginEditing(WMTextFieldDelegate *self, WMTextField *tPtr)
-    {
-        PyObject *pyobj, *delegate, *func, *pydata, *arglist, *tuple, *result;
-        Bool retval = False;
-
-        tuple = (PyObject*) self->data;
-        pyobj = PyTuple_GetItem(tuple, 0);
-        delegate = PyTuple_GetItem(tuple, 1);
-        if (delegate != Py_None) {
-            func = PyObject_GetAttrString(delegate, "shouldBeginEditing");
-            if (func!=NULL && func!=Py_None) {
-                pydata = PyObject_GetAttrString(delegate, "data");
-                if (!pydata) {
-                    Py_INCREF(Py_None);
-                    pydata = Py_None;
-                }
-                arglist = Py_BuildValue("(OO)", pyobj, pydata);
-                result = PyEval_CallObject(func, arglist);
-                if (result!=Py_None && PyInt_AsLong(result)!=0) {
-                    retval = True;
-                }
-                Py_DECREF(pydata);
-                Py_DECREF(arglist);
-                Py_XDECREF(result);
-            }
-            Py_XDECREF(func);
-        }
-
-        return retval;
-    }
-
-    static Bool
-    pyTextFieldShouldEndEditing(WMTextFieldDelegate *self, WMTextField *tPtr)
-    {
-        PyObject *pyobj, *delegate, *func, *pydata, *arglist, *tuple, *result;
-        Bool retval = False;
-
-        tuple = (PyObject*) self->data;
-        pyobj = PyTuple_GetItem(tuple, 0);
-        delegate = PyTuple_GetItem(tuple, 1);
-        if (delegate != Py_None) {
-            func = PyObject_GetAttrString(delegate, "shouldEndEditing");
-            if (func!=NULL && func!=Py_None) {
-                pydata = PyObject_GetAttrString(delegate, "data");
-                if (!pydata) {
-                    Py_INCREF(Py_None);
-                    pydata = Py_None;
-                }
-                arglist = Py_BuildValue("(OO)", pyobj, pydata);
-                result = PyEval_CallObject(func, arglist);
-                if (result!=Py_None && PyInt_AsLong(result)!=0) {
-                    retval = True;
-                }
-                Py_DECREF(pydata);
-                Py_DECREF(arglist);
-                Py_XDECREF(result);
-            }
-            Py_XDECREF(func);
-        }
-
-        return retval;
-    }
-%}
-
-%inline %{
-    void pyWMSetWindowCloseAction(WMWindow *win, PyObject *pyacArgs) {
-        WMSetWindowCloseAction(win, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetButtonAction(WMButton *bPtr, PyObject *pyacArgs) {
-        WMSetButtonAction(bPtr, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetScrollerAction(WMScroller *sPtr, PyObject *pyacArgs) {
-        WMSetScrollerAction(sPtr, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetListAction(WMList *lPtr, PyObject *pyacArgs) {
-        WMSetListAction(lPtr, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetListDoubleAction(WMList *lPtr, PyObject *pyacArgs) {
-        WMSetListDoubleAction(lPtr, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetBrowserAction(WMBrowser *bPtr, PyObject *pyacArgs) {
-        WMSetBrowserAction(bPtr, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetBrowserDoubleAction(WMBrowser *bPtr, PyObject *pyacArgs) {
-        WMSetBrowserDoubleAction(bPtr, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetMenuItemAction(WMMenuItem *miPtr, PyObject *pyacArgs) {
-        WMSetMenuItemAction(miPtr, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetPopUpButtonAction(WMPopUpButton *pPtr, PyObject *pyacArgs) {
-        WMSetPopUpButtonAction(pPtr, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetSliderAction(WMSlider *sPtr, PyObject *pyacArgs) {
-        WMSetSliderAction(sPtr, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetRulerMoveAction(WMRuler *rPtr, PyObject *pyacArgs) {
-        WMSetRulerMoveAction(rPtr, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetRulerReleaseAction(WMRuler *rPtr, PyObject *pyacArgs) {
-        WMSetRulerReleaseAction(rPtr, PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void pyWMSetColorPanelAction(WMColorPanel *panel, PyObject *pyacArgs) {
-        WMSetColorPanelAction(panel, (WMAction2*)PythonWMActionCallback, (void*)pyacArgs);
-        Py_INCREF(pyacArgs);
-    }
-
-    void* pyWMAddTimerHandler(int miliseconds, PyObject *pycArgs) {
-        Py_INCREF(pycArgs);
-        return (void*)WMAddTimerHandler(miliseconds, PythonWMCallback,
-                                        (void*)pycArgs);
-    }
-
-    void* pyWMAddPersistentTimerHandler(int miliseconds, PyObject *pycArgs) {
-        Py_INCREF(pycArgs);
-        return (void*)WMAddPersistentTimerHandler(miliseconds, PythonWMCallback,
-                                                  (void*)pycArgs);
-    }
-
-    /* this doesn't work. we pass (func, data) as cdata at creation time, but
-     * only data at destruction, so it won't find it unless we change
-     * WMDeleteTimerWithClientData() to extract data from the tuple, and this
-     * requires access to the internals of WINGs
-    void pyWMDeleteTimerWithClientData(PyObject *pycData) {
-        WMDeleteTimerWithClientData((void*)pycData);
-    }*/
-
-    void pyWMDeleteTimerHandler(void *handlerID) {
-        WMDeleteTimerHandler((WMHandlerID)handlerID);
-    }
-
-    void* pyWMAddIdleHandler(PyObject *pycArgs) {
-        Py_INCREF(pycArgs);
-        return (void*)WMAddIdleHandler(PythonWMCallback, (void*)pycArgs);
-    }
-
-    void pyWMDeleteIdleHandler(void *handlerID) {
-        WMDeleteIdleHandler((WMHandlerID)handlerID);
-    }
-
-%}
-
-
-%exception pyWMSetTextFieldDelegate {
-    $function
-    if (PyErr_Occurred()) {
-        return NULL;
-    }
-}
-
-%inline %{
-    void pyWMSetTextFieldDelegate(WMTextField *tPtr, PyObject *txtArgs) {
-        WMTextFieldDelegate *td;
-
-        if (!txtArgs || !PyTuple_Check(txtArgs) || PyTuple_Size(txtArgs)!=2) {
-            PyErr_SetString(PyExc_TypeError, "invalid setting of WMTextField "
-                            "delegate. Should be '(self, delegate)'");
-            return;
-        }
-        // how do I check if txtArgs[1] is an instance of WMTextFieldDelegate?
-        td = WMGetTextFieldDelegate(tPtr);
-        if (!td) {
-            td = (WMTextFieldDelegate*)wmalloc(sizeof(WMTextFieldDelegate));
-            td->didBeginEditing    = pyTextFieldDidBeginEditing;
-            td->didChange          = pyTextFieldDidChange;
-            td->didEndEditing      = pyTextFieldDidEndEditing;
-            td->shouldBeginEditing = pyTextFieldShouldBeginEditing;
-            td->shouldEndEditing   = pyTextFieldShouldEndEditing;
-        } else {
-            Py_XDECREF((PyObject*)td->data);
-        }
-        Py_INCREF(txtArgs);
-        td->data = txtArgs;
-        WMSetTextFieldDelegate(tPtr, td);
-    }
-%}
-
-
-%inline %{
-    PyObject* pyWMGetTextFieldDelegate(WMTextField *tPtr) {
-        WMTextFieldDelegate *td;
-        PyObject *result, *tuple;
-
-        td = WMGetTextFieldDelegate(tPtr);
-        if (!td) {
-            Py_INCREF(Py_None);
-            return Py_None;
-        }
-
-        tuple = (PyObject*)td->data;
-        if (!tuple || !PyTuple_Check(tuple) || PyTuple_Size(tuple)!=2) {
-            PyErr_SetString(PyExc_TypeError, "invalid TextField delegate");
-            return NULL;
-        }
-
-        result = PyTuple_GetItem(tuple, 1);
-        if (!result)
-            result = Py_None;
-
-        Py_INCREF(result);
-
-        return result;
-    }
-%}
-
-
-/* ignore structures we will not use */
-%ignore ConnectionDelegate;
-
-/* ignore functions we don't need */
-// should we ignore vararg functions, or just convert them to functions with
-// a fixed number of parameters?
-%varargs(char*) wmessage;
-//%ignore wmessage;
-%ignore wwarning;
-%ignore wfatal;
-%ignore wsyserror;
-%ignore wsyserrorwithcode;
-%ignore WMCreatePLArray;
-%ignore WMCreatePLDictionary;
-
-%apply int *INPUT { int *argc };
-
-#define Bool int
-
-%include "WINGs/WUtil.h"
-
-/* ignore structures we will not use */
-
-/* ignore functions we don't need */
-
-%include "WINGs/WINGs.h"
-
-
-%{
-void
-WHandleEvents()
-{
-    /* Check any expired timers */
-    W_CheckTimerHandlers();
-
-    /* Do idle and timer stuff while there are no input events */
-    /* Do not wait for input here. just peek to se if input is available */
-    while (!W_HandleInputEvents(False, -1) && W_CheckIdleHandlers()) {
-        /* dispatch timer events */
-        W_CheckTimerHandlers();
-    }
-
-    W_HandleInputEvents(True, -1);
-
-    /* Check any expired timers */
-    W_CheckTimerHandlers();
-}
-%}
-
-
-/* rewrite functions originally defined as macros */
-%inline %{
-#undef WMDuplicateArray
-WMArray* WMDuplicateArray(WMArray* array) {
-    return WMCreateArrayWithArray(array);
-}
-
-#undef WMPushInArray
-void WMPushInArray(WMArray *array, void *item) {
-    WMAddToArray(array, item);
-}
-
-#undef WMSetInArray
-void* WMSetInArray(WMArray *array, int index, void *item) {
-    return WMReplaceInArray(array, index, item);
-}
-
-#undef WMRemoveFromArray
-int WMRemoveFromArray(WMArray *array, void *item) {
-    return WMRemoveFromArrayMatching(array, NULL, item);
-}
-
-#undef WMGetFirstInArray
-int WMGetFirstInArray(WMArray *array, void *item) {
-    return WMFindInArray(array, NULL, item);
-}
-
-#undef WMCreateBag
-WMBag* WMCreateBag(int size) {
-    return WMCreateTreeBag();
-}
-
-#undef WMCreateBagWithDestructor
-WMBag* WMCreateBagWithDestructor(int size, WMFreeDataProc *destructor) {
-    return WMCreateTreeBagWithDestructor(destructor);
-}
-
-#undef WMSetInBag
-void* WMSetInBag(WMBag *bag, int index, void *item) {
-    return WMReplaceInBag(bag, index, item);
-}
-
-#undef WMAddItemToTree
-WMTreeNode* WMAddItemToTree(WMTreeNode *parent, void *item) {
-    return WMInsertItemInTree(parent, -1, item);
-}
-
-#undef WMAddNodeToTree
-WMTreeNode* WMAddNodeToTree(WMTreeNode *parent, WMTreeNode *aNode) {
-    return WMInsertNodeInTree(parent, -1, aNode);
-}
-
-#undef WMGetFirstInTree
-/* Returns first tree node that has data == cdata */
-WMTreeNode* WMGetFirstInTree(WMTreeNode *aTree, void *cdata) {
-    return WMFindInTree(aTree, NULL, cdata);
-}
-
-#undef WMFlushConnection
-int WMFlushConnection(WMConnection *cPtr) {
-    return WMSendConnectionData(cPtr, NULL);
-}
-
-#undef WMGetConnectionQueuedData
-WMArray* WMGetConnectionQueuedData(WMConnection *cPtr) {
-    return WMGetConnectionUnsentData(cPtr);
-}
-
-#undef WMWidgetClass
-W_Class WMWidgetClass(WMWidget *widget) {
-    return (((W_WidgetType*)(widget))->widgetClass);
-}
-
-#undef WMWidgetView
-WMView* WMWidgetView(WMWidget *widget) {
-    return (((W_WidgetType*)(widget))->view);
-}
-
-#undef WMCreateCommandButton
-WMButton* WMCreateCommandButton(WMWidget *parent) {
-    return WMCreateCustomButton(parent, WBBSpringLoadedMask|WBBPushInMask
-                                |WBBPushLightMask|WBBPushChangeMask);
-}
-
-#undef WMCreateRadioButton
-WMButton* WMCreateRadioButton(WMWidget *parent) {
-    return WMCreateButton(parent, WBTRadio);
-}
-
-#undef WMCreateSwitchButton
-WMButton* WMCreateSwitchButton(WMWidget *parent) {
-    return WMCreateButton(parent, WBTSwitch);
-}
-
-#undef WMAddListItem
-WMListItem* WMAddListItem(WMList *lPtr, char *text)
-{
-    return WMInsertListItem(lPtr, -1, text);
-}
-
-#undef WMCreateText
-WMText* WMCreateText(WMWidget *parent) {
-    return WMCreateTextForDocumentType(parent, NULL, NULL);
-}
-
-#undef WMRefreshText
-void WMRefreshText(WMText *tPtr) {
-    return WMThawText(tPtr);
-}
-
-#undef WMClearText
-void WMClearText(WMText *tPtr) {
-    return WMAppendTextStream(tPtr, NULL);
-}
-%}
-
-
--- a/WINGs/python/WINGs.py
+++ b/WINGs/python/WINGs.py
@@ -1,643 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import wings
-
-# Some useful constants
-
-False = 0
-True = 1
-
-# check about None as action for buttonAction/windowCloseAction ...
-
-################################################################################
-# Exceptions
-################################################################################
-from exceptions import Exception, StandardError
-
-class Error(StandardError):
-    pass
-
-del Exception, StandardError
-
-class WMTimer:
-    def __init__(self, milliseconds, callback, cdata=None, persistent=False):
-        if persistent:
-            self._o = wings.pyWMAddPersistentTimerHandler(milliseconds, (callback, cdata))
-        else:
-            self._o = wings.pyWMAddTimerHandler(milliseconds, (callback, cdata))
-        self.__WMDeleteTimerHandler = wings.pyWMDeleteTimerHandler
-
-    def __del__(self):
-        self.__WMDeleteTimerHandler(self._o)
-
-
-class WMPersistentTimer(WMTimer):
-    def __init__(self, milliseconds, callback, cdata=None):
-        WMTimer.__init__(self, milliseconds, callback, cdata, persistent=True)
-
-
-class WMScreen:
-    __readonly = ('display', 'width', 'height', 'depth')
-
-    def __init__(self, appname, display="", simpleapp=False):
-        wings.WMInitializeApplication(appname, len(sys.argv), sys.argv)	
-        self._o = wings.pyWMOpenScreen(display, simpleapp)
-        if not self._o:
-            raise Error, "Cannot open display %s" % display
-        self.__dict__['display'] = wings.WMScreenDisplay(self._o)
-        self.__dict__['width'] = wings.WMScreenWidth(self._o)
-        self.__dict__['height'] = wings.WMScreenHeight(self._o)
-        self.__dict__['depth'] = wings.WMScreenDepth(self._o)
-
-    def __setattr__(self, name ,value):
-        if name in self.__readonly:
-            #raise AttributeError, "'%s' is a read-only WMScreen attribute" % name
-            raise Error, "'%s' is a read-only WMScreen attribute" % name
-        self.__dict__[name] = value
-
-    def __delattr__(self, name):
-        if name in self.__readonly:
-            #raise AttributeError, "'%s' attribute cannot be deleted from WMScreen instance" % name
-            raise Error, "'%s' attribute cannot be deleted from WMScreen instance" % name
-        try:
-            del(self.__dict__[name])
-        except KeyError:
-            raise AttributeError, "%s instance has no attribute '%s'" % \
-                                  (self.__class__.__name__, name)
-
-    def mainLoop(self):
-        wings.pyWMScreenMainLoop(self._o)
-
-    def breakMainLoop(self):
-        wings.pyWMBreakScreenMainLoop(self._o)
-
-    def runModalLoop(self, view):
-        wings.pyWMRunModalLoop(self._o, view)
-
-    def breakModalLoop(self):
-        wings.WMBreakModalLoop(self._o)
-
-    def size(self):
-        return (self.width, self.height)
-
-
-class WMView:
-    pass
-
-
-class WMWidget(WMView):
-    def __init__(self):
-        if self.__class__ == WMWidget:
-            raise Error, "a WMWidget can't be instantiated directly"
-        self._o = None
-        self.__WMDestroyWidget = wings.WMDestroyWidget
-
-    def __del__(self):
-        if self._o is not None:
-            self.__WMDestroyWidget(self._o)
-
-    def resize(self, width, height):
-        wings.WMResizeWidget(self._o, width, height)
-
-    def move(self, x, y):
-        wings.WMMoveWidget(self._o, x, y)
-
-    def realize(self):
-        wings.WMRealizeWidget(self._o)
-
-    def show(self):
-        wings.WMMapWidget(self._o)
-
-    def hide(self):
-        wings.WMUnmapWidget(self._o)
-
-    def redisplay(self):
-        wings.WMRedisplayWidget(self._o)
-    
-    def width(self):
-        return wings.WMWidgetWidth(self._o)
-    
-    def height(self):
-        return wings.WMWidgetHeight(self._o)
-
-    def screen(self):
-        return wings.WMWidgetScreen(self._o)
-
-    def view(self):
-        return wings.WMWidgetView(self._o)
-
-    def setFocusTo(self, other):
-        wings.WMSetFocusToWidget(other._o)
-
-
-class WMWindow(WMWidget):
-    def __init__(self, screen, name, style=wings.WMTitledWindowMask
-                 |wings.WMClosableWindowMask|wings.WMMiniaturizableWindowMask
-                 |wings.WMResizableWindowMask):
-        WMWidget.__init__(self)
-        self._o = wings.WMCreateWindowWithStyle(screen._o, name, style)
-    
-    def setMinSize(self, minWidth, minHeight):
-        wings.WMSetWindowMinSize(self._o, minWidth, minHeight)
-    
-    def setMaxSize(self, maxWidth, maxHeight):
-        wings.WMSetWindowMaxSize(self._o, maxWidth, maxHeight)
-    
-    def setInitialPosition(self, x, y):
-        wings.WMSetWindowInitialPosition(self._o, x, y)
-    
-    def setTitle(self, title):
-        wings.WMSetWindowTitle(self._o, title)
-
-    def setCloseAction(self, action, data=None):
-        if action!=None and (not callable(action)):
-            raise Error, "action needs to be a callable object or None"
-        wings.pyWMSetWindowCloseAction(self._o, (self, action, data))
-
-
-class WMPanel(WMWindow):
-    def __init__(self, owner, name, style=wings.WMTitledWindowMask
-                 |wings.WMClosableWindowMask|wings.WMResizableWindowMask):
-        WMWidget.__init__(self)
-        self._o = wings.WMCreatePanelWithStyleForWindow(owner._o, name, style)
-
-class WMFrame(WMWidget):
-    def __init__(self, parent, title=None):
-        WMWidget.__init__(self)
-        self._o = wings.WMCreateFrame(parent._o)
-        self.setTitle(title)
-
-    def setRelief(self, relief):
-        wings.WMSetFrameRelief(self._o, relief)
-
-    def setTitle(self, title=""):
-        wings.WMSetFrameTitle(self._o, title)
-
-    def setTitlePosition(self, position):
-        wings.WMSetFrameTitlePosition(self._o, position)
-
-class WMLabel(WMWidget):
-    def __init__(self, parent, text=None):
-        WMWidget.__init__(self)
-        self._o = wings.WMCreateLabel(parent._o)
-        self.setText(text)
-
-    def setWraps(self, flag):
-        # bool(flag) for python2.2
-        wings.WMSetLabelWraps(self._o, flag)
-
-    def setRelief(self, relief):
-        wings.WMSetLabelRelief(self._o, relief)
-
-    def setText(self, text=""):
-        wings.WMSetLabelText(self._o, text)
-
-    def setTextColor(self, color):
-        wings.WMSetLabelTextColor(self._o, color)
-
-    def setFont(self, font):
-        wings.WMSetLabelFont(self._o, font)
-
-    def setTextAlignment(self, alignment):
-        wings.WMSetLabelTextAlignment(self._o, alignment)
-
-    def setImage(self, image):
-        wings.WMSetLabelImage(self._o, image)
-
-    def setImagePosition(self, position):
-        wings.WMSetLabelImagePosition(self._o, position)
-
-    def text(self):
-        return wings.WMGetLabelText(self._o)
-
-    def font(self):
-        return wings.WMGetLabelFont(self._o)
-
-    def image(self):
-        return wings.WMGetLabelImage(self._o)
-
-
-class WMBox(WMWidget):
-    def __init__(self, parent):
-        WMWidget.__init__(self)
-        self._o = wings.WMCreateBox(parent._o)
-
-    def setHorizontal(self, flag):
-        # bool(flag) for python2.2
-        wings.WMSetBoxHorizontal(self._o, flag)
-
-    def setBorderWidth(self, width):
-        wings.WMSetBoxBorderWidth(self._o, width)
-
-    def addSubview(self, view, expand, fill, minSize, maxSize, space):
-        wings.WMAddBoxSubview(self._o, view, expand, fill, minSize, maxSixe, space)
-
-    def addSubviewAtEnd(self, view, expand, fill, minSize, maxSize, space):
-        wings.WMAddBoxSubviewAtEnd(self._o, view, expand, fill, minSize, maxSixe, space)
-
-    def removeSubview(self, view):
-        wings.WMRemoveBoxSubview(self._o, view)
-
-
-class WMButton(WMWidget): # not for user instantiation
-    def __init__(self, parent):
-        WMWidget.__init__(self)
-        if self.__class__ == WMButton:
-            raise Error, "a WMButton can't be instantiated directly"
-
-
-    def setText(self, text=""):
-        wings.WMSetButtonText(self._o, text)
-
-    def setAction(self, action, data=None):
-        if action!=None and (not callable(action)):
-            raise Error, "action needs to be a callable object or None"
-        wings.pyWMSetButtonAction(self._o, (self, action, data))
-
-    def performClick(self):
-        wings.WMPerformButtonClick(self._o)
-
-    def setEnabled(self, flag):
-        # bool(flag) for python2.2
-        wings.WMSetButtonEnabled(self._o, flag)
-
-    def isEnabled(self):
-        return wings.WMGetButtonEnabled(self._o)
-
-    def setImageDimsWhenDisabled(self, flag):
-        # bool(flag)
-        wings.WMSetButtonImageDimsWhenDisabled(self._o, flag)
-    
-    def setImage(self, image):
-        wings.WMSetButtonImage(self_.o, image)
-    
-    def setAlternateImage(self, image):
-        wings.WMSetButtonAltImage(self._o, image)
-    
-    def setImagePosition(self, position):
-        wings.WMSetButtonImagePosition(self._o, position)
-    
-    def setImageDefault(self):
-        wings.WMSetButtonImageDefault(self._o)
-    
-
-class WMCommandButton(WMButton):
-    def __init__(self, parent):
-        WMButton.__init__(self, parent)
-        self._o = wings.WMCreateCommandButton(parent._o)
-
-
-class WMSwitchButton(WMButton):
-    def __init__(self, parent):
-        WMButton.__init__(self, parent)
-        self._o = wings.WMCreateSwitchButton(parent._o)
-
-
-class WMRadioButton(WMButton):
-    def __init__(self, parent, group=None):
-        WMButton.__init__(self, parent)
-        self._o = wings.WMCreateRadioButton(parent._o)
-        if group:
-            wings.WMGroupButtons(group._o, self._o)
-
-
-class WMListItem:
-    pass
-
-
-class WMList(WMWidget):
-    def __init__(self, parent):
-        WMWidget.__init__(self)
-        self._o = wings.WMCreateList(parent._o)
-
-    def allowEmptySelection(self, flag):
-        # bool(flag)
-        wings.WMSetListAllowEmptySelection(self._o, flag)
-
-    def allowMultipleSelection(self, flag):
-        # bool(flag)
-        wings.WMSetListAllowMultipleSelection(self._o, flag)
-
-    def addItem(self, item):
-        wings.WMAddListItem(self._o, item)
-
-    def insertItem(self, row, item):
-        wings.WMInsertListItem(self._o, row, item)
-
-    def sortItems(self):
-        wings.WMSortListItems(self._o)
-
-    def rowWithTitle(self, title):
-        return wings.WMFindRowOfListItemWithTitle(self._o, title)
-
-    def selectedItemRow(self):
-        return wings.WMGetListSelectedItemRow(self._o)
-
-    def selectedItem(self):
-        return wings.WMGetListSelectedItem(self._o)
-
-    def removeItem(self, index):
-        wings.WMRemoveListItem(self._o, index)
-
-    def selectItem(self, index):
-        wings.WMSelectListItem(self._o, index)
-
-    def unselectItem(self, index):
-        wings.WMUnselectListItem(self._o, index)
-
-
-class WMTextFieldDelegate:
-    __callbacks = ('didBeginEditing', 'didChange', 'didEndEditing',
-                   'shouldBeginEditing', 'shouldEndEditing')
-
-    def __init__(self):
-        self.__dict__['data'] = None
-        self.__dict__['didBeginEditing'] = None
-        self.__dict__['didChange'] = None
-        self.__dict__['didEndEditing'] = None
-        self.__dict__['shouldBeginEditing'] = None
-        self.__dict__['shouldEndEditing'] = None
- 
-    def __setattr__(self, name ,value):
-        if name in self.__callbacks and value!=None and (not callable(value)):
-            #raise AttributeError, "%s.%s needs to be a callable object or None" % (self.__class__.__name__, name)
-            raise Error, "%s.%s needs to be a callable object or None" % (self.__class__.__name__, name)
-        else:
-            self.__dict__[name] = value
-
-
-class WMTextField(WMWidget):
-    def __init__(self, parent, text=""):
-        WMWidget.__init__(self)
-        self._o = wings.WMCreateTextField(parent._o)
-        wings.WMSetTextFieldText(self._o, text)
-
-    def setDelegate(self, delegate):
-        if delegate.__class__ != WMTextFieldDelegate:
-            raise Error, "textfield delegate must be of type 'WMTextFieldDelegate'"
-        wings.pyWMSetTextFieldDelegate(self._o, (self, delegate))
-
-    def delegate(self):
-        return wings.pyWMGetTextFieldDelegate(self._o)
-
-    def text(self):
-        return wings.WMGetTextFieldText(self._o)
-
-    def setEditable(self, flag):
-        # bool(flag)
-        wings.WMSetTextFieldEditable(self._o, flag)
-
-    def setBordered(self, flag):
-        # bool(flag)
-        wings.WMSetTextFieldBordered(self._o, flag)
-
-    def setBeveled(self, flag):
-        # bool(flag)
-        wings.WMSetTextFieldBeveled(self._o, flag)
-
-    def setSecure(self, flag):
-        # bool(flag)
-        wings.WMSetTextFieldSecure(self._o, flag)
-
-    def setCursorPosition(self, position):
-        wings.WMSetTextFieldCursorPosition(self._o, position)
-
-    def setNextText(self, next):
-        wings.WMSetTextFieldNextTextField(self._o, next._o)
-
-    def setPreviousText(self, previous):
-        wings.WMSetTextFieldPrevTextField(self._o, previous._o)
-
-    def setTextAlignment(self, alignment):
-        wings.WMSetTextFieldAlignment(self._o, alignment)
-
-    def isEditable(self):
-        return wings.WMGetTextFieldEditable(self._o)
-
-    def insertText(self, text, position):
-        wings.WMInsertTextFieldText(self._o, text, position)
-
-    def deleteText(self, start, count):
-        wings.WMDeleteTextFieldRange(self._o, wings.wmkrange(start, count))
-
-    def selectText(self, start, count):
-        wings.WMSelectTextFieldRange(self._o, wings.wmkrange(start, count))
-
-    def setFont(self, font):
-        wings.WMSetTextFieldFont(self._o, font)
-
-    def font(self):
-        return wings.WMGetTextFieldFont(self._o)
-
-
-################################################################################
-# wrap the WINGs constants so we don't need wings.constant_name
-################################################################################
-
-# WMWindow title style
-WMTitledWindowMask         = wings.WMTitledWindowMask
-WMClosableWindowMask       = wings.WMClosableWindowMask
-WMMiniaturizableWindowMask = wings.WMMiniaturizableWindowMask
-WMResizableWindowMask      = wings.WMResizableWindowMask
-
-# WMFrame title positions
-WTPNoTitle     = wings.WTPNoTitle
-WTPAboveTop    = wings.WTPAboveTop
-WTPAtTop       = wings.WTPAtTop
-WTPBelowTop    = wings.WTPBelowTop
-WTPAboveBottom = wings.WTPAboveBottom
-WTPAtBottom    = wings.WTPAtBottom
-WTPBelowBottom = wings.WTPBelowBottom
-
-# Alingments
-WALeft      = wings.WALeft
-WACenter    = wings.WACenter
-WARight     = wings.WARight
-WAJustified = wings.WAJustified	# not valid for textfields
-
-# Image positions
-WIPNoImage   = wings.WIPNoImage
-WIPImageOnly = wings.WIPImageOnly
-WIPLeft      = wings.WIPLeft
-WIPRight     = wings.WIPRight
-WIPBelow     = wings.WIPBelow
-WIPAbove     = wings.WIPAbove
-WIPOverlaps  = wings.WIPOverlaps
-
-# Relief types
-WRFlat   = wings.WRFlat
-WRSimple = wings.WRSimple
-WRRaised = wings.WRRaised
-WRSunken = wings.WRSunken
-WRGroove = wings.WRGroove
-WRRidge  = wings.WRRidge
-WRPushed = wings.WRPushed
-
-
-# TextField events
-WMReturnTextMovement  = wings.WMReturnTextMovement
-WMEscapeTextMovement  = wings.WMEscapeTextMovement
-WMIllegalTextMovement = wings.WMIllegalTextMovement
-WMTabTextMovement     = wings.WMTabTextMovement
-WMBacktabTextMovement = wings.WMBacktabTextMovement
-WMLeftTextMovement    = wings.WMLeftTextMovement
-WMRightTextMovement   = wings.WMRightTextMovement
-WMUpTextMovement      = wings.WMUpTextMovement
-WMDownTextMovement    = wings.WMDownTextMovement
-
-
-if __name__ == "__main__":
-    def quit(obj, data):
-        #sys.exit()
-        scr.breakMainLoop()
-
-    def click(btn, list):
-        print win.width(), win.height()
-        print list.selectedItemRow()
-        win2.show()
-        scr.runModalLoop(win2.view())
-        print txt2.text()
-
-    def sayhi(btn, data):
-        print "hi"
-
-    def breakLoop(btn, data):
-        #sys.exit()
-        scr.breakModalLoop()
-        win2.hide()
-
-    def dc(object, data, action):
-        print "didChange:", object, data, action
-
-    def dbe(object, data, action):
-        print "didBeginEditing:", object, data, action
-
-    def dee(object, data, action):
-        if action == wings.WMReturnTextMovement:
-            if object == txt:
-                object.setFocusTo(txt2)
-            else:
-                object.setFocusTo(txt)
-        print "didEndEditing:", object, data, action, object.text()
-
-    def tcb(one):
-        old = list.selectedItemRow()
-        list.selectItem(list.index)
-        list.unselectItem(old)
-        list.index = (list.index+1) % 3
-        #print one
-
-    scr = WMScreen("foobar")
-    win = WMWindow(scr, "aWindow")
-    win.setCloseAction(quit)
-    win.setTitle("test window")
-    win.resize(400, 180)
-    win.setInitialPosition((scr.width-win.width())/2, (scr.height-win.height())/2)
-
-    btn = WMCommandButton(win)
-    btn.setText("Click Me")
-    btn.resize(100, 25)
-    btn.move(20, 20)
-    btn.show()
-
-    sw = WMSwitchButton(win)
-    sw.setText("Some option")
-    sw.resize(100, 25)
-    sw.move(20, 50)
-    sw.show()
-
-    radios = []
-    r = None
-    j = 0
-    for i in ["One", "Two", "Four"]:
-        r = WMRadioButton(win, r)
-        radios.append(r)
-        r.show()
-        r.setText(i)
-        r.move(20, 70+j*25)
-        r.resize(100, 25)
-        j=j+1
-
-    sw.setAction(sayhi)
-
-    list = WMList(win)
-    list.resize(100,100)
-    list.move(130, 20)
-    list.addItem("one")
-    list.addItem("two")
-    list.addItem("three")
-    list.allowMultipleSelection(1)
-    list.show()
-    list.index = 0
-
-    txtdel = WMTextFieldDelegate()
-    txtdel.data = 'mydata'
-    txtdel.didBeginEditing = dbe
-    txtdel.didEndEditing = dee
-    txtdel.didChange = dc
-
-    txt = WMTextField(win, "abc")
-    txt.resize(95, 20)
-    txt.move(295, 20)
-    txt.setDelegate(txtdel)
-    txt.show()
-    txt2 = WMTextField(win, "01234567890")
-    txt2.resize(95, 20)
-    txt2.move(295, 45)
-    txt2.setDelegate(txtdel)
-    txt2.show()
-
-    txt.setNextText(txt2)
-    txt2.setNextText(txt)
-
-    label = WMLabel(win, "Text1:")
-    label.setTextAlignment(WARight)
-    label.move(240, 20)
-    label.resize(55, 20)
-    label.show()
-
-    label2 = WMLabel(win, "mytext2:")
-    label2.setTextAlignment(WARight)
-    label2.move(240, 45)
-    label2.resize(55, 20)
-    label2.show()
-    
-    btn.setAction(click, list)
-    
-    frame = WMFrame(win, "My Frame")
-    frame.resize(150, 50)
-    frame.move(240, 70)
-    #frame.setRelief(WRPushed)
-    frame.show()
-    
-    ebtn = WMCommandButton(win)
-    ebtn.setText("Exit")
-    ebtn.resize(100, 25)
-    ebtn.move(290, 147)
-    ebtn.setAction(quit)
-    ebtn.show()
-
-    win.realize()
-    win.show()
-
-    timer = WMPersistentTimer(1000, tcb, win)
-    #del(timer)
-    #timer.delete()
-
-    win2 = WMPanel(win, "anotherWindow", WMTitledWindowMask)
-    win2.setTitle("transient test window")
-    win2.resize(150, 50)
-    win2.setInitialPosition((scr.width-win2.width())/2, (scr.height-win2.height())/2)
-
-    btn7 = WMCommandButton(win2)
-    btn7.setText("Dismiss")
-    btn7.resize(100, 25)
-    btn7.move(27, 10)
-    btn7.show()
-    btn7.setAction(breakLoop)
-
-    win2.realize()
-    
-    scr.mainLoop()
-
--- a/WINGs/python/setup.py
+++ b/WINGs/python/setup.py
@@ -1,71 +0,0 @@
-#!/usr/bin/env python
-
-"""Setup script for the WINGs module distribution."""
-
-import os, sys
-from distutils.core import setup
-from distutils.extension import Extension
-
-## Get the include dirs
-wings = os.popen("get-wings-flags --cflags", "r")
-flags = wings.read().split()
-include_dirs = [x[2:] for x in flags]
-#include_dirs += [".."]
-wings.close()
-
-## Get the library dirs
-wings = os.popen("get-wings-flags --ldflags", "r")
-flags = wings.read().split()
-library_dirs = [x[2:] for x in flags]
-#library_dirs += [".."]
-wings.close()
-
-## Get the libraries
-wings = os.popen("get-wings-flags --libs", "r")
-flags = wings.read().split()
-libraries = [x[2:] for x in flags]
-wings.close()
-
-runtime_library_dirs = []
-extra_objects = []
-extra_compile_args = ['-Wno-strict-prototypes', '-Wno-unused']
-
-long_description = \
-"""Python interface to the WINGs library
-
-Python WINGs is an interface to WINGs, a small widget set with the
-N*XTSTEP look and feel. It's API is inspired in OpenStep and it's
-implementation borrows some ideas from Tk. It has a reasonable set of
-widgets, sufficient for building small applications (like a CDPlayer
-or hacking something like rxvt). It also has other functions that are
-usefull for applications, like a User Defaults alike configuration
-manager and a notification system.
-
-"""
-
-setup (# Distribution meta-data
-        name = "Python-WINGs",
-        version = "0.81.0",
-        description = "A python interface to WINGs",
-        long_description=long_description,
-        author = "Dan Pascu",
-        author_email = "dan@windowmaker.info",
-        license = "GPL",
-        platforms = "ALL",
-        url = "http://windowmaker.info/",
-
-        # Description of the modules and packages in the distribution
-
-        py_modules = ["WINGs"],
-
-        ext_modules = [Extension(
-                name='wings',
-                sources=['WINGs.c'],
-                include_dirs=include_dirs,
-                library_dirs=library_dirs,
-                runtime_library_dirs=runtime_library_dirs,
-                libraries=libraries,
-                extra_objects=extra_objects,
-                extra_compile_args=extra_compile_args,
-                )],
-)
--- a/WINGs/python/test.py
+++ b/WINGs/python/test.py
@@ -1,159 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-from WINGs import *
-
-if __name__ == "__main__":
-    def quit(obj, data):
-        #sys.exit()
-        scr.breakMainLoop()
-
-    def click(btn, list):
-        print win.width(), win.height()
-        print list.selectedItemRow()
-        win2.show()
-        scr.runModalLoop(win2.view())
-        print txt2.text()
-
-    def sayhi(btn, data):
-        print "hi"
-
-    def breakLoop(btn, data):
-        #sys.exit()
-        scr.breakModalLoop()
-        win2.hide()
-
-    def dc(object, data, action):
-        print "didChange:", object, data, action
-
-    def dbe(object, data, action):
-        print "didBeginEditing:", object, data, action
-
-    def dee(object, data, action):
-        if action == wings.WMReturnTextMovement:
-            if object == txt:
-                object.setFocusTo(txt2)
-            else:
-                object.setFocusTo(txt)
-        print "didEndEditing:", object, data, action, object.text()
-
-    def tcb(one):
-        old = list.selectedItemRow()
-        list.selectItem(list.index)
-        list.unselectItem(old)
-        list.index = (list.index+1) % 3
-        #print one
-
-    scr = WMScreen("foobar")
-    win = WMWindow(scr, "aWindow")
-    win.setCloseAction(quit)
-    win.setTitle("test window")
-    win.resize(400, 180)
-    win.setInitialPosition((scr.width-win.width())/2, (scr.height-win.height())/2)
-
-    btn = WMCommandButton(win)
-    btn.setText("Click Me")
-    btn.resize(100, 25)
-    btn.move(20, 20)
-    btn.show()
-
-    sw = WMSwitchButton(win)
-    sw.setText("Some option")
-    sw.resize(100, 25)
-    sw.move(20, 50)
-    sw.show()
-
-    radios = []
-    r = None
-    j = 0
-    for i in ["One", "Two", "Four"]:
-        r = WMRadioButton(win, r)
-        radios.append(r)
-        r.show()
-        r.setText(i)
-        r.move(20, 70+j*25)
-        r.resize(100, 25)
-        j=j+1
-
-    sw.setAction(sayhi)
-
-    list = WMList(win)
-    list.resize(100,100)
-    list.move(130, 20)
-    list.addItem("one")
-    list.addItem("two")
-    list.addItem("three")
-    list.allowMultipleSelection(1)
-    list.show()
-    list.index = 0
-
-    txtdel = WMTextFieldDelegate()
-    txtdel.data = 'mydata'
-    txtdel.didBeginEditing = dbe
-    txtdel.didEndEditing = dee
-    txtdel.didChange = dc
-
-    txt = WMTextField(win)
-    txt.resize(95, 20)
-    txt.move(295, 20)
-    txt.setDelegate(txtdel)
-    txt.show()
-    txt2 = WMTextField(win, "01234567890")
-    txt2.resize(95, 20)
-    txt2.move(295, 45)
-    txt2.setDelegate(txtdel)
-    txt2.show()
-
-    txt.setNextText(txt2)
-    txt2.setNextText(txt)
-
-    label = WMLabel(win, "Text1:")
-    label.setTextAlignment(WARight)
-    label.move(240, 20)
-    label.resize(55, 20)
-    label.show()
-
-    label2 = WMLabel(win, "mytext2:")
-    label2.setTextAlignment(WARight)
-    label2.move(240, 45)
-    label2.resize(55, 20)
-    label2.show()
-    
-    btn.setAction(click, list)
-    
-    frame = WMFrame(win, "My Frame")
-    frame.resize(150, 50)
-    frame.move(240, 70)
-    #frame.setRelief(WRPushed)
-    frame.show()
-    
-    ebtn = WMCommandButton(win)
-    ebtn.setText("Exit")
-    ebtn.resize(100, 25)
-    ebtn.move(290, 147)
-    ebtn.setAction(quit)
-    ebtn.show()
-
-    win.realize()
-    win.show()
-
-    timer = WMPersistentTimer(1000, tcb, win)
-    #del(timer)
-    #timer.delete()
-    
-    win2 = WMPanel(win, "anotherWindow", WMTitledWindowMask)
-    win2.setTitle("transient test window")
-    win2.resize(150, 50)
-    win2.setInitialPosition((scr.width-win2.width())/2, (scr.height-win2.height())/2)
-
-    btn7 = WMCommandButton(win2)
-    btn7.setText("Dismiss")
-    btn7.resize(100, 25)
-    btn7.move(27, 10)
-    btn7.show()
-    btn7.setAction(breakLoop)
-
-    win2.realize()
-    
-    scr.mainLoop()
-
--- a/WINGs/selection.c
+++ b/WINGs/selection.c
@@ -341,7 +341,6 @@ Bool WMCreateSelectionHandler(WMView * view, Atom selection, Time timestamp, WMS
 	/*//printf("created selection handler for %d\n", W_VIEW_DRAWABLE(view)); */

 	handler = wmalloc(sizeof(SelectionHandler));
-
 	handler->view = view;
 	handler->selection = selection;
 	handler->timestamp = timestamp;
@@ -373,14 +372,12 @@ WMRequestSelection(WMView * view, Atom selection, Atom target, Time timestamp,
 	}

 	handler = wmalloc(sizeof(SelectionCallback));
-
 	handler->view = view;
 	handler->selection = selection;
 	handler->target = target;
 	handler->timestamp = timestamp;
 	handler->callback = callback;
 	handler->data = cdata;
-	memset(&handler->flags, 0, sizeof(handler->flags));

 	if (selCallbacks == NULL) {
 		selCallbacks = WMCreateArrayWithDestructor(4, wfree);
--- a/WINGs/snprintf.c
+++ b/WINGs/snprintf.c
@@ -1,941 +0,0 @@
-/*
- * Copyright Patrick Powell 1995
- * This code is based on code written by Patrick Powell (papowell@astart.com)
- * It may be used for any purpose as long as this notice remains intact
- * on all source code distributions
- */
-
-/**************************************************************
- * Original:
- * Patrick Powell Tue Apr 11 09:48:21 PDT 1995
- * A bombproof version of doprnt (dopr) included.
- * Sigh.  This sort of thing is always nasty do deal with.  Note that
- * the version here does not include floating point...
- *
- * snprintf() is used instead of sprintf() as it does limit checks
- * for string length.  This covers a nasty loophole.
- *
- * The other functions are there to prevent NULL pointers from
- * causing nast effects.
- *
- * More Recently:
- *  Brandon Long <blong@fiction.net> 9/15/96 for mutt 0.43
- *  This was ugly.  It is still ugly.  I opted out of floating point
- *  numbers, but the formatter understands just about everything
- *  from the normal C string format, at least as far as I can tell from
- *  the Solaris 2.5 printf(3S) man page.
- *
- *  Brandon Long <blong@fiction.net> 10/22/97 for mutt 0.87.1
- *    Ok, added some minimal floating point support, which means this
- *    probably requires libm on most operating systems.  Don't yet
- *    support the exponent (e,E) and sigfig (g,G).  Also, fmtint()
- *    was pretty badly broken, it just wasn't being exercised in ways
- *    which showed it, so that's been fixed.  Also, formated the code
- *    to mutt conventions, and removed dead code left over from the
- *    original.  Also, there is now a builtin-test, just compile with:
- *           gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
- *    and run snprintf for results.
- *
- *  Thomas Roessler <roessler@guug.de> 01/27/98 for mutt 0.89i
- *    The PGP code was using unsigned hexadecimal formats.
- *    Unfortunately, unsigned formats simply didn't work.
- *
- *  Michael Elkins <me@cs.hmc.edu> 03/05/98 for mutt 0.90.8
- *    The original code assumed that both snprintf() and vsnprintf() were
- *    missing.  Some systems only have snprintf() but not vsnprintf(), so
- *    the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF.
- *
- *  Andrew Tridgell (tridge@samba.org) Oct 1998
- *    fixed handling of %.0f
- *    added test for HAVE_LONG_DOUBLE
- *
- * tridge@samba.org, idra@samba.org, April 2001
- *    got rid of fcvt code (twas buggy and made testing harder)
- *    added C99 semantics
- *
- **************************************************************/
-
-#ifndef NO_CONFIG_H		/* for some tests */
-#include "config.h"
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#include <sys/types.h>
-#include <stdarg.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#if defined(HAVE_SNPRINTF) && defined(HAVE_VSNPRINTF) && defined(HAVE_C99_VSNPRINTF)
-/* only include stdio.h if we are not re-defining snprintf or vsnprintf */
-#include <stdio.h>
-/* make the compiler happy with an empty file */
-void dummy_snprintf(void)
-{
-}
-#else
-
-#ifdef HAVE_LONG_DOUBLE
-#define LDOUBLE long double
-#else
-#define LDOUBLE double
-#endif
-
-#ifdef HAVE_LONG_LONG
-#define LLONG long long
-#else
-#define LLONG long
-#endif
-
-static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args);
-static void fmtstr(char *buffer, size_t * currlen, size_t maxlen, char *value, int flags, int min, int max);
-static void fmtint(char *buffer, size_t * currlen, size_t maxlen,
-		   long value, int base, int min, int max, int flags);
-static void fmtfp(char *buffer, size_t * currlen, size_t maxlen, LDOUBLE fvalue, int min, int max, int flags);
-static void dopr_outch(char *buffer, size_t * currlen, size_t maxlen, char c);
-
-/*
- * dopr(): poor man's version of doprintf
- */
-
-/* format read states */
-#define DP_S_DEFAULT 0
-#define DP_S_FLAGS   1
-#define DP_S_MIN     2
-#define DP_S_DOT     3
-#define DP_S_MAX     4
-#define DP_S_MOD     5
-#define DP_S_CONV    6
-#define DP_S_DONE    7
-
-/* format flags - Bits */
-#define DP_F_MINUS 	(1 << 0)
-#define DP_F_PLUS  	(1 << 1)
-#define DP_F_SPACE 	(1 << 2)
-#define DP_F_NUM   	(1 << 3)
-#define DP_F_ZERO  	(1 << 4)
-#define DP_F_UP    	(1 << 5)
-#define DP_F_UNSIGNED 	(1 << 6)
-
-/* Conversion Flags */
-#define DP_C_SHORT   1
-#define DP_C_LONG    2
-#define DP_C_LDOUBLE 3
-#define DP_C_LLONG   4
-
-#define char_to_int(p) ((p)- '0')
-#ifndef MAX
-#define MAX(p,q) (((p) >= (q)) ? (p) : (q))
-#endif
-
-static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args)
-{
-	char ch;
-	LLONG value;
-	LDOUBLE fvalue;
-	char *strvalue;
-	int min;
-	int max;
-	int state;
-	int flags;
-	int cflags;
-	size_t currlen;
-
-	state = DP_S_DEFAULT;
-	currlen = flags = cflags = min = 0;
-	max = -1;
-	ch = *format++;
-
-	while (state != DP_S_DONE) {
-		if (ch == '\0')
-			state = DP_S_DONE;
-
-		switch (state) {
-		case DP_S_DEFAULT:
-			if (ch == '%')
-				state = DP_S_FLAGS;
-			else
-				dopr_outch(buffer, &currlen, maxlen, ch);
-			ch = *format++;
-			break;
-		case DP_S_FLAGS:
-			switch (ch) {
-			case '-':
-				flags |= DP_F_MINUS;
-				ch = *format++;
-				break;
-			case '+':
-				flags |= DP_F_PLUS;
-				ch = *format++;
-				break;
-			case ' ':
-				flags |= DP_F_SPACE;
-				ch = *format++;
-				break;
-			case '#':
-				flags |= DP_F_NUM;
-				ch = *format++;
-				break;
-			case '0':
-				flags |= DP_F_ZERO;
-				ch = *format++;
-				break;
-			default:
-				state = DP_S_MIN;
-				break;
-			}
-			break;
-		case DP_S_MIN:
-			if (isdigit((unsigned char)ch)) {
-				min = 10 * min + char_to_int(ch);
-				ch = *format++;
-			} else if (ch == '*') {
-				min = va_arg(args, int);
-				ch = *format++;
-				state = DP_S_DOT;
-			} else {
-				state = DP_S_DOT;
-			}
-			break;
-		case DP_S_DOT:
-			if (ch == '.') {
-				state = DP_S_MAX;
-				ch = *format++;
-			} else {
-				state = DP_S_MOD;
-			}
-			break;
-		case DP_S_MAX:
-			if (isdigit((unsigned char)ch)) {
-				if (max < 0)
-					max = 0;
-				max = 10 * max + char_to_int(ch);
-				ch = *format++;
-			} else if (ch == '*') {
-				max = va_arg(args, int);
-				ch = *format++;
-				state = DP_S_MOD;
-			} else {
-				state = DP_S_MOD;
-			}
-			break;
-		case DP_S_MOD:
-			switch (ch) {
-			case 'h':
-				cflags = DP_C_SHORT;
-				ch = *format++;
-				break;
-			case 'l':
-				cflags = DP_C_LONG;
-				ch = *format++;
-				if (ch == 'l') {	/* It's a long long */
-					cflags = DP_C_LLONG;
-					ch = *format++;
-				}
-				break;
-			case 'L':
-				cflags = DP_C_LDOUBLE;
-				ch = *format++;
-				break;
-			default:
-				break;
-			}
-			state = DP_S_CONV;
-			break;
-		case DP_S_CONV:
-			switch (ch) {
-			case 'd':
-			case 'i':
-				if (cflags == DP_C_SHORT)
-					value = va_arg(args, int);
-				else if (cflags == DP_C_LONG)
-					value = va_arg(args, long int);
-				else if (cflags == DP_C_LLONG)
-					value = va_arg(args, LLONG);
-				else
-					value = va_arg(args, int);
-				fmtint(buffer, &currlen, maxlen, value, 10, min, max, flags);
-				break;
-			case 'o':
-				flags |= DP_F_UNSIGNED;
-				if (cflags == DP_C_SHORT)
-					value = va_arg(args, unsigned int);
-				else if (cflags == DP_C_LONG)
-					value = (long)va_arg(args, unsigned long int);
-				else if (cflags == DP_C_LLONG)
-					value = (long)va_arg(args, unsigned LLONG);
-				else
-					value = (long)va_arg(args, unsigned int);
-				fmtint(buffer, &currlen, maxlen, value, 8, min, max, flags);
-				break;
-			case 'u':
-				flags |= DP_F_UNSIGNED;
-				if (cflags == DP_C_SHORT)
-					value = va_arg(args, unsigned int);
-				else if (cflags == DP_C_LONG)
-					value = (long)va_arg(args, unsigned long int);
-				else if (cflags == DP_C_LLONG)
-					value = (LLONG) va_arg(args, unsigned LLONG);
-				else
-					value = (long)va_arg(args, unsigned int);
-				fmtint(buffer, &currlen, maxlen, value, 10, min, max, flags);
-				break;
-			case 'X':
-				flags |= DP_F_UP;
-			case 'x':
-				flags |= DP_F_UNSIGNED;
-				if (cflags == DP_C_SHORT)
-					value = va_arg(args, unsigned int);
-				else if (cflags == DP_C_LONG)
-					value = (long)va_arg(args, unsigned long int);
-				else if (cflags == DP_C_LLONG)
-					value = (LLONG) va_arg(args, unsigned LLONG);
-				else
-					value = (long)va_arg(args, unsigned int);
-				fmtint(buffer, &currlen, maxlen, value, 16, min, max, flags);
-				break;
-			case 'f':
-				if (cflags == DP_C_LDOUBLE)
-					fvalue = va_arg(args, LDOUBLE);
-				else
-					fvalue = va_arg(args, double);
-				/* um, floating point? */
-				fmtfp(buffer, &currlen, maxlen, fvalue, min, max, flags);
-				break;
-			case 'E':
-				flags |= DP_F_UP;
-			case 'e':
-				if (cflags == DP_C_LDOUBLE)
-					fvalue = va_arg(args, LDOUBLE);
-				else
-					fvalue = va_arg(args, double);
-				break;
-			case 'G':
-				flags |= DP_F_UP;
-			case 'g':
-				if (cflags == DP_C_LDOUBLE)
-					fvalue = va_arg(args, LDOUBLE);
-				else
-					fvalue = va_arg(args, double);
-				break;
-			case 'c':
-				dopr_outch(buffer, &currlen, maxlen, va_arg(args, int));
-				break;
-			case 's':
-				strvalue = va_arg(args, char *);
-				if (max == -1) {
-					max = strlen(strvalue);
-				}
-				if (min > 0 && max >= 0 && min > max)
-					max = min;
-				fmtstr(buffer, &currlen, maxlen, strvalue, flags, min, max);
-				break;
-			case 'p':
-				strvalue = va_arg(args, void *);
-				fmtint(buffer, &currlen, maxlen, (long)strvalue, 16, min, max, flags);
-				break;
-			case 'n':
-				if (cflags == DP_C_SHORT) {
-					short int *num;
-					num = va_arg(args, short int *);
-					*num = currlen;
-				} else if (cflags == DP_C_LONG) {
-					long int *num;
-					num = va_arg(args, long int *);
-					*num = (long int)currlen;
-				} else if (cflags == DP_C_LLONG) {
-					LLONG *num;
-					num = va_arg(args, LLONG *);
-					*num = (LLONG) currlen;
-				} else {
-					int *num;
-					num = va_arg(args, int *);
-					*num = currlen;
-				}
-				break;
-			case '%':
-				dopr_outch(buffer, &currlen, maxlen, ch);
-				break;
-			case 'w':
-				/* not supported yet, treat as next char */
-				ch = *format++;
-				break;
-			default:
-				/* Unknown, skip */
-				break;
-			}
-			ch = *format++;
-			state = DP_S_DEFAULT;
-			flags = cflags = min = 0;
-			max = -1;
-			break;
-		case DP_S_DONE:
-			break;
-		default:
-			/* hmm? */
-			break;	/* some picky compilers need this */
-		}
-	}
-	if (maxlen != 0) {
-		if (currlen < maxlen - 1)
-			buffer[currlen] = '\0';
-		else if (maxlen > 0)
-			buffer[maxlen - 1] = '\0';
-	}
-
-	return currlen;
-}
-
-static void fmtstr(char *buffer, size_t * currlen, size_t maxlen, char *value, int flags, int min, int max)
-{
-	int padlen, strln;	/* amount to pad */
-	int cnt = 0;
-
-#ifdef DEBUG_SNPRINTF
-	printf("fmtstr min=%d max=%d s=[%s]\n", min, max, value);
-#endif
-	if (value == 0) {
-		value = "<NULL>";
-	}
-
-	for (strln = 0; value[strln]; ++strln) ;	/* strlen */
-	padlen = min - strln;
-	if (padlen < 0)
-		padlen = 0;
-	if (flags & DP_F_MINUS)
-		padlen = -padlen;	/* Left Justify */
-
-	while ((padlen > 0) && (cnt < max)) {
-		dopr_outch(buffer, currlen, maxlen, ' ');
-		--padlen;
-		++cnt;
-	}
-	while (*value && (cnt < max)) {
-		dopr_outch(buffer, currlen, maxlen, *value++);
-		++cnt;
-	}
-	while ((padlen < 0) && (cnt < max)) {
-		dopr_outch(buffer, currlen, maxlen, ' ');
-		++padlen;
-		++cnt;
-	}
-}
-
-/* Have to handle DP_F_NUM (ie 0x and 0 alternates) */
-
-static void fmtint(char *buffer, size_t * currlen, size_t maxlen,
-		   long value, int base, int min, int max, int flags)
-{
-	int signvalue = 0;
-	unsigned long uvalue;
-	char convert[20];
-	int place = 0;
-	int spadlen = 0;	/* amount to space pad */
-	int zpadlen = 0;	/* amount to zero pad */
-	int caps = 0;
-
-	if (max < 0)
-		max = 0;
-
-	uvalue = value;
-
-	if (!(flags & DP_F_UNSIGNED)) {
-		if (value < 0) {
-			signvalue = '-';
-			uvalue = -value;
-		} else {
-			if (flags & DP_F_PLUS)	/* Do a sign (+/i) */
-				signvalue = '+';
-			else if (flags & DP_F_SPACE)
-				signvalue = ' ';
-		}
-	}
-
-	if (flags & DP_F_UP)
-		caps = 1;	/* Should characters be upper case? */
-
-	do {
-		convert[place++] = (caps ? "0123456789ABCDEF" : "0123456789abcdef")
-		    [uvalue % (unsigned)base];
-		uvalue = (uvalue / (unsigned)base);
-	} while (uvalue && (place < 20));
-	if (place == 20)
-		place--;
-	convert[place] = 0;
-
-	zpadlen = max - place;
-	spadlen = min - MAX(max, place) - (signvalue ? 1 : 0);
-	if (zpadlen < 0)
-		zpadlen = 0;
-	if (spadlen < 0)
-		spadlen = 0;
-	if (flags & DP_F_ZERO) {
-		zpadlen = MAX(zpadlen, spadlen);
-		spadlen = 0;
-	}
-	if (flags & DP_F_MINUS)
-		spadlen = -spadlen;	/* Left Justifty */
-
-#ifdef DEBUG_SNPRINTF
-	printf("zpad: %d, spad: %d, min: %d, max: %d, place: %d\n", zpadlen, spadlen, min, max, place);
-#endif
-
-	/* Spaces */
-	while (spadlen > 0) {
-		dopr_outch(buffer, currlen, maxlen, ' ');
-		--spadlen;
-	}
-
-	/* Sign */
-	if (signvalue)
-		dopr_outch(buffer, currlen, maxlen, signvalue);
-
-	/* Zeros */
-	if (zpadlen > 0) {
-		while (zpadlen > 0) {
-			dopr_outch(buffer, currlen, maxlen, '0');
-			--zpadlen;
-		}
-	}
-
-	/* Digits */
-	while (place > 0)
-		dopr_outch(buffer, currlen, maxlen, convert[--place]);
-
-	/* Left Justified spaces */
-	while (spadlen < 0) {
-		dopr_outch(buffer, currlen, maxlen, ' ');
-		++spadlen;
-	}
-}
-
-static LDOUBLE abs_val(LDOUBLE value)
-{
-	LDOUBLE result = value;
-
-	if (value < 0)
-		result = -value;
-
-	return result;
-}
-
-static LDOUBLE POW10(int exp)
-{
-	LDOUBLE result = 1;
-
-	while (exp) {
-		result *= 10;
-		exp--;
-	}
-
-	return result;
-}
-
-static LLONG ROUND(LDOUBLE value)
-{
-	LLONG intpart;
-
-	intpart = (LLONG) value;
-	value = value - intpart;
-	if (value >= 0.5)
-		intpart++;
-
-	return intpart;
-}
-
-/* a replacement for modf that doesn't need the math library. Should
- be portable, but slow */
-static double my_modf(double x0, double *iptr)
-{
-	int i;
-	long l;
-	double x = x0;
-	double f = 1.0;
-
-	for (i = 0; i < 100; i++) {
-		l = (long)x;
-		if (l <= (x + 1) && l >= (x - 1))
-			break;
-		x *= 0.1;
-		f *= 10.0;
-	}
-
-	if (i == 100) {
-		/* yikes! the number is beyond what we can handle. What do we do? */
-		(*iptr) = 0;
-		return 0;
-	}
-
-	if (i != 0) {
-		double i2;
-		double ret;
-
-		ret = my_modf(x0 - l * f, &i2);
-		(*iptr) = l * f + i2;
-		return ret;
-	}
-
-	(*iptr) = l;
-	return x - (*iptr);
-}
-
-static void fmtfp(char *buffer, size_t * currlen, size_t maxlen, LDOUBLE fvalue, int min, int max, int flags)
-{
-	int signvalue = 0;
-	double ufvalue;
-	char iconvert[311];
-	char fconvert[311];
-	int iplace = 0;
-	int fplace = 0;
-	int padlen = 0;		/* amount to pad */
-	int zpadlen = 0;
-	int caps = 0;
-	int index;
-	double intpart;
-	double fracpart;
-	double temp;
-
-	/*
-	 * AIX manpage says the default is 0, but Solaris says the default
-	 * is 6, and sprintf on AIX defaults to 6
-	 */
-	if (max < 0)
-		max = 6;
-
-	ufvalue = abs_val(fvalue);
-
-	if (fvalue < 0) {
-		signvalue = '-';
-	} else {
-		if (flags & DP_F_PLUS) {	/* Do a sign (+/i) */
-			signvalue = '+';
-		} else {
-			if (flags & DP_F_SPACE)
-				signvalue = ' ';
-		}
-	}
-
-#if 0
-	if (flags & DP_F_UP)
-		caps = 1;	/* Should characters be upper case? */
-#endif
-
-#if 0
-	if (max == 0)
-		ufvalue += 0.5;	/* if max = 0 we must round */
-#endif
-
-	/*
-	 * Sorry, we only support 16 digits past the decimal because of our
-	 * conversion method
-	 */
-	if (max > 16)
-		max = 16;
-
-	/* We "cheat" by converting the fractional part to integer by
-	 * multiplying by a factor of 10
-	 */
-
-	temp = ufvalue;
-	my_modf(temp, &intpart);
-
-	fracpart = ROUND((POW10(max)) * (ufvalue - intpart));
-
-	if (fracpart >= POW10(max)) {
-		intpart++;
-		fracpart -= POW10(max);
-	}
-
-	/* Convert integer part */
-	do {
-		temp = intpart;
-		my_modf(intpart * 0.1, &intpart);
-		temp = temp * 0.1;
-		index = (int)((temp - intpart + 0.05) * 10.0);
-		/* index = (int) (((double)(temp*0.1) -intpart +0.05) *10.0); */
-		/* printf ("%llf, %f, %x\n", temp, intpart, index); */
-		iconvert[iplace++] = (caps ? "0123456789ABCDEF" : "0123456789abcdef")[index];
-	} while (intpart && (iplace < 311));
-	if (iplace == 311)
-		iplace--;
-	iconvert[iplace] = 0;
-
-	/* Convert fractional part */
-	if (fracpart) {
-		do {
-			temp = fracpart;
-			my_modf(fracpart * 0.1, &fracpart);
-			temp = temp * 0.1;
-			index = (int)((temp - fracpart + 0.05) * 10.0);
-			/* index = (int) ((((temp/10) -fracpart) +0.05) *10); */
-			/* printf ("%lf, %lf, %ld\n", temp, fracpart, index); */
-			fconvert[fplace++] = (caps ? "0123456789ABCDEF" : "0123456789abcdef")[index];
-		} while (fracpart && (fplace < 311));
-		if (fplace == 311)
-			fplace--;
-	}
-	fconvert[fplace] = 0;
-
-	/* -1 for decimal point, another -1 if we are printing a sign */
-	padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0);
-	zpadlen = max - fplace;
-	if (zpadlen < 0)
-		zpadlen = 0;
-	if (padlen < 0)
-		padlen = 0;
-	if (flags & DP_F_MINUS)
-		padlen = -padlen;	/* Left Justifty */
-
-	if ((flags & DP_F_ZERO) && (padlen > 0)) {
-		if (signvalue) {
-			dopr_outch(buffer, currlen, maxlen, signvalue);
-			--padlen;
-			signvalue = 0;
-		}
-		while (padlen > 0) {
-			dopr_outch(buffer, currlen, maxlen, '0');
-			--padlen;
-		}
-	}
-	while (padlen > 0) {
-		dopr_outch(buffer, currlen, maxlen, ' ');
-		--padlen;
-	}
-	if (signvalue)
-		dopr_outch(buffer, currlen, maxlen, signvalue);
-
-	while (iplace > 0)
-		dopr_outch(buffer, currlen, maxlen, iconvert[--iplace]);
-
-#ifdef DEBUG_SNPRINTF
-	printf("fmtfp: fplace=%d zpadlen=%d\n", fplace, zpadlen);
-#endif
-
-	/*
-	 * Decimal point.  This should probably use locale to find the correct
-	 * char to print out.
-	 */
-	if (max > 0) {
-		dopr_outch(buffer, currlen, maxlen, '.');
-
-		while (fplace > 0)
-			dopr_outch(buffer, currlen, maxlen, fconvert[--fplace]);
-	}
-
-	while (zpadlen > 0) {
-		dopr_outch(buffer, currlen, maxlen, '0');
-		--zpadlen;
-	}
-
-	while (padlen < 0) {
-		dopr_outch(buffer, currlen, maxlen, ' ');
-		++padlen;
-	}
-}
-
-static void dopr_outch(char *buffer, size_t * currlen, size_t maxlen, char c)
-{
-	if (*currlen < maxlen) {
-		buffer[(*currlen)] = c;
-	}
-	(*currlen)++;
-}
-
-#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
-int vsnprintf(char *str, size_t count, const char *fmt, va_list args)
-{
-	return dopr(str, count, fmt, args);
-}
-#endif
-
-#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
-int snprintf(char *str, size_t count, const char *fmt, ...)
-{
-	size_t ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vsnprintf(str, count, fmt, ap);
-	va_end(ap);
-	return ret;
-}
-#endif
-
-#endif
-
-#ifndef HAVE_VASPRINTF
-int vasprintf(char **ptr, const char *format, va_list ap)
-{
-	int ret;
-
-	ret = vsnprintf(NULL, 0, format, ap);
-	if (ret <= 0)
-		return ret;
-
-	(*ptr) = (char *)malloc(ret + 1);
-	if (!*ptr)
-		return -1;
-	ret = vsnprintf(*ptr, ret + 1, format, ap);
-
-	return ret;
-}
-#endif
-
-#ifndef HAVE_ASPRINTF
-int asprintf(char **ptr, const char *format, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, format);
-	ret = vasprintf(ptr, format, ap);
-	va_end(ap);
-
-	return ret;
-}
-#endif
-
-#ifdef TEST_SNPRINTF
-
-int sprintf(char *str, const char *fmt, ...);
-
-int main(void)
-{
-	char buf1[1024];
-	char buf2[1024];
-	char *fp_fmt[] = {
-		"%1.1f",
-		"%-1.5f",
-		"%1.5f",
-		"%123.9f",
-		"%10.5f",
-		"% 10.5f",
-		"%+22.9f",
-		"%+4.9f",
-		"%01.3f",
-		"%4f",
-		"%3.1f",
-		"%3.2f",
-		"%.0f",
-		"%f",
-		"-16.16f",
-		NULL
-	};
-	double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996,
-		0.9996, 1.996, 4.136, 0
-	};
-	char *int_fmt[] = {
-		"%-1.5d",
-		"%1.5d",
-		"%123.9d",
-		"%5.5d",
-		"%10.5d",
-		"% 10.5d",
-		"%+22.33d",
-		"%01.3d",
-		"%4d",
-		"%d",
-		NULL
-	};
-	long int_nums[] = { -1, 134, 91340, 341, 0203, 0 };
-	char *str_fmt[] = {
-		"10.5s",
-		"5.10s",
-		"10.1s",
-		"0.10s",
-		"10.0s",
-		"1.10s",
-		"%s",
-		"%.1s",
-		"%.10s",
-		"%10s",
-		NULL
-	};
-	char *str_vals[] = { "hello", "a", "", "a longer string", NULL };
-	int x, y;
-	int fail = 0;
-	int num = 0;
-
-	printf("Testing snprintf format codes against system sprintf...\n");
-
-	for (x = 0; fp_fmt[x]; x++) {
-		for (y = 0; fp_nums[y] != 0; y++) {
-			int l1 = snprintf(NULL, 0, fp_fmt[x], fp_nums[y]);
-			int l2 = snprintf(buf1, sizeof(buf1), fp_fmt[x], fp_nums[y]);
-			sprintf(buf2, fp_fmt[x], fp_nums[y]);
-			if (strcmp(buf1, buf2)) {
-				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
-				       fp_fmt[x], buf1, buf2);
-				fail++;
-			}
-			if (l1 != l2) {
-				printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, fp_fmt[x]);
-				fail++;
-			}
-			num++;
-		}
-	}
-
-	for (x = 0; int_fmt[x]; x++) {
-		for (y = 0; int_nums[y] != 0; y++) {
-			int l1 = snprintf(NULL, 0, int_fmt[x], int_nums[y]);
-			int l2 = snprintf(buf1, sizeof(buf1), int_fmt[x], int_nums[y]);
-			sprintf(buf2, int_fmt[x], int_nums[y]);
-			if (strcmp(buf1, buf2)) {
-				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
-				       int_fmt[x], buf1, buf2);
-				fail++;
-			}
-			if (l1 != l2) {
-				printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, int_fmt[x]);
-				fail++;
-			}
-			num++;
-		}
-	}
-
-	for (x = 0; str_fmt[x]; x++) {
-		for (y = 0; str_vals[y] != 0; y++) {
-			int l1 = snprintf(NULL, 0, str_fmt[x], str_vals[y]);
-			int l2 = snprintf(buf1, sizeof(buf1), str_fmt[x], str_vals[y]);
-			sprintf(buf2, str_fmt[x], str_vals[y]);
-			if (strcmp(buf1, buf2)) {
-				printf("snprintf doesn't match Format: %s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
-				       str_fmt[x], buf1, buf2);
-				fail++;
-			}
-			if (l1 != l2) {
-				printf("snprintf l1 != l2 (%d %d) %s\n", l1, l2, str_fmt[x]);
-				fail++;
-			}
-			num++;
-		}
-	}
-
-	printf("%d tests failed out of %d.\n", fail, num);
-
-	printf("seeing how many digits we support\n");
-	{
-		double v0 = 0.12345678901234567890123456789012345678901;
-		for (x = 0; x < 100; x++) {
-			snprintf(buf1, sizeof(buf1), "%1.1f", v0 * pow(10, x));
-			sprintf(buf2, "%1.1f", v0 * pow(10, x));
-			if (strcmp(buf1, buf2)) {
-				printf("we seem to support %d digits\n", x - 1);
-				break;
-			}
-		}
-	}
-
-	return 0;
-}
-#endif				/* SNPRINTF_TEST */
--- a/WINGs/string.c
+++ b/WINGs/string.c
@@ -1,9 +1,19 @@
+/*
+ * Until FreeBSD gets their act together;
+ * http://www.mail-archive.com/freebsd-hackers@freebsd.org/msg69469.html
+ */
+#if defined( FREEBSD )
+#   undef _XOPEN_SOURCE
+#endif

 #include "wconfig.h"

 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#ifdef HAVE_BSD_STRING_H
+#include <bsd/string.h>
+#endif

 #include "WUtil.h"

@@ -41,7 +51,6 @@ char *wtokennext(char *word, char **next)
 	ptr = word;

 	state = 0;
-	*t = 0;
 	while (1) {
 		if (*ptr == 0)
 			ctype = PRC_EOS;
@@ -121,21 +130,33 @@ char *wtokenjoin(char **list, int count)

 	flat_string = wmalloc(j + count + 1);

-	*flat_string = 0;
 	for (i = 0; i < count; i++) {
 		if (list[i] != NULL && list[i][0] != 0) {
-			if (i > 0)
-				strcat(flat_string, " ");
+			if (i > 0 &&
+			    wstrlcat(flat_string, " ", j + count + 1) >= j + count + 1)
+					goto error;
+
 			wspace = strpbrk(list[i], " \t");
-			if (wspace)
-				strcat(flat_string, "\"");
-			strcat(flat_string, list[i]);
-			if (wspace)
-				strcat(flat_string, "\"");
+
+			if (wspace &&
+			    wstrlcat(flat_string, "\"", j + count + 1) >= j + count + 1)
+					goto error;
+
+			if (wstrlcat(flat_string, list[i], j + count + 1) >= j + count + 1)
+				goto error;
+
+			if (wspace &&
+			    wstrlcat(flat_string, "\"", j + count + 1) >= j + count + 1)
+					goto error;
 		}
 	}

 	return flat_string;
+
+error:
+	wfree(flat_string);
+
+	return NULL;
 }

 void wtokenfree(char **tokens, int count)
@@ -145,32 +166,30 @@ void wtokenfree(char **tokens, int count)
 	wfree(tokens);
 }

-char *wtrimspace(char *s)
+char *wtrimspace(const char *s)
 {
 	char *t;
-	char *c;
+
+	if (s == NULL)
+		return NULL;

 	while (isspace(*s) && *s)
 		s++;
-	t = s + strlen(s) - 1;
+	t = (char *)s + strlen(s) - 1;
 	while (t > s && isspace(*t))
 		t--;

-	c = wmalloc(t - s + 2);
-	memcpy(c, s, t - s + 1);
-	c[t - s + 1] = 0;
-
-	return c;
+	return wstrndup(s, t - s + 1);
 }

-char *wstrdup(char *str)
+char *wstrdup(const char *str)
 {
 	assert(str != NULL);

 	return strcpy(wmalloc(strlen(str) + 1), str);
 }

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

@@ -186,40 +205,223 @@ char *wstrndup(char *str, size_t len)
 char *wstrconcat(char *str1, char *str2)
 {
 	char *str;
+	size_t slen;

 	if (!str1)
 		return wstrdup(str2);
 	else if (!str2)
 		return wstrdup(str1);

-	str = wmalloc(strlen(str1) + strlen(str2) + 1);
-	strcpy(str, str1);
-	strcat(str, str2);
+	slen = strlen(str1) + strlen(str2) + 1;
+	str = wmalloc(slen);
+	if (wstrlcpy(str, str1, slen) >= slen ||
+	    wstrlcat(str, str2, slen) >= slen) {
+		wfree(str);
+		return NULL;
+	}

 	return str;
 }

 char *wstrappend(char *dst, char *src)
 {
+	size_t slen;
+
 	if (!dst)
 		return wstrdup(src);
 	else if (!src || *src == 0)
 		return dst;

-	dst = wrealloc(dst, strlen(dst) + strlen(src) + 1);
-	strcat(dst, src);
+	slen = strlen(dst) + strlen(src) + 1;
+	dst = wrealloc(dst, slen);
+	if (wstrlcat(dst, src, slen) >= slen)
+		return NULL;

 	return dst;
 }

-#ifndef HAVE_STRCASECMP
-int strcasecmp(const char *s1, const char *s2)
+
+#if HAVE_STRLCAT
+size_t
+wstrlcat(char *dst, const char *src, size_t siz)
 {
-	while (*s1 && *s2 && (tolower(*s1) == tolower(*s2))) {
-		s1++;
-		s2++;
+	return strlcat(dst, src, siz);
+}
+#else
+/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t
+wstrlcat(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end */
+	while (n-- != 0 && *d != '\0')
+		d++;
+	dlen = d - dst;
+	n = siz - dlen;
+
+	if (n == 0)
+		return(dlen + strlen(s));
+	while (*s != '\0') {
+		if (n != 1) {
+			*d++ = *s;
+			n--;
+		}
+		s++;
+	}
+	*d = '\0';
+
+	return(dlen + (s - src));	/* count does not include NUL */
+}
+#endif /* HAVE_STRLCAT */
+
+#if HAVE_STRLCPY
+size_t
+wstrlcpy(char *dst, const char *src, size_t siz)
+{
+	return strlcpy(dst, src, siz);
+}
+#else
+
+/*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+wstrlcpy(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0) {
+		while (--n != 0) {
+			if ((*d++ = *s++) == '\0')
+				break;
+		}
 	}

-	return (tolower(*s1) - tolower(*s2));
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return(s - src - 1);	/* count does not include NUL */
+}
+#endif /* HAVE_STRLCPY */
+
+/* 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)
+{
+	char *p, *r, *last, *ret;
+	size_t slen;
+	int needs_quoting;
+
+	if (!s)
+		return NULL;
+
+	needs_quoting = !*s;			/* the empty string does need quoting */
+
+	/* do not quote if consists only of the following characters */
+	for (p = (char *)s; *p && !needs_quoting; p++) {
+		needs_quoting = !(isalnum(*p) || (*p == '+') || (*p == '/') ||
+				 (*p == '.') || (*p == ',') || (*p == '-'));
+	}
+
+	if (!needs_quoting)
+		return wstrdup(s);
+
+	for (slen = 0, p = (char *)s; *p; p++)		/* count space needed (worst case) */
+		slen += *p == '\'' ? 4 : 1;		/* every single ' becomes ''\' */
+
+	slen += 2 /* leading + trailing "'" */ + 1 /* NULL */;
+
+	ret = r = wmalloc(slen);
+	p = (char *)s;
+	last = p;
+
+	if (*p != '\'')					/* if string doesn't already begin with "'" */
+		*r++ ='\'';				/* start putting it in quotes */
+
+	while (*p) {
+		last = p;
+		if (*p == '\'') {			/* turn each ' into ''\' */
+			if (p != s)			/* except if it's the first ', in which case */
+				*r++ = '\'';		/* only escape it */
+			*r++ = '\\';
+			*r++ = '\'';
+			while (*++p && *p == '\'') {	/* keep turning each consecutive 's into \' */
+				*r++ = '\\';
+				*r++ = '\'';
+			}
+			if (*p)				/* if more input follows, terminate */
+				*r++ = '\'';		/* what we have so far */
+		} else {
+			*r++ = *p++;
+		}
+	}
+
+	if (*last != '\'')				/* if the last one isn't already a ' */
+		*r++ = '\'';				/* terminate the whole shebang */
+
+	*r = '\0';
+
+	return ret;					/* technically, we lose (but not leak) a couple of */
+							/* bytes (twice the number of consecutive 's in the */
+							/* input or so), but since these are relatively rare */
+							/* and short-lived strings, not sure if a trip to */
+							/* wstrdup+wfree worths the gain. */
 }
-#endif
--- a/WINGs/tree.c
+++ b/WINGs/tree.c
@@ -40,10 +40,7 @@ WMTreeNode *WMCreateTreeNodeWithDestructor(void *data, WMFreeDataProc * destruct
 	WMTreeNode *aNode;

 	aNode = (WMTreeNode *) wmalloc(sizeof(W_TreeNode));
-	memset(aNode, 0, sizeof(W_TreeNode));
-
 	aNode->destructor = destructor;
-
 	aNode->data = data;
 	aNode->parent = NULL;
 	aNode->depth = 0;
@@ -125,7 +122,7 @@ void WMDeleteLeafForTreeNode(WMTreeNode * aNode, int index)
 	WMDeleteFromArray(aNode->leaves, index);
 }

-static int sameData(void *item, void *data)
+static int sameData(const void *item, const void *data)
 {
 	return (((WMTreeNode *) item)->data == data);
 }
@@ -199,27 +196,22 @@ void WMSortTree(WMTreeNode * aNode, WMCompareDataProc * comparer)
 	sortLeavesForNode(aNode, comparer);
 }

-static WMTreeNode *findNodeInTree(WMTreeNode * aNode, WMMatchDataProc * match, void *cdata)
+static WMTreeNode *findNodeInTree(WMTreeNode * aNode, WMMatchDataProc * match, void *cdata, int limit)
 {
-	if (match == NULL) {
-		if (aNode->data == cdata) {
-			return aNode;
-		}
-	} else {
-		if ((*match) (aNode->data, cdata)) {
-			return aNode;
-		}
-	}
+	if (match == NULL && aNode->data == cdata)
+		return aNode;
+	else if ((*match) (aNode->data, cdata))
+		return aNode;

-	if (aNode->leaves) {
+	if (aNode->leaves && limit != 0) {
 		WMTreeNode *leaf;
 		int i;

 		for (i = 0; i < WMGetArrayItemCount(aNode->leaves); i++) {
-			leaf = findNodeInTree(WMGetFromArray(aNode->leaves, i), match, cdata);
-			if (leaf) {
+			leaf = findNodeInTree(WMGetFromArray(aNode->leaves, i),
+					      match, cdata, limit > 0 ? limit - 1 : limit);
+			if (leaf)
 				return leaf;
-			}
 		}
 	}

@@ -230,5 +222,34 @@ WMTreeNode *WMFindInTree(WMTreeNode * aTree, WMMatchDataProc * match, void *cdat
 {
 	wassertrv(aTree != NULL, NULL);

-	return findNodeInTree(aTree, match, cdata);
+	return findNodeInTree(aTree, match, cdata, -1);
+}
+
+WMTreeNode *WMFindInTreeWithDepthLimit(WMTreeNode * aTree, WMMatchDataProc * match, void *cdata, int limit)
+{
+	wassertrv(aTree != NULL, NULL);
+	wassertrv(limit >= 0, NULL);
+
+	return findNodeInTree(aTree, match, cdata, limit);
+}
+
+void WMTreeWalk(WMTreeNode * aNode, WMTreeWalkProc * walk, void *data, Bool DepthFirst)
+{
+	int i;
+	WMTreeNode *leaf;
+
+	wassertr(aNode != NULL);
+
+	if (DepthFirst)
+		(*walk)(aNode, data);
+
+	if (aNode->leaves) {
+		for (i = 0; i < WMGetArrayItemCount(aNode->leaves); i++) {
+			leaf = (WMTreeNode *)WMGetFromArray(aNode->leaves, i);
+			WMTreeWalk(leaf, walk, data, DepthFirst);
+		}
+	}
+
+	if (!DepthFirst)
+		(*walk)(aNode, data);
 }
--- a/WINGs/userdefaults.c
+++ b/WINGs/userdefaults.c
@@ -1,6 +1,7 @@

 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <stdio.h>
 #include <assert.h>
 #include <unistd.h>
@@ -39,6 +40,11 @@ static void synchronizeUserDefaults(void *foo);
 extern char *WMGetApplicationName();

 #define DEFAULTS_DIR "/Defaults"
+#ifndef HAVE_INOTIFY
+/* Check defaults database for changes every this many milliseconds */
+/* XXX: this is shared with src/ stuff, put it in some common header */
+#define UD_SYNC_INTERVAL	2000
+#endif

 char *wusergnusteppath()
 {
@@ -46,19 +52,28 @@ char *wusergnusteppath()
 	char *gspath;
 	int pathlen;

-	if (!path) {
-		gspath = getenv("GNUSTEP_USER_ROOT");
+	gspath = getenv("GNUSTEP_USER_ROOT");
+	if (gspath) {
+		gspath = wexpandpath(gspath);
 		if (gspath) {
-			gspath = wexpandpath(gspath);
 			pathlen = strlen(gspath) + 4;
 			path = wmalloc(pathlen);
-			strcpy(path, gspath);
+			if (wstrlcpy(path, gspath, pathlen) >= pathlen) {
+				wfree(gspath);
+				return NULL;
+			}
 			wfree(gspath);
-		} else {
-			pathlen = strlen(wgethomedir()) + 10;
-			path = wmalloc(pathlen);
-			strcpy(path, wgethomedir());
-			strcat(path, "/GNUstep");
+		}
+	} else {
+		char *h = wgethomedir();
+		if (!h)
+			return NULL;
+		pathlen = strlen(h) + 8 /* /GNUstep */ + 1;
+		path = wmalloc(pathlen);
+		if (wstrlcpy(path, h, pathlen) >= pathlen ||
+		    wstrlcat(path, "/GNUstep", pathlen) >= pathlen) {
+			wfree(path);
+			return NULL;
 		}
 	}

@@ -69,23 +84,41 @@ char *wdefaultspathfordomain(char *domain)
 {
 	char *path;
 	char *gspath;
+	size_t slen;

 	gspath = wusergnusteppath();
-	path = wmalloc(strlen(gspath) + strlen(DEFAULTS_DIR) + strlen(domain) + 4);
-	strcpy(path, gspath);
-	strcat(path, DEFAULTS_DIR);
-	strcat(path, "/");
-	strcat(path, domain);
+	slen = strlen(gspath) + strlen(DEFAULTS_DIR) + strlen(domain) + 4;
+	path = wmalloc(slen);
+
+	if (wstrlcpy(path, gspath, slen) >= slen ||
+	    wstrlcat(path, DEFAULTS_DIR, slen) >= slen ||
+	    wstrlcat(path, "/", slen) >= slen ||
+	    wstrlcat(path, domain, slen) >= slen) {
+		wfree(path);
+		return NULL;
+	}

 	return path;
 }

-static void
-#ifdef HAVE_ATEXIT
-saveDefaultsChanges(void)
-#else
-saveDefaultsChanges(int foo, void *bar)
+/* XXX: doesn't quite belong to *user*defaults.c */
+#ifndef GLOBAL_DEFAULTS_SUBDIR
+#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
 #endif
+char *wglobaldefaultspathfordomain(const char *domain)
+{
+	char *t = NULL;
+	size_t len;
+
+	len = strlen( SYSCONFDIR ) + strlen( GLOBAL_DEFAULTS_SUBDIR ) + strlen(domain) + 3;
+	t = wmalloc(len);
+	snprintf(t, len, "%s/%s/%s", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR, domain);
+
+	return t;
+}
+
+static void
+saveDefaultsChanges(void)
 {
 	/* save the user defaults databases */
 	synchronizeUserDefaults(NULL);
@@ -97,11 +130,7 @@ static void registerSaveOnExit(void)
 	static Bool registeredSaveOnExit = False;

 	if (!registeredSaveOnExit) {
-#ifdef HAVE_ATEXIT
 		atexit(saveDefaultsChanges);
-#else
-		on_exit(saveDefaultsChanges, (void *)NULL);
-#endif
 		registeredSaveOnExit = True;
 	}
 }
@@ -117,6 +146,19 @@ static void synchronizeUserDefaults(void *foo)
 	}
 }

+#ifndef HAVE_INOTIFY
+static void addSynchronizeTimerHandler(void)
+{
+	static Bool initialized = False;
+
+	if (!initialized) {
+		WMAddPersistentTimerHandler(UD_SYNC_INTERVAL,
+		    synchronizeUserDefaults, NULL);
+		initialized = True;
+	}
+}
+#endif
+
 void WMEnableUDPeriodicSynchronization(WMUserDefaults * database, Bool enable)
 {
 	database->dontSync = !enable;
@@ -152,10 +194,10 @@ void WMSynchronizeUserDefaults(WMUserDefaults * database)
 			} else {
 				/* something happened with the file. just overwrite it */
 				wwarning(_("cannot read domain from file '%s' when syncing"), path);
-				WMWritePropListToFile(database->appDomain, path, True);
+				WMWritePropListToFile(database->appDomain, path);
 			}
 		} else if (database->dirty) {
-			WMWritePropListToFile(database->appDomain, path, True);
+			WMWritePropListToFile(database->appDomain, path);
 		} else if (fileIsNewer) {
 			plF = WMReadPropListFromFile(path);
 			if (plF) {
@@ -167,7 +209,7 @@ void WMSynchronizeUserDefaults(WMUserDefaults * database)
 			} else {
 				/* something happened with the file. just overwrite it */
 				wwarning(_("cannot read domain from file '%s' when syncing"), path);
-				WMWritePropListToFile(database->appDomain, path, True);
+				WMWritePropListToFile(database->appDomain, path);
 			}
 		}

@@ -199,7 +241,7 @@ void WMSaveUserDefaults(WMUserDefaults * database)
 		} else {
 			path = database->path;
 		}
-		WMWritePropListToFile(database->appDomain, path, True);
+		WMWritePropListToFile(database->appDomain, path);
 		database->dirty = 0;
 		if (stat(path, &stbuf) >= 0)
 			database->timestamp = stbuf.st_mtime;
@@ -227,12 +269,9 @@ WMUserDefaults *WMGetStandardUserDefaults(void)
 		}
 	}

-	/* we didn't found the database we are looking for. Go read it. */
+	/* we didn't found the database we are looking for. Go read it. XXX: wtf? */
 	defaults = wmalloc(sizeof(WMUserDefaults));
-	memset(defaults, 0, sizeof(WMUserDefaults));
-
 	defaults->defaults = WMCreatePLDictionary(NULL, NULL);
-
 	defaults->searchList = wmalloc(sizeof(WMPropList *) * 3);

 	/* application domain */
@@ -293,6 +332,9 @@ WMUserDefaults *WMGetStandardUserDefaults(void)
 		defaults->next = sharedUserDefaults;
 	sharedUserDefaults = defaults;

+#ifndef HAVE_INOTIFY
+	addSynchronizeTimerHandler();
+#endif
 	registerSaveOnExit();

 	return defaults;
@@ -318,12 +360,9 @@ WMUserDefaults *WMGetDefaultsFromPath(char *path)
 		}
 	}

-	/* we didn't found the database we are looking for. Go read it. */
+	/* we didn't found the database we are looking for. Go read it. XXX wtf? */
 	defaults = wmalloc(sizeof(WMUserDefaults));
-	memset(defaults, 0, sizeof(WMUserDefaults));
-
 	defaults->defaults = WMCreatePLDictionary(NULL, NULL);
-
 	defaults->searchList = wmalloc(sizeof(WMPropList *) * 2);

 	/* the domain we want, go in the first position */
@@ -366,6 +405,9 @@ WMUserDefaults *WMGetDefaultsFromPath(char *path)
 		defaults->next = sharedUserDefaults;
 	sharedUserDefaults = defaults;

+#ifndef HAVE_INOTIFY
+	addSynchronizeTimerHandler();
+#endif
 	registerSaveOnExit();

 	return defaults;
--- a/WINGs/usleep.c
+++ b/WINGs/usleep.c
@@ -1,46 +1,25 @@

+#include <errno.h>
+#include <time.h>
+
 #include "wconfig.h"

-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#include <unistd.h>
-#include <string.h>
-
-#if defined(HAVE_SELECT)
-
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
-
-void wusleep(unsigned int microsecs)
+void wusleep(unsigned int usec)
 {
-	struct timeval tv;
-	fd_set rd, wr, ex;
-	FD_ZERO(&rd);
-	FD_ZERO(&wr);
-	FD_ZERO(&ex);
-	tv.tv_sec = microsecs / 1000000u;
-	tv.tv_usec = microsecs % 1000000u;
-	select(1, &rd, &wr, &ex, &tv);
+	struct timespec tm;
+
+	/* An arbitrary limit of 10 minutes -- in WM, if
+	 * somethings wants to sleep anything even close to
+	 * this, it's most likely an error.
+	 */
+	if (usec > 600000000)
+		return;
+
+	tm.tv_sec = usec / 1000000;
+	tm.tv_nsec = (usec % 1000000) * 1000;
+
+	while (nanosleep(&tm, &tm) == -1 && errno == EINTR)
+		;
+
 }

-#else				/* not HAVE_SELECT */
-
-# ifdef HAVE_POLL
-
-void wusleep(unsigned int microsecs)
-{
-	poll((struct poll *)0, (size_t) 0, microsecs / 1000);
-}
-
-# else				/* ! HAVE_POLL */
-
-oops !
-# endif				/* !HAVE_POLL */
-#endif				/* !HAVE_SELECT */
--- a/WINGs/wapplication.c
+++ b/WINGs/wapplication.c
@@ -1,12 +1,10 @@

 #include <unistd.h>
+#include <X11/Xlocale.h>

 #include "WINGsP.h"
-
 #include "wconfig.h"

-#include "X11/Xlocale.h"
-
 extern void W_InitNotificationCenter(void);

 struct W_Application WMApplication;
@@ -67,39 +65,55 @@ static char *checkFile(char *path, char *folder, char *ext, char *resource)
 {
 	char *ret;
 	int extralen;
+	size_t slen;

-	extralen = (ext ? strlen(ext) : 0) + (folder ? strlen(folder) : 0) + 4;
-	ret = wmalloc(strlen(path) + strlen(resource) + extralen + 8);
-	strcpy(ret, path);
-	if (folder) {
-		strcat(ret, "/");
-		strcat(ret, folder);
-	}
-	if (ext) {
-		strcat(ret, "/");
-		strcat(ret, ext);
-	}
-	strcat(ret, "/");
-	strcat(ret, resource);
+	if (!path || !resource)
+		return NULL;

-	if (access(ret, F_OK) != 0) {
-		wfree(ret);
-		ret = NULL;
-	}
+	extralen = (ext ? strlen(ext) + 1 : 0) + (folder ? strlen(folder) + 1 : 0) + 1;
+	slen = strlen(path) + strlen(resource) + 1 + extralen;
+	ret = wmalloc(slen);
+
+	if (wstrlcpy(ret, path, slen) >= slen)
+		goto error;
+
+	if (folder &&
+		(wstrlcat(ret, "/", slen) >= slen ||
+		 wstrlcat(ret, folder, slen) >= slen))
+			goto error;
+
+	if (ext &&
+		(wstrlcat(ret, "/", slen) >= slen ||
+		 wstrlcat(ret, ext, slen) >= slen))
+			goto error;
+
+	if (wstrlcat(ret, "/", slen) >= slen ||
+	    wstrlcat(ret, resource, slen) >= slen)
+		goto error;
+
+	if (access(ret, F_OK) != 0)
+		goto error;

 	return ret;
+
+error:
+	if (ret)
+		wfree(ret);
+	return NULL;
 }

 char *WMPathForResourceOfType(char *resource, char *ext)
 {
-	char *path = NULL;
-	char *tmp, *appdir;
+	char *path, *tmp, *appdir;
 	int i;
+	size_t slen;
+
+	path = tmp = appdir = NULL;

 	/*
 	 * Paths are searched in this order:
 	 * - resourcePath/ext
-	 * - argv[0]/ext
+	 * - dirname(argv[0])/ext
 	 * - GNUSTEP_USER_ROOT/Applications/ApplicationName.app/ext
 	 * - ~/GNUstep/Applications/ApplicationName.app/ext
 	 * - GNUSTEP_LOCAL_ROOT/Applications/ApplicationName.app/ext
@@ -111,7 +125,7 @@ char *WMPathForResourceOfType(char *resource, char *ext)
 	if (WMApplication.resourcePath) {
 		path = checkFile(WMApplication.resourcePath, NULL, ext, resource);
 		if (path)
-			return path;
+			goto out;
 	}

 	if (WMApplication.argv[0]) {
@@ -125,58 +139,42 @@ char *WMPathForResourceOfType(char *resource, char *ext)
 		} else {
 			path = NULL;
 		}
-		wfree(tmp);
-		if (path)
-			return path;
+		goto out;
 	}

-	appdir = wmalloc(strlen(WMApplication.applicationName) + 20);
-	sprintf(appdir, "Applications/%s.app", WMApplication.applicationName);
+	slen = strlen(WMApplication.applicationName) + sizeof("Applications/.app");
+	appdir = wmalloc(slen);
+	if (snprintf(appdir, slen, "Applications/%s.app", WMApplication.applicationName) >= slen)
+		goto out;

-	if (getenv("GNUSTEP_USER_ROOT")) {
-		path = checkFile(getenv("GNUSTEP_USER_ROOT"), appdir, ext, resource);
-		if (path) {
-			wfree(appdir);
-			return path;
-		}
-	}
+	path = checkFile(getenv("GNUSTEP_USER_ROOT"), appdir, ext, resource);
+	if (path)
+		goto out;

-	tmp = wusergnusteppath();
-	if (tmp) {
-		path = checkFile(tmp, appdir, ext, resource);
-		if (path) {
-			wfree(appdir);
-			return path;
-		}
-	}
+	path = checkFile(wusergnusteppath(), appdir, ext, resource);
+	if (path)
+		goto out;

-	if (getenv("GNUSTEP_LOCAL_ROOT")) {
-		path = checkFile(getenv("GNUSTEP_LOCAL_ROOT"), appdir, ext, resource);
-		if (path) {
-			wfree(appdir);
-			return path;
-		}
-	}
+	path = checkFile(getenv("GNUSTEP_LOCAL_ROOT"), appdir, ext, resource);
+	if (path)
+		goto out;

 	path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
-	if (path) {
+	if (path)
+		goto out;
+
+	path = checkFile(getenv("GNUSTEP_SYSTEM_ROOT"), appdir, ext, resource);
+	if (path)
+		goto out;
+
+	path = checkFile("/usr/GNUstep", appdir, ext, resource); /* falls through */
+
+out:
+	if (tmp)
+		wfree(tmp);
+	if (appdir)
 		wfree(appdir);
-		return path;
-	}

-	if (getenv("GNUSTEP_SYSTEM_ROOT")) {
-		path = checkFile(getenv("GNUSTEP_SYSTEM_ROOT"), appdir, ext, resource);
-		if (path) {
-			wfree(appdir);
-			return path;
-		}
-	}
+	return path;

-	path = checkFile("/usr/GNUstep", appdir, ext, resource);
-	if (path) {
-		wfree(appdir);
-		return path;
-	}
-
-	return NULL;
 }
--- a/WINGs/wballoon.c
+++ b/WINGs/wballoon.c
@@ -50,7 +50,6 @@ struct W_Balloon *W_CreateBalloon(WMScreen * scr)
 	Balloon *bPtr;

 	bPtr = wmalloc(sizeof(Balloon));
-	memset(bPtr, 0, sizeof(Balloon));

 	bPtr->view = W_CreateUnmanagedTopView(scr);
 	if (!bPtr->view) {
--- a/WINGs/wbox.c
+++ b/WINGs/wbox.c
@@ -44,7 +44,6 @@ WMBox *WMCreateBox(WMWidget * parent)
 	Box *bPtr;

 	bPtr = wmalloc(sizeof(Box));
-	memset(bPtr, 0, sizeof(Box));

 	bPtr->widgetClass = WC_Box;

@@ -194,7 +193,7 @@ void WMAddBoxSubviewAtEnd(WMBox * bPtr, WMView * view, Bool expand, Bool fill, i
 	rearrange(bPtr);
 }

-static int matchView(void *item, void *cdata)
+static int matchView(const void *item, const void *cdata)
 {
 	return (((SubviewItem *) item)->view == (WMView *) cdata);
 }
--- a/WINGs/wbrowser.c
+++ b/WINGs/wbrowser.c
@@ -95,7 +95,6 @@ WMBrowser *WMCreateBrowser(WMWidget * parent)
 	wassertrv(parent, NULL);

 	bPtr = wmalloc(sizeof(WMBrowser));
-	memset(bPtr, 0, sizeof(WMBrowser));

 	bPtr->widgetClass = WC_Browser;

@@ -690,6 +689,7 @@ char *WMGetBrowserPathToColumn(WMBrowser * bPtr, int column)
 {
 	int i, size;
 	char *path;
+	size_t slen;
 	WMListItem *item;

 	if (column >= bPtr->usedColumnCount)
@@ -709,24 +709,34 @@ char *WMGetBrowserPathToColumn(WMBrowser * bPtr, int column)
 	}

 	/* get the path */
-	path = wmalloc(size + (column + 1) * strlen(bPtr->pathSeparator) + 1);
-	/* ignore first / */
-	*path = 0;
+	slen = size + (column + 1) * strlen(bPtr->pathSeparator) + 1;
+	path = wmalloc(slen);
+	/* ignore first `/' */
 	for (i = 0; i <= column; i++) {
-		strcat(path, bPtr->pathSeparator);
+		if (wstrlcat(path, bPtr->pathSeparator, slen) >= slen)
+			goto error;
+
 		item = WMGetListSelectedItem(bPtr->columns[i]);
 		if (!item)
 			break;
-		strcat(path, item->text);
+
+		if (wstrlcat(path, item->text, slen) >= slen)
+			goto error;
+
 	}

 	return path;
+
+error:
+	wfree(path);
+	return NULL;
 }

 WMArray *WMGetBrowserPaths(WMBrowser * bPtr)
 {
 	int column, i, k, size, selNo;
 	char *path;
+	size_t slen;
 	WMListItem *item, *lastItem;
 	WMArray *paths, *items;

@@ -761,11 +771,14 @@ WMArray *WMGetBrowserPaths(WMBrowser * bPtr)
 	for (k = 0; k < selNo; k++) {
 		/* get the path */
 		lastItem = WMGetFromArray(items, k);
-		path = wmalloc(size + (lastItem != NULL ? strlen(lastItem->text) : 0));
-		/* ignore first / */
-		*path = 0;
+		slen = size + (lastItem != NULL ? strlen(lastItem->text) : 0);
+		path = wmalloc(slen);
+		/* ignore first `/' */
 		for (i = 0; i <= column; i++) {
-			strcat(path, bPtr->pathSeparator);
+			if (wstrlcat(path, bPtr->pathSeparator, slen) >= slen) {
+				wfree(path);
+				return NULL;
+			}
 			if (i == column) {
 				item = lastItem;
 			} else {
@@ -773,7 +786,10 @@ WMArray *WMGetBrowserPaths(WMBrowser * bPtr)
 			}
 			if (!item)
 				break;
-			strcat(path, item->text);
+			if (wstrlcat(path, item->text, slen) >= slen) {
+				wfree(path);
+				return NULL;
+			}
 		}
 		WMAddToArray(paths, path);
 	}
@@ -1102,27 +1118,48 @@ static void destroyBrowser(WMBrowser * bPtr)

 static char *createTruncatedString(WMFont * font, char *text, int *textLen, int width)
 {
-	int dLen = WMWidthOfString(font, ".", 1);
-	char *textBuf = (char *)wmalloc((*textLen) + 4);
+	size_t slen;
+	int dLen;
+	char *textBuf;
+
+	dLen = WMWidthOfString(font, ".", 1);
+	slen = *textLen + 4;
+	textBuf = wmalloc(slen);

 	if (width >= 3 * dLen) {
-		int dddLen = 3 * dLen;
 		int tmpTextLen = *textLen;

-		strcpy(textBuf, text);
-		while (tmpTextLen && (WMWidthOfString(font, textBuf, tmpTextLen) + dddLen > width))
+		if (wstrlcpy(textBuf, text, slen) >= slen)
+			goto error;
+
+		while (tmpTextLen && (WMWidthOfString(font, textBuf, tmpTextLen) + 3 * dLen > width))
 			tmpTextLen--;
-		strcpy(textBuf + tmpTextLen, "...");
+
+		if (wstrlcpy(textBuf + tmpTextLen, "...", slen) >= slen)
+			goto error;
+
 		*textLen = tmpTextLen + 3;
+
 	} else if (width >= 2 * dLen) {
-		strcpy(textBuf, "..");
+		if (wstrlcpy(textBuf, "..", slen) >= slen)
+			goto error;
+
 		*textLen = 2;
+
 	} else if (width >= dLen) {
-		strcpy(textBuf, ".");
+		if (wstrlcpy(textBuf, ".", slen) >= slen)
+			goto error;
+
 		*textLen = 1;
+
 	} else {
 		*textBuf = '\0';
 		*textLen = 0;
 	}
+
 	return textBuf;
+
+error:
+	wfree(textBuf);
+	return NULL;
 }
--- a/WINGs/wcolor.c
+++ b/WINGs/wcolor.c
@@ -314,9 +314,13 @@ unsigned short WMGetColorAlpha(WMColor * color)

 char *WMGetColorRGBDescription(WMColor * color)
 {
-	char *str = wmalloc(32);
+	char *str = wmalloc(8);

-	sprintf(str, "#%02x%02x%02x", color->color.red >> 8, color->color.green >> 8, color->color.blue >> 8);
+	if (snprintf(str, 8, "#%02x%02x%02x",
+		     color->color.red >> 8, color->color.green >> 8, color->color.blue >> 8) >= 8) {
+		wfree(str);
+		return NULL;
+	}

 	return str;
 }
--- a/WINGs/wcolorpanel.c
+++ b/WINGs/wcolorpanel.c
@@ -26,6 +26,8 @@
 #include "wconfig.h"
 #include "WINGsP.h"
 #include "rgb.h"
+
+#include <errno.h>
 #include <math.h>
 #include <unistd.h>
 #include <ctype.h>
@@ -33,7 +35,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <errno.h>
+
+#define	RETRY( x )	do {				\
+				x;			\
+			} while (errno == EINTR);

 /* BUG There's something fishy with shaped windows */
 /* Whithout shape extension the magnified image is completely broken -Dan */
@@ -270,11 +275,6 @@ enum {
 #define M_PI 3.14159265358979323846
 #endif

-/* Silly hack for Windows systems with cygwin */
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
-
 static int fetchFile(char *toPath, char *imageSrcFile, char *imageDestFileName);
 char *generateNewFilename(char *curName);
 void convertCPColor(CPColor * color);
@@ -374,8 +374,6 @@ static WMColorPanel *makeColorPanel(WMScreen * scrPtr, char *name)
 	GC wgc = WMColorGC(scrPtr->white);

 	panel = wmalloc(sizeof(WMColorPanel));
-	memset(panel, 0, sizeof(WMColorPanel));
-
 	panel->color.rgb.red = 0;
 	panel->color.rgb.green = 0;
 	panel->color.rgb.blue = 0;
@@ -1146,7 +1144,7 @@ static void readConfiguration(W_ColorPanel * panel)

 	if (stat(panel->configurationPath, &stat_buf) != 0) {
 		if (mkdir(panel->configurationPath, S_IRWXU | S_IRGRP | S_IROTH | S_IXGRP | S_IXOTH) != 0) {
-			wsyserror(_("Color Panel: Could not create directory %s needed"
+			werror(_("Color Panel: Could not create directory %s needed"
 				    " to store configurations"), panel->configurationPath);
 			WMSetPopUpButtonEnabled(panel->customPaletteMenuBtn, False);
 			WMSetPopUpButtonEnabled(panel->colorListColorMenuBtn, False);
@@ -1160,7 +1158,7 @@ static void readConfiguration(W_ColorPanel * panel)
 	}

 	if (!(dPtr = opendir(panel->configurationPath))) {
-		wwarning(_("Color Panel: Could not find file"), "%s", panel->configurationPath);
+		wwarning("%s: %s", _("Color Panel: Could not find file"), panel->configurationPath);
 		return;
 	}

@@ -1600,8 +1598,8 @@ static Cursor magnifyGrabPointer(W_ColorPanel * panel)
 	W_Screen *scr = WMWidgetScreen(panel->win);
 	Pixmap magPixmap, magPixmap2;
 	Cursor magCursor;
-	XColor fgColor = { 0, 0, 0, 0, DoRed | DoGreen | DoBlue };
-	XColor bgColor = { 0, 0xbf00, 0xa000, 0x5000, DoRed | DoGreen | DoBlue };
+	XColor fgColor = { 0, 0, 0, 0, DoRed | DoGreen | DoBlue, 0 };
+	XColor bgColor = { 0, 0xbf00, 0xa000, 0x5000, DoRed | DoGreen | DoBlue, 0 };

 	/* Cursor creation stuff */
 	magPixmap = XCreatePixmapFromBitmapData(scr->display, W_DRAWABLE(scr),
@@ -1842,7 +1840,6 @@ static wheelMatrix *wheelCreateMatrix(unsigned int width, unsigned int height)
 	assert((width > 0) && (height > 0));

 	matrix = wmalloc(sizeof(wheelMatrix));
-	memset(matrix, 0, sizeof(wheelMatrix));
 	matrix->width = width;
 	matrix->height = height;

@@ -2728,7 +2725,6 @@ static void customSetPalette(W_ColorPanel * panel)
 	W_Screen *scr = WMWidgetScreen(panel->win);
 	RImage *scaledImg;
 	Pixmap image;
-	int item;

 	image = XCreatePixmap(scr->display, W_DRAWABLE(scr), customPaletteWidth, customPaletteHeight, scr->depth);
 	scaledImg = RScaleImage(panel->customPaletteImg, customPaletteWidth, customPaletteHeight);
@@ -2754,7 +2750,7 @@ static void customSetPalette(W_ColorPanel * panel)
 	panel->palXRatio = (double)(panel->customPaletteImg->width) / (double)(customPaletteWidth);
 	panel->palYRatio = (double)(panel->customPaletteImg->height) / (double)(customPaletteHeight);

-	item = WMGetPopUpButtonSelectedItem(panel->customPaletteHistoryBtn);
+	WMGetPopUpButtonSelectedItem(panel->customPaletteHistoryBtn);
 }

 static void customPalettePositionSelection(W_ColorPanel * panel, int x, int y)
@@ -2958,7 +2954,7 @@ static void customPaletteMenuNewFromFile(W_ColorPanel * panel)
 			WMRunAlertPanel(scr, panel->win, _("File Error"),
 					_("Invalid file format !"), _("OK"), NULL, NULL);
 			if (i != 0) {
-				wsyserror(_("can't remove file %s"), tmp);
+				werror(_("can't remove file %s"), tmp);
 				WMRunAlertPanel(scr, panel->win, _("File Error"),
 						_("Couldn't remove file from Configuration Directory !"),
 						_("OK"), NULL, NULL);
@@ -3034,7 +3030,7 @@ static void customPaletteMenuRename(W_ColorPanel * panel)
 		}

 		if (rename(fromPath, toPath) != 0)
-			wsyserror(_("Couldn't rename palette %s to %s\n"), fromName, toName);
+			werror(_("Couldn't rename palette %s to %s"), fromName, toName);
 		else {
 			WMRemovePopUpButtonItem(panel->customPaletteHistoryBtn, item);
 			WMInsertPopUpButtonItem(panel->customPaletteHistoryBtn, item, toName);
@@ -3081,7 +3077,7 @@ static void customPaletteMenuRemove(W_ColorPanel * panel)
 			WMRemovePopUpButtonItem(panel->customPaletteHistoryBtn, item);

 		} else {
-			wsyserror(_("Couldn't remove palette %s\n"), tmp);
+			werror(_("Couldn't remove palette %s"), tmp);
 		}

 		wfree(tmp);
@@ -3343,33 +3339,45 @@ static void hsbInit(W_ColorPanel * panel)

 static int fetchFile(char *toPath, char *srcFile, char *destFile)
 {
-	int src, dest;
-	int n;
-	char *tmp;
+	FILE *src, *dst;
+	size_t nread, nwritten;
+	char *dstpath;
 	char buf[BUFSIZE];

-	if ((src = open(srcFile, O_RDONLY | O_BINARY)) == 0) {
-		wsyserror(_("Could not open %s"), srcFile);
+	RETRY( src = fopen(srcFile, "rb") )
+	if (src == NULL) {
+		werror(_("Could not open %s"), srcFile);
 		return -1;
 	}

-	tmp = wstrconcat(toPath, destFile);
-	if ((dest = open(tmp, O_RDWR | O_CREAT | O_BINARY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH))
-	    == 0) {
-		wsyserror(_("Could not create %s"), tmp);
-		wfree(tmp);
+	dstpath = wstrconcat(toPath, destFile);
+	RETRY( dst = fopen(dstpath, "wb") )
+	if (dst == NULL) {
+		werror(_("Could not create %s"), dstpath);
+		wfree(dstpath);
+		RETRY( fclose(src) )
 		return -1;
 	}
-	wfree(tmp);

-	/* Copy the file */
-	while ((n = read(src, buf, BUFSIZE)) > 0) {
-		if (write(dest, buf, n) != n) {
-			wsyserror(_("Write error on file %s"), destFile);
-			return -1;
-		}
-	}
+	do {
+		RETRY( nread = fread(buf, 1, sizeof(buf), src) )
+		if (ferror(src))
+			break;

+		RETRY( nwritten = fwrite(buf, 1, nread, dst) )
+		if (ferror(dst) || feof(src) || nread != nwritten)
+			break;
+
+	} while (1);
+
+	if (ferror(src) || ferror(dst))
+		unlink(dstpath);
+
+	RETRY( fclose(src) )
+	fsync(fileno(dst));
+	RETRY( fclose(dst) )
+
+	wfree(dstpath);
 	return 0;
 }

@@ -3392,9 +3400,8 @@ char *generateNewFilename(char *curName)

 	newName = wmalloc(baseLen + 16);
 	strncpy(newName, curName, baseLen);
-	newName[baseLen] = 0;

-	sprintf(&newName[baseLen], " {%i}", n + 1);
+	snprintf(&newName[baseLen], 16, " {%i}", n + 1);

 	return newName;
 }
@@ -3434,20 +3441,14 @@ RColor ulongToRColor(WMScreen * scr, unsigned long value)
 	RColor color;
 	XColor *xcolor = NULL;

-	if (!(xcolor = wmalloc(sizeof(XColor)))) {
-		wwarning(_("Color Panel: Could not allocate memory"));
-		color.red = 0;
-		color.green = 0;
-		color.blue = 0;
-		return color;
-	}
-
+	xcolor = wmalloc(sizeof(XColor));
 	xcolor->pixel = value;
 	XQueryColor(scr->display, scr->rcontext->cmap, xcolor);

 	color.red = xcolor->red >> 8;
 	color.green = xcolor->green >> 8;
 	color.blue = xcolor->blue >> 8;
+	color.alpha = 0;

 	wfree(xcolor);

--- a/WINGs/wcolorwell.c
+++ b/WINGs/wcolorwell.c
@@ -138,7 +138,6 @@ WMColorWell *WMCreateColorWell(WMWidget * parent)
 	ColorWell *cPtr;

 	cPtr = wmalloc(sizeof(ColorWell));
-	memset(cPtr, 0, sizeof(ColorWell));

 	cPtr->widgetClass = WC_ColorWell;

--- a/WINGs/wconfig.h
+++ b/WINGs/wconfig.h
@@ -3,7 +3,7 @@
 #ifndef WINGS_CONFIG_H_
 #define WINGS_CONFIG_H_

-#include "../src/config.h"
+#include "../config.h"

 #if defined(HAVE_LIBINTL_H) && defined(I18N)
 # include <libintl.h>
--- a/WINGs/wevent.c
+++ b/WINGs/wevent.c
@@ -78,7 +78,7 @@ void WMCreateEventHandler(WMView * view, unsigned long mask, WMEventProc * event
 	WMAddToArray(view->eventHandlers, hPtr);
 }

-static int matchHandler(void *item, void *cdata)
+static int matchHandler(const void *item, const void *cdata)
 {
 #define H1 ((W_EventHandler*)item)
 #define H2 ((W_EventHandler*)cdata)
--- a/WINGs/wfilepanel.c
+++ b/WINGs/wfilepanel.c
@@ -1,15 +1,16 @@

-#include "WINGsP.h"
-#include "wconfig.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
+
 #include <unistd.h>
 #include <dirent.h>
 #include <limits.h>
 #include <errno.h>
 #include <stdint.h>

+#include "WINGsP.h"
+#include "wconfig.h"
+
 #ifndef PATH_MAX
 #define PATH_MAX 1024
 #endif
@@ -67,6 +68,8 @@ static void browserDClick();

 static void fillColumn(WMBrowserDelegate * self, WMBrowser * bPtr, int column, WMList * list);

+static void normalizePath(char *s);
+
 static void deleteFile();

 static void createDir();
@@ -118,13 +121,14 @@ static void textChangedObserver(void *observerData, WMNotification * notificatio
 	char *text;
 	WMList *list;
 	int col = WMGetBrowserNumberOfColumns(panel->browser) - 1;
-	int i, textEvent;
+	int i;
+	uintptr_t textEvent;

 	if (!(list = WMGetBrowserListInColumn(panel->browser, col)))
 		return;

 	text = WMGetTextFieldText(panel->fileField);
-	textEvent = (int)(uintptr_t) WMGetNotificationClientData(notification);
+	textEvent = (uintptr_t)WMGetNotificationClientData(notification);

 	if (panel->flags.autoCompletion && textEvent != WMDeleteTextEvent)
 		i = closestListItem(list, text, False);
@@ -157,7 +161,7 @@ static void textEditedObserver(void *observerData, WMNotification * notification
 {
 	W_FilePanel *panel = (W_FilePanel *) observerData;

-	if ((int)(uintptr_t) WMGetNotificationClientData(notification) == WMReturnTextMovement) {
+	if ((uintptr_t)WMGetNotificationClientData(notification) == WMReturnTextMovement) {
 		WMPerformButtonClick(panel->okButton);
 	}
 }
@@ -169,7 +173,6 @@ static WMFilePanel *makeFilePanel(WMScreen * scrPtr, char *name, char *title)
 	WMPixmap *icon;

 	fPtr = wmalloc(sizeof(WMFilePanel));
-	memset(fPtr, 0, sizeof(WMFilePanel));

 	fPtr->win = WMCreateWindowWithStyle(scrPtr, name, WMTitledWindowMask | WMResizableWindowMask);
 	WMResizeWidget(fPtr->win, PWIDTH, PHEIGHT);
@@ -520,10 +523,13 @@ static void listDirectoryOnColumn(WMFilePanel * panel, int column, char *path)
 		if (strcmp(dentry->d_name, ".") == 0 || strcmp(dentry->d_name, "..") == 0)
 			continue;

-		strcpy(pbuf, path);
-		if (strcmp(path, "/") != 0)
-			strcat(pbuf, "/");
-		strcat(pbuf, dentry->d_name);
+		if (wstrlcpy(pbuf, path, sizeof(pbuf)) >= sizeof(pbuf))
+			goto out;
+		if (strcmp(path, "/") != 0 &&
+		    wstrlcat(pbuf, "/", sizeof(pbuf)) >= sizeof(pbuf))
+			goto out;
+		if (wstrlcat(pbuf, dentry->d_name, sizeof(pbuf)) >= sizeof(pbuf))
+			goto out;

 		if (stat(pbuf, &stat_buf) != 0) {
 #ifdef VERBOSE
@@ -541,6 +547,7 @@ static void listDirectoryOnColumn(WMFilePanel * panel, int column, char *path)
 	}
 	WMSortBrowserColumnWithComparer(bPtr, column, comparer);

+out:
 	closedir(dir);
 }

@@ -593,7 +600,8 @@ static void showError(WMScreen * scr, WMWindow * owner, char *s, char *file)

 static void createDir(WMButton * bPre, WMFilePanel * panel)
 {
-	char *dirName, *directory, *file, *s;
+	char *dirName, *directory, *file;
+	size_t slen;
 	WMScreen *scr = WMWidgetScreen(panel->win);

 	dirName = WMRunInputPanel(scr, panel->win, _("Create Directory"),
@@ -601,158 +609,117 @@ static void createDir(WMButton * bPre, WMFilePanel * panel)
 	if (!dirName)
 		return;

-	directory = getCurrentFileName(panel);
-	s = strrchr(directory, '/');
-	if (s)
-		s[1] = 0;
-
-	if (dirName[0] == '/') {
-		directory[0] = 0;
+	/* if `dirName' is an absolute path, don't mind `directory'.
+	 * normalize as needed (possibly not needed at all?) */
+	normalizePath(dirName);
+	if (*dirName != '/') {
+		directory = getCurrentFileName(panel);
+		normalizePath(directory);
 	} else {
-		while ((s = strstr(directory, "//"))) {
-			int i;
-			for (i = 2; s[i] == '/'; i++) ;
-			strcpy(s, &s[i - 1]);
-		}
-		if ((s = strrchr(directory, '/')) && !s[1])
-			s[0] = 0;
-	}
-	while ((s = strstr(dirName, "//"))) {
-		int i;
-		for (i = 2; s[i] == '/'; i++) ;
-		strcpy(s, &s[i - 1]);
-	}
-	if ((s = strrchr(dirName, '/')) && !s[1])
-		s[0] = 0;
-
-	file = wmalloc(strlen(dirName) + strlen(directory) + 4);
-	sprintf(file, "%s/%s", directory, dirName);
-	while ((s = strstr(file, "//"))) {
-		int i;
-		for (i = 2; s[i] == '/'; i++) ;
-		strcpy(s, &s[i - 1]);
+		directory = NULL;
 	}

-	if (mkdir(file, 0xfff) != 0) {
-		switch (errno) {
-		case EACCES:
-			showError(scr, panel->win, _("Permission denied."), NULL);
-			break;
-		case EEXIST:
-			showError(scr, panel->win, _("'%s' already exists."), file);
-			break;
-		case ENOENT:
-			showError(scr, panel->win, _("Path does not exist."), NULL);
-		}
-	} else
+	slen = strlen(dirName) + (directory ? strlen(directory) + 1 /* "/" */  : 0) + 1 /* NULL */;
+	file = wmalloc(slen);
+
+	if (directory &&
+		(wstrlcat(file, directory, slen) >= slen ||
+		 wstrlcat(file, "/", slen) >= slen))
+			goto out;
+
+	if (wstrlcat(file, dirName, slen) >= slen)
+		goto out;
+
+	if (mkdir(file, 00777) != 0) {
+#define __msgbufsize__ 512
+		char *buffer = wmalloc(__msgbufsize__);
+		snprintf(buffer, __msgbufsize__, _("Can not create %s: %s"), file, strerror(errno));
+		showError(scr, panel->win, buffer, NULL);
+		wfree(buffer);
+#undef __msgbufsize__
+	} else {
 		WMSetFilePanelDirectory(panel, file);
+	}

-	wfree(dirName);
-	wfree(directory);
-	wfree(file);
+out:
+	if (dirName)
+		wfree(dirName);
+	if (directory)
+		wfree(directory);
+	if (file)
+		wfree(file);
 }

+/*
+ *----------------------------------------------------------------------
+ * normalizePath--
+ *	Remove multiple consecutive and any trailing slashes from
+ *	a path.
+ *----------------------------------------------------------------------
+ */
+static void normalizePath(char *s)
+{
+	int i, j, found;
+
+	found = 0;
+	for (i = 0; s[i]; (void)(!found && i++)) {
+		found = 0;
+		if (s[i] == '/' && s[i+1] == '/') {
+			int nslash = 1;
+			found = 1;
+			i++;
+			while (s[i+nslash] == '/')
+				nslash++;
+			for (j = 0; s[i+j+nslash]; j++)
+				s[i+j] = s[i+j+nslash];
+			s[i+j] = '\0';
+		}
+	}
+	if (i > 1 && s[--i] == '/')
+		s[i] = '\0';
+}
+
+
 static void deleteFile(WMButton * bPre, WMFilePanel * panel)
 {
-	char *file;
-	char *buffer, *s;
+	char *file, *buffer;
 	struct stat filestat;
 	WMScreen *scr = WMWidgetScreen(panel->win);
+#define __msgbufsize__ 512

+	buffer = wmalloc(__msgbufsize__);
 	file = getCurrentFileName(panel);
+	normalizePath(file);

-	while ((s = strstr(file, "//"))) {
-		int i;
-		for (i = 2; s[i] == '/'; i++) ;
-		strcpy(s, &s[i - 1]);
+	if (stat(file, &filestat) == -1) {
+		snprintf(buffer, __msgbufsize__, _("Can not find %s: %s"), file, strerror(errno));
+		showError(scr, panel->win, buffer, NULL);
+		goto out;
 	}
-	if (strlen(file) > 1 && (s = strrchr(file, '/')) && !s[1])
-		s[0] = 0;

-	if (stat(file, &filestat)) {
-		switch (errno) {
-		case ENOENT:
-			showError(scr, panel->win, _("'%s' does not exist."), file);
-			break;
-		case EACCES:
-			showError(scr, panel->win, _("Permission denied."), NULL);
-			break;
-		case ENOMEM:
-			showError(scr, panel->win, _("Insufficient memory available."), NULL);
-			break;
-		case EROFS:
-			showError(scr, panel->win, _("'%s' is on a read-only filesystem."), file);
-			break;
-		default:
-			showError(scr, panel->win, _("Can not delete '%s'."), file);
-		}
-		wfree(file);
-		return;
-	} else if (S_ISDIR(filestat.st_mode)) {
-		int len = strlen(file) + 20;
-		buffer = wmalloc(len);
-		snprintf(buffer, len, _("Delete directory %s ?"), file);
-	} else {
-		int len = strlen(file) + 15;
-		buffer = wmalloc(len);
-		snprintf(buffer, len, _("Delete file %s ?"), file);
-	}
+	snprintf(buffer, __msgbufsize__, _("Delete %s %s?"),
+		S_ISDIR(filestat.st_mode) ? _("directory") : _("file"), file);

 	if (!WMRunAlertPanel(WMWidgetScreen(panel->win), panel->win,
 			     _("Warning"), buffer, _("OK"), _("Cancel"), NULL)) {
-		if (S_ISDIR(filestat.st_mode)) {
-			if (rmdir(file) != 0) {
-				switch (errno) {
-				case EACCES:
-					showError(scr, panel->win, _("Permission denied."), NULL);
-					break;
-				case ENOENT:
-					showError(scr, panel->win, _("Directory '%s' does not exist."), file);
-					break;
-				case ENOTEMPTY:
-					showError(scr, panel->win, _("Directory '%s' is not empty."), file);
-					break;
-				case EBUSY:
-					showError(scr, panel->win, _("Directory '%s' is busy."), file);
-					break;
-				default:
-					showError(scr, panel->win, _("Can not delete '%s'."), file);
-				}
-			} else {
-				char *s = strrchr(file, '/');
-				if (s)
-					s[0] = 0;
-				WMSetFilePanelDirectory(panel, file);
-			}
-		} else if (remove(file) != 0) {
-			switch (errno) {
-			case EISDIR:
-				showError(scr, panel->win, _("'%s' is a directory."), file);
-				break;
-			case ENOENT:
-				showError(scr, panel->win, _("'%s' does not exist."), file);
-				break;
-			case EACCES:
-				showError(scr, panel->win, _("Permission denied."), NULL);
-				break;
-			case ENOMEM:
-				showError(scr, panel->win, _("Insufficient memory available."), NULL);
-				break;
-			case EROFS:
-				showError(scr, panel->win, _("'%s' is on a read-only filesystem."), file);
-				break;
-			default:
-				showError(scr, panel->win, _("Can not delete '%s'."), file);
-			}
+
+		if (remove(file) == -1) {
+			snprintf(buffer, __msgbufsize__, _("Removing %s failed: %s"), file, strerror(errno));
+			showError(scr, panel->win, buffer, NULL);
 		} else {
 			char *s = strrchr(file, '/');
 			if (s)
-				s[1] = 0;
+				s[0] = 0;
 			WMSetFilePanelDirectory(panel, file);
 		}
+
 	}
-	wfree(buffer);
-	wfree(file);
+out:
+	if (buffer)
+		wfree(buffer);
+	if (file)
+		wfree(file);
+#undef __msgbufsize__
 }

 static void goUnmount(WMButton * bPtr, WMFilePanel * panel)
@@ -823,29 +790,41 @@ static char *getCurrentFileName(WMFilePanel * panel)
 {
 	char *path;
 	char *file;
-	char *tmp;
-	int len;
+	char *ret;
+	size_t slen;

 	path = WMGetBrowserPath(panel->browser);

-	len = strlen(path);
-	if (path[len - 1] == '/') {
-		file = WMGetTextFieldText(panel->fileField);
-		tmp = wmalloc(strlen(path) + strlen(file) + 8);
-		if (file[0] != '/') {
-			strcpy(tmp, path);
-			strcat(tmp, file);
-		} else
-			strcpy(tmp, file);
+	if (!path)
+		return NULL;

-		wfree(file);
-		wfree(path);
-		return tmp;
-	} else {
+	if (path[strlen(path) -1] != '/')
 		return path;
-	}
+
+	file = WMGetTextFieldText(panel->fileField);
+	slen = strlen(path) + strlen(file) + 1;
+	ret = wmalloc(slen);
+
+	if (*file != '/' &&
+	    wstrlcat(ret, path, slen) >= slen)
+		goto error;
+
+	if (wstrlcat(ret, file, slen) >= slen)
+		goto error;
+
+	wfree(file);
+	wfree(path);
+	return ret;
+
+error:
+	wfree(file);
+	wfree(path);
+	wfree(ret);
+
+	return NULL;
 }

+
 static Bool validOpenFile(WMFilePanel * panel)
 {
 	WMListItem *item;
--- a/WINGs/wfont.c
+++ b/WINGs/wfont.c
@@ -139,7 +139,6 @@ WMFont *WMCreateFont(WMScreen * scrPtr, char *fontName)
 	}

 	font = wmalloc(sizeof(WMFont));
-	memset(font, 0, sizeof(WMFont));

 	font->screen = scrPtr;

--- a/WINGs/wfont_noxft.c
+++ b/WINGs/wfont_noxft.c
@@ -1,701 +0,0 @@
-
-#include "wconfig.h"
-
-#ifndef XFT
-
-#include "WINGsP.h"
-
-#include <wraster.h>
-#include <assert.h>
-#include <X11/Xlocale.h>
-
-static char *makeFontSetOfSize(char *fontset, int size);
-
-/* XLFD pattern matching */
-static char *getElementFromXLFD(const char *xlfd, int index)
-{
-	const char *p = xlfd;
-	while (*p != 0) {
-		if (*p == '-' && --index == 0) {
-			const char *end = strchr(p + 1, '-');
-			char *buf;
-			size_t len;
-			if (end == 0)
-				end = p + strlen(p);
-			len = end - (p + 1);
-			buf = wmalloc(len);
-			memcpy(buf, p + 1, len);
-			buf[len] = 0;
-			return buf;
-		}
-		p++;
-	}
-	return strdup("*");
-}
-
-/* XLFD pattern matching */
-static char *generalizeXLFD(const char *xlfd)
-{
-	char *buf;
-	int len;
-	char *weight = getElementFromXLFD(xlfd, 3);
-	char *slant = getElementFromXLFD(xlfd, 4);
-	char *pxlsz = getElementFromXLFD(xlfd, 7);
-
-#define Xstrlen(A) ((A)?strlen(A):0)
-	len = Xstrlen(xlfd) + Xstrlen(weight) + Xstrlen(slant) + Xstrlen(pxlsz) * 2 + 60;
-#undef Xstrlen
-
-	buf = wmalloc(len + 1);
-	snprintf(buf, len + 1, "%s,-*-*-%s-%s-*-*-%s-*-*-*-*-*-*-*,"
-		 "-*-*-*-*-*-*-%s-*-*-*-*-*-*-*,*", xlfd, weight, slant, pxlsz, pxlsz);
-
-	wfree(pxlsz);
-	wfree(slant);
-	wfree(weight);
-
-	return buf;
-}
-
-/* XLFD pattern matching */
-static XFontSet
-W_CreateFontSetWithGuess(Display * dpy, char *xlfd, char ***missing, int *nmissing, char **def_string)
-{
-	XFontSet fs = XCreateFontSet(dpy, xlfd, missing, nmissing, def_string);
-
-	if (fs != NULL && *nmissing == 0)
-		return fs;
-
-	/* for non-iso8859-1 language and iso8859-1 specification
-	   (this fontset is only for pattern analysis) */
-	if (fs == NULL) {
-		if (*nmissing != 0)
-			XFreeStringList(*missing);
-		setlocale(LC_CTYPE, "C");
-		fs = XCreateFontSet(dpy, xlfd, missing, nmissing, def_string);
-		setlocale(LC_CTYPE, "");
-	}
-
-	/* make XLFD font name for pattern analysis */
-	if (fs != NULL) {
-		XFontStruct **fontstructs;
-		char **fontnames;
-		if (XFontsOfFontSet(fs, &fontstructs, &fontnames) > 0)
-			xlfd = fontnames[0];
-	}
-
-	xlfd = generalizeXLFD(xlfd);
-
-	if (*nmissing != 0)
-		XFreeStringList(*missing);
-	if (fs != NULL)
-		XFreeFontSet(dpy, fs);
-
-	fs = XCreateFontSet(dpy, xlfd, missing, nmissing, def_string);
-
-	wfree(xlfd);
-	return fs;
-}
-
-static char *xlfdFromFontName(char *fontName)
-{
-	char *systemFont, *boldSystemFont;
-	char *font;
-	int size;
-
-	systemFont = WINGsConfiguration.systemFont;
-	boldSystemFont = WINGsConfiguration.boldSystemFont;
-
-	size = WINGsConfiguration.defaultFontSize;
-
-	if (strcmp(fontName, "SystemFont") == 0) {
-		font = systemFont;
-	} else if (strncmp(fontName, "SystemFont-", 11) == 0) {
-		font = systemFont;
-		if (sscanf(&fontName[11], "%i", &size) != 1) {
-			size = WINGsConfiguration.defaultFontSize;
-			wwarning(_("Invalid size specification '%s' in %s. "
-				   "Using default %d\n"), &fontName[11], fontName, size);
-		}
-	} else if (strcmp(fontName, "BoldSystemFont") == 0) {
-		font = boldSystemFont;
-	} else if (strncmp(fontName, "BoldSystemFont-", 15) == 0) {
-		font = boldSystemFont;
-		if (sscanf(&fontName[15], "%i", &size) != 1) {
-			size = WINGsConfiguration.defaultFontSize;
-			wwarning(_("Invalid size specification '%s' in %s. "
-				   "Using default %d\n"), &fontName[15], fontName, size);
-		}
-	} else {
-		font = NULL;
-	}
-
-	return (font != NULL ? makeFontSetOfSize(font, size) : wstrdup(fontName));
-}
-
-WMFont *WMCreateFontSet(WMScreen * scrPtr, char *fontName)
-{
-	WMFont *font;
-	Display *display = scrPtr->display;
-	char **missing;
-	int nmissing = 0;
-	char *defaultString;
-	char *fname;
-	XFontSetExtents *extents;
-
-	fname = xlfdFromFontName(fontName);
-
-	font = WMHashGet(scrPtr->fontSetCache, fname);
-	if (font) {
-		WMRetainFont(font);
-		wfree(fname);
-		return font;
-	}
-
-	font = wmalloc(sizeof(WMFont));
-	memset(font, 0, sizeof(WMFont));
-
-	font->notFontSet = 0;
-
-	font->screen = scrPtr;
-
-	font->font.set = W_CreateFontSetWithGuess(display, fname, &missing, &nmissing, &defaultString);
-	if (nmissing > 0 && font->font.set) {
-		int i;
-
-		wwarning(_("the following character sets are missing in %s:"), fname);
-		for (i = 0; i < nmissing; i++) {
-			wwarning(missing[i]);
-		}
-		XFreeStringList(missing);
-		if (defaultString)
-			wwarning(_("the string \"%s\" will be used in place of any characters from those sets."),
-				 defaultString);
-	}
-	if (!font->font.set) {
-		wfree(font);
-		wfree(fname);
-		return NULL;
-	}
-
-	extents = XExtentsOfFontSet(font->font.set);
-
-	font->height = extents->max_logical_extent.height;
-	font->y = font->height - (font->height + extents->max_logical_extent.y);
-
-	font->refCount = 1;
-
-	font->name = fname;
-
-	assert(WMHashInsert(scrPtr->fontSetCache, font->name, font) == NULL);
-
-	return font;
-}
-
-WMFont *WMCreateNormalFont(WMScreen * scrPtr, char *fontName)
-{
-	WMFont *font;
-	Display *display = scrPtr->display;
-	char *fname, *ptr;
-
-	fontName = xlfdFromFontName(fontName);
-
-	if ((ptr = strchr(fontName, ','))) {
-		fname = wmalloc(ptr - fontName + 1);
-		strncpy(fname, fontName, ptr - fontName);
-		fname[ptr - fontName] = 0;
-	} else {
-		fname = wstrdup(fontName);
-	}
-
-	wfree(fontName);
-
-	font = WMHashGet(scrPtr->fontCache, fname);
-	if (font) {
-		WMRetainFont(font);
-		wfree(fname);
-		return font;
-	}
-
-	font = wmalloc(sizeof(WMFont));
-	memset(font, 0, sizeof(WMFont));
-
-	font->notFontSet = 1;
-
-	font->screen = scrPtr;
-
-	font->font.normal = XLoadQueryFont(display, fname);
-	if (!font->font.normal) {
-		wfree(font);
-		wfree(fname);
-		return NULL;
-	}
-	font->height = font->font.normal->ascent + font->font.normal->descent;
-	font->y = font->font.normal->ascent;
-
-	font->refCount = 1;
-
-	font->name = fname;
-
-	assert(WMHashInsert(scrPtr->fontCache, font->name, font) == NULL);
-
-	return font;
-}
-
-WMFont *WMCreateFont(WMScreen * scrPtr, char *fontName)
-{
-	return WMCreateFontWithFlags(scrPtr, fontName, WFDefaultFont);
-}
-
-WMFont *WMCreateFontWithFlags(WMScreen * scrPtr, char *fontName, WMFontFlags flags)
-{
-	Bool multiByte = scrPtr->useMultiByte;
-	WMFont *font;
-
-	if (flags & WFFontSet) {
-		multiByte = True;
-	} else if (flags & WFNormalFont) {
-		multiByte = False;
-	}
-
-	if (multiByte) {
-		font = WMCreateFontSet(scrPtr, fontName);
-	} else {
-		font = WMCreateNormalFont(scrPtr, fontName);
-	}
-
-	return font;
-}
-
-WMFont *WMRetainFont(WMFont * font)
-{
-	wassertrv(font != NULL, NULL);
-
-	font->refCount++;
-
-	return font;
-}
-
-void WMReleaseFont(WMFont * font)
-{
-	wassertr(font != NULL);
-
-	font->refCount--;
-	if (font->refCount < 1) {
-		if (font->notFontSet) {
-			XFreeFont(font->screen->display, font->font.normal);
-		} else {
-			XFreeFontSet(font->screen->display, font->font.set);
-		}
-
-		if (font->name) {
-			if (font->notFontSet) {
-				WMHashRemove(font->screen->fontCache, font->name);
-			} else {
-				WMHashRemove(font->screen->fontSetCache, font->name);
-			}
-			wfree(font->name);
-		}
-		wfree(font);
-	}
-}
-
-Bool WMIsAntialiasingEnabled(WMScreen * scrPtr)
-{
-	return False;
-}
-
-unsigned int WMFontHeight(WMFont * font)
-{
-	wassertrv(font != NULL, 0);
-
-	return font->height;
-}
-
-char *WMGetFontName(WMFont * font)
-{
-	wassertrv(font != NULL, NULL);
-
-	return font->name;
-}
-
-WMFont *WMDefaultSystemFont(WMScreen * scrPtr)
-{
-	return WMRetainFont(scrPtr->normalFont);
-}
-
-WMFont *WMDefaultBoldSystemFont(WMScreen * scrPtr)
-{
-	return WMRetainFont(scrPtr->boldFont);
-}
-
-static WMFont *makeSystemFontOfSize(WMScreen * scrPtr, int size, Bool bold)
-{
-	WMFont *font;
-	char *fontSpec;
-
-#define WConf WINGsConfiguration
-	if (bold) {
-		fontSpec = makeFontSetOfSize(WConf.boldSystemFont, size);
-	} else {
-		fontSpec = makeFontSetOfSize(WConf.systemFont, size);
-	}
-#undef WConf
-
-	if (scrPtr->useMultiByte) {
-		font = WMCreateFontSet(scrPtr, fontSpec);
-	} else {
-		font = WMCreateNormalFont(scrPtr, fontSpec);
-	}
-
-	if (!font) {
-		if (scrPtr->useMultiByte) {
-			wwarning(_("could not load font set %s. Trying fixed."), fontSpec);
-			font = WMCreateFontSet(scrPtr, "fixed");
-			if (!font) {
-				font = WMCreateFontSet(scrPtr, "-*-fixed-medium-r-normal-*-14-*-*-*-*-*-*-*");
-			}
-		} else {
-			wwarning(_("could not load font %s. Trying fixed."), fontSpec);
-			font = WMCreateNormalFont(scrPtr, "fixed");
-		}
-		if (!font) {
-			wwarning(_("could not load fixed font!"));
-			wfree(fontSpec);
-			return NULL;
-		}
-	}
-	wfree(fontSpec);
-
-	return font;
-}
-
-WMFont *WMSystemFontOfSize(WMScreen * scrPtr, int size)
-{
-	return makeSystemFontOfSize(scrPtr, size, False);
-}
-
-WMFont *WMBoldSystemFontOfSize(WMScreen * scrPtr, int size)
-{
-	return makeSystemFontOfSize(scrPtr, size, True);
-}
-
-XFontSet WMGetFontFontSet(WMFont * font)
-{
-	wassertrv(font != NULL, NULL);
-
-	if (!font->notFontSet && !font->antialiased)
-		return font->font.set;
-
-	return NULL;
-}
-
-int WMWidthOfString(WMFont * font, char *text, int length)
-{
-	wassertrv(font != NULL, 0);
-	wassertrv(text != NULL, 0);
-
-	if (font->notFontSet) {
-		return XTextWidth(font->font.normal, text, length);
-	} else {
-		XRectangle rect;
-		XRectangle AIXsucks;
-
-		XmbTextExtents(font->font.set, text, length, &AIXsucks, &rect);
-
-		return rect.width;
-	}
-}
-
-void WMDrawString(WMScreen * scr, Drawable d, WMColor * color, WMFont * font, int x, int y, char *text, int length)
-{
-	wassertr(font != NULL);
-
-	if (font->notFontSet) {
-		XSetFont(scr->display, scr->drawStringGC, font->font.normal->fid);
-		XSetForeground(scr->display, scr->drawStringGC, W_PIXEL(color));
-		XDrawString(scr->display, d, scr->drawStringGC, x, y + font->y, text, length);
-	} else {
-		XSetForeground(scr->display, scr->drawStringGC, W_PIXEL(color));
-		XmbDrawString(scr->display, d, font->font.set, scr->drawStringGC, x, y + font->y, text, length);
-	}
-}
-
-void
-WMDrawImageString(WMScreen * scr, Drawable d, WMColor * color, WMColor * background,
-		  WMFont * font, int x, int y, char *text, int length)
-{
-	wassertr(font != NULL);
-
-	if (font->notFontSet) {
-		XSetForeground(scr->display, scr->drawImStringGC, W_PIXEL(color));
-		XSetBackground(scr->display, scr->drawImStringGC, W_PIXEL(background));
-		XSetFont(scr->display, scr->drawImStringGC, font->font.normal->fid);
-		XDrawImageString(scr->display, d, scr->drawImStringGC, x, y + font->y, text, length);
-	} else {
-		XSetForeground(scr->display, scr->drawImStringGC, W_PIXEL(color));
-		XSetBackground(scr->display, scr->drawImStringGC, W_PIXEL(background));
-		XmbDrawImageString(scr->display, d, font->font.set, scr->drawImStringGC,
-				   x, y + font->y, text, length);
-	}
-}
-
-static char *makeFontSetOfSize(char *fontset, int size)
-{
-	char font[300], *f;
-	char *newfs = NULL;
-	char *ptr;
-
-	do {
-		char *tmp;
-		int end;
-
-		f = fontset;
-		ptr = strchr(fontset, ',');
-		if (ptr) {
-			int count = ptr - fontset;
-
-			if (count > 255) {
-				wwarning(_("font description %s is too large."), fontset);
-			} else {
-				memcpy(font, fontset, count);
-				font[count] = 0;
-				f = (char *)font;
-			}
-		}
-
-		if (newfs)
-			end = strlen(newfs);
-		else
-			end = 0;
-
-		tmp = wmalloc(end + strlen(f) + 8);
-		if (end != 0) {
-			sprintf(tmp, "%s,", newfs);
-			sprintf(tmp + end + 1, f, size);
-		} else {
-			sprintf(tmp + end, f, size);
-		}
-
-		if (newfs)
-			wfree(newfs);
-		newfs = tmp;
-
-		fontset = ptr + 1;
-	} while (ptr != NULL);
-
-	return newfs;
-}
-
-#define FONT_PROPS 14
-
-typedef struct {
-	char *props[FONT_PROPS];
-} W_FontAttributes;
-
-static void changeFontProp(char *buf, char *newprop, int position)
-{
-	char buf2[512];
-	char *ptr, *pptr, *rptr;
-	int count;
-
-	if (buf[0] != '-') {
-		/* // remove warning later. or maybe not */
-		wwarning(_("Invalid font specification: '%s'\n"), buf);
-		return;
-	}
-
-	ptr = pptr = rptr = buf;
-	count = 0;
-	while (*ptr && *ptr != ',') {
-		if (*ptr == '-') {
-			count++;
-			if (count - 1 == position + 1) {
-				rptr = ptr;
-				break;
-			}
-			if (count - 1 == position) {
-				pptr = ptr + 1;
-			}
-		}
-		ptr++;
-	}
-	if (position == FONT_PROPS - 1) {
-		rptr = ptr;
-	}
-
-	*pptr = 0;
-	snprintf(buf2, 512, "%s%s%s", buf, newprop, rptr);
-	strcpy(buf, buf2);
-}
-
-static WMArray *getOptions(char *options)
-{
-	char *ptr, *ptr2, *str;
-	WMArray *result;
-	int count;
-
-	result = WMCreateArrayWithDestructor(2, (WMFreeDataProc *) wfree);
-
-	ptr = options;
-	while (1) {
-		ptr2 = strchr(ptr, ',');
-		if (!ptr2) {
-			WMAddToArray(result, wstrdup(ptr));
-			break;
-		} else {
-			count = ptr2 - ptr;
-			str = wmalloc(count + 1);
-			memcpy(str, ptr, count);
-			str[count] = 0;
-			WMAddToArray(result, str);
-			ptr = ptr2 + 1;
-		}
-	}
-
-	return result;
-}
-
-#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;
-
-WMFont *WMCopyFontWithChanges(WMScreen * scrPtr, WMFont * font, const WMFontAttributes * changes)
-{
-	int index[FONT_PROPS], count[FONT_PROPS];
-	int totalProps, i, j, carry;
-	char fname[512];
-	WMFontFlags fFlags;
-	WMBag *props;
-	WMArray *options;
-	WMFont *result;
-	char *prop;
-
-	snprintf(fname, 512, "%s", font->name);
-
-	fFlags = (font->antialiased ? WFAntialiased : WFNotAntialiased);
-	fFlags |= (font->notFontSet ? WFNormalFont : WFFontSet);
-
-	props = WMCreateBagWithDestructor(1, (WMFreeDataProc *) WMFreeArray);
-
-	totalProps = 0;
-	for (i = 0; i < FONT_PROPS; i++) {
-		prop = ((W_FontAttributes *) changes)->props[i];
-		count[i] = index[i] = 0;
-		if (!prop) {
-			/* No change for this property */
-			continue;
-		} else if (strchr(prop, ',') == NULL) {
-			/* Simple option */
-			changeFontProp(fname, prop, i);
-		} else {
-			/* Option with fallback alternatives */
-			if ((changes == WFAEmphasized || changes == WFABoldEmphasized) &&
-			    font->antialiased && strcmp(prop, "o,i") == 0) {
-				options = getOptions("i,o");
-			} else {
-				options = getOptions(prop);
-			}
-			WMInsertInBag(props, i, options);
-			count[i] = WMGetArrayItemCount(options);
-			if (totalProps == 0)
-				totalProps = 1;
-			totalProps = totalProps * count[i];
-		}
-	}
-
-	if (totalProps == 0) {
-		/* No options with fallback alternatives at all */
-		WMFreeBag(props);
-		return WMCreateFontWithFlags(scrPtr, fname, fFlags);
-	}
-
-	for (i = 0; i < totalProps; i++) {
-		for (j = 0; j < FONT_PROPS; j++) {
-			if (count[j] != 0) {
-				options = WMGetFromBag(props, j);
-				prop = WMGetFromArray(options, index[j]);
-				if (prop) {
-					changeFontProp(fname, prop, j);
-				}
-			}
-		}
-		result = WMCreateFontWithFlags(scrPtr, fname, fFlags);
-		if (result) {
-			WMFreeBag(props);
-			return result;
-		}
-		for (j = FONT_PROPS - 1, carry = 1; j >= 0; j--) {
-			if (count[j] != 0) {
-				index[j] += carry;
-				carry = (index[j] == count[j]);
-				index[j] %= count[j];
-			}
-		}
-	}
-
-	WMFreeBag(props);
-
-	return NULL;
-}
-
-// should WFANormal also set "normal" or leave it alone?
-static const WMFontAttributes W_FANormal = {
-	WFAUnchanged, WFAUnchanged, "medium,normal,regular", "r", "normal",
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
-};
-
-static const WMFontAttributes W_FABold = {
-	WFAUnchanged, WFAUnchanged, "bold", WFAUnchanged,
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
-};
-
-static const WMFontAttributes W_FANotBold = {
-	WFAUnchanged, WFAUnchanged, "medium,normal,regular", WFAUnchanged,
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
-};
-
-static const WMFontAttributes W_FAEmphasized = {
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, "o,i",
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
-};
-
-static const WMFontAttributes W_FANotEmphasized = {
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, "r",
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
-};
-
-static const WMFontAttributes W_FABoldEmphasized = {
-	WFAUnchanged, WFAUnchanged, "bold", "o,i",
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged,
-	WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged
-};
-
-const WMFontAttributes *WFANormal = &W_FANormal;
-const WMFontAttributes *WFABold = &W_FABold;
-const WMFontAttributes *WFANotBold = &W_FANotBold;
-const WMFontAttributes *WFAEmphasized = &W_FAEmphasized;
-const WMFontAttributes *WFANotEmphasized = &W_FANotEmphasized;
-const WMFontAttributes *WFABoldEmphasized = &W_FABoldEmphasized;
-
-#endif
--- a/WINGs/wfont_wchar.c
+++ b/WINGs/wfont_wchar.c
@@ -1,543 +0,0 @@
-
-#include "wconfig.h"
-
-#ifdef XFT
-
-#include <X11/Xft/Xft.h>
-#include <fontconfig/fontconfig.h>
-
-#if defined(HAVE_MBSNRTOWCS)
-# define __USE_GNU
-#endif
-
-#ifdef HAVE_WCHAR_H
-# include <wchar.h>
-#endif
-
-#include <stdlib.h>
-
-#include "WINGsP.h"
-
-#include <wraster.h>
-#include <assert.h>
-#include <X11/Xlocale.h>
-
-// && defined(HAVE_MBSTATE_T___COUNT)
-// in configure.ac use AC_CHECK_MEMBER(struct mbstate_t.__count,
-//                                     have=1, have=0, [#include <wchar.h>])
-#if defined(HAVE_MBSNRTOWCS)
-
-static size_t wmbsnrtowcs(wchar_t * dest, const char **src, size_t nbytes, size_t len)
-{
-	mbstate_t ps;
-	size_t n;
-
-	memset(&ps, 0, sizeof(mbstate_t));
-	n = mbsnrtowcs(dest, src, nbytes, len, &ps);
-	if (n != (size_t) - 1 && *src) {
-		*src -= ps.__count;
-	}
-
-	return n;
-}
-
-#elif defined(HAVE_MBRTOWC)
-
-// This is 8 times slower than the version above.
-static size_t wmbsnrtowcs(wchar_t * dest, const char **src, size_t nbytes, size_t len)
-{
-	mbstate_t ps;
-	const char *ptr;
-	size_t n;
-	int nb;
-
-	if (nbytes == 0)
-		return 0;
-
-	memset(&ps, 0, sizeof(mbstate_t));
-
-	if (dest == NULL) {
-		for (ptr = *src, n = 0; nbytes > 0; n++) {
-			nb = mbrtowc(NULL, ptr, nbytes, &ps);
-			if (nb == -1) {
-				return ((size_t) - 1);
-			} else if (nb == 0 || nb == -2) {
-				return n;
-			}
-			ptr += nb;
-			nbytes -= nb;
-		}
-	}
-
-	for (ptr = *src, n = 0; n < len && nbytes > 0; n++, dest++) {
-		nb = mbrtowc(dest, ptr, nbytes, &ps);
-		if (nb == -2) {
-			*src = ptr;
-			return n;
-		} else if (nb == -1) {
-			*src = ptr;
-			return ((size_t) - 1);
-		} else if (nb == 0) {
-			*src = NULL;
-			return n;
-		}
-		ptr += nb;
-		nbytes -= nb;
-	}
-
-	*src = ptr;
-	return n;
-}
-
-#else
-
-// Not only 8 times slower than the version based on mbsnrtowcs
-// but also this version is not thread safe nor reentrant
-
-static size_t wmbsnrtowcs(wchar_t * dest, const char **src, size_t nbytes, size_t len)
-{
-	const char *ptr;
-	size_t n;
-	int nb;
-
-	if (nbytes == 0)
-		return 0;
-
-	mbtowc(NULL, NULL, 0);	/* reset shift state */
-
-	if (dest == NULL) {
-		for (ptr = *src, n = 0; nbytes > 0; n++) {
-			nb = mbtowc(NULL, ptr, nbytes);
-			if (nb == -1) {
-				mbtowc(NULL, NULL, 0);
-				nb = mbtowc(NULL, ptr, strlen(ptr));
-				return (nb == -1 ? (size_t) - 1 : n);
-			} else if (nb == 0) {
-				return n;
-			}
-			ptr += nb;
-			nbytes -= nb;
-		}
-	}
-
-	for (ptr = *src, n = 0; n < len && nbytes > 0; n++, dest++) {
-		nb = mbtowc(dest, ptr, nbytes);
-		if (nb == -1) {
-			mbtowc(NULL, NULL, 0);
-			nb = mbtowc(NULL, ptr, strlen(ptr));
-			*src = ptr;
-			return (nb == -1 ? (size_t) - 1 : n);
-		} else if (nb == 0) {
-			*src = NULL;
-			return n;
-		}
-		ptr += nb;
-		nbytes -= nb;
-	}
-
-	*src = ptr;
-	return n;
-}
-
-#endif
-
-#define DEFAULT_SIZE 12
-
-static char *fixXLFD(char *xlfd, int size)
-{
-	char *fname, *ptr;
-
-	fname = wmalloc(strlen(xlfd) + 20);
-	if (strstr(xlfd, "%d") != NULL)
-		sprintf(fname, xlfd, size ? size : DEFAULT_SIZE);
-	else
-		strcpy(fname, xlfd);
-
-	if ((ptr = strchr(fname, ','))) {
-		*ptr = 0;
-	}
-
-	return fname;
-}
-
-static Bool hasProperty(FcPattern * pattern, const char *property)
-{
-	FcValue val;
-
-	if (FcPatternGet(pattern, property, 0, &val) == FcResultMatch) {
-		return True;
-	}
-
-	return False;
-}
-
-static Bool hasPropertyWithStringValue(FcPattern * pattern, const char *object, char *value)
-{
-	FcChar8 *str;
-	int id;
-
-	if (!value || value[0] == 0)
-		return True;
-
-	id = 0;
-	while (FcPatternGetString(pattern, object, id, &str) == FcResultMatch) {
-		if (strcasecmp(value, (char *)str) == 0) {
-			return True;
-		}
-		id++;
-	}
-
-	return False;
-}
-
-// also handle an xlfd with %d for size?
-static char *makeFontOfSize(char *font, int size, char *fallback)
-{
-	FcPattern *pattern;
-	char *result;
-
-	if (font[0] == '-') {
-		char *fname;
-
-		fname = fixXLFD(font, size);
-		pattern = XftXlfdParse(fname, False, False);
-		wfree(fname);
-	} else {
-		pattern = FcNameParse(font);
-	}
-
-	//FcPatternPrint(pattern);
-	if (size > 0) {
-		FcPatternDel(pattern, "pixelsize");
-		FcPatternAddDouble(pattern, "pixelsize", (double)size);
-	} else if (size == 0 && !hasProperty(pattern, "size") && !hasProperty(pattern, "pixelsize")) {
-		FcPatternAddDouble(pattern, "pixelsize", (double)DEFAULT_SIZE);
-	}
-
-	if (fallback && !hasPropertyWithStringValue(pattern, "family", fallback)) {
-		FcPatternAddString(pattern, "family", fallback);
-	}
-
-	result = FcNameUnparse(pattern);
-	FcPatternDestroy(pattern);
-
-	return result;
-}
-
-WMFont *WMCreateFont(WMScreen * scrPtr, char *fontName)
-{
-	WMFont *font;
-	Display *display = scrPtr->display;
-	char *fname, *ptr;
-
-	/* This is for back-compat (to allow reading of old xlfd descriptions) */
-	if (fontName[0] == '-' && (ptr = strchr(fontName, ','))) {
-		// warn for deprecation
-		fname = wmalloc(ptr - fontName + 1);
-		strncpy(fname, fontName, ptr - fontName);
-		fname[ptr - fontName] = 0;
-	} else {
-		fname = wstrdup(fontName);
-	}
-
-	font = WMHashGet(scrPtr->fontCache, fname);
-	if (font) {
-		WMRetainFont(font);
-		wfree(fname);
-		return font;
-	}
-
-	font = wmalloc(sizeof(WMFont));
-	memset(font, 0, sizeof(WMFont));
-
-	font->screen = scrPtr;
-
-	// remove
-	printf("WMCreateFont: %s\n", fname);
-
-	if (fname[0] == '-') {
-		// Backward compat thing. Remove in a later version
-		font->font = XftFontOpenXlfd(display, scrPtr->screen, fname);
-	} else {
-		font->font = XftFontOpenName(display, scrPtr->screen, fname);
-	}
-	if (!font->font) {
-		wfree(font);
-		wfree(fname);
-		return NULL;
-	}
-	font->height = font->font->ascent + font->font->descent;
-	font->y = font->font->ascent;
-
-	font->refCount = 1;
-
-	font->name = fname;
-
-	assert(WMHashInsert(scrPtr->fontCache, font->name, font) == NULL);
-
-	return font;
-}
-
-WMFont *WMRetainFont(WMFont * font)
-{
-	wassertrv(font != NULL, NULL);
-
-	font->refCount++;
-
-	return font;
-}
-
-void WMReleaseFont(WMFont * font)
-{
-	wassertr(font != NULL);
-
-	font->refCount--;
-	if (font->refCount < 1) {
-		XftFontClose(font->screen->display, font->font);
-		if (font->name) {
-			WMHashRemove(font->screen->fontCache, font->name);
-			wfree(font->name);
-		}
-		wfree(font);
-	}
-}
-
-Bool WMIsAntialiasingEnabled(WMScreen * scrPtr)
-{
-	return scrPtr->antialiasedText;
-}
-
-unsigned int WMFontHeight(WMFont * font)
-{
-	wassertrv(font != NULL, 0);
-
-	return font->height;
-}
-
-char *WMGetFontName(WMFont * font)
-{
-	wassertrv(font != NULL, NULL);
-
-	return font->name;
-}
-
-WMFont *WMDefaultSystemFont(WMScreen * scrPtr)
-{
-	return WMRetainFont(scrPtr->normalFont);
-}
-
-WMFont *WMDefaultBoldSystemFont(WMScreen * scrPtr)
-{
-	return WMRetainFont(scrPtr->boldFont);
-}
-
-WMFont *WMSystemFontOfSize(WMScreen * scrPtr, int size)
-{
-	WMFont *font;
-	char *fontSpec;
-
-	fontSpec = makeFontOfSize(WINGsConfiguration.systemFont, size, "sans");
-
-	font = WMCreateFont(scrPtr, fontSpec);
-
-	if (!font) {
-		wwarning(_("could not load font %s."), fontSpec);
-	}
-
-	wfree(fontSpec);
-
-	return font;
-}
-
-WMFont *WMBoldSystemFontOfSize(WMScreen * scrPtr, int size)
-{
-	WMFont *font;
-	char *fontSpec;
-
-	fontSpec = makeFontOfSize(WINGsConfiguration.boldSystemFont, size, "sans");
-
-	font = WMCreateFont(scrPtr, fontSpec);
-
-	if (!font) {
-		wwarning(_("could not load font %s."), fontSpec);
-	}
-
-	wfree(fontSpec);
-
-	return font;
-}
-
-int WMWidthOfString(WMFont * font, char *text, int length)
-{
-	XGlyphInfo extents;
-
-	wassertrv(font != NULL, 0);
-	wassertrv(text != NULL, 0);
-
-	if (font->screen->useWideChar) {
-		wchar_t *wtext;
-		const char *mtext;
-		int len;
-
-		wtext = (wchar_t *) wmalloc(sizeof(wchar_t) * (length + 1));
-		mtext = text;
-		len = wmbsnrtowcs(wtext, &mtext, length, length);
-		if (len > 0) {
-			wtext[len] = L'\0';	/* not really necessary here */
-			XftTextExtents32(font->screen->display, font->font, (XftChar32 *) wtext, len, &extents);
-		} else {
-			if (len == -1) {
-				wwarning(_("Conversion to widechar failed (possible "
-					   "invalid multibyte sequence): '%s':(pos %d)\n"),
-					 text, mtext - text + 1);
-			}
-			extents.xOff = 0;
-		}
-		wfree(wtext);
-	} else if (font->screen->useMultiByte) {
-		XftTextExtentsUtf8(font->screen->display, font->font, (XftChar8 *) text, length, &extents);
-	} else {
-		XftTextExtents8(font->screen->display, font->font, (XftChar8 *) text, length, &extents);
-	}
-
-	return extents.xOff;	/* don't ask :P */
-}
-
-void WMDrawString(WMScreen * scr, Drawable d, WMColor * color, WMFont * font, int x, int y, char *text, int length)
-{
-	XftColor xftcolor;
-
-	wassertr(font != NULL);
-
-	xftcolor.color.red = color->color.red;
-	xftcolor.color.green = color->color.green;
-	xftcolor.color.blue = color->color.blue;
-	xftcolor.color.alpha = color->alpha;;
-	xftcolor.pixel = W_PIXEL(color);
-
-	XftDrawChange(scr->xftdraw, d);
-
-	if (font->screen->useWideChar) {
-		wchar_t *wtext;
-		const char *mtext;
-		int len;
-
-		wtext = (wchar_t *) wmalloc(sizeof(wchar_t) * (length + 1));
-		mtext = text;
-		len = wmbsnrtowcs(wtext, &mtext, length, length);
-		if (len > 0) {
-			XftDrawString32(scr->xftdraw, &xftcolor, font->font,
-					x, y + font->y, (XftChar32 *) wtext, len);
-		} else if (len == -1) {
-			wwarning(_("Conversion to widechar failed (possible invalid "
-				   "multibyte sequence): '%s':(pos %d)\n"), text, mtext - text + 1);
-			/* we can draw normal text, or we can draw as much widechar
-			 * text as was already converted until the error. go figure */
-			/*XftDrawString8(scr->xftdraw, &xftcolor, font->font,
-			   x, y + font->y, (XftChar8*)text, length); */
-		}
-		wfree(wtext);
-	} else if (font->screen->useMultiByte) {
-		XftDrawStringUtf8(scr->xftdraw, &xftcolor, font->font, x, y + font->y, (XftChar8 *) text, length);
-	} else {
-		XftDrawString8(scr->xftdraw, &xftcolor, font->font, x, y + font->y, (XftChar8 *) text, length);
-	}
-}
-
-void
-WMDrawImageString(WMScreen * scr, Drawable d, WMColor * color, WMColor * background,
-		  WMFont * font, int x, int y, char *text, int length)
-{
-	XftColor textColor;
-	XftColor bgColor;
-
-	wassertr(font != NULL);
-
-	textColor.color.red = color->color.red;
-	textColor.color.green = color->color.green;
-	textColor.color.blue = color->color.blue;
-	textColor.color.alpha = color->alpha;;
-	textColor.pixel = W_PIXEL(color);
-
-	bgColor.color.red = background->color.red;
-	bgColor.color.green = background->color.green;
-	bgColor.color.blue = background->color.blue;
-	bgColor.color.alpha = background->alpha;;
-	bgColor.pixel = W_PIXEL(background);
-
-	XftDrawChange(scr->xftdraw, d);
-
-	XftDrawRect(scr->xftdraw, &bgColor, x, y, WMWidthOfString(font, text, length), font->height);
-
-	if (font->screen->useWideChar) {
-		wchar_t *wtext;
-		const char *mtext;
-		int len;
-
-		mtext = text;
-		wtext = (wchar_t *) wmalloc(sizeof(wchar_t) * (length + 1));
-		len = wmbsnrtowcs(wtext, &mtext, length, length);
-		if (len > 0) {
-			XftDrawString32(scr->xftdraw, &textColor, font->font,
-					x, y + font->y, (XftChar32 *) wtext, len);
-		} else if (len == -1) {
-			wwarning(_("Conversion to widechar failed (possible invalid "
-				   "multibyte sequence): '%s':(pos %d)\n"), text, mtext - text + 1);
-			/* we can draw normal text, or we can draw as much widechar
-			 * text as was already converted until the error. go figure */
-			/*XftDrawString8(scr->xftdraw, &textColor, font->font,
-			   x, y + font->y, (XftChar8*)text, length); */
-		}
-		wfree(wtext);
-	} else if (font->screen->useMultiByte) {
-		XftDrawStringUtf8(scr->xftdraw, &textColor, font->font, x, y + font->y, (XftChar8 *) text, length);
-	} else {
-		XftDrawString8(scr->xftdraw, &textColor, font->font, x, y + font->y, (XftChar8 *) text, length);
-	}
-}
-
-WMFont *WMCopyFontWithStyle(WMScreen * scrPtr, WMFont * font, WMFontStyle style)
-{
-	FcPattern *pattern;
-	WMFont *copy;
-	char *name;
-
-	if (!font)
-		return NULL;
-
-	pattern = FcNameParse(WMGetFontName(font));
-	switch (style) {
-	case WFSNormal:
-		FcPatternDel(pattern, "weight");
-		FcPatternDel(pattern, "slant");
-		FcPatternAddString(pattern, "weight", "regular");
-		FcPatternAddString(pattern, "weight", "medium");
-		FcPatternAddString(pattern, "slant", "roman");
-		break;
-	case WFSBold:
-		FcPatternDel(pattern, "weight");
-		FcPatternAddString(pattern, "weight", "bold");
-		break;
-	case WFSEmphasized:
-		FcPatternDel(pattern, "slant");
-		FcPatternAddString(pattern, "slant", "italic");
-		FcPatternAddString(pattern, "slant", "oblique");
-		break;
-	case WFSBoldEmphasized:
-		FcPatternDel(pattern, "weight");
-		FcPatternDel(pattern, "slant");
-		FcPatternAddString(pattern, "weight", "bold");
-		FcPatternAddString(pattern, "slant", "italic");
-		FcPatternAddString(pattern, "slant", "oblique");
-		break;
-	}
-
-	name = FcNameUnparse(pattern);
-	copy = WMCreateFont(scrPtr, name);
-	FcPatternDestroy(pattern);
-	wfree(name);
-
-	return copy;
-}
-
-#endif				/* XFT */
--- a/WINGs/wfontpanel.c
+++ b/WINGs/wfontpanel.c
@@ -5,6 +5,7 @@

 #include <ctype.h>
 #include <string.h>
+#include <strings.h>
 #include <stdint.h>

 #include <X11/Xft/Xft.h>
@@ -165,7 +166,6 @@ WMFontPanel *WMGetFontPanel(WMScreen * scr)
 		return scr->sharedFontPanel;

 	panel = wmalloc(sizeof(FontPanel));
-	memset(panel, 0, sizeof(FontPanel));

 	panel->win = WMCreateWindow(scr, "fontPanel");
 	/*    WMSetWidgetBackgroundColor(panel->win, WMWhiteColor(scr)); */
@@ -461,7 +461,6 @@ static void addTypefaceToXftFamily(Family * fam, char *style)
 	}

 	face = wmalloc(sizeof(Typeface));
-	memset(face, 0, sizeof(Typeface));

 	face->typeface = wstrdup(style);
 	face->sizes = WMCreateArray(4);
@@ -548,7 +547,7 @@ static void listFamilies(WMScreen * scr, WMFontPanel * panel)
 		WMListItem *item;

 		WM_ITERATE_ARRAY(array, fam, i) {
-			strcpy(buffer, fam->name);
+			wstrlcpy(buffer, fam->name, sizeof(buffer));
 			item = WMAddListItem(panel->famLs, buffer);

 			item->clientData = fam;
@@ -630,7 +629,7 @@ static void familyClick(WMWidget * w, void *data)
 		int top = 0;
 		WMListItem *fitem;

-		strcpy(buffer, face->typeface);
+		wstrlcpy(buffer, face->typeface, sizeof(buffer));
 		if (strcasecmp(face->typeface, "Roman") == 0)
 			top = 1;
 		if (strcasecmp(face->typeface, "Regular") == 0)
@@ -686,8 +685,8 @@ static void typefaceClick(WMWidget * w, void *data)
 	WMClearList(panel->sizLs);

 	WM_ITERATE_ARRAY(face->sizes, size, i) {
-		if ((int)(uintptr_t) size != 0) {
-			sprintf(buffer, "%i", (int)(uintptr_t) size);
+		if ((uintptr_t)size != 0) {
+			sprintf(buffer, "%li", (uintptr_t)size);

 			WMAddListItem(panel->sizLs, buffer);
 		}
@@ -755,7 +754,7 @@ static void setFontPanelFontName(FontPanel * panel, char *family, char *style, d
 		int top = 0;
 		WMListItem *fitem;

-		strcpy(buffer, face->typeface);
+		wstrlcpy(buffer, face->typeface, sizeof(buffer));
 		if (strcasecmp(face->typeface, "Roman") == 0)
 			top = 1;
 		if (top)
@@ -782,8 +781,8 @@ static void setFontPanelFontName(FontPanel * panel, char *family, char *style, d

 	WM_ITERATE_ARRAY(face->sizes, vsize, i) {
 		char buffer[32];
-		if ((int)(uintptr_t) vsize != 0) {
-			sprintf(buffer, "%i", (int)(uintptr_t) vsize);
+		if ((uintptr_t)vsize != 0) {
+			sprintf(buffer, "%li", (uintptr_t)vsize);

 			WMAddListItem(panel->sizLs, buffer);
 		}
--- a/WINGs/wframe.c
+++ b/WINGs/wframe.c
@@ -221,7 +221,6 @@ WMFrame *WMCreateFrame(WMWidget * parent)
 	Frame *fPtr;

 	fPtr = wmalloc(sizeof(Frame));
-	memset(fPtr, 0, sizeof(Frame));

 	fPtr->widgetClass = WC_Frame;

--- a/WINGs/wlabel.c
+++ b/WINGs/wlabel.c
@@ -39,7 +39,6 @@ WMLabel *WMCreateLabel(WMWidget * parent)
 	Label *lPtr;

 	lPtr = wmalloc(sizeof(Label));
-	memset(lPtr, 0, sizeof(Label));

 	lPtr->widgetClass = WC_Label;

--- a/WINGs/wlist.c
+++ b/WINGs/wlist.c
@@ -110,7 +110,6 @@ WMList *WMCreateList(WMWidget * parent)
 	W_Screen *scrPtr = W_VIEW(parent)->screen;

 	lPtr = wmalloc(sizeof(List));
-	memset(lPtr, 0, sizeof(List));

 	lPtr->widgetClass = WC_List;

@@ -187,7 +186,6 @@ WMListItem *WMInsertListItem(WMList * lPtr, int row, char *text)
 	CHECK_CLASS(lPtr, WC_List);

 	item = wmalloc(sizeof(WMListItem));
-	memset(item, 0, sizeof(WMListItem));
 	item->text = wstrdup(text);

 	row = WMIN(row, WMGetArrayItemCount(lPtr->items));
@@ -392,12 +390,9 @@ static void scrollByAmount(WMList * lPtr, int amount)
 static void vScrollCallBack(WMWidget * scroller, void *self)
 {
 	WMList *lPtr = (WMList *) self;
-	int height;
 	int oldTopItem = lPtr->topItem;
 	int itemCount = WMGetArrayItemCount(lPtr->items);

-	height = lPtr->view->size.height - 4;
-
 	switch (WMGetScrollerHitPart((WMScroller *) scroller)) {
 	case WSDecrementLine:
 		scrollByAmount(lPtr, -1);
@@ -638,7 +633,7 @@ static void handleEvents(XEvent * event, void *data)
 	}
 }

-static int matchTitle(void *item, void *title)
+static int matchTitle(const void *item, const void *title)
 {
 	return (strcmp(((WMListItem *) item)->text, (char *)title) == 0 ? 1 : 0);
 }
--- a/WINGs/wmenuitem.c
+++ b/WINGs/wmenuitem.c
@@ -41,7 +41,6 @@ WMMenuItem *WMCreateMenuItem(void)
 	WMMenuItem *item;

 	item = wmalloc(sizeof(MenuItem));
-	memset(item, 0, sizeof(MenuItem));

 	item->flags.enabled = 1;

--- a/WINGs/wmisc.c
+++ b/WINGs/wmisc.c
@@ -140,43 +140,6 @@ static int fitText(char *text, WMFont * font, int width, int wrap)
 	return i;
 }

-#ifdef OLD_CODE
-static int fitText(char *text, WMFont * font, int width, int wrap)
-{
-	int i, j;
-	int w;
-
-	if (text[0] == 0)
-		return 0;
-
-	i = 0;
-	if (wrap) {
-		if (text[0] == '\n')
-			return 0;
-
-		do {
-			i++;
-			w = WMWidthOfString(font, text, i);
-		} while (w < width && text[i] != '\n' && text[i] != 0);
-
-		if (text[i] == '\n')
-			return i;
-
-		/* keep words complete */
-		if (!isspace(text[i])) {
-			j = i;
-			while (j > 1 && !isspace(text[j]) && text[j] != 0)
-				j--;
-			if (j > 1)
-				i = j;
-		}
-	} else {
-		i = strcspn(text, "\n");
-	}
-	return i;
-}
-#endif
-
 int W_GetTextHeight(WMFont * font, char *text, int width, int wrap)
 {
 	char *ptr = text;
--- a/Show More
+++ b/Show More