aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-29 16:21:11 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-11-29 16:21:11 +0000
commit35c71ce5114d90004f9109b25c0dc6434d41014d (patch)
treeed5d0a7131d872bb92690156847701bba80e3ee8
parent39afbc7590886cd5df1c9b23cf33f6bdc3346209 (diff)
parent78972c737f1dfb2228c40bed355cfd01eb1103ad (diff)
downloadqemu-emu-32-release.tar.gz
Merge "Merge cherrypicks of ['android-review.googlesource.com/2851246'] into emu-32-release." into emu-32-releaseemu-32-release
-rw-r--r--android-qemu2-glue/qemu-user-event-agent-impl.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/android-qemu2-glue/qemu-user-event-agent-impl.c b/android-qemu2-glue/qemu-user-event-agent-impl.c
index 3e9ec2e7d4..add446c587 100644
--- a/android-qemu2-glue/qemu-user-event-agent-impl.c
+++ b/android-qemu2-glue/qemu-user-event-agent-impl.c
@@ -27,16 +27,6 @@
#include "ui/console.h"
#include "ui/input.h"
-static void user_event_key(unsigned code, bool down) {
- if (code == 0) {
- return;
- }
- if (VERBOSE_CHECK(keys))
- dprint(">> %s KEY [0x%03x,%s]", __func__, (code & 0x3ff), down ? "down" : " up ");
-
- goldfish_event_send(0x01, code, down);
-}
-
static void user_event_keycode(int code) {
bool down = code & 0x400;
if (VERBOSE_CHECK(keys))
@@ -69,6 +59,19 @@ static void user_event_keycodes(int* kcodes, int count) {
}
}
+static void user_event_key(unsigned code, bool down) {
+ if (code == 0) {
+ return;
+ }
+ if (VERBOSE_CHECK(keys))
+ dprint(">> %s KEY [0x%03x,%s]", __func__, (code & 0x3ff), down ? "down" : " up ");
+
+ if (down) {
+ code |= 0x400;
+ }
+ user_event_keycode(code);
+}
+
/*
* Both goldfish_events and virtio_input_multi_touch are maintained in order to
* be backward compatible. When feature Virtio is enabled, makes sure