From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eDxxp-0001dk-O8 for qemu-devel@nongnu.org; Sun, 12 Nov 2017 14:30:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eDxxo-0008En-V2 for qemu-devel@nongnu.org; Sun, 12 Nov 2017 14:30:41 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:53368) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eDxxo-0008EO-OU for qemu-devel@nongnu.org; Sun, 12 Nov 2017 14:30:40 -0500 Received: by mail-wm0-x242.google.com with SMTP id g141so11281239wmg.2 for ; Sun, 12 Nov 2017 11:30:40 -0800 (PST) From: Jindrich Makovicka Date: Sun, 12 Nov 2017 20:30:28 +0100 Message-Id: <20171112193032.9724-5-makovick@gmail.com> In-Reply-To: <20171112193032.9724-1-makovick@gmail.com> References: <903d8048-77e9-4a30-d8e1-56ccd8b6a6bc@amsat.org> <20171112193032.9724-1-makovick@gmail.com> Subject: [Qemu-devel] [PATCH 4/8] sdl2: Do not hide the cursor on auxilliary windows List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers , Gerd Hoffmann , Cole Robinson Cc: Jindrich Makovicka Signed-off-by: Jindrich Makovicka --- ui/sdl2.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ui/sdl2.c b/ui/sdl2.c index 9cf4b1772b..677c22282d 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -465,6 +465,10 @@ static void handle_mousemotion(SDL_Event *ev) int max_x, max_y; struct sdl2_console *scon = get_scon_from_window(ev->key.windowID); + if (!qemu_console_is_graphic(scon->dcl.con)) { + return; + } + if (qemu_input_is_absolute() || absolute_enabled) { int scr_w, scr_h; SDL_GetWindowSize(scon->real_window, &scr_w, &scr_h); @@ -492,6 +496,10 @@ static void handle_mousebutton(SDL_Event *ev) SDL_MouseButtonEvent *bev; struct sdl2_console *scon = get_scon_from_window(ev->key.windowID); + if (!qemu_console_is_graphic(scon->dcl.con)) { + return; + } + bev = &ev->button; if (!gui_grab && !qemu_input_is_absolute()) { if (ev->type == SDL_MOUSEBUTTONUP && bev->button == SDL_BUTTON_LEFT) { @@ -514,6 +522,10 @@ static void handle_mousewheel(SDL_Event *ev) SDL_MouseWheelEvent *wev = &ev->wheel; InputButton btn; + if (!qemu_console_is_graphic(scon->dcl.con)) { + return; + } + if (wev->y > 0) { btn = INPUT_BUTTON_WHEEL_UP; } else if (wev->y < 0) { @@ -655,6 +667,11 @@ static void sdl_mouse_warp(DisplayChangeListener *dcl, int x, int y, int on) { struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl); + + if (!qemu_console_is_graphic(scon->dcl.con)) { + return; + } + if (on) { if (!guest_cursor) { sdl_show_cursor(); -- 2.15.0