From nobody Wed Feb 11 02:07:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523628417016323.3281870607299; Fri, 13 Apr 2018 07:06:57 -0700 (PDT) Received: from localhost ([::1]:55995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zLr-0005T1-QC for importer@patchew.org; Fri, 13 Apr 2018 10:06:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zJu-0004Ah-Az for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f6zJt-000193-72 for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:54 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:46874) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f6zJt-00018P-1b for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:53 -0400 Received: by mail-wr0-x243.google.com with SMTP id d1so8420050wrj.13 for ; Fri, 13 Apr 2018 07:04:52 -0700 (PDT) Received: from Nikki.cbg.collabora.co.uk (bakora.collabora.co.uk. [46.17.161.148]) by smtp.googlemail.com with ESMTPSA id y51sm4785330wrc.38.2018.04.13.07.04.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 07:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/9MPoFI9eNVZAspLGNHhoO1SN4cpYMarzezatbgZDlM=; b=fBtSM7oPtZwefeRYyIvoGlBnz6MyxkhULP+toRIFIAhOVOsb9LGnQLd3sqndOS6WlI s4KbLc9E2Q2cDE2twkBfdqvu9DFWAErsKx1nShraREmpkZ6q0HPww6612x23xWe9mKKG 4m3P9ce2UaZyS7hh0f3KGUiO1RFjMezscuPsMstV3JXwbVBh9GA1SBXVOHsUHushx+LV WhQhRANC+75q9EOi71B7hk1Y0fZ0e5ULFKtTBQXZh20L/jt1SRlvl0O0XmPYTLuOS5kM P/eWKzuB4Vp20Pa11e7prdyhxyAzH6ZnY1C4lOmMURebX6uq0HmxHXSuPNfjbQNoSctc QKVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/9MPoFI9eNVZAspLGNHhoO1SN4cpYMarzezatbgZDlM=; b=n/NxuoOGGwPKrSyxwu4k4jXvpxmihHYrl9jdSKVjEz6i06iO4PAdar6UGNLlXkglkO 3fPGlJAtl9AwIHffRpRp99jgV3Q6vsw9eENmeolenemVASqiphQ61PjwyJyk+MvqHZn7 vhW02rPieu2bMTbgB7lAebzJaxnVTzeXQhR4wyW+wmc/9Y43fZtyhxSgdt+zQwqjb4Sy Y3SmtWfhJ3PM+yGv6oTQ65IqNdHLSMkldPGNhwR7xWtjoJhsvUUiFX/h5EMgSVlOLaj4 I+YKeWHHC2pMOUEmPYWuSoKGrDLsEfL8ZStnV+dWaTWqRz4OPIUckTh73Dq0IWWqdf6j zEVg== X-Gm-Message-State: ALQs6tDahrlU9ddHPio8GpTBrVMQsMZjCazKYzxj6o+jJiIAflrDraMl HmTHttgrZc/lqUFOJbP3wvVxWg== X-Google-Smtp-Source: AIpwx4/RBsmrlsHcoHupUPcriXTTrXNzxVX6I+x67tuE8+4gG/2Krx02bCaNnBXHI5K49j3TsXOI7w== X-Received: by 10.28.249.8 with SMTP id x8mr3605044wmh.12.1523628291857; Fri, 13 Apr 2018 07:04:51 -0700 (PDT) From: Elie Tournier To: qemu-devel@nongnu.org Date: Fri, 13 Apr 2018 14:58:41 +0100 Message-Id: <20180413135842.21325-3-tournier.elie@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180413135842.21325-1-tournier.elie@gmail.com> References: <20180413135842.21325-1-tournier.elie@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH v3 2/3] sdl: Move DisplayOptions global to sdl2_console 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: Elie Tournier , kraxel@redhat.com, Elie Tournier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Suggested-by: Gerd Hoffmann Signed-off-by: Elie Tournier --- include/ui/sdl2.h | 1 + ui/sdl2.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h index 51084e6320..f43eecdbd6 100644 --- a/include/ui/sdl2.h +++ b/include/ui/sdl2.h @@ -14,6 +14,7 @@ struct sdl2_console { DisplayChangeListener dcl; DisplaySurface *surface; + DisplayOptions *opts; SDL_Texture *texture; SDL_Window *real_window; SDL_Renderer *real_renderer; diff --git a/ui/sdl2.c b/ui/sdl2.c index 83b917fa37..da037248c2 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -32,7 +32,6 @@ =20 static int sdl2_num_outputs; static struct sdl2_console *sdl2_console; -static DisplayOptions *opts; =20 static SDL_Surface *guest_sprite_surface; static int gui_grab; /* if true, all keyboard/mouse events are grabbed */ @@ -566,7 +565,7 @@ static void handle_windowevent(SDL_Event *ev) break; case SDL_WINDOWEVENT_CLOSE: if (qemu_console_is_graphic(scon->dcl.con)) { - if (opts->has_window_close && !opts->window_close) { + if (scon->opts->has_window_close && !scon->opts->window_close)= { allow_close =3D false; } if (allow_close) { @@ -613,7 +612,7 @@ void sdl2_poll_events(struct sdl2_console *scon) handle_textinput(ev); break; case SDL_QUIT: - if (opts->has_window_close && !opts->window_close) { + if (scon->opts->has_window_close && !scon->opts->window_close)= { allow_close =3D false; } if (allow_close) { @@ -770,7 +769,6 @@ static void sdl2_display_init(DisplayState *ds, Display= Options *o) SDL_SysWMinfo info; =20 assert(o->type =3D=3D DISPLAY_TYPE_SDL); - opts =3D o; =20 #ifdef __linux__ /* on Linux, SDL may use fbcon|directfb|svgalib when run without @@ -806,6 +804,7 @@ static void sdl2_display_init(DisplayState *ds, Display= Options *o) return; } sdl2_console =3D g_new0(struct sdl2_console, sdl2_num_outputs); + sdl2_console->opts =3D o; for (i =3D 0; i < sdl2_num_outputs; i++) { QemuConsole *con =3D qemu_console_lookup_by_index(i); assert(con !=3D NULL); @@ -846,7 +845,8 @@ static void sdl2_display_init(DisplayState *ds, Display= Options *o) g_free(filename); } =20 - if (opts->has_full_screen && opts->full_screen) { + if (sdl2_console->opts->has_full_screen && + sdl2_console->opts->full_screen) { gui_fullscreen =3D 1; sdl_grab_start(0); } --=20 2.17.0