From nobody Mon Oct 27 18:35:01 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521640378194256.41701857269993; Wed, 21 Mar 2018 06:52:58 -0700 (PDT) Received: from localhost ([::1]:55249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eyeAf-00084o-Di for importer@patchew.org; Wed, 21 Mar 2018 09:52:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eye8e-0006x8-0X for qemu-devel@nongnu.org; Wed, 21 Mar 2018 09:50:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eye8b-0007sf-4B for qemu-devel@nongnu.org; Wed, 21 Mar 2018 09:50:48 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:45252 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eye8a-0007rx-Uu for qemu-devel@nongnu.org; Wed, 21 Mar 2018 09:50:45 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 71B46406E8A4; Wed, 21 Mar 2018 13:50:43 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 237CB2166BAE; Wed, 21 Mar 2018 13:50:43 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 470C599AD6; Wed, 21 Mar 2018 14:50:41 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 21 Mar 2018 14:50:36 +0100 Message-Id: <20180321135041.15768-2-kraxel@redhat.com> In-Reply-To: <20180321135041.15768-1-kraxel@redhat.com> References: <20180321135041.15768-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 21 Mar 2018 13:50:43 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 21 Mar 2018 13:50:43 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/5] ui: add ctrl modifier support to kbd_put_qcode_console() 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" Signed-off-by: Gerd Hoffmann --- include/ui/console.h | 2 +- ui/console.c | 15 +++++++++++++-- ui/gtk.c | 4 ++-- ui/sdl2-input.c | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index 6d2c052068..37a8d68d29 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -99,7 +99,7 @@ void hmp_mouse_set(Monitor *mon, const QDict *qdict); #define QEMU_KEY_CTRL_PAGEDOWN 0xe407 =20 void kbd_put_keysym_console(QemuConsole *s, int keysym); -bool kbd_put_qcode_console(QemuConsole *s, int qcode); +bool kbd_put_qcode_console(QemuConsole *s, int qcode, bool ctrl); void kbd_put_string_console(QemuConsole *s, const char *str, int len); void kbd_put_keysym(int keysym); =20 diff --git a/ui/console.c b/ui/console.c index 530a491987..3fb2f4e09f 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1191,11 +1191,22 @@ static const int qcode_to_keysym[Q_KEY_CODE__MAX] = =3D { [Q_KEY_CODE_BACKSPACE] =3D QEMU_KEY_BACKSPACE, }; =20 -bool kbd_put_qcode_console(QemuConsole *s, int qcode) +static const int ctrl_qcode_to_keysym[Q_KEY_CODE__MAX] =3D { + [Q_KEY_CODE_UP] =3D QEMU_KEY_CTRL_UP, + [Q_KEY_CODE_DOWN] =3D QEMU_KEY_CTRL_DOWN, + [Q_KEY_CODE_RIGHT] =3D QEMU_KEY_CTRL_RIGHT, + [Q_KEY_CODE_LEFT] =3D QEMU_KEY_CTRL_LEFT, + [Q_KEY_CODE_HOME] =3D QEMU_KEY_CTRL_HOME, + [Q_KEY_CODE_END] =3D QEMU_KEY_CTRL_END, + [Q_KEY_CODE_PGUP] =3D QEMU_KEY_CTRL_PAGEUP, + [Q_KEY_CODE_PGDN] =3D QEMU_KEY_CTRL_PAGEDOWN, +}; + +bool kbd_put_qcode_console(QemuConsole *s, int qcode, bool ctrl) { int keysym; =20 - keysym =3D qcode_to_keysym[qcode]; + keysym =3D ctrl ? ctrl_qcode_to_keysym[qcode] : qcode_to_keysym[qcode]; if (keysym =3D=3D 0) { return false; } diff --git a/ui/gtk.c b/ui/gtk.c index ef5bc42094..e98ac4d2fc 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1197,12 +1197,12 @@ static gboolean gd_text_key_down(GtkWidget *widget, QemuConsole *con =3D vc->gfx.dcl.con; =20 if (key->keyval =3D=3D GDK_KEY_Delete) { - kbd_put_qcode_console(con, Q_KEY_CODE_DELETE); + kbd_put_qcode_console(con, Q_KEY_CODE_DELETE, false); } else if (key->length) { kbd_put_string_console(con, key->string, key->length); } else { int qcode =3D gd_map_keycode(key->hardware_keycode); - kbd_put_qcode_console(con, qcode); + kbd_put_qcode_console(con, qcode, false); } return TRUE; } diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c index 605d781971..35d35c14c4 100644 --- a/ui/sdl2-input.c +++ b/ui/sdl2-input.c @@ -70,7 +70,7 @@ void sdl2_process_key(struct sdl2_console *scon, kbd_put_keysym_console(con, QEMU_KEY_BACKSPACE); break; default: - kbd_put_qcode_console(con, qcode); + kbd_put_qcode_console(con, qcode, false); break; } } --=20 2.9.3