Wayland GUI backend

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

@@ -11,6 +11,7 @@ jobs:
           - ubuntu-20.04
           - ubuntu-22.04
         x11: [ON, OFF]
+        wayland: [ON, OFF]
         compiler:
           - clang
           - gcc
@@ -74,6 +75,8 @@ jobs:
             libpulse-dev \
             librsvg2-dev \
             libsystemd-dev \
+            libwayland-bin \
+            libwayland-dev \
             libx11-dev \
             libxdamage-dev \
             libxext-dev \
@@ -82,7 +85,8 @@ jobs:
             libxml2-dev \
             libxmmsclient-dev \
             libxnvctrl-dev \
-            ncurses-dev
+            ncurses-dev \
+            wayland-protocols
       - name: Install libc++
         if: matrix.compiler == 'clang'
         run: |
@@ -125,6 +129,7 @@ jobs:
             -DBUILD_RSS=ON                       \
             -DBUILD_TESTS=ON                     \
             -DBUILD_WLAN=ON                      \
+            -DBUILD_WAYLAND=${{ matrix.wayland }}\
             -DBUILD_X11=${{ matrix.x11 }}        \
             -DBUILD_XMMS2=ON                     \
             -DCMAKE_C_COMPILER=$CC               \

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

@@ -32,6 +32,7 @@ jobs:
           cd build
           cmake ..                               \
             -DMAINTAINER_MODE=ON                 \
+            -DBUILD_WAYLAND=OFF                  \
             -DBUILD_TESTS=ON
       - name: Compile
         working-directory: build

.github/workflows/publish-appimage.yml

@@ -41,6 +41,7 @@ jobs:
             libpulse-dev \
             librsvg2-dev \
             libsystemd-dev \
+            libwayland-dev \
             libx11-dev \
             libxdamage-dev \
             libxext-dev \

AUTHORS

@@ -175,6 +175,11 @@ J
   Some cleaning and commenting apparently :)
   SIGHUP config file reload
 
+K. Eugene Carlson <kvngncrlsn at gmail dot com>
+  Additional Linux memory reporting variables
+  Linux CPU frequency governor reporting
+  Additional FreeBSD memory reporting variables
+
 Kapil Hari Paranjape <[email protected]>
   ibm_volume patch
   kFreeBSD support patch

cmake/ConkyBuildOptions.cmake

@@ -177,6 +177,8 @@ else(BUILD_NCURSES)
     FORCE)
 endif(BUILD_NCURSES)
 
+option(BUILD_WAYLAND "Build Wayland support" true)
+
 option(BUILD_X11 "Build X11 support" true)
 if(BUILD_X11)
   option(OWN_WINDOW "Enable own_window support" true)
@@ -208,6 +210,9 @@ endif(BUILD_X11)
 if(BUILD_X11)
   set(BUILD_GUI true)
 endif(BUILD_X11)
+if(BUILD_WAYLAND)
+  set(BUILD_GUI true)
+endif(BUILD_WAYLAND)
 
 if(OWN_WINDOW)
   option(BUILD_ARGB "Build ARGB (real transparency) support" true)

cmake/ConkyPlatformChecks.cmake

@@ -352,6 +352,37 @@ if(BUILD_X11)
   endif(X11_FOUND)
 endif(BUILD_X11)
 
