[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/11] ui: convert key events to QKeyCodes immediatel
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 05/11] ui: convert key events to QKeyCodes immediately |
Date: |
Mon, 16 Oct 2017 15:16:38 +0200 |
From: "Daniel P. Berrange" <address@hidden>
Always use QKeyCode in the InputKeyEvent struct, by converting key
numbers to QKeyCode at the time the event is created. This allows
the code processing / consuming key events to assume QKeyCode is
used. The only place we accept a key number in the InputKeyEvent
struct is with QMP commands sent by the user.
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/input.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/ui/input.c b/ui/input.c
index 3422d4a8ef..4b241aa823 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -157,9 +157,16 @@ void qmp_input_send_event(bool has_device, const char
*device,
}
for (e = events; e != NULL; e = e->next) {
- InputEvent *event = e->value;
+ InputEvent *evt = e->value;
- qemu_input_event_send(con, event);
+ if (evt->type == INPUT_EVENT_KIND_KEY &&
+ evt->u.key.data->key->type == KEY_VALUE_KIND_NUMBER) {
+ KeyValue *key = evt->u.key.data->key;
+ QKeyCode code = qemu_input_key_number_to_qcode(key->u.qcode.data);
+ qemu_input_event_send_key_qcode(con, code, evt->u.key.data->down);
+ } else {
+ qemu_input_event_send(con, evt);
+ }
}
qemu_input_event_sync();
@@ -341,6 +348,11 @@ void qemu_input_event_send_impl(QemuConsole *src,
InputEvent *evt)
void qemu_input_event_send(QemuConsole *src, InputEvent *evt)
{
+ /* Expect all parts of QEMU to send events with QCodes exclusively.
+ * Key numbers are only supported as end-user input via QMP */
+ assert(!(evt->type == INPUT_EVENT_KIND_KEY &&
+ evt->u.key.data->key->type == KEY_VALUE_KIND_NUMBER));
+
if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) {
return;
}
@@ -400,10 +412,8 @@ void qemu_input_event_send_key(QemuConsole *src, KeyValue
*key, bool down)
void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down)
{
- KeyValue *key = g_new0(KeyValue, 1);
- key->type = KEY_VALUE_KIND_NUMBER;
- key->u.number.data = num;
- qemu_input_event_send_key(src, key, down);
+ QKeyCode code = qemu_input_key_number_to_qcode(num);
+ qemu_input_event_send_key_qcode(src, code, down);
}
void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down)
--
2.9.3
- [Qemu-devel] [PULL 00/11] Ui 20171016 patches, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 11/11] gtk: fix wrong id between texture and framebuffer, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 05/11] ui: convert key events to QKeyCodes immediately,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 01/11] build: automatically handle GIT submodule checkout for dtc, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 03/11] ui: add keycodemapdb repository as a GIT submodule, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 04/11] ui: convert common input code to keycodemapdb, Gerd Hoffmann, 2017/10/16
- [Qemu-devel] [PULL 07/11] tools: add qemu-keymap, Gerd Hoffmann, 2017/10/16