diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-10 12:20:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-08-10 12:20:26 (GMT) |
| commit | 7e666f982b42472fb5f1e0c2a5ba13795a49a072 (patch) | |
| tree | 5eb0b4caefdd9dbc80e9ba897eb00d188a37a3d2 /library/tk.tcl | |
| parent | b7a61d63d4aabbd30586eea219f7402f3da61ac6 (diff) | |
| parent | b883e880976a068be12cf29c379b97be348ea79c (diff) | |
| download | tk-7e666f982b42472fb5f1e0c2a5ba13795a49a072.zip tk-7e666f982b42472fb5f1e0c2a5ba13795a49a072.tar.gz tk-7e666f982b42472fb5f1e0c2a5ba13795a49a072.tar.bz2 | |
merge trunk
Diffstat (limited to 'library/tk.tcl')
| -rw-r--r-- | library/tk.tcl | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/library/tk.tcl b/library/tk.tcl index 8a0e3ff..fb16418 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -307,14 +307,22 @@ proc ::tk::EventMotifBindings {n1 dummy dummy} { set op add } - event $op <<Cut>> <Control-Key-w> - event $op <<Copy>> <Meta-Key-w> - event $op <<Paste>> <Control-Key-y> + event $op <<Cut>> <Control-Key-w> <Shift-Key-Delete> + event $op <<Copy>> <Meta-Key-w> <Control-Key-Insert> + event $op <<Paste>> <Control-Key-y> <Shift-Key-Insert> event $op <<Undo>> <Control-underscore> - event $op <<PrevChar>> <Control-Key-b> - event $op <<NextChar>> <Control-Key-f> - event $op <<PrevLine>> <Control-Key-p> - event $op <<NextLine>> <Control-Key-n> + 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> } #---------------------------------------------------------------------- @@ -380,12 +388,12 @@ switch -exact -- [tk windowingsystem] { event add <<PrevChar>> <Left> event add <<SelectPrevChar>> <Shift-Left> event add <<NextWord>> <Control-Right> - event add <<SelectNextWord>> <Shift-Control-Right> + event add <<SelectNextWord>> <Control-Shift-Right> event add <<PrevWord>> <Control-Left> - event add <<SelectPrevWord>> <Shift-Control-Left> - event add <<LineStart>> <Home> <Control-Key-a> <Control-Lock-Key-A> + event add <<SelectPrevWord>> <Control-Shift-Left> + event add <<LineStart>> <Home> event add <<SelectLineStart>> <Shift-Home> - event add <<LineEnd>> <End> <Control-Key-e> <Control-Lock-Key-E> + event add <<LineEnd>> <End> event add <<SelectLineEnd>> <Shift-End> event add <<PrevLine>> <Up> event add <<NextLine>> <Down> @@ -393,8 +401,8 @@ switch -exact -- [tk windowingsystem] { event add <<SelectNextLine>> <Shift-Down> event add <<PrevPara>> <Control-Up> event add <<NextPara>> <Control-Down> - event add <<SelectPrevPara>> <Shift-Control-Up> - event add <<SelectPrevPara>> <Shift-Control-Down> + event add <<SelectPrevPara>> <Control-Shift-Up> + event add <<SelectPrevPara>> <Control-Shift-Down> # Some OS's define a goofy (as in, not <Shift-Tab>) keysym that is # returned when the user presses <Shift-Tab>. In order for tab @@ -428,9 +436,9 @@ switch -exact -- [tk windowingsystem] { event add <<PrevChar>> <Left> event add <<SelectPrevChar>> <Shift-Left> event add <<NextWord>> <Control-Right> - event add <<SelectNextWord>> <Shift-Control-Right> + event add <<SelectNextWord>> <Control-Shift-Right> event add <<PrevWord>> <Control-Left> - event add <<SelectPrevWord>> <Shift-Control-Left> + event add <<SelectPrevWord>> <Control-Shift-Left> event add <<LineStart>> <Home> <Control-Key-a> <Control-Lock-Key-A> event add <<SelectLineStart>> <Shift-Home> event add <<LineEnd>> <End> <Control-Key-e> <Control-Lock-Key-E> @@ -441,8 +449,8 @@ switch -exact -- [tk windowingsystem] { event add <<SelectNextLine>> <Shift-Down> event add <<PrevPara>> <Control-Up> event add <<NextPara>> <Control-Down> - event add <<SelectPrevPara>> <Shift-Control-Up> - event add <<SelectPrevPara>> <Shift-Control-Down> + event add <<SelectPrevPara>> <Control-Shift-Up> + event add <<SelectPrevPara>> <Control-Shift-Down> } "aqua" { event add <<Cut>> <Command-Key-x> <Key-F2> <Control-Lock-Key-X> |