[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/10] ui: sdl2: Release grab before opening console
From: |
Cole Robinson |
Subject: |
[Qemu-devel] [PATCH 02/10] ui: sdl2: Release grab before opening console window |
Date: |
Fri, 6 May 2016 14:03:06 -0400 |
sdl 2.0.4 currently has a bug which causes our UI shortcuts to fire
rapidly in succession:
https://bugzilla.libsdl.org/show_bug.cgi?id=3287
It's a toss up whether ctrl+alt+f or ctrl+alt+2 will fire an
odd or even number of times, thus determining whether the action
succeeds or fails.
Opening monitor/serial windows is doubly broken, since it will often
lock the UI trying to grab the pointer:
0x00007fffef3720a5 in SDL_Delay_REAL () at /lib64/libSDL2-2.0.so.0
0x00007fffef3688ba in X11_SetWindowGrab () at /lib64/libSDL2-2.0.so.0
0x00007fffef2f2da7 in SDL_SendWindowEvent () at /lib64/libSDL2-2.0.so.0
0x00007fffef2f080b in SDL_SetKeyboardFocus () at /lib64/libSDL2-2.0.so.0
0x00007fffef35d784 in X11_DispatchFocusIn.isra.8 () at /lib64/libSDL2-2.0.so.0
0x00007fffef35dbce in X11_DispatchEvent () at /lib64/libSDL2-2.0.so.0
0x00007fffef35ee4a in X11_PumpEvents () at /lib64/libSDL2-2.0.so.0
0x00007fffef2eea6a in SDL_PumpEvents_REAL () at /lib64/libSDL2-2.0.so.0
0x00007fffef2eeab5 in SDL_WaitEventTimeout_REAL () at /lib64/libSDL2-2.0.so.0
0x000055555597eed0 in sdl2_poll_events (scon=0x55555876f928) at ui/sdl2.c:593
We can work around that hang by ungrabbing the pointer before launching
a new window. This roughly matches what our sdl1 code does
Signed-off-by: Cole Robinson <address@hidden>
---
ui/sdl2.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ui/sdl2.c b/ui/sdl2.c
index d042442..909038f 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -357,6 +357,10 @@ static void handle_keydown(SDL_Event *ev)
case SDL_SCANCODE_7:
case SDL_SCANCODE_8:
case SDL_SCANCODE_9:
+ if (gui_grab) {
+ sdl_grab_end(scon);
+ }
+
win = ev->key.keysym.scancode - SDL_SCANCODE_1;
if (win < sdl2_num_outputs) {
sdl2_console[win].hidden = !sdl2_console[win].hidden;
--
2.7.4
- [Qemu-devel] [PATCH 00/10] ui: gtk and sdl2 fixes, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 01/10] ui: gtk: fix crash when terminal inner-border is NULL, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 05/10] configure: add echo_version helper, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 02/10] ui: sdl2: Release grab before opening console window,
Cole Robinson <=
- [Qemu-devel] [PATCH 07/10] configure: report SDL version, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 06/10] configure: report GTK version, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 10/10] ui: gtk: Fix some deprecation warnings, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 03/10] configure: build SDL if only SDL2 available, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 08/10] configure: support vte-2.91, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 04/10] configure: error on unknown --with-sdlabi value, Cole Robinson, 2016/05/06
- [Qemu-devel] [PATCH 09/10] ui: gtk: Fix a runtime warning on vte >= 0.37, Cole Robinson, 2016/05/06