Skip to content

Commit e0262c2

Browse files
pierreceliasnaur
authored andcommitted
io/key: add NameSpace, report it on Linux
Fixes gio#204. Signed-off-by: pierre <[email protected]>
1 parent c5fb759 commit e0262c2

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

app/internal/wm/os_js.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ func translateKey(k string) (string, bool) {
570570
case "Tab":
571571
n = key.NameTab
572572
case " ":
573-
n = "Space"
573+
n = key.NameSpace
574574
case "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12":
575575
n = k
576576
default:

app/internal/wm/os_macos.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ func convertKey(k rune) (string, bool) {
443443
case 0x09, 0x19:
444444
n = key.NameTab
445445
case 0x20:
446-
n = "Space"
446+
n = key.NameSpace
447447
default:
448448
k = unicode.ToUpper(k)
449449
if !unicode.IsPrint(k) {

app/internal/wm/os_windows.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ func convertKeyCode(code uintptr) (string, bool) {
671671
case windows.VK_TAB:
672672
r = key.NameTab
673673
case windows.VK_SPACE:
674-
r = "Space"
674+
r = key.NameSpace
675675
case windows.VK_OEM_1:
676676
r = ";"
677677
case windows.VK_OEM_PLUS:

app/internal/xkb/xkb_unix.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ func convertKeysym(s C.xkb_keysym_t) (string, bool) {
234234
if 'a' <= s && s <= 'z' {
235235
return string(rune(s - 'a' + 'A')), true
236236
}
237-
if ' ' <= s && s <= '~' {
237+
if ' ' < s && s <= '~' {
238238
return string(rune(s)), true
239239
}
240240
var n string
@@ -292,7 +292,7 @@ func convertKeysym(s C.xkb_keysym_t) (string, bool) {
292292
case C.XKB_KEY_Tab, C.XKB_KEY_KP_Tab, C.XKB_KEY_ISO_Left_Tab:
293293
n = key.NameTab
294294
case 0x20, C.XKB_KEY_KP_Space:
295-
n = "Space"
295+
n = key.NameSpace
296296
default:
297297
return "", false
298298
}

io/key/key.go

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const (
112112
NamePageUp = "⇞"
113113
NamePageDown = "⇟"
114114
NameTab = "⇥"
115+
NameSpace = "Space"
115116
)
116117

117118
// Contain reports whether m contains all modifiers

0 commit comments

Comments
 (0)