From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxGbK-0002Hh-BN for qemu-devel@nongnu.org; Fri, 13 Nov 2015 10:49:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxGbG-0005O0-70 for qemu-devel@nongnu.org; Fri, 13 Nov 2015 10:49:22 -0500 Received: from mout.web.de ([212.227.15.14]:55741) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxGbF-0005Nl-Te for qemu-devel@nongnu.org; Fri, 13 Nov 2015 10:49:18 -0500 References: <1447354938-1575-1-git-send-email-ehabkost@redhat.com> <1447354938-1575-2-git-send-email-ehabkost@redhat.com> From: =?UTF-8?Q?Andreas_F=c3=a4rber?= Message-ID: <56460675.202@web.de> Date: Fri, 13 Nov 2015 16:49:09 +0100 MIME-Version: 1.0 In-Reply-To: <1447354938-1575-2-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v2 1/7] vl: Add DT_COCOA DisplayType value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Maydell Am 12.11.2015 um 20:02 schrieb Eduardo Habkost: > Instead of reusing DT_SDL for Cocoa, use DT_COCOA to indicate > that a Cocoa display was requested. > > configure already ensures CONFIG_COCOA and CONFIG_SDL are never > set at the same time. The only case where DT_SDL is used outside > a #ifdef CONFIG_SDL block is in the no_frame/alt_grab/ctrl_grab > check. That means the only user-visible change is that we will > start printing a warning if the SDL-specific options are used in > Cocoa mode. This is a bugfix, because no_frame/alt_grab/ctrl_grab > are not used by Cocoa code. > > Cc: Andreas Färber > Cc: Peter Maydell > Signed-off-by: Eduardo Habkost > --- > include/sysemu/sysemu.h | 1 + > vl.c | 6 ++++-- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h > index f992494..0f4e520 100644 > --- a/include/sysemu/sysemu.h > +++ b/include/sysemu/sysemu.h > @@ -137,6 +137,7 @@ typedef enum DisplayType > DT_DEFAULT, > DT_CURSES, > DT_SDL, > + DT_COCOA, > DT_GTK, > DT_NOGRAPHIC, > DT_NONE, > diff --git a/vl.c b/vl.c > index 7d993a5..bba1b0a 100644 > --- a/vl.c > +++ b/vl.c > @@ -4247,8 +4247,10 @@ int main(int argc, char **argv, char **envp) > if (display_type == DT_DEFAULT && !display_remote) { > #if defined(CONFIG_GTK) > display_type = DT_GTK; > -#elif defined(CONFIG_SDL) || defined(CONFIG_COCOA) > +#elif defined(CONFIG_SDL) > display_type = DT_SDL; > +#elif defined(CONFIG_COCOA) > + display_type = DT_COCOA; > #elif defined(CONFIG_VNC) > vnc_parse("localhost:0,to=99,id=default", &error_abort); > show_vnc_port = 1; > @@ -4588,7 +4590,7 @@ int main(int argc, char **argv, char **envp) > sdl_display_init(ds, full_screen, no_frame); > break; > #elif defined(CONFIG_COCOA) > - case DT_SDL: > + case DT_COCOA: > cocoa_display_init(ds, full_screen); > break; > #endif Sounds like a good idea, but haven't reviewed those extra DT_SDL uses, Acked-by: Andreas Färber Regards, Andreas