[PATCH v2 0/1] MR7331: winex11.drv: Go though WithdrawnState when transitioning from IconicState to NormalState.
When transitioning a window from IconicState to NormalState and the window is managed, go through WithdrawnState. This is needed because Mutter doesn't unmap windows when making windows iconic/minimized as Mutter needs to support live preview for minimized windows. So on Mutter, a window can be both iconic and mapped. If the window is mapped, then XMapWindow() will have no effect according to the XMapWindow() documentation. Thus we have to transition to WithdrawnState first, then to NormalState.
Fix Mass Effect Legendary Edition (1328670) starts minimized.
-- v2: winex11.drv: Go though WithdrawnState when transitioning from IconicState to NormalState.
From: Zhiyi Zhang zzhang@codeweavers.com
When transitioning a window from IconicState to NormalState and the window is managed, go through WithdrawnState. This is needed because Mutter doesn't unmap windows when making windows iconic/minimized as Mutter needs to support live preview for minimized windows. So on Mutter, a window can be both iconic and mapped. If the window is mapped, then XMapWindow() will have no effect according to the XMapWindow() documentation. Thus we have to transition to WithdrawnState first, then to NormalState.
Fix Mass Effect Legendary Edition (1328670) starts minimized. --- dlls/winex11.drv/window.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b033960fc26..7ae1d8ef66a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1448,6 +1448,20 @@ static void window_set_wm_state( struct x11drv_win_data *data, UINT new_state ) return; /* another map/unmap WM_STATE update is pending, wait for it to complete */ if (old_state == new_state) return; /* states are the same, nothing to update */
+ /* When transitioning a window from IconicState to NormalState and the window is managed, go + * through WithdrawnState. This is needed because Mutter doesn't unmap windows when making + * windows iconic/minimized as Mutter needs to support live preview for minimized windows. So on + * Mutter, a window can be both iconic and mapped. If the window is mapped, then XMapWindow() + * will have no effect according to the XMapWindow() documentation. Thus we have to transition + * to WithdrawnState first, then to NormalState */ + if (data->managed && MAKELONG(old_state, new_state) == MAKELONG(IconicState, NormalState)) + { + WARN( "window %p/%lx is iconic, remapping to workaround Mutter issues.\n", data->hwnd, data->whole_window ); + window_set_wm_state( data, WithdrawnState ); + window_set_wm_state( data, NormalState ); + return; + } + switch (MAKELONG(old_state, new_state)) { case MAKELONG(WithdrawnState, IconicState):
This merge request was approved by Rémi Bernon.
-
Rémi Bernon (＠rbernon) -
Zhiyi Zhang
-
Zhiyi Zhang (＠zhiyi)