From patchwork Thu Jan 12 19:07:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 9513987 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 28ACC601E5 for ; Thu, 12 Jan 2017 19:08:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AE8C286DB for ; Thu, 12 Jan 2017 19:08:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FF2328707; Thu, 12 Jan 2017 19:08:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7366B286DB for ; Thu, 12 Jan 2017 19:08:27 +0000 (UTC) Received: from localhost ([::1]:36208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRkja-0004yh-Gb for patchwork-qemu-devel@patchwork.kernel.org; Thu, 12 Jan 2017 14:08:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRkin-0004Hv-Ez for qemu-devel@nongnu.org; Thu, 12 Jan 2017 14:07:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRkik-0002A3-CW for qemu-devel@nongnu.org; Thu, 12 Jan 2017 14:07:37 -0500 Received: from [2a03:4000:1::4e2f:c7ac:d] (port=33966 helo=mail.weilnetz.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRkik-00029Y-6n for qemu-devel@nongnu.org; Thu, 12 Jan 2017 14:07:34 -0500 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by mail.weilnetz.de (Postfix) with ESMTP id F2FB411810AC; Thu, 12 Jan 2017 20:07:32 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from mail.weilnetz.de ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JyGkjE2RdL-Y; Thu, 12 Jan 2017 20:07:30 +0100 (CET) Received: from edv32.bib.uni-mannheim.de (p54AC81E0.dip0.t-ipconnect.de [84.172.129.224]) by mail.weilnetz.de (Postfix) with ESMTPSA id CD24211810A6; Thu, 12 Jan 2017 20:07:30 +0100 (CET) To: Samuel Thibault , Gerd Hoffmann References: <1483967385-12891-1-git-send-email-kraxel@redhat.com> <1483967385-12891-6-git-send-email-kraxel@redhat.com> <1484236609.5151.16.camel@redhat.com> <20170112170539.GS2832@var.bordeaux.inria.fr> From: Stefan Weil Message-ID: Date: Thu, 12 Jan 2017 20:07:30 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.5.1 MIME-Version: 1.0 In-Reply-To: <20170112170539.GS2832@var.bordeaux.inria.fr> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a03:4000:1::4e2f:c7ac:d Subject: Re: [Qemu-devel] [PULL v2 05/11] sdl2: set window ID 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: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP On 01/12/17 18:05, Samuel Thibault wrote: > Hello, > > Gerd Hoffmann, on Thu 12 Jan 2017 16:56:49 +0100, wrote: >> On Do, 2017-01-12 at 16:10 +0100, Stefan Weil wrote: >>> This commit breaks builds for Windows. See below for details. >> >>> Windows does not use X11. gcc fails: >>> >>> CC ui/sdl2.o >>> /qemu/ui/sdl2.c: In function ‘sdl_display_init’: >>> /qemu/ui/sdl2.c:821:54: error: ‘union ’ has no member named ‘x11’ >>> qemu_console_set_window_id(con, info.info.x11.window); >> >> Oops. > > Oops, sorry, it seems to have been overlooked indeed. Can you easily > test the attached patch? > > Samuel > It does not compile. I fixed it and simplified the code a little bit (see below, please fix line wrap which my mailer enforced). That code compiles. I did not run tests. Stefan /* Load a 32x32x4 image. White pixels are transparent. */ diff --git a/ui/sdl2.c b/ui/sdl2.c index 9a79b17b92..91fb111aa5 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -817,9 +817,15 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) sdl2_console[i].dcl.con = con; register_displaychangelistener(&sdl2_console[i].dcl); +#if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_X11) if (SDL_GetWindowWMInfo(sdl2_console[i].real_window, &info)) { +#if defined(SDL_VIDEO_DRIVER_WINDOWS) + qemu_console_set_window_id(con, (uintptr_t)info.info.win.window); +#elif defined(SDL_VIDEO_DRIVER_X11) qemu_console_set_window_id(con, info.info.x11.window); +#endif } +#endif }