January 2013 - Wine-commits

Henri Verbeet : d3d9/tests: Merge shader.c into device.c.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: dd9efc98521df5eb3bae1599e86f7d846d50fe4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9efc98521df5eb3bae1599e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 11 12:07:49 2013 +0100 d3d9/tests: Merge shader.c into device.c. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/device.c | 392 +++++++++++++++++++++++++++++++++++++++++-- dlls/d3d9/tests/shader.c | 334 ------------------------------------ 3 files changed, 374 insertions(+), 353 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd9efc98521df5eb3bae1…

1 0

Henri Verbeet : d3d9/tests: Merge texture.c into device.c.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 0c9713bb65ca679c701123fc07b79883fc6d4e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9713bb65ca679c701123fc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 11 12:07:50 2013 +0100 d3d9/tests: Merge texture.c into device.c. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/device.c | 540 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/texture.c | 452 ------------------------------------ 3 files changed, 540 insertions(+), 453 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c9713bb65ca679c70112…

1 0

Henri Verbeet : d3d9/tests: Merge surface.c into device.c.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 3197e364132ea978e7b105a7bd5f0df29fd5094c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3197e364132ea978e7b105a7b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 11 12:07:51 2013 +0100 d3d9/tests: Merge surface.c into device.c. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/device.c | 956 ++++++++++++++++++++++++++++++++++++++++++- dlls/d3d9/tests/surface.c | 841 ------------------------------------- 3 files changed, 955 insertions(+), 843 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3197e364132ea978e7b10…

1 0

Huw Davies : usp10: Simplify the reordering of glyphs.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 83cbc07141daba31ab93141e7f14c61798b9a5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83cbc07141daba31ab93141e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 11 11:09:19 2013 +0000 usp10: Simplify the reordering of glyphs. --- dlls/usp10/usp10.c | 40 ++++++++++++++++++---------------------- 1 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 75fe597..b77c251 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3239,6 +3239,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN HRESULT hr = S_OK; INT i; INT *lpDx; + WORD *reordered_glyphs = (WORD *)pwGlyphs; TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, @@ -3253,8 +3254,22 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2); + if (!lpDx) return E_OUTOFMEMORY; fuOptions |= ETO_PDY; + if (psa->fRTL && psa->fLogicalOrder) + { + reordered_glyphs = heap_alloc( cGlyphs * sizeof(WORD) ); + if (!reordered_glyphs) + { + heap_free( lpDx ); + return E_OUTOFMEMORY; + } + + for (i = 0; i < cGlyphs; i++) + reordered_glyphs[i] = pwGlyphs[cGlyphs - 1 - i]; + } + for (i = 0; i < cGlyphs; i++) { lpDx[i * 2] = piAdvance[i]; @@ -3269,29 +3284,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN } } - if (psa->fRTL && psa->fLogicalOrder) - { - int i; - WORD *rtlGlyphs; - - rtlGlyphs = heap_alloc(cGlyphs * sizeof(WORD)); - if (!rtlGlyphs) - { - heap_free(lpDx); - return E_OUTOFMEMORY; - } - - for (i = 0; i < cGlyphs; i++) - rtlGlyphs[i] = pwGlyphs[cGlyphs-1-i]; - - if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, rtlGlyphs, cGlyphs, lpDx)) - hr = S_FALSE; - heap_free(rtlGlyphs); - } - else - if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, lpDx)) - hr = S_FALSE; + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, reordered_glyphs, cGlyphs, lpDx)) + hr = S_FALSE; + if (reordered_glyphs != pwGlyphs) heap_free( reordered_glyphs ); heap_free(lpDx); return hr;

1 0

