Merge trunk

11 files changed, 270 insertions, 59 deletions

diff --git a/doc/SetOptions.3 b/doc/SetOptions.3
index f5966cb..cb04655 100644
--- a/doc/SetOptions.3
+++ b/doc/SetOptions.3
@@ -434,7 +434,9 @@ suitable for passing to \fBTcl_GetIndexFromObj\fR.  The value must
 be one of the strings in the table, or a unique abbreviation of
 one of the strings.  The internal form is an integer giving the index
 into the table of the matching string, like the return value
-from \fBTcl_GetStringFromObj\fR.
+from \fBTcl_GetStringFromObj\fR.  This option type supports the
+\fBTK_OPTION_NULL_OK\fR flag; if a NULL value is set, the internal
+representation is set to -1.
 .TP
 \fBTK_OPTION_SYNONYM\fR
 This type is used to provide alternative names for an option (for
diff --git a/doc/bind.n b/doc/bind.n
index 8703425..3d5a3a4 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -70,7 +70,7 @@ event pattern may
 take one of three forms.  In the simplest case it is a single
 printing ASCII character, such as \fBa\fR or \fB[\fR.  The character
 may not be a space character or the character \fB<\fR.  This form of
-pattern matches a \fBKeyPress\fR event for the particular
+pattern matches a \fBKey\fR event for the particular
 character.  The second form of pattern is longer but more general.
 It has the following syntax:
 .CS
@@ -168,14 +168,14 @@ couple non-standard X event types that were added to better support
 the Macintosh and Windows platforms.  Below is a list of all the valid
 types; where two names appear together, they are synonyms.
 .DS
-.ta \w'\fBButtonPress, Button\0\0\0\fR'u +\w'\fBKeyPress, Key\0\0\0\fR'u
+.ta \w'\fBButton, ButtonPress\0\0\0\fR'u +\w'\fBKey, KeyPress\0\0\0\fR'u
 \fBActivate\fR	\fBDestroy\fR	\fBMap\fR
-\fBButtonPress\fR, \fBButton\fR	\fBEnter\fR	\fBMapRequest\fR
+\fBButton\fR, \fBButtonPress\fR	\fBEnter\fR	\fBMapRequest\fR
 \fBButtonRelease\fR	\fBExpose\fR	\fBMotion\fR
 \fBCirculate\fR	\fBFocusIn\fR	\fBMouseWheel\fR
 \fBCirculateRequest\fR	\fBFocusOut\fR	\fBProperty\fR
 \fBColormap\fR	\fBGravity\fR	\fBReparent\fR
-\fBConfigure\fR	\fBKeyPress\fR, \fBKey\fR	\fBResizeRequest\fR
+\fBConfigure\fR	\fBKey\fR, \fBKeyPress\fR	\fBResizeRequest\fR
 \fBConfigureRequest\fR	\fBKeyRelease\fR	\fBUnmap\fR
 \fBCreate\fR	\fBLeave\fR	\fBVisibility\fR
 \fBDeactivate\fR
@@ -209,21 +209,21 @@ the mouse wheel has moved.  The smallest value for which the
 system will report is defined by the OS. The sign of the
 value determines which direction your widget should scroll.  Positive
 values should scroll up and negative values should scroll down.
-.IP "\fBKeyPress\fR, \fBKeyRelease\fR" 5
-The \fBKeyPress\fR and \fBKeyRelease\fR events are generated
-whenever a key is pressed or released.  \fBKeyPress\fR and \fBKeyRelease\fR
+.IP "\fBKey\fR, \fBKeyRelease\fR" 5
+The \fBKey\fR and \fBKeyRelease\fR events are generated
+whenever a key is pressed or released.  \fBKey\fR and \fBKeyRelease\fR
 events are sent to the window which currently has the keyboard focus.
-.IP "\fBButtonPress\fR, \fBButtonRelease\fR, \fBMotion\fR" 5
-The \fBButtonPress\fR and \fBButtonRelease\fR events
+.IP "\fBButton\fR, \fBButtonRelease\fR, \fBMotion\fR" 5
+The \fBButton\fR and \fBButtonRelease\fR events
 are generated when the user presses or releases a mouse button.
 \fBMotion\fR events are generated whenever the pointer is moved.
-\fBButtonPress\fR, \fBButtonRelease\fR, and \fBMotion\fR events are
+\fBButton\fR, \fBButtonRelease\fR, and \fBMotion\fR events are
 normally sent to the window containing the pointer.
 .RS
 .PP
 When a mouse button is pressed, the window containing the pointer
 automatically obtains a temporary pointer grab.
-Subsequent \fBButtonPress\fR, \fBButtonRelease\fR, and \fBMotion\fR
+Subsequent \fBButton\fR, \fBButtonRelease\fR, and \fBMotion\fR
 events will be sent to that window,
 regardless of which window contains the pointer,
 until all buttons have been released.
@@ -351,7 +351,7 @@ position in the stacking order.
 .SS "EVENT DETAILS"
 .PP
 The last part of a long event specification is \fIdetail\fR.  In the
-case of a \fBButtonPress\fR or \fBButtonRelease\fR event, it is the
+case of a \fBButton\fR or \fBButtonRelease\fR event, it is the
 number of a button (1\-9).  If a button number is given, then only an
 event on that particular button will match;  if no button number is
 given, then an event on any button will match.  Note:  giving a
@@ -360,10 +360,10 @@ in the first case, it refers to a button being pressed or released,
 while in the second it refers to some other button that is already
 depressed when the matching event occurs.  If a button
 number is given then \fItype\fR may be omitted:  if will default
-to \fBButtonPress\fR.  For example, the specifier \fB<1>\fR
-is equivalent to \fB<ButtonPress\-1>\fR.
+to \fBButton\fR.  For example, the specifier \fB<1>\fR
+is equivalent to \fB<Button\-1>\fR.
 .PP
-If the event type is \fBKeyPress\fR or \fBKeyRelease\fR, then
+If the event type is \fBKey\fR or \fBKeyRelease\fR, then
 \fIdetail\fR may be specified in the form of an X keysym.  Keysyms
 are textual specifications for particular keys on the keyboard;
 they include all the alphanumeric ASCII characters (e.g.
@@ -383,9 +383,9 @@ system.
 If necessary, you can use the \fB%K\fR notation described below
 to print out the keysym name for a particular key.
 If a keysym \fIdetail\fR is given, then the
-\fItype\fR field may be omitted;  it will default to \fBKeyPress\fR.
+\fItype\fR field may be omitted;  it will default to \fBKey\fR.
 For example, \fB<Control\-comma>\fR is equivalent to
-\fB<Control\-KeyPress\-comma>\fR.
+\fB<Control\-Key\-comma>\fR.
 .SH "BINDING SCRIPTS AND SUBSTITUTIONS"
 .PP
 The \fIscript\fR argument to \fBbind\fR is a Tcl script, called the
@@ -421,7 +421,7 @@ in the stacking order, or \fB0\fR if the receiving window is at the
 bottom.
 .IP \fB%b\fR 5
 The number of the button that was pressed or released.  Valid only
-for \fBButtonPress\fR and \fBButtonRelease\fR events.
+for \fBButton\fR and \fBButtonRelease\fR events.
 .IP \fB%c\fR 5
 The \fIcount\fR field from the event.  Valid only for \fBExpose\fR events.
 Indicates that there are \fIcount\fR pending \fBExpose\fR events which have not
@@ -468,7 +468,7 @@ Indicates the new or requested height of the window.
 The \fIwindow\fR field from the event, represented as a hexadecimal
 integer.  Valid for all event types.
 .IP \fB%k\fR 5
-The \fIkeycode\fR field from the event.  Valid only for \fBKeyPress\fR
+The \fIkeycode\fR field from the event.  Valid only for \fBKey\fR
 and \fBKeyRelease\fR events.
 .IP \fB%m\fR 5
 The \fImode\fR field from the event.  The substituted string is one of
@@ -483,8 +483,8 @@ The \fIplace\fR field from the event, substituted as one of the
 strings \fBPlaceOnTop\fR or \fBPlaceOnBottom\fR.  Valid only
 for \fBCirculate\fR and \fBCirculateRequest\fR events.
 .IP \fB%s\fR 5
-The \fIstate\fR field from the event.  For \fBButtonPress\fR,
-\fBButtonRelease\fR, \fBEnter\fR, \fBKeyPress\fR, \fBKeyRelease\fR,
+The \fIstate\fR field from the event.  For \fBButton\fR,
+\fBButtonRelease\fR, \fBEnter\fR, \fBKey\fR, \fBKeyRelease\fR,
 \fBLeave\fR, and \fBMotion\fR events, a decimal string
 is substituted.  For \fBVisibility\fR, one of the strings
 \fBVisibilityUnobscured\fR, \fBVisibilityPartiallyObscured\fR,
@@ -506,8 +506,8 @@ Valid only for
 \fBResizeRequest\fR, and \fBExpose\fR events.
 .IP "\fB%x\fR, \fB%y\fR" 5
 The \fIx\fR and \fIy\fR fields from the event.
-For \fBButtonPress\fR, \fBButtonRelease\fR, \fBMotion\fR,
-\fBKeyPress\fR, \fBKeyRelease\fR, and \fBMouseWheel\fR events,
+For \fBButton\fR, \fBButtonRelease\fR, \fBMotion\fR,
+\fBKey\fR, \fBKeyRelease\fR, and \fBMouseWheel\fR events,
 \fB%x\fR and \fB%y\fR indicate the position of the mouse pointer
 relative to the receiving window.
 For \fBEnter\fR and \fBLeave\fR events, the position where the
@@ -520,7 +520,7 @@ the empty string if the event does not correspond to a UNICODE character
 (e.g. the shift key was pressed). \fBXmbLookupString\fR (or
 \fBXLookupString\fR when input method support is turned off) does all
 the work of translating from the event to a UNICODE character.
-Valid only for \fBKeyPress\fR and \fBKeyRelease\fR events.
+Valid only for \fBKey\fR and \fBKeyRelease\fR events.
 .IP \fB%B\fR 5
 The \fIborder_width\fR field from the event.  Valid only for
 \fBConfigure\fR, \fBConfigureRequest\fR, and \fBCreate\fR events.
@@ -538,13 +538,13 @@ event, \fB1\fR indicates that it is a
 event generated by \fBSendEvent\fR.
 .IP \fB%K\fR 5
 The keysym corresponding to the event, substituted as a textual
-string.  Valid only for \fBKeyPress\fR and \fBKeyRelease\fR events.
+string.  Valid only for \fBKey\fR and \fBKeyRelease\fR events.
 .IP \fB%M\fR 5
 The number of script-based binding patterns matched so far for the
 event.  Valid for all event types.
 .IP \fB%N\fR 5
 The keysym corresponding to the event, substituted as a decimal
-number.  Valid only for \fBKeyPress\fR and \fBKeyRelease\fR events.
+number.  Valid only for \fBKey\fR and \fBKeyRelease\fR events.
 .IP \fB%P\fR 5
 The name of the property being updated or deleted (which
 may be converted to an XAtom using \fBwinfo atom\fR.) Valid
@@ -566,7 +566,7 @@ The \fIx_root\fR and  \fIy_root\fR fields from the event.
 If a virtual-root window manager is being used then the substituted
 values are the corresponding x-coordinate and y-coordinate in the virtual root.
 Valid only for
-\fBButtonPress\fR, \fBButtonRelease\fR, \fBEnter\fR, \fBKeyPress\fR,
+\fBButton\fR, \fBButtonRelease\fR, \fBEnter\fR, \fBKey\fR,
 \fBKeyRelease\fR, \fBLeave\fR and \fBMotion\fR events.
 Same meaning as \fB%x\fR and \fB%y\fR, except relative to the (virtual) root
 window.
@@ -679,17 +679,17 @@ When a \fIsequence\fR specified in a \fBbind\fR command contains
 more than one event pattern, then its script is executed whenever
 the recent events (leading up to and including the current event)
 match the given sequence.  This means, for example, that if button 1 is
-clicked repeatedly the sequence \fB<Double\-ButtonPress\-1>\fR will match
+clicked repeatedly the sequence \fB<Double\-Button\-1>\fR will match
 each button press but the first.
 If extraneous events that would prevent a match occur in the middle
 of an event sequence then the extraneous events are
-ignored unless they are \fBKeyPress\fR or \fBButtonPress\fR events.
-For example, \fB<Double\-ButtonPress\-1>\fR will match a sequence of
+ignored unless they are \fBKey\fR or \fBButton\fR events.
+For example, \fB<Double\-Button\-1>\fR will match a sequence of
 presses of button 1, even though there will be \fBButtonRelease\fR
 events (and possibly \fBMotion\fR events) between the
-\fBButtonPress\fR events.
-Furthermore, a \fBKeyPress\fR event may be preceded by any number
-of other \fBKeyPress\fR events for modifier keys without the
+\fBButton\fR events.
+Furthermore, a \fBKey\fR event may be preceded by any number
+of other \fBKey\fR events for modifier keys without the
 modifier keys preventing a match.
 For example, the event sequence \fBaB\fR will match a press of the
 \fBa\fR key, a release of the \fBa\fR key, a press of the \fBShift\fR
diff --git a/doc/canvas.n b/doc/canvas.n
index 8f98ff9..623154f 100644
--- a/doc/canvas.n
+++ b/doc/canvas.n
@@ -470,7 +470,7 @@ defined for \fItagOrId\fR.
 .PP
 The only events for which bindings may be specified are those related to
 the mouse and keyboard (such as \fBEnter\fR, \fBLeave\fR,
-\fBButtonPress\fR, \fBMotion\fR, and \fBKeyPress\fR) or virtual events.
+\fBButton\fR, \fBMotion\fR, and \fBKey\fR) or virtual events.
 The handling of events in canvases uses the current item defined in
 \fBITEM IDS AND TAGS\fR above. \fBEnter\fR and \fBLeave\fR events
 trigger for an
@@ -771,7 +771,8 @@ This command returns an empty string.
 \fIpathName \fBmoveto \fItagOrId xPos yPos\fR
 .
 Move the items given by \fItagOrId\fR in the canvas coordinate
-space so that the first coordinate pair of the bottommost item with
+space so that the first coordinate pair (the upper-left corner of the
+bounding box) of the first item (the lowest in the display list) with
 tag \fItagOrId\fR is located at
 position (\fIxPos\fR,\fIyPos\fR). \fIxPos\fR and \fIyPos\fR may be
 the empty string, in which case the corresponding coordinate
@@ -1590,6 +1591,12 @@ ends of the line.
 \fBlast\fR (for an arrowhead at the last point of the line), or
 \fBboth\fR (for arrowheads at both ends).
 This option defaults to \fBnone\fR.
+When requested to draw an arrowhead, Tk internally adjusts the corresponding
+line end point so that the rendered line ends at the neck of the arrowhead
+rather than at its tip so that the line doesn't extend past the edge of the
+arrowhead. This may trigger a \fBLeave\fR event if the mouse is hovering this
+line end. Conversely, when removing an arrowhead Tk adjusts the corresponding
+line point the other way round, which may trigger an \fBEnter\fR event.
 .TP
 \fB\-arrowshape \fIshape\fR
 This option indicates how to draw arrowheads.
diff --git a/doc/event.n b/doc/event.n
index 3e084d7..f4eb426 100644
--- a/doc/event.n
+++ b/doc/event.n
@@ -100,7 +100,7 @@ Corresponds to the \fB%B\fR substitution for binding scripts.
 .TP
 \fB\-button\fI number\fR
 \fINumber\fR must be an integer;  it specifies the \fIdetail\fR field
-for a \fBButtonPress\fR or \fBButtonRelease\fR event, overriding
+for a \fBButton\fR or \fBButtonRelease\fR event, overriding
 any button  number provided in the base \fIevent\fR argument.
 Corresponds to the \fB%b\fR substitution for binding scripts.
 .TP
@@ -155,7 +155,7 @@ Corresponds to the \fB%h\fR substitution for binding scripts.
 \fB\-keycode\fI number\fR
 \fINumber\fR  must be an integer;  it specifies the \fIkeycode\fR
 field for the event.
-Valid for \fBKeyPress\fR and \fBKeyRelease\fR events.
+Valid for \fBKey\fR and \fBKeyRelease\fR events.
 Corresponds to the \fB%k\fR substitution for binding scripts.
 .TP
 \fB\-keysym\fI name\fR
@@ -163,7 +163,7 @@ Corresponds to the \fB%k\fR substitution for binding scripts.
 \fBspace\fR, or \fBReturn\fR;  its corresponding
 keycode value is used as the \fIkeycode\fR field for event, overriding
 any detail specified in the base \fIevent\fR argument.
-Valid for \fBKeyPress\fR and \fBKeyRelease\fR events.
+Valid for \fBKey\fR and \fBKeyRelease\fR events.
 Corresponds to the \fB%K\fR substitution for binding scripts.
 .TP
 \fB\-mode\fI notify\fR
@@ -189,7 +189,7 @@ Corresponds to the \fB%p\fR substitution for binding scripts.
 \fB\-root\fI window\fR
 \fIWindow\fR must be either a window path name or an integer window
 identifier;  it specifies the \fIroot\fR field for the event.
-Valid for \fBKeyPress\fR, \fBKeyRelease\fR, \fBButtonPress\fR,
+Valid for \fBKey\fR, \fBKeyRelease\fR, \fBButton\fR,
 \fBButtonRelease\fR, \fBEnter\fR, \fBLeave\fR, and \fBMotion\fR
 events.
 Corresponds to the \fB%R\fR substitution for binding scripts.
@@ -197,14 +197,14 @@ Corresponds to the \fB%R\fR substitution for binding scripts.
 \fB\-rootx\fI coord\fR
 \fICoord\fR must be a screen distance;  it specifies the \fIx_root\fR
 field for the event.
-Valid for \fBKeyPress\fR, \fBKeyRelease\fR, \fBButtonPress\fR,
+Valid for \fBKey\fR, \fBKeyRelease\fR, \fBButton\fR,
 \fBButtonRelease\fR, \fBEnter\fR, \fBLeave\fR, and \fBMotion\fR
 events.  Corresponds to the \fB%X\fR substitution for binding scripts.
 .TP
 \fB\-rooty\fI coord\fR
 \fICoord\fR must be a screen distance;  it specifies the \fIy_root\fR
 field for the event.
-Valid for \fBKeyPress\fR, \fBKeyRelease\fR, \fBButtonPress\fR,
+Valid for \fBKey\fR, \fBKeyRelease\fR, \fBButton\fR,
 \fBButtonRelease\fR, \fBEnter\fR, \fBLeave\fR, and \fBMotion\fR
 events.
 Corresponds to the \fB%Y\fR substitution for binding scripts.
@@ -221,7 +221,7 @@ Corresponds to the \fB%#\fR substitution for binding scripts.
 .TP
 \fB\-state\fI state\fR
 \fIState\fR specifies the \fIstate\fR field for the event.
-For \fBKeyPress\fR, \fBKeyRelease\fR, \fBButtonPress\fR,
+For \fBKey\fR, \fBKeyRelease\fR, \fBButtons\fR,
 \fBButtonRelease\fR, \fBEnter\fR, \fBLeave\fR, and \fBMotion\fR events
 it must be an integer value.
 For \fBVisibility\fR events it must be one of \fBVisibilityUnobscured\fR,
@@ -233,7 +233,7 @@ Corresponds to the \fB%s\fR substitution for binding scripts.
 \fB\-subwindow\fI window\fR
 \fIWindow\fR specifies the \fIsubwindow\fR field for the event, either
 as a path name for a Tk widget or as an integer window identifier.
-Valid for \fBKeyPress\fR, \fBKeyRelease\fR, \fBButtonPress\fR,
+Valid for \fBKey\fR, \fBKeyRelease\fR, \fBButton\fR,
 \fBButtonRelease\fR, \fBEnter\fR, \fBLeave\fR, and \fBMotion\fR events.
 Similar to \fB%S\fR substitution for binding scripts.
 .TP
@@ -241,7 +241,7 @@ Similar to \fB%S\fR substitution for binding scripts.
 \fIInteger\fR must be an integer value;  it specifies the \fItime\fR field
 for the event. Additonally the special value \fBcurrent\fR is allowed,
 this value will be substituted by the current event time.
-Valid for \fBKeyPress\fR, \fBKeyRelease\fR, \fBButtonPress\fR,
+Valid for \fBKey\fR, \fBKeyRelease\fR, \fBButton\fR,
 \fBButtonRelease\fR, \fBEnter\fR, \fBLeave\fR, \fBMotion\fR,
 and \fBProperty\fR events.
 Corresponds to the \fB%t\fR substitution for binding scripts.
@@ -249,7 +249,7 @@ Corresponds to the \fB%t\fR substitution for binding scripts.
 \fB\-warp\fI boolean\fR
 \fIboolean\fR must be a boolean value;  it specifies whether
 the screen pointer should be warped as well.
-Valid for \fBKeyPress\fR, \fBKeyRelease\fR, \fBButtonPress\fR,
+Valid for \fBKey\fR, \fBKeyRelease\fR, \fBButton\fR,
 \fBButtonRelease\fR, and \fBMotion\fR events.  The pointer will
 only warp to a window if it is mapped.
 .TP
@@ -282,7 +282,7 @@ be processed in order but at the front of the queue.
 \fB\-x\fI coord\fR
 \fICoord\fR must be a screen distance;  it specifies the \fIx\fR field
 for the event.
-Valid for \fBKeyPress\fR, \fBKeyRelease\fR, \fBButtonPress\fR,
+Valid for \fBKey\fR, \fBKeyRelease\fR, \fBButton\fR,
 \fBButtonRelease\fR, \fBMotion\fR, \fBEnter\fR, \fBLeave\fR,
 \fBExpose\fR, \fBConfigure\fR, \fBGravity\fR, and \fBReparent\fR
 events.
@@ -294,7 +294,7 @@ for binding scripts.
 \fB\-y\fI coord\fR
 \fICoord\fR must be a screen distance;  it specifies the \fIy\fR
 field for the event.
-Valid for \fBKeyPress\fR, \fBKeyRelease\fR, \fBButtonPress\fR,
+Valid for \fBKey\fR, \fBKeyRelease\fR, \fBButton\fR,
 \fBButtonRelease\fR, \fBMotion\fR, \fBEnter\fR, \fBLeave\fR,
 \fBExpose\fR, \fBConfigure\fR, \fBGravity\fR, and \fBReparent\fR
 events.
diff --git a/doc/keysyms.n b/doc/keysyms.n
index 02e7e8e..cc985a3 100644
--- a/doc/keysyms.n
+++ b/doc/keysyms.n
@@ -1328,6 +1328,55 @@ braille_dot_8                    65528     0xFFF8
 braille_dot_9                    65529     0xFFF9
 braille_dot_10                   65530     0xFFFA
 Delete                           65535     0xFFFF
+SunFA_Grave                  268828416     0x1005FF00
+SunFA_Circum                 268828417     0x1005FF01
+SunFA_Tilde                  268828418     0x1005FF02
+SunFA_Acute                  268828419     0x1005FF03
+SunFA_Diaeresis              268828420     0x1005FF04
+SunFA_Cedilla                268828421     0x1005FF05
+SunF36                       268828432     0x1005FF10
+SunF37                       268828433     0x1005FF11
+SunSys_Req                   268828512     0x1005FF60
+SunProps                     268828528     0x1005FF70
+SunFront                     268828529     0x1005FF71
+SunCopy                      268828530     0x1005FF72
+SunOpen                      268828531     0x1005FF73
+SunPaste                     268828532     0x1005FF74
+SunCut                       268828533     0x1005FF75
+SunPowerSwitch               268828534     0x1005FF76
+SunAudioLowerVolume          268828535     0x1005FF77
+SunAudioMute                 268828536     0x1005FF78
+SunAudioRaiseVolume          268828537     0x1005FF79
+SunVideoDegauss              268828538     0x1005FF7A
+SunVideoLowerBrightness      268828539     0x1005FF7B
+SunVideoRaiseBrightness      268828540     0x1005FF7C
+SunPowerSwitchShift          268828541     0x1005FF7D
+XF86Switch_VT_1              269024769     0x1008FE01
+XF86Switch_VT_2              269024770     0x1008FE02
+XF86Switch_VT_3              269024771     0x1008FE03
+XF86Switch_VT_4              269024772     0x1008FE04
+XF86Switch_VT_5              269024773     0x1008FE05
+XF86Switch_VT_6              269024774     0x1008FE06
+XF86Switch_VT_7              269024775     0x1008FE07
+XF86Switch_VT_8              269024776     0x1008FE08
+XF86Switch_VT_9              269024777     0x1008FE09
+XF86Switch_VT_10             269024778     0x1008FE0A
+XF86Switch_VT_11             269024779     0x1008FE0B
+XF86Switch_VT_12             269024780     0x1008FE0C
+XF86Ungrab                   269024800     0x1008FE20
+XF86ClearGrab                269024801     0x1008FE21
+XF86Next_VMode               269024802     0x1008FE22
+XF86Prev_VMode               269024803     0x1008FE23
+XF86LogWindowTree            269024804     0x1008FE24
+XF86LogGrabInfo              269024805     0x1008FE25
+XF86ModeLock                 269025025     0x1008FF01
+XF86MonBrightnessUp          269025026     0x1008FF02
+XF86MonBrightnessDown        269025027     0x1008FF03
+XF86KbdLightOnOff            269025028     0x1008FF04
+XF86KbdBrightnessUp          269025029     0x1008FF05
+XF86KbdBrightnessDown        269025030     0x1008FF06
+XF86MonBrightnessCycle       269025031     0x1008FF07
+XF86Standby                  269025040     0x1008FF10
 XF86AudioLowerVolume         269025041     0x1008FF11
 XF86AudioMute                269025042     0x1008FF12
 XF86AudioRaiseVolume         269025043     0x1008FF13
@@ -1335,6 +1384,156 @@ XF86AudioPlay                269025044     0x1008FF14
 XF86AudioStop                269025045     0x1008FF15
 XF86AudioPrev                269025046     0x1008FF16
 XF86AudioNext                269025047     0x1008FF17
+XF86HomePage                 269025048     0x1008FF18
+XF86Mail                     269025049     0x1008FF19
+XF86Start                    269025050     0x1008FF1A
+XF86Search                   269025051     0x1008FF1B
+XF86AudioRecord              269025052     0x1008FF1C
+XF86Calculator               269025053     0x1008FF1D
+XF86Memo                     269025054     0x1008FF1E
+XF86ToDoList                 269025055     0x1008FF1F
+XF86Calendar                 269025056     0x1008FF20
+XF86PowerDown                269025057     0x1008FF21
+XF86ContrastAdjust           269025058     0x1008FF22
+XF86RockerUp                 269025059     0x1008FF23
+XF86RockerDown               269025060     0x1008FF24
+XF86RockerEnter              269025061     0x1008FF25
+XF86Back                     269025062     0x1008FF26
+XF86Forward                  269025063     0x1008FF27
+XF86Stop                     269025064     0x1008FF28
+XF86Refresh                  269025065     0x1008FF29
+XF86PowerOff                 269025066     0x1008FF2A
+XF86WakeUp                   269025067     0x1008FF2B
+XF86Eject                    269025068     0x1008FF2C
+XF86ScreenSaver              269025069     0x1008FF2D
+XF86WWW                      269025070     0x1008FF2E
+XF86Sleep                    269025071     0x1008FF2F
+XF86Favorites                269025072     0x1008FF30
+XF86AudioPause               269025073     0x1008FF31
+XF86AudioMedia               269025074     0x1008FF32
+XF86MyComputer               269025075     0x1008FF33
+XF86VendorHome               269025076     0x1008FF34
+XF86LightBulb                269025077     0x1008FF35
+XF86Shop                     269025078     0x1008FF36
+XF86History                  269025079     0x1008FF37
+XF86OpenURL                  269025080     0x1008FF38
+XF86AddFavorite              269025081     0x1008FF39
+XF86HotLinks                 269025082     0x1008FF3A
+XF86BrightnessAdjust         269025083     0x1008FF3B
+XF86Finance                  269025084     0x1008FF3C
+XF86Community                269025085     0x1008FF3D
+XF86AudioRewind              269025086     0x1008FF3E
+XF86BackForward              269025087     0x1008FF3F
+XF86Launch0                  269025088     0x1008FF40
+XF86Launch1                  269025089     0x1008FF41
+XF86Launch2                  269025090     0x1008FF42
+XF86Launch3                  269025091     0x1008FF43
+XF86Launch4                  269025092     0x1008FF44
+XF86Launch5                  269025093     0x1008FF45
+XF86Launch6                  269025094     0x1008FF46
+XF86Launch7                  269025095     0x1008FF47
+XF86Launch8                  269025096     0x1008FF48
+XF86Launch9                  269025097     0x1008FF49
+XF86LaunchA                  269025098     0x1008FF4A
+XF86LaunchB                  269025099     0x1008FF4B
+XF86LaunchC                  269025100     0x1008FF4C
+XF86LaunchD                  269025101     0x1008FF4D
+XF86LaunchE                  269025102     0x1008FF4E
+XF86LaunchF                  269025103     0x1008FF4F
+XF86ApplicationLeft          269025104     0x1008FF50
+XF86ApplicationRight         269025105     0x1008FF51
+XF86Book                     269025106     0x1008FF52
+XF86CD                       269025107     0x1008FF53
+XF86Calculater               269025108     0x1008FF54
+XF86Clear                    269025109     0x1008FF55
+XF86Close                    269025110     0x1008FF56
+XF86Copy                     269025111     0x1008FF57
+XF86Cut                      269025112     0x1008FF58
+XF86Display                  269025113     0x1008FF59
+XF86DOS                      269025114     0x1008FF5A
+XF86Documents                269025115     0x1008FF5B
+XF86Excel                    269025116     0x1008FF5C
+XF86Explorer                 269025117     0x1008FF5D
+XF86Game                     269025118     0x1008FF5E
+XF86Go                       269025119     0x1008FF5F
+XF86iTouch                   269025120     0x1008FF60
+XF86LogOff                   269025121     0x1008FF61
+XF86Market                   269025122     0x1008FF62
+XF86Meeting                  269025123     0x1008FF63
+XF86MenuKB                   269025125     0x1008FF65
+XF86MenuPB                   269025126     0x1008FF66
+XF86MySites                  269025127     0x1008FF67
+XF86New                      269025128     0x1008FF68
+XF86News                     269025129     0x1008FF69
+XF86OfficeHome               269025130     0x1008FF6A
+XF86Open                     269025131     0x1008FF6B
+XF86Option                   269025132     0x1008FF6C
+XF86Paste                    269025133     0x1008FF6D
+XF86Phone                    269025134     0x1008FF6E
+XF86Q                        269025136     0x1008FF70
+XF86Reply                    269025138     0x1008FF72
+XF86Reload                   269025139     0x1008FF73
+XF86RotateWindows            269025140     0x1008FF74
+XF86RotationPB               269025141     0x1008FF75
+XF86RotationKB               269025142     0x1008FF76
+XF86Save                     269025143     0x1008FF77
+XF86ScrollUp                 269025144     0x1008FF78
+XF86ScrollDown               269025145     0x1008FF79
+XF86ScrollClick              269025146     0x1008FF7A
+XF86Send                     269025147     0x1008FF7B
+XF86Spell                    269025148     0x1008FF7C
+XF86SplitScreen              269025149     0x1008FF7D
+XF86Support                  269025150     0x1008FF7E
+XF86TaskPane                 269025151     0x1008FF7F
+XF86Terminal                 269025152     0x1008FF80
+XF86Tools                    269025153     0x1008FF81
+XF86Travel                   269025154     0x1008FF82
+XF86UserPB                   269025156     0x1008FF84
+XF86User1KB                  269025157     0x1008FF85
+XF86User2KB                  269025158     0x1008FF86
+XF86Video                    269025159     0x1008FF87
+XF86WheelButton              269025160     0x1008FF88
+XF86Word                     269025161     0x1008FF89
+XF86Xfer                     269025162     0x1008FF8A
+XF86ZoomIn                   269025163     0x1008FF8B
+XF86ZoomOut                  269025164     0x1008FF8C
+XF86Away                     269025165     0x1008FF8D
+XF86Messenger                269025166     0x1008FF8E
+XF86WebCam                   269025167     0x1008FF8F
+XF86MailForward              269025168     0x1008FF90
+XF86Pictures                 269025169     0x1008FF91
+XF86Music                    269025170     0x1008FF92
+XF86Battery                  269025171     0x1008FF93
+XF86Bluetooth                269025172     0x1008FF94
+XF86WLAN                     269025173     0x1008FF95
+XF86UWB                      269025174     0x1008FF96
+XF86AudioForward             269025175     0x1008FF97
+XF86AudioRepeat              269025176     0x1008FF98
+XF86AudioRandomPlay          269025177     0x1008FF99
+XF86Subtitle                 269025178     0x1008FF9A
+XF86AudioCycleTrack          269025179     0x1008FF9B
+XF86CycleAngle               269025180     0x1008FF9C
+XF86FrameBack                269025181     0x1008FF9D
+XF86FrameForward             269025182     0x1008FF9E
+XF86Time                     269025183     0x1008FF9F
+XF86Select                   269025184     0x1008FFA0
+XF86View                     269025185     0x1008FFA1
+XF86TopMenu                  269025186     0x1008FFA2
+XF86Red                      269025187     0x1008FFA3
+XF86Green                    269025188     0x1008FFA4
+XF86Yellow                   269025189     0x1008FFA5
+XF86Blue                     269025190     0x1008FFA6
+XF86Suspend                  269025191     0x1008FFA7
+XF86Hibernate                269025192     0x1008FFA8
+XF86TouchpadToggle           269025193     0x1008FFA9
+XF86TouchpadOn               269025200     0x1008FFB0
+XF86TouchpadOff              269025201     0x1008FFB1
+XF86AudioMicMute             269025202     0x1008FFB2
+XF86Keyboard                 269025203     0x1008FFB3
+XF86WWAN                     269025204     0x1008FFB4
+XF86RFKill                   269025205     0x1008FFB5
+XF86AudioPreset              269025206     0x1008FFB6
+XF86RotationLockToggle       269025207     0x1008FFB7
 .CE
 .SH "SEE ALSO"
 bind(n), event(n)
diff --git a/doc/popup.n b/doc/popup.n
index 6e6fd95..9543750 100644
--- a/doc/popup.n
+++ b/doc/popup.n
@@ -38,7 +38,7 @@ $m add command \-label "Example 2" \-command bell
 pack [label .l \-text "Click me!"]
 
 # Arrange for the menu to pop up when the label is clicked
-bind .l <1> {\fBtk_popup\fR .popupMenu %X %Y}
+bind .l <Button-1> {\fBtk_popup\fR .popupMenu %X %Y}
 .CE
 .SH "SEE ALSO"
 bind(n), menu(n), tk_optionMenu(n)
diff --git a/doc/text.n b/doc/text.n
index c4128a1..61929e6 100644
--- a/doc/text.n
+++ b/doc/text.n
@@ -1733,8 +1733,8 @@ all the sequences for which bindings have been defined for \fItagName\fR.
 .RS
 .PP
 The only events for which bindings may be specified are those related to the
-mouse and keyboard (such as \fBEnter\fR, \fBLeave\fR, \fBButtonPress\fR,
-\fBMotion\fR, and \fBKeyPress\fR) or virtual events. Event bindings for a text
+mouse and keyboard (such as \fBEnter\fR, \fBLeave\fR, \fBButton\fR,
+\fBMotion\fR, and \fBKey\fR) or virtual events. Event bindings for a text
 widget use the \fBcurrent\fR mark described under \fBMARKS\fR above. An
 \fBEnter\fR event triggers for a tag when the tag first becomes present on the
 current character, and a \fBLeave\fR event triggers for a tag when it ceases
diff --git a/doc/tk4.0.ps b/doc/tk4.0.ps
index 5b71d92..5b0b675 100644
--- a/doc/tk4.0.ps
+++ b/doc/tk4.0.ps
@@ -1384,7 +1384,7 @@ V
 3 F
 ( takes precedence over a binding on) 270.54 567.89 T
 5 F
-(<KeyPress>.) 416.24 567.89 T
+(<Key>.) 416.24 567.89 T
 3 F
 -0.26 (The mechanism for con\337ict resolution is similar in Tk 4.0 except that one binding can) 170.1 555.89 P
 -0.35 (trigger for) 152.1 543.78 P
@@ -1578,7 +1578,7 @@ V
 (tion of them. If you wish for a binding not to trigger when a modi\336er is present, you can) 152.1 596.33 T
 (just de\336ne an empty binding for that modi\336er combination. For example,) 152.1 584.33 T
 5 9 Q
-(bind .b <Control-ButtonPress-1> {# this script is a no-op}) 179.1 570 T
+(bind .b <Control-Button-1> {# this script is a no-op}) 179.1 570 T
 3 10 Q
 (creates a binding that will trigger on mouse button presses when the) 152.1 556.33 T
 5 F
@@ -1587,7 +1587,7 @@ V
 ( key is) 468.34 556.33 T
 -0.22 (down. If there is also a) 152.1 544.33 P
 5 F
--0.52 (<ButtonPress-1>) 244.35 544.33 P
+-0.52 (<Button-1>) 244.35 544.33 P
 3 F
 -0.22 ( binding for) 334.3 544.33 P
 5 F
diff --git a/doc/ttk_intro.n b/doc/ttk_intro.n
index 07e071b..3b399ee 100644
--- a/doc/ttk_intro.n
+++ b/doc/ttk_intro.n
@@ -60,7 +60,7 @@ For example, the \fBtext\fR element
 (which displays a text string) has
 \fB\-text\fR, \fB\-font\fR, \fB\-foreground\fR, \fB\-background\fR,
 \fB\-underline\fR, and \fB\-width\fR options.
-The value of an element option is taken from:
+The value of an element option is taken from (in precedence order):
 .IP \(bu
 an option of the same name and type in the widget containing the element;
 .IP \(bu
@@ -121,7 +121,7 @@ widget are:
 .CS
 bind TButton <Enter>		{ %W state active }
 bind TButton <Leave>		{ %W state !active }
-bind TButton <ButtonPress-1>	{ %W state pressed }
+bind TButton <Button-1>		{ %W state pressed }
 bind TButton <Button1-Leave>	{ %W state !pressed }
 bind TButton <Button1-Enter>	{ %W state pressed }
 bind TButton <ButtonRelease-1>	\e
diff --git a/doc/ttk_treeview.n b/doc/ttk_treeview.n
index 2deb5b5..bcd995b 100644
--- a/doc/ttk_treeview.n
+++ b/doc/ttk_treeview.n
@@ -351,9 +351,9 @@ binding scripts for each of the item's \fB\-tags\fR are evaluated
 in order as per \fIbindtags(n)\fR.
 .RS
 .PP
-\fB<KeyPress>\fR, \fB<KeyRelease>\fR, and virtual events
+\fB<Key>\fR, \fB<KeyRelease>\fR, and virtual events
 are sent to the focus item.
-\fB<ButtonPress>\fR, \fB<ButtonRelease>\fR, and \fB<Motion>\fR events
+\fB<Button>\fR, \fB<ButtonRelease>\fR, and \fB<Motion>\fR events
 are sent to the item under the mouse pointer.
 No other event types are supported.
 .PP
diff --git a/doc/ttk_widget.n b/doc/ttk_widget.n
index 2dca269..73affdd 100644
--- a/doc/ttk_widget.n
+++ b/doc/ttk_widget.n
@@ -80,6 +80,9 @@ See also \fB\-justify\fR (for widgets supporting this option).
 .OP \-compound compound Compound
 Specifies how to display the image relative to the text,
 in the case both \fB\-text\fR and \fB\-image\fR are present.
+If set to the empty string (the default), the rules described in the
+"Elements" section of \fIttk::intro(n)\fR explain which value is actually
+used.
 Valid values are:
 .RS
 .IP text
@@ -94,7 +97,7 @@ Display text centered on top of image.
 .IP right
 Display image above, below, left of, or right of the text, respectively.
 .IP none
-The default; display the image if present, otherwise the text.
+Display the image if present, otherwise the text.
 .RE
 .OP \-font font Font
 Font to use for the text displayed by the widget.