+if(BUILD_WAYLAND)
+  find_package(Wayland  REQUIRED)
+  set(conky_libs ${conky_libs} ${WAYLAND_CLIENT_LIBRARY})
+  set(conky_includes ${conky_includes} ${WAYLAND_CLIENT_INCLUDE_DIR})
+
+  find_package(PkgConfig)
+
+  pkg_check_modules(wayland-protocols QUIET wayland-protocols>=1.13)
+  if(WAYLAND_CLIENT_FOUND AND wayland-protocols_FOUND)
+    # find Wayland protocols
+    pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
+
+    # find 'wayland-scanner' executable
+    pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
+  else(WAYLAND_CLIENT_FOUND AND wayland-protocols_FOUND)
+    message(FATAL_ERROR "Unable to find wayland-scanner and xdg-shell protocol")
+  endif(WAYLAND_CLIENT_FOUND AND wayland-protocols_FOUND)
+
+  pkg_check_modules(PANGOCAIRO pangocairo)
+  set(conky_libs ${conky_libs} ${PANGOCAIRO_LIBRARIES})
+  set(conky_includes ${conky_includes} ${PANGOCAIRO_INCLUDE_DIRS})
+
+  pkg_check_modules(PANGOFC pangofc)
+  set(conky_libs ${conky_libs} ${PANGOFC_LIBRARIES})
+  set(conky_includes ${conky_includes} ${PANGOFC_INCLUDE_DIRS})
+
+  pkg_check_modules(PANGOFT2 pangoft2)
+  set(conky_libs ${conky_libs} ${PANGOFT2_LIBRARIES})
+  set(conky_includes ${conky_includes} ${PANGOFT2_INCLUDE_DIRS})
+endif(BUILD_WAYLAND)
+
 # Otherwise, use the most recent Lua version
 pkg_search_module(LUA
                   REQUIRED
@@ -454,6 +485,12 @@ if(BUILD_PULSEAUDIO)
   set(conky_includes ${conky_includes} ${PULSEAUDIO_INCLUDE_DIRS})
 endif(BUILD_PULSEAUDIO)
 
+if(WANT_CURL)
+  pkg_check_modules(CURL REQUIRED libcurl)
+  set(conky_libs ${conky_libs} ${CURL_LIBRARIES})
+  set(conky_includes ${conky_includes} ${CURL_INCLUDE_DIRS})
+endif(WANT_CURL)
+
 # Common libraries
 if(WANT_GLIB)
   pkg_check_modules(GLIB REQUIRED glib-2.0>=2.36)

cmake/FindWayland.cmake

@@ -0,0 +1,59 @@
+find_path(
+  WAYLAND_CLIENT_INCLUDE_DIR
+  NAMES wayland-client.h
+)
+
+find_library(
+  WAYLAND_CLIENT_LIBRARY
+  NAMES wayland-client libwayland-client
+)
+
+if(WAYLAND_CLIENT_INCLUDE_DIR AND WAYLAND_CLIENT_LIBRARY)
+  add_library(wayland::client UNKNOWN IMPORTED)
+
+  set_target_properties(
+    wayland::client PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${WAYLAND_CLIENT_INCLUDE_DIR}"
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+    IMPORTED_LOCATION "${WAYLAND_CLIENT_LIBRARY}"
+  )
+endif()
+
+find_path(
+  WAYLAND_SERVER_INCLUDE_DIR
+  NAMES wayland-server.h
+)
+
+find_library(
+  WAYLAND_SERVER_LIBRARY
+  NAMES wayland-server libwayland-server
+)
+
+if(WAYLAND_SERVER_INCLUDE_DIR AND WAYLAND_SERVER_LIBRARY)
+  add_library(wayland::server UNKNOWN IMPORTED)
+
+  set_target_properties(
+    wayland::server PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${WAYLAND_SERVER_INCLUDE_DIR}"
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+    IMPORTED_LOCATION "${WAYLAND_SERVER_LIBRARY}"
+  )
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  WAYLAND_CLIENT
+  REQUIRED_VARS WAYLAND_CLIENT_LIBRARY WAYLAND_CLIENT_INCLUDE_DIR
+)
+
+find_package_handle_standard_args(
+  WAYLAND_SERVER
+  REQUIRED_VARS WAYLAND_SERVER_LIBRARY WAYLAND_SERVER_INCLUDE_DIR
+)
+
+mark_as_advanced(
+  WAYLAND_CLIENT_INCLUDE_DIR
+  WAYLAND_CLIENT_LIBRARY
+  WAYLAND_SERVER_INCLUDE_DIR
+  WAYLAND_SERVER_LIBRARY
+)

