From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Stefan Weil" <sw@weilnetz.de>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Bernhard Beschow" <shentey@gmail.com>
Subject: [PATCH 3/3] ui/sdl2-input: Fix AltGr modifier on Windows hosts
Date: Wed, 12 Apr 2023 22:34:25 +0200 [thread overview]
Message-ID: <20230412203425.32566-4-shentey@gmail.com> (raw)
In-Reply-To: <20230412203425.32566-1-shentey@gmail.com>
Windows generates Ctrl + Alt_R for AltGr. By removing the Ctrl modifier Linux
guests see AltGr. This fixes e.g. the '~' key on german keyboards.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
ui/sdl2-input.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c
index f068382209..a6538b56d2 100644
--- a/ui/sdl2-input.c
+++ b/ui/sdl2-input.c
@@ -39,6 +39,19 @@ void sdl2_process_key(struct sdl2_console *scon,
return;
}
qcode = qemu_input_map_usb_to_qcode[ev->keysym.scancode];
+
+#ifdef CONFIG_WIN32
+ if (qcode == Q_KEY_CODE_ALT_R &&
+ qkbd_state_modifier_get(scon->kbd, QKBD_MOD_CTRL)) {
+ /*
+ * Windows generates Ctrl + Alt_R for AltGr. By removing the Ctrl
+ * modifier (Linux) guests see AltGr.
+ */
+ trace_sdl2_process_key(ev->keysym.scancode, Q_KEY_CODE_CTRL, "up");
+ qkbd_state_key_event(scon->kbd, Q_KEY_CODE_CTRL, false);
+ }
+#endif
+
trace_sdl2_process_key(ev->keysym.scancode, qcode,
ev->type == SDL_KEYDOWN ? "down" : "up");
qkbd_state_key_event(scon->kbd, qcode, ev->type == SDL_KEYDOWN);
--
2.40.0
next prev parent reply other threads:[~2023-04-12 20:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-12 20:34 [PATCH 0/3] SDL2 usability fixes Bernhard Beschow
2023-04-12 20:34 ` [PATCH 1/3] ui/sdl2: Grab Alt+Tab also in fullscreen mode Bernhard Beschow
2023-04-12 21:12 ` Bernhard Beschow
2023-04-12 20:34 ` [PATCH 2/3] ui/sdl2: Grab Alt+F4 also under Windows Bernhard Beschow
2023-04-12 20:34 ` Bernhard Beschow [this message]
2023-04-13 17:54 ` [PATCH 0/3] SDL2 usability fixes Volker Rümelin
2023-04-13 20:43 ` Bernhard Beschow
2023-04-13 21:40 ` Volker Rümelin
2023-04-14 13:23 ` Bernhard Beschow
2023-04-14 6:53 ` Volker Rümelin
2023-04-14 13:29 ` Bernhard Beschow
2023-04-14 15:50 ` BALATON Zoltan
2023-04-14 19:09 ` Volker Rümelin
2023-04-17 19:24 ` Bernhard Beschow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230412203425.32566-4-shentey@gmail.com \
--to=shentey@gmail.com \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).