joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 09:55:40 +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_windows.go
+41 -4
View File
@@ -112,6 +112,19 @@ const (
_VK_RETURN = 0x0d
_VK_UP = 0x26
_VK_F1 = 0x70
_VK_F2 = 0x71
_VK_F3 = 0x72
_VK_F4 = 0x73
_VK_F5 = 0x74
_VK_F6 = 0x75
_VK_F7 = 0x76
_VK_F8 = 0x77
_VK_F9 = 0x78
_VK_F10 = 0x79
_VK_F11 = 0x7A
_VK_F12 = 0x7B
_UNICODE_NOCHAR = 65535
_WM_CANCELMODE = 0x001F
@@ -457,11 +470,11 @@ func (w *window) HWND() (syscall.Handle, int, int) {
return w.hwnd, w.width, w.height
}
func convertKeyCode(code uintptr) (rune, bool) {
func convertKeyCode(code uintptr) (string, bool) {
if '0' <= code && code <= '9' || 'A' <= code && code <= 'Z' {
return rune(code), true
return string(code), true
}
var r rune
var r string
switch code {
case _VK_ESCAPE:
r = key.NameEscape
@@ -487,8 +500,32 @@ func convertKeyCode(code uintptr) (rune, bool) {
r = key.NamePageUp
case _VK_NEXT:
r = key.NamePageDown
case _VK_F1:
r = "F1"
case _VK_F2:
r = "F2"
case _VK_F3:
r = "F3"
case _VK_F4:
r = "F4"
case _VK_F5:
r = "F5"
case _VK_F6:
r = "F6"
case _VK_F7:
r = "F7"
case _VK_F8:
r = "F8"
case _VK_F9:
r = "F9"
case _VK_F10:
r = "F10"
case _VK_F11:
r = "F11"
case _VK_F12:
r = "F12"
default:
return 0, false
return "", false
}
return r, true
}