From 983a19169b174cbdf96756083661e6b28731470b Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Sat, 1 Mar 2025 16:54:59 +0100
Subject: [PATCH] Don't include xcb_icccm.h

We just need this constant, so there's no real need to add the
additional dependency. There's also no real harm in adding it, but it
would result in additional work for every packager.
---
 src/wine-host/editor.cpp | 28 ++++++++++++++++++++++------
 src/wine-host/editor.h   |  2 --
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/wine-host/editor.cpp b/src/wine-host/editor.cpp
index 554688da..c283389d 100644
--- a/src/wine-host/editor.cpp
+++ b/src/wine-host/editor.cpp
@@ -90,9 +90,22 @@ constexpr char active_window_property_name[] = "_NET_ACTIVE_WINDOW";
 
 /**
  * We'll use this property to filter windows for `host_window_`. Like `xprop`
- * and `xwininfo`, we'll only consider windows with this property set.
+ * and `xwininfo`, we'll only consider windows with this property set, although
+ * we won't filter on whether or not the window is actually visible because it
+ * may be minimalized when the plugin's GUI is being opened.
  */
-constexpr char wm_state_property_name[] = "WM_STATE";
+constexpr char icccm_wm_state_property_name[] = "WM_STATE";
+
+/**
+ * This `WM_STATE` property value indicates that a window is a visible top level
+ * window. Needs to be set on Wine's window as part of emulating the behavior of
+ * a minimal window manager.
+ *
+ * Taken from the ICCCM specification:
+ *
+ * <https://x.org/releases/X11R7.6/doc/xorg-docs/specs/ICCCM/icccm.html#wm_state_property>
+ */
+constexpr uint32_t icccm_wm_state_normal = 1;
 
 // `xdnd_aware_property_name` was moved to `editor.h` so the unity build
 // succeeds
@@ -302,7 +315,7 @@ Editor::Editor(MainContext& main_context,
           }
       }),
       xcb_wm_state_property_(
-          get_atom_by_name(*x11_connection_, wm_state_property_name)),
+          get_atom_by_name(*x11_connection_, icccm_wm_state_property_name)),
       parent_window_(parent_window_handle),
       wrapper_window_(
           x11_connection_,
@@ -614,9 +627,12 @@ void Editor::handle_x11_events() noexcept {
                     });
                     xcb_map_window(x11_connection_.get(), wine_window_);
 
-                    const std::array<uint32_t, 2> values{XCB_ICCCM_WM_STATE_NORMAL, 0};
-                    xcb_change_property(x11_connection_.get(), XCB_PROP_MODE_REPLACE, wine_window_, xcb_wm_state_property_,
-                                        xcb_wm_state_property_, 32, 2, values.data());
+                    const std::array<uint32_t, 2> values{
+                        icccm_wm_state_normal, 0};
+                    xcb_change_property(
+                        x11_connection_.get(), XCB_PROP_MODE_REPLACE,
+                        wine_window_, xcb_wm_state_property_,
+                        xcb_wm_state_property_, 32, 2, values.data());
                     xcb_flush(x11_connection_.get());
                 } break;
                 // Start the XEmbed procedure when the window becomes visible,
diff --git a/src/wine-host/editor.h b/src/wine-host/editor.h
index 1e700d42..4d4148f0 100644
--- a/src/wine-host/editor.h
+++ b/src/wine-host/editor.h
@@ -18,7 +18,6 @@
 
 #include <memory>
 #include <optional>
-#include <string>
 
 #include <windows.h>
 #include <function2/function2.hpp>
@@ -27,7 +26,6 @@
 #pragma push_macro("_WIN32")
 #undef _WIN32
 #include <xcb/xcb.h>
-#include <xcb/xcb_icccm.h>
 #pragma pop_macro("_WIN32")
 
 #include "../common/configuration.h"