joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-05 17:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

io/key: switch Event.Name to be a string and add function keys

Browse Source 
Function keys don't have a natural rune representation so switch
Event.Name to be a string to fit "F1"-"F12".

Fixes gio#59

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-11-08 19:00:43 +01:00
parent c833c98fd7
commit cc43588aba
8 changed files with 169 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/internal/window/os_macos.go
+29 -5
View File
@@ -289,14 +289,14 @@ func Main() {
C.gio_main(view, title, C.CGFloat(w), C.CGFloat(h))
}
func convertKey(k rune) (rune, bool) {
func convertKey(k rune) (string, bool) {
if '0' <= k && k <= '9' || 'A' <= k && k <= 'Z' {
return k, true
return string(k), true
}
if 'a' <= k && k <= 'z' {
return k - 0x20, true
return string(k - 0x20), true
}
var n rune
var n string
switch k {
case 0x1b:
n = key.NameEscape
@@ -322,8 +322,32 @@ func convertKey(k rune) (rune, bool) {
n = key.NamePageUp
case C.NSPageDownFunctionKey:
n = key.NamePageDown
case C.NSF1FunctionKey:
n = "F1"
case C.NSF2FunctionKey:
n = "F2"
case C.NSF3FunctionKey:
n = "F3"
case C.NSF4FunctionKey:
n = "F4"
case C.NSF5FunctionKey:
n = "F5"
case C.NSF6FunctionKey:
n = "F6"
case C.NSF7FunctionKey:
n = "F7"
case C.NSF8FunctionKey:
n = "F8"
case C.NSF9FunctionKey:
n = "F9"
case C.NSF10FunctionKey:
n = "F10"
case C.NSF11FunctionKey:
n = "F11"
case C.NSF12FunctionKey:
n = "F12"
default:
return 0, false
return "", false
}
return n, true
}