From patchwork Tue Apr 19 19:55:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 612286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3qqG6N1lfPz9t73 for ; Wed, 20 Apr 2016 05:58:36 +1000 (AEST) Received: from localhost ([::1]:35655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbn8-00018O-Dx for incoming@patchwork.ozlabs.org; Tue, 19 Apr 2016 15:58:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkN-0002hq-8D for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1asbkI-0007aj-Bn for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asbkI-0007af-6l for qemu-devel@nongnu.org; Tue, 19 Apr 2016 15:55:38 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AA6BC7F356; Tue, 19 Apr 2016 19:55:37 +0000 (UTC) Received: from localhost (vpn1-5-236.gru2.redhat.com [10.97.5.236]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3JJtaqC015035; Tue, 19 Apr 2016 15:55:36 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 19 Apr 2016 16:55:17 -0300 Message-Id: <1461095728-22055-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1461095728-22055-1-git-send-email-ehabkost@redhat.com> References: <1461095728-22055-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.7 v3 01/12] vl: Add DT_COCOA DisplayType value 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: Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Peter Maydell Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Acked-by: Andreas Färber 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 2033f8c..90766da 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -136,6 +136,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 36593c9..a920f16 100644 --- a/vl.c +++ b/vl.c @@ -4235,8 +4235,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; @@ -4560,7 +4562,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