[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/12] sdl2: Use correct sdl2_console for window even
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 11/12] sdl2: Use correct sdl2_console for window events |
Date: |
Fri, 19 Dec 2014 10:17:05 +0100 |
From: Max Reitz <address@hidden>
SDL_PollEvent() polls events for all windows; therefore,
sdl2_poll_events() will poll the events for all windows and not only for
the one identified by the given sdl2_console.
This should be considered in handle_windowevent(): The window affected
by the event is not necessarily the one identified by the sdl2_console
object given to sdl2_poll_events(), but the one identified by
ev->window.windowID.
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/sdl2.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 64ce206..04bbcc7 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -507,8 +507,10 @@ static void handle_mousewheel(SDL_Event *ev)
qemu_input_event_sync();
}
-static void handle_windowevent(struct sdl2_console *scon, SDL_Event *ev)
+static void handle_windowevent(SDL_Event *ev)
{
+ struct sdl2_console *scon = get_scon_from_window(ev->window.windowID);
+
switch (ev->window.event) {
case SDL_WINDOWEVENT_RESIZED:
{
@@ -586,7 +588,7 @@ void sdl2_poll_events(struct sdl2_console *scon)
handle_mousewheel(ev);
break;
case SDL_WINDOWEVENT:
- handle_windowevent(scon, ev);
+ handle_windowevent(ev);
break;
default:
break;
--
1.8.3.1
- [Qemu-devel] [PULL 00/12] sdl2: fixes, cleanups and opengl preparation., Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 02/12] sdl2: rename sdl2_state to sdl2_console, move to header file, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 03/12] sdl2: move keyboard input code to new sdl2-input.c, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 10/12] sdl2: move sdl2_2d_refresh to sdl2-2d.c, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 06/12] sdl2: overhaul window size handling, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 12/12] sdl2: Work around SDL2 SDL_ShowWindow() bug, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 11/12] sdl2: Use correct sdl2_console for window events,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 09/12] sdl2: factor out sdl2_poll_events, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 05/12] sdl2: move sdl_update to new sdl2-2d.c, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 08/12] sdl2: add+use sdl2_2d_redraw function., Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 04/12] sdl2: turn on keyboard grabs, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 01/12] sdl: move version logic from source code to makefile, Gerd Hoffmann, 2014/12/19
- [Qemu-devel] [PULL 07/12] sdl2: move sdl_switch to sdl2-2d.c, Gerd Hoffmann, 2014/12/19
- Re: [Qemu-devel] [PULL 00/12] sdl2: fixes, cleanups and opengl preparation., Peter Maydell, 2014/12/22