Add mouse events & friends for Wayland

.github/workflows/build-and-test-linux.yaml

@@ -140,6 +140,7 @@ jobs:
             -DBUILD_MYSQL=ON                     \
             -DBUILD_NVIDIA=ON                    \
             -DBUILD_PULSEAUDIO=ON                \
+            -DBUILD_CURL=ON                      \
             -DBUILD_RSS=ON                       \
             -DBUILD_TESTS=ON                     \
             -DBUILD_WLAN=ON                      \

.github/workflows/build-and-test-macos.yaml

@@ -37,6 +37,7 @@ jobs:
             libxft \
             libxinerama \
             libxfixes \
+            libxi \
             lua \
             ninja \
             pkg-config

.vscode/extensions.json

@@ -2,6 +2,7 @@
   "recommendations": [
     "kamadorueda.alejandra",
     "ms-vscode.cmake-tools",
-    "mkhl.direnv"
+    "mkhl.direnv",
+    "xaver.clang-format"
   ]
 }

3rdparty/toluapp/CMakeLists.txt

@@ -5,7 +5,7 @@
 # Please note that the package source code is licensed under its own license.
 
 project ( toluapp C )
-cmake_minimum_required ( VERSION 3.4 )
+cmake_minimum_required ( VERSION 3.15 )
 # Disable dist stuff, we're not installing this as a lib
 # include ( cmake/dist.cmake )
 

CMakeLists.txt

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.17)
 
 project(conky)
 

README.md

@@ -33,8 +33,8 @@ Conky can display more than 300 built-in objects, including support for:
 
 ... and much much more.
 
