Merge pull request #1887 from whot/wip/warn-on-xwayland

x11: log a warning if we're running against Xwayland
input-leap · Mar 12, 2024 · 08d43e7 · 08d43e7
2 parents 9c88618 + 396317e
commit 08d43e7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/doc/newsfragments/warn-on-xwayland.feature b/doc/newsfragments/warn-on-xwayland.feature
@@ -0,0 +1 @@
+InputLeap now warns when connecting to Xwayland.
diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp
@@ -118,6 +118,8 @@ XWindowsScreen::XWindowsScreen(
                                              m_keyMap);
 		LOG_DEBUG("screen shape: %d,%d %dx%d %s", m_x, m_y, m_w, m_h, m_xinerama ? "(xinerama)" : "");
 		LOG_DEBUG("window is 0x%08lx", m_window);
+        if (detectXwayland())
+            LOG_WARN("Running against Xwayland. InputLeap will not work as expected");
 	}
 	catch (...) {
         if (m_display != nullptr) {
@@ -2025,6 +2027,14 @@ XWindowsScreen::detectXI2()
 			"XInputExtension", &xi_opcode, &event, &error);
 }
 
+bool
+XWindowsScreen::detectXwayland()
+{
+    int opcode, event, error;
+    return m_impl->XQueryExtension(m_display, "XWAYLAND",
+                                   &opcode, &event, &error);
+}
+
 void
 XWindowsScreen::selectXIRawMotion()
 {

diff --git a/src/lib/platform/XWindowsScreen.h b/src/lib/platform/XWindowsScreen.h
@@ -143,6 +143,7 @@ class XWindowsScreen : public PlatformScreen {
     int y_accumulateMouseScroll(std::int32_t yDelta) const;
 
     bool detectXI2();
+    bool detectXwayland();
     void selectXIRawMotion();
     void selectEvents(Window) const;
     void doSelectEvents(Window) const;