Allow compilation without Wayland support (#523)

rcaelers · Mar 5, 2024 · bc0055c · bc0055c
1 parent 88ef702
commit bc0055c
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 42 deletions.
diff --git a/cmake/config.h.in b/cmake/config.h.in
@@ -42,6 +42,7 @@
 #cmakedefine HAVE_TESTS
 #cmakedefine HAVE_TRACING
 #cmakedefine HAVE_UNFOLD_AUTO_UPDATE
+#cmakedefine HAVE_WAYLAND
 #cmakedefine HAVE_XFCE4
 #cmakedefine HAVE_XRECORD
 #cmakedefine PLATFORM_OS_MACOS

diff --git a/libs/input-monitor/src/CMakeLists.txt b/libs/input-monitor/src/CMakeLists.txt
@@ -9,25 +9,31 @@ if (PLATFORM_OS_UNIX)
     unix/XScreenSaverMonitor.cc
     unix/UnixInputMonitorFactory.cc
     unix/MutterInputMonitor.cc
-    unix/WaylandInputMonitor.cc
-    ${CMAKE_CURRENT_BINARY_DIR}/ext-idle-notify-v1.c
     )
 
   target_include_directories(workrave-libs-input-monitor PRIVATE ${CMAKE_SOURCE_DIR}/libs/input-monitor/src/unix)
+
   if (HAVE_GTK)
     target_include_directories(workrave-libs-input-monitor PRIVATE ${GTK_INCLUDE_DIRS})
     target_link_libraries(workrave-libs-input-monitor ${GTK_LIBRARIES})
     target_link_libraries(workrave-libs-input-monitor ${X11_X11_LIB} ${X11_Xtst_LIB} ${X11_Xss_LIB})
   endif()
