summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-06-23 10:35:25 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-06-29 22:00:33 +0100
commit13aefd303cf996c2d183e94082413885bf1d15bf (patch)
tree1421fcbcacae41d6dcbe5b67a5b34520e0bbdaaf
parentf61c387ea627079b33a635f5d203a2c2bccc86c6 (diff)
downloadqemu-13aefd303cf996c2d183e94082413885bf1d15bf.tar.gz
qemu-13aefd303cf996c2d183e94082413885bf1d15bf.tar.bz2
qemu-13aefd303cf996c2d183e94082413885bf1d15bf.zip
ui/cocoa: Honour -show-cursor command line option
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 <peter.maydell@linaro.org> Message-id: 1403516125-14568-5-git-send-email-peter.maydell@linaro.org
-rw-r--r--ui/cocoa.m20
1 files changed, 18 insertions, 2 deletions
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 06951d03f0..3147178118 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;