| Message ID | 20200510184304.9267-8-vr_qemu@t-online.de |
|---|---|
| State | New |
| Headers | show |
| Series | [01/10] ui/win32-kbd-hook: handle AltGr in a hook procedure | expand |
On 5/10/20 8:43 PM, Volker Rümelin wrote: > Signed-off-by: Volker Rümelin <vr_qemu@t-online.de> > --- > ui/sdl2-input.c | 3 +++ > ui/trace-events | 3 +++ > 2 files changed, 6 insertions(+) > > diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c > index 1f9fe831b3..f068382209 100644 > --- a/ui/sdl2-input.c > +++ b/ui/sdl2-input.c > @@ -27,6 +27,7 @@ > #include "ui/console.h" > #include "ui/input.h" > #include "ui/sdl2.h" > +#include "trace.h" > > void sdl2_process_key(struct sdl2_console *scon, > SDL_KeyboardEvent *ev) > @@ -38,6 +39,8 @@ void sdl2_process_key(struct sdl2_console *scon, > return; > } > qcode = qemu_input_map_usb_to_qcode[ev->keysym.scancode]; > + trace_sdl2_process_key(ev->keysym.scancode, qcode, > + ev->type == SDL_KEYDOWN ? "down" : "up"); > qkbd_state_key_event(scon->kbd, qcode, ev->type == SDL_KEYDOWN); > > if (!qemu_console_is_graphic(con)) { > diff --git a/ui/trace-events b/ui/trace-events > index 0dcda393c1..5367fd3f16 100644 > --- a/ui/trace-events > +++ b/ui/trace-events > @@ -75,6 +75,9 @@ input_event_abs(int conidx, const char *axis, int value) "con %d, axis %s, value > input_event_sync(void) "" > input_mouse_mode(int absolute) "absolute %d" > > +# sdl2-input.c > +sdl2_process_key(int sdl_scancode, int qcode, const char *action) "translated SDL scancode %d to QKeyCode %d (%s)" > + > # spice-display.c > qemu_spice_add_memslot(int qid, uint32_t slot_id, unsigned long virt_start, unsigned long virt_end, int async) "%d %u: host virt 0x%lx - 0x%lx async=%d" > qemu_spice_del_memslot(int qid, uint32_t gid, uint32_t slot_id) "%d gid=%u sid=%u" > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c index 1f9fe831b3..f068382209 100644 --- a/ui/sdl2-input.c +++ b/ui/sdl2-input.c @@ -27,6 +27,7 @@ #include "ui/console.h" #include "ui/input.h" #include "ui/sdl2.h" +#include "trace.h" void sdl2_process_key(struct sdl2_console *scon, SDL_KeyboardEvent *ev) @@ -38,6 +39,8 @@ void sdl2_process_key(struct sdl2_console *scon, return; } qcode = qemu_input_map_usb_to_qcode[ev->keysym.scancode]; + trace_sdl2_process_key(ev->keysym.scancode, qcode, + ev->type == SDL_KEYDOWN ? "down" : "up"); qkbd_state_key_event(scon->kbd, qcode, ev->type == SDL_KEYDOWN); if (!qemu_console_is_graphic(con)) { diff --git a/ui/trace-events b/ui/trace-events index 0dcda393c1..5367fd3f16 100644 --- a/ui/trace-events +++ b/ui/trace-events @@ -75,6 +75,9 @@ input_event_abs(int conidx, const char *axis, int value) "con %d, axis %s, value input_event_sync(void) "" input_mouse_mode(int absolute) "absolute %d" +# sdl2-input.c +sdl2_process_key(int sdl_scancode, int qcode, const char *action) "translated SDL scancode %d to QKeyCode %d (%s)" + # spice-display.c qemu_spice_add_memslot(int qid, uint32_t slot_id, unsigned long virt_start, unsigned long virt_end, int async) "%d %u: host virt 0x%lx - 0x%lx async=%d" qemu_spice_del_memslot(int qid, uint32_t gid, uint32_t slot_id) "%d gid=%u sid=%u"
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de> --- ui/sdl2-input.c | 3 +++ ui/trace-events | 3 +++ 2 files changed, 6 insertions(+)