sync nmakehlp.c with Tcl version

<p>purge spaces at end of lines
<p>clean-up unix/Makefile.in after carbon removal

20 files changed, 247 insertions, 233 deletions

diff --git a/ChangeLog b/ChangeLog
index 70988a7..18c3d0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -426,7 +426,7 @@
 2011-12-22  Don Porter  <dgp@users.sourceforge.net>
 
 	* win/tkWinMenu.c: [Bug 3235256] Keep menu entry IDs out of system
-	values. Thanks Colin McDonald. 
+	values. Thanks Colin McDonald.
 
 2011-11-22  Jan Nijtmans  <nijtmans@users.sf.net>
 
diff --git a/changes b/changes
index 2cb8571..28b5605 100644
--- a/changes
+++ b/changes
@@ -3253,7 +3253,7 @@ could be listed twice, if a long list of files were shown, and the view
 scrolled to the right, and then a different file file was shown, the
 scrollregion on the canvas wasn't being reset, so the file dialog was
 broken from then on, added an update idletasks so that the watch
-cursor was shown when the dialog was thinking. For the motif file 
+cursor was shown when the dialog was thinking. For the motif file
 dialog, fixed the weights for resizing.  On the clrpicker, fixed the
 finalColor variable which caused problems when the OK button was
 "clicked" before the dialog was mapped (in the test suite). Added Ioi's
@@ -3301,13 +3301,13 @@ to use the new event gereating mechanism.
 9/18/96 (bug fix) Long-standing bug in bind where <Button-1><Button-1> was
 reported as <Double-Button-1>, but <Double-Key-a> was reported as "aa". (CS)
 
-9/27/96 (bug fix) Bindings didn't work on 64-bit machines due to changes 
+9/27/96 (bug fix) Bindings didn't work on 64-bit machines due to changes
 made for virtual events. (CS)
 
-9/30/96 (feature change) Binding for new virtual events included both 
-lower and upper-case, e.g., <<Copy>> was defined as <Control-c> and 
+9/30/96 (feature change) Binding for new virtual events included both
+lower and upper-case, e.g., <<Copy>> was defined as <Control-c> and
 <Control-C>.  Previously, widgets were directly bound to only lower-case
-bindings.  The upper-case binding caused incompatibility with some existing 
+bindings.  The upper-case binding caused incompatibility with some existing
 Tcl programs, so the upper case bindings for <<Cut>>, <<Copy>>, and <<Paste>>
 were removed. (CS)
 
@@ -3333,7 +3333,7 @@ constraints. It used to return an error. (SAU)
 10/1/96 (bug fix)  "The way grid handles '^' short-cuts was re-written
 to eliminate core dumps. (SAU)
 
-10/3/96 (feature change) A virtual event binding associated with a 
+10/3/96 (feature change) A virtual event binding associated with a
 given physical event is now considered less specific than a binding for
 that same physical event, all other things being equal. (CS).
 
@@ -3378,13 +3378,13 @@ error due to a misplaced common in library/menu.tcl. (JO)
 error mechanism. (RJ)
 
 10/23/96 (bug fix) Fixed a bug in the Mac subwindow implementation
-that caused refreshes to not occur for canvases with embedded 
+that caused refreshes to not occur for canvases with embedded
 windows. (RJ)
 
 10/24/96 (bug fix) Provided workaround for Apple bug that doesn't
 handle zooming correctly for floating windows. (RJ)
 
-10/24/96 (bug fix) Macintosh tearoff menus are now correctly 
+10/24/96 (bug fix) Macintosh tearoff menus are now correctly
 displayed as Mac floating windows. (RJ)
 
 11/1/96 (bug fix) Restored manual page for procedures like
@@ -3486,10 +3486,10 @@ child of the master. (SS)
 widget command, which allows a menu to operate as a menubar. On the
 Macintosh, the menubar is displayed accross the top of the main monitor,
 just like with other applications. Under Windows and Unix, the menu is
-attached to the toplevel window. Also, changed some semantics.  
-Tearoff menus will now reflect changes to the menu it was 
+attached to the toplevel window. Also, changed some semantics.
+Tearoff menus will now reflect changes to the menu it was
 torn off from, and are deleted when the master menu is
-deleted. Tearoffs also reflect more look-and-feel of the 
+deleted. Tearoffs also reflect more look-and-feel of the
 platforms they are running on. (SRP)
 
 10/31/96 (bug fix) Under Windows, missing system cursors would
@@ -3575,9 +3575,9 @@ correctly if it contained the literal characters \" (CS)
 12/17/96 (feature change) Native Windows labels do not get a focus-ring
 border.  (CS)
 
-12/17/96 (bug fix) Under Windows, colors specified as "#XXYYZZ" where XX, YY, 
+12/17/96 (bug fix) Under Windows, colors specified as "#XXYYZZ" where XX, YY,
 or ZZ were not valid hex digits were getting a random color value instead of
-being an error. (CS) 
+being an error. (CS)
 
 ----------------- Released 8.0a1, 12/17/96 -----------------------
 
@@ -3599,7 +3599,7 @@ first time. (SS)
 
 1/6/97 (bug fix) Under Windows, the initialization code was not
 looking in the right directory for the Tk libraries when the program
-being run was not in the Tcl installation heirarchy. (SS) 
+being run was not in the Tcl installation heirarchy. (SS)
 
 1/8/97 (bug fix) Under Windows, the windows were not being unmapped
 properly, which led to strange packer behavior. (SS)
@@ -3612,10 +3612,10 @@ menubars. (JO)
 cause Tk to crash because TkMainInfo was freed before menu released its
 resources.  This bug had already been fixed for scrollbars and buttons. (CS)
 
-1/15/97 (bug fix) Tk is now working under Win32s again, including Win32 
+1/15/97 (bug fix) Tk is now working under Win32s again, including Win32
 version 1.25.  Fixed separate problems in fonts and dialogs. (CS)
 
-1/15/97 (feature change) Under Windows, font sizes are now specified in 
+1/15/97 (feature change) Under Windows, font sizes are now specified in
 points, not pixels.  The mapping between pointsize and pixels depends on
 Windows having accurate metrics for the monitor (plug&play helps).  Font
 metrics are still reported in pixels. (CS)
@@ -3760,7 +3760,7 @@ unix-centric fonts in scripts don't break when run on Windows or Mac.
 now, a minimal XLFD (such as "*-times-*") will be accepted, and all
 unspecified attributes will be given default values.  (2) Previously, in the
 {name size style ...} format, only the style was optional; now both the size
-and the style are optional; this solves the problem of old scripts that 
+and the style are optional; this solves the problem of old scripts that
 contain specifications of the form "-font fixed" or "-font times". (CCS)
 
 5/7/97 (new feature) Menus now send a virtual event <<MenuSelect>>
@@ -3795,7 +3795,7 @@ Ie. You can now use -stick, in addition to -sticky. (RJ)
 finding the library files when they are installed in a directory
 containing a space in the name. (SS)
 
-6/2/97 (bug fix) Virtual events associated with <Enter>/<Leave> in text 
+6/2/97 (bug fix) Virtual events associated with <Enter>/<Leave> in text
 widget tag caused panic. (CCS)
 
 6/6/97 (bug fix) On some systems, struct timeval.tv_sec is unsigned. (SS)
