[PATCH 0/2] MR10239: winex11: Continue requesting fullscreen monitors in PropertyNotify handlers.
In case it was delayed or skipped because of _NET_WM_STATE_FULLSCREEN not being requested yet, we need to retry after any update that might trigger further _NET_WM_STATE requests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10239
From: Rémi Bernon <rbernon@codeweavers.com> --- dlls/winex11.drv/window.c | 57 ++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 26cb17a2c77..98752287c46 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1272,39 +1272,28 @@ void window_set_user_time( struct x11drv_win_data *data, Time time, BOOL init ) 32, PropModeReplace, (unsigned char *)&time, 1 ); } -/* Update _NET_WM_FULLSCREEN_MONITORS when _NET_WM_STATE_FULLSCREEN is set to support fullscreen - * windows spanning multiple monitors */ -static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) +static void window_set_net_wm_fullscreen_monitors( struct x11drv_win_data *data, const struct monitor_indices *new_monitors ) { - struct monitor_indices *old_monitors = &data->pending_state.monitors, monitors; - XEvent xev; - - if (!(data->pending_state.net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) || is_virtual_desktop() - || NtUserGetWindowLongW( data->hwnd, GWL_STYLE ) & WS_MINIMIZE) - return; - - /* If the current display device handler cannot detect dynamic device changes, do not use - * _NET_WM_FULLSCREEN_MONITORS because xinerama_get_fullscreen_monitors() may report wrong - * indices because of stale xinerama monitor information */ - if (!X11DRV_DisplayDevices_SupportEventHandlers()) - return; + const struct monitor_indices *old_monitors = &data->pending_state.monitors; + data->desired_state.monitors = *new_monitors; - if (!xinerama_get_fullscreen_monitors( &data->rects.visible, &monitors.generation, monitors.indices )) - return; - data->desired_state.monitors = monitors; - - if (!memcmp( old_monitors, &monitors, sizeof(monitors) )) return; /* states are the same, nothing to update */ + if (!(data->pending_state.net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) || is_virtual_desktop()) return; /* window isn't fullscreen, delay updating */ + if (!data->whole_window || !data->managed || data->embedded) return; /* no window or not managed, nothing to update */ + if (!memcmp( old_monitors, new_monitors, sizeof(*new_monitors) )) return; /* states are the same, nothing to update */ + if (data->pending_state.wm_state == IconicState) return; /* window is iconic and may be mapped or not, don't update its state now */ if (data->pending_state.wm_state == WithdrawnState) { - memcpy( &data->pending_state.monitors, &monitors, sizeof(monitors) ); + memcpy( &data->pending_state.monitors, new_monitors, sizeof(*new_monitors) ); TRACE( "window %p/%lx, requesting _NET_WM_FULLSCREEN_MONITORS %s serial %lu\n", data->hwnd, data->whole_window, - debugstr_monitor_indices( &monitors ), NextRequest( data->display ) ); + debugstr_monitor_indices( new_monitors ), NextRequest( data->display ) ); XChangeProperty( data->display, data->whole_window, x11drv_atom(_NET_WM_FULLSCREEN_MONITORS), - XA_CARDINAL, 32, PropModeReplace, (unsigned char *)monitors.indices, 4 ); + XA_CARDINAL, 32, PropModeReplace, (unsigned char *)new_monitors->indices, 4 ); } else { + XEvent xev; + xev.xclient.type = ClientMessage; xev.xclient.window = data->whole_window; xev.xclient.message_type = x11drv_atom(_NET_WM_FULLSCREEN_MONITORS); @@ -1313,17 +1302,31 @@ static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) xev.xclient.send_event = True; xev.xclient.format = 32; xev.xclient.data.l[4] = 1; - memcpy( xev.xclient.data.l, monitors.indices, sizeof(monitors.indices) ); + memcpy( xev.xclient.data.l, new_monitors->indices, sizeof(new_monitors->indices) ); - memcpy( &data->pending_state.monitors, &monitors, sizeof(monitors) ); + memcpy( &data->pending_state.monitors, new_monitors, sizeof(*new_monitors) ); TRACE( "window %p/%lx, requesting _NET_WM_FULLSCREEN_MONITORS %s serial %lu\n", data->hwnd, data->whole_window, - debugstr_monitor_indices( &monitors ), NextRequest( data->display ) ); + debugstr_monitor_indices( new_monitors ), NextRequest( data->display ) ); XSendEvent( data->display, DefaultRootWindow( data->display ), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev ); } /* assume it changes immediately, we don't track the property for now */ - memcpy( &data->current_state.monitors, &monitors, sizeof(monitors) ); + memcpy( &data->current_state.monitors, new_monitors, sizeof(*new_monitors) ); +} + +/* Update _NET_WM_FULLSCREEN_MONITORS when _NET_WM_STATE_FULLSCREEN is set to support fullscreen + * windows spanning multiple monitors */ +static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) +{ + struct monitor_indices monitors; + + /* If the current display device handler cannot detect dynamic device changes, do not use + * _NET_WM_FULLSCREEN_MONITORS because xinerama_get_fullscreen_monitors() may report wrong + * indices because of stale xinerama monitor information */ + if (!X11DRV_DisplayDevices_SupportEventHandlers()) return; + if (!xinerama_get_fullscreen_monitors( &data->rects.visible, &monitors.generation, monitors.indices )) return; + window_set_net_wm_fullscreen_monitors( data, &monitors ); } static void window_set_net_wm_state( struct x11drv_win_data *data, UINT new_state ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10239
From: Rémi Bernon <rbernon@codeweavers.com> In case it was delayed or skipped because of _NET_WM_STATE_FULLSCREEN not being requested yet, we need to retry after any update that might trigger further _NET_WM_STATE requests. --- dlls/winex11.drv/window.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 98752287c46..3561130f202 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1846,6 +1846,15 @@ static BOOL handle_state_change( unsigned long serial, unsigned long *expect_ser return TRUE; } +static void window_request_desired_state( struct x11drv_win_data *data ) +{ + window_set_wm_state( data, data->desired_state.wm_state, data->desired_state.activate ); + window_set_net_wm_state( data, data->desired_state.net_wm_state ); + window_set_net_wm_fullscreen_monitors( data, &data->desired_state.monitors ); + window_set_mwm_hints( data, &data->desired_state.mwm_hints ); + window_set_config( data, data->desired_state.rect, FALSE ); +} + void window_wm_state_notify( struct x11drv_win_data *data, unsigned long serial, UINT value, Time time ) { UINT *desired = &data->desired_state.wm_state, *pending = &data->pending_state.wm_state, *current = &data->current_state.wm_state; @@ -1865,10 +1874,7 @@ void window_wm_state_notify( struct x11drv_win_data *data, unsigned long serial, data->reparenting = 0; /* send any pending changes from the desired state */ - window_set_wm_state( data, data->desired_state.wm_state, data->desired_state.activate ); - window_set_net_wm_state( data, data->desired_state.net_wm_state ); - window_set_mwm_hints( data, &data->desired_state.mwm_hints ); - window_set_config( data, data->desired_state.rect, FALSE ); + window_request_desired_state( data ); if (data->current_state.wm_state == NormalState) NtUserSetProp( data->hwnd, focus_time_prop, (HANDLE)time ); else if (!data->wm_state_serial) NtUserRemoveProp( data->hwnd, focus_time_prop ); @@ -1889,10 +1895,7 @@ void window_net_wm_state_notify( struct x11drv_win_data *data, unsigned long ser return; /* send any pending changes from the desired state */ - window_set_wm_state( data, data->desired_state.wm_state, data->desired_state.activate ); - window_set_net_wm_state( data, data->desired_state.net_wm_state ); - window_set_mwm_hints( data, &data->desired_state.mwm_hints ); - window_set_config( data, data->desired_state.rect, FALSE ); + window_request_desired_state( data ); } void window_wm_hints_notify( struct x11drv_win_data *data, unsigned long serial, const XWMHints *value ) @@ -1924,10 +1927,7 @@ void window_mwm_hints_notify( struct x11drv_win_data *data, unsigned long serial return; /* send any pending changes from the desired state */ - window_set_wm_state( data, data->desired_state.wm_state, data->desired_state.activate ); - window_set_net_wm_state( data, data->desired_state.net_wm_state ); - window_set_mwm_hints( data, &data->desired_state.mwm_hints ); - window_set_config( data, data->desired_state.rect, FALSE ); + window_request_desired_state( data ); } void window_wm_normal_hints_notify( struct x11drv_win_data *data, unsigned long serial, const XSizeHints *value ) @@ -1968,10 +1968,7 @@ void window_configure_notify( struct x11drv_win_data *data, unsigned long serial data->pending_state.above = FALSE; /* allow requesting it again */ /* send any pending changes from the desired state */ - window_set_wm_state( data, data->desired_state.wm_state, data->desired_state.activate ); - window_set_net_wm_state( data, data->desired_state.net_wm_state ); - window_set_mwm_hints( data, &data->desired_state.mwm_hints ); - window_set_config( data, data->desired_state.rect, FALSE ); + window_request_desired_state( data ); } void net_active_window_notify( unsigned long serial, Window value, Time time ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10239
participants (2)
-
Rémi Bernon -
Rémi Bernon (＠rbernon)