From 7638f5c5958d0f9243c8b71569b9cb048f439a7a Mon Sep 17 00:00:00 2001
From: dmitry <shemeldima2@yandex.ru>
Date: Thu, 6 Aug 2020 01:42:57 +0300
Subject: [PATCH] Add base name representation

---
 include/modules/wlr/workspace_manager.hpp | 14 ++++++++----
 src/modules/wlr/workspace_manager.cpp     | 26 ++++++++++++++++++-----
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/include/modules/wlr/workspace_manager.hpp b/include/modules/wlr/workspace_manager.hpp
index 3c8fe99d..f606331d 100644
--- a/include/modules/wlr/workspace_manager.hpp
+++ b/include/modules/wlr/workspace_manager.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
 #include <fmt/format.h>
+#include <gtkmm/button.h>
 #include <gtkmm/image.h>
+#include <gtkmm/label.h>
 
 #include <memory>
 #include <vector>
@@ -23,6 +25,7 @@ class Workspace {
   auto update() -> void;
 
   auto id() const -> uint32_t { return id_; }
+  // wlr stuff
   auto handle_name(const std::string &name) -> void { name_ = name; }
   auto handle_coordinates(const std::vector<uint32_t> &coordinates) -> void {
     coordinates_ = coordinates;
@@ -46,8 +49,9 @@ class Workspace {
   std::string           name_;
   std::vector<uint32_t> coordinates_;
 
-  const Gtk::Box   box_;
-  const Gtk::Image icon_;
+  Gtk::Button button_;
+  Gtk::Box    content_;
+  Gtk::Label  label_;
 };
 
 class WorkspaceGroup {
@@ -62,11 +66,12 @@ class WorkspaceGroup {
 
   // wlr stuff
   auto handle_workspace_create(zwlr_workspace_handle_v1 *workspace_handle) -> void;
-
   auto handle_remove() -> void;
   auto handle_output_enter(wl_output *output) -> void;
   auto handle_output_leave() -> void;
 
+  auto add_button(Gtk::Button &button) -> void;
+
  private:
   static uint32_t    group_global_id;
   const waybar::Bar &bar_;
@@ -93,10 +98,11 @@ class WorkspaceManager : public AModule {
   auto register_manager(wl_registry *registry, uint32_t name, uint32_t version) -> void;
   auto handle_workspace_group_create(zwlr_workspace_group_handle_v1 *workspace_group_handle)
       -> void;
-
   auto handle_done() -> void;
   auto handle_finished() -> void;
 
+  auto add_button(Gtk::Button &button) -> void { box_.pack_start(button, false, false); }
+
  private:
   const waybar::Bar &                          bar_;
   Gtk::Box                                     box_;
diff --git a/src/modules/wlr/workspace_manager.cpp b/src/modules/wlr/workspace_manager.cpp
index 04a31888..25ce5253 100644
--- a/src/modules/wlr/workspace_manager.cpp
+++ b/src/modules/wlr/workspace_manager.cpp
@@ -14,7 +14,7 @@ uint32_t WorkspaceGroup::group_global_id = 0;
 
 WorkspaceManager::WorkspaceManager(const std::string &id, const waybar::Bar &bar,
                                    const Json::Value &config)
-    : waybar::AModule(config, "workspaces", id, false, !config["disable-scroll"].asBool()),
+    : waybar::AModule(config, "workspaces", id, false, false),
       bar_(bar),
       box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0) {
   box_.set_name("workspaces");
@@ -53,6 +53,7 @@ auto WorkspaceManager::handle_finished() -> void {
 }
 
 auto WorkspaceManager::handle_done() -> void {
+  dp.emit();
 }
 
 auto WorkspaceManager::update() -> void {
@@ -92,8 +93,11 @@ WorkspaceGroup::WorkspaceGroup(const Bar &bar, const Json::Value &config, Worksp
       id_(++group_global_id) {
   add_workspace_group_listener(workspace_group_handle, this);
 }
+auto WorkspaceGroup::add_button(Gtk::Button &button) -> void {
+  workspace_manager_.add_button(button);
+}
 
-WorkspaceGroup::~WorkspaceGroup()->void {
+WorkspaceGroup::~WorkspaceGroup() {
   if (!workspace_group_handle_) {
     return;
   }
@@ -135,7 +139,7 @@ auto WorkspaceGroup::remove_workspace(uint32_t id) -> void {
                          [id](const std::unique_ptr<Workspace> &w) { return w->id() == id; });
 
   if (it == workspaces_.end()) {
-    spdlog::warn("Can't find group with id {}", id);
+    spdlog::warn("Can't find workspace with id {}", id);
     return;
   }
 
@@ -148,8 +152,17 @@ Workspace::Workspace(const Bar &bar, const Json::Value &config, WorkspaceGroup &
       config_(config),
       workspace_group_(workspace_group),
       workspace_handle_(workspace),
-      id_(++workspace_global_id) {
+      id_(++workspace_global_id),
+      content_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0} {
   add_workspace_listener(workspace, this);
+  workspace_group.add_button(button_);
+  button_.set_relief(Gtk::RELIEF_NONE);
+  label_.set_label(fmt::format("{name}", fmt::arg("name", "1")));
+  label_.show();
+  content_.add(label_);
+  content_.show();
+  button_.add(content_);
+  button_.show();
 }
 
 Workspace::~Workspace() {
@@ -161,7 +174,10 @@ Workspace::~Workspace() {
   workspace_handle_ = nullptr;
 }
 
-auto Workspace::update() -> void {}
+auto Workspace::update() -> void {
+  label_.set_label(fmt::format("{name}", fmt::arg("name", name_)));
+  label_.show();
+}
 
 auto Workspace::handle_state(const std::vector<uint32_t> &state) -> void {
   state_ = 0;