marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemac: For SetCursorPos(), reset positions of pending mouse button and scroll events. 

They are effectively deemed to have happened after the SetCursorPos().
oldstable
Ken Thomases 2013-04-26 04:06:12 -05:00 committed by Alexandre Julliard
parent a6722029e5
commit 51129752bc
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/winemac.drv/cocoa_app.m
View File

@ -1032,8 +1032,8 @@ int macdrv_err_on;
{
[self clipCursorLocation:&pos];
ret = [self warpCursorTo:&pos from:NULL];
synthesizedLocation = pos;
ret = [self warpCursorTo:&synthesizedLocation from:NULL];
if (ret)
{
// We want to discard mouse-move events that have already been
@ -1076,6 +1076,7 @@ int macdrv_err_on;
[queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED) |
event_mask_for_type(MOUSE_MOVED_ABSOLUTE)
forWindow:nil];
[queue resetMouseEventPositions:pos];
}
[eventQueuesLock unlock];
}

2
dlls/winemac.drv/cocoa_event.h
View File

@ -42,6 +42,8 @@
- (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents;
- (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout;
- (void) resetMouseEventPositions:(CGPoint)pos;
@end
void OnMainThread(dispatch_block_t block);

23
dlls/winemac.drv/cocoa_event.m
View File

@ -280,6 +280,29 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea
return [self query:query timeout:timeout processEvents:FALSE];
}
- (void) resetMouseEventPositions:(CGPoint)pos
{
MacDrvEvent* event;
[eventsLock lock];
for (event in events)
{
if (event->event->type == MOUSE_BUTTON)
{
event->event->mouse_button.x = pos.x;
event->event->mouse_button.y = pos.y;
}
else if (event->event->type == MOUSE_SCROLL)
{
event->event->mouse_scroll.x = pos.x;
event->event->mouse_scroll.y = pos.y;
}
}
[eventsLock unlock];
}
/***********************************************************************
* OnMainThread