From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx8m-000179-DO for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zwx8k-0004xS-17 for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46590) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwx8j-0004xO-Rh for qemu-devel@nongnu.org; Thu, 12 Nov 2015 14:02:33 -0500 From: Eduardo Habkost Date: Thu, 12 Nov 2015 17:02:12 -0200 Message-Id: <1447354938-1575-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1447354938-1575-1-git-send-email-ehabkost@redhat.com> References: <1447354938-1575-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [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: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Peter Maydell 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=C3=A4rber 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 =3D=3D DT_DEFAULT && !display_remote) { #if defined(CONFIG_GTK) display_type =3D DT_GTK; -#elif defined(CONFIG_SDL) || defined(CONFIG_COCOA) +#elif defined(CONFIG_SDL) display_type =3D DT_SDL; +#elif defined(CONFIG_COCOA) + display_type =3D DT_COCOA; #elif defined(CONFIG_VNC) vnc_parse("localhost:0,to=3D99,id=3Ddefault", &error_abort); show_vnc_port =3D 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 --=20 2.1.0