forked from joejulian/gio
io/key: add NameSpace, report it on Linux
Fixes gio#204. Signed-off-by: pierre <pierre.curto@gmail.com>
This commit is contained in:
@@ -570,7 +570,7 @@ func translateKey(k string) (string, bool) {
|
||||
case "Tab":
|
||||
n = key.NameTab
|
||||
case " ":
|
||||
n = "Space"
|
||||
n = key.NameSpace
|
||||
case "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12":
|
||||
n = k
|
||||
default:
|
||||
|
||||
@@ -443,7 +443,7 @@ func convertKey(k rune) (string, bool) {
|
||||
case 0x09, 0x19:
|
||||
n = key.NameTab
|
||||
case 0x20:
|
||||
n = "Space"
|
||||
n = key.NameSpace
|
||||
default:
|
||||
k = unicode.ToUpper(k)
|
||||
if !unicode.IsPrint(k) {
|
||||
|
||||
@@ -671,7 +671,7 @@ func convertKeyCode(code uintptr) (string, bool) {
|
||||
case windows.VK_TAB:
|
||||
r = key.NameTab
|
||||
case windows.VK_SPACE:
|
||||
r = "Space"
|
||||
r = key.NameSpace
|
||||
case windows.VK_OEM_1:
|
||||
r = ";"
|
||||
case windows.VK_OEM_PLUS:
|
||||
|
||||
@@ -234,7 +234,7 @@ func convertKeysym(s C.xkb_keysym_t) (string, bool) {
|
||||
if 'a' <= s && s <= 'z' {
|
||||
return string(rune(s - 'a' + 'A')), true
|
||||
}
|
||||
if ' ' <= s && s <= '~' {
|
||||
if ' ' < s && s <= '~' {
|
||||
return string(rune(s)), true
|
||||
}
|
||||
var n string
|
||||
@@ -292,7 +292,7 @@ func convertKeysym(s C.xkb_keysym_t) (string, bool) {
|
||||
case C.XKB_KEY_Tab, C.XKB_KEY_KP_Tab, C.XKB_KEY_ISO_Left_Tab:
|
||||
n = key.NameTab
|
||||
case 0x20, C.XKB_KEY_KP_Space:
|
||||
n = "Space"
|
||||
n = key.NameSpace
|
||||
default:
|
||||
return "", false
|
||||
}
|
||||
|
||||
@@ -112,6 +112,7 @@ const (
|
||||
NamePageUp = "⇞"
|
||||
NamePageDown = "⇟"
|
||||
NameTab = "⇥"
|
||||
NameSpace = "Space"
|
||||
)
|
||||
|
||||
// Contain reports whether m contains all modifiers
|
||||
|
||||
Reference in New Issue
Block a user