WIP: working layer-shell popups via gtk-layer-shell library

Author: alebastr

include/bar.hpp

@@ -57,6 +57,7 @@ class Bar {
   void onConfigure(GdkEventConfigure *ev);
   void onRealize();
   void onMap(GdkEventAny *ev);
+  void initLayerSurface();
   void setExclusiveZone(uint32_t width, uint32_t height);
   void setSurfaceSize(uint32_t width, uint32_t height);
   auto setupWidgets() -> void;
@@ -70,6 +71,8 @@ class Bar {
     int bottom = 0;
     int left = 0;
   } margins_;
+  // use gtk-layer-shell instead of handling layer surfaces directly
+  bool                                          use_gls_ = false;
   uint32_t                                      width_ = 0;
   uint32_t                                      height_ = 1;
   uint8_t                                       anchor_;

src/bar.cpp

@@ -1,3 +1,6 @@
+#ifdef HAVE_GTK_LAYER_SHELL
+#include <gtk-layer-shell.h>
+#endif
 #include "bar.hpp"
 #include "client.hpp"
 #include "factory.hpp"
@@ -98,6 +101,10 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
     margins_ = {.top = gaps, .right = gaps, .bottom = gaps, .left = gaps};
   }
 
+#ifdef HAVE_GTK_LAYER_SHELL
+  use_gls_ = config["gtk-layer-shell"].isBool() ? config["gtk-layer-shell"].asBool() : true;
+  initLayerSurface();
+#endif
   setupWidgets();
 
   if (window.get_realized()) {
@@ -131,11 +138,51 @@ void waybar::Bar::onConfigure(GdkEventConfigure* ev) {
       tmp_width = ev->width;
     }
   }
-  if (tmp_width != width_ || tmp_height != height_) {
+  spdlog::debug("onConfigure: set size (width: {} -> {}, height: {} -> {}) for output {}",
+                width_,
+                tmp_width,
+                height_,
+                tmp_height,
+                output->name);
+  if (use_gls_) {
+    width_ = tmp_width;
+    height_ = tmp_height;
+    setExclusiveZone(tmp_width, tmp_height);
+  } else if (tmp_width != width_ || tmp_height != height_) {
     setSurfaceSize(tmp_width, tmp_height);
   }
 }
 
+void waybar::Bar::initLayerSurface() {
+#ifdef HAVE_GTK_LAYER_SHELL
+  if (use_gls_) {
+    auto gtk_window = window.gobj();
+    // this has to be executed before GtkWindow.realize
+    gtk_layer_init_for_window(gtk_window);
+    gtk_layer_set_keyboard_interactivity(gtk_window, FALSE);
+    auto layer =
+        config["layer"] == "top" ? GTK_LAYER_SHELL_LAYER_TOP : GTK_LAYER_SHELL_LAYER_BOTTOM;
+    gtk_layer_set_layer(gtk_window, layer);
+    gtk_layer_set_monitor(gtk_window, output->monitor->gobj());
+    gtk_layer_set_namespace(gtk_window, "waybar");
+
+    gtk_layer_set_anchor(
+        gtk_window, GTK_LAYER_SHELL_EDGE_LEFT, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT);
+    gtk_layer_set_anchor(
+        gtk_window, GTK_LAYER_SHELL_EDGE_RIGHT, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT);
+    gtk_layer_set_anchor(
+        gtk_window, GTK_LAYER_SHELL_EDGE_TOP, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP);
+    gtk_layer_set_anchor(
+        gtk_window, GTK_LAYER_SHELL_EDGE_BOTTOM, anchor_ & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM);
+
+    gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_LEFT, margins_.left);
+    gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_RIGHT, margins_.right);
+    gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_TOP, margins_.top);
+    gtk_layer_set_margin(gtk_window, GTK_LAYER_SHELL_EDGE_BOTTOM, margins_.bottom);
+  }
+#endif
+}
+
 void waybar::Bar::onRealize() {
   auto gdk_window = window.get_window()->gobj();
   gdk_wayland_window_set_use_custom_surface(gdk_window);
@@ -145,29 +192,31 @@ void waybar::Bar::onMap(GdkEventAny* ev) {
   auto gdk_window = window.get_window()->gobj();
   surface = gdk_wayland_window_get_wl_surface(gdk_window);
 
-  auto client = waybar::Client::inst();
-  // owned by output->monitor; no need to destroy
-  auto wl_output = gdk_wayland_monitor_get_wl_output(output->monitor->gobj());
-  auto layer =
-      config["layer"] == "top" ? ZWLR_LAYER_SHELL_V1_LAYER_TOP : ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
-  layer_surface = zwlr_layer_shell_v1_get_layer_surface(
-      client->layer_shell, surface, wl_output, layer, "waybar");
+  if (!use_gls_) {
+    auto client = waybar::Client::inst();
+    auto layer =
+        config["layer"] == "top" ? ZWLR_LAYER_SHELL_V1_LAYER_TOP : ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM;
+    // owned by output->monitor; no need to destroy
+    auto wl_output = gdk_wayland_monitor_get_wl_output(output->monitor->gobj());
+    layer_surface = zwlr_layer_shell_v1_get_layer_surface(
+        client->layer_shell, surface, wl_output, layer, "waybar");
 
-  zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface, false);
-  zwlr_layer_surface_v1_set_anchor(layer_surface, anchor_);
-  zwlr_layer_surface_v1_set_margin(
-      layer_surface, margins_.top, margins_.right, margins_.bottom, margins_.left);
-  setSurfaceSize(width_, height_);
-  setExclusiveZone(width_, height_);
+    zwlr_layer_surface_v1_set_keyboard_interactivity(layer_surface, false);
+    zwlr_layer_surface_v1_set_anchor(layer_surface, anchor_);
+    zwlr_layer_surface_v1_set_margin(
+        layer_surface, margins_.top, margins_.right, margins_.bottom, margins_.left);
+    setSurfaceSize(width_, height_);
+    setExclusiveZone(width_, height_);
 
-  static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
-      .configure = layerSurfaceHandleConfigure,
-      .closed = layerSurfaceHandleClosed,
-  };
-  zwlr_layer_surface_v1_add_listener(layer_surface, &layer_surface_listener, this);
+    static const struct zwlr_layer_surface_v1_listener layer_surface_listener = {
+        .configure = layerSurfaceHandleConfigure,
+        .closed = layerSurfaceHandleClosed,
+    };
+    zwlr_layer_surface_v1_add_listener(layer_surface, &layer_surface_listener, this);
 
-  wl_surface_commit(surface);
-  wl_display_roundtrip(client->wl_display);
+    wl_surface_commit(surface);
+    wl_display_roundtrip(client->wl_display);
+  }
 }
 
 void waybar::Bar::setExclusiveZone(uint32_t width, uint32_t height) {
@@ -184,7 +233,15 @@ void waybar::Bar::setExclusiveZone(uint32_t width, uint32_t height) {
     }
   }
   spdlog::debug("Set exclusive zone {} for output {}", zone, output->name);
-  zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, zone);
+
+#ifdef HAVE_GTK_LAYER_SHELL
+  if (use_gls_) {
+    gtk_layer_set_exclusive_zone(window.gobj(), zone);
+  } else
+#endif
+  {
+    zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, zone);
+  }
 }
 
 void waybar::Bar::setSurfaceSize(uint32_t width, uint32_t height) {