diff options
| -rw-r--r-- | doc/bind.n | 2 | ||||
| -rw-r--r-- | generic/tkBind.c | 1 | ||||
| -rw-r--r-- | library/console.tcl | 4 | ||||
| -rw-r--r-- | library/entry.tcl | 4 | ||||
| -rw-r--r-- | library/spinbox.tcl | 4 | ||||
| -rw-r--r-- | library/text.tcl | 4 | ||||
| -rw-r--r-- | library/ttk/entry.tcl | 4 |
7 files changed, 12 insertions, 11 deletions
@@ -106,7 +106,7 @@ Modifiers consist of any of the following values: .ta 6c \fBControl\fR \fBMod1\fR, \fBM1\fR, \fBCommand\fR \fBAlt\fR \fBMod2\fR, \fBM2\fR, \fBOption\fR -\fBShift\fR \fBMod3\fR, \fBM3\fR +\fBShift\fR \fBMod3\fR, \fBM3\fR, \fBFunction\fR \fBLock\fR \fBMod4\fR, \fBM4\fR \fBExtended\fR \fBMod5\fR, \fBM5\fR \fBButton1\fR, \fBB1\fR \fBMeta\fR, \fBM\fR diff --git a/generic/tkBind.c b/generic/tkBind.c index 9f3016f..d5c12d4 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -474,6 +474,7 @@ static const ModInfo modArray[] = { {"Mod3", Mod3Mask, 0}, {"M3", Mod3Mask, 0}, {"Mod4", Mod4Mask, 0}, + {"Fn", Mod4Mask, 0}, {"M4", Mod4Mask, 0}, {"Mod5", Mod5Mask, 0}, {"M5", Mod5Mask, 0}, diff --git a/library/console.tcl b/library/console.tcl index 980b2a1..5b35f52 100644 --- a/library/console.tcl +++ b/library/console.tcl @@ -424,7 +424,7 @@ proc ::tk::ConsoleBind {w} { # gets and overhaul of how it handles input -- hobbs bind Console <Control-t> {} - # Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound. + # Ignore all Alt, Meta, Control, and Fn keypresses unless explicitly bound. # Otherwise, if a widget binding for one of these is defined, the # <Keypress> class binding will also fire and insert the character # which is wrong. @@ -432,7 +432,7 @@ proc ::tk::ConsoleBind {w} { bind Console <Alt-Key> {# nothing } bind Console <Meta-Key> {# nothing} bind Console <Control-Key> {# nothing} - bind Console <Mod4-Key> {# nothing} + bind Console <Fn-Key> {# nothing} foreach {ev key} { <<Console_NextImmediate>> <Control-n> diff --git a/library/entry.tcl b/library/entry.tcl index 2576317..980cf5f 100644 --- a/library/entry.tcl +++ b/library/entry.tcl @@ -196,7 +196,7 @@ bind Entry <Key> { tk::EntryInsert %W %A } -# Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound. +# Ignore all Alt, Meta, Control, and Fn keypresses unless explicitly bound. # Otherwise, if a widget binding for one of these is defined, the # <Key> class binding will also fire and insert the character, # which is wrong. Ditto for Escape, Return, and Tab. @@ -211,7 +211,7 @@ bind Entry <Tab> {# nothing} bind Entry <Prior> {# nothing} bind Entry <Next> {# nothing} bind Entry <Command-Key> {# nothing} -bind Entry <Mod4-Key> {# nothing} +bind Entry <Fn-Key> {# nothing} # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663] bind Entry <<NextLine>> {# nothing} bind Entry <<PrevLine>> {# nothing} diff --git a/library/spinbox.tcl b/library/spinbox.tcl index 8d516bc..fada802 100644 --- a/library/spinbox.tcl +++ b/library/spinbox.tcl @@ -205,7 +205,7 @@ bind Spinbox <Key> { ::tk::EntryInsert %W %A } -# Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound. +# Ignore all Alt, Meta, Control, and Fn keypresses unless explicitly bound. # Otherwise, if a widget binding for one of these is defined, the # <Key> class binding will also fire and insert the character, # which is wrong. Ditto for Escape, Return, and Tab. @@ -220,7 +220,7 @@ bind Spinbox <Tab> {# nothing} bind Spinbox <Prior> {# nothing} bind Spinbox <Next> {# nothing} bind Spinbox <Command-Key> {# nothing} -bind Spinbox <Mod4-Key> {# nothing} +bind Spinbox <Fn-Key> {# nothing} # On Windows, paste is done using Shift-Insert. Shift-Insert already # generates the <<Paste>> event, so we don't need to do anything here. diff --git a/library/text.tcl b/library/text.tcl index 92446a5..cb288ab 100644 --- a/library/text.tcl +++ b/library/text.tcl @@ -298,7 +298,7 @@ bind Text <Key> { tk::TextInsert %W %A } -# Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound. +# Ignore all Alt, Meta, Control, and Fn keypresses unless explicitly bound. # Otherwise, if a widget binding for one of these is defined, the # <Key> class binding will also fire and insert the character, # which is wrong. Ditto for <Escape>. @@ -309,7 +309,7 @@ bind Text <Control-Key> {# nothing} bind Text <Escape> {# nothing} bind Text <KP_Enter> {# nothing} bind Text <Command-Key> {# nothing} -bind Text <Mod4-Key> {# nothing} +bind Text <Fn-Key> {# nothing} # Additional emacs-like bindings: diff --git a/library/ttk/entry.tcl b/library/ttk/entry.tcl index cf41315..42360af 100644 --- a/library/ttk/entry.tcl +++ b/library/ttk/entry.tcl @@ -119,7 +119,7 @@ bind TEntry <Key> { ttk::entry::Insert %W %A } bind TEntry <Delete> { ttk::entry::Delete %W } bind TEntry <BackSpace> { ttk::entry::Backspace %W } -# Ignore all Alt, Meta, Control, and Mod4 keypresses unless explicitly bound. +# Ignore all Alt, Meta, Control, and Fn keypresses unless explicitly bound. # Otherwise, the <Key> class binding will fire and insert the character. # Ditto for Escape, Return, and Tab. # @@ -131,7 +131,7 @@ bind TEntry <Return> {# nothing} bind TEntry <KP_Enter> {# nothing} bind TEntry <Tab> {# nothing} bind TEntry <Command-Key> {# nothing} -bind TEntry <Mod4-Key> {# nothing} +bind TEntry <Fn-Key> {# nothing} # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663] bind TEntry <<PrevLine>> {# nothing} |