Huw Davies : usp10: Handle an offset of the first glyph.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: f5ab208ce81a177e50607064c0b2acf0432fae32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ab208ce81a177e50607064c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 11 11:09:20 2013 +0000 usp10: Handle an offset of the first glyph. --- dlls/usp10/usp10.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b77c251..850c486 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3275,12 +3275,20 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN lpDx[i * 2] = piAdvance[i]; lpDx[i * 2 + 1] = 0; - if (pGoffset && i > 0) + if (pGoffset) { - lpDx[(i - 1) * 2] += pGoffset[i].du; - lpDx[(i - 1) * 2 + 1] += pGoffset[i].dv; - lpDx[i * 2] -= pGoffset[i].du; - lpDx[i * 2 + 1] -= pGoffset[i].dv; + if (i == 0) + { + x += pGoffset[i].du; + y += pGoffset[i].dv; + } + else + { + lpDx[(i - 1) * 2] += pGoffset[i].du; + lpDx[(i - 1) * 2 + 1] += pGoffset[i].dv; + } + lpDx[i * 2] -= pGoffset[i].du; + lpDx[i * 2 + 1] -= pGoffset[i].dv; } }

1 0

Huw Davies : usp10: Fix the offset calculations for rtl display.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: bd08cecbb6e3e8c9fb900881120691ecae7082fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd08cecbb6e3e8c9fb9008811… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 11 11:09:21 2013 +0000 usp10: Fix the offset calculations for rtl display. --- dlls/usp10/usp10.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 850c486..b25e956 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3237,7 +3237,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN const int *piJustify, const GOFFSET *pGoffset) { HRESULT hr = S_OK; - INT i; + INT i, dir = 1; INT *lpDx; WORD *reordered_glyphs = (WORD *)pwGlyphs; @@ -3268,27 +3268,29 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN for (i = 0; i < cGlyphs; i++) reordered_glyphs[i] = pwGlyphs[cGlyphs - 1 - i]; + dir = -1; } for (i = 0; i < cGlyphs; i++) { - lpDx[i * 2] = piAdvance[i]; + int orig_index = (dir > 0) ? i : cGlyphs - 1 - i; + lpDx[i * 2] = piAdvance[orig_index]; lpDx[i * 2 + 1] = 0; if (pGoffset) { if (i == 0) { - x += pGoffset[i].du; - y += pGoffset[i].dv; + x += pGoffset[orig_index].du * dir; + y += pGoffset[orig_index].dv * dir; } else { - lpDx[(i - 1) * 2] += pGoffset[i].du; - lpDx[(i - 1) * 2 + 1] += pGoffset[i].dv; + lpDx[(i - 1) * 2] += pGoffset[orig_index].du * dir; + lpDx[(i - 1) * 2 + 1] += pGoffset[orig_index].dv * dir; } - lpDx[i * 2] -= pGoffset[i].du; - lpDx[i * 2 + 1] -= pGoffset[i].dv; + lpDx[i * 2] -= pGoffset[orig_index].du * dir; + lpDx[i * 2 + 1] -= pGoffset[orig_index].dv * dir; } }

1 0

