From nobody Wed Feb 11 03:01:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151689088530977.0673022159416; Thu, 25 Jan 2018 06:34:45 -0800 (PST) Received: from localhost ([::1]:43989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeic0-0006oR-0X for importer@patchew.org; Thu, 25 Jan 2018 09:34:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeiZn-0005TZ-6L for qemu-devel@nongnu.org; Thu, 25 Jan 2018 09:32:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeiZl-0006tv-Ib for qemu-devel@nongnu.org; Thu, 25 Jan 2018 09:32:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51082) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eeiZl-0006sQ-9g for qemu-devel@nongnu.org; Thu, 25 Jan 2018 09:32:25 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9BA06A0C53 for ; Thu, 25 Jan 2018 14:32:24 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-227.ams2.redhat.com [10.36.116.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED456600CC; Thu, 25 Jan 2018 14:32:23 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 27EAD17444; Thu, 25 Jan 2018 15:32:19 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 25 Jan 2018 15:32:17 +0100 Message-Id: <20180125143218.29528-8-kraxel@redhat.com> In-Reply-To: <20180125143218.29528-1-kraxel@redhat.com> References: <20180125143218.29528-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 25 Jan 2018 14:32:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 7/8] sdl: use ctrl-alt-g as grab hotkey X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Be consistent with gtk and cocoa. Signed-off-by: Gerd Hoffmann Message-id: 20180115154855.30850-2-kraxel@redhat.com --- ui/sdl.c | 30 +++++++++++++----------------- ui/sdl2.c | 27 +++++++++++---------------- 2 files changed, 24 insertions(+), 33 deletions(-) diff --git a/ui/sdl.c b/ui/sdl.c index f26048d3a2..0017b4a912 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -323,11 +323,11 @@ static void sdl_update_caption(void) status =3D " [Stopped]"; else if (gui_grab) { if (alt_grab) - status =3D " - Press Ctrl-Alt-Shift to exit mouse grab"; + status =3D " - Press Ctrl-Alt-Shift-G to exit mouse grab"; else if (ctrl_grab) - status =3D " - Press Right-Ctrl to exit mouse grab"; + status =3D " - Press Right-Ctrl-G to exit mouse grab"; else - status =3D " - Press Ctrl-Alt to exit mouse grab"; + status =3D " - Press Ctrl-Alt-G to exit mouse grab"; } =20 if (qemu_name) { @@ -531,6 +531,16 @@ static void handle_keydown(SDL_Event *ev) toggle_full_screen(); gui_keysym =3D 1; break; + case 0x22: /* 'g' key */ + if (!gui_grab) { + if (qemu_console_is_graphic(NULL)) { + sdl_grab_start(); + } + } else if (!gui_fullscreen) { + sdl_grab_end(); + } + gui_keysym =3D 1; + break; case 0x16: /* 'u' key on US keyboard */ if (scaling_active) { scaling_active =3D 0; @@ -666,20 +676,6 @@ static void handle_keyup(SDL_Event *ev) } if (!mod_state && gui_key_modifier_pressed) { gui_key_modifier_pressed =3D 0; - if (gui_keysym =3D=3D 0) { - /* exit/enter grab if pressing Ctrl-Alt */ - if (!gui_grab) { - if (qemu_console_is_graphic(NULL)) { - sdl_grab_start(); - } - } else if (!gui_fullscreen) { - sdl_grab_end(); - } - /* SDL does not send back all the modifiers key, so we must - * correct it. */ - reset_keys(); - return; - } gui_keysym =3D 0; } if (qemu_console_is_graphic(NULL) && !gui_keysym) { diff --git a/ui/sdl2.c b/ui/sdl2.c index 89c6a2633c..1db5dd6f5f 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -141,11 +141,11 @@ static void sdl_update_caption(struct sdl2_console *s= con) status =3D " [Stopped]"; } else if (gui_grab) { if (alt_grab) { - status =3D " - Press Ctrl-Alt-Shift to exit grab"; + status =3D " - Press Ctrl-Alt-Shift-G to exit grab"; } else if (ctrl_grab) { - status =3D " - Press Right-Ctrl to exit grab"; + status =3D " - Press Right-Ctrl-G to exit grab"; } else { - status =3D " - Press Ctrl-Alt to exit grab"; + status =3D " - Press Ctrl-Alt-G to exit grab"; } } =20 @@ -364,6 +364,14 @@ static void handle_keydown(SDL_Event *ev) toggle_full_screen(scon); gui_keysym =3D 1; break; + case SDL_SCANCODE_G: + gui_keysym =3D 1; + if (!gui_grab) { + sdl_grab_start(scon); + } else if (!gui_fullscreen) { + sdl_grab_end(scon); + } + break; case SDL_SCANCODE_U: sdl2_window_destroy(scon); sdl2_window_create(scon); @@ -416,19 +424,6 @@ static void handle_keyup(SDL_Event *ev) } if (!mod_state && gui_key_modifier_pressed) { gui_key_modifier_pressed =3D 0; - if (gui_keysym =3D=3D 0) { - /* exit/enter grab if pressing Ctrl-Alt */ - if (!gui_grab) { - sdl_grab_start(scon); - } else if (!gui_fullscreen) { - sdl_grab_end(scon); - } - /* SDL does not send back all the modifiers key, so we must - * correct it. */ - sdl2_reset_keys(scon); - return; - } - sdl2_reset_keys(scon); gui_keysym =3D 0; } if (!gui_keysym) { --=20 2.9.3