wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Nikolay Sivov : xmllite: Handle E_PENDING from stream for comment nodes.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 9d664b2217c6b2b508f15fdd1cc152912fdbc832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d664b2217c6b2b508f15fdd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 11:17:27 2013 +0400 xmllite: Handle E_PENDING from stream for comment nodes. --- dlls/xmllite/reader.c | 89 +++++++++++++++++++++++++++++++++++------- dlls/xmllite/tests/reader.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d664b2217c6b2b508f15…

1 0

Ken Thomases : winemac: Implement an APP_DEACTIVATED event.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: b564d972294fca82f3ebb3edf4600e69adb89f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b564d972294fca82f3ebb3edf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:56 2013 -0600 winemac: Implement an APP_DEACTIVATED event. --- dlls/winemac.drv/cocoa_app.m | 11 +++++++++++ dlls/winemac.drv/event.c | 5 +++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 15 +++++++++++++++ 5 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 54a6d50..7b12185 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -179,7 +179,18 @@ int macdrv_err_on; */ - (void)applicationDidResignActive:(NSNotification *)notification { + macdrv_event event; + WineEventQueue* queue; + [self invalidateGotFocusEvents]; + + event.type = APP_DEACTIVATED; + event.window = NULL; + + [eventQueuesLock lock]; + for (queue in eventQueues) + [queue postEvent:&event]; + [eventQueuesLock unlock]; } - (void)applicationWillFinishLaunching:(NSNotification *)notification diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 634fe52..654e691 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(event); static const char *dbgstr_event(int type) { static const char * const event_names[] = { + "APP_DEACTIVATED", "MOUSE_BUTTON", "WINDOW_CLOSE_REQUESTED", "WINDOW_FRAME_CHANGED", @@ -58,6 +59,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) if (mask & QS_POSTMESSAGE) { + event_mask |= event_mask_for_type(APP_DEACTIVATED); event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_FRAME_CHANGED); event_mask |= event_mask_for_type(WINDOW_GOT_FOCUS); @@ -85,6 +87,9 @@ void macdrv_handle_event(macdrv_event *event) switch (event->type) { + case APP_DEACTIVATED: + macdrv_app_deactivated(); + break; case MOUSE_BUTTON: macdrv_mouse_button(hwnd, event); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index e6c747f..d1b73fe 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -121,6 +121,7 @@ extern void macdrv_window_close_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_frame_changed(HWND hwnd, CGRect frame) DECLSPEC_HIDDEN; extern void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_lost_focus(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_app_deactivated(void) DECLSPEC_HIDDEN; extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 2084d78..dcdf91d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -124,6 +124,7 @@ extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDE /* event */ enum { + APP_DEACTIVATED, MOUSE_BUTTON, WINDOW_CLOSE_REQUESTED, WINDOW_FRAME_CHANGED, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 5356687..810d3ae 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1469,3 +1469,18 @@ void macdrv_window_lost_focus(HWND hwnd, const macdrv_event *event) if (hwnd == GetForegroundWindow()) SendMessageW(hwnd, WM_CANCELMODE, 0, 0); } + + +/*********************************************************************** + * macdrv_app_deactivated + * + * Handler for APP_DEACTIVATED events. + */ +void macdrv_app_deactivated(void) +{ + if (GetActiveWindow() == GetForegroundWindow()) + { + TRACE("setting fg to desktop\n"); + SetForegroundWindow(GetDesktopWindow()); + } +}

1 0

Ken Thomases : winemac: Implement a WINDOW_LOST_FOCUS event.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 3c5973139fa61d24d1e980de48c592da1dacafd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5973139fa61d24d1e980de4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:53 2013 -0600 winemac: Implement a WINDOW_LOST_FOCUS event. --- dlls/winemac.drv/cocoa_window.m | 11 +++++++++++ dlls/winemac.drv/event.c | 5 +++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 16 ++++++++++++++++ 5 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a6e6856..e5e78f9 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -556,6 +556,17 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) [self windowDidResize:notification]; } + - (void)windowDidResignKey:(NSNotification *)notification + { + macdrv_event event; + + if (causing_becomeKeyWindow) return; + + event.type = WINDOW_LOST_FOCUS; + event.window = (macdrv_window)[self retain]; + [queue postEvent:&event]; + } + - (void)windowDidResize:(NSNotification *)notification { macdrv_event event; diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 969c5e7..634fe52 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -36,6 +36,7 @@ static const char *dbgstr_event(int type) "WINDOW_CLOSE_REQUESTED", "WINDOW_FRAME_CHANGED", "WINDOW_GOT_FOCUS", + "WINDOW_LOST_FOCUS", }; if (0 <= type && type < NUM_EVENT_TYPES) return event_names[type]; @@ -60,6 +61,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_FRAME_CHANGED); event_mask |= event_mask_for_type(WINDOW_GOT_FOCUS); + event_mask |= event_mask_for_type(WINDOW_LOST_FOCUS); } return event_mask; @@ -95,6 +97,9 @@ void macdrv_handle_event(macdrv_event *event) case WINDOW_GOT_FOCUS: macdrv_window_got_focus(hwnd, event); break; + case WINDOW_LOST_FOCUS: + macdrv_window_lost_focus(hwnd, event); + break; default: TRACE(" ignoring\n"); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 0be4b59..e6c747f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -120,6 +120,7 @@ extern void set_surface_use_alpha(struct window_surface *window_surface, BOOL us extern void macdrv_window_close_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_frame_changed(HWND hwnd, CGRect frame) DECLSPEC_HIDDEN; extern void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_window_lost_focus(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 35229ba..2084d78 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -128,6 +128,7 @@ enum { WINDOW_CLOSE_REQUESTED, WINDOW_FRAME_CHANGED, WINDOW_GOT_FOCUS, + WINDOW_LOST_FOCUS, NUM_EVENT_TYPES }; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index c87897a..5356687 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1453,3 +1453,19 @@ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) TRACE("win %p/%p rejecting focus\n", hwnd, event->window); macdrv_window_rejected_focus(event); } + + +/*********************************************************************** + * macdrv_window_lost_focus + * + * Handler for WINDOW_LOST_FOCUS events. + */ +void macdrv_window_lost_focus(HWND hwnd, const macdrv_event *event) +{ + if (!hwnd) return; + + TRACE("win %p/%p fg %p\n", hwnd, event->window, GetForegroundWindow()); + + if (hwnd == GetForegroundWindow()) + SendMessageW(hwnd, WM_CANCELMODE, 0, 0); +}

