[PATCH v4 0/2] MR10848: winewayland.drv: Add alpha-modifier-v1 protocol to support change alpha by...
winewayland.drv: Add alpha-modifier-v1 protocol to support change alpha by WAYLAND_SetLayeredWindowAttributes. @afrantzis @rbernon The attachment is the test source code on Windows and the corresponding generated test program. [test-layered-alpha.cpp](/uploads/dba6d38e8990978d4bde562011c85995/test-layered-alpha.cpp) [test-layered-alpha.exe](/uploads/bba6c165533d56ca85af9d461e488b03/test-layered-alpha.exe) The test program runs as shown in the figure below. {width=505 height=543} The purpose of the patch is that when adjusting the Alpha slider in the figure, the transparency of the window changes accordingly. -- v4: winewayland.drv: Add WAYLAND_UpdateLayeredWindow and add support for changing alpha using the alpha-modifier-v1 protocol. winewayland.drv: Add alpha-modifier-v1 protocol to support change alpha by WAYLAND_SetLayeredWindowAttributes. https://gitlab.winehq.org/wine/wine/-/merge_requests/10848
From: chenjiangyi <chenjiangyi@uniontech.com> Signed-off-by: chenjiangyi <chenjiangyi@uniontech.com> --- dlls/winewayland.drv/Makefile.in | 1 + dlls/winewayland.drv/alpha-modifier-v1.xml | 103 +++++++++++++++++++++ dlls/winewayland.drv/wayland.c | 5 + dlls/winewayland.drv/wayland_surface.c | 12 +++ dlls/winewayland.drv/waylanddrv.h | 3 + dlls/winewayland.drv/window.c | 31 +++++++ 6 files changed, 155 insertions(+) create mode 100644 dlls/winewayland.drv/alpha-modifier-v1.xml diff --git a/dlls/winewayland.drv/Makefile.in b/dlls/winewayland.drv/Makefile.in index cbc49823cd6..95f690386a4 100644 --- a/dlls/winewayland.drv/Makefile.in +++ b/dlls/winewayland.drv/Makefile.in @@ -8,6 +8,7 @@ VER_FILEDESCRIPTION_STR = "Wine Wayland driver" SOURCES = \ cursor-shape-v1.xml \ + alpha-modifier-v1.xml \ display.c \ dllmain.c \ opengl.c \ diff --git a/dlls/winewayland.drv/alpha-modifier-v1.xml b/dlls/winewayland.drv/alpha-modifier-v1.xml new file mode 100644 index 00000000000..ab0a401d1ab --- /dev/null +++ b/dlls/winewayland.drv/alpha-modifier-v1.xml @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> +<protocol name="alpha_modifier_v1"> + <copyright> + Copyright © 2024 Xaver Hugl + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice (including the next + paragraph) shall be included in all copies or substantial portions of the + Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + </copyright> + + <interface name="wp_alpha_modifier_v1" version="1"> + <description summary="surface alpha modifier manager"> + This interface allows a client to set a factor for the alpha values on a + surface, which can be used to offload such operations to the compositor, + which can in turn for example offload them to KMS. + + Warning! The protocol described in this file is currently in the testing + phase. Backward compatible changes may be added together with the + corresponding interface version bump. Backward incompatible changes can + only be done by creating a new major version of the extension. + </description> + + <request name="destroy" type="destructor"> + <description summary="destroy the alpha modifier manager object"> + Destroy the alpha modifier manager. This doesn't destroy objects + created with the manager. + </description> + </request> + + <enum name="error"> + <entry name="already_constructed" value="0" + summary="wl_surface already has a alpha modifier object"/> + </enum> + + <request name="get_surface"> + <description summary="create a new alpha modifier surface object"> + Create a new alpha modifier surface object associated with the + given wl_surface. If there is already such an object associated with + the wl_surface, the already_constructed error will be raised. + </description> + <arg name="id" type="new_id" interface="wp_alpha_modifier_surface_v1"/> + <arg name="surface" type="object" interface="wl_surface"/> + </request> + </interface> + + <interface name="wp_alpha_modifier_surface_v1" version="1"> + <description summary="alpha modifier object for a surface"> + This interface allows the client to set a factor for the alpha values on + a surface, which can be used to offload such operations to the compositor. + The default factor is UINT32_MAX. + + This object has to be destroyed before the associated wl_surface. Once the + wl_surface is destroyed, all request on this object will raise the + no_surface error. + </description> + + <enum name="error"> + <entry name="no_surface" value="0" summary="wl_surface was destroyed"/> + </enum> + + <request name="destroy" type="destructor"> + <description summary="destroy the alpha modifier object"> + This destroys the object, and is equivalent to set_multiplier with + a value of UINT32_MAX, with the same double-buffered semantics as + set_multiplier. + </description> + </request> + + <request name="set_multiplier"> + <description summary="specify the alpha multiplier"> + Sets the alpha multiplier for the surface. The alpha multiplier is + double-buffered state, see wl_surface.commit for details. + + This factor is applied in the compositor's blending space, as an + additional step after the processing of per-pixel alpha values for the + wl_surface. The exact meaning of the factor is thus undefined, unless + the blending space is specified in a different extension. + + This multiplier is applied even if the buffer attached to the + wl_surface doesn't have an alpha channel; in that case an alpha value + of one is used instead. + + Zero means completely transparent, UINT32_MAX means completely opaque. + </description> + <arg name="factor" type="uint"/> + </request> + </interface> +</protocol> diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index b3d6b3c89e7..ba098685c46 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -205,6 +205,11 @@ static void registry_handle_global(void *data, struct wl_registry *registry, process_wayland.wp_pointer_warp_v1 = wl_registry_bind(registry, id, &wp_pointer_warp_v1_interface, 1); } + else if (strcmp(interface, "wp_alpha_modifier_v1") == 0) + { + process_wayland.wp_alpha_modifier_v1 = + wl_registry_bind(registry, id, &wp_alpha_modifier_v1_interface, 1); + } } static void registry_handle_global_remove(void *data, struct wl_registry *registry, diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 2f8275ddb52..2fdb74842cb 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -173,6 +173,12 @@ struct wayland_surface *wayland_surface_create(HWND hwnd) ERR("Failed to create wp_viewport Wayland surface\n"); goto err; } + /* Initialize alpha modifier if supported */ + if (process_wayland.wp_alpha_modifier_v1) + { + surface->wp_alpha_modifier_surface_v1 = + wp_alpha_modifier_v1_get_surface(process_wayland.wp_alpha_modifier_v1, surface->wl_surface); + } surface->window.scale = 1.0; @@ -353,6 +359,12 @@ void wayland_surface_clear_role(struct wayland_surface *surface) surface->xdg_toplevel_icon = NULL; } + if (surface->wp_alpha_modifier_surface_v1) + { + wp_alpha_modifier_surface_v1_destroy(surface->wp_alpha_modifier_surface_v1); + surface->wp_alpha_modifier_surface_v1 = NULL; + } + if (surface->xdg_toplevel) { xdg_toplevel_destroy(surface->xdg_toplevel); diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 5f4bd6a7cf6..ff7f1be7e91 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -39,6 +39,7 @@ #include "wlr-data-control-unstable-v1-client-protocol.h" #include "xdg-toplevel-icon-v1-client-protocol.h" #include "pointer-warp-v1-client-protocol.h" +#include "alpha-modifier-v1-client-protocol.h" #include "windef.h" #include "winbase.h" @@ -180,6 +181,7 @@ struct wayland struct xdg_toplevel_icon_manager_v1 *xdg_toplevel_icon_manager_v1; struct wp_cursor_shape_manager_v1 *wp_cursor_shape_manager_v1; struct wp_pointer_warp_v1 *wp_pointer_warp_v1; + struct wp_alpha_modifier_v1 *wp_alpha_modifier_v1; struct wayland_seat seat; struct wayland_keyboard keyboard; struct wayland_pointer pointer; @@ -286,6 +288,7 @@ struct wayland_surface HWND toplevel_hwnd; }; }; + struct wp_alpha_modifier_surface_v1 *wp_alpha_modifier_surface_v1; struct wayland_surface_config pending, requested, processing, current; BOOL resizing; diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 88eee3421d7..e016f160cd0 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -673,9 +673,25 @@ LRESULT WAYLAND_DesktopWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) void WAYLAND_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, DWORD flags) { struct wayland_win_data *data; + struct wayland_surface *surface; + uint32_t opacity = UINT32_MAX; if (!(data = wayland_win_data_get(hwnd))) return; + data->layered_attribs_set = TRUE; + + surface = data->wayland_surface; + if (surface && surface->wp_alpha_modifier_surface_v1 && (flags & LWA_ALPHA)) + { + /* Convert BYTE alpha (0-255) to UINT32_MAX range + * 0 = fully transparent, UINT32_MAX = fully opaque */ + opacity = (UINT32_MAX / 255) * alpha; + + wp_alpha_modifier_surface_v1_set_multiplier(surface->wp_alpha_modifier_surface_v1, opacity); + wl_surface_commit(surface->wl_surface); + wl_display_flush(process_wayland.wl_display); + } + wayland_win_data_release(data); } @@ -727,6 +743,7 @@ void WAYLAND_SetWindowIcons(HWND hwnd, HICON icon, const ICONINFO *ii, HICON ico void WAYLAND_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) { struct wayland_win_data *data; + struct wayland_surface *surface; DWORD changed = style->styleNew ^ style->styleOld; if (hwnd == NtUserGetDesktopWindow()) return; @@ -734,8 +751,22 @@ void WAYLAND_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) /* Changing WS_EX_LAYERED resets attributes */ if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) + { data->layered_attribs_set = FALSE; + /* Reset surface alpha to fully opaque, mirroring X11DRV_SetWindowStyle + * which calls sync_window_opacity(display, window, 0, 0) to remove + * _NET_WM_WINDOW_OPACITY when WS_EX_LAYERED is toggled. */ + surface = data->wayland_surface; + if (surface && surface->wp_alpha_modifier_surface_v1) + { + wp_alpha_modifier_surface_v1_set_multiplier(surface->wp_alpha_modifier_surface_v1, + UINT32_MAX); + wl_surface_commit(surface->wl_surface); + wl_display_flush(process_wayland.wl_display); + } + } + wayland_win_data_release(data); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10848
From: chenjiangyi <chenjiangyi@uniontech.com> Signed-off-by: chenjiangyi <chenjiangyi@uniontech.com> --- dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/waylanddrv_main.c | 1 + dlls/winewayland.drv/window.c | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index ff7f1be7e91..45c71f3cc2c 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -457,6 +457,7 @@ void WAYLAND_SetWindowIcons(HWND hwnd, HICON icon, const ICONINFO *ii, HICON ico void WAYLAND_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style); void WAYLAND_SetWindowText(HWND hwnd, LPCWSTR text); LRESULT WAYLAND_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam, const POINT *pos); +void WAYLAND_UpdateLayeredWindow(HWND hwnd, BYTE alpha, UINT flags); UINT WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manager, void *param); LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp); void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, HWND owner_hint, UINT swp_flags, diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c index b7a8a29be70..5fae15c81eb 100644 --- a/dlls/winewayland.drv/waylanddrv_main.c +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -48,6 +48,7 @@ static const struct user_driver_funcs waylanddrv_funcs = .pSetWindowStyle = WAYLAND_SetWindowStyle, .pSetWindowText = WAYLAND_SetWindowText, .pSysCommand = WAYLAND_SysCommand, + .pUpdateLayeredWindow = WAYLAND_UpdateLayeredWindow, .pUpdateDisplayDevices = WAYLAND_UpdateDisplayDevices, .pWindowMessage = WAYLAND_WindowMessage, .pWindowPosChanged = WAYLAND_WindowPosChanged, diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index e016f160cd0..69d7a7c7100 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -839,6 +839,31 @@ LRESULT WAYLAND_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam, const POINT return ret; } +/*********************************************************************** + * WAYLAND_UpdateLayeredWindow + */ +void WAYLAND_UpdateLayeredWindow(HWND hwnd, BYTE alpha, UINT flags) +{ + struct wayland_win_data *data; + struct wayland_surface *surface; + uint32_t opacity = UINT32_MAX; + + if (!(data = wayland_win_data_get(hwnd))) return; + + surface = data->wayland_surface; + if (surface && surface->wp_alpha_modifier_surface_v1 && (flags & LWA_ALPHA)) + { + /* Convert BYTE alpha (0-255) to UINT32_MAX range */ + opacity = (UINT32_MAX / 255) * alpha; + wp_alpha_modifier_surface_v1_set_multiplier( + surface->wp_alpha_modifier_surface_v1, opacity); + wl_surface_commit(surface->wl_surface); + wl_display_flush(process_wayland.wl_display); + } + + wayland_win_data_release(data); +} + void set_client_surface(HWND hwnd, struct wayland_client_surface *new_client) { HWND toplevel = NtUserGetAncestor(hwnd, GA_ROOT); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10848
participants (2)
-
chenjiangyi -
JiangYi Chen (＠meshine)