Use <???> in stead of <key-???>, except for <1> and <2>

1 files changed, 48 insertions, 48 deletions

diff --git a/library/tk.tcl b/library/tk.tcl
index d7fae1d..fcc987d 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -306,21 +306,21 @@ proc ::tk::EventMotifBindings {n1 dummy dummy} {
 	set op add
     }
 
-    event $op <<Cut>> <Control-Key-w> <Control-Lock-Key-W> <Shift-Key-Delete>
-    event $op <<Copy>> <Meta-Key-w> <Meta-Lock-Key-W> <Control-Key-Insert>
-    event $op <<Paste>> <Control-Key-y> <Control-Lock-Key-Y> <Shift-Key-Insert>
-    event $op <<PrevChar>> <Control-Key-b> <Control-Lock-Key-B>
-    event $op <<NextChar>> <Control-Key-f> <Control-Lock-Key-F>
-    event $op <<PrevLine>> <Control-Key-p> <Control-Lock-Key-P>
-    event $op <<NextLine>> <Control-Key-n> <Control-Lock-Key-N>
-    event $op <<LineStart>> <Control-Key-a> <Control-Lock-Key-A>
-    event $op <<LineEnd>> <Control-Key-e> <Control-Lock-Key-E>
-    event $op <<SelectPrevChar>> <Control-Key-B> <Control-Lock-Key-b>
-    event $op <<SelectNextChar>> <Control-Key-F> <Control-Lock-Key-f>
-    event $op <<SelectPrevLine>> <Control-Key-P> <Control-Lock-Key-p>
-    event $op <<SelectNextLine>> <Control-Key-N> <Control-Lock-Key-n>
-    event $op <<SelectLineStart>> <Control-Key-A> <Control-Lock-Key-a>
-    event $op <<SelectLineEnd>> <Control-Key-E> <Control-Lock-Key-e>
+    event $op <<Cut>> <Control-w> <Control-Lock-W> <Shift-Delete>
+    event $op <<Copy>> <Meta-w> <Meta-Lock-W> <Control-Insert>
+    event $op <<Paste>> <Control-y> <Control-Lock-Y> <Shift-Insert>
+    event $op <<PrevChar>> <Control-b> <Control-Lock-B>
+    event $op <<NextChar>> <Control-f> <Control-Lock-F>
+    event $op <<PrevLine>> <Control-p> <Control-Lock-P>
+    event $op <<NextLine>> <Control-n> <Control-Lock-N>
+    event $op <<LineStart>> <Control-a> <Control-Lock-A>
+    event $op <<LineEnd>> <Control-e> <Control-Lock-E>
+    event $op <<SelectPrevChar>> <Control-B> <Control-Lock-b>
+    event $op <<SelectNextChar>> <Control-F> <Control-Lock-f>
+    event $op <<SelectPrevLine>> <Control-P> <Control-Lock-p>
+    event $op <<SelectNextLine>> <Control-N> <Control-Lock-n>
+    event $op <<SelectLineStart>> <Control-A> <Control-Lock-a>
+    event $op <<SelectLineEnd>> <Control-E> <Control-Lock-e>
 }
 
 #----------------------------------------------------------------------