cmake/config.h.in

@@ -42,6 +42,8 @@
 
 #cmakedefine HAVE_CLOCK_GETTIME 1
 
+#cmakedefine BUILD_WAYLAND 1
+
 #cmakedefine BUILD_X11 1
 
 #cmakedefine OWN_WINDOW 1

doc/config_settings.yaml

@@ -344,6 +344,10 @@ values:
       will provide more useful things).
   - name: out_to_stderr
     desc: Print text to stderr.
+  - name: out_to_wayland
+    desc: |-
+      Open a Wayland window to display output.
+    default: no
   - name: out_to_x
     desc: |-
       When set to no, there will be no output in X (useful when

doc/variables.yaml

@@ -1195,6 +1195,8 @@ values:
       - mbox
   - name: mem
     desc: Amount of memory in use.
+  - name: memactive
+    desc: Amount of active memory. FreeBSD only.
   - name: memavail
     desc: Amount of available memory as recorded in /proc/meminfo. Linux 3.14+ only.
   - name: membar
@@ -1226,10 +1228,16 @@ values:
       - (scale)
       - (-t)
       - (-l)
+  - name: meminactive
+    desc: Amount of inactive memory. FreeBSD only.
+  - name: memlaundry
+    desc: Amount of memory in the laundry queue. FreeBSD only.
   - name: memmax
     desc: Total amount of memory.
   - name: memperc
     desc: Percentage of memory in use.
+  - name: memwired
+    desc: Amount of wired memory. FreeBSD only.
   - name: memwithbuffers
     desc: |-
       Amount of memory in use, including that used by system

extras/convert.lua

@@ -36,6 +36,7 @@ local bool_setting = {
     background = true, disable_auto_reload = true, double_buffer = true, draw_borders = true,
     draw_graph_borders = true, draw_outline = true, draw_shades = true, extra_newline = true,
     format_human_readable = true, no_buffers = true, out_to_console = true,
+    out_to_wayland = true,
     out_to_ncurses = true, out_to_stderr = true, out_to_x = true, override_utf8_locale = true,
     own_window = true, own_window_argb_visual = true, own_window_transparent = true,
     short_units = true, show_graph_range = true, show_graph_scale = true,

src/CMakeLists.txt

@@ -120,6 +120,8 @@ set(conky_sources
     display-http.hh
     display-x11.cc
     display-x11.hh
+    display-wayland.cc
+    display-wayland.hh
     lua-config.cc
     lua-config.hh
     setting.cc
@@ -227,7 +229,7 @@ if(BUILD_PORT_MONITORS)
 endif(BUILD_PORT_MONITORS)
 
 if(BUILD_GUI)
-  set(gui fonts.cc fonts.h)
+  set(gui fonts.cc fonts.h gui.cc gui.h)
   set(optional_sources ${optional_sources} ${gui})
 endif(BUILD_GUI)
 
@@ -241,6 +243,32 @@ if(BUILD_X11)
   endif(BUILD_XINERAMA)
 endif(BUILD_X11)
 
+if(BUILD_WAYLAND)
+  set(wl_srcs wl.cc wl.h xdg-shell-protocol.c wlr-layer-shell-protocol.c x11-color.cc x11-color.h)
+  set(optional_sources ${optional_sources} ${wl_srcs})
+  # generate protocol implementations
+  set(XDG_PROT_DEF "${WAYLAND_PROTOCOLS_DIR}/stable/xdg-shell/xdg-shell.xml")
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell-client-protocol.h
+    COMMAND ${WAYLAND_SCANNER} client-header ${XDG_PROT_DEF} xdg-shell-client-protocol.h)
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xdg-shell-protocol.c
+    COMMAND ${WAYLAND_SCANNER} private-code ${XDG_PROT_DEF} xdg-shell-protocol.c
+    DEPENDS xdg-shell-client-protocol.h)
+
+  set(WLR_LAYER_SHELL_PROT_DEF "${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml")
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-client-protocol.h
+    COMMAND ${WAYLAND_SCANNER} client-header ${WLR_LAYER_SHELL_PROT_DEF} wlr-layer-shell-client-protocol.h)
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/wlr-layer-shell-protocol.c
+    COMMAND ${WAYLAND_SCANNER} private-code ${WLR_LAYER_SHELL_PROT_DEF} wlr-layer-shell-protocol.c
+    DEPENDS wlr-layer-shell-client-protocol.h)
+
+  # include output dir in include path
+  include_directories(${CMAKE_CURRENT_BINARY_DIR})
+endif(BUILD_WAYLAND)
+
 if(BUILD_HDDTEMP)
   set(hddtemp hddtemp.cc hddtemp.h)
   set(optional_sources ${optional_sources} ${hddtemp})