Ken Thomases : winemac: Implement support for WS_DISABLED windows.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 064186e7394ff3070ca13101b974847a67c9e4d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=064186e7394ff3070ca13101b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 06:18:05 2013 -0600 winemac: Implement support for WS_DISABLED windows. --- dlls/winemac.drv/cocoa_window.h | 5 +++ dlls/winemac.drv/cocoa_window.m | 56 +++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/macdrv_cocoa.h | 6 ++++ dlls/winemac.drv/window.c | 16 +++++++++++ 4 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 3b9dc90..1edcd9c 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -22,4 +22,9 @@ @interface WineWindow : NSPanel <NSWindowDelegate> +{ + NSUInteger normalStyleMask; + BOOL disabled; +} + @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 608f750..848e49e 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -60,6 +60,8 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @interface WineWindow () +(a)property (nonatomic) BOOL disabled; + + (void) flipRect:(NSRect*)rect; @end @@ -77,6 +79,8 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @implementation WineWindow + @synthesize disabled; + + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame { @@ -90,6 +94,9 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) backing:NSBackingStoreBuffered defer:YES] autorelease]; + if (!window) return nil; + window->normalStyleMask = [window styleMask]; + /* Standardize windows to eliminate differences between titled and borderless windows and between NSWindow and NSPanel. */ [window setHidesOnDeactivate:NO]; @@ -115,12 +122,33 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) rect->origin.y = NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]) - NSMaxY(*rect); } + - (void) adjustFeaturesForState + { + NSUInteger style = normalStyleMask; + + if (self.disabled) + style &= ~NSResizableWindowMask; + if (style != [self styleMask]) + [self setStyleMask:style]; + + if (style & NSClosableWindowMask) + [[self standardWindowButton:NSWindowCloseButton] setEnabled:!self.disabled]; + if (style & NSMiniaturizableWindowMask) + [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!self.disabled]; + } + - (void) setWindowFeatures:(const struct macdrv_window_features*)wf { - [self setStyleMask:style_mask_for_features(wf)]; + normalStyleMask = style_mask_for_features(wf); + [self adjustFeaturesForState]; [self setHasShadow:wf->shadow]; } + - (void) setMacDrvState:(const struct macdrv_window_state*)state + { + self.disabled = state->disabled; + } + /* Returns whether or not the window was ordered in, which depends on if its frame intersects any screen. */ - (BOOL) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next @@ -171,13 +199,22 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) return on_screen; } + - (void) setDisabled:(BOOL)newValue + { + if (disabled != newValue) + { + disabled = newValue; + [self adjustFeaturesForState]; + } + } + /* * ---------- NSWindow method overrides ---------- */ - (BOOL) canBecomeKeyWindow { - return YES; + return !self.disabled; } - (BOOL) canBecomeMainWindow @@ -248,6 +285,21 @@ void macdrv_set_cocoa_window_features(macdrv_window w, } /*********************************************************************** + * macdrv_set_cocoa_window_state + * + * Update a Cocoa window's state. + */ +void macdrv_set_cocoa_window_state(macdrv_window w, + const struct macdrv_window_state* state) +{ + WineWindow* window = (WineWindow*)w; + + OnMainThread(^{ + [window setMacDrvState:state]; + }); +} + +/*********************************************************************** * macdrv_set_cocoa_window_title * * Set a Cocoa window's title. diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 4cebcef..e2a735b 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -125,11 +125,17 @@ struct macdrv_window_features { unsigned int shadow:1; }; +struct macdrv_window_state { + unsigned int disabled:1; +}; + extern macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, CGRect frame) DECLSPEC_HIDDEN; extern void macdrv_destroy_cocoa_window(macdrv_window w) DECLSPEC_HIDDEN; extern void macdrv_set_cocoa_window_features(macdrv_window w, const struct macdrv_window_features* wf) DECLSPEC_HIDDEN; +extern void macdrv_set_cocoa_window_state(macdrv_window w, + const struct macdrv_window_state* state) DECLSPEC_HIDDEN; extern void macdrv_set_cocoa_window_title(macdrv_window w, const UniChar* title, size_t length) DECLSPEC_HIDDEN; extern int macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 696941c..8520afa 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -74,6 +74,18 @@ static void get_cocoa_window_features(struct macdrv_win_data *data, /*********************************************************************** + * get_cocoa_window_state + */ +static void get_cocoa_window_state(struct macdrv_win_data *data, + DWORD style, DWORD ex_style, + struct macdrv_window_state* state) +{ + memset(state, 0, sizeof(*state)); + state->disabled = (style & WS_DISABLED) != 0; +} + + +/*********************************************************************** * get_mac_rect_offset * * Helper for macdrv_window_to_mac_rect and macdrv_mac_to_window_rect. @@ -268,12 +280,16 @@ static void set_cocoa_window_properties(struct macdrv_win_data *data) { DWORD style, ex_style; struct macdrv_window_features wf; + struct macdrv_window_state state; style = GetWindowLongW(data->hwnd, GWL_STYLE); ex_style = GetWindowLongW(data->hwnd, GWL_EXSTYLE); get_cocoa_window_features(data, style, ex_style, &wf); macdrv_set_cocoa_window_features(data->cocoa_window, &wf); + + get_cocoa_window_state(data, style, ex_style, &state); + macdrv_set_cocoa_window_state(data->cocoa_window, &state); }

1 0

Ken Thomases : winemac: Implement support for no-activate windows.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 9d29ea42e135001a92179cd5cda2fcff3a306304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d29ea42e135001a92179cd5c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 06:18:36 2013 -0600 winemac: Implement support for no-activate windows. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 7 +++++-- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 21 +++++++++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 1edcd9c..86211dd 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -25,6 +25,7 @@ { NSUInteger normalStyleMask; BOOL disabled; + BOOL noActivate; } @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 848e49e..dde77b3 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -61,6 +61,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @interface WineWindow () @property (nonatomic) BOOL disabled; +(a)property (nonatomic) BOOL noActivate; + (void) flipRect:(NSRect*)rect; @@ -79,7 +80,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @implementation WineWindow - @synthesize disabled; + @synthesize disabled, noActivate; + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame @@ -147,6 +148,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) - (void) setMacDrvState:(const struct macdrv_window_state*)state { self.disabled = state->disabled; + self.noActivate = state->no_activate; } /* Returns whether or not the window was ordered in, which depends on if @@ -214,7 +216,8 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) */ - (BOOL) canBecomeKeyWindow { - return !self.disabled; + if (self.disabled || self.noActivate) return NO; + return YES; } - (BOOL) canBecomeMainWindow diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index e2a735b..d91cd1a 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -127,6 +127,7 @@ struct macdrv_window_features { struct macdrv_window_state { unsigned int disabled:1; + unsigned int no_activate:1; }; extern macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 8520afa..b813cdc 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -73,6 +73,26 @@ static void get_cocoa_window_features(struct macdrv_win_data *data, } +/******************************************************************* + * can_activate_window + * + * Check if we can activate the specified window. + */ +static inline BOOL can_activate_window(HWND hwnd) +{ + LONG style = GetWindowLongW(hwnd, GWL_STYLE); + RECT rect; + + if (!(style & WS_VISIBLE)) return FALSE; + if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; + if (style & WS_MINIMIZE) return FALSE; + if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_NOACTIVATE) return FALSE; + if (hwnd == GetDesktopWindow()) return FALSE; + if (GetWindowRect(hwnd, &rect) && IsRectEmpty(&rect)) return FALSE; + return !(style & WS_DISABLED); +} + + /*********************************************************************** * get_cocoa_window_state */ @@ -82,6 +102,7 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, { memset(state, 0, sizeof(*state)); state->disabled = (style & WS_DISABLED) != 0; + state->no_activate = !can_activate_window(data->hwnd); }