1 0

Ken Thomases : winemac: Implement a WINDOW_GOT_FOCUS event for when Cocoa tries to focus a window.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 7863a230ec8412506d3256c20a1940d9bddb9776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7863a230ec8412506d3256c20… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:48 2013 -0600 winemac: Implement a WINDOW_GOT_FOCUS event for when Cocoa tries to focus a window. --- dlls/winemac.drv/cocoa_app.h | 5 +++ dlls/winemac.drv/cocoa_app.m | 70 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/cocoa_event.m | 7 ++++ dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 32 +++++++++++++++++- dlls/winemac.drv/event.c | 5 +++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 7 ++++ dlls/winemac.drv/window.c | 34 +++++++++++++++++++ 9 files changed, 162 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7863a230ec8412506d325…

1 0

Ken Thomases : winemac: Maintain a list of which windows have been "key" ( focused) recently.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: beccf0f8c0598191afc334f0a5d9d84686d67df2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beccf0f8c0598191afc334f0a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:45 2013 -0600 winemac: Maintain a list of which windows have been "key" (focused) recently. --- dlls/winemac.drv/cocoa_app.h | 2 ++ dlls/winemac.drv/cocoa_app.m | 31 ++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 0955dea..40f9e9d 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -35,6 +35,8 @@ NSLock* eventQueuesLock; NSTimeInterval eventTimeAdjustment; + + NSMutableArray* keyWindows; } - (void) transformProcessToForeground; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 638e642..c69f09e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -34,7 +34,9 @@ int macdrv_err_on; eventQueues = [[NSMutableArray alloc] init]; eventQueuesLock = [[NSLock alloc] init]; - if (!eventQueues || !eventQueuesLock) + keyWindows = [[NSMutableArray alloc] init]; + + if (!eventQueues || !eventQueuesLock || !keyWindows) { [self release]; return nil; @@ -45,6 +47,7 @@ int macdrv_err_on; - (void) dealloc { + [keyWindows release]; [eventQueues release]; [eventQueuesLock release]; [super dealloc]; @@ -118,6 +121,32 @@ int macdrv_err_on; return (eventTime + eventTimeAdjustment) * 1000; } + + /* + * ---------- NSApplicationDelegate methods ---------- + */ + - (void)applicationWillFinishLaunching:(NSNotification *)notification + { + NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; + + [nc addObserverForName:NSWindowDidBecomeKeyNotification + object:nil + queue:nil + usingBlock:^(NSNotification *note){ + NSWindow* window = [note object]; + [keyWindows removeObjectIdenticalTo:window]; + [keyWindows insertObject:window atIndex:0]; + }]; + + [nc addObserverForName:NSWindowWillCloseNotification + object:nil + queue:[NSOperationQueue mainQueue] + usingBlock:^(NSNotification *note){ + NSWindow* window = [note object]; + [keyWindows removeObjectIdenticalTo:window]; + }]; + } + @end /***********************************************************************

1 0

Ken Thomases : winemac: Take control over when a window can become focused away from Cocoa.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 6cde62ac18c9845c6f339b273a821135f7bf6794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cde62ac18c9845c6f339b273… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:41 2013 -0600 winemac: Take control over when a window can become focused away from Cocoa. --- dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 56 ++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 34 ++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 5 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 1f81cc6..7708fa6 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -45,6 +45,8 @@ CGFloat colorKeyRed, colorKeyGreen, colorKeyBlue; BOOL usePerPixelAlpha; + + BOOL causing_becomeKeyWindow; } @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 402db30..c1f90d2 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -440,14 +440,52 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) [queue postEvent:&event]; } + - (void) makeFocused + { + NSArray* screens; + + [NSApp transformProcessToForeground]; + + /* If a borderless window is offscreen, orderFront: won't move + it onscreen like it would for a titled window. Do that ourselves. */ + screens = [NSScreen screens]; + if (!([self styleMask] & NSTitledWindowMask) && ![self isVisible] && + !frame_intersects_screens([self frame], screens)) + { + NSScreen* primaryScreen = [screens objectAtIndex:0]; + NSRect frame = [primaryScreen frame]; + [self setFrameTopLeftPoint:NSMakePoint(NSMinX(frame), NSMaxY(frame))]; + frame = [self constrainFrameRect:[self frame] toScreen:primaryScreen]; + [self setFrame:frame display:YES]; + } + + [self orderFront:nil]; + causing_becomeKeyWindow = TRUE; + [self makeKeyWindow]; + causing_becomeKeyWindow = FALSE; + if (latentParentWindow) + { + [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; + self.latentParentWindow = nil; + } + if (![self isExcludedFromWindowsMenu]) + [NSApp addWindowsItem:self title:[self title] filename:NO]; + + /* Cocoa may adjust the frame when the window is ordered onto the screen. + Generate a frame-changed event just in case. The back end will ignore + it if nothing actually changed. */ + [self windowDidResize:nil]; + } + /* * ---------- NSWindow method overrides ---------- */ - (BOOL) canBecomeKeyWindow { + if (causing_becomeKeyWindow) return YES; if (self.disabled || self.noActivate) return NO; - return YES; + return [self isKeyWindow]; } - (BOOL) canBecomeMainWindow @@ -841,3 +879,19 @@ void macdrv_window_use_per_pixel_alpha(macdrv_window w, int use_per_pixel_alpha) [pool release]; } + +/*********************************************************************** + * macdrv_give_cocoa_window_focus + * + * Makes the Cocoa window "key" (gives it keyboard focus). This also + * orders it front and, if its frame was not within the desktop bounds, + * Cocoa will typically move it on-screen. + */ +void macdrv_give_cocoa_window_focus(macdrv_window w) +{ + WineWindow* window = (WineWindow*)w; + + OnMainThread(^{ + [window makeFocused]; + }); +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 4827d40..4b7de10 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -205,5 +205,6 @@ extern void macdrv_set_window_color_key(macdrv_window w, CGFloat keyRed, CGFloat CGFloat keyBlue) DECLSPEC_HIDDEN; extern void macdrv_clear_window_color_key(macdrv_window w) DECLSPEC_HIDDEN; extern void macdrv_window_use_per_pixel_alpha(macdrv_window w, int use_per_pixel_alpha) DECLSPEC_HIDDEN; +extern void macdrv_give_cocoa_window_focus(macdrv_window w) DECLSPEC_HIDDEN; #endif /* __WINE_MACDRV_COCOA_H */ diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a08e896..74894e9 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -43,6 +43,9 @@ static CRITICAL_SECTION win_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static CFMutableDictionaryRef win_datas; +void CDECL macdrv_SetFocus(HWND hwnd); + + /*********************************************************************** * get_cocoa_window_features */ @@ -154,6 +157,12 @@ static void show_window(struct macdrv_win_data *data) TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, NULL, NULL); + if (data->on_screen) + { + HWND hwndFocus = GetFocus(); + if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) + macdrv_SetFocus(hwndFocus); + } } @@ -820,6 +829,31 @@ void CDECL macdrv_DestroyWindow(HWND hwnd) } +/***************************************************************** + * SetFocus (MACDRV.@) + * + * Set the Mac focus. + */ +void CDECL macdrv_SetFocus(HWND hwnd) +{ + struct macdrv_win_data *data; + + TRACE("%p\n", hwnd); + + if (!(hwnd = GetAncestor(hwnd, GA_ROOT))) return; + if (!(data = get_win_data(hwnd))) return; + + if (data->cocoa_window) + { + /* Set Mac focus */ + macdrv_give_cocoa_window_focus(data->cocoa_window); + data->on_screen = TRUE; + } + + release_win_data(data); +} + + /*********************************************************************** * SetLayeredWindowAttributes (MACDRV.@) * diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 73e78ca..a0e1ab8 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -10,6 +10,7 @@ @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx +@ cdecl SetFocus(long) macdrv_SetFocus @ cdecl SetLayeredWindowAttributes(long long long long) macdrv_SetLayeredWindowAttributes @ cdecl SetParent(long long long) macdrv_SetParent @ cdecl SetWindowRgn(long long long) macdrv_SetWindowRgn

1 0

Ken Thomases : winemac: Implement a MOUSE_BUTTON event for mouse clicks.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: bd269786a505931c82f7fe93c6cc6d76102daac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd269786a505931c82f7fe93c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:37 2013 -0600 winemac: Implement a MOUSE_BUTTON event for mouse clicks. --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/cocoa_window.m | 35 +++++++++++ dlls/winemac.drv/event.c | 7 ++ dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 8 +++ dlls/winemac.drv/mouse.c | 122 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 175 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 1de19ef..8484db8 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ event.c \ gdi.c \ macdrv_main.c \ + mouse.c \ surface.c \ window.c diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index c05adae..402db30 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -158,6 +158,13 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) } } + /* By default, NSView will swallow right-clicks in an attempt to support contextual + menus. We need to bypass that and allow the event to make it to the window. */ + - (void) rightMouseDown:(NSEvent*)theEvent + { + [[self window] rightMouseDown:theEvent]; + } + @end @@ -417,6 +424,22 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) [self checkTransparency]; } + - (void) postMouseButtonEvent:(NSEvent *)theEvent pressed:(int)pressed + { + CGPoint pt = CGEventGetLocation([theEvent CGEvent]); + macdrv_event event; + + event.type = MOUSE_BUTTON; + event.window = (macdrv_window)[self retain]; + event.mouse_button.button = [theEvent buttonNumber]; + event.mouse_button.pressed = pressed; + event.mouse_button.x = pt.x; + event.mouse_button.y = pt.y; + event.mouse_button.time_ms = [NSApp ticksForEventTime:[theEvent timestamp]]; + + [queue postEvent:&event]; + } + /* * ---------- NSWindow method overrides ---------- @@ -446,6 +469,18 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) /* + * ---------- NSResponder method overrides ---------- + */ + - (void) mouseDown:(NSEvent *)theEvent { [self postMouseButtonEvent:theEvent pressed:1]; } + - (void) rightMouseDown:(NSEvent *)theEvent { [self mouseDown:theEvent]; } + - (void) otherMouseDown:(NSEvent *)theEvent { [self mouseDown:theEvent]; } + + - (void) mouseUp:(NSEvent *)theEvent { [self postMouseButtonEvent:theEvent pressed:0]; } + - (void) rightMouseUp:(NSEvent *)theEvent { [self mouseUp:theEvent]; } + - (void) otherMouseUp:(NSEvent *)theEvent { [self mouseUp:theEvent]; } + + + /* * ---------- NSWindowDelegate methods ---------- */ - (void)windowDidMove:(NSNotification *)notification diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index da41884..4d35082 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(event); static const char *dbgstr_event(int type) { static const char * const event_names[] = { + "MOUSE_BUTTON", "WINDOW_CLOSE_REQUESTED", "WINDOW_FRAME_CHANGED", }; @@ -50,6 +51,9 @@ static macdrv_event_mask get_event_mask(DWORD mask) if ((mask & QS_ALLINPUT) == QS_ALLINPUT) return -1; + if (mask & QS_MOUSEBUTTON) + event_mask |= event_mask_for_type(MOUSE_BUTTON); + if (mask & QS_POSTMESSAGE) { event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); @@ -77,6 +81,9 @@ void macdrv_handle_event(macdrv_event *event) switch (event->type) { + case MOUSE_BUTTON: + macdrv_mouse_button(hwnd, event); + break; case WINDOW_CLOSE_REQUESTED: macdrv_window_close_requested(hwnd); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index c40fb86..378b4ab 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -120,4 +120,6 @@ extern void set_surface_use_alpha(struct window_surface *window_surface, BOOL us extern void macdrv_window_close_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_frame_changed(HWND hwnd, CGRect frame) DECLSPEC_HIDDEN; +extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; + #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 70be367..4827d40 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -122,6 +122,7 @@ extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDE /* event */ enum { + MOUSE_BUTTON, WINDOW_CLOSE_REQUESTED, WINDOW_FRAME_CHANGED, NUM_EVENT_TYPES @@ -134,6 +135,13 @@ typedef struct macdrv_event { macdrv_window window; union { struct { + int button; + int pressed; + int x; + int y; + unsigned long time_ms; + } mouse_button; + struct { CGRect frame; } window_frame_changed; }; diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c new file mode 100644 index 0000000..31d3db0 --- /dev/null +++ b/dlls/winemac.drv/mouse.c @@ -0,0 +1,122 @@ +/* + * MACDRV mouse driver + * + * Copyright 1998 Ulrich Weigand + * Copyright 2007 Henri Verbeet + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include "macdrv.h" +#include "winuser.h" +#include "wine/server.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cursor); + + +/*********************************************************************** + * send_mouse_input + * + * Update the various window states on a mouse event. + */ +static void send_mouse_input(HWND hwnd, UINT flags, int x, int y, + DWORD mouse_data, unsigned long time) +{ + INPUT input; + HWND top_level_hwnd; + + top_level_hwnd = GetAncestor(hwnd, GA_ROOT); + + if ((flags & MOUSEEVENTF_MOVE) && (flags & MOUSEEVENTF_ABSOLUTE)) + { + RECT rect; + + /* update the wine server Z-order */ + SetRect(&rect, x, y, x + 1, y + 1); + MapWindowPoints(0, top_level_hwnd, (POINT *)&rect, 2); + + SERVER_START_REQ(update_window_zorder) + { + req->window = wine_server_user_handle(top_level_hwnd); + req->rect.left = rect.left; + req->rect.top = rect.top; + req->rect.right = rect.right; + req->rect.bottom = rect.bottom; + wine_server_call(req); + } + SERVER_END_REQ; + } + + input.type = INPUT_MOUSE; + input.mi.dx = x; + input.mi.dy = y; + input.mi.mouseData = mouse_data; + input.mi.dwFlags = flags; + input.mi.time = time; + input.mi.dwExtraInfo = 0; + + __wine_send_input(top_level_hwnd, &input); +} + + +/*********************************************************************** + * macdrv_mouse_button + * + * Handler for MOUSE_BUTTON events. + */ +void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) +{ + UINT flags = 0; + WORD data = 0; + + TRACE("win %p button %d %s at (%d,%d) time %lu (%lu ticks ago)\n", hwnd, event->mouse_button.button, + (event->mouse_button.pressed ? "pressed" : "released"), + event->mouse_button.x, event->mouse_button.y, + event->mouse_button.time_ms, (GetTickCount() - event->mouse_button.time_ms)); + + if (event->mouse_button.pressed) + { + switch (event->mouse_button.button) + { + case 0: flags |= MOUSEEVENTF_LEFTDOWN; break; + case 1: flags |= MOUSEEVENTF_RIGHTDOWN; break; + case 2: flags |= MOUSEEVENTF_MIDDLEDOWN; break; + default: + flags |= MOUSEEVENTF_XDOWN; + data = 1 << (event->mouse_button.button - 3); + break; + } + } + else + { + switch (event->mouse_button.button) + { + case 0: flags |= MOUSEEVENTF_LEFTUP; break; + case 1: flags |= MOUSEEVENTF_RIGHTUP; break; + case 2: flags |= MOUSEEVENTF_MIDDLEUP; break; + default: + flags |= MOUSEEVENTF_XUP; + data = 1 << (event->mouse_button.button - 3); + break; + } + } + + send_mouse_input(hwnd, flags | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, + event->mouse_button.x, event->mouse_button.y, + data, event->mouse_button.time_ms); +}

1 0

Ken Thomases : winemac: Add infrastructure to convert from Cocoa event time to Wine tick count.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: a22be47fcf172793a67b851fd8c4b00c97b71072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22be47fcf172793a67b851fd… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:33 2013 -0600 winemac: Add infrastructure to convert from Cocoa event time to Wine tick count. --- dlls/winemac.drv/cocoa_app.h | 5 +++++ dlls/winemac.drv/cocoa_app.m | 10 ++++++++++ dlls/winemac.drv/cocoa_main.m | 36 +++++++++++++++++++++++++++--------- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 +- 5 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 490c2ee..0955dea 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -33,6 +33,8 @@ { NSMutableArray* eventQueues; NSLock* eventQueuesLock; + + NSTimeInterval eventTimeAdjustment; } - (void) transformProcessToForeground; @@ -40,6 +42,9 @@ - (BOOL) registerEventQueue:(WineEventQueue*)queue; - (void) unregisterEventQueue:(WineEventQueue*)queue; + - (void) computeEventTimeAdjustmentFromTicks:(unsigned long long)tickcount uptime:(uint64_t)uptime_ns; + - (double) ticksForEventTime:(NSTimeInterval)eventTime; + @end void OnMainThread(dispatch_block_t block); diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index bcdfee0..638e642 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -108,6 +108,16 @@ int macdrv_err_on; [eventQueuesLock unlock]; } + - (void) computeEventTimeAdjustmentFromTicks:(unsigned long long)tickcount uptime:(uint64_t)uptime_ns + { + eventTimeAdjustment = (tickcount / 1000.0) - (uptime_ns / (double)NSEC_PER_SEC); + } + + - (double) ticksForEventTime:(NSTimeInterval)eventTime + { + return (eventTime + eventTimeAdjustment) * 1000; + } + @end /*********************************************************************** diff --git a/dlls/winemac.drv/cocoa_main.m b/dlls/winemac.drv/cocoa_main.m index d920036..f0e501d 100644 --- a/dlls/winemac.drv/cocoa_main.m +++ b/dlls/winemac.drv/cocoa_main.m @@ -19,6 +19,8 @@ */ #import <AppKit/AppKit.h> +#include <mach/mach.h> +#include <mach/mach_time.h> #include "macdrv_cocoa.h" #import "cocoa_app.h" @@ -33,6 +35,13 @@ enum { }; +struct cocoa_app_startup_info { + NSConditionLock* lock; + unsigned long long tickcount; + uint64_t uptime_ns; +}; + + /*********************************************************************** * run_cocoa_app * @@ -50,12 +59,14 @@ enum { */ static void run_cocoa_app(void* info) { - NSConditionLock* lock = info; + struct cocoa_app_startup_info* startup_info = info; + NSConditionLock* lock = startup_info->lock; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; [WineApplication sharedApplication]; [NSApp setDelegate:(WineApplication*)NSApp]; + [NSApp computeEventTimeAdjustmentFromTicks:startup_info->tickcount uptime:startup_info->uptime_ns]; /* Retain the lock while we're using it, so macdrv_start_cocoa_app() doesn't deallocate it in the middle of us unlocking it. */ @@ -78,11 +89,13 @@ static void run_cocoa_app(void* info) * * Returns 0 on success, non-zero on failure. */ -int macdrv_start_cocoa_app(void) +int macdrv_start_cocoa_app(unsigned long long tickcount) { int ret = -1; CFRunLoopSourceRef source; - NSConditionLock* lock; + struct cocoa_app_startup_info startup_info; + uint64_t uptime_mach = mach_absolute_time(); + mach_timebase_info_data_t mach_timebase; NSDate* timeLimit; CFRunLoopSourceContext source_context = { 0 }; @@ -94,29 +107,34 @@ int macdrv_start_cocoa_app(void) toTarget:[NSThread class] withObject:nil]; - lock = [[NSConditionLock alloc] initWithCondition:COCOA_APP_NOT_RUNNING]; + startup_info.lock = [[NSConditionLock alloc] initWithCondition:COCOA_APP_NOT_RUNNING]; + startup_info.tickcount = tickcount; + + mach_timebase_info(&mach_timebase); + startup_info.uptime_ns = uptime_mach * mach_timebase.numer / mach_timebase.denom; + timeLimit = [NSDate dateWithTimeIntervalSinceNow:5]; - source_context.info = lock; + source_context.info = &startup_info; source_context.perform = run_cocoa_app; source = CFRunLoopSourceCreate(NULL, 0, &source_context); - if (source && lock && timeLimit) + if (source && startup_info.lock && timeLimit) { CFRunLoopAddSource(CFRunLoopGetMain(), source, kCFRunLoopCommonModes); CFRunLoopSourceSignal(source); CFRunLoopWakeUp(CFRunLoopGetMain()); - if ([lock lockWhenCondition:COCOA_APP_RUNNING beforeDate:timeLimit]) + if ([startup_info.lock lockWhenCondition:COCOA_APP_RUNNING beforeDate:timeLimit]) { - [lock unlock]; + [startup_info.lock unlock]; ret = 0; } } if (source) CFRelease(source); - [lock release]; + [startup_info.lock release]; [pool release]; return ret; } diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 550c63e..70be367 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -112,7 +112,7 @@ struct macdrv_display { /* main */ extern int macdrv_err_on; -extern int macdrv_start_cocoa_app(void) DECLSPEC_HIDDEN; +extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; /* display */ diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2a9e0ac..a21390d 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -40,7 +40,7 @@ static BOOL process_attach(void) if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; macdrv_err_on = ERR_ON(macdrv); - if (macdrv_start_cocoa_app()) + if (macdrv_start_cocoa_app(GetTickCount64())) { ERR("Failed to start Cocoa app main loop\n"); return FALSE;

1 0

Ken Thomases : winemac: Implement WINDOW_FRAME_CHANGED event to tell Wine when window is moved or resized .
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 6e59740e18ed41579016013ee614234e2d9bf9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e59740e18ed41579016013ee… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:29 2013 -0600 winemac: Implement WINDOW_FRAME_CHANGED event to tell Wine when window is moved or resized. --- dlls/winemac.drv/cocoa_window.m | 53 ++++++++++++++++++ dlls/winemac.drv/event.c | 7 ++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 7 ++ dlls/winemac.drv/window.c | 110 ++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/winemac.drv.spec | 1 + 6 files changed, 177 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e59740e18ed415790160…

1 0

Michael Stefaniuc : wined3d: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: b28aff0dd72686774dfe159daf92b29cbb86ec21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28aff0dd72686774dfe159da… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 27 22:57:20 2013 +0100 wined3d: Use assignment instead of memcpy to copy structs. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/stateblock.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 31ee94a..2fd5108 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6448,7 +6448,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi return; } - memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); + new_desc->parent.settings = settings; new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 75d1dfe..5657732 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -861,7 +861,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined new_desc->num_textures_used = i + 1; } - memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); + new_desc->parent.settings = settings; new_desc->shader = gen_ati_shader(settings.op, gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 10104e1..6f55dc3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1168,11 +1168,11 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL)); /* Set some of the defaults for lights, transforms etc */ - memcpy(&state->transforms[WINED3D_TS_PROJECTION], &identity, sizeof(identity)); - memcpy(&state->transforms[WINED3D_TS_VIEW], &identity, sizeof(identity)); + state->transforms[WINED3D_TS_PROJECTION] = identity; + state->transforms[WINED3D_TS_VIEW] = identity; for (i = 0; i < 256; ++i) { - memcpy(&state->transforms[WINED3D_TS_WORLD_MATRIX(i)], &identity, sizeof(identity)); + state->transforms[WINED3D_TS_WORLD_MATRIX(i)] = identity; } state->fb = &device->fb; @@ -1313,7 +1313,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) for (i = 0; i < MAX_TEXTURES; ++i) { TRACE("Setting up default texture states for texture Stage %u.\n", i); - memcpy(&state->transforms[WINED3D_TS_TEXTURE0 + i], &identity, sizeof(identity)); + state->transforms[WINED3D_TS_TEXTURE0 + i] = identity; state->texture_states[i][WINED3D_TSS_COLOR_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_MODULATE; state->texture_states[i][WINED3D_TSS_COLOR_ARG1] = WINED3DTA_TEXTURE; state->texture_states[i][WINED3D_TSS_COLOR_ARG2] = WINED3DTA_CURRENT;

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013