@@ -3826,7 +3826,7 @@ position the insertion point after the last character, and @x,y indices were
 computed incorrectly if -scrollregion had been specified and canvas was
 scrolled. (CCS)
 
-6/13/97 (bug fix) Hitting up/down arrows in a text widget packed in a 
+6/13/97 (bug fix) Hitting up/down arrows in a text widget packed in a
 toplevel window created with the "-screen" option would cause an error dialog
 to pop up. (CCS)
 
@@ -3899,7 +3899,7 @@ impossible under Windows, and is not done for Unix. (SRP)
 7/21/97 (bug fix) After fixing the bug that in canvas text item the insertion
 cursor wasn't shown if insertion point was at end of text item, introduced a
 different bug in where clicking in entry widget with 0 characters would
-crash or display garbage. (CCS) 
+crash or display garbage. (CCS)
 
 7/22/97 (bug fix) If there were a whole bunch of returns or tabs in a row in
 a canvas text item, then the temporary buffer used when outputting
@@ -3934,7 +3934,7 @@ window could cause an X error if the window had just been withdrawn.  (JO)
 8/4/97 (feature change) tkerror and bgerror are not anymore hard links
 maintained by the Tcl core. The implementation of bgerror provided by
 Tk tries, for backward compatibility only, to to call "tkerror" and
-if that fails, falls back to the usual dialog and stack trace option 
+if that fails, falls back to the usual dialog and stack trace option
 posting. You can thus still use either "bgerror" or "tkerror" as your
 application error handling proc, but using "bgerror" is strongly
 recommended as support for "tkerror" will eventually vanish in upcoming
@@ -3956,7 +3956,7 @@ no window manager. (BW)
 different interpreters could get confused if they had the same name. (JO)
 
 8/8/97 (new feature) Added new procedure Tk_GetImageMasterData for
-mapping image names to master data.  (JO) 
+mapping image names to master data.  (JO)
 
 8/8/97 (feature change) Modified Tk_FindPhoto procedure to require
 extra "interp" argument (needed for bug fix above).  (JO)
@@ -4018,9 +4018,9 @@ some conditions (such as an image named "place").  (JO)
 10/9/97 (bug fix) Fixed bug that sometimes prevented listboxes from
 scrolling far enough horizontally to see the rightmost character.  (JO)
 
-10/10/97 (bug fix) In canvas text items, if the text ended with a \n, it 
-was not counted in the bbox height, as it did in tk4.2.  This caused 
-"hello\n" to be the same height as "hello" and you couldn't see the 
+10/10/97 (bug fix) In canvas text items, if the text ended with a \n, it
+was not counted in the bbox height, as it did in tk4.2.  This caused
+"hello\n" to be the same height as "hello" and you couldn't see the
 cursor positioned on the next line. (CCS)
 
 10/10/97 (bug fix) The grid geometry manager didn't always properly
@@ -4068,10 +4068,10 @@ its place, and the replacement deleted would cause a panic. On Unix,
 instead of everytime the active menu item changed. (SRP)
 
 10/27/97 (bug fix) If a particular race condition occurred under Windows,
-Tk would crash complaining about trying to free a color that wasn't 
+Tk would crash complaining about trying to free a color that wasn't
 allocated. (SS)
 
-10/28/97 (bug fix) Under Windows, button grabs did not report motion 
+10/28/97 (bug fix) Under Windows, button grabs did not report motion
 events that occurred outside of Tk windows. (SS)
 
 10/28/97 (bug fix) Fixed incorrect display of transparent images on
@@ -4090,9 +4090,9 @@ the Macintosh port was not. (RJ)
 on the Macintosh.  Tk now also will iconify a toplevel window on the
 Mac if the new Appearance Manager is present. (RJ)
 
-10/28/97 (bug fixes) In canvas' postscript command: User name 
+10/28/97 (bug fixes) In canvas' postscript command: User name
 information was leaked in safe interpreters on Unix (security fix).
-Errors while reading prolog.ps were not propagated and the error 
+Errors while reading prolog.ps were not propagated and the error
 message was mixed with partial data. Note: postscript output does
 not work in safe interpreters on unix and windows. (DL)
 
@@ -4108,7 +4108,7 @@ the keyboard under Unix. (SRP)
 architectures. (SS)
 
 11/5/97 (bug fix) Embedding on Windows was using freed data (crashing
-in safe.test with TCL_MEM_DEBUG). NB: Embedding is still not fully 
+in safe.test with TCL_MEM_DEBUG). NB: Embedding is still not fully
 implemented on Windows ! (It works mostly when Tk is embeded into it's
 own Tk frame (safe::loadTk case), but not well with respect to resizing
 with a toplevel container or with an external process). (DL)
@@ -4140,7 +4140,7 @@ evaluation you always use "expr {...}" instead of "expr ..." and
 "if {...} ..." instead of "if ... ...". It will also be faster
 thanks to the byte compiler. (DL)
 
-12/3/97 (new feature) Added support for browser/plugin style embedding, 
+12/3/97 (new feature) Added support for browser/plugin style embedding,
 and made various other fixes to get the plugin working on the Mac. (JI)
 
 12/8/97 (bug fix) on Windows, using "winfo pathname" before "." was mapped
@@ -4154,14 +4154,14 @@ Jan/9/98 (improvement) Allow applications to have custom init script
 without  having to patch the Tk core: Tk_Init will use an existing
 "tkInit" proc if one exists in the interp where one tries to install Tk
 instead of defining it's own (tkInit is the transient proc defined in
-generic/tkInitScript.h that searches and sources tk.tcl and defines 
+generic/tkInitScript.h that searches and sources tk.tcl and defines
 the 'correct' tk_library). (DL)
 
 ---- Shipped as part of the plugin2.0 as 8.0p2Plugin2, Jan 15th 98 ----
 
 6/3/98 (bug fix) Fixed bugs in the tk_getOpenFile under Unix.
  1) If the -initialdir option was "." the result would be "././foo.tcl"
-    instead of an absolute path, like the Windows interface.  
+    instead of an absolute path, like the Windows interface.
  2) There is a traceVar on the data(selectPath) where the script was
     assumes the window exists. (BS)
 
@@ -4205,10 +4205,10 @@ including the center of the coord as part of the bound area.  (RJ)
 
 8/4/98 (bug fix) Fixed memory leak in Windows menu code. (SS)
 
-8/4/98 (bug fix) Fixed bug where bgerror's were not being generated 
+8/4/98 (bug fix) Fixed bug where bgerror's were not being generated
 from menu callbacks on Windows. (SS)
 
-8/4/98 (bug fix) Alt-key bindings were not being handled properly 
+8/4/98 (bug fix) Alt-key bindings were not being handled properly
 under Windows, resulting in annoying beeps. (SS)
 
 8/4/98 (bug fix) Fixed bug in Windows menubar handling that allowed
@@ -4353,10 +4353,10 @@ Changes for Tk 8.1 go below this line.
       characters.  For those familiar with the Japanese or Chinese patches,
       there is no "-kanjifont" option.  Characters from any available fonts
       will automatically be used if the widget's originally selected font is
-      not capable of displaying a given character.  
+      not capable of displaying a given character.
     - Textual widgets are international aware.  For instance, cursor
       positioning commands would now move the cursor forwards/back by 1
-      international character, not by 1 byte.  
+      international character, not by 1 byte.
     - Input Method Editors (IMEs) work on Mac and Windows.  Unix is still in
       progress.
 
