github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-13 00:06:25 +01:00
Code Releases Activity

cocoa_common: don't autohide mouse on mousedown

Browse Source 
Previews code allowed to click the same spot for a long time and the cursor
would autohide. No more!
This commit is contained in:
Stefano Pigozzi 2013-06-01 17:58:08 +02:00
parent db7835f5d7
commit f4dcb93be1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
video/out/cocoa_common.m
View File

@ -71,6 +71,7 @@ static bool RightAltPressed(NSEvent *event)
@property(nonatomic, assign) struct vo *videoOutput; @property(nonatomic, assign) struct vo *videoOutput;
- (BOOL)containsCurrentMouseLocation; - (BOOL)containsCurrentMouseLocation;
- (void)mouseEvent:(NSEvent *)theEvent; - (void)mouseEvent:(NSEvent *)theEvent;
@property(nonatomic, assign, getter=hasMouseDown) BOOL mouseDown;
@end @end
struct vo_cocoa_input_queue { struct vo_cocoa_input_queue {
@ -218,7 +219,9 @@ static void vo_cocoa_set_cursor_visibility(struct vo *vo, bool visible)
if (visible) { if (visible) {
// show cursor unconditionally // show cursor unconditionally
CGDisplayShowCursor(kCGDirectMainDisplay); CGDisplayShowCursor(kCGDirectMainDisplay);
} else if (vo->opts->fs && [s->view containsCurrentMouseLocation]) { } else if (vo->opts->fs &&
[s->view containsCurrentMouseLocation] &&
![s->view hasMouseDown]) {
// only hide cursor if in fullscreen and the video view contains the // only hide cursor if in fullscreen and the video view contains the
// mouse location // mouse location
CGDisplayHideCursor(kCGDirectMainDisplay); CGDisplayHideCursor(kCGDirectMainDisplay);
@ -849,6 +852,7 @@ int vo_cocoa_cgl_color_size(struct vo *vo)
@implementation GLMPlayerOpenGLView @implementation GLMPlayerOpenGLView
@synthesize videoOutput = _video_output; @synthesize videoOutput = _video_output;
@synthesize mouseDown = _mouse_down;
- (BOOL)acceptsFirstResponder { return YES; } - (BOOL)acceptsFirstResponder { return YES; }
- (BOOL)becomeFirstResponder { return YES; } - (BOOL)becomeFirstResponder { return YES; }
- (BOOL)resignFirstResponder { return YES; } - (BOOL)resignFirstResponder { return YES; }
@ -961,18 +965,22 @@ int vo_cocoa_cgl_color_size(struct vo *vo)
cocoa_async_put_key( cocoa_async_put_key(
s->input_queue, s->input_queue,
(MP_MOUSE_BTN0 + buttonNumber) | MP_KEY_STATE_DOWN); (MP_MOUSE_BTN0 + buttonNumber) | MP_KEY_STATE_DOWN);
self.mouseDown = YES;
// Looks like Cocoa doesn't create MouseUp events when we are // Looks like Cocoa doesn't create MouseUp events when we are
// doing the second click in a double click. Put in the key_fifo // doing the second click in a double click. Put in the key_fifo
// the key that would be put from the MouseUp handling code. // the key that would be put from the MouseUp handling code.
if([theEvent clickCount] == 2) if([theEvent clickCount] == 2) {
cocoa_async_put_key(s->input_queue, cocoa_async_put_key(s->input_queue,
MP_MOUSE_BTN0 + buttonNumber); MP_MOUSE_BTN0 + buttonNumber);
self.mouseDown = NO;
}
break; break;
case NSLeftMouseUp: case NSLeftMouseUp:
case NSRightMouseUp: case NSRightMouseUp:
case NSOtherMouseUp: case NSOtherMouseUp:
cocoa_async_put_key(s->input_queue, cocoa_async_put_key(s->input_queue,
MP_MOUSE_BTN0 + buttonNumber); MP_MOUSE_BTN0 + buttonNumber);
self.mouseDown = NO;
break; break;
} }
} }