@@ -368,18 +368,18 @@ if {![llength [info command tk_chooseDirectory]]} {
 
 switch -exact -- [tk windowingsystem] {
     "x11" {
-	event add <<Cut>>		<Control-Key-x> <Key-F20> <Control-Lock-Key-X>
-	event add <<Copy>>		<Control-Key-c> <Key-F16> <Control-Lock-Key-C>
-	event add <<Paste>>		<Control-Key-v> <Key-F18> <Control-Lock-Key-V>
+	event add <<Cut>>		<Control-x> <F20> <Control-Lock-X>
+	event add <<Copy>>		<Control-c> <F16> <Control-Lock-C>
+	event add <<Paste>>		<Control-v> <F18> <Control-Lock-V>
 	event add <<PasteSelection>>	<ButtonRelease-2>
-	event add <<Undo>>		<Control-Key-z> <Control-Lock-Key-Z>
-	event add <<Redo>>		<Control-Key-Z> <Control-Lock-Key-z>
+	event add <<Undo>>		<Control-z> <Control-Lock-Z>
+	event add <<Redo>>		<Control-Z> <Control-Lock-z>
 	event add <<ContextMenu>>	<Button-3>
 	# On Darwin/Aqua, buttons from left to right are 1,3,2.  On Darwin/X11 with recent
 	# XQuartz as the X server, they are 1,2,3; other X servers may differ.
 
-	event add <<SelectAll>>		<Control-Key-/>
-	event add <<SelectNone>>	<Control-Key-\\>
+	event add <<SelectAll>>		<Control-/>
+	event add <<SelectNone>>	<Control-\\>
 	event add <<NextChar>>		<Right>
 	event add <<SelectNextChar>>	<Shift-Right>
 	event add <<PrevChar>>		<Left>
@@ -419,16 +419,16 @@ switch -exact -- [tk windowingsystem] {
 	set ::tk::AlwaysShowSelection 1
     }
     "win32" {
-	event add <<Cut>>		<Control-Key-x> <Shift-Key-Delete> <Control-Lock-Key-X>
-	event add <<Copy>>		<Control-Key-c> <Control-Key-Insert> <Control-Lock-Key-C>
-	event add <<Paste>>		<Control-Key-v> <Shift-Key-Insert> <Control-Lock-Key-V>
+	event add <<Cut>>		<Control-x> <Shift-Delete> <Control-Lock-X>
+	event add <<Copy>>		<Control-c> <Control-Insert> <Control-Lock-C>
+	event add <<Paste>>		<Control-v> <Shift-Insert> <Control-Lock-V>
 	event add <<PasteSelection>>	<ButtonRelease-2>
-  	event add <<Undo>>		<Control-Key-z> <Control-Lock-Key-Z>
-	event add <<Redo>>		<Control-Key-y> <Control-Lock-Key-Y>
+  	event add <<Undo>>		<Control-z> <Control-Lock-Z>
+	event add <<Redo>>		<Control-y> <Control-Lock-Y>
 	event add <<ContextMenu>>	<Button-3>
 
-	event add <<SelectAll>>		<Control-Key-/> <Control-Key-a> <Control-Lock-Key-A>
-	event add <<SelectNone>>	<Control-Key-\\>
+	event add <<SelectAll>>		<Control-/> <Control-a> <Control-Lock-A>
+	event add <<SelectNone>>	<Control-\\>
 	event add <<NextChar>>		<Right>
 	event add <<SelectNextChar>>	<Shift-Right>
 	event add <<PrevChar>>		<Left>
@@ -452,36 +452,36 @@ switch -exact -- [tk windowingsystem] {
 	event add <<ToggleSelection>>	<Control-ButtonPress-1>
     }
     "aqua" {
-	event add <<Cut>>		<Command-Key-x> <Key-F2> <Command-Lock-Key-X>
-	event add <<Copy>>		<Command-Key-c> <Key-F3> <Command-Lock-Key-C>
-	event add <<Paste>>		<Command-Key-v> <Key-F4> <Command-Lock-Key-V>
+	event add <<Cut>>		<Command-x> <F2> <Command-Lock-X>
+	event add <<Copy>>		<Command-c> <F3> <Command-Lock-C>
+	event add <<Paste>>		<Command-v> <F4> <Command-Lock-V>
 	event add <<PasteSelection>>	<ButtonRelease-3>
 	event add <<Clear>>		<Clear>
 	event add <<ContextMenu>>	<Button-2>
 
 	# Official bindings
 	# See http://support.apple.com/kb/HT1343
-	event add <<SelectAll>>		<Command-Key-a>
+	event add <<SelectAll>>		<Command-a>
 	#Attach function keys not otherwise assigned to this event so they no-op - workaround for bug 0e6930dfe7
-	event add <<SelectNone>>	<Option-Command-Key-a> <Key-F5> <Key-F1> <Key-F5> <Key-F6> <Key-F7> <Key-F8> <Key-F9> <Key-F10> <Key-F11> <Key-F12>
-	event add <<Undo>>		<Command-Key-z> <Command-Lock-Key-Z>
-	event add <<Redo>>		<Shift-Command-Key-z> <Shift-Command-Lock-Key-z>
-	event add <<NextChar>>		<Right> <Control-Key-f> <Control-Lock-Key-F>
-	event add <<SelectNextChar>>	<Shift-Right> <Shift-Control-Key-F> <Shift-Control-Lock-Key-F>
-	event add <<PrevChar>>		<Left> <Control-Key-b> <Control-Lock-Key-B>
-	event add <<SelectPrevChar>>	<Shift-Left> <Shift-Control-Key-B> <Shift-Control-Lock-Key-B>
+	event add <<SelectNone>>	<Option-Command-a> <F5> <F1> <F5> <F6> <F7> <F8> <F9> <F10> <F11> <F12>
+	event add <<Undo>>		<Command-z> <Command-Lock-Z>
+	event add <<Redo>>		<Shift-Command-z> <Shift-Command-Lock-z>
+	event add <<NextChar>>		<Right> <Control-f> <Control-Lock-F>
+	event add <<SelectNextChar>>	<Shift-Right> <Shift-Control-F> <Shift-Control-Lock-F>
+	event add <<PrevChar>>		<Left> <Control-b> <Control-Lock-B>
+	event add <<SelectPrevChar>>	<Shift-Left> <Shift-Control-B> <Shift-Control-Lock-B>
 	event add <<NextWord>>		<Option-Right>
 	event add <<SelectNextWord>>	<Shift-Option-Right>
 	event add <<PrevWord>>		<Option-Left>
 	event add <<SelectPrevWord>>	<Shift-Option-Left>
-	event add <<LineStart>>		<Home> <Command-Left> <Control-Key-a> <Control-Lock-Key-A>
-	event add <<SelectLineStart>>	<Shift-Home> <Shift-Command-Left> <Shift-Control-Key-A> <Shift-Control-Lock-Key-A>
-	event add <<LineEnd>>		<End> <Command-Right> <Control-Key-e> <Control-Lock-Key-E>
-	event add <<SelectLineEnd>>	<Shift-End> <Shift-Command-Right> <Shift-Control-Key-E> <Shift-Control-Lock-Key-E>
-	event add <<PrevLine>>		<Up> <Control-Key-p> <Control-Lock-Key-P>
-	event add <<SelectPrevLine>>	<Shift-Up> <Shift-Control-Key-P> <Shift-Control-Lock-Key-P>
-	event add <<NextLine>>		<Down> <Control-Key-n> <Control-Lock-Key-N>
-	event add <<SelectNextLine>>	<Shift-Down> <Shift-Control-Key-N> <Shift-Control-Lock-Key-N>
+	event add <<LineStart>>		<Home> <Command-Left> <Control-a> <Control-Lock-A>
+	event add <<SelectLineStart>>	<Shift-Home> <Shift-Command-Left> <Shift-Control-A> <Shift-Control-Lock-A>
+	event add <<LineEnd>>		<End> <Command-Right> <Control-e> <Control-Lock-E>
+	event add <<SelectLineEnd>>	<Shift-End> <Shift-Command-Right> <Shift-Control-E> <Shift-Control-Lock-E>
+	event add <<PrevLine>>		<Up> <Control-p> <Control-Lock-P>
+	event add <<SelectPrevLine>>	<Shift-Up> <Shift-Control-P> <Shift-Control-Lock-P>
+	event add <<NextLine>>		<Down> <Control-n> <Control-Lock-N>
+	event add <<SelectNextLine>>	<Shift-Down> <Shift-Control-N> <Shift-Control-Lock-N>
 	# Not official, but logical extensions of above. Also derived from
 	# bindings present in MS Word on OSX.
 	event add <<PrevPara>>		<Option-Up>