@@ -4644,7 +4644,7 @@ library/menu.tcl. [Bug: 2425] (redman)
 calling from the Makefile. [Bug: 2413] (redman)
 
 7/22/99 (bug fix) Block out sys/stat.h include with #if to allow
-extension writers to use the MetroWerks compiler on Windows. 
+extension writers to use the MetroWerks compiler on Windows.
 [Bug: 2385] (redman)
 
 7/29/99 (bug fix) Allow tcl to opn CON and NUL on Windows, moved check
@@ -4657,7 +4657,7 @@ sets of makefiles (nmake and gmake). (redman)
 Njitmans.  [Bug: 2446] (hobbs)
 
 8/1/99  (bug fix) Wrapped #define of panic() inside #ifndef blocks to
-avoid compiler errors on Macintosh.  Patch from Vince Darley.  
+avoid compiler errors on Macintosh.  Patch from Vince Darley.
 [Bug: 2389] (hobbs)
 
 --------------- Released 8.2b2, August 5, 1999 ----------------------
@@ -5121,7 +5121,7 @@ expansion to the Win/Mac console. (hobbs)
 
 2001-08-14 (bug fix)[450545] Tk's Tcl_ObjTypes now registered (fellows)
 
-2001-08-20 (performance enhancement) internal use of a "window" Tcl_ObjType 
+2001-08-20 (performance enhancement) internal use of a "window" Tcl_ObjType
 (fellows)
 
 2001-08-20 (performance enhancement) Obj-ified [grid] and [pack] (spjuth)
@@ -5887,46 +5887,46 @@ Updated test suite, documentation, and demos.
 
 2004-12-09 (performance)[1081966] BMP, JPG image load speed (fellows)
 
-2004-12-17 (feature change) Modified DisplayFrame to draw a container's 
+2004-12-17 (feature change) Modified DisplayFrame to draw a container's
 background when the embedded window is NULL (chengyemao)
 
