72 lines
2.9 KiB
Diff
72 lines
2.9 KiB
Diff
From 6ad5c45090c3009d62b97452dc91f1705118feb3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
|
Date: Mon, 18 May 2026 16:09:57 +0200
|
|
Subject: [PATCH] x11: Do not unminimize windows with initial IconicState
|
|
|
|
This is a revert of commit be5c2ebc. While this worked around issues in
|
|
wine/proton, it did contravene icccm in the interpretation of initially
|
|
iconic windows.
|
|
|
|
This reverts commit be5c2ebcb59652c91a5817762e6535b357f14a47.
|
|
|
|
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2043
|
|
Adapted-from: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3001>
|
|
---
|
|
src/x11/events.c | 37 +++++++++++++------------------------
|
|
1 file changed, 13 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/src/x11/events.c b/src/x11/events.c
|
|
index 905b5bf9d2..3b258b6e36 100644
|
|
--- a/src/x11/events.c
|
|
+++ b/src/x11/events.c
|
|
@@ -1410,33 +1410,22 @@ handle_other_xevent (MetaX11Display *x11_display,
|
|
{
|
|
window = meta_window_x11_new (display, event->xmaprequest.window,
|
|
FALSE, META_COMP_EFFECT_CREATE);
|
|
- /* The window might have initial iconic state, but this is a
|
|
- * MapRequest, fall through to ensure it is unminimized in
|
|
- * that case.
|
|
- */
|
|
}
|
|
- else if (frame_was_receiver)
|
|
+ /* if frame was receiver it's some malicious send event or something */
|
|
+ else if (!frame_was_receiver && window)
|
|
{
|
|
- meta_warning ("Map requests on the frame window are unexpected\n");
|
|
- break;
|
|
- }
|
|
-
|
|
- /* Double check that creating the MetaWindow succeeded */
|
|
- if (window == NULL)
|
|
- break;
|
|
-
|
|
- meta_verbose ("MapRequest on %s mapped = %d minimized = %d\n",
|
|
- window->desc, window->mapped, window->minimized);
|
|
-
|
|
- if (window->minimized)
|
|
- {
|
|
- meta_window_unminimize (window);
|
|
- if (window->workspace != workspace_manager->active_workspace)
|
|
+ meta_verbose ("MapRequest on %s mapped = %d minimized = %d\n",
|
|
+ window->desc, window->mapped, window->minimized);
|
|
+ if (window->minimized)
|
|
{
|
|
- meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d\n",
|
|
- window->mapped, window->minimized);
|
|
- meta_window_change_workspace (window,
|
|
- workspace_manager->active_workspace);
|
|
+ meta_window_unminimize (window);
|
|
+ if (window->workspace != workspace_manager->active_workspace)
|
|
+ {
|
|
+ meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d\n",
|
|
+ window->mapped, window->minimized);
|
|
+ meta_window_change_workspace (window,
|
|
+ workspace_manager->active_workspace);
|
|
+ }
|
|
}
|
|
}
|
|
break;
|
|
--
|
|
2.54.0
|
|
|