Merge pull request #606 from TomHarte/MouseHiding

Causes the Mac mouse pointer to hide after 3 seconds.

OSBindings/Mac/Clock Signal/Views/CSOpenGLView.m

@@ -16,10 +16,12 @@
 @implementation CSOpenGLView {
 	CVDisplayLinkRef _displayLink;
 	CGSize _backingSize;
+
+	NSTrackingArea *_mouseTrackingArea;
+	NSTimer *_mouseHideTimer;
 }
 
-- (void)prepareOpenGL
+- (void)prepareOpenGL {
-{
 	// Synchronize buffer swaps with vertical refresh rate
 	GLint swapInt = 1;
 	[[self openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval];
@@ -43,51 +45,43 @@
 	CVDisplayLinkStart(_displayLink);
 }
 
-static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeStamp *now, const CVTimeStamp *outputTime, CVOptionFlags flagsIn, CVOptionFlags *flagsOut, void *displayLinkContext)
+static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeStamp *now, const CVTimeStamp *outputTime, CVOptionFlags flagsIn, CVOptionFlags *flagsOut, void *displayLinkContext) {
-{
 	CSOpenGLView *const view = (__bridge CSOpenGLView *)displayLinkContext;
 	[view drawAtTime:now frequency:CVDisplayLinkGetActualOutputVideoRefreshPeriod(displayLink)];
 	return kCVReturnSuccess;
 }
 
-- (void)drawAtTime:(const CVTimeStamp *)now frequency:(double)frequency
+- (void)drawAtTime:(const CVTimeStamp *)now frequency:(double)frequency {
-{
 	[self redrawWithEvent:CSOpenGLViewRedrawEventTimer];
 }
 
-- (void)drawRect:(NSRect)dirtyRect
+- (void)drawRect:(NSRect)dirtyRect {
-{
 	[self redrawWithEvent:CSOpenGLViewRedrawEventAppKit];
 }
 
-- (void)redrawWithEvent:(CSOpenGLViewRedrawEvent)event
+- (void)redrawWithEvent:(CSOpenGLViewRedrawEvent)event {
-{
 	[self performWithGLContext:^{
 		[self.delegate openGLViewRedraw:self event:event];
 		CGLFlushDrawable([[self openGLContext] CGLContextObj]);
 	}];
 }
 
-- (void)invalidate
+- (void)invalidate {
-{
 	CVDisplayLinkStop(_displayLink);
 }
 
-- (void)dealloc
+- (void)dealloc {
-{
 	// Release the display link
 	CVDisplayLinkRelease(_displayLink);
 }
 
-- (CGSize)backingSize
+- (CGSize)backingSize {
-{
 	@synchronized(self) {
 		return _backingSize;
 	}
 }
 
-- (void)reshape
+- (void)reshape {
-{
 	[super reshape];
 	@synchronized(self) {
 		_backingSize = [self convertSizeToBacking:self.bounds.size];
@@ -99,10 +93,8 @@ static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
 	}];
 }
 
-- (void)awakeFromNib
+- (void)awakeFromNib {
-{
+	NSOpenGLPixelFormatAttribute attributes[] = {
-	NSOpenGLPixelFormatAttribute attributes[] =
-	{
 		NSOpenGLPFADoubleBuffer,
 		NSOpenGLPFAOpenGLProfile,	NSOpenGLProfileVersion3_2Core,
 //		NSOpenGLPFAMultisample,
@@ -131,8 +123,7 @@ static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
 	[self registerForDraggedTypes:@[(__bridge NSString *)kUTTypeFileURL]];
 }
 
-- (void)performWithGLContext:(dispatch_block_t)action
+- (void)performWithGLContext:(dispatch_block_t)action {
-{
 	CGLLockContext([[self openGLContext] CGLContextObj]);
 	[self.openGLContext makeCurrentContext];
 	action();
@@ -141,47 +132,79 @@ static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
 
 #pragma mark - NSResponder
 
-- (BOOL)acceptsFirstResponder
+- (BOOL)acceptsFirstResponder {
-{
 	return YES;
 }
 
-- (void)keyDown:(NSEvent *)theEvent
+- (void)keyDown:(NSEvent *)theEvent {
-{
 	[self.responderDelegate keyDown:theEvent];
 }
 
-- (void)keyUp:(NSEvent *)theEvent
+- (void)keyUp:(NSEvent *)theEvent {
-{
 	[self.responderDelegate keyUp:theEvent];
 }
 
-- (void)flagsChanged:(NSEvent *)theEvent
+- (void)flagsChanged:(NSEvent *)theEvent {
-{
 	[self.responderDelegate flagsChanged:theEvent];
 }
 
-- (void)paste:(id)sender
+- (void)paste:(id)sender {
-{
 	[self.responderDelegate paste:sender];
 }
 
 #pragma mark - NSDraggingDestination
 
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
+- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender {
-{
+	for(NSPasteboardItem *item in [[sender draggingPasteboard] pasteboardItems]) {
-	for(NSPasteboardItem *item in [[sender draggingPasteboard] pasteboardItems])
-	{
 		NSURL *URL = [NSURL URLWithString:[item stringForType:(__bridge NSString *)kUTTypeFileURL]];
 		[self.delegate openGLView:self didReceiveFileAtURL:URL];
 	}
 	return YES;
 }
 
-- (NSDragOperation)draggingEntered:(id < NSDraggingInfo >)sender
+- (NSDragOperation)draggingEntered:(id < NSDraggingInfo >)sender {
-{
-	// we'll drag and drop, yeah?
 	return NSDragOperationLink;
 }
 
+#pragma mark - Mouse hiding
+
+- (void)updateTrackingAreas {
+	[super updateTrackingAreas];
+
+	if(_mouseTrackingArea) {
+		[self removeTrackingArea:_mouseTrackingArea];
+	}
+	_mouseTrackingArea =
+		[[NSTrackingArea alloc]
+			initWithRect:self.bounds
+			options:NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved | NSTrackingActiveWhenFirstResponder
+			owner:self
+			userInfo:nil];
+	[self addTrackingArea:_mouseTrackingArea];
+}
+
+- (void)mouseMoved:(NSEvent *)event {
+	[super mouseMoved:event];
+	[self scheduleMouseHide];
+}
+
+- (void)mouseEntered:(NSEvent *)event {
+	[super mouseEntered:event];
+	[self scheduleMouseHide];
+}
+
+- (void)scheduleMouseHide {
+	[_mouseHideTimer invalidate];
+	_mouseHideTimer = [NSTimer scheduledTimerWithTimeInterval:3.0 repeats:NO block:^(NSTimer * _Nonnull timer) {
+        [NSCursor setHiddenUntilMouseMoves:YES];
+	}];
+}
+
+- (void)mouseExited:(NSEvent *)event {
+	[super mouseExited:event];
+
+	[_mouseHideTimer invalidate];
+	_mouseHideTimer = nil;
+}
+
 @end