From patchwork Sat Jul 30 09:39:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 107487 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ECEDAB6EE8 for ; Sat, 30 Jul 2011 19:39:52 +1000 (EST) Received: from localhost ([::1]:42376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qn61N-0006K1-3X for incoming@patchwork.ozlabs.org; Sat, 30 Jul 2011 05:39:49 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qn612-00061q-O7 for qemu-devel@nongnu.org; Sat, 30 Jul 2011 05:39:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qn60z-0005c6-Na for qemu-devel@nongnu.org; Sat, 30 Jul 2011 05:39:28 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:51212) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qn60z-0005bj-HS for qemu-devel@nongnu.org; Sat, 30 Jul 2011 05:39:25 -0400 Received: from smtp03.web.de ( [172.20.0.65]) by fmmailgate03.web.de (Postfix) with ESMTP id E9DFD19643C27; Sat, 30 Jul 2011 11:39:24 +0200 (CEST) Received: from [92.75.128.27] (helo=localhost.localdomain) by smtp03.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1Qn60y-0001Sl-04; Sat, 30 Jul 2011 11:39:24 +0200 From: Jan Kiszka To: Anthony Liguori , qemu-devel Date: Sat, 30 Jul 2011 11:39:10 +0200 Message-Id: <9156bed46e3b887ef92f204e4c11861c338dcd1d.1312018756.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1+wB1PPkHQFflmfPP1KU3w5zjpZ3iHm5UNZWIA7 RTGazzPczK+kTGoiIRB9KfpRoyuQKDxucBZUEvshBbPeGda2X0 qlO3+9z2g= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.234 Subject: [Qemu-devel] [PATCH 07/15] sdl: Drop bogus gui_fullscreen_initial_grab X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka There must be no difference between initial -full-screen and switching to this mode via the hot key. Signed-off-by: Jan Kiszka --- ui/sdl.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/ui/sdl.c b/ui/sdl.c index e18c59a..80bf776 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -47,7 +47,6 @@ static int gui_fullscreen; static int gui_noframe; static int gui_key_modifier_pressed; static int gui_keysym; -static int gui_fullscreen_initial_grab; static int gui_grab_code = KMOD_LALT | KMOD_LCTRL; static uint8_t modifiers_state[256]; static int width, height; @@ -751,7 +750,7 @@ static void sdl_refresh(DisplayState *ds) break; case SDL_ACTIVEEVENT: if (gui_grab && ev->active.state == SDL_APPINPUTFOCUS && - !ev->active.gain && !gui_fullscreen_initial_grab) { + !ev->active.gain && !gui_fullscreen) { sdl_grab_end(); } if (ev->active.state & SDL_APPACTIVE) { @@ -923,7 +922,6 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) atexit(sdl_cleanup); if (full_screen) { gui_fullscreen = 1; - gui_fullscreen_initial_grab = 1; sdl_grab_start(); } }