summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-18 14:48:30 +0000
committerulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-18 14:48:30 +0000
commit20b1f841a69c0388b7719cbce6e03c6708020402 (patch)
treead9dce1ad46f231c2ed5721caa741b1274962204 /libvo
parent007988abf8c17199068b9cd138209b3bc86a4815 (diff)
downloadmpv-20b1f841a69c0388b7719cbce6e03c6708020402.tar.bz2
mpv-20b1f841a69c0388b7719cbce6e03c6708020402.tar.xz
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
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_macosx.m10
-rw-r--r--libvo/vo_quartz.c8
2 files changed, 12 insertions, 6 deletions
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m
index 0cc3645061..8d3c68b541 100644
--- a/libvo/vo_macosx.m
+++ b/libvo/vo_macosx.m
@@ -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;
}
}
diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c
index 017b0e12b0..240291bbf8 100644
--- a/libvo/vo_quartz.c
+++ b/libvo/vo_quartz.c
@@ -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;