1 0

Ken Thomases : winemac: Implement support for WS_EX_TOPMOST windows.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 429732ce1a4db12cfd9149bbc1c630bd9509508b URL: http://source.winehq.org/git/wine.git/?a=commit;h=429732ce1a4db12cfd9149bbc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 06:18:55 2013 -0600 winemac: Implement support for WS_EX_TOPMOST windows. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 10 +++++++++- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 1 + 4 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 86211dd..41e0b90 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -26,6 +26,7 @@ NSUInteger normalStyleMask; BOOL disabled; BOOL noActivate; + BOOL floating; } @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index dde77b3..16217c2 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -62,6 +62,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @property (nonatomic) BOOL disabled; @property (nonatomic) BOOL noActivate; +(a)property (nonatomic) BOOL floating; + (void) flipRect:(NSRect*)rect; @@ -80,7 +81,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @implementation WineWindow - @synthesize disabled, noActivate; + @synthesize disabled, noActivate, floating; + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame @@ -147,8 +148,15 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) - (void) setMacDrvState:(const struct macdrv_window_state*)state { + NSInteger level; + self.disabled = state->disabled; self.noActivate = state->no_activate; + + self.floating = state->floating; + level = state->floating ? NSFloatingWindowLevel : NSNormalWindowLevel; + if (level != [self level]) + [self setLevel:level]; } /* Returns whether or not the window was ordered in, which depends on if diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d91cd1a..fa2e083 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -128,6 +128,7 @@ struct macdrv_window_features { struct macdrv_window_state { unsigned int disabled:1; unsigned int no_activate:1; + unsigned int floating:1; }; extern macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index b813cdc..232c60a 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -103,6 +103,7 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, memset(state, 0, sizeof(*state)); state->disabled = (style & WS_DISABLED) != 0; state->no_activate = !can_activate_window(data->hwnd); + state->floating = (ex_style & WS_EX_TOPMOST) != 0; }

1 0

