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);
   auto setupWidgets() -> void;
   void getModules(const Factory &, const std::string &);

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,7 @@ waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
     margins_ = {.top = gaps, .right = gaps, .bottom = gaps, .left = gaps};
   }
 
+  initLayerSurface();
   setupWidgets();
 
   if (window.get_realized()) {
@@ -131,11 +135,59 @@ void waybar::Bar::onConfigure(GdkEventConfigure* ev) {
       tmp_width = ev->width;
     }
   }
+  spdlog::debug("onConfigure: set size (width: {} -> {}, height: {} -> {}) for output {}",
+                width_,
+                tmp_width,
+                height_,
+                tmp_height,
+                output->name);
+#ifndef HAVE_GTK_LAYER_SHELL
   if (tmp_width != width_ || tmp_height != height_) {
     zwlr_layer_surface_v1_set_size(layer_surface, tmp_width, tmp_height);
   }
+#else
+  setExclusiveZone(tmp_width, tmp_height);
+#endif
 }
 
+void waybar::Bar::initLayerSurface() {
+#ifdef HAVE_GTK_LAYER_SHELL
+  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
+}
+
+#ifdef HAVE_GTK_LAYER_SHELL
+void waybar::Bar::onRealize() {}
+
+void waybar::Bar::onMap(GdkEventAny* ev) {
+  auto gdk_window = window.get_window()->gobj();
+  surface = gdk_wayland_window_get_wl_surface(gdk_window);
+  // window.set_size_request(width_, height_);
+  // window.resize(width_, height_);
+  // setExclusiveZone(width_, height_);
+}
+#else
 void waybar::Bar::onRealize() {
   auto gdk_window = window.get_window()->gobj();
   gdk_wayland_window_set_use_custom_surface(gdk_window);
@@ -146,10 +198,10 @@ void waybar::Bar::onMap(GdkEventAny* ev) {
   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;
+  // 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");
 
@@ -169,6 +221,7 @@ void waybar::Bar::onMap(GdkEventAny* ev) {
   wl_surface_commit(surface);
   wl_display_roundtrip(client->wl_display);
 }
+#endif
 
 void waybar::Bar::setExclusiveZone(uint32_t width, uint32_t height) {
   auto zone = 0;
@@ -184,7 +237,11 @@ void waybar::Bar::setExclusiveZone(uint32_t width, uint32_t height) {
     }
   }
   spdlog::debug("Set exclusive zone {} for output {}", zone, output->name);
+#ifndef HAVE_GTK_LAYER_SHELL
   zwlr_layer_surface_v1_set_exclusive_zone(layer_surface, zone);
+#else
+  gtk_layer_set_exclusive_zone(window.gobj(), zone);
+#endif
 }
 
 // Converting string to button code rn as to avoid doing it later
@@ -285,7 +342,9 @@ auto waybar::Bar::toggle() -> void {
     window.get_style_context()->remove_class("hidden");
   }
   setExclusiveZone(width_, height_);
+#ifndef HAVE_GTK_LAYER_SHELL
   wl_surface_commit(surface);
+#endif
 }
 
 void waybar::Bar::getModules(const Factory& factory, const std::string& pos) {