[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/10] sdl: pass key event source to input layer
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 08/10] sdl: pass key event source to input layer |
Date: |
Mon, 26 May 2014 09:51:24 +0200 |
So the input layer knows where the input is coming from
and input routing works correctly.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/sdl2.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 361de61..0e884f9 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -190,30 +190,33 @@ static void sdl_switch(DisplayChangeListener *dcl,
}
}
-static void reset_keys(void)
+static void reset_keys(struct sdl2_state *scon)
{
+ QemuConsole *con = scon ? scon->dcl.con : NULL;
int i;
for (i = 0; i < 256; i++) {
if (modifiers_state[i]) {
int qcode = sdl2_scancode_to_qcode[i];
- qemu_input_event_send_key_qcode(NULL, qcode, false);
+ qemu_input_event_send_key_qcode(con, qcode, false);
modifiers_state[i] = 0;
}
}
}
-static void sdl_process_key(SDL_KeyboardEvent *ev)
+static void sdl_process_key(struct sdl2_state *scon,
+ SDL_KeyboardEvent *ev)
{
int qcode = sdl2_scancode_to_qcode[ev->keysym.scancode];
+ QemuConsole *con = scon ? scon->dcl.con : NULL;
switch (ev->keysym.scancode) {
#if 0
case SDL_SCANCODE_NUMLOCKCLEAR:
case SDL_SCANCODE_CAPSLOCK:
/* SDL does not send the key up event, so we generate it */
- qemu_input_event_send_key_qcode(NULL, qcode, true);
- qemu_input_event_send_key_qcode(NULL, qcode, false);
+ qemu_input_event_send_key_qcode(con, qcode, true);
+ qemu_input_event_send_key_qcode(con, qcode, false);
return;
#endif
case SDL_SCANCODE_LCTRL:
@@ -231,7 +234,7 @@ static void sdl_process_key(SDL_KeyboardEvent *ev)
}
/* fall though */
default:
- qemu_input_event_send_key_qcode(NULL, qcode,
+ qemu_input_event_send_key_qcode(con, qcode,
ev->type == SDL_KEYDOWN);
}
}
@@ -506,7 +509,7 @@ static void handle_keydown(SDL_Event *ev)
}
}
if (!gui_keysym) {
- sdl_process_key(&ev->key);
+ sdl_process_key(scon, &ev->key);
}
}
@@ -531,13 +534,13 @@ static void handle_keyup(SDL_Event *ev)
}
/* SDL does not send back all the modifiers key, so we must
* correct it. */
- reset_keys();
+ reset_keys(scon);
return;
}
gui_keysym = 0;
}
if (!gui_keysym) {
- sdl_process_key(&ev->key);
+ sdl_process_key(scon, &ev->key);
}
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] input: add event routing and multiseat support., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 01/10] input (curses): mask keycodes to remove modifier bits, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 05/10] input: switch hid keyboard to new input layer api., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 04/10] input: keymap: add meta keys, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 09/10] usb: add input routing support for tablet and keyboard, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 02/10] input: add qemu_input_key_number_to_qcode, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 07/10] input: bind devices and input routing, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 08/10] sdl: pass key event source to input layer,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 06/10] input: switch hid mouse and tablet to the new input layer api., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 10/10] docs: add multiseat.txt, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 03/10] input: add name to input_event_key_number, Gerd Hoffmann, 2014/05/26
- Re: [Qemu-devel] [PULL 00/10] input: add event routing and multiseat support., Peter Maydell, 2014/05/28