cocoa_common: fix double click handling

The Cocoa framework generates only a NS*MouseDown event when handling
the second click of a double click (no NS*MouseUp). If that's the case
put mouse up key in mplayer2's fifo when dealing with the MouseDown
Cocoa event.

1 files changed, 8 insertions, 8 deletions

diff --git a/libvo/cocoa_common.m b/libvo/cocoa_common.m
index 36f5e2471f..007ecd1e02 100644
--- a/libvo/cocoa_common.m
+++ b/libvo/cocoa_common.m
@@ -486,23 +486,23 @@ void create_menu()
 
 - (void) mouseEvent:(NSEvent *)theEvent
 {
-    if ( [theEvent buttonNumber] >= 0 && [theEvent buttonNumber] <= 9 )
-    {
+    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 == 2)
-            buttonNumber = 1;
+        if (buttonNumber == 1)  buttonNumber = 2;
+        else if (buttonNumber == 2) buttonNumber = 1;
         switch ([theEvent type]) {
             case NSLeftMouseDown:
-                break;
             case NSRightMouseDown:
             case NSOtherMouseDown:
                 mplayer_put_key(l_vo->key_fifo, (MOUSE_BTN0 + buttonNumber) | MP_KEY_DOWN);
+                // Looks like Cocoa doesn't create MouseUp events when we are
+                // doing the second click in a double click. Put in the key_fifo
+                // the key that would be put from the MouseUp handling code.
+                if([theEvent clickCount] == 2)
+                   mplayer_put_key(l_vo->key_fifo, MOUSE_BTN0 + buttonNumber);
                 break;
             case NSLeftMouseUp:
-                break;
             case NSRightMouseUp:
             case NSOtherMouseUp:
                 mplayer_put_key(l_vo->key_fifo, MOUSE_BTN0 + buttonNumber);