From patchwork Mon Jun 30 12:49:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 32717 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f199.google.com (mail-yk0-f199.google.com [209.85.160.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2C3D721131 for ; Mon, 30 Jun 2014 12:53:48 +0000 (UTC) Received: by mail-yk0-f199.google.com with SMTP id 200sf12935184ykr.2 for ; Mon, 30 Jun 2014 05:53:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=p0X4zjVRr/UPNa6OTIAr/vFTMRs4+WoY8kkgbgWCK04=; b=PyjN+XvNz2SmlgST7jKW1HrWH5ReSjlv0X18/O8TzvLfQW5tOPju2POrQ+U4GrWUMC mI5PMahe1Y51sbc/X0SSksNj1/Hb0P929yMi4/MVWT8PHtMPZFhb54hCfjQh7lzd9O0q v/cO+pNoLW9BhNtU24UTKdy9XrWrpbBP+/+N3KjbJl91IJynaf1M5J5C+e8H3nhajoQU Bq7/HdjIhA2Hn23cRKCmRc2+yV0jry47lBiyhk6A125s4Ug7DZ5IU5SfnOv83U3L8BiA Vxb4dHIPRRkOnK9/eBlbDrzALGIum0YVJnI2IOA4TNrDf9oUaHMlVPXa1sQItsbLiQPy TU0A== X-Gm-Message-State: ALoCoQnWHVhRKJDtAzlLG8V4pSFXL+FSRKIYVBk4kvmuMj5rudxhrjGMAUBuFJiSUsUQ+liao0Oy X-Received: by 10.58.94.197 with SMTP id de5mr22732546veb.19.1404132827989; Mon, 30 Jun 2014 05:53:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.46.99 with SMTP id j90ls1461656qga.49.gmail; Mon, 30 Jun 2014 05:53:47 -0700 (PDT) X-Received: by 10.58.236.170 with SMTP id uv10mr3210309vec.31.1404132827878; Mon, 30 Jun 2014 05:53:47 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id ju5si9993712veb.53.2014.06.30.05.53.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 05:53:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id id10so7472699vcb.38 for ; Mon, 30 Jun 2014 05:53:47 -0700 (PDT) X-Received: by 10.58.188.199 with SMTP id gc7mr34060144vec.4.1404132827806; Mon, 30 Jun 2014 05:53:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp136143vcb; Mon, 30 Jun 2014 05:53:47 -0700 (PDT) X-Received: by 10.140.22.134 with SMTP id 6mr55702355qgn.4.1404132827001; Mon, 30 Jun 2014 05:53:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d7si24911839qcs.34.2014.06.30.05.53.46 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 30 Jun 2014 05:53:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:34111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1b5e-0004O9-Lq for patch@linaro.org; Mon, 30 Jun 2014 08:53:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1b1x-0007kD-2J for qemu-devel@nongnu.org; Mon, 30 Jun 2014 08:49:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1b1w-0006r6-2t for qemu-devel@nongnu.org; Mon, 30 Jun 2014 08:49:57 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1b1v-0006qf-TC for qemu-devel@nongnu.org; Mon, 30 Jun 2014 08:49:56 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1X1b1v-0008VP-6v for qemu-devel@nongnu.org; Mon, 30 Jun 2014 13:49:55 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 30 Jun 2014 13:49:55 +0100 Message-Id: <1404132595-32651-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1404132595-32651-1-git-send-email-peter.maydell@linaro.org> References: <1404132595-32651-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 4/4] ui/cocoa: Honour -show-cursor command line option 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Honour the -show-cursor command line option (which forces the mouse pointer to always be displayed even when input is grabbed) in the Cocoa UI backend. Signed-off-by: Peter Maydell Message-id: 1403516125-14568-5-git-send-email-peter.maydell@linaro.org --- ui/cocoa.m | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index 06951d0..3147178 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -323,6 +323,22 @@ QemuCocoaView *cocoaView; return (p.x > -1 && p.x < screen.width && p.y > -1 && p.y < screen.height); } +- (void) hideCursor +{ + if (!cursor_hide) { + return; + } + [NSCursor hide]; +} + +- (void) unhideCursor +{ + if (!cursor_hide) { + return; + } + [NSCursor unhide]; +} + - (void) drawRect:(NSRect) rect { COCOA_DEBUG("QemuCocoaView: drawRect\n"); @@ -735,7 +751,7 @@ QemuCocoaView *cocoaView; else [normalWindow setTitle:@"QEMU - (Press ctrl + alt to release Mouse)"]; } - [NSCursor hide]; + [self hideCursor]; if (!isAbsoluteEnabled) { isMouseDeassociated = TRUE; CGAssociateMouseAndMouseCursorPosition(FALSE); @@ -753,7 +769,7 @@ QemuCocoaView *cocoaView; else [normalWindow setTitle:@"QEMU"]; } - [NSCursor unhide]; + [self unhideCursor]; if (isMouseDeassociated) { CGAssociateMouseAndMouseCursorPosition(TRUE); isMouseDeassociated = FALSE;