From patchwork Wed Nov 11 19:09:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 543033 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 56CCF1402D1 for ; Thu, 12 Nov 2015 06:11:07 +1100 (AEDT) Received: from localhost ([::1]:42503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwanR-00035g-27 for incoming@patchwork.ozlabs.org; Wed, 11 Nov 2015 14:11:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwamp-0002E2-Q2 for qemu-devel@nongnu.org; Wed, 11 Nov 2015 14:10:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zwamo-0006ZK-Lq for qemu-devel@nongnu.org; Wed, 11 Nov 2015 14:10:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwamo-0006ZG-GV for qemu-devel@nongnu.org; Wed, 11 Nov 2015 14:10:26 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 0C0FBC6A2D; Wed, 11 Nov 2015 19:10:26 +0000 (UTC) Received: from localhost (ovpn-113-50.phx2.redhat.com [10.3.113.50]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tABJAO1P018449; Wed, 11 Nov 2015 14:10:25 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 11 Nov 2015 17:09:05 -0200 Message-Id: <1447268956-27500-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1447268956-27500-1-git-send-email-ehabkost@redhat.com> References: <1447268956-27500-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Peter Maydell Subject: [Qemu-devel] [PATCH 01/12] vl: Add DT_COCOA DisplayType value X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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