RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix mouse button mapping: 

MOUSE_BTN1 is middle buttion, MOUSE_BTN2 is right button.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25450 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ulion 2007-12-18 14:48:30 +00:00
parent 007988abf8
commit 20b1f841a6
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libvo/vo_macosx.m
View File

@ -1048,17 +1048,23 @@ static int control(uint32_t request, void *data, ...)
{
if ( [theEvent buttonNumber] >= 0 && [theEvent buttonNumber] <= 9 )
{
int buttonNumber = [theEvent buttonNumber];
// Fix to mplayer defined button order: left, middle, right
if (buttonNumber == 1)
buttonNumber = 2;
else if (buttonNumber == 1)
buttonNumber = 2;
switch([theEvent type])
{
case NSLeftMouseDown:
case NSRightMouseDown:
case NSOtherMouseDown:
mplayer_put_key((MOUSE_BTN0 + [theEvent buttonNumber]) | MP_KEY_DOWN);
mplayer_put_key((MOUSE_BTN0 + buttonNumber) | MP_KEY_DOWN);
break;
case NSLeftMouseUp:
case NSRightMouseUp:
case NSOtherMouseUp:
mplayer_put_key(MOUSE_BTN0 + [theEvent buttonNumber]);
mplayer_put_key(MOUSE_BTN0 + buttonNumber);
break;
}
}

8
libvo/vo_quartz.c
View File

@ -328,10 +328,10 @@ static OSStatus MouseEventHandler(EventHandlerCallRef nextHandler, EventRef even
mplayer_put_key(MOUSE_BTN0);
break;
case kEventMouseButtonSecondary:
mplayer_put_key(MOUSE_BTN1);
mplayer_put_key(MOUSE_BTN2);
break;
case kEventMouseButtonTertiary:
mplayer_put_key(MOUSE_BTN2);
mplayer_put_key(MOUSE_BTN1);
break;
default:result = eventNotHandledErr;break;
@ -358,10 +358,10 @@ static OSStatus MouseEventHandler(EventHandlerCallRef nextHandler, EventRef even
mplayer_put_key(MOUSE_BTN0 | MP_KEY_DOWN);
break;
case kEventMouseButtonSecondary:
mplayer_put_key(MOUSE_BTN1 | MP_KEY_DOWN);
mplayer_put_key(MOUSE_BTN2 | MP_KEY_DOWN);
break;
case kEventMouseButtonTertiary:
mplayer_put_key(MOUSE_BTN2 | MP_KEY_DOWN);
mplayer_put_key(MOUSE_BTN1 | MP_KEY_DOWN);
break;
default:result = eventNotHandledErr;break;