-Conky can display information either as text, or using simple progress
-bars and graph widgets, with different fonts and colours.
+Conky can display information either as text, or using simple progress bars and
+graph widgets, with different fonts and colours, as well as handle [mouse events](https://github.com/brndnmtthws/conky/wiki/Mouse-Events).
 
 ## Screenshots
 

cmake/ConkyBuildOptions.cmake

@@ -18,6 +18,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+include(CMakeDependentOption)
+include(DependentOption)
+
 if(NOT CMAKE_BUILD_TYPE)
   if(MAINTAINER_MODE)
     set(
@@ -97,33 +100,33 @@ set(DEFAULT_TEXT_BUFFER_SIZE "256"
 set(MAX_NET_INTERFACES "256" CACHE STRING "Maximum number of network devices")
 
 # Platform specific options Linux only
+cmake_dependent_option(BUILD_PORT_MONITORS "Build TCP portmon support" true
+  "OS_LINUX" false)
+cmake_dependent_option(BUILD_IBM "Support for IBM/Lenovo notebooks" true
+  "OS_LINUX" false)
+cmake_dependent_option(BUILD_HDDTEMP "Support for hddtemp" true
+  "OS_LINUX" false)
+cmake_dependent_option(BUILD_IPV6 "Enable if you want IPv6 support" true
+  "OS_LINUX" false)
+
 if(OS_LINUX)
-  option(BUILD_PORT_MONITORS "Build TCP portmon support" true)
-  option(BUILD_IBM "Support for IBM/Lenovo notebooks" true)
-  option(BUILD_HDDTEMP "Support for hddtemp" true)
-  option(BUILD_IPV6 "Enable if you want IPv6 support" true)
-  if(BUILD_X11)
-    # nvidia may also work on FreeBSD, not sure
-    option(BUILD_NVIDIA "Enable nvidia support" false)
-  endif(BUILD_X11)
-else(OS_LINUX)
-  set(BUILD_PORT_MONITORS false)
-  set(BUILD_IBM false)
-  set(BUILD_HDDTEMP false)
-  set(BUILD_NVIDIA false)
-  set(BUILD_IPV6 false)
+  # nvidia may also work on FreeBSD, not sure
+  # NvCtrl requires X11. Should be modified to use NVML directly.
+  dependent_option(BUILD_NVIDIA "Enable Nvidia NvCtrl variables" false
+    "BUILD_X11" false
+    "Nvidia NvCtrl variables require X11")
+else()
+  set(BUILD_NVIDIA false CACHE BOOL "Enable Nvidia NvCtrl variables" FORCE)
 endif(OS_LINUX)
 
 # macOS Only
-if(OS_DARWIN)
-  option(
-    BUILD_IPGFREQ
-    "Enable cpu freq calculation based on Intel® Power Gadget; otherwise use constant factory value"
-    false)
-endif(OS_DARWIN)
+cmake_dependent_option(
+  BUILD_IPGFREQ
+  "Enable cpu freq calculation based on Intel® Power Gadget; otherwise use constant factory value"
+  false
+  "OS_DARWIN" false)
 
 # Optional features etc
-#
 
 option(BUILD_WLAN "Enable wireless support" false)
 
@@ -137,53 +140,59 @@ option(BUILD_OLD_CONFIG "Enable support for the old syntax of configurations"
 option(BUILD_MATH "Enable math support" true)
 
 option(BUILD_NCURSES "Enable ncurses support" true)
-if(BUILD_NCURSES)
-  option(
-    LEAKFREE_NCURSES
-    "Enable to hide false ncurses-memleaks in valgrind (works only when ncurses is compiled with --disable-leaks)"
-    false)
-else(BUILD_NCURSES)
-  set(
-    LEAKFREE_NCURSES false
-    CACHE
-      BOOL
-      "Enable to hide false ncurses-memleaks in valgrind (works only when ncurses is compiled with --disable-leaks)"
-    FORCE)
-endif(BUILD_NCURSES)
+
+dependent_option(LEAKFREE_NCURSES
+  "Enable to hide false ncurses-memleaks in valgrind (works only when ncurses is compiled with --disable-leaks)"
+  false
+  "BUILD_NCURSES" false
+  "LEAKFREE_NCURSES requires ncurses")
 
 option(BUILD_WAYLAND "Build Wayland support" false)
 
 option(BUILD_X11 "Build X11 support" true)
-if(BUILD_X11)
-  option(OWN_WINDOW "Enable own_window support" true)
-
-  # Mac Fix
-  if(OS_DARWIN)
-    option(BUILD_XDAMAGE "Build Xdamage support" false)
-		option(BUILD_XFIXES "Build Xfixes support" false)
-  else(OS_DARWIN)
-    option(BUILD_XDAMAGE "Build Xdamage support" true)
-		option(BUILD_XFIXES "Build Xfixes support" true)
-  endif(OS_DARWIN)
-
-  option(BUILD_XINERAMA "Build Xinerama support" true)
-  option(BUILD_XDBE "Build Xdbe (double-buffer) support" true)
-  option(BUILD_XFT "Build Xft (freetype fonts) support" true)
-  option(BUILD_IMLIB2 "Enable Imlib2 support" true)
-  option(BUILD_XSHAPE "Enable Xshape support" true)
-  option(BUILD_MOUSE_EVENTS "Enable mouse event support" true)
-else(BUILD_X11)
-  set(OWN_WINDOW false CACHE BOOL "Enable own_window support" FORCE)
-  set(BUILD_XDAMAGE false CACHE BOOL "Build Xdamage support" FORCE)
-	set(BUILD_XFIXES false CACHE BOOL "Build Xfixes support" FORCE)
-  set(BUILD_XINERAMA false CACHE BOOL "Build Xinerama support" FORCE)
-  set(BUILD_XDBE false CACHE BOOL "Build Xdbe (double-buffer) support" FORCE)
-  set(BUILD_XFT false CACHE BOOL "Build Xft (freetype fonts) support" FORCE)
-  set(BUILD_IMLIB2 false CACHE BOOL "Enable Imlib2 support" FORCE)
-  set(BUILD_XSHAPE false CACHE BOOL "Enable Xshape support" FORCE)
-  set(BUILD_MOUSE_EVENTS false CACHE BOOL "Enable mouse event support" FORCE)
-  set(BUILD_NVIDIA false)
-endif(BUILD_X11)
+
+dependent_option(OWN_WINDOW "Enable running conky in a dedicated window" true
+  "BUILD_X11" false
+  "Dedicated window mode only works on X11")
+
+# On MacOS these cause issues so they're disabled by default
+if(OS_DARWIN)
+  dependent_option(BUILD_XDAMAGE "Build Xdamage support" false
+    "BUILD_X11" false
+    "Xdamage support requires X11")
+  dependent_option(BUILD_XFIXES "Build Xfixes support" false
+    "BUILD_X11" false
+    "Xfixes support requires X11")
+else()
+  dependent_option(BUILD_XDAMAGE "Build Xdamage support" true
+    "BUILD_X11" false
+    "Xdamage support requires X11")
+  dependent_option(BUILD_XFIXES "Build Xfixes support" true
+    "BUILD_X11" false
+    "Xfixes support requires X11")
+endif(OS_DARWIN)
+
+dependent_option(BUILD_ARGB "Build ARGB (real transparency) support" true
+  "BUILD_X11;OWN_WINDOW" false
+  "ARGB support requires X11 and OWN_WINDOW enabled, not needed on Wayland")
+dependent_option(BUILD_XINERAMA "Build Xinerama support" true
+  "BUILD_X11" false
+  "Xinerama support requires X11")
+dependent_option(BUILD_XDBE "Build Xdbe (double-buffer) support" true
+  "BUILD_X11" false
+  "Xdbe based double-buffering requires X11")
+dependent_option(BUILD_XFT "Build Xft (freetype fonts) support" true
+  "BUILD_X11" false
+  "Xft (freetype font) support requires X11")
+dependent_option(BUILD_IMLIB2 "Enable Imlib2 support" true
+  "BUILD_X11" false
+  "Imlib2 support requires X11")
+dependent_option(BUILD_XSHAPE "Enable Xshape support" true
+  "BUILD_X11" false
+  "Xshape support requires X11")
+dependent_option(BUILD_XINPUT "Build Xinput 2 support" true
+  "BUILD_X11;BUILD_MOUSE_EVENTS" false
+  "Xinput 2 support requires X11 and BUILD_MOUSE_EVENTS enabled")
 
 # if we build with any GUI support
 if(BUILD_X11)
@@ -193,16 +202,15 @@ if(BUILD_WAYLAND)
   set(BUILD_GUI true)
 endif(BUILD_WAYLAND)
 
-if(OWN_WINDOW)
-  option(BUILD_ARGB "Build ARGB (real transparency) support" true)
-else(OWN_WINDOW)
-  set(BUILD_ARGB false
-      CACHE BOOL "Build ARGB (real transparency) support"
-      FORCE)
-endif(OWN_WINDOW)
+dependent_option(BUILD_MOUSE_EVENTS "Enable mouse event support" true
+  "BUILD_WAYLAND OR OWN_WINDOW" false
+  "Mouse event support requires Wayland or OWN_WINDOW enabled")
 
+# Lua library options
 option(BUILD_LUA_CAIRO "Build cairo bindings for Lua" false)
-option(BUILD_LUA_IMLIB2 "Build Imlib2 bindings for Lua" false)
+dependent_option(BUILD_LUA_IMLIB2 "Build Imlib2 bindings for Lua" false
+  "BUILD_X11;BUILD_IMLIB2" false
+  "Imlib2 Lua bindings require X11 and Imlib2")
 option(BUILD_LUA_RSVG "Build rsvg bindings for Lua" false)
 
 option(BUILD_AUDACIOUS "Build audacious (music player) support" false)
@@ -217,12 +225,9 @@ option(BUILD_XMMS2 "Enable if you want XMMS2 (music player) support" false)
 
 option(BUILD_CURL "Enable if you want Curl support" false)
 
-option(BUILD_RSS "Enable if you want RSS support" false)
-
-if(BUILD_RSS)
-  # if RSS is enabled, curl is required
-  set(BUILD_CURL true)
-endif(BUILD_RSS)
+dependent_option(BUILD_RSS "Enable if you want RSS support" false
+  "BUILD_CURL" false
+  "RSS depends on Curl support")
 
 option(BUILD_APCUPSD "Enable APCUPSD support" true)
 
@@ -248,6 +253,8 @@ option(BUILD_PULSEAUDIO
 option(BUILD_INTEL_BACKLIGHT
        "Enable support for Intel backlight" false)
 
+run_dependency_checks()
+
 message(STATUS "CMAKE_C_FLAGS: " ${CMAKE_C_FLAGS})
 message(STATUS "CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS})
 

cmake/ConkyPlatformChecks.cmake

@@ -59,6 +59,8 @@ set(INCLUDE_SEARCH_PATH /usr/include /usr/local/include)
 # Set system vars
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
   set(OS_LINUX true)
+else(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  set(OS_LINUX false)
 endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
@@ -68,33 +70,47 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   if(BUILD_IRC)
     set(conky_libs ${conky_libs} -lssl -lcrypto)
   endif(BUILD_IRC)
+else(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+  set(OS_FREEBSD false)
 endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 
 if(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
   set(OS_DRAGONFLY true)
   set(conky_libs ${conky_libs} -ldevstat)
+else(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
+  set(OS_DRAGONFLY false)
 endif(CMAKE_SYSTEM_NAME MATCHES "DragonFly")
 
 if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
   set(OS_OPENBSD true)
+else(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+  set(OS_OPENBSD false)
 endif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
 
 if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
   set(OS_SOLARIS true)
   set(conky_libs ${conky_libs} -lkstat)
+else(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+  set(OS_SOLARIS false)
 endif(CMAKE_SYSTEM_NAME MATCHES "SunOS")
 
 if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
   set(OS_NETBSD true)
+else(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+  set(OS_NETBSD false)
 endif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
 
 if(CMAKE_SYSTEM_NAME MATCHES "Haiku")
   set(OS_HAIKU true)
   set(conky_libs ${conky_libs} -lnetwork -lintl)
+else(CMAKE_SYSTEM_NAME MATCHES "Haiku")
+  set(OS_HAIKU false)
 endif(CMAKE_SYSTEM_NAME MATCHES "Haiku")
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(OS_DARWIN true)
+else(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  set(OS_DARWIN false)
 endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
 if(NOT OS_LINUX
@@ -402,6 +418,29 @@ if(BUILD_X11)
 
       set(conky_libs ${conky_libs} ${X11_Xfixes_LIB})
     endif(BUILD_XFIXES)
+
+    # check for Xinput
+    if(BUILD_XINPUT)
+      if(NOT X11_Xinput_FOUND)
+        message(FATAL_ERROR "Unable to find Xinput library")
+      endif(NOT X11_Xinput_FOUND)
+
+      set(conky_libs ${conky_libs} ${X11_Xinput_LIB})
+    endif(BUILD_XINPUT)
+
+
+    if(X11_xcb_FOUND)
+      set(HAVE_XCB true)
+      set(conky_libs ${conky_libs} ${X11_xcb_LIB})
+      if(X11_xcb_errors_FOUND)
+        set(HAVE_XCB_ERRORS true)
+        set(conky_libs ${conky_libs} ${X11_xcb_LIB} ${X11_xcb_errors_LIB})
+      else(X11_xcb_errors_FOUND)
+        set(HAVE_XCB_ERRORS false)
+      endif(X11_xcb_errors_FOUND)
+    else(X11_xcb_FOUND)
+      set(HAVE_XCB false)
+    endif(X11_xcb_FOUND)
   else(X11_FOUND)
     message(FATAL_ERROR "Unable to find X11 library")
   endif(X11_FOUND)
@@ -451,7 +490,7 @@ set(conky_libs ${conky_libs} ${LUA_LIBRARIES})
 set(conky_includes ${conky_includes} ${LUA_INCLUDE_DIR})
 include_directories(3rdparty/toluapp/include)
 
-if(BUILD_X11)
+if(BUILD_GUI)
   # Check for libraries used by Lua bindings
   if(BUILD_LUA_CAIRO)
     pkg_check_modules(CAIRO REQUIRED cairo>=1.14 cairo-xlib)
@@ -464,21 +503,21 @@ if(BUILD_X11)
     endif(NOT APP_PATCH)
   endif(BUILD_LUA_CAIRO)
 
-  if(BUILD_LUA_IMLIB2)
+  if(BUILD_X11 AND BUILD_LUA_IMLIB2)
     pkg_search_module(IMLIB2 REQUIRED imlib2 Imlib2)
     set(luaimlib2_libs ${IMLIB2_LIBS} ${IMLIB2_LDFLAGS} ${LUA_LIBRARIES})
     set(luaimlib2_includes
       ${IMLIB2_INCLUDE_DIRS}
       ${LUA_INCLUDE_DIR}
       ${X11_INCLUDE_DIR})
-  endif(BUILD_LUA_IMLIB2)
+  endif(BUILD_X11 AND BUILD_LUA_IMLIB2)
 
   if(BUILD_LUA_RSVG)
     pkg_check_modules(RSVG REQUIRED librsvg-2.0>=2.52)
     set(luarsvg_libs ${RSVG_LIBRARIES} ${LUA_LIBRARIES})
     set(luarsvg_includes ${RSVG_INCLUDE_DIRS} ${LUA_INCLUDE_DIR})
   endif(BUILD_LUA_RSVG)
-endif(BUILD_X11)
+endif(BUILD_GUI)
 
 if(BUILD_AUDACIOUS)
   set(WANT_GLIB true)