[PATCH v2 0/2] MR6026: winemac: Use the new surface shape helper to update window shape.
-- v2: winemac: Use window surface shape for window shape region. winemac: Use window surface shape for color key transparency. https://gitlab.winehq.org/wine/wine/-/merge_requests/6026
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.h | 3 - dlls/winemac.drv/cocoa_window.m | 104 ++++++++++++++------------------ dlls/winemac.drv/macdrv.h | 1 - dlls/winemac.drv/macdrv_cocoa.h | 4 +- dlls/winemac.drv/surface.c | 27 ++++++++- dlls/winemac.drv/window.c | 39 ++---------- 6 files changed, 78 insertions(+), 100 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index b5168d0c128..804297f55a0 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -52,9 +52,6 @@ @interface WineWindow : NSPanel <NSWindowDelegate> BOOL shapeChangedSinceLastDraw; - BOOL colorKeyed; - CGFloat colorKeyRed, colorKeyGreen, colorKeyBlue; - BOOL usePerPixelAlpha; NSUInteger lastModifierFlags; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bae2e21fb48..866306d3511 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -367,6 +367,7 @@ @interface WineContentView : WineBaseView <NSTextInputClient, NSViewLayerContent { CGRect surfaceRect; CGImageRef colorImage; + CGImageRef shapeImage; NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; @@ -413,8 +414,6 @@ @interface WineWindow () @property (nonatomic) BOOL shapeChangedSinceLastDraw; @property (readonly, nonatomic) BOOL needsTransparency; -(a)property (nonatomic) BOOL colorKeyed; -(a)property (nonatomic) CGFloat colorKeyRed, colorKeyGreen, colorKeyBlue; @property (nonatomic) BOOL usePerPixelAlpha; @property (assign, nonatomic) void* himc; @@ -503,6 +502,7 @@ - (void) dealloc [glContexts release]; [pendingGlContexts release]; CGImageRelease(colorImage); + CGImageRelease(shapeImage); [super dealloc]; } @@ -519,7 +519,7 @@ - (BOOL) wantsUpdateLayer - (void) updateLayer { WineWindow* window = (WineWindow*)[self window]; - CGImageRef image; + CGImageRef image, maskedImage; CGRect imageRect; CALayer* layer = [self layer]; @@ -535,21 +535,10 @@ - (void) updateLayer imageRect.size.width *= layer.contentsScale; imageRect.size.height *= layer.contentsScale; - image = CGImageCreateWithImageInRect(colorImage, imageRect); - - if (window.colorKeyed) - { - CGImageRef maskedImage; - CGFloat components[] = { window.colorKeyRed - 0.5, window.colorKeyRed + 0.5, - window.colorKeyGreen - 0.5, window.colorKeyGreen + 0.5, - window.colorKeyBlue - 0.5, window.colorKeyBlue + 0.5 }; - maskedImage = CGImageCreateWithMaskingColors(image, components); - if (maskedImage) - { - CGImageRelease(image); - image = maskedImage; - } - } + maskedImage = shapeImage ? CGImageCreateWithMask(colorImage, shapeImage) + : CGImageRetain(colorImage); + image = CGImageCreateWithImageInRect(maskedImage, imageRect); + CGImageRelease(maskedImage); if (image) { @@ -561,7 +550,7 @@ - (void) updateLayer // If the window may be transparent, then we have to invalidate the // shadow every time we draw. Also, if this is the first time we've // drawn since changing from transparent to opaque. - if (window.colorKeyed || window.usePerPixelAlpha || window.shapeChangedSinceLastDraw) + if (shapeImage || window.usePerPixelAlpha || window.shapeChangedSinceLastDraw) { window.shapeChangedSinceLastDraw = FALSE; [window invalidateShadow]; @@ -580,6 +569,17 @@ - (void) setColorImage:(CGImageRef)image colorImage = CGImageRetain(image); } + - (void) setShapeImage:(CGImageRef)image + { + CGImageRelease(shapeImage); + shapeImage = CGImageRetain(image); + } + + - (BOOL) hasShapeImage + { + return !!shapeImage; + } + - (void) viewWillDraw { [super viewWillDraw]; @@ -1017,7 +1017,6 @@ @implementation WineWindow @synthesize disabled, noForeground, preventsAppActivation, floating, fullscreen, fakingClose, closing, latentParentWindow, hwnd, queue; @synthesize drawnSinceShown; @synthesize shapeChangedSinceLastDraw; - @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @synthesize himc, commandDone; @@ -2071,8 +2070,9 @@ - (void) setDisabled:(BOOL)newValue - (BOOL) needsTransparency { - return self.contentView.layer.mask || self.colorKeyed || self.usePerPixelAlpha || - (gl_surface_mode == GL_SURFACE_BEHIND && [(WineContentView*)self.contentView hasGLDescendant]); + WineContentView *view = self.contentView; + return self.contentView.layer.mask || [view hasShapeImage] || self.usePerPixelAlpha || + (gl_surface_mode == GL_SURFACE_BEHIND && [view hasGLDescendant]); } - (void) checkTransparency @@ -3521,6 +3521,30 @@ void macdrv_window_set_color_image(macdrv_window w, CGImageRef image, CGRect rec } } + +/*********************************************************************** + * macdrv_window_set_shape_image + */ +void macdrv_window_set_shape_image(macdrv_window w, CGImageRef image) +{ +(a)autoreleasepool +{ + WineWindow* window = (WineWindow*)w; + + CGImageRetain(image); + + OnMainThreadAsync(^{ + WineContentView *view = [window contentView]; + + [view setShapeImage:image]; + [view setNeedsDisplay:true]; + [window checkTransparency]; + + CGImageRelease(image); + }); +} +} + /*********************************************************************** * macdrv_set_window_shape * @@ -3567,42 +3591,6 @@ void macdrv_set_window_alpha(macdrv_window w, CGFloat alpha) } } -/*********************************************************************** - * macdrv_set_window_color_key - */ -void macdrv_set_window_color_key(macdrv_window w, CGFloat keyRed, CGFloat keyGreen, - CGFloat keyBlue) -{ -(a)autoreleasepool -{ - WineWindow* window = (WineWindow*)w; - - OnMainThread(^{ - window.colorKeyed = TRUE; - window.colorKeyRed = keyRed; - window.colorKeyGreen = keyGreen; - window.colorKeyBlue = keyBlue; - [window checkTransparency]; - }); -} -} - -/*********************************************************************** - * macdrv_clear_window_color_key - */ -void macdrv_clear_window_color_key(macdrv_window w) -{ -(a)autoreleasepool -{ - WineWindow* window = (WineWindow*)w; - - OnMainThread(^{ - window.colorKeyed = FALSE; - [window checkTransparency]; - }); -} -} - /*********************************************************************** * macdrv_window_use_per_pixel_alpha */ diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index cbb453b2dfa..6c9735bd8e4 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -189,7 +189,6 @@ extern BOOL macdrv_SystemParametersInfo(UINT action, UINT int_param, void *ptr_p RECT whole_rect; /* Mac window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ int pixel_format; /* pixel format for GL */ - COLORREF color_key; /* color key for layered window; CLR_INVALID is not color keyed */ HANDLE drag_event; /* event to signal that Cocoa-driven window dragging has ended */ unsigned int on_screen : 1; /* is window ordered in? (minimized or not) */ unsigned int shaped : 1; /* is window using a custom region shape? */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 30ab06c3662..94821eef6bf 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -553,11 +553,9 @@ extern void macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame); extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent); extern void macdrv_window_set_color_image(macdrv_window w, CGImageRef image, CGRect rect, CGRect dirty); +extern void macdrv_window_set_shape_image(macdrv_window w, CGImageRef image); extern void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count); extern void macdrv_set_window_alpha(macdrv_window w, CGFloat alpha); -extern void macdrv_set_window_color_key(macdrv_window w, CGFloat keyRed, CGFloat keyGreen, - CGFloat keyBlue); -extern void macdrv_clear_window_color_key(macdrv_window w); extern void macdrv_window_use_per_pixel_alpha(macdrv_window w, int use_per_pixel_alpha); extern void macdrv_give_cocoa_window_focus(macdrv_window w, int activate); extern void macdrv_set_window_min_max_sizes(macdrv_window w, CGSize min_size, CGSize max_size); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index b6f0ea2d812..fa47c7e474e 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -95,6 +95,31 @@ static BOOL macdrv_surface_flush(struct window_surface *window_surface, const RE macdrv_window_set_color_image(surface->window, image, cgrect_from_rect(*rect), cgrect_from_rect(*dirty)); CGImageRelease(image); + if (shape_changed) + { + if (!shape_bits) + macdrv_window_set_shape_image(surface->window, NULL); + else + { + const BYTE *src = shape_bits; + CGDataProviderRef provider; + CGImageRef image; + BYTE *dst; + UINT i; + + if (!(provider = data_provider_create(shape_info->bmiHeader.biSizeImage, (void **)&dst))) return TRUE; + for (i = 0; i < shape_info->bmiHeader.biSizeImage; i++) dst[i] = ~src[i]; /* CGImage mask bits are inverted */ + + image = CGImageMaskCreate(shape_info->bmiHeader.biWidth, abs(shape_info->bmiHeader.biHeight), 1, 1, + shape_info->bmiHeader.biSizeImage / abs(shape_info->bmiHeader.biHeight), + provider, NULL, retina_on); + CGDataProviderRelease(provider); + + macdrv_window_set_shape_image(surface->window, image); + CGImageRelease(image); + } + } + return TRUE; } @@ -166,7 +191,7 @@ static struct window_surface *create_surface(HWND hwnd, macdrv_window window, co } if (desc.hDeviceDc) NtUserReleaseDC(hwnd, desc.hDeviceDc); - if (!(surface = calloc(1, sizeof(*surface)))) goto failed; + if (!(surface = calloc(1, sizeof(*surface)))) return NULL; if (!window_surface_init(&surface->header, &macdrv_surface_funcs, hwnd, rect, info, bitmap)) goto failed; surface->window = window; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 6ebaccadbb2..c7d4ed35137 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -278,7 +278,6 @@ static struct macdrv_win_data *alloc_win_data(HWND hwnd) if ((data = calloc(1, sizeof(*data)))) { data->hwnd = hwnd; - data->color_key = CLR_INVALID; data->swap_interval = 1; pthread_mutex_lock(&win_data_mutex); if (!win_datas) @@ -485,7 +484,7 @@ static inline void add_bounds_rect(RECT *bounds, const RECT *rect) /*********************************************************************** * sync_window_opacity */ -static void sync_window_opacity(struct macdrv_win_data *data, COLORREF key, BYTE alpha, +static void sync_window_opacity(struct macdrv_win_data *data, BYTE alpha, BOOL per_pixel_alpha, DWORD flags) { CGFloat opacity = 1.0; @@ -496,33 +495,6 @@ static void sync_window_opacity(struct macdrv_win_data *data, COLORREF key, BYTE TRACE("setting window %p/%p alpha to %g\n", data->hwnd, data->cocoa_window, opacity); macdrv_set_window_alpha(data->cocoa_window, opacity); - if (flags & LWA_COLORKEY) - { - /* FIXME: treat PALETTEINDEX and DIBINDEX as black */ - if ((key & (1 << 24)) || key >> 16 == 0x10ff) - key = RGB(0, 0, 0); - } - else - key = CLR_INVALID; - - if (data->color_key != key) - { - if (key == CLR_INVALID) - { - TRACE("clearing color-key for window %p/%p\n", data->hwnd, data->cocoa_window); - macdrv_clear_window_color_key(data->cocoa_window); - } - else - { - TRACE("setting color-key for window %p/%p to RGB %d,%d,%d\n", data->hwnd, data->cocoa_window, - GetRValue(key), GetGValue(key), GetBValue(key)); - macdrv_set_window_color_key(data->cocoa_window, GetRValue(key), GetGValue(key), GetBValue(key)); - } - - data->color_key = key; - needs_flush = TRUE; - } - if (!data->per_pixel_alpha != !per_pixel_alpha) { TRACE("setting window %p/%p per-pixel-alpha to %d\n", data->hwnd, data->cocoa_window, per_pixel_alpha); @@ -757,7 +729,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) /* set the window opacity */ if (!NtUserGetLayeredWindowAttributes(data->hwnd, &key, &alpha, &layered_flags)) layered_flags = 0; - sync_window_opacity(data, key, alpha, FALSE, layered_flags); + sync_window_opacity(data, alpha, FALSE, layered_flags); done: if (win_rgn) NtGdiDeleteObjectApp(win_rgn); @@ -778,7 +750,6 @@ static void destroy_cocoa_window(struct macdrv_win_data *data) macdrv_destroy_cocoa_window(data->cocoa_window); data->cocoa_window = 0; data->on_screen = FALSE; - data->color_key = CLR_INVALID; if (data->surface) window_surface_release(data->surface); data->surface = NULL; if (data->unminimized_surface) window_surface_release(data->unminimized_surface); @@ -1685,7 +1656,7 @@ void macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, DWOR data->ulw_layered = FALSE; if (data->cocoa_window) { - sync_window_opacity(data, key, alpha, FALSE, flags); + sync_window_opacity(data, alpha, FALSE, flags); /* since layered attributes are now set, can now show the window */ if ((NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_VISIBLE) && !data->on_screen) show_window(data); @@ -1780,7 +1751,7 @@ void macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) { data->layered = FALSE; data->ulw_layered = FALSE; - sync_window_opacity(data, 0, 0, FALSE, 0); + sync_window_opacity(data, 0, FALSE, 0); } if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYOUTRTL)) @@ -1903,7 +1874,7 @@ void macdrv_UpdateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF col show_window(data); /* The ULW flags are a superset of the LWA flags. */ - sync_window_opacity(data, color_key, 255, TRUE, flags); + sync_window_opacity(data, 255, TRUE, flags); release_win_data(data); } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6026
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winemac.drv/window.c | 56 +++------------------------------------ 1 file changed, 3 insertions(+), 53 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index c7d4ed35137..029715e4180 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -403,68 +403,18 @@ static void set_cocoa_window_properties(struct macdrv_win_data *data) */ static void sync_window_region(struct macdrv_win_data *data, HRGN win_region) { - HRGN hrgn = win_region; - RGNDATA *region_data; - const CGRect* rects; - int count; - if (!data->cocoa_window) return; - data->shaped = FALSE; if (IsRectEmpty(&data->window_rect)) /* set an empty shape */ { + data->shaped = FALSE; TRACE("win %p/%p setting empty shape for zero-sized window\n", data->hwnd, data->cocoa_window); macdrv_set_window_shape(data->cocoa_window, &CGRectZero, 1); return; } - if (hrgn == (HRGN)1) /* hack: win_region == 1 means retrieve region from server */ - { - if (!(hrgn = NtGdiCreateRectRgn(0, 0, 0, 0))) return; - if (NtUserGetWindowRgnEx(data->hwnd, hrgn, 0) == ERROR) - { - NtGdiDeleteObjectApp(hrgn); - hrgn = 0; - } - } - - if (hrgn && NtUserGetWindowLongW(data->hwnd, GWL_EXSTYLE) & WS_EX_LAYOUTRTL) - NtUserMirrorRgn(data->hwnd, hrgn); - if (hrgn) - { - NtGdiOffsetRgn(hrgn, data->window_rect.left - data->whole_rect.left, - data->window_rect.top - data->whole_rect.top); - } - region_data = get_region_data(hrgn, 0); - if (region_data) - { - rects = (CGRect*)region_data->Buffer; - count = region_data->rdh.nCount; - /* Special case optimization. If the region entirely encloses the Cocoa - window, it's the same as there being no region. It's potentially - hard/slow to test this for arbitrary regions, so we just check for - very simple regions. */ - if (count == 1 && CGRectContainsRect(rects[0], - CGRectOffset(cgrect_from_rect(data->whole_rect), -data->whole_rect.left, -data->whole_rect.top))) - { - TRACE("optimizing for simple region that contains Cocoa content rect\n"); - rects = NULL; - count = 0; - } - } - else - { - rects = NULL; - count = 0; - } - - TRACE("win %p/%p win_region %p rects %p count %d\n", data->hwnd, data->cocoa_window, win_region, rects, count); - macdrv_set_window_shape(data->cocoa_window, rects, count); - - free(region_data); - data->shaped = (region_data != NULL); - - if (hrgn && hrgn != win_region) NtGdiDeleteObjectApp(hrgn); + /* use surface shape instead */ + macdrv_set_window_shape(data->cocoa_window, NULL, 0); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6026
Rebased to resolve some conflicts. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6026#note_76384
participants (1)
-
Rémi Bernon