-  target_link_libraries(workrave-libs-input-monitor ${WAYLAND_CLIENT_LIBRARIES})
-
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ext-idle-notify-v1.c ${CMAKE_CURRENT_BINARY_DIR}/ext-idle-notify-v1-client.h
-    COMMAND ${WAYLAND_SCANNER} private-code ${CMAKE_CURRENT_SOURCE_DIR}/unix/protocols/ext-idle-notify-v1.xml ${CMAKE_CURRENT_BINARY_DIR}/ext-idle-notify-v1.c
-    COMMAND ${WAYLAND_SCANNER} client-header ${CMAKE_CURRENT_SOURCE_DIR}/unix/protocols/ext-idle-notify-v1.xml ${CMAKE_CURRENT_BINARY_DIR}/ext-idle-notify-v1-client.h
-    DEPENDS unix/protocols/ext-idle-notify-v1.xml
-    VERBATIM
-  )
+
+  if (HAVE_WAYLAND)
+    add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ext-idle-notify-v1.c ${CMAKE_CURRENT_BINARY_DIR}/ext-idle-notify-v1-client.h
+      COMMAND ${WAYLAND_SCANNER} private-code ${CMAKE_CURRENT_SOURCE_DIR}/unix/protocols/ext-idle-notify-v1.xml ${CMAKE_CURRENT_BINARY_DIR}/ext-idle-notify-v1.c
+      COMMAND ${WAYLAND_SCANNER} client-header ${CMAKE_CURRENT_SOURCE_DIR}/unix/protocols/ext-idle-notify-v1.xml ${CMAKE_CURRENT_BINARY_DIR}/ext-idle-notify-v1-client.h
+      DEPENDS unix/protocols/ext-idle-notify-v1.xml
+      VERBATIM
+    )
+    target_sources(workrave-libs-input-monitor PRIVATE
+      unix/WaylandInputMonitor.cc
+      ${CMAKE_CURRENT_BINARY_DIR}/ext-idle-notify-v1.c
+      )
+    target_link_libraries(workrave-libs-input-monitor ${WAYLAND_CLIENT_LIBRARIES})
+  endif()
+
   target_include_directories(workrave-libs-input-monitor PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 endif()
 

diff --git a/libs/input-monitor/src/unix/UnixInputMonitorFactory.cc b/libs/input-monitor/src/unix/UnixInputMonitorFactory.cc
@@ -34,7 +34,10 @@
 #include "X11InputMonitor.hh"
 #include "XScreenSaverMonitor.hh"
 #include "MutterInputMonitor.hh"
-#include "WaylandInputMonitor.hh"
+
+#if defined(HAVE_WAYLAND)
+#  include "WaylandInputMonitor.hh"
+#endif
 
 using namespace std;
 using namespace workrave;
@@ -111,10 +114,12 @@ UnixInputMonitorFactory::create_monitor(MonitorCapability capability)
             {
               monitor = IInputMonitor::Ptr(new MutterInputMonitor());
             }
+#if defined(HAVE_WAYLAND)
           else if (monitor_method == "wayland")
             {
               monitor = IInputMonitor::Ptr(new WaylandInputMonitor());
             }
+#endif
 
           initialized = monitor->init();
 

diff --git a/ui/app/toolkits/gtkmm/BreakWindow.cc b/ui/app/toolkits/gtkmm/BreakWindow.cc
@@ -56,6 +56,8 @@
 #  include "core/ICore.hh"
 #elif defined(PLATFORM_OS_UNIX)
 #  include "desktop-window.h"
+#endif
+#if defined(HAVE_WAYLAND)
 #  include "WaylandWindowManager.hh"
 #endif
 
@@ -76,7 +78,7 @@ BreakWindow::BreakWindow(std::shared_ptr<IApplicationContext> app,
 {
   TRACE_ENTRY();
 
-#if defined(PLATFORM_OS_UNIX)
+#if defined(HAVE_WAYLAND)
   if (Platform::running_on_wayland())
     {
       auto wm = std::make_shared<WaylandWindowManager>();
@@ -146,9 +148,7 @@ BreakWindow::BreakWindow(std::shared_ptr<IApplicationContext> app,
   if (WindowsForceFocus::GetForceFocusValue())
     initial_ignore_activity = true;
 
-  app->get_configurator()->get_value_with_default("advanced/force_focus_on_break_start",
-                                                              force_focus_on_break_start,
-                                                              true);
+  app->get_configurator()->get_value_with_default("advanced/force_focus_on_break_start", force_focus_on_break_start, true);
 #endif
 
   auto core = app->get_core();
@@ -695,7 +695,7 @@ BreakWindow::start()
   // Otherwise, there is not gobj()...
   realize_if_needed();
 
-#if defined(PLATFORM_OS_UNIX)
+#if defined(HAVE_WAYLAND)
   if (window_manager)
     {
       window_manager->init_surface(*this, head.get_monitor(), true);
@@ -764,7 +764,7 @@ BreakWindow::stop()
 
   hide();
 
-#if defined(PLATFORM_OS_UNIX)
+#if defined(HAVE_WAYLAND)
   if (window_manager)
     {
       window_manager->clear_surfaces();

diff --git a/ui/app/toolkits/gtkmm/BreakWindow.hh b/ui/app/toolkits/gtkmm/BreakWindow.hh
@@ -31,7 +31,7 @@
 #if defined(PLATFORM_OS_WINDOWS)
 class DesktopWindow;
 #endif
-#if defined(PLATFORM_OS_UNIX)
+#if defined(HAVE_WAYLAND)
 #  include "platforms/unix/WaylandWindowManager.hh"
 #endif
 
@@ -154,7 +154,7 @@ private:
   bool force_focus_on_break_start{false};
   long parent{0};
 #endif
-#if defined(PLATFORM_OS_UNIX)
+#if defined(HAVE_WAYLAND)
   std::shared_ptr<WaylandWindowManager> window_manager;
 #endif
 

diff --git a/ui/app/toolkits/gtkmm/CMakeLists.txt b/ui/app/toolkits/gtkmm/CMakeLists.txt
@@ -47,11 +47,32 @@ if (PLATFORM_OS_UNIX)
     platforms/unix/desktop-window.c
     platforms/unix/gtktrayicon.c
     platforms/unix/UnixLocker.cc
-    platforms/unix/WaylandWindowManager.cc
-    ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-unstable-v1.c
-    ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell.c
+
     )
 
+    if (HAVE_WAYLAND)
+      add_custom_command(
+        OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-unstable-v1.c  ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-unstable-v1-client.h
+        COMMAND ${WAYLAND_SCANNER} private-code ${CMAKE_CURRENT_SOURCE_DIR}/platforms/unix/protocols/wlr-layer-shell-unstable-v1.xml ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-unstable-v1.c
+        COMMAND ${WAYLAND_SCANNER} client-header ${CMAKE_CURRENT_SOURCE_DIR}/platforms/unix/protocols/wlr-layer-shell-unstable-v1.xml ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-unstable-v1-client.h
+        DEPENDS platforms/unix/protocols/wlr-layer-shell-unstable-v1.xml
+        VERBATIM
+      )
+
+      add_custom_command(
+        OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell.c  ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell-client.h
+        COMMAND ${WAYLAND_SCANNER} private-code ${CMAKE_CURRENT_SOURCE_DIR}/platforms/unix/protocols/xdg-shell.xml ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell.c
+        COMMAND ${WAYLAND_SCANNER} client-header ${CMAKE_CURRENT_SOURCE_DIR}/platforms/unix/protocols/xdg-shell.xml ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell-client.h
+        DEPENDS platforms/unix/protocols/xdg-shell.xml
+        VERBATIM
+      )
+
+      target_sources(workrave-toolkit-gtkmm PRIVATE
+        platforms/unix/WaylandWindowManager.cc
+        ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-unstable-v1.c
+        ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell.c)
+    endif()
+
     if (HAVE_DBUSMENU)
       target_sources(workrave-toolkit-gtkmm PRIVATE platforms/unix/DbusMenu.cc)
     endif()
@@ -62,21 +83,6 @@ if (PLATFORM_OS_UNIX)
 
     target_include_directories(workrave-toolkit-gtkmm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/platforms/unix ${CMAKE_CURRENT_SOURCE_DIR}/platforms/unix/protocols)
 
-    add_custom_command(
-      OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-unstable-v1.c  ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-unstable-v1-client.h
-      COMMAND ${WAYLAND_SCANNER} private-code ${CMAKE_CURRENT_SOURCE_DIR}/platforms/unix/protocols/wlr-layer-shell-unstable-v1.xml ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-unstable-v1.c
-      COMMAND ${WAYLAND_SCANNER} client-header ${CMAKE_CURRENT_SOURCE_DIR}/platforms/unix/protocols/wlr-layer-shell-unstable-v1.xml ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-unstable-v1-client.h
-      DEPENDS platforms/unix/protocols/wlr-layer-shell-unstable-v1.xml
-      VERBATIM
-    )
-
-    add_custom_command(
-      OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell.c  ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell-client.h
-      COMMAND ${WAYLAND_SCANNER} private-code ${CMAKE_CURRENT_SOURCE_DIR}/platforms/unix/protocols/xdg-shell.xml ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell.c
-      COMMAND ${WAYLAND_SCANNER} client-header ${CMAKE_CURRENT_SOURCE_DIR}/platforms/unix/protocols/xdg-shell.xml ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell-client.h
-      DEPENDS platforms/unix/protocols/xdg-shell.xml
-      VERBATIM
-    )
 
     target_include_directories(workrave-toolkit-gtkmm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/platforms/unix/)
 endif()

diff --git a/ui/app/toolkits/gtkmm/PreludeWindow.cc b/ui/app/toolkits/gtkmm/PreludeWindow.cc
@@ -46,7 +46,7 @@ PreludeWindow::PreludeWindow(HeadInfo head, BreakId break_id)
   : Gtk::Window(Gtk::WINDOW_POPUP)
 {
   TRACE_ENTRY();
-#if defined(PLATFORM_OS_UNIX)
+#if defined(HAVE_WAYLAND)
   if (Platform::running_on_wayland())
     {
       auto wm = std::make_shared<WaylandWindowManager>();
@@ -137,7 +137,7 @@ PreludeWindow::start()
   // Otherwise, there is no gobj()...
   realize_if_needed();
 
-#if defined(PLATFORM_OS_UNIX)
+#if defined(HAVE_WAYLAND)
   if (window_manager)
     {
       window_manager->init_surface(*this, head.get_monitor(), false);
@@ -198,7 +198,7 @@ PreludeWindow::stop()
   frame->set_frame_flashing(0);
   hide();
 
-#if defined(PLATFORM_OS_UNIX)
+#if defined(HAVE_WAYLAND)
   if (window_manager)
     {
       window_manager->clear_surfaces();

diff --git a/ui/app/toolkits/gtkmm/PreludeWindow.hh b/ui/app/toolkits/gtkmm/PreludeWindow.hh
@@ -101,7 +101,7 @@ private:
   // Alignment in Wayland
   Gtk::Alignment *align{nullptr};
 
-#if defined(PLATFORM_OS_UNIX)
+#if defined(HAVE_WAYLAND)
   std::shared_ptr<WaylandWindowManager> window_manager;
 #endif
 };