4545static bool keyChangeShift =false ;
4646static bool keyChangeOption =false ;
4747static bool keyChangeCapsLock =false ;
48+ /* Keep track of the current mouse up/down state for open/closed cursor hand*/
49+ static bool leftMouseGrabbing =false ;
4850
4951/* -------------------------- Helper function ----------------------------*/
5052
@@ -457,7 +459,13 @@ int mpl_check_modifier(
457459case 1 : [[NSCursor arrowCursor ]set ];break ;
458460case 2 : [[NSCursor pointingHandCursor ]set ];break ;
459461case 3 : [[NSCursor crosshairCursor ]set ];break ;
460- case 4 : [[NSCursor openHandCursor ]set ];break ;
462+ case 4 :
463+ if (leftMouseGrabbing) {
464+ [[NSCursor closedHandCursor ]set ];
465+ }else {
466+ [[NSCursor openHandCursor ]set ];
467+ }
468+ break ;
461469/* OSX handles busy state itself so no need to set a cursor here*/
462470case 5 :break ;
463471case 6 : [[NSCursor resizeLeftRightCursor ]set ];break ;
@@ -1503,8 +1511,10 @@ - (void)mouseDown:(NSEvent *)event
15031511else
15041512 {
15051513 button =1 ;
1506- if ([NSCursor currentCursor ]==[NSCursor openHandCursor ])
1514+ if ([NSCursor currentCursor ]==[NSCursor openHandCursor ]) {
1515+ leftMouseGrabbing =true ;
15071516 [[NSCursor closedHandCursor ]set ];
1517+ }
15081518 }
15091519break ;
15101520 }
@@ -1531,6 +1541,7 @@ - (void)mouseUp:(NSEvent *)event
15311541 y = location.y * device_scale;
15321542switch ([eventtype ])
15331543 {case NSEventTypeLeftMouseUp:
1544+ leftMouseGrabbing =false ;
15341545 button =1 ;
15351546if ([NSCursor currentCursor ]==[NSCursor closedHandCursor ])
15361547 [[NSCursor openHandCursor ]set ];