From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1tga-0000PV-A1 for qemu-devel@nongnu.org; Fri, 19 Dec 2014 04:17:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1tgR-0006AB-3n for qemu-devel@nongnu.org; Fri, 19 Dec 2014 04:17:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1tgQ-00069S-Mx for qemu-devel@nongnu.org; Fri, 19 Dec 2014 04:17:15 -0500 From: Gerd Hoffmann Date: Fri, 19 Dec 2014 10:17:05 +0100 Message-Id: <1418980626-22747-12-git-send-email-kraxel@redhat.com> In-Reply-To: <1418980626-22747-1-git-send-email-kraxel@redhat.com> References: <1418980626-22747-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 11/12] sdl2: Use correct sdl2_console for window events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori , Max Reitz From: Max Reitz 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 Signed-off-by: Gerd Hoffmann --- 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