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

app,io/key: introduce keys for directional navigation

Browse Source 
This change adds key.NameUp/Down/Left/Right and maps the Android TV
remote directional keys to them. As a side-effect a key.InputOp can
now receive directional keys (and block their focus movement).

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2022-04-14 17:26:57 +02:00
parent d37197f45b
commit ad7c1eb78d
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/os_android.go
+11 -15
View File
@@ -867,8 +867,6 @@ func (w *window) draw(env *C.JNIEnv, sync bool) {
}
}
type keyMapper func(devId, keyCode C.int32_t) rune
func runInJVM(jvm *C.JavaVM, f func(env *C.JNIEnv)) {
if jvm == nil {
panic("nil JVM")
@@ -908,6 +906,14 @@ func convertKeyCode(code C.jint) (string, bool) {
n = key.NameAlt
case C.AKEYCODE_META_LEFT, C.AKEYCODE_META_RIGHT:
n = key.NameSuper
case C.AKEYCODE_DPAD_UP:
n = key.NameUp
case C.AKEYCODE_DPAD_DOWN:
n = key.NameDown
case C.AKEYCODE_DPAD_LEFT:
n = key.NameLeft
case C.AKEYCODE_DPAD_RIGHT:
n = key.NameRight
default:
return "", false
}
@@ -917,19 +923,9 @@ func convertKeyCode(code C.jint) (string, bool) {
//export Java_org_gioui_GioView_onKeyEvent
func Java_org_gioui_GioView_onKeyEvent(env *C.JNIEnv, class C.jclass, handle C.jlong, keyCode, r C.jint, pressed C.jboolean, t C.jlong) {
w := cgo.Handle(handle).Value().(*window)
if pressed == C.JNI_TRUE {
switch keyCode {
case C.AKEYCODE_DPAD_UP:
w.callbacks.MoveFocus(router.FocusUp)
case C.AKEYCODE_DPAD_DOWN:
w.callbacks.MoveFocus(router.FocusDown)
case C.AKEYCODE_DPAD_LEFT:
w.callbacks.MoveFocus(router.FocusLeft)
case C.AKEYCODE_DPAD_RIGHT:
w.callbacks.MoveFocus(router.FocusRight)
case C.AKEYCODE_DPAD_CENTER:
w.callbacks.ClickFocus()
}
if pressed == C.JNI_TRUE && keyCode == C.AKEYCODE_DPAD_CENTER {
w.callbacks.ClickFocus()
return
}
if n, ok := convertKeyCode(keyCode); ok {
state := key.Release