-2004-12-17 (bug fix)[842945][831627] Fixed a bug in ContainerEventProc  
-to handle ConfigureNotify event properly; Changed CleanupContainList to 
-TkWinCleanupContainerList to be invoked in TkWinXCleanup; Changed Intialize 
-and CreateTopLevelWindow to create the DeleteWindowsExitProc after TkpInit 
-so that finalization will be done in a proper sequence (to avoid painics 
+2004-12-17 (bug fix)[842945][831627] Fixed a bug in ContainerEventProc
+to handle ConfigureNotify event properly; Changed CleanupContainList to
+TkWinCleanupContainerList to be invoked in TkWinXCleanup; Changed Intialize
+and CreateTopLevelWindow to create the DeleteWindowsExitProc after TkpInit
+so that finalization will be done in a proper sequence (to avoid painics
 and potential crashes in exit). (chengyemao)
 
-2004-12-17 (platform support) Added TkWinClenupContainerList into stublib. 
+2004-12-17 (platform support) Added TkWinClenupContainerList into stublib.
 (chengyemao)
 
-2004-12-18 (buf fix)[222677] Close the embedded window (of a different 
+2004-12-18 (buf fix)[222677] Close the embedded window (of a different
 process) when its container is destroyed. (chengyemao)
 
-2004-12-19 (Windows feature implementation of embedded/embedding 
-Tk and bug fix) Implemented container identification, focus, raise, set 
-title of and move window so that an embedded widget is able to identify 
-a container, to get focus and to receive key press input. Fixed bugs include 
-[1024364][1096047] and an incorrect wm overrideredirect for an embedded 
+2004-12-19 (Windows feature implementation of embedded/embedding
+Tk and bug fix) Implemented container identification, focus, raise, set
+title of and move window so that an embedded widget is able to identify
+a container, to get focus and to receive key press input. Fixed bugs include
+[1024364][1096047] and an incorrect wm overrideredirect for an embedded
 window. (chengyemao)
 
-2004-12-20 (Windows feature implementation of embedded/embedding Tk) 
-Implemented overrideredirect for an embedded toplevel; correctly updated a 
-frame's upper left x and y of an embedded toplevel after its container 
-(of another process) moved. (chengyemao) 
-
-2004-12-28 (feature implementatoin of embedded/embedding Tk of Windows) 
-Implemented embedded/embedding toplevel menu. A menu may be embedded in 
-a container of either the same process or a different process. Working 
-fine with Windows 98. But having a problem when invoked with a mouse click 
-(Windows XP): if an embedded menu is in a different process, the menu items 
-may show as a blank window at the pull-down time and require the mouse 
+2004-12-20 (Windows feature implementation of embedded/embedding Tk)
+Implemented overrideredirect for an embedded toplevel; correctly updated a
+frame's upper left x and y of an embedded toplevel after its container
+(of another process) moved. (chengyemao)
+
+2004-12-28 (feature implementatoin of embedded/embedding Tk of Windows)
+Implemented embedded/embedding toplevel menu. A menu may be embedded in
+a container of either the same process or a different process. Working
+fine with Windows 98. But having a problem when invoked with a mouse click
+(Windows XP): if an embedded menu is in a different process, the menu items
+may show as a blank window at the pull-down time and require the mouse
 moves over the menu items to complete display. (chengyemao)
 
 2004-12-29 (platform support)[1092952,1091967] MSVC7, gcc OPT compiles (hobbs)
 
 2005-01-03 (feature implementation of embedded/embedding Tk of Windows) Added
-a separated window handler for an embedded menu; solved the problem of 
+a separated window handler for an embedded menu; solved the problem of
 a blank menu display with a mouse click in XP. (chengyemao)
 
 2005-01-07 (feature implementation of embedded/embedding Tk of Window) Added
@@ -5934,9 +5934,9 @@ TK_STATE message (Windows) to support {wm state} for embedded windows; forced
 redraw of container after the embedded window detached; removed unnecessary
 panic in using embedded window; embeded toplevel menu of an embedded window
 automatically in wrapper updating.  Modified and added functions: WmStateCmd,
-UpdateWrapper, TkpWmGetState (added) in tkWinWm.c; TkpUseWindow, 
-TkWinEmbeddedEventProc in tkWinEmbed.c; TkWinChildProc in tkWinX.c. 
-(chengyemao) 
+UpdateWrapper, TkpWmGetState (added) in tkWinWm.c; TkpUseWindow,
+TkWinEmbeddedEventProc in tkWinEmbed.c; TkWinChildProc in tkWinX.c.
+(chengyemao)
 
 2005-01-08 (bug fix)[1098625] Wrong toplevel geometry when created with a menu;
 [637653] Deleting a popup menu crashes wish (chengyemao)
@@ -6281,7 +6281,7 @@ _NET_WM_PING (fellows)
 2007-04-23 (enhancement) Allow empty value for -selectforeground opt (steffen)
 
 2007-04-23 (platform support) Aqua: remove Tk-internal double buffering that is
-wasteful on Aqua; allows direct-to-window CoreGraphics drawing (e.g. adding 
+wasteful on Aqua; allows direct-to-window CoreGraphics drawing (e.g. adding
 support for colors with alpha) (steffen)
 
 2007-04-23 (platform support) Aqua: add all OS theme colors/brushes (patterns)
@@ -6442,7 +6442,7 @@ steffen, kupries)
 
 --- Released 8.5b3, Novemeber 19, 2007 --- See ChangeLog for details ---
 
-2007-11-25 (bug fix)[1343984] ttk::notebook bugs (english,boudaillier) 
+2007-11-25 (bug fix)[1343984] ttk::notebook bugs (english,boudaillier)
 
 2007-11-26 (bug fix)[1822391] [photo put] segfault w/ PPM data (kenny)
 
diff --git a/compat/unistd.h b/compat/unistd.h
index 1a40e90..9a1dcd7 100644
--- a/compat/unistd.h
+++ b/compat/unistd.h
@@ -25,8 +25,8 @@
 #define NULL    0
 #endif
 
-/* 
- * Strict POSIX stuff goes here.  Extensions go down below, in the 
+/*
+ * Strict POSIX stuff goes here.  Extensions go down below, in the
  * ifndef _POSIX_SOURCE section.
  */
 
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 36475df..6794edb 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -872,7 +872,7 @@ declare 23 aqua {
     void TkMacOSXMakeRealWindowExist(TkWindow *winPtr)
 }
 declare 24 aqua {
-    void *    TkMacOSXMakeStippleMap(Drawable d1, Drawable d2)
+    void *TkMacOSXMakeStippleMap(Drawable d1, Drawable d2)
 }
 declare 25 aqua {
     void TkMacOSXMenuClick(void)
diff --git a/license.terms b/license.terms
index 50619a3..fc7b2c0 100644
--- a/license.terms
+++ b/license.terms
@@ -28,7 +28,7 @@ MODIFICATIONS.
 
 GOVERNMENT USE: If you are acquiring this software on behalf of the
 U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
+in the software and related documentation as defined in the Federal
 Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
 are acquiring the software on behalf of the Department of Defense, the
 software shall be classified as "Commercial Computer Software" and the
diff --git a/macosx/README b/macosx/README
index efcca73..8bd33d4 100644
--- a/macosx/README
+++ b/macosx/README
@@ -3,7 +3,6 @@ Tcl/Tk Mac OS X README
 
 This is the README file for the Mac OS X/Darwin version of Tcl/Tk.
 
-
 1. Where to go for support
 --------------------------
 
@@ -17,16 +16,11 @@ before asking on the list, many questions have already been answered).
 	http://groups.google.com/group/comp.lang.tcl/
 
 - The Tcl'ers Wiki also has many pages dealing with Tcl & Tk on Mac OS X, see
-	http://wiki.tcl.tk/references/3753!
-	http://wiki.tcl.tk/references/8361!
+	http://wiki.tcl.tk/_/ref?N=3753
+	http://wiki.tcl.tk/_/ref?N=8361
 
 - Please report bugs with Tcl or Tk on Mac OS X to the sourceforge bug trackers:
-	Tcl: http://sf.net/tracker/?func=add&group_id=10894&atid=110894
-	Tk:  http://sf.net/tracker/?func=add&group_id=12997&atid=112997
-please make sure that your report Tk specific bugs to the tktoolkit project bug
-tracker rather than the tcl project bug tracker.
-Mac OS X specific bugs should in general be assigned to user 'das'.
-
+	http://tcl.sourceforge.net/
 
 2. Using Tcl/Tk on Mac OS X
 ---------------------------
@@ -179,13 +173,16 @@ given window. The 3 argument form sets the class for the given window using the
 default attributes for that class. The 4 argument form sets the class and the
 list of attributes for the given window.
 Window class names:
-      standardDocument, standardFloating, resizable, fullZoom, horizontalZoom,
+    document, modal, floating, utility, toolbar, simple, help, overlay
+Window attribute names:
+    standardDocument, standardFloating, resizable, fullZoom, horizontalZoom,
     verticalZoom, closeBox, collapseBox, toolbarButton, sideTitlebar,
     noTitleBar, unifiedTitleAndToolbar, metal, hud, noShadow, doesNotCycle,
     noActivates, hideOnSuspend, inWindowMenu, ignoreClicks, doesNotHide,
     canJoinAllSpaces, moveToActiveSpace, nonActivating, black, dark, light,
     gray, red, green, blue, cyan, yellow, magenta, orange, purple,
     brown, clear, opacity
+
 Note that not all attributes are valid for all window classes.
 Support for the 3 argument form was added with the Cocoa-based Tk 8.5.7, at the
 same time support for some legacy Carbon-specific classes and attributes was
@@ -286,7 +283,7 @@ The following build configurations are available:
 The Xcode projects refer to the toplevel tcl and tk source directories via the
 the TCL_SRCROOT and TK_SRCROOT user build settings, by default these are set to
 the project-relative paths '../../tcl' and '../../tk', if your source
-directories are named differently, e.g. '../../tcl8.6' and '../../tk8.6', you
+directories are named differently, e.g. '../../tcl8.5' and '../../tk8.5', you
 need to manually change the TCL_SRCROOT and TK_SRCROOT settings by editing your
 ${USER}.pbxuser file (located inside the Tk.xcodeproj bundle directory) with a
 text editor.
@@ -322,9 +319,9 @@ trees in a common parent directory.
 
 - The following instructions assume the Tcl and Tk source trees are named
 "tcl${ver}" and "tk${ver}" (where ${ver} is a shell variable containing the
-Tcl/Tk version number, e.g. '8.6').
+Tcl/Tk version number, e.g. '8.5').
 Setup this shell variable as follows:
-	ver="8.6"
+	ver="8.5"
 If you are building from CVS, omit this step (CVS source tree names usually do
 not contain a version number).
 
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6d877a8..6834f26 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -155,7 +155,7 @@ AQUA_INCLUDES		= -I$(MAC_OSX_DIR) -I$(XLIB_DIR)
 # Linker switch(es) to use to link with the X11 library archive (the
 # configure script will try to set this value automatically, but you
 # can override it).
-X11_LIB_SWITCHES	= @XLIBSW@ $(XFT_LIBS)
+X11_LIB_SWITCHES	= $(XFT_LIBS) @XLIBSW@
 
 
 # To turn off the security checks that disallow incoming sends when
@@ -200,16 +200,17 @@ SHELL			= @SHELL@
 # path. Targets that need an installed tclsh should not depend
 # on this variable.
 
-BUILD_TCLSH		= @BUILD_TCLSH@@EXEEXT@
+BUILD_TCLSH		= @BUILD_TCLSH@
 
 # TCL_EXE is the name of a tclsh executable that is available *BEFORE*
 # running make for the first time. Certain build targets (make genstubs)
 # need it to be available on the PATH. This executable should *NOT* be
 # required just to do a normal build although it can be required to run
 # make dist. This variable is set to "" if no tclsh is available.
+EXE_SUFFIX		= @EXEEXT@
 TCL_EXE			= @TCLSH_PROG@
-WISH_EXE		= wish@EXEEXT@
-TKTEST_EXE		= tktest@EXEEXT@
+WISH_EXE		= wish${EXE_SUFFIX}
+TKTEST_EXE		= tktest${EXE_SUFFIX}
 
 # Tk used to let the configure script choose which program to use
 # for installing, but there are just too many different versions of
@@ -326,7 +327,7 @@ CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 ${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
 ${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@
 
-CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS} 
+CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS}
 
 APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@
 
@@ -354,7 +355,7 @@ TEXT_OBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextImage.o tkTextIndex.o \
 	tkTextMark.o tkTextTag.o tkTextWind.o
 
 # either tkUnixFont.o (default) or tkUnixRFont.o (if --enable-xft)
-# 
+#
 FONT_OBJS = @UNIX_FONT_OBJS@
 
 GENERIC_OBJS = tk3d.o tkArgv.o tkAtom.o tkBind.o tkBitmap.o tkClipboard.o \
@@ -666,7 +667,13 @@ valgrind: $(TKTEST_EXE)
 valgrindshell: $(TKTEST_EXE)
 	$(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(SCRIPT)
 
-INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
+INSTALL_BASE_TARGETS = install-binaries install-libraries
+INSTALL_DOC_TARGETS = install-doc
+INSTALL_DEV_TARGETS = install-headers
+INSTALL_DEMO_TARGETS = install-demos
+INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
+INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
+		$(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS)
 
 install: $(INSTALL_TARGETS)
 
@@ -693,7 +700,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
 	    echo "Creating package index $(PKG_INDEX)"; \
 	    rm -f "$(PKG_INDEX)"; \
 	    (\
-	    echo "if {[catch {package present Tcl 8.5.0}]} { return }";\
+	    echo "if {[catch {package present Tcl 8.5.0}]} return";\
 	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
 	    if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \
 	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
@@ -711,11 +718,11 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
 	@@INSTALL_LIB@
 	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
 	@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
-	    $(INSTALL_LIBRARY) "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
+	    $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
 	    chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
 	fi
-	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
-	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
+	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
+	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
 	@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
 	@$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh"
 	@if test "$(STUB_LIB_FILE)" != "" ; then \
@@ -725,10 +732,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
 	@EXTRA_INSTALL_BINARIES@
 
 install-libraries: libraries
-	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
-	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)/X11"; fi; \
-	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
-		"$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
+	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
 		"$(SCRIPT_INSTALL_DIR)/msgs" "$(SCRIPT_INSTALL_DIR)/ttk"; \
 	    do \
 	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
@@ -737,18 +741,9 @@ install-libraries: libraries
 		else true; \
 		fi; \
 	    done;
-	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
-	@for i in $(PUBLIC_HDRS); \
-	    do \
-	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
-	    done;
-	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
-	    do \
-	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)/X11"; \
-	    done;
 	@echo "Installing Tk library files to $(SCRIPT_INSTALL_DIR)/";
-	@for i in $(TOP_DIR)/library/*.tcl \
-	        $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
+	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
+		$(UNIX_DIR)/tkAppInit.c; \
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
 	    done;
@@ -829,8 +824,29 @@ install-doc:
 	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
 	done
 
+install-headers:
+	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
+	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
+	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \
+	    do \
+	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
+		echo "Making directory $$i"; \
+		$(INSTALL_DATA_DIR) "$$i"; \
+		else true; \
+		fi; \
+	    done;
+	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
+	@for i in $(PUBLIC_HDRS); \
+	    do \
+	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
+	    done;
+	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
+	    do \
+	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)/X11"; \
+	    done;
+
 # Optional target to install private headers
-install-private-headers: libraries
+install-private-headers:
 	@for i in "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \
 	    do \
 	    if [ ! -d "$$i" ] ; then \
@@ -1638,7 +1654,7 @@ BUILD_HTML = \
 #
 # Targets to build Solaris package of the distribution for the current
 # architecture.  To build stream packages for both sun4 and i86pc
-# architectures: 
+# architectures:
 #
 #   On the sun4 machine, execute the following:
 #     make distclean; ./configure
@@ -1694,7 +1710,7 @@ package-common:
 # Build and install the architecture specific files in the dist directory.
 #
 
-package-binaries: 
+package-binaries:
 	cd $(DISTDIR)/unix/`arch`; \
 	$(MAKE); \
 	$(MAKE) install-binaries prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION) \
diff --git a/unix/tk.spec b/unix/tk.spec
index df0e6b4..df3b965 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -32,7 +32,7 @@ CFLAGS="%optflags" ./configure \
 	--prefix=%{directory} \
 	--exec-prefix=%{directory} \
 	--libdir=%{directory}/%{_lib}
-make 
+make
 
 %install
 cd unix
diff --git a/unix/tkConfig.sh.in b/unix/tkConfig.sh.in
index 1b96f37..bb85ad0 100644
--- a/unix/tkConfig.sh.in
+++ b/unix/tkConfig.sh.in
@@ -1,5 +1,5 @@
 # tkConfig.sh --
-# 
+#
 # This shell script (for sh) is generated automatically by Tk's
 # configure script.  It will create shell variables for most of
 # the configuration options discovered by the configure script.
diff --git a/unix/tkUnixConfig.c b/unix/tkUnixConfig.c
index 2862eff..0b3af03 100644
--- a/unix/tkUnixConfig.c
+++ b/unix/tkUnixConfig.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * tkUnixConfig.c --
  *
  *	This module implements the Unix system defaults for the configuration
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index f422111..b7fc97f 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -42,7 +42,7 @@ Tk_SetCaretPos(
     if (   dispPtr->caret.winPtr == winPtr
 	&& dispPtr->caret.x == x
 	&& dispPtr->caret.y == y
-	&& dispPtr->caret.height == height) 
+	&& dispPtr->caret.height == height)
     {
 	return;
     }
@@ -116,7 +116,7 @@ TkpGetString(
 #ifdef TK_USE_INPUT_METHODS
     if ((winPtr->dispPtr->flags & TK_DISPLAY_USE_IM)
 	    && (winPtr->inputContext != NULL)
-	    && (eventPtr->type == KeyPress)) 
+	    && (eventPtr->type == KeyPress))
     {
 	Status status;
 
@@ -129,7 +129,7 @@ TkpGetString(
 	if (status == XBufferOverflow) { /* Expand buffer and try again */
 	    Tcl_DStringSetLength(dsPtr, len);
 	    len = Xutf8LookupString(winPtr->inputContext, &eventPtr->xkey,
-		    Tcl_DStringValue(dsPtr), Tcl_DStringLength(dsPtr), 
+		    Tcl_DStringValue(dsPtr), Tcl_DStringLength(dsPtr),
 		    &kePtr->keysym, &status);
 	}
 	if ((status != XLookupChars) && (status != XLookupBoth)) {
@@ -145,7 +145,7 @@ TkpGetString(
 	Tcl_DStringSetLength(&buf, TCL_DSTRING_STATIC_SIZE-1);
 
 	len = XmbLookupString(winPtr->inputContext, &eventPtr->xkey,
-		Tcl_DStringValue(&buf), Tcl_DStringLength(&buf), 
+		Tcl_DStringValue(&buf), Tcl_DStringLength(&buf),
                 &kePtr->keysym, &status);
 
 	/*
@@ -281,7 +281,7 @@ TkpGetKeySym(
     TkKeyEvent* kePtr = (TkKeyEvent*) eventPtr;
 
 #ifdef TK_USE_INPUT_METHODS
-    /* 
+    /*
      * If input methods are active, we may already have determined a keysym.
      * Return it.
      */
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 2626d71..940cf73 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -382,7 +382,7 @@ static int		WmDeiconifyCmd(Tk_Window tkwin, TkWindow *winPtr,
 static int		WmFocusmodelCmd(Tk_Window tkwin, TkWindow *winPtr,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *CONST objv[]);
-static int		WmForgetCmd(Tk_Window tkwin, TkWindow *winPtr, 
+static int		WmForgetCmd(Tk_Window tkwin, TkWindow *winPtr,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *CONST objv[]);
 static int		WmFrameCmd(Tk_Window tkwin, TkWindow *winPtr,
@@ -418,7 +418,7 @@ static int		WmIconpositionCmd(Tk_Window tkwin, TkWindow *winPtr,
 static int		WmIconwindowCmd(Tk_Window tkwin, TkWindow *winPtr,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *CONST objv[]);
-static int		WmManageCmd(Tk_Window tkwin, TkWindow *winPtr, 
+static int		WmManageCmd(Tk_Window tkwin, TkWindow *winPtr,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *CONST objv[]);
 static int		WmMaxsizeCmd(Tk_Window tkwin, TkWindow *winPtr,
@@ -988,7 +988,7 @@ TkWmSetClass(
  *
  * Tk_WmObjCmd --
  *
- *	This function is invoked to process the "wm" Tcl command. 
+ *	This function is invoked to process the "wm" Tcl command.
  *
  *----------------------------------------------------------------------
  */
@@ -5411,7 +5411,7 @@ SetNetWmType(TkWindow *winPtr, Tcl_Obj *typePtr)
  * GetNetWmType --
  *
  *	Read the extended window manager type hint from a window
- *	and return as a list of names suitable for use with 
+ *	and return as a list of names suitable for use with
  *	SetNetWmType.
  *
  *----------------------------------------------------------------------
@@ -6349,7 +6349,7 @@ TkWmStackorderToplevel(
 		*window_ptr++ = childWinPtr;
 	    }
 	}
-	/* ASSERT: window_ptr - windows == table.numEntries 
+	/* ASSERT: window_ptr - windows == table.numEntries
 	 * (#matched toplevel windows == #children) [Bug 1789819]
 	 */
 	*window_ptr = NULL;
@@ -7306,7 +7306,7 @@ TkpWmSetState(
  *----------------------------------------------------------------------
  */
 
-static void 
+static void
 RemapWindows(winPtr, parentPtr)
      TkWindow *winPtr;
      TkWindow *parentPtr;
diff --git a/win/Makefile.in b/win/Makefile.in
index 0f8f545..eda2aed 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -145,7 +145,7 @@ MAN2TCL			= man2tcl$(EXEEXT)
 
 @SET_MAKE@
 
-# Setting the VPATH variable to a list of paths will cause the 
+# Setting the VPATH variable to a list of paths will cause the
 # makefile to look into these paths when resolving .c to .obj
 # dependencies.
 
@@ -406,7 +406,7 @@ SHELL_ENV = \
 	TK_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TK_LIBRARY; \
 	PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH;
 
-# Main targets.  The default target -- all -- builds the binaries, 
+# Main targets.  The default target -- all -- builds the binaries,
 # performs any post processing on libraries or documents.
 
 all: binaries libraries doc
@@ -481,7 +481,7 @@ install-binaries: binaries
 		$(COPY) $$i "$(BIN_INSTALL_DIR)"; \
 	    fi; \
 	    done
-	@echo "Creating package index $(PKG_INDEX)"; 
+	@echo "Creating package index $(PKG_INDEX)";
 	@$(RM) $(PKG_INDEX);
 	@(\
 	echo "if {[catch {package present Tcl $(TCLVERSION).0}]} return";\
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index d0edcf0..b1a1517 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -498,9 +498,10 @@ GetVersionFromFile(
 	    p = strstr(szBuffer, match);
 	    if (p != NULL) {
 		/*
-		 * Skip to first digit.
+		 * Skip to first digit after the match.
 		 */
 
+		p += strlen(match);
 		while (*p && !isdigit(*p)) {
 		    ++p;
 		}
@@ -630,11 +631,11 @@ SubstituteFile(
 	    }
 	}
 #endif
-	
+
 	/*
 	 * Run the substitutions over each line of the input
 	 */
-	
+
 	while (fgets(szBuffer, cbBuffer, fp) != NULL) {
 	    list_item_t *p = NULL;
 	    for (p = substPtr; p != NULL; p = p->nextPtr) {
@@ -654,7 +655,7 @@ SubstituteFile(
 	    }
 	    printf(szBuffer);
 	}
-	
+
 	list_free(&substPtr);
     }
     fclose(fp);
diff --git a/xlib/X11/X.h b/xlib/X11/X.h
index bdc4f13..daf2283 100644
--- a/xlib/X11/X.h
+++ b/xlib/X11/X.h
@@ -13,13 +13,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the names of Digital or MIT not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -100,39 +100,39 @@ typedef unsigned long KeyCode;	/* In order to use IME, the Macintosh needs
 
 #define NoSymbol	     0L	/* special KeySym */
 
-/***************************************************************** 
- * EVENT DEFINITIONS 
+/*****************************************************************
+ * EVENT DEFINITIONS
  *****************************************************************/
 
 /* Input Event Masks. Used as event-mask window attribute and as arguments
    to Grab requests.  Not to be confused with event names.  */
 
 #define NoEventMask			0L
-#define KeyPressMask			(1L<<0)  
-#define KeyReleaseMask			(1L<<1)  
-#define ButtonPressMask			(1L<<2)  
-#define ButtonReleaseMask		(1L<<3)  
-#define EnterWindowMask			(1L<<4)  
-#define LeaveWindowMask			(1L<<5)  
-#define PointerMotionMask		(1L<<6)  
-#define PointerMotionHintMask		(1L<<7)  
-#define Button1MotionMask		(1L<<8)  
-#define Button2MotionMask		(1L<<9)  
-#define Button3MotionMask		(1L<<10) 
-#define Button4MotionMask		(1L<<11) 
-#define Button5MotionMask		(1L<<12) 
-#define ButtonMotionMask		(1L<<13) 
+#define KeyPressMask			(1L<<0)
+#define KeyReleaseMask			(1L<<1)
+#define ButtonPressMask			(1L<<2)
+#define ButtonReleaseMask		(1L<<3)
+#define EnterWindowMask			(1L<<4)
+#define LeaveWindowMask			(1L<<5)
+#define PointerMotionMask		(1L<<6)
+#define PointerMotionHintMask		(1L<<7)
+#define Button1MotionMask		(1L<<8)
+#define Button2MotionMask		(1L<<9)
+#define Button3MotionMask		(1L<<10)
+#define Button4MotionMask		(1L<<11)
+#define Button5MotionMask		(1L<<12)
+#define ButtonMotionMask		(1L<<13)
 #define KeymapStateMask			(1L<<14)
-#define ExposureMask			(1L<<15) 
-#define VisibilityChangeMask		(1L<<16) 
-#define StructureNotifyMask		(1L<<17) 
-#define ResizeRedirectMask		(1L<<18) 
-#define SubstructureNotifyMask		(1L<<19) 
-#define SubstructureRedirectMask	(1L<<20) 
-#define FocusChangeMask			(1L<<21) 
-#define PropertyChangeMask		(1L<<22) 
-#define ColormapChangeMask		(1L<<23) 
-#define OwnerGrabButtonMask		(1L<<24) 
+#define ExposureMask			(1L<<15)
+#define VisibilityChangeMask		(1L<<16)
+#define StructureNotifyMask		(1L<<17)
+#define ResizeRedirectMask		(1L<<18)
+#define SubstructureNotifyMask		(1L<<19)
+#define SubstructureRedirectMask	(1L<<20)
+#define FocusChangeMask			(1L<<21)
+#define PropertyChangeMask		(1L<<22)
+#define ColormapChangeMask		(1L<<23)
+#define OwnerGrabButtonMask		(1L<<24)
 
 /* Event names.  Used in "type" field in XEvent structures.  Not to be
 confused with event masks above.  They start from 2 because 0 and 1
@@ -229,7 +229,7 @@ are reserved in the protocol for errors and replies. */
 #define NotifyWhileGrabbed	3
 
 #define NotifyHint		1	/* for MotionNotify events */
-		       
+
 /* Notify detail */
 
 #define NotifyAncestor		0
@@ -299,7 +299,7 @@ are reserved in the protocol for errors and replies. */
 #define RevertToParent		2
 
 /*****************************************************************
- * ERROR CODES 
+ * ERROR CODES
  *****************************************************************/
 
 #define Success		   0	/* everything's okay */
@@ -314,9 +314,9 @@ are reserved in the protocol for errors and replies. */
 #define BadDrawable	   9	/* parameter not a Pixmap or Window */
 #define BadAccess	  10	/* depending on context:
 				 - key/button already grabbed
-				 - attempt to free an illegal 
-				   cmap entry 
-				- attempt to store into a read-only 
+				 - attempt to free an illegal
+				   cmap entry
+				- attempt to store into a read-only
 				   color map entry.
  				- attempt to modify the access control
 				   list from other than the local host.
@@ -333,7 +333,7 @@ are reserved in the protocol for errors and replies. */
 #define LastExtensionError	255
 
 /*****************************************************************
- * WINDOW DEFINITIONS 
+ * WINDOW DEFINITIONS
  *****************************************************************/
 
 /* Window classes used by CreateWindow */
@@ -525,7 +525,7 @@ are reserved in the protocol for errors and replies. */
 #define GCCapStyle              (1L<<6)
 #define GCJoinStyle		(1L<<7)
 #define GCFillStyle		(1L<<8)
-#define GCFillRule		(1L<<9) 
+#define GCFillRule		(1L<<9)
 #define GCTile			(1L<<10)
 #define GCStipple		(1L<<11)
 #define GCTileStipXOrigin	(1L<<12)
@@ -542,7 +542,7 @@ are reserved in the protocol for errors and replies. */
 
 #define GCLastBit		22
 /*****************************************************************
- * FONTS 
+ * FONTS
  *****************************************************************/
 
 /* used in QueryFont -- draw direction */
@@ -553,7 +553,7 @@ are reserved in the protocol for errors and replies. */
 #define FontChange		255
 
 /*****************************************************************
- *  IMAGING 
+ *  IMAGING
  *****************************************************************/
 
 /* ImageFormat -- PutImage, GetImage */
@@ -563,7 +563,7 @@ are reserved in the protocol for errors and replies. */
 #define ZPixmap			2	/* depth == drawable depth */
 
 /*****************************************************************
- *  COLOR MAP STUFF 
+ *  COLOR MAP STUFF
  *****************************************************************/
 
 /* For CreateColormap */
@@ -588,7 +588,7 @@ are reserved in the protocol for errors and replies. */
 #define TileShape		1	/* size tiled fastest */
 #define StippleShape		2	/* size stippled fastest */
 
-/***************************************************************** 
+/*****************************************************************
  * KEYBOARD/POINTER STUFF
  *****************************************************************/
 
@@ -619,7 +619,7 @@ are reserved in the protocol for errors and replies. */
 #define MappingPointer		2
 
 /*****************************************************************
- * SCREEN SAVER STUFF 
+ * SCREEN SAVER STUFF
  *****************************************************************/
 
 #define DontPreferBlanking	0
@@ -649,10 +649,10 @@ are reserved in the protocol for errors and replies. */
 
 /* for ChangeAccessControl */
 
-#define EnableAccess		1      
+#define EnableAccess		1
 #define DisableAccess		0
 
-/* Display classes  used in opening the connection 
+/* Display classes  used in opening the connection
  * Note that the statically allocated ones are even numbered and the
  * dynamically changeable ones are odd numbered */
 
diff --git a/xlib/X11/Xfuncproto.h b/xlib/X11/Xfuncproto.h
index a59379b..6d63002 100644
--- a/xlib/X11/Xfuncproto.h
+++ b/xlib/X11/Xfuncproto.h
@@ -1,14 +1,14 @@
 /* $XConsortium: Xfuncproto.h,v 1.7 91/05/13 20:49:21 rws Exp $ */
-/* 
+/*
  * Copyright 1989, 1991 by the Massachusetts Institute of Technology
  *
  * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided 
- * that the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
  * documentation, and that the name of M.I.T. not be used in advertising
- * or publicity pertaining to distribution of the software without specific, 
- * written prior permission. M.I.T. makes no representations about the 
+ * or publicity pertaining to distribution of the software without specific,
+ * written prior permission. M.I.T. makes no representations about the
  * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index 3af3682..667bdc7 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -1,14 +1,14 @@
 /* $XConsortium: Xlib.h,v 11.221 93/07/02 14:13:28 gildea Exp $ */
-/* 
+/*
  * Copyright 1985, 1986, 1987, 1991 by the Massachusetts Institute of Technology
  *
  * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided 
- * that the above copyright notice appear in all copies and that both that 
- * copyright notice and this permission notice appear in supporting 
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
  * documentation, and that the name of M.I.T. not be used in advertising
- * or publicity pertaining to distribution of the software without specific, 
- * written prior permission. M.I.T. makes no representations about the 
+ * or publicity pertaining to distribution of the software without specific,
+ * written prior permission. M.I.T. makes no representations about the
  * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
@@ -163,10 +163,10 @@ typedef struct {
 	unsigned long background;/* background pixel */
 	int line_width;		/* line width */
 	int line_style;	 	/* LineSolid, LineOnOffDash, LineDoubleDash */
-	int cap_style;	  	/* CapNotLast, CapButt, 
+	int cap_style;	  	/* CapNotLast, CapButt,
 				   CapRound, CapProjecting */
 	int join_style;	 	/* JoinMiter, JoinRound, JoinBevel */
-	int fill_style;	 	/* FillSolid, FillTiled, 
+	int fill_style;	 	/* FillSolid, FillTiled,
 				   FillStippled, FillOpaeueStippled */
 	int fill_rule;	  	/* EvenOddRule, WindingRule */
 	int arc_mode;		/* ArcChord, ArcPieSlice */
@@ -209,7 +209,7 @@ typedef struct {
 
 /*
  * Depth structure; contains information for each possible depth.
- */	
+ */
 typedef struct {
 	int depth;		/* this depth (Z) of the depth */
 	int nvisuals;		/* number of Visual types at this depth */
@@ -237,7 +237,7 @@ typedef struct {
 	unsigned long black_pixel;	/* White and Black pixel values */
 	int max_maps, min_maps;	/* max and min color maps */
 	int backing_store;	/* Never, WhenMapped, Always */
-	Bool save_unders;	
+	Bool save_unders;
 	long root_input_mask;	/* initial root input mask */
 } Screen;
 
@@ -348,7 +348,7 @@ typedef struct _XImage {
 	} f;
 } XImage;
 
-/* 
+/*
  * Data structure for XReconfigureWindow
  */
 typedef struct {
@@ -369,7 +369,7 @@ typedef struct {
 	char pad;
 } XColor;
 
-/* 
+/*
  * Data structures for graphics operations.  On most machines, these are
  * congruent with the wire protocol structures, so reformatting the data
  * can be avoided on these architectures.
@@ -381,12 +381,12 @@ typedef struct {
 typedef struct {
     short x, y;
 } XPoint;
-    
+
 typedef struct {
     short x, y;
     unsigned short width, height;
 } XRectangle;
-    
+
 typedef struct {
     short x, y;
     unsigned short width, height;
@@ -487,7 +487,7 @@ typedef struct _XDisplay {
 	struct _XExten *ext_procs; /* extensions initialized on this display */
 	/*
 	 * the following can be fixed size, as the protocol defines how
-	 * much address space is available. 
+	 * much address space is available.
 	 * While this could be done using the extension vector, there
 	 * may be MANY events processed, so a search through the extension
 	 * list to find the right procedure for each event might be
@@ -602,7 +602,7 @@ typedef struct {
 	int mode;		/* NotifyNormal, NotifyGrab, NotifyUngrab */
 	int detail;
 	/*
-	 * NotifyAncestor, NotifyVirtual, NotifyInferior, 
+	 * NotifyAncestor, NotifyVirtual, NotifyInferior,
 	 * NotifyNonlinear,NotifyNonlinearVirtual
 	 */
 	Bool same_screen;	/* same screen flag */
@@ -621,9 +621,9 @@ typedef struct {
 	int mode;		/* NotifyNormal, NotifyGrab, NotifyUngrab */
 	int detail;
 	/*
-	 * NotifyAncestor, NotifyVirtual, NotifyInferior, 
+	 * NotifyAncestor, NotifyVirtual, NotifyInferior,
 	 * NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,
-	 * NotifyPointerRoot, NotifyDetailNone 
+	 * NotifyPointerRoot, NotifyDetailNone
 	 */
 } XFocusChangeEvent;
 typedef XFocusChangeEvent XFocusInEvent;
@@ -637,7 +637,7 @@ typedef struct {
 	Display *display;	/* Display the event was read from */
 	Window window;
 	char key_vector[32];
-} XKeymapEvent;	
+} XKeymapEvent;
 
 typedef struct {
 	int type;
@@ -1124,7 +1124,7 @@ typedef struct {
 typedef unsigned long XIMFeedback;
 
 #define XIMReverse	1
-#define XIMUnderline	(1<<1) 
+#define XIMUnderline	(1<<1)
 #define XIMHighlight	(1<<2)
 #define XIMPrimary 	(1<<5)
 #define XIMSecondary	(1<<6)
@@ -1133,11 +1133,11 @@ typedef unsigned long XIMFeedback;
 typedef struct _XIMText {
     unsigned short length;
     XIMFeedback *feedback;
-    Bool encoding_is_wchar; 
+    Bool encoding_is_wchar;
     union {
 	char *multi_byte;
 	wchar_t *wide_char;
-    } string; 
+    } string;
 } XIMText;
 
 typedef struct _XIMPreeditDrawCallbackStruct {
@@ -1152,13 +1152,13 @@ typedef enum {
     XIMForwardWord, XIMBackwardWord,
     XIMCaretUp, XIMCaretDown,
     XIMNextLine, XIMPreviousLine,
-    XIMLineStart, XIMLineEnd, 
+    XIMLineStart, XIMLineEnd,
     XIMAbsolutePosition,
     XIMDontChange
 } XIMCaretDirection;
 
 typedef enum {
-    XIMIsInvisible,	/* Disable caret feedback */ 
+    XIMIsInvisible,	/* Disable caret feedback */
     XIMIsPrimary,	/* UI defined caret feedback */
     XIMIsSecondary	/* UI defined caret feedback */
 } XIMCaretStyle;
@@ -1173,7 +1173,7 @@ typedef enum {
     XIMTextType,
     XIMBitmapType
 } XIMStatusDataType;
-	
+
 typedef struct _XIMStatusDrawCallbackStruct {
     XIMStatusDataType type;
     union {
diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h
index 7348e90..58124b0 100644
--- a/xlib/X11/Xutil.h
+++ b/xlib/X11/Xutil.h
@@ -6,13 +6,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the names of Digital or MIT not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -33,7 +33,7 @@ SOFTWARE.
 #   define Region XRegion
 #endif
 
-/* 
+/*
  * Bitmask returned by XParseGeometry().  Each bit tells if the corresponding
  * value (x, y, width, height) was found in the parsed string.
  */
@@ -128,7 +128,7 @@ IconPositionHint|IconMaskHint|WindowGroupHint)
 
 
 /*
- * new structure for manipulating TEXT properties; used with WM_NAME, 
+ * new structure for manipulating TEXT properties; used with WM_NAME,
  * WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND.
  */
 typedef struct {
@@ -206,16 +206,16 @@ typedef struct _XComposeStatus {
    || ((unsigned)(keysym) == XK_Mode_switch) \
    || ((unsigned)(keysym) == XK_Num_Lock))
 /*
- * opaque reference to Region data type 
+ * opaque reference to Region data type
  */
-typedef struct _XRegion *Region; 
+typedef struct _XRegion *Region;
 
 /* Return values from XRectInRegion() */
- 
+
 #define RectangleOut 0
 #define RectangleIn  1
 #define RectanglePart 2
- 
+
 
 /*
  * Information used by the visual utility routines to find desired visual
@@ -435,7 +435,7 @@ extern Status XGetStandardColormap(
     Display*		/* display */,
     Window		/* w */,
     XStandardColormap*	/* colormap_return */,
-    Atom		/* property */			    
+    Atom		/* property */
 #endif
 );
 
@@ -460,7 +460,7 @@ extern Status XGetWMClientMachine(
 extern XWMHints *XGetWMHints(
 #if NeedFunctionPrototypes
     Display*		/* display */,
-    Window		/* w */		      
+    Window		/* w */
 #endif
 );
 
@@ -485,7 +485,7 @@ extern Status XGetWMNormalHints(
     Display*		/* display */,
     Window		/* w */,
     XSizeHints*		/* hints_return */,
-    long*		/* supplied_return */ 
+    long*		/* supplied_return */
 #endif
 );
 
@@ -591,7 +591,7 @@ extern void XSetIconSizes(
     Display*		/* display */,
     Window		/* w */,
     XIconSize*		/* size_list */,
-    int			/* count */    
+    int			/* count */
 #endif
 );
 
diff --git a/xlib/X11/keysym.h b/xlib/X11/keysym.h
index a8f1408..550b76d 100644
--- a/xlib/X11/keysym.h
+++ b/xlib/X11/keysym.h
@@ -6,13 +6,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the names of Digital or MIT not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/xlib/xgc.c b/xlib/xgc.c
index 8c04726..8975373 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -134,9 +134,9 @@ XCreateGC(
 
     InitField(function,		  GCFunction,		GXcopy);
     InitField(plane_mask,	  GCPlaneMask,		(unsigned long)(~0));
-    InitField(foreground,	  GCForeground,		
+    InitField(foreground,	  GCForeground,
 	    BlackPixelOfScreen(DefaultScreenOfDisplay(display)));
-    InitField(background,	  GCBackground,		
+    InitField(background,	  GCBackground,
 	    WhitePixelOfScreen(DefaultScreenOfDisplay(display)));
     InitField(line_width,	  GCLineWidth,		1);
     InitField(line_style,	  GCLineStyle,		LineSolid);