From patchwork Wed Jan 6 22:47:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 42354 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A0A60B6EF0 for ; Thu, 7 Jan 2010 09:56:49 +1100 (EST) Received: from localhost ([127.0.0.1]:59799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSeo2-0004Ec-Tw for incoming@patchwork.ozlabs.org; Wed, 06 Jan 2010 17:56:46 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSef8-0007PV-LO for qemu-devel@nongnu.org; Wed, 06 Jan 2010 17:47:34 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSef3-0007ME-EU for qemu-devel@nongnu.org; Wed, 06 Jan 2010 17:47:33 -0500 Received: from [199.232.76.173] (port=50114 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSef3-0007Lk-4v for qemu-devel@nongnu.org; Wed, 06 Jan 2010 17:47:29 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:50480) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NSef2-00054t-9b for qemu-devel@nongnu.org; Wed, 06 Jan 2010 17:47:28 -0500 Received: from smtp05.web.de (fmsmtp05.dlan.cinetic.de [172.20.4.166]) by fmmailgate01.web.de (Postfix) with ESMTP id A62251447A555; Wed, 6 Jan 2010 23:47:27 +0100 (CET) Received: from [84.148.52.231] (helo=localhost.localdomain) by smtp05.web.de with asmtp (WEB.DE 4.110 #314) id 1NSef1-0001R8-00; Wed, 06 Jan 2010 23:47:27 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 6 Jan 2010 23:47:14 +0100 Message-Id: <1262818037-926-9-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.6.5.3 In-Reply-To: <1262818037-926-8-git-send-email-andreas.faerber@web.de> References: <1262818037-926-1-git-send-email-andreas.faerber@web.de> <1262818037-926-2-git-send-email-andreas.faerber@web.de> <1262818037-926-3-git-send-email-andreas.faerber@web.de> <1262818037-926-4-git-send-email-andreas.faerber@web.de> <1262818037-926-5-git-send-email-andreas.faerber@web.de> <1262818037-926-6-git-send-email-andreas.faerber@web.de> <1262818037-926-7-git-send-email-andreas.faerber@web.de> <1262818037-926-8-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1/etxfkeLDPgPVW6qTJMCJBLroTAzioNc/9sdGr Jmq1lum0EvmhPORL83EgFdbZxldXPZp1toNoMTAUf02cgGUUbJ ssxChWnNucDEaFyhVUlQ== X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Mike Kronenberg , Alexander Graf Subject: [Qemu-devel] [PATCH v2 RESEND 08/11] Cocoa: Don't unconditionally show the window X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When QEMU was launched in no-graphic, Curses or VNC mode, don't run it as a Cocoa application. Based on patch by Alexander Graf. v1: - Avoid type mismatch warning for argv - Drop noCocoa variable - Coding Style changes Signed-off-by: Andreas Färber Cc: Alexander Graf Cc: Mike Kronenberg --- cocoa.m | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/cocoa.m b/cocoa.m index d5f941b..70c249b 100644 --- a/cocoa.m +++ b/cocoa.m @@ -855,6 +855,16 @@ int main (int argc, const char * argv[]) { gArgc = argc; gArgv = (char **)argv; CPSProcessSerNum PSN; + int i; + + /* In case we don't need to display a window, let's not do that */ + for (i = 1; i < argc; i++) { + if (!strcmp(argv[i], "-vnc") || + !strcmp(argv[i], "-nographic") || + !strcmp(argv[i], "-curses")) { + return qemu_main(gArgc, gArgv); + } + } NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; [NSApplication sharedApplication];