src/colours.cc

@@ -28,9 +28,13 @@
  */
 #include "conky.h"
 #include "logging.h"
+#include "gui.h"
 #ifdef BUILD_X11
 #include "x11.h"
-#endif
+#endif /*BUILD_X11*/
+#ifdef BUILD_WAYLAND
+#include "x11-color.h"
+#endif /*BUILD_WAYLAND*/
 
 /* precalculated: 31/255, and 63/255 */
 #define CONST_8_TO_5_BITS 0.12156862745098
@@ -83,8 +87,61 @@ unsigned int adjust_colours(unsigned int colour) {
   return colour;
 }
 
-#ifdef BUILD_X11
+
+#ifdef BUILD_GUI
+#ifdef BUILD_WAYLAND
+static int hex_nibble_value(char c) {
+    if (c >= '0' && c <= '9') {
+        return c - '0';
+    } else if (c >= 'a' && c <= 'f') {
+        return c - 'a' + 10;
+    } else if (c >= 'A' && c <= 'F') {
+        return c - 'A' + 10;
+    }
+    return -1;
+}
+
+long manually_get_x11_color(const char *name) {
+    unsigned short r, g, b;
+    size_t len = strlen(name);
+    if (OsLookupColor(-1, name, len, &r, &g, &b)) {
+      return 0x000000ff | ((r & 0xff) << 24) | ((g & 0xff) << 16) | ((b & 0xff) << 8);
+    }
+    if (name[0] == '#') {
+      name++;
+      len--;
+    }
+    if (len == 6 || len == 8)
+    {
+        unsigned char argb[4] = {0xff, 0, 0, 0};
+        for (size_t i = 0; i + 1 < len; i += 2) {
+            int nib1 = hex_nibble_value(name[i]);
+            int nib2 = hex_nibble_value(name[i+1]);
+            if (nib1 < 0 || nib2 < 0) {
+              goto err;
+            }
+            int val = (nib1 << 4) + nib2;
+
+            argb[3 - i / 2] = val;
+        }
+        long out;
+        memcpy(static_cast<void*>(&out), argb, 4);
+        return out;
+    }
+    err:
+    NORM_ERR("can't parse X color '%s' (%d)", name, len);
+    return 0xFF00FF;
+}
+#endif /* BUILD_WAYLAND */
+
 long get_x11_color(const char *name) {
+#ifdef BUILD_X11
+#ifdef BUILD_WAYLAND
+  if (!display) {
+    return manually_get_x11_color(name);
+  }
+#endif /*BUILD_WAYLAND*/
+  assert(display != nullptr);
   XColor color;
 
   color.pixel = 0;
@@ -108,9 +165,13 @@ long get_x11_color(const char *name) {
   }
 
   return static_cast<long>(color.pixel);
+#endif /*BUILD_X11*/
+#ifdef BUILD_WAYLAND
+  return manually_get_x11_color(name);
+#endif /*BUILD_WAYLAND*/
 }
 
 long get_x11_color(const std::string &colour) {
   return get_x11_color(colour.c_str());
 }
-#endif
+#endif /*BUILD_GUI*/