From 8fe4aa94ee7e5400450c124397c8edabfd6d726b Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Tue, 8 Aug 2017 21:34:47 +1000 Subject: cocoa: fix button numbering for back/forward It seems like the Cocoa backend used to return the same mpv keycodes for mouse back/forward as it did for scrolling up and down. Fix this by explicitly mapping all Cocoa button numbers to the right mpv keycodes. --- video/out/cocoa/events_view.m | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'video') diff --git a/video/out/cocoa/events_view.m b/video/out/cocoa/events_view.m index 7a95bb9442..0bf434caf3 100644 --- a/video/out/cocoa/events_view.m +++ b/video/out/cocoa/events_view.m @@ -291,7 +291,7 @@ - (void)putMouseEvent:(NSEvent *)event withState:(int)state { self.hasMouseDown = (state == MP_KEY_STATE_DOWN); - int mpkey = (MP_MOUSE_BASE + [self mpvButtonNumber:event]); + int mpkey = [self mpvButtonNumber:event]; [self.adapter putKey:(mpkey | state) withModifiers:[event modifierFlags]]; } @@ -326,9 +326,12 @@ { int buttonNumber = [event buttonNumber]; switch (buttonNumber) { - case 1: return 2; - case 2: return 1; - default: return buttonNumber; + case 0: return MP_MBTN_LEFT; + case 1: return MP_MBTN_RIGHT; + case 2: return MP_MBTN_MID; + case 3: return MP_MBTN_BACK; + case 4: return MP_MBTN_FORWARD; + default: return MP_MBTN9 - 5 + buttonNumber; } } @end -- cgit v1.2.3