From ed8d3e8566303b8ca573252fcaeb2a4e12482b6e Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 14 Apr 2022 11:38:34 +0200 Subject: [PATCH] io/key: [API] rename tab and modifier keys, introduce NameCommand We already have precedence for word-named keys ("Space") and the new names are less obscure and matches Modifiers.String. Signed-off-by: Elias Naur --- io/key/key.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/io/key/key.go b/io/key/key.go index e22da449..7e5d1d10 100644 --- a/io/key/key.go +++ b/io/key/key.go @@ -180,12 +180,13 @@ const ( NameDeleteForward = "⌦" NamePageUp = "⇞" NamePageDown = "⇟" - NameTab = "⇥" + NameTab = "Tab" NameSpace = "Space" - NameCtrl = "⌃" - NameShift = "⇧" - NameAlt = "⎇" - NameSuper = "⊞" + NameCtrl = "Ctrl" + NameShift = "Shift" + NameAlt = "Alt" + NameSuper = "Super" + NameCommand = "⌘" NameF1 = "F1" NameF2 = "F2" NameF3 = "F3" @@ -261,19 +262,19 @@ func (e Event) String() string { func (m Modifiers) String() string { var strs []string if m.Contain(ModCtrl) { - strs = append(strs, "Ctrl") + strs = append(strs, NameCtrl) } if m.Contain(ModCommand) { - strs = append(strs, "Command") + strs = append(strs, NameCommand) } if m.Contain(ModShift) { - strs = append(strs, "Shift") + strs = append(strs, NameShift) } if m.Contain(ModAlt) { - strs = append(strs, "Alt") + strs = append(strs, NameAlt) } if m.Contain(ModSuper) { - strs = append(strs, "Super") + strs = append(strs, NameSuper) } return strings.Join(strs, "|") }