ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemac: Request mouse move events when our window is active even when cursor is outside it.

This commit is contained in:
Ken Thomases 2013-02-24 22:53:37 -06:00 committed by Alexandre Julliard
parent 0a56ef356a
commit 5d8e685297
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -565,7 +565,22 @@ - (void) sendEvent:(NSEvent*)anEvent
{ {
WineWindow* targetWindow; WineWindow* targetWindow;
targetWindow = (WineWindow*)[anEvent window]; /* Because of the way -[NSWindow setAcceptsMouseMovedEvents:] works, the
event indicates its window is the main window, even if the cursor is
over a different window. Find the actual WineWindow that is under the
cursor and post the event as being for that window. */
if (type == NSMouseMoved)
{
CGPoint cgpoint = CGEventGetLocation([anEvent CGEvent]);
NSPoint point = [self flippedMouseLocation:NSPointFromCGPoint(cgpoint)];
NSInteger windowUnderNumber;
windowUnderNumber = [NSWindow windowNumberAtPoint:point
belowWindowWithWindowNumber:0];
targetWindow = (WineWindow*)[self windowWithWindowNumber:windowUnderNumber];
}
else
targetWindow = (WineWindow*)[anEvent window];
if ([targetWindow isKindOfClass:[WineWindow class]]) if ([targetWindow isKindOfClass:[WineWindow class]])
{ {

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

@ -273,6 +273,7 @@ + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)w
[window disableCursorRects]; [window disableCursorRects];
[window setShowsResizeIndicator:NO]; [window setShowsResizeIndicator:NO];
[window setHasShadow:wf->shadow]; [window setHasShadow:wf->shadow];
[window setAcceptsMouseMovedEvents:YES];
[window setColorSpace:[NSColorSpace genericRGBColorSpace]]; [window setColorSpace:[NSColorSpace genericRGBColorSpace]];
[window setDelegate:window]; [window setDelegate:window];
window.hwnd = hwnd; window.hwnd = hwnd;
@ -283,6 +284,8 @@ + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)w
return nil; return nil;
[contentView setAutoresizesSubviews:NO]; [contentView setAutoresizesSubviews:NO];
/* We use tracking areas in addition to setAcceptsMouseMovedEvents:YES
because they give us mouse moves in the background. */
trackingArea = [[[NSTrackingArea alloc] initWithRect:[contentView bounds] trackingArea = [[[NSTrackingArea alloc] initWithRect:[contentView bounds]
options:(NSTrackingMouseMoved | options:(NSTrackingMouseMoved |
NSTrackingActiveAlways | NSTrackingActiveAlways |