diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-06-03 06:43:38 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2022-06-03 06:43:38 -0700 |
| commit | 70e975203f366f2f30daaeb714bb852562b7b72f (patch) | |
| tree | 08f9180a22e2a836cc8a11e7d1e27f540b4467c1 /ui | |
| parent | c9641eb422905cc0804a7e310269abf09543cce8 (diff) | |
| parent | 707d93d4abc6485c638e2aecd93fbd904f2f6b3e (diff) | |
| download | qemu-70e975203f366f2f30daaeb714bb852562b7b72f.zip qemu-70e975203f366f2f30daaeb714bb852562b7b72f.tar.gz qemu-70e975203f366f2f30daaeb714bb852562b7b72f.tar.bz2 | |
Merge tag 'pull-request-2022-06-03' of https://gitlab.com/thuth/qemu into staging
* s390x storage key improvements for KVM
* Some cosmetics for s390x
* Update MAINTAINERS entries
* Improve some spots wrt memory handling in the qtests
* Clean up the "-display sdl" parameter parsing
# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmKZpQURHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbXQ1Q//TVyCnWe+kAwwMljS9tebnVwZ1C3wrH68
# KJxeeWNxIdCLMJetZa3V8lYkLuLKojELi24+qAFH+//RWoEIBFvhVlZffWL/7NHw
# KAYy8ZWHeGui29hYgAxlKFC8GSCdsGD+PJU6E0C7wN7R6UVCvPfxPk+MQXjbt/Tn
# UGgb0Ysp4MxEKk3i2t3DR49n7KniUD3ZGZimGhAWfPwe+tPP52Ijczheenv2/R4J
# ip0bc+xo2zUwa6VPBdncnZtOhyXTCNeTxsJcnxnjFVmo9scP2aFOFrV43PvLs0E7
# l2yhQKwXbqIMyaJ+/aFULuOOLL3w2fdOu6TzsMlWiRFF5UmbJjj/8V7Vq1GELupZ
# 2QU0wSJMlNPteRlHUMD0Tz8nG/r/ffYtOAoK3eZAG0tIWV/3xcTIGt0TZuV1VgzY
# M8nNhQTdweCtx5y4sbncEO6qmF5F8u8hbZ7DZCFRCKYkLkC3sv+QDiF1Ys9Iu1MM
# wy7uLcrQZ9rPZ96x1aPKgYMHtrV98yN5om6/CnFVXKvAYX+pAp2of9iTSEAWhRKi
# sDktJ39uCdkdgxnNKBQe6g0cug6mlnpoCM9PSR0zuXuTjFTVZxJBgw7p6Uyofccv
# jL8T6/uR3xQMJ/VDuo0UZLYa4bYnzCc/gJmarLiwBxhykzHAthobBwaXSsLTZ+9J
# 1DpfGpSKDDQ=
# =3Rhl
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 02 Jun 2022 11:07:01 PM PDT
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [undefined]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [undefined]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* tag 'pull-request-2022-06-03' of https://gitlab.com/thuth/qemu:
ui: Remove deprecated options "-sdl" and "-curses"
ui: Switch "-display sdl" to use the QAPI parser
ui: Remove deprecated parameters of the "-display sdl" option
tests/qtest: use g_autofree for test_server_create_chr
qtest/npcm7xx_pwm-test: Fix memory leak in mft_qom_set
MAINTAINERS: Update maintainers for Guest x86 HAXM CPUs
MAINTAINERS: Change my email address
tests/tcg: Test overflow conditions
MAINTAINERS: Update s390 vhost entries
target/s390x: kvm: Honor storage keys during emulation
hw/s390x/s390-virtio-ccw: Improve the machine description string
s390: Typo fix FLOATING_POINT_SUPPPORT_ENH
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/sdl2.c | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -40,6 +40,8 @@ static struct sdl2_console *sdl2_console; static SDL_Surface *guest_sprite_surface; static int gui_grab; /* if true, all keyboard/mouse events are grabbed */ +static bool alt_grab; +static bool ctrl_grab; static int gui_saved_grab; static int gui_fullscreen; @@ -853,6 +855,14 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o) gui_fullscreen = o->has_full_screen && o->full_screen; + if (o->u.sdl.has_grab_mod) { + if (o->u.sdl.grab_mod == HOT_KEY_MOD_LSHIFT_LCTRL_LALT) { + alt_grab = true; + } else if (o->u.sdl.grab_mod == HOT_KEY_MOD_RCTRL) { + ctrl_grab = true; + } + } + for (i = 0;; i++) { QemuConsole *con = qemu_console_lookup_by_index(i); if (!con) { |