Ken Thomases : winemac: Implement support for owned windows.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: b6544d19ddd1e4d5af2cef69ec14bb414b179573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6544d19ddd1e4d5af2cef69e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 06:19:36 2013 -0600 winemac: Implement support for owned windows. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 53 ++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 6 ++++ 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 41e0b90..8533e2a 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -27,6 +27,7 @@ BOOL disabled; BOOL noActivate; BOOL floating; + WineWindow* latentParentWindow; } @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 16217c2..e6ae103 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -63,6 +63,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @property (nonatomic) BOOL disabled; @property (nonatomic) BOOL noActivate; @property (nonatomic) BOOL floating; +(a)property (retain, nonatomic) NSWindow* latentParentWindow; + (void) flipRect:(NSRect*)rect; @@ -81,7 +82,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @implementation WineWindow - @synthesize disabled, noActivate, floating; + @synthesize disabled, noActivate, floating, latentParentWindow; + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame @@ -119,6 +120,12 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) return window; } + - (void) dealloc + { + [latentParentWindow release]; + [super dealloc]; + } + + (void) flipRect:(NSRect*)rect { rect->origin.y = NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]) - NSMaxY(*rect); @@ -172,11 +179,23 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) [self orderWindow:NSWindowBelow relativeTo:[prev windowNumber]]; else [self orderWindow:NSWindowAbove relativeTo:[next windowNumber]]; + if (latentParentWindow) + { + [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; + self.latentParentWindow = nil; + } } return on_screen; } + - (void) doOrderOut + { + self.latentParentWindow = [self parentWindow]; + [latentParentWindow removeChildWindow:self]; + [self orderOut:nil]; + } + - (BOOL) setFrameIfOnScreen:(NSRect)contentRect { NSArray* screens = [NSScreen screens]; @@ -193,7 +212,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) { on_screen = frame_intersects_screens(contentRect, screens); if (!on_screen) - [self orderOut:nil]; + [self doOrderOut]; } oldFrame = [self frame]; @@ -209,6 +228,19 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) return on_screen; } + - (void) setMacDrvParentWindow:(WineWindow*)parent + { + if ([self parentWindow] != parent) + { + [[self parentWindow] removeChildWindow:self]; + self.latentParentWindow = nil; + if ([self isVisible] && parent) + [parent addChildWindow:self ordered:NSWindowAbove]; + else + self.latentParentWindow = parent; + } + } + - (void) setDisabled:(BOOL)newValue { if (disabled != newValue) @@ -368,7 +400,7 @@ void macdrv_hide_cocoa_window(macdrv_window w) WineWindow* window = (WineWindow*)w; OnMainThread(^{ - [window orderOut:nil]; + [window doOrderOut]; }); } @@ -392,3 +424,18 @@ int macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) return on_screen; } + +/*********************************************************************** + * macdrv_set_cocoa_parent_window + * + * Sets the parent window for a Cocoa window. If parent is NULL, clears + * the parent window. + */ +void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent) +{ + WineWindow* window = (WineWindow*)w; + + OnMainThread(^{ + [window setMacDrvParentWindow:(WineWindow*)parent]; + }); +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index fa2e083..86a49ce 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -144,5 +144,6 @@ extern int macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, macdrv_window next) DECLSPEC_HIDDEN; extern void macdrv_hide_cocoa_window(macdrv_window w) DECLSPEC_HIDDEN; extern int macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) DECLSPEC_HIDDEN; +extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent) DECLSPEC_HIDDEN; #endif /* __WINE_MACDRV_COCOA_H */ diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 232c60a..21c9e59 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -301,12 +301,18 @@ static macdrv_window macdrv_get_cocoa_window(HWND hwnd) static void set_cocoa_window_properties(struct macdrv_win_data *data) { DWORD style, ex_style; + HWND owner; + macdrv_window owner_win; struct macdrv_window_features wf; struct macdrv_window_state state; style = GetWindowLongW(data->hwnd, GWL_STYLE); ex_style = GetWindowLongW(data->hwnd, GWL_EXSTYLE); + owner = GetWindow(data->hwnd, GW_OWNER); + owner_win = macdrv_get_cocoa_window(owner); + macdrv_set_cocoa_parent_window(data->cocoa_window, owner_win); + get_cocoa_window_features(data, style, ex_style, &wf); macdrv_set_cocoa_window_features(data->cocoa_window, &wf);

1 0