From patchwork Fri May 6 18:03:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 67304 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp449960qge; Fri, 6 May 2016 11:10:05 -0700 (PDT) X-Received: by 10.28.144.11 with SMTP id s11mr10466039wmd.72.1462558205044; Fri, 06 May 2016 11:10:05 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id wn2si19814918wjc.72.2016.05.06.11.10.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 06 May 2016 11:10:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:59621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aykCB-0007gp-LR for patch@linaro.org; Fri, 06 May 2016 14:09:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayk7F-00072G-MU for qemu-devel@nongnu.org; Fri, 06 May 2016 14:04:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ayk73-0001RJ-Ob for qemu-devel@nongnu.org; Fri, 06 May 2016 14:04:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33536) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayk73-0001Nu-Ip for qemu-devel@nongnu.org; Fri, 06 May 2016 14:04:29 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 791072027D for ; Fri, 6 May 2016 18:04:18 +0000 (UTC) Received: from colepc.redhat.com (ovpn-113-44.phx2.redhat.com [10.3.113.44]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u46I4E4b019036; Fri, 6 May 2016 14:04:17 -0400 From: Cole Robinson To: qemu-devel@nongnu.org Date: Fri, 6 May 2016 14:03:06 -0400 Message-Id: <31c9ab6540b031f7a614c59edcecea9877685612.1462557436.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 02/10] ui: sdl2: Release grab before opening console window 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 , Cole Robinson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- ui/sdl2.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.4 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;