Commit 1aeb8f05 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* always forward the clicks to OSX's core

parent 21ae55dc
...@@ -479,7 +479,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -479,7 +479,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
msg_Dbg( p_vout, "received NSRightMouseDown (generic method) or Ctrl clic" ); msg_Dbg( p_vout, "received NSRightMouseDown (generic method) or Ctrl clic" );
[NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]]; [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]];
} }
else
/* always forward to core as well */
[super mouseDown: o_event]; [super mouseDown: o_event];
} }
} }
...@@ -490,20 +491,14 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -490,20 +491,14 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( p_vout ) if( p_vout )
{ {
switch( [o_event type] ) if( [o_event type] == NSOtherMouseDown )
{
case NSOtherMouseDown:
{ {
var_Get( p_vout, "mouse-button-down", &val ); var_Get( p_vout, "mouse-button-down", &val );
val.i_int |= 2; val.i_int |= 2;
var_Set( p_vout, "mouse-button-down", val ); var_Set( p_vout, "mouse-button-down", val );
} }
break;
default:
[super mouseDown: o_event]; [super mouseDown: o_event];
break;
}
} }
} }
...@@ -511,19 +506,13 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -511,19 +506,13 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
{ {
if( p_vout ) if( p_vout )
{ {
switch( [o_event type] ) if( [o_event type] == NSRightMouseDown )
{
case NSRightMouseDown:
{ {
msg_Dbg( p_vout, "received NSRightMouseDown (specific method)" ); msg_Dbg( p_vout, "received NSRightMouseDown (specific method)" );
[NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]]; [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]];
} }
break;
default:
[super mouseDown: o_event]; [super mouseDown: o_event];
break;
}
} }
} }
...@@ -533,9 +522,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -533,9 +522,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( p_vout ) if( p_vout )
{ {
switch( [o_event type] ) if( [o_event type] == NSLeftMouseUp )
{
case NSLeftMouseUp:
{ {
vlc_value_t b_val; vlc_value_t b_val;
b_val.b_bool = VLC_TRUE; b_val.b_bool = VLC_TRUE;
...@@ -545,12 +532,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -545,12 +532,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
val.i_int &= ~1; val.i_int &= ~1;
var_Set( p_vout, "mouse-button-down", val ); var_Set( p_vout, "mouse-button-down", val );
} }
break;
default:
[super mouseUp: o_event]; [super mouseUp: o_event];
break;
}
} }
} }
...@@ -560,20 +543,14 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -560,20 +543,14 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
if( p_vout ) if( p_vout )
{ {
switch( [o_event type] ) if( [o_event type] == NSOtherMouseUp )
{
case NSOtherMouseUp:
{ {
var_Get( p_vout, "mouse-button-down", &val ); var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~2; val.i_int &= ~2;
var_Set( p_vout, "mouse-button-down", val ); var_Set( p_vout, "mouse-button-down", val );
} }
break;
default:
[super mouseUp: o_event]; [super mouseUp: o_event];
break;
}
} }
} }
...@@ -581,21 +558,14 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -581,21 +558,14 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
{ {
if( p_vout ) if( p_vout )
{ {
switch( [o_event type] ) if( [o_event type] == NSRightMouseUp )
{
case NSRightMouseUp:
{ {
/* FIXME: this isn't the appropriate place, but we can't receive /* FIXME: this isn't the appropriate place, but we can't receive
* NSRightMouseDown some how */ * NSRightMouseDown some how */
msg_Dbg( p_vout, "received NSRightMouseUp" ); msg_Dbg( p_vout, "received NSRightMouseUp" );
[NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]]; [NSMenu popUpContextMenu: [[VLCMain sharedInstance] getVoutMenu] withEvent: o_event forView: [[[VLCMain sharedInstance] getControls] getVoutView]];
} }
break;
default:
[super mouseUp: o_event]; [super mouseUp: o_event];
break;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment