videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

vout/macosx: remove mouse handling 

This currently deadlocks the vout and should be done in the vout
window properly anyway.
This commit is contained in:
Marvin Scholz 2021-06-01 15:18:51 +02:00 committed by Hugo Beauzée-Luyssen
parent baca970d74
commit 1951da33fa
1 changed files with 1 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
modules/video_output/macosx.m
View File

@ -711,91 +711,7 @@ static void OpenglSwap (vlc_gl_t *gl)
#pragma mark -
#pragma mark Mouse handling
- (void)mouseDown:(NSEvent *)o_event
{
@synchronized (self) {
if (vd) {
if ([o_event type] == NSLeftMouseDown && !([o_event modifierFlags] & NSControlKeyMask)) {
if ([o_event clickCount] <= 1)
vout_display_SendEventMousePressed (vd, MOUSE_BUTTON_LEFT);
}
}
}
[super mouseDown:o_event];
}
- (void)otherMouseDown:(NSEvent *)o_event
{
@synchronized (self) {
if (vd)
vout_display_SendEventMousePressed (vd, MOUSE_BUTTON_CENTER);
}
[super otherMouseDown: o_event];
}
- (void)mouseUp:(NSEvent *)o_event
{
@synchronized (self) {
if (vd) {
if ([o_event type] == NSLeftMouseUp)
vout_display_SendEventMouseReleased (vd, MOUSE_BUTTON_LEFT);
}
}
[super mouseUp: o_event];
}
- (void)otherMouseUp:(NSEvent *)o_event
{
@synchronized (self) {
if (vd)
vout_display_SendEventMouseReleased (vd, MOUSE_BUTTON_CENTER);
}
[super otherMouseUp: o_event];
}
- (void)mouseMoved:(NSEvent *)o_event
{
/* on HiDPI displays, the point bounds don't equal the actual pixel based bounds */
NSPoint ml = [self convertPoint: [o_event locationInWindow] fromView: nil];
NSRect videoRect = [self bounds];
BOOL b_inside = [self mouse: ml inRect: videoRect];
ml = [self convertPointToBacking: ml];
videoRect = [self convertRectToBacking: videoRect];
if (b_inside) {
@synchronized (self) {
if (vd) {
vout_display_SendMouseMovedDisplayCoordinates(vd,
(int)ml.x, videoRect.size.height - (int)ml.y);
}
}
}
[super mouseMoved: o_event];
}
- (void)mouseDragged:(NSEvent *)o_event
{
[self mouseMoved: o_event];
[super mouseDragged: o_event];
}
- (void)otherMouseDragged:(NSEvent *)o_event
{
[self mouseMoved: o_event];
[super otherMouseDragged: o_event];
}
- (void)rightMouseDragged:(NSEvent *)o_event
{
[self mouseMoved: o_event];
[super rightMouseDragged: o_event];
}
#warning Missing mouse handling, must be implemented in Vout Window
- (BOOL)acceptsFirstResponder
{