Compare commits
3 Commits
f1c68321a7
...
9b0a036925
| Author | SHA1 | Date | |
|---|---|---|---|
| 9b0a036925 | |||
| 11ccd55a52 | |||
| a912cb9687 |
@@ -1 +1,3 @@
|
|||||||
IndentWidth: 4
|
IndentWidth: 4
|
||||||
|
ColumnLimit: 0
|
||||||
|
AlignConsecutiveAssignments: true
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include <gtk4-layer-shell/gtk4-layer-shell.h>
|
#include <gtk4-layer-shell/gtk4-layer-shell.h>
|
||||||
#include <gtkmm.h>
|
#include <gtkmm.h>
|
||||||
|
#include "icons.hpp"
|
||||||
#include "services/hyprland.hpp"
|
#include "services/hyprland.hpp"
|
||||||
#include "services/tray.hpp"
|
#include "services/tray.hpp"
|
||||||
#include "widgets/clock.hpp"
|
#include "widgets/clock.hpp"
|
||||||
@@ -10,7 +10,6 @@
|
|||||||
#include "widgets/tray.hpp"
|
#include "widgets/tray.hpp"
|
||||||
#include "widgets/webWidget.hpp"
|
#include "widgets/webWidget.hpp"
|
||||||
#include "widgets/workspaceIndicator.hpp"
|
#include "widgets/workspaceIndicator.hpp"
|
||||||
#include "icons.hpp"
|
|
||||||
|
|
||||||
class Bar : public Gtk::Window {
|
class Bar : public Gtk::Window {
|
||||||
public:
|
public:
|
||||||
@@ -26,8 +25,8 @@ class Bar : public Gtk::Window {
|
|||||||
private:
|
private:
|
||||||
Clock clock;
|
Clock clock;
|
||||||
Date date;
|
Date date;
|
||||||
WebWidget homeAssistant {ICON_HOME, "Home Assistant",
|
WebWidget homeAssistant{ICON_HOME, "Home Assistant",
|
||||||
"https://home.rivercry.com"};
|
"https://home.rivercry.com"};
|
||||||
TrayService &trayService;
|
TrayService &trayService;
|
||||||
HyprlandService &hyprlandService;
|
HyprlandService &hyprlandService;
|
||||||
int monitorId;
|
int monitorId;
|
||||||
|
|||||||
@@ -2,30 +2,37 @@
|
|||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <glibmm.h>
|
#include <glibmm.h>
|
||||||
#include <iostream>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <sigc++/sigc++.h>
|
#include <sigc++/sigc++.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
class HyprlandService {
|
class HyprlandService {
|
||||||
public:
|
public:
|
||||||
static constexpr int kWorkspaceSlotCount = 5;
|
static constexpr int kWorkspaceSlotCount = 7;
|
||||||
|
const char *kMonitorCommand = "hyprctl monitors -j";
|
||||||
|
const char *kWorkspaceCommand = "hyprctl workspaces -j";
|
||||||
|
const char *kClientsCommand = "hyprctl clients -j";
|
||||||
|
|
||||||
|
struct WindowState {
|
||||||
|
int hyprId = -1;
|
||||||
|
};
|
||||||
|
|
||||||
struct WorkspaceState {
|
struct WorkspaceState {
|
||||||
int id = -1;
|
int hyprId = -1;
|
||||||
int hyprId = -1;
|
int monitorId = -1;
|
||||||
bool active = false;
|
bool active = false;
|
||||||
bool focused = false;
|
bool focused = false;
|
||||||
bool urgent = false;
|
std::vector<std::string> urgentWindows;
|
||||||
std::string label;
|
std::string label;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Monitor {
|
struct Monitor {
|
||||||
std::map<int, WorkspaceState> workspaceStates;
|
std::map<int, WorkspaceState *> workspaceStates;
|
||||||
std::string name;
|
std::string name;
|
||||||
int x = 0;
|
int x = 0;
|
||||||
int y = 0;
|
int y = 0;
|
||||||
int id = -1;
|
int id = -1;
|
||||||
int focusedWorkspaceId = -1;
|
int focusedWorkspaceId = -1;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -34,69 +41,30 @@ class HyprlandService {
|
|||||||
|
|
||||||
void start();
|
void start();
|
||||||
void on_hyprland_event(std::string event, std::string data);
|
void on_hyprland_event(std::string event, std::string data);
|
||||||
|
|
||||||
void printMonitor(const Monitor &mon) const;
|
void printMonitor(const Monitor &mon) const;
|
||||||
|
|
||||||
sigc::signal<void(std::string, std::string)> socketEventSignal;
|
sigc::signal<void(std::string, std::string)> socketEventSignal;
|
||||||
sigc::signal<void(int)> workspaceStateChanged;
|
sigc::signal<void()> workspaceStateChanged;
|
||||||
sigc::signal<void()> monitorStateChanged;
|
sigc::signal<void()> monitorStateChanged;
|
||||||
|
|
||||||
Monitor *getMonitorById(int id);
|
Monitor *getMonitorById(int id);
|
||||||
const Monitor *getMonitorById(int id) const;
|
|
||||||
Monitor *getMonitorByIndex(std::size_t index);
|
Monitor *getMonitorByIndex(std::size_t index);
|
||||||
const Monitor *getMonitorByIndex(std::size_t index) const;
|
|
||||||
// Switch to a workspace slot on a given monitor. If the workspace has an
|
|
||||||
// associated Hyprland workspace id (hyprId >= 0) that id will be used.
|
|
||||||
// Otherwise the slot and monitor name will be used to request creation
|
|
||||||
// / activation via `hyprctl`.
|
|
||||||
void switchToWorkspace(int workspaceId);
|
void switchToWorkspace(int workspaceId);
|
||||||
|
|
||||||
|
std::map<int, WorkspaceState *> getAllWorkspaces() const {
|
||||||
|
return this->workspaces;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int fd = -1;
|
int fd = -1;
|
||||||
std::string buffer;
|
|
||||||
std::map<int, Monitor> monitors;
|
std::map<int, Monitor> monitors;
|
||||||
|
std::map<int, WorkspaceState *> workspaces;
|
||||||
|
|
||||||
|
std::string get_socket_path();
|
||||||
bool on_socket_read(Glib::IOCondition condition);
|
bool on_socket_read(Glib::IOCondition condition);
|
||||||
void parse_message(const std::string &line);
|
void parse_message(const std::string &line);
|
||||||
std::string get_socket_path();
|
|
||||||
void refresh_monitors();
|
void refresh_monitors();
|
||||||
void refresh_workspaces();
|
void refresh_workspaces();
|
||||||
void handle_urgent_window(std::string windowAddress);
|
void onUrgentEvent(std::string windowAddress);
|
||||||
|
void onActiveWindowEvent(std::string windowAddress);
|
||||||
};
|
};
|
||||||
|
|
||||||
inline void HyprlandService::printMonitor(const Monitor &mon) const {
|
|
||||||
std::cout << "=== Monitor Info ===\n";
|
|
||||||
std::cout << "Name: " << mon.name << " (ID: " << mon.id << ")\n";
|
|
||||||
std::cout << "Position: (" << mon.x << ", " << mon.y << ")\n";
|
|
||||||
std::cout << "Focused Workspace ID: " << mon.focusedWorkspaceId << "\n";
|
|
||||||
|
|
||||||
std::cout << "Workspaces:\n";
|
|
||||||
|
|
||||||
if (mon.workspaceStates.empty()) {
|
|
||||||
std::cout << " (None)\n";
|
|
||||||
} else {
|
|
||||||
for (int slot = 1; slot <= HyprlandService::kWorkspaceSlotCount;
|
|
||||||
++slot) {
|
|
||||||
const auto it = mon.workspaceStates.find(slot);
|
|
||||||
if (it == mon.workspaceStates.end()) {
|
|
||||||
std::cout << " - [Slot: " << slot << " | HyprID: n/a]"
|
|
||||||
<< " Label: <none> | Active: No | Focused: No | "
|
|
||||||
"Urgent: No\n";
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const WorkspaceState &ws = it->second;
|
|
||||||
std::cout << " - [Slot: " << ws.id << " | HyprID: "
|
|
||||||
<< (ws.hyprId >= 0 ? std::to_string(ws.hyprId)
|
|
||||||
: std::string("n/a"))
|
|
||||||
<< "] "
|
|
||||||
<< "Label: " << (ws.label.empty() ? "<none>" : ws.label)
|
|
||||||
<< " | "
|
|
||||||
<< "Active: " << (ws.active ? "Yes" : "No") << " | "
|
|
||||||
<< "Focused: " << (ws.focused ? "Yes" : "No") << " | "
|
|
||||||
<< "Urgent: " << (ws.urgent ? "Yes" : "No") << "\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
std::cout << "====================\n";
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -16,9 +16,10 @@ class WorkspaceIndicator : public Gtk::Box {
|
|||||||
int monitorId;
|
int monitorId;
|
||||||
sigc::connection workspaceConnection;
|
sigc::connection workspaceConnection;
|
||||||
sigc::connection monitorConnection;
|
sigc::connection monitorConnection;
|
||||||
|
std::map<int, Gtk::Label *> workspaceLabels;
|
||||||
|
|
||||||
void rebuild();
|
void rebuild();
|
||||||
void on_workspace_update(int monitorId);
|
void on_workspace_update();
|
||||||
void on_monitor_update();
|
void on_monitor_update();
|
||||||
void clear_children();
|
void refreshLabel(Gtk::Label *label, HyprlandService::WorkspaceState state);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -22,6 +22,10 @@ window {
|
|||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.workspace-pill:hover {
|
||||||
|
background-color: rgba(255, 255, 255, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
.workspace-pill-focused {
|
.workspace-pill-focused {
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
color: #1e1e1e;
|
color: #1e1e1e;
|
||||||
@@ -42,10 +46,6 @@ window {
|
|||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.workspace-pill:hover {
|
|
||||||
background-color: rgba(255, 255, 255, 0.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
.minimized {
|
.minimized {
|
||||||
background-color: rgba(50, 50, 50, 0.5);
|
background-color: rgba(50, 50, 50, 0.5);
|
||||||
}
|
}
|
||||||
@@ -86,6 +86,6 @@ tooltip {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.icon-label {
|
.icon-label {
|
||||||
font-family: "Material Icons, Hack Nerd Font Mono";
|
font-family: "Material Icons, Font Awesome 7 Brands, Hack Nerd Font Mono";
|
||||||
font-size: 19px;
|
font-size: 19px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ App::App() {
|
|||||||
this->app = Gtk::Application::create("org.example.mybar");
|
this->app = Gtk::Application::create("org.example.mybar");
|
||||||
|
|
||||||
app->signal_activate().connect([&]() {
|
app->signal_activate().connect([&]() {
|
||||||
auto display = Gdk::Display::get_default();
|
auto display = Gdk::Display::get_default();
|
||||||
auto monitors = display->get_monitors();
|
auto monitors = display->get_monitors();
|
||||||
|
|
||||||
for (guint i = 0; i < monitors->get_n_items(); ++i) {
|
for (guint i = 0; i < monitors->get_n_items(); ++i) {
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
#include "bar/bar.hpp"
|
#include "bar/bar.hpp"
|
||||||
|
|
||||||
#include "gtk/gtk.h"
|
#include "gtk/gtk.h"
|
||||||
|
|
||||||
#include "widgets/date.hpp"
|
#include "widgets/date.hpp"
|
||||||
#include "widgets/spacer.hpp"
|
#include "widgets/spacer.hpp"
|
||||||
#include "widgets/volumeWidget.hpp"
|
#include "widgets/volumeWidget.hpp"
|
||||||
@@ -35,7 +37,6 @@ Bar::Bar(GdkMonitor *monitor, HyprlandService &hyprlandService,
|
|||||||
|
|
||||||
set_child(main_box);
|
set_child(main_box);
|
||||||
|
|
||||||
|
|
||||||
this->volumeWidget = Gtk::make_managed<VolumeWidget>();
|
this->volumeWidget = Gtk::make_managed<VolumeWidget>();
|
||||||
|
|
||||||
load_css();
|
load_css();
|
||||||
@@ -46,13 +47,9 @@ Bar::Bar(GdkMonitor *monitor, HyprlandService &hyprlandService,
|
|||||||
Glib::signal_timeout().connect(sigc::mem_fun(clock, &Clock::onUpdate),
|
Glib::signal_timeout().connect(sigc::mem_fun(clock, &Clock::onUpdate),
|
||||||
1000);
|
1000);
|
||||||
|
|
||||||
|
|
||||||
date.onUpdate();
|
date.onUpdate();
|
||||||
|
|
||||||
Glib::signal_timeout().connect(sigc::mem_fun(date, &Date::onUpdate),
|
Glib::signal_timeout().connect(sigc::mem_fun(date, &Date::onUpdate), 1000);
|
||||||
1000);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Bar::setup_ui() {
|
void Bar::setup_ui() {
|
||||||
@@ -83,26 +80,25 @@ void Bar::setup_ui() {
|
|||||||
center_box.append(*(new Spacer()));
|
center_box.append(*(new Spacer()));
|
||||||
center_box.append(*this->volumeWidget);
|
center_box.append(*this->volumeWidget);
|
||||||
|
|
||||||
|
|
||||||
trayWidget = Gtk::make_managed<TrayWidget>(trayService);
|
trayWidget = Gtk::make_managed<TrayWidget>(trayService);
|
||||||
right_box.append(*trayWidget);
|
right_box.append(*trayWidget);
|
||||||
right_box.append(homeAssistant);
|
// right_box.append(homeAssistant);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Bar::load_css() {
|
void Bar::load_css() {
|
||||||
auto css_provider = Gtk::CssProvider::create();
|
auto css_provider = Gtk::CssProvider::create();
|
||||||
|
|
||||||
std::string css_path = "resources/bar.css";
|
std::string css_path = "resources/bar.css";
|
||||||
const char* home = std::getenv("HOME");
|
const char *home = std::getenv("HOME");
|
||||||
if (home) {
|
if (home) {
|
||||||
std::filesystem::path config_path = std::filesystem::path(home) / ".config/bar/bar.css";
|
std::filesystem::path config_path =
|
||||||
|
std::filesystem::path(home) / ".config/bar/bar.css";
|
||||||
if (std::filesystem::exists(config_path)) {
|
if (std::filesystem::exists(config_path)) {
|
||||||
css_path = config_path.string();
|
css_path = config_path.string();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::string css =
|
const std::string css = SystemHelper::read_file_to_string(css_path);
|
||||||
SystemHelper::read_file_to_string(css_path);
|
|
||||||
css_provider->load_from_data(css);
|
css_provider->load_from_data(css);
|
||||||
|
|
||||||
Gtk::StyleContext::add_provider_for_display(
|
Gtk::StyleContext::add_provider_for_display(
|
||||||
|
|||||||
@@ -14,16 +14,6 @@
|
|||||||
|
|
||||||
#include "helpers/systemHelper.hpp"
|
#include "helpers/systemHelper.hpp"
|
||||||
|
|
||||||
namespace {
|
|
||||||
const char *kMonitorCommand = "hyprctl monitors -j";
|
|
||||||
const char *kWorkspaceCommand = "hyprctl workspaces -j";
|
|
||||||
const char *kClientsCommand = "hyprctl clients -j";
|
|
||||||
|
|
||||||
bool is_workspace_event(const std::string &event) {
|
|
||||||
return event.find("workspace") != std::string::npos;
|
|
||||||
}
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
HyprlandService::HyprlandService() = default;
|
HyprlandService::HyprlandService() = default;
|
||||||
|
|
||||||
HyprlandService::~HyprlandService() {
|
HyprlandService::~HyprlandService() {
|
||||||
@@ -34,15 +24,24 @@ HyprlandService::~HyprlandService() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void HyprlandService::on_hyprland_event(std::string event, std::string data) {
|
void HyprlandService::on_hyprland_event(std::string event, std::string data) {
|
||||||
if (event == "urgent") {
|
if (event == "monitoradded" || event == "monitorremoved") {
|
||||||
handle_urgent_window(data);
|
refresh_monitors();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_workspace_event(event) || event == "focusedmon" ||
|
if (event == "urgent") {
|
||||||
event == "monitoradded" || event == "monitorremoved") {
|
onUrgentEvent(data);
|
||||||
refresh_monitors();
|
}
|
||||||
|
|
||||||
|
if (event == "workspace" || event == "movewindow") {
|
||||||
refresh_workspaces();
|
refresh_workspaces();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// use for
|
||||||
|
// event == "focusedmon"
|
||||||
|
|
||||||
|
if (event == "activewindowv2") {
|
||||||
|
onActiveWindowEvent(data);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void HyprlandService::start() {
|
void HyprlandService::start() {
|
||||||
@@ -79,7 +78,6 @@ void HyprlandService::start() {
|
|||||||
Glib::IOCondition::IO_ERR);
|
Glib::IOCondition::IO_ERR);
|
||||||
|
|
||||||
refresh_monitors();
|
refresh_monitors();
|
||||||
refresh_workspaces();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool HyprlandService::on_socket_read(Glib::IOCondition condition) {
|
bool HyprlandService::on_socket_read(Glib::IOCondition condition) {
|
||||||
@@ -93,19 +91,20 @@ bool HyprlandService::on_socket_read(Glib::IOCondition condition) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
char buffer[4096];
|
std::string buffer;
|
||||||
const ssize_t bytes_read = read(fd, buffer, sizeof(buffer) - 1);
|
char temp_buffer[4096];
|
||||||
|
const ssize_t bytes_read = read(fd, temp_buffer, sizeof(temp_buffer) - 1);
|
||||||
|
|
||||||
if (bytes_read > 0) {
|
if (bytes_read > 0) {
|
||||||
buffer[bytes_read] = '\0';
|
temp_buffer[bytes_read] = '\0';
|
||||||
this->buffer.append(buffer);
|
buffer.append(temp_buffer);
|
||||||
|
|
||||||
size_t pos = 0;
|
size_t pos = 0;
|
||||||
|
|
||||||
while ((pos = this->buffer.find('\n')) != std::string::npos) {
|
while ((pos = buffer.find('\n')) != std::string::npos) {
|
||||||
const std::string line = this->buffer.substr(0, pos);
|
const std::string line = buffer.substr(0, pos);
|
||||||
parse_message(line);
|
parse_message(line);
|
||||||
this->buffer.erase(0, pos + 1);
|
buffer.erase(0, pos + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -123,7 +122,7 @@ void HyprlandService::parse_message(const std::string &line) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::string HyprlandService::get_socket_path() {
|
std::string HyprlandService::get_socket_path() {
|
||||||
const char *sig = std::getenv("HYPRLAND_INSTANCE_SIGNATURE");
|
const char *sig = std::getenv("HYPRLAND_INSTANCE_SIGNATURE");
|
||||||
const char *runtime = std::getenv("XDG_RUNTIME_DIR");
|
const char *runtime = std::getenv("XDG_RUNTIME_DIR");
|
||||||
|
|
||||||
if (!sig || !runtime) {
|
if (!sig || !runtime) {
|
||||||
@@ -135,177 +134,77 @@ std::string HyprlandService::get_socket_path() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void HyprlandService::refresh_monitors() {
|
void HyprlandService::refresh_monitors() {
|
||||||
std::string output;
|
this->monitors.clear();
|
||||||
|
this->workspaces.clear();
|
||||||
|
|
||||||
try {
|
std::string output = SystemHelper::get_command_output(kMonitorCommand);
|
||||||
output = SystemHelper::get_command_output(kMonitorCommand);
|
auto monitorsJson = nlohmann::json::parse(output, nullptr, false);
|
||||||
} catch (const std::exception &ex) {
|
|
||||||
std::cerr << "[Hyprland] Failed to query monitors: " << ex.what()
|
|
||||||
<< std::endl;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto monitorsJson = nlohmann::json::parse(output, nullptr, false);
|
|
||||||
if (!monitorsJson.is_array()) {
|
|
||||||
std::cerr << "[Hyprland] Unexpected monitor payload" << std::endl;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::map<int, Monitor> updated;
|
|
||||||
|
|
||||||
for (const auto &monitorJson : monitorsJson) {
|
for (const auto &monitorJson : monitorsJson) {
|
||||||
if (!monitorJson.is_object()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
Monitor monitor;
|
Monitor monitor;
|
||||||
monitor.id = monitorJson.value("id", -1);
|
monitor.id = monitorJson.value("id", -1);
|
||||||
monitor.name = monitorJson.value("name", "");
|
monitor.name = monitorJson.value("name", "");
|
||||||
monitor.x = monitorJson.value("x", 0);
|
monitor.x = monitorJson.value("x", 0);
|
||||||
monitor.y = monitorJson.value("y", 0);
|
monitor.y = monitorJson.value("y", 0);
|
||||||
|
|
||||||
if (monitorJson.contains("activeWorkspace") &&
|
monitor.focusedWorkspaceId = monitorJson["activeWorkspace"].value("id", -1);
|
||||||
monitorJson["activeWorkspace"].is_object()) {
|
|
||||||
monitor.focusedWorkspaceId =
|
|
||||||
monitorJson["activeWorkspace"].value("id", -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (monitor.id >= 0) {
|
if (monitor.id >= 0) {
|
||||||
updated.emplace(monitor.id, std::move(monitor));
|
this->monitors[monitor.id] = monitor;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int slot = 1; slot <= HyprlandService::kWorkspaceSlotCount; ++slot) {
|
||||||
|
WorkspaceState wsState;
|
||||||
|
wsState.focused = false;
|
||||||
|
wsState.active = false;
|
||||||
|
wsState.label = std::to_string(slot);
|
||||||
|
wsState.monitorId = monitor.id;
|
||||||
|
|
||||||
|
int id = slot + monitor.id * HyprlandService::kWorkspaceSlotCount;
|
||||||
|
wsState.hyprId = id;
|
||||||
|
this->workspaces[id] = new WorkspaceState(wsState);
|
||||||
|
this->monitors[monitor.id].workspaceStates[slot] = this->workspaces[id];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
monitors.swap(updated);
|
this->refresh_workspaces();
|
||||||
monitorStateChanged.emit();
|
monitorStateChanged.emit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called every time when workspace changes have been detected.
|
||||||
|
* Used to Update the internal state for the Workspaces,
|
||||||
|
*/
|
||||||
void HyprlandService::refresh_workspaces() {
|
void HyprlandService::refresh_workspaces() {
|
||||||
if (monitors.empty()) {
|
std::string output = SystemHelper::get_command_output(kWorkspaceCommand);
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string output;
|
|
||||||
|
|
||||||
try {
|
|
||||||
output = SystemHelper::get_command_output(kWorkspaceCommand);
|
|
||||||
} catch (const std::exception &ex) {
|
|
||||||
std::cerr << "[Hyprland] Failed to query workspaces: " << ex.what()
|
|
||||||
<< std::endl;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto workspacesJson = nlohmann::json::parse(output, nullptr, false);
|
auto workspacesJson = nlohmann::json::parse(output, nullptr, false);
|
||||||
if (!workspacesJson.is_array()) {
|
|
||||||
std::cerr << "[Hyprland] Unexpected workspace payload" << std::endl;
|
for (auto &[id, ws] : this->workspaces) {
|
||||||
return;
|
ws->focused = false;
|
||||||
|
ws->active = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (auto &pair : monitors) {
|
output = SystemHelper::get_command_output(kMonitorCommand);
|
||||||
auto &monitor = pair.second;
|
auto monitorsJson = nlohmann::json::parse(output, nullptr, false);
|
||||||
monitor.workspaceStates.clear();
|
|
||||||
|
|
||||||
int focusedSlot = -1;
|
for (const auto &monitorJson : monitorsJson) {
|
||||||
if (monitor.focusedWorkspaceId > 0) {
|
const int monitorId = monitorJson.value("id", -1);
|
||||||
focusedSlot = ((monitor.focusedWorkspaceId - 1) %
|
const int focusedWorkspaceId = monitorJson["activeWorkspace"].value("id", -1);
|
||||||
HyprlandService::kWorkspaceSlotCount) +
|
|
||||||
1;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int slot = 1; slot <= HyprlandService::kWorkspaceSlotCount;
|
auto monitor = this->monitors[monitorId];
|
||||||
++slot) {
|
monitor.focusedWorkspaceId = focusedWorkspaceId;
|
||||||
WorkspaceState state;
|
|
||||||
state.id = slot;
|
|
||||||
state.hyprId = -1;
|
|
||||||
state.label = std::to_string(slot);
|
|
||||||
state.active = (slot == focusedSlot);
|
|
||||||
state.focused = state.focused;
|
|
||||||
state.urgent = false;
|
|
||||||
monitor.workspaceStates.emplace(slot, state);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const auto &workspaceJson : workspacesJson) {
|
for (const auto &workspaceJson : workspacesJson) {
|
||||||
if (!workspaceJson.is_object()) {
|
const int workspaceId = workspaceJson.value("id", -1);
|
||||||
continue;
|
std::map<int, WorkspaceState *>::iterator workspaceStateIt = this->workspaces.find(workspaceId);
|
||||||
}
|
WorkspaceState *workspaceState = workspaceStateIt->second;
|
||||||
|
|
||||||
const int monitorId = workspaceJson.value("monitorID", -1);
|
workspaceState->focused = monitors[workspaceState->monitorId].focusedWorkspaceId == workspaceId;
|
||||||
const int workspaceId = workspaceJson.value("id", -1);
|
workspaceState->active = true;
|
||||||
|
|
||||||
auto monitorIt = monitors.find(monitorId);
|
|
||||||
if (monitorIt == monitors.end() || workspaceId < 0) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto &monitor = monitorIt->second;
|
|
||||||
const int slot =
|
|
||||||
((workspaceId - 1) % HyprlandService::kWorkspaceSlotCount) + 1;
|
|
||||||
auto &workspaceState = monitor.workspaceStates[slot];
|
|
||||||
|
|
||||||
workspaceState.id = slot;
|
|
||||||
workspaceState.hyprId = workspaceId;
|
|
||||||
workspaceState.focused = (monitor.focusedWorkspaceId == workspaceId);
|
|
||||||
workspaceState.active =
|
|
||||||
workspaceState.focused || workspaceJson.value("windows", 0) > 0;
|
|
||||||
workspaceState.urgent = false;
|
|
||||||
|
|
||||||
std::string labelCandidate;
|
|
||||||
if (workspaceJson.contains("name") &&
|
|
||||||
workspaceJson["name"].is_string()) {
|
|
||||||
labelCandidate = workspaceJson["name"].get<std::string>();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (labelCandidate.empty() ||
|
|
||||||
labelCandidate == std::to_string(workspaceId)) {
|
|
||||||
workspaceState.label = std::to_string(slot);
|
|
||||||
} else {
|
|
||||||
workspaceState.label = labelCandidate;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (workspaceJson.contains("urgent") &&
|
|
||||||
workspaceJson["urgent"].is_boolean()) {
|
|
||||||
workspaceState.urgent = workspaceJson["urgent"].get<bool>();
|
|
||||||
} else if (workspaceJson.contains("hasurgent") &&
|
|
||||||
workspaceJson["hasurgent"].is_boolean()) {
|
|
||||||
workspaceState.urgent = workspaceJson["hasurgent"].get<bool>();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const auto &pair : monitors) {
|
workspaceStateChanged.emit();
|
||||||
workspaceStateChanged.emit(pair.first);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
HyprlandService::Monitor *HyprlandService::getMonitorById(int id) {
|
|
||||||
auto it = monitors.find(id);
|
|
||||||
if (it == monitors.end()) {
|
|
||||||
throw std::runtime_error("Monitor with ID " + std::to_string(id) +
|
|
||||||
" not found.");
|
|
||||||
}
|
|
||||||
|
|
||||||
return &it->second;
|
|
||||||
}
|
|
||||||
|
|
||||||
const HyprlandService::Monitor *HyprlandService::getMonitorById(int id) const {
|
|
||||||
auto it = monitors.find(id);
|
|
||||||
if (it == monitors.end()) {
|
|
||||||
throw std::runtime_error("Monitor with ID " + std::to_string(id) +
|
|
||||||
" not found.");
|
|
||||||
}
|
|
||||||
|
|
||||||
return &it->second;
|
|
||||||
}
|
|
||||||
|
|
||||||
HyprlandService::Monitor *
|
|
||||||
HyprlandService::getMonitorByIndex(std::size_t index) {
|
|
||||||
if (index >= monitors.size()) {
|
|
||||||
throw std::runtime_error("Monitor index out of bounds: " +
|
|
||||||
std::to_string(index));
|
|
||||||
}
|
|
||||||
|
|
||||||
auto it = monitors.begin();
|
|
||||||
std::advance(it, static_cast<long>(index));
|
|
||||||
return &it->second;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void HyprlandService::switchToWorkspace(int workspaceId) {
|
void HyprlandService::switchToWorkspace(int workspaceId) {
|
||||||
@@ -320,68 +219,109 @@ void HyprlandService::switchToWorkspace(int workspaceId) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const HyprlandService::Monitor *
|
void HyprlandService::onUrgentEvent(std::string windowAddress) {
|
||||||
HyprlandService::getMonitorByIndex(std::size_t index) const {
|
std::string output = SystemHelper::get_command_output(kClientsCommand);
|
||||||
|
auto clientsJson = nlohmann::json::parse(output, nullptr, false);
|
||||||
|
|
||||||
|
for (const auto &clientJson : clientsJson) {
|
||||||
|
const std::string addr = clientJson.value("address", "");
|
||||||
|
|
||||||
|
if (addr == "0x" + windowAddress) {
|
||||||
|
int workspaceId = clientJson["workspace"].value("id", -1);
|
||||||
|
|
||||||
|
WorkspaceState *ws = this->workspaces[workspaceId];
|
||||||
|
|
||||||
|
// todo: maybee better method of access
|
||||||
|
if (ws) {
|
||||||
|
ws->urgentWindows.push_back(windowAddress);
|
||||||
|
workspaceStateChanged.emit();
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void HyprlandService::onActiveWindowEvent(std::string windowAddress) {
|
||||||
|
std::string output = SystemHelper::get_command_output(kClientsCommand);
|
||||||
|
auto clientsJson = nlohmann::json::parse(output, nullptr, false);
|
||||||
|
|
||||||
|
for (const auto &clientJson : clientsJson) {
|
||||||
|
const std::string addr = clientJson.value("address", "");
|
||||||
|
|
||||||
|
if (addr == "0x" + windowAddress) {
|
||||||
|
int workspaceId = clientJson["workspace"]["id"];
|
||||||
|
WorkspaceState *ws = this->workspaces[workspaceId];
|
||||||
|
|
||||||
|
if (ws) {
|
||||||
|
auto it = std::find(ws->urgentWindows.begin(), ws->urgentWindows.end(), windowAddress);
|
||||||
|
if (it != ws->urgentWindows.end()) {
|
||||||
|
ws->urgentWindows.erase(it);
|
||||||
|
workspaceStateChanged.emit();
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void HyprlandService::printMonitor(const Monitor &mon) const {
|
||||||
|
std::cout << "=== Monitor Info ===\n";
|
||||||
|
std::cout << "Name: " << mon.name << " (ID: " << mon.id << ")\n";
|
||||||
|
std::cout << "Position: (" << mon.x << ", " << mon.y << ")\n";
|
||||||
|
std::cout << "Focused Workspace ID: " << mon.focusedWorkspaceId << "\n";
|
||||||
|
|
||||||
|
std::cout << "Workspaces:\n";
|
||||||
|
|
||||||
|
if (mon.workspaceStates.empty()) {
|
||||||
|
std::cout << " (None)\n";
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int slot = 1; slot <= HyprlandService::kWorkspaceSlotCount; ++slot) {
|
||||||
|
const auto it = mon.workspaceStates.find(slot);
|
||||||
|
if (it == mon.workspaceStates.end()) {
|
||||||
|
std::cout << " - [Slot: " << slot << " | HyprID: n/a]"
|
||||||
|
<< " Label: <none> | Active: No | Focused: No | "
|
||||||
|
"Urgent: No\n";
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const WorkspaceState *ws = it->second;
|
||||||
|
std::cout << " - [HyprID: "
|
||||||
|
<< (ws->hyprId >= 0 ? std::to_string(ws->hyprId)
|
||||||
|
: std::string("n/a"))
|
||||||
|
<< "] "
|
||||||
|
<< "Label: " << (ws->label.empty() ? "<none>" : ws->label)
|
||||||
|
<< " | "
|
||||||
|
<< "Active: " << (ws->active ? "Yes" : "No") << " | "
|
||||||
|
<< "Focused: " << (ws->focused ? "Yes" : "No") << " | "
|
||||||
|
<< "Urgent: " << (ws->urgentWindows.size() > 0 ? "Yes" : "No")
|
||||||
|
<< "\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
std::cout << "====================\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
HyprlandService::Monitor *HyprlandService::getMonitorById(int id) {
|
||||||
|
auto it = monitors.find(id);
|
||||||
|
if (it == monitors.end()) {
|
||||||
|
throw std::runtime_error("Monitor with ID " + std::to_string(id) +
|
||||||
|
" not found.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return &it->second;
|
||||||
|
}
|
||||||
|
|
||||||
|
HyprlandService::Monitor *HyprlandService::getMonitorByIndex(std::size_t index) {
|
||||||
if (index >= monitors.size()) {
|
if (index >= monitors.size()) {
|
||||||
throw std::runtime_error("Monitor index out of bounds: " +
|
throw std::runtime_error("Monitor index out of bounds: " + std::to_string(index));
|
||||||
std::to_string(index));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
auto it = monitors.begin();
|
auto it = monitors.begin();
|
||||||
std::advance(it, static_cast<long>(index));
|
std::advance(it, static_cast<long>(index));
|
||||||
|
|
||||||
return &it->second;
|
return &it->second;
|
||||||
}
|
}
|
||||||
|
|
||||||
void HyprlandService::handle_urgent_window(std::string windowAddress) {
|
|
||||||
std::string output;
|
|
||||||
try {
|
|
||||||
output = SystemHelper::get_command_output(kClientsCommand);
|
|
||||||
} catch (const std::exception &ex) {
|
|
||||||
std::cerr << "[Hyprland] Failed to query clients: " << ex.what()
|
|
||||||
<< std::endl;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto clientsJson = nlohmann::json::parse(output, nullptr, false);
|
|
||||||
if (!clientsJson.is_array()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
int workspaceId = -1;
|
|
||||||
|
|
||||||
for (const auto &client : clientsJson) {
|
|
||||||
if (!client.is_object())
|
|
||||||
continue;
|
|
||||||
|
|
||||||
std::string addr = client.value("address", "");
|
|
||||||
if (addr == "0x" + windowAddress) {
|
|
||||||
if (client.contains("workspace") &&
|
|
||||||
client["workspace"].is_object()) {
|
|
||||||
workspaceId = client["workspace"].value("id", -1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (workspaceId == -1) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (auto &pair : monitors) {
|
|
||||||
auto &monitor = pair.second;
|
|
||||||
bool changed = false;
|
|
||||||
|
|
||||||
for (auto &wsPair : monitor.workspaceStates) {
|
|
||||||
if (wsPair.second.hyprId == workspaceId) {
|
|
||||||
if (!wsPair.second.urgent) {
|
|
||||||
wsPair.second.urgent = true;
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (changed) {
|
|
||||||
workspaceStateChanged.emit(monitor.id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -15,12 +15,12 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
constexpr const char *kWatcherBusName = "org.kde.StatusNotifierWatcher";
|
constexpr const char *kWatcherBusName = "org.kde.StatusNotifierWatcher";
|
||||||
constexpr const char *kWatcherObjectPath = "/StatusNotifierWatcher";
|
constexpr const char *kWatcherObjectPath = "/StatusNotifierWatcher";
|
||||||
constexpr const char *kWatcherInterface = "org.kde.StatusNotifierWatcher";
|
constexpr const char *kWatcherInterface = "org.kde.StatusNotifierWatcher";
|
||||||
constexpr const char *kItemInterface = "org.kde.StatusNotifierItem";
|
constexpr const char *kItemInterface = "org.kde.StatusNotifierItem";
|
||||||
constexpr const char *kDBusPropertiesIface = "org.freedesktop.DBus.Properties";
|
constexpr const char *kDBusPropertiesIface = "org.freedesktop.DBus.Properties";
|
||||||
constexpr const char *kDBusMenuInterface = "com.canonical.dbusmenu";
|
constexpr const char *kDBusMenuInterface = "com.canonical.dbusmenu";
|
||||||
|
|
||||||
const char *kWatcherIntrospection =
|
const char *kWatcherIntrospection =
|
||||||
R"(<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-Bus Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
|
R"(<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-Bus Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
|
||||||
@@ -55,25 +55,25 @@ ParsedService parse_service_identifier(const Glib::ustring &sender,
|
|||||||
ParsedService parsed;
|
ParsedService parsed;
|
||||||
|
|
||||||
if (service.empty()) {
|
if (service.empty()) {
|
||||||
parsed.busName = sender;
|
parsed.busName = sender;
|
||||||
parsed.objectPath = "/StatusNotifierItem";
|
parsed.objectPath = "/StatusNotifierItem";
|
||||||
return parsed;
|
return parsed;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (service.front() == '/') {
|
if (service.front() == '/') {
|
||||||
parsed.busName = sender;
|
parsed.busName = sender;
|
||||||
parsed.objectPath = service;
|
parsed.objectPath = service;
|
||||||
return parsed;
|
return parsed;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto slash = service.find('/');
|
const auto slash = service.find('/');
|
||||||
if (slash == std::string::npos) {
|
if (slash == std::string::npos) {
|
||||||
parsed.busName = service;
|
parsed.busName = service;
|
||||||
parsed.objectPath = "/StatusNotifierItem";
|
parsed.objectPath = "/StatusNotifierItem";
|
||||||
return parsed;
|
return parsed;
|
||||||
}
|
}
|
||||||
|
|
||||||
parsed.busName = service.substr(0, slash);
|
parsed.busName = service.substr(0, slash);
|
||||||
parsed.objectPath = service.substr(slash);
|
parsed.objectPath = service.substr(slash);
|
||||||
|
|
||||||
if (parsed.busName.empty()) {
|
if (parsed.busName.empty()) {
|
||||||
@@ -90,8 +90,8 @@ ParsedService parse_service_identifier(const Glib::ustring &sender,
|
|||||||
GVariant *create_property_list_variant() {
|
GVariant *create_property_list_variant() {
|
||||||
GVariantBuilder builder;
|
GVariantBuilder builder;
|
||||||
g_variant_builder_init(&builder, G_VARIANT_TYPE("as"));
|
g_variant_builder_init(&builder, G_VARIANT_TYPE("as"));
|
||||||
const char *properties[] = {"label", "label-markup", "enabled",
|
const char *properties[] = {"label", "label-markup", "enabled",
|
||||||
"visible", "children-display", "type",
|
"visible", "children-display", "type",
|
||||||
"toggle-type", "toggle-state"};
|
"toggle-type", "toggle-state"};
|
||||||
for (const char *prop : properties) {
|
for (const char *prop : properties) {
|
||||||
g_variant_builder_add(&builder, "s", prop);
|
g_variant_builder_add(&builder, "s", prop);
|
||||||
@@ -106,7 +106,7 @@ void call_about_to_show(const Glib::RefPtr<Gio::DBus::Connection> &connection,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
GError *error = nullptr;
|
GError *error = nullptr;
|
||||||
GVariant *result = g_dbus_connection_call_sync(
|
GVariant *result = g_dbus_connection_call_sync(
|
||||||
connection->gobj(), busName.c_str(), menuPath.c_str(),
|
connection->gobj(), busName.c_str(), menuPath.c_str(),
|
||||||
kDBusMenuInterface, "AboutToShow", g_variant_new("(i)", id), nullptr,
|
kDBusMenuInterface, "AboutToShow", g_variant_new("(i)", id), nullptr,
|
||||||
@@ -137,7 +137,7 @@ GVariant *call_get_layout(const Glib::RefPtr<Gio::DBus::Connection> &connection,
|
|||||||
GVariant *params = g_variant_new("(ii@as)", 0, -1, properties);
|
GVariant *params = g_variant_new("(ii@as)", 0, -1, properties);
|
||||||
g_variant_ref_sink(properties);
|
g_variant_ref_sink(properties);
|
||||||
|
|
||||||
GError *error = nullptr;
|
GError *error = nullptr;
|
||||||
GVariant *result = g_dbus_connection_call_sync(
|
GVariant *result = g_dbus_connection_call_sync(
|
||||||
connection->gobj(), busName.c_str(), menuPath.c_str(),
|
connection->gobj(), busName.c_str(), menuPath.c_str(),
|
||||||
kDBusMenuInterface, "GetLayout", params, nullptr,
|
kDBusMenuInterface, "GetLayout", params, nullptr,
|
||||||
@@ -174,15 +174,15 @@ void parse_menu_node(GVariant *tuple, TrayService::MenuNode &outNode) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
int id = 0;
|
int id = 0;
|
||||||
GVariant *propsVariant = nullptr;
|
GVariant *propsVariant = nullptr;
|
||||||
GVariant *childrenVariant = nullptr;
|
GVariant *childrenVariant = nullptr;
|
||||||
|
|
||||||
g_variant_get(tuple, "(i@a{sv}@av)", &id, &propsVariant, &childrenVariant);
|
g_variant_get(tuple, "(i@a{sv}@av)", &id, &propsVariant, &childrenVariant);
|
||||||
|
|
||||||
outNode.id = id;
|
outNode.id = id;
|
||||||
outNode.enabled = true;
|
outNode.enabled = true;
|
||||||
outNode.visible = true;
|
outNode.visible = true;
|
||||||
outNode.separator = false;
|
outNode.separator = false;
|
||||||
outNode.label.clear();
|
outNode.label.clear();
|
||||||
|
|
||||||
@@ -190,7 +190,7 @@ void parse_menu_node(GVariant *tuple, TrayService::MenuNode &outNode) {
|
|||||||
GVariantIter iter;
|
GVariantIter iter;
|
||||||
g_variant_iter_init(&iter, propsVariant);
|
g_variant_iter_init(&iter, propsVariant);
|
||||||
const gchar *key = nullptr;
|
const gchar *key = nullptr;
|
||||||
GVariant *value = nullptr;
|
GVariant *value = nullptr;
|
||||||
|
|
||||||
while (g_variant_iter_next(&iter, "{sv}", &key, &value)) {
|
while (g_variant_iter_next(&iter, "{sv}", &key, &value)) {
|
||||||
if (!key || !value) {
|
if (!key || !value) {
|
||||||
@@ -214,13 +214,13 @@ void parse_menu_node(GVariant *tuple, TrayService::MenuNode &outNode) {
|
|||||||
if (std::strcmp(key, "label") == 0) {
|
if (std::strcmp(key, "label") == 0) {
|
||||||
if (g_variant_is_of_type(unboxed, G_VARIANT_TYPE_STRING)) {
|
if (g_variant_is_of_type(unboxed, G_VARIANT_TYPE_STRING)) {
|
||||||
const gchar *str = g_variant_get_string(unboxed, nullptr);
|
const gchar *str = g_variant_get_string(unboxed, nullptr);
|
||||||
outNode.label = str ? str : "";
|
outNode.label = str ? str : "";
|
||||||
}
|
}
|
||||||
} else if (std::strcmp(key, "label-markup") == 0 &&
|
} else if (std::strcmp(key, "label-markup") == 0 &&
|
||||||
outNode.label.empty()) {
|
outNode.label.empty()) {
|
||||||
if (g_variant_is_of_type(unboxed, G_VARIANT_TYPE_STRING)) {
|
if (g_variant_is_of_type(unboxed, G_VARIANT_TYPE_STRING)) {
|
||||||
const gchar *str = g_variant_get_string(unboxed, nullptr);
|
const gchar *str = g_variant_get_string(unboxed, nullptr);
|
||||||
outNode.label = str ? str : "";
|
outNode.label = str ? str : "";
|
||||||
}
|
}
|
||||||
} else if (std::strcmp(key, "enabled") == 0) {
|
} else if (std::strcmp(key, "enabled") == 0) {
|
||||||
if (g_variant_is_of_type(unboxed, G_VARIANT_TYPE_BOOLEAN)) {
|
if (g_variant_is_of_type(unboxed, G_VARIANT_TYPE_BOOLEAN)) {
|
||||||
@@ -362,7 +362,7 @@ void TrayService::activate(const std::string &id, int32_t x, int32_t y) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
GError *error = nullptr;
|
GError *error = nullptr;
|
||||||
GVariant *result = g_dbus_connection_call_sync(
|
GVariant *result = g_dbus_connection_call_sync(
|
||||||
connection->gobj(), it->second->publicData.busName.c_str(),
|
connection->gobj(), it->second->publicData.busName.c_str(),
|
||||||
it->second->publicData.objectPath.c_str(), kItemInterface, "Activate",
|
it->second->publicData.objectPath.c_str(), kItemInterface, "Activate",
|
||||||
@@ -387,7 +387,7 @@ void TrayService::secondaryActivate(const std::string &id, int32_t x,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
GError *error = nullptr;
|
GError *error = nullptr;
|
||||||
GVariant *result = g_dbus_connection_call_sync(
|
GVariant *result = g_dbus_connection_call_sync(
|
||||||
connection->gobj(), it->second->publicData.busName.c_str(),
|
connection->gobj(), it->second->publicData.busName.c_str(),
|
||||||
it->second->publicData.objectPath.c_str(), kItemInterface,
|
it->second->publicData.objectPath.c_str(), kItemInterface,
|
||||||
@@ -411,7 +411,7 @@ void TrayService::contextMenu(const std::string &id, int32_t x, int32_t y) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
GError *error = nullptr;
|
GError *error = nullptr;
|
||||||
GVariant *result = g_dbus_connection_call_sync(
|
GVariant *result = g_dbus_connection_call_sync(
|
||||||
connection->gobj(), it->second->publicData.busName.c_str(),
|
connection->gobj(), it->second->publicData.busName.c_str(),
|
||||||
it->second->publicData.objectPath.c_str(), kItemInterface,
|
it->second->publicData.objectPath.c_str(), kItemInterface,
|
||||||
@@ -566,7 +566,7 @@ bool TrayService::activate_menu_item(const std::string &id, int itemId) {
|
|||||||
"(isvu)", itemId, "clicked", g_variant_new_variant(emptyData),
|
"(isvu)", itemId, "clicked", g_variant_new_variant(emptyData),
|
||||||
static_cast<guint32>(g_get_monotonic_time() / 1000));
|
static_cast<guint32>(g_get_monotonic_time() / 1000));
|
||||||
|
|
||||||
GError *error = nullptr;
|
GError *error = nullptr;
|
||||||
GVariant *result = g_dbus_connection_call_sync(
|
GVariant *result = g_dbus_connection_call_sync(
|
||||||
connection->gobj(), item.publicData.busName.c_str(),
|
connection->gobj(), item.publicData.busName.c_str(),
|
||||||
item.publicData.menuPath.c_str(), kDBusMenuInterface, "Event", params,
|
item.publicData.menuPath.c_str(), kDBusMenuInterface, "Event", params,
|
||||||
@@ -723,16 +723,16 @@ void TrayService::register_item(const Glib::ustring &sender,
|
|||||||
}
|
}
|
||||||
|
|
||||||
const std::string id = parsed.busName + parsed.objectPath;
|
const std::string id = parsed.busName + parsed.objectPath;
|
||||||
auto existing = items.find(id);
|
auto existing = items.find(id);
|
||||||
if (existing != items.end()) {
|
if (existing != items.end()) {
|
||||||
refresh_item(*existing->second);
|
refresh_item(*existing->second);
|
||||||
itemUpdatedSignal.emit(existing->second->publicData);
|
itemUpdatedSignal.emit(existing->second->publicData);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto item = std::make_unique<TrackedItem>();
|
auto item = std::make_unique<TrackedItem>();
|
||||||
item->publicData.id = id;
|
item->publicData.id = id;
|
||||||
item->publicData.busName = parsed.busName;
|
item->publicData.busName = parsed.busName;
|
||||||
item->publicData.objectPath = parsed.objectPath;
|
item->publicData.objectPath = parsed.objectPath;
|
||||||
|
|
||||||
refresh_item(*item);
|
refresh_item(*item);
|
||||||
@@ -789,7 +789,7 @@ void TrayService::refresh_item(TrackedItem &item) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
GError *error = nullptr;
|
GError *error = nullptr;
|
||||||
GVariant *reply = g_dbus_connection_call_sync(
|
GVariant *reply = g_dbus_connection_call_sync(
|
||||||
connection->gobj(), item.publicData.busName.c_str(),
|
connection->gobj(), item.publicData.busName.c_str(),
|
||||||
item.publicData.objectPath.c_str(), kDBusPropertiesIface, "GetAll",
|
item.publicData.objectPath.c_str(), kDBusPropertiesIface, "GetAll",
|
||||||
@@ -816,7 +816,7 @@ void TrayService::refresh_item(TrackedItem &item) {
|
|||||||
g_variant_iter_init(&iter, dictVariant);
|
g_variant_iter_init(&iter, dictVariant);
|
||||||
|
|
||||||
const gchar *key = nullptr;
|
const gchar *key = nullptr;
|
||||||
GVariant *value = nullptr;
|
GVariant *value = nullptr;
|
||||||
|
|
||||||
Glib::RefPtr<Gdk::Paintable> iconTexture;
|
Glib::RefPtr<Gdk::Paintable> iconTexture;
|
||||||
Glib::RefPtr<Gdk::Paintable> attentionTexture;
|
Glib::RefPtr<Gdk::Paintable> attentionTexture;
|
||||||
@@ -836,23 +836,23 @@ void TrayService::refresh_item(TrackedItem &item) {
|
|||||||
|
|
||||||
if (std::strcmp(key, "Title") == 0) {
|
if (std::strcmp(key, "Title") == 0) {
|
||||||
const gchar *str = g_variant_get_string(value, nullptr);
|
const gchar *str = g_variant_get_string(value, nullptr);
|
||||||
title = str ? str : "";
|
title = str ? str : "";
|
||||||
} else if (std::strcmp(key, "Status") == 0) {
|
} else if (std::strcmp(key, "Status") == 0) {
|
||||||
const gchar *str = g_variant_get_string(value, nullptr);
|
const gchar *str = g_variant_get_string(value, nullptr);
|
||||||
status = str ? str : "";
|
status = str ? str : "";
|
||||||
} else if (std::strcmp(key, "Menu") == 0) {
|
} else if (std::strcmp(key, "Menu") == 0) {
|
||||||
if (g_variant_is_of_type(value, G_VARIANT_TYPE_OBJECT_PATH)) {
|
if (g_variant_is_of_type(value, G_VARIANT_TYPE_OBJECT_PATH)) {
|
||||||
const gchar *str = g_variant_get_string(value, nullptr);
|
const gchar *str = g_variant_get_string(value, nullptr);
|
||||||
menuPath = str ? str : "";
|
menuPath = str ? str : "";
|
||||||
} else {
|
} else {
|
||||||
const gchar *str = g_variant_get_string(value, nullptr);
|
const gchar *str = g_variant_get_string(value, nullptr);
|
||||||
menuPath = str ? str : "";
|
menuPath = str ? str : "";
|
||||||
}
|
}
|
||||||
} else if (std::strcmp(key, "IconName") == 0) {
|
} else if (std::strcmp(key, "IconName") == 0) {
|
||||||
const gchar *str = g_variant_get_string(value, nullptr);
|
const gchar *str = g_variant_get_string(value, nullptr);
|
||||||
iconName = str ? str : "";
|
iconName = str ? str : "";
|
||||||
} else if (std::strcmp(key, "AttentionIconName") == 0) {
|
} else if (std::strcmp(key, "AttentionIconName") == 0) {
|
||||||
const gchar *str = g_variant_get_string(value, nullptr);
|
const gchar *str = g_variant_get_string(value, nullptr);
|
||||||
attentionIconName = str ? str : "";
|
attentionIconName = str ? str : "";
|
||||||
} else if (std::strcmp(key, "IconPixmap") == 0) {
|
} else if (std::strcmp(key, "IconPixmap") == 0) {
|
||||||
iconTexture = parse_icon_pixmap(value);
|
iconTexture = parse_icon_pixmap(value);
|
||||||
@@ -864,10 +864,10 @@ void TrayService::refresh_item(TrackedItem &item) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
g_variant_unref(dictVariant);
|
g_variant_unref(dictVariant);
|
||||||
const bool menuPathChanged = (item.publicData.menuPath != menuPath);
|
const bool menuPathChanged = (item.publicData.menuPath != menuPath);
|
||||||
item.publicData.title = title;
|
item.publicData.title = title;
|
||||||
item.publicData.status = status;
|
item.publicData.status = status;
|
||||||
item.publicData.menuPath = menuPath;
|
item.publicData.menuPath = menuPath;
|
||||||
item.publicData.menuAvailable = !menuPath.empty();
|
item.publicData.menuAvailable = !menuPath.empty();
|
||||||
|
|
||||||
if (menuPathChanged || !item.publicData.menuAvailable) {
|
if (menuPathChanged || !item.publicData.menuAvailable) {
|
||||||
@@ -1029,7 +1029,7 @@ Glib::RefPtr<Gdk::Paintable> TrayService::parse_icon_pixmap(GVariant *variant) {
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t width = 0;
|
int32_t width = 0;
|
||||||
int32_t height = 0;
|
int32_t height = 0;
|
||||||
g_variant_get_child(entry, 0, "i", &width);
|
g_variant_get_child(entry, 0, "i", &width);
|
||||||
g_variant_get_child(entry, 1, "i", &height);
|
g_variant_get_child(entry, 1, "i", &height);
|
||||||
@@ -1045,7 +1045,7 @@ Glib::RefPtr<Gdk::Paintable> TrayService::parse_icon_pixmap(GVariant *variant) {
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
gsize rawLength = 0;
|
gsize rawLength = 0;
|
||||||
const guint8 *rawBytes = static_cast<const guint8 *>(
|
const guint8 *rawBytes = static_cast<const guint8 *>(
|
||||||
g_variant_get_fixed_array(bytesVariant, &rawLength, sizeof(guint8)));
|
g_variant_get_fixed_array(bytesVariant, &rawLength, sizeof(guint8)));
|
||||||
if (!rawBytes || rawLength < static_cast<gsize>(width * height * 4)) {
|
if (!rawBytes || rawLength < static_cast<gsize>(width * height * 4)) {
|
||||||
@@ -1062,16 +1062,16 @@ Glib::RefPtr<Gdk::Paintable> TrayService::parse_icon_pixmap(GVariant *variant) {
|
|||||||
const guint32 *pixels = reinterpret_cast<const guint32 *>(rawBytes);
|
const guint32 *pixels = reinterpret_cast<const guint32 *>(rawBytes);
|
||||||
for (std::size_t idx = 0; idx < pixelCount; ++idx) {
|
for (std::size_t idx = 0; idx < pixelCount; ++idx) {
|
||||||
const guint32 pixel = pixels[idx];
|
const guint32 pixel = pixels[idx];
|
||||||
const guint8 a = static_cast<guint8>((pixel >> 24) & 0xFF);
|
const guint8 a = static_cast<guint8>((pixel >> 24) & 0xFF);
|
||||||
const guint8 r = static_cast<guint8>((pixel >> 16) & 0xFF);
|
const guint8 r = static_cast<guint8>((pixel >> 16) & 0xFF);
|
||||||
const guint8 g = static_cast<guint8>((pixel >> 8) & 0xFF);
|
const guint8 g = static_cast<guint8>((pixel >> 8) & 0xFF);
|
||||||
const guint8 b = static_cast<guint8>(pixel & 0xFF);
|
const guint8 b = static_cast<guint8>(pixel & 0xFF);
|
||||||
|
|
||||||
const std::size_t base = idx * 4;
|
const std::size_t base = idx * 4;
|
||||||
rgba[base + 0] = r;
|
rgba[base + 0] = r;
|
||||||
rgba[base + 1] = g;
|
rgba[base + 1] = g;
|
||||||
rgba[base + 2] = b;
|
rgba[base + 2] = b;
|
||||||
rgba[base + 3] = a;
|
rgba[base + 3] = a;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto pixbuf =
|
auto pixbuf =
|
||||||
@@ -1082,9 +1082,9 @@ Glib::RefPtr<Gdk::Paintable> TrayService::parse_icon_pixmap(GVariant *variant) {
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
auto *dest = pixbuf->get_pixels();
|
auto *dest = pixbuf->get_pixels();
|
||||||
const int destRowstride = pixbuf->get_rowstride();
|
const int destRowstride = pixbuf->get_rowstride();
|
||||||
const int srcRowstride = width * 4;
|
const int srcRowstride = width * 4;
|
||||||
|
|
||||||
for (int y = 0; y < height; ++y) {
|
for (int y = 0; y < height; ++y) {
|
||||||
std::memcpy(dest + y * destRowstride,
|
std::memcpy(dest + y * destRowstride,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ TrayIconWidget::TrayIconWidget(TrayService &service, std::string id)
|
|||||||
set_focusable(false);
|
set_focusable(false);
|
||||||
set_valign(Gtk::Align::CENTER);
|
set_valign(Gtk::Align::CENTER);
|
||||||
set_halign(Gtk::Align::CENTER);
|
set_halign(Gtk::Align::CENTER);
|
||||||
|
add_css_class("tray-icon");
|
||||||
|
|
||||||
picture.set_halign(Gtk::Align::CENTER);
|
picture.set_halign(Gtk::Align::CENTER);
|
||||||
picture.set_valign(Gtk::Align::CENTER);
|
picture.set_valign(Gtk::Align::CENTER);
|
||||||
@@ -98,8 +99,8 @@ void TrayIconWidget::on_secondary_released(int /*n_press*/, double x,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
pendingX = x;
|
pendingX = x;
|
||||||
pendingY = y;
|
pendingY = y;
|
||||||
menuPopupPending = true;
|
menuPopupPending = true;
|
||||||
try_popup();
|
try_popup();
|
||||||
}
|
}
|
||||||
@@ -124,7 +125,7 @@ bool TrayIconWidget::ensure_menu() {
|
|||||||
|
|
||||||
const auto &layout = *layoutOpt;
|
const auto &layout = *layoutOpt;
|
||||||
|
|
||||||
auto menu = Gio::Menu::create();
|
auto menu = Gio::Menu::create();
|
||||||
auto actions = Gio::SimpleActionGroup::create();
|
auto actions = Gio::SimpleActionGroup::create();
|
||||||
|
|
||||||
populate_menu_items(layout.children, menu, actions);
|
populate_menu_items(layout.children, menu, actions);
|
||||||
@@ -137,7 +138,7 @@ bool TrayIconWidget::ensure_menu() {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
menuModel = menu;
|
menuModel = menu;
|
||||||
menuActions = actions;
|
menuActions = actions;
|
||||||
|
|
||||||
if (!menuPopover) {
|
if (!menuPopover) {
|
||||||
|
|||||||
@@ -17,15 +17,10 @@ VolumeWidget::VolumeWidget() : Gtk::Box(Gtk::Orientation::HORIZONTAL) {
|
|||||||
|
|
||||||
append(label);
|
append(label);
|
||||||
|
|
||||||
// Click toggles mute using wpctl
|
|
||||||
click = Gtk::GestureClick::create();
|
click = Gtk::GestureClick::create();
|
||||||
click->set_button(GDK_BUTTON_PRIMARY);
|
click->set_button(GDK_BUTTON_PRIMARY);
|
||||||
// signal_released provides (int, double, double) — use lambda to ignore
|
click->signal_released().connect([this](int, double, double) {
|
||||||
// args
|
|
||||||
click->signal_released().connect([this](int /*n_press*/, double /*x*/,
|
|
||||||
double /*y*/) {
|
|
||||||
try {
|
try {
|
||||||
// Toggle mute then refresh
|
|
||||||
(void)SystemHelper::get_command_output(
|
(void)SystemHelper::get_command_output(
|
||||||
"wpctl set-mute @DEFAULT_SINK@ toggle");
|
"wpctl set-mute @DEFAULT_SINK@ toggle");
|
||||||
} catch (const std::exception &ex) {
|
} catch (const std::exception &ex) {
|
||||||
@@ -34,19 +29,17 @@ VolumeWidget::VolumeWidget() : Gtk::Box(Gtk::Orientation::HORIZONTAL) {
|
|||||||
}
|
}
|
||||||
this->update();
|
this->update();
|
||||||
});
|
});
|
||||||
add_controller(click);
|
|
||||||
|
|
||||||
// Initial read
|
add_controller(click);
|
||||||
update();
|
update();
|
||||||
|
|
||||||
// Start polling every 1 second to keep the display up to date
|
this->timeoutConn = Glib::signal_timeout().connect(
|
||||||
timeoutConn = Glib::signal_timeout().connect(
|
|
||||||
sigc::mem_fun(*this, &VolumeWidget::on_timeout), 100);
|
sigc::mem_fun(*this, &VolumeWidget::on_timeout), 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
VolumeWidget::~VolumeWidget() {
|
VolumeWidget::~VolumeWidget() {
|
||||||
if (timeoutConn.connected())
|
if (this->timeoutConn.connected())
|
||||||
timeoutConn.disconnect();
|
this->timeoutConn.disconnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
void VolumeWidget::update() {
|
void VolumeWidget::update() {
|
||||||
@@ -54,18 +47,16 @@ void VolumeWidget::update() {
|
|||||||
const std::string out =
|
const std::string out =
|
||||||
SystemHelper::get_command_output("wpctl get-volume @DEFAULT_SINK@");
|
SystemHelper::get_command_output("wpctl get-volume @DEFAULT_SINK@");
|
||||||
|
|
||||||
// Attempt to parse a number (percentage or fraction)
|
|
||||||
std::smatch m;
|
std::smatch m;
|
||||||
std::regex r_percent(R"((\d+(?:\.\d+)?)%)");
|
std::regex r_percent(R"((\d+(?:\.\d+)?)%)");
|
||||||
std::regex r_number(R"((\d+(?:\.\d+)?))");
|
std::regex r_number(R"((\d+(?:\.\d+)?))");
|
||||||
|
|
||||||
std::string text = out;
|
std::string text = out;
|
||||||
int percent = -1;
|
int percent = -1;
|
||||||
|
|
||||||
if (std::regex_search(text, m, r_percent)) {
|
if (std::regex_search(text, m, r_percent)) {
|
||||||
percent = static_cast<int>(std::round(std::stod(m[1].str())));
|
percent = static_cast<int>(std::round(std::stod(m[1].str())));
|
||||||
} else if (std::regex_search(text, m, r_number)) {
|
} else if (std::regex_search(text, m, r_number)) {
|
||||||
// If number looks like 0.8 treat as fraction
|
|
||||||
const double v = std::stod(m[1].str());
|
const double v = std::stod(m[1].str());
|
||||||
if (v <= 1.0)
|
if (v <= 1.0)
|
||||||
percent = static_cast<int>(std::round(v * 100.0));
|
percent = static_cast<int>(std::round(v * 100.0));
|
||||||
@@ -76,7 +67,6 @@ void VolumeWidget::update() {
|
|||||||
if (percent >= 0) {
|
if (percent >= 0) {
|
||||||
label.set_text(std::to_string(percent) + "%");
|
label.set_text(std::to_string(percent) + "%");
|
||||||
} else {
|
} else {
|
||||||
// Fallback to raw output (trimmed)
|
|
||||||
auto pos = text.find_first_not_of(" \t\n\r");
|
auto pos = text.find_first_not_of(" \t\n\r");
|
||||||
if (pos != std::string::npos) {
|
if (pos != std::string::npos) {
|
||||||
auto end = text.find_last_not_of(" \t\n\r");
|
auto end = text.find_last_not_of(" \t\n\r");
|
||||||
@@ -94,5 +84,6 @@ void VolumeWidget::update() {
|
|||||||
|
|
||||||
bool VolumeWidget::on_timeout() {
|
bool VolumeWidget::on_timeout() {
|
||||||
update();
|
update();
|
||||||
|
|
||||||
return true; // keep timeout active
|
return true; // keep timeout active
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#include "widgets/workspaceIndicator.hpp"
|
#include "widgets/workspaceIndicator.hpp"
|
||||||
|
#include "services/hyprland.hpp"
|
||||||
|
|
||||||
#include <exception>
|
#include <cassert>
|
||||||
#include <gdk/gdk.h>
|
#include <gdk/gdk.h>
|
||||||
#include <gtkmm/gestureclick.h>
|
#include <gtkmm/gestureclick.h>
|
||||||
#include <gtkmm/widget.h>
|
#include <gtkmm/widget.h>
|
||||||
@@ -17,6 +18,23 @@ WorkspaceIndicator::WorkspaceIndicator(HyprlandService &service, int monitorId)
|
|||||||
monitorConnection = service.monitorStateChanged.connect(
|
monitorConnection = service.monitorStateChanged.connect(
|
||||||
sigc::mem_fun(*this, &WorkspaceIndicator::on_monitor_update));
|
sigc::mem_fun(*this, &WorkspaceIndicator::on_monitor_update));
|
||||||
|
|
||||||
|
for (int i = 1; i <= HyprlandService::kWorkspaceSlotCount; ++i) {
|
||||||
|
auto label = Gtk::make_managed<Gtk::Label>(std::to_string(i));
|
||||||
|
label->add_css_class("workspace-pill");
|
||||||
|
|
||||||
|
auto gesture = Gtk::GestureClick::create();
|
||||||
|
gesture->set_button(GDK_BUTTON_PRIMARY);
|
||||||
|
gesture->signal_released().connect(
|
||||||
|
[this, i, &service](int, double, double) {
|
||||||
|
service.switchToWorkspace(
|
||||||
|
i + this->monitorId * HyprlandService::kWorkspaceSlotCount);
|
||||||
|
});
|
||||||
|
label->add_controller(gesture);
|
||||||
|
|
||||||
|
workspaceLabels[i] = label;
|
||||||
|
append(*label);
|
||||||
|
}
|
||||||
|
|
||||||
rebuild();
|
rebuild();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,77 +48,41 @@ WorkspaceIndicator::~WorkspaceIndicator() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void WorkspaceIndicator::on_workspace_update(int monitorId) {
|
void WorkspaceIndicator::on_workspace_update() {
|
||||||
if (this->monitorId != monitorId && monitorId != -1) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
rebuild();
|
rebuild();
|
||||||
}
|
}
|
||||||
|
|
||||||
void WorkspaceIndicator::on_monitor_update() { rebuild(); }
|
void WorkspaceIndicator::on_monitor_update() { rebuild(); }
|
||||||
|
|
||||||
|
void WorkspaceIndicator::refreshLabel(Gtk::Label *label, HyprlandService::WorkspaceState state) {
|
||||||
|
label->remove_css_class("workspace-pill-active");
|
||||||
|
label->remove_css_class("workspace-pill-focused");
|
||||||
|
label->remove_css_class("workspace-pill-urgent");
|
||||||
|
|
||||||
|
auto gesture = Gtk::GestureClick::create();
|
||||||
|
gesture->set_button(GDK_BUTTON_PRIMARY);
|
||||||
|
gesture->signal_released().connect(
|
||||||
|
[this, state](int, double, double) {
|
||||||
|
service.switchToWorkspace(state.hyprId);
|
||||||
|
});
|
||||||
|
label->add_controller(gesture);
|
||||||
|
|
||||||
|
if (state.urgentWindows.size() > 0) {
|
||||||
|
label->add_css_class("workspace-pill-urgent");
|
||||||
|
} else {
|
||||||
|
if (state.focused) {
|
||||||
|
label->add_css_class("workspace-pill-focused");
|
||||||
|
} else if (state.active) {
|
||||||
|
label->add_css_class("workspace-pill-active");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void WorkspaceIndicator::rebuild() {
|
void WorkspaceIndicator::rebuild() {
|
||||||
clear_children();
|
HyprlandService::Monitor *mon = service.getMonitorById(this->monitorId);
|
||||||
|
|
||||||
HyprlandService::Monitor *monitor = nullptr;
|
for (auto [id, workspaceState] : mon->workspaceStates) {
|
||||||
try {
|
Gtk::Label *label = workspaceLabels[id];
|
||||||
monitor = service.getMonitorById(monitorId);
|
this->refreshLabel(label, *workspaceState);
|
||||||
} catch (const std::exception &) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (monitor == nullptr) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int workspaceId = 1;
|
|
||||||
workspaceId <= HyprlandService::kWorkspaceSlotCount; ++workspaceId) {
|
|
||||||
const HyprlandService::WorkspaceState *state = nullptr;
|
|
||||||
auto it = monitor->workspaceStates.find(workspaceId);
|
|
||||||
|
|
||||||
if (it != monitor->workspaceStates.end()) {
|
|
||||||
state = &it->second;
|
|
||||||
}
|
|
||||||
|
|
||||||
const std::string display = (state && !state->label.empty())
|
|
||||||
? state->label
|
|
||||||
: std::to_string(workspaceId);
|
|
||||||
|
|
||||||
auto label = Gtk::make_managed<Gtk::Label>(display);
|
|
||||||
label->add_css_class("workspace-pill");
|
|
||||||
|
|
||||||
auto gesture = Gtk::GestureClick::create();
|
|
||||||
gesture->set_button(GDK_BUTTON_PRIMARY);
|
|
||||||
gesture->signal_released().connect(
|
|
||||||
[this, workspaceId](int /*n_press*/, double /*x*/, double /*y*/) {
|
|
||||||
int realWorkspaceId = workspaceId + 5 * (monitorId);
|
|
||||||
|
|
||||||
service.switchToWorkspace(realWorkspaceId);
|
|
||||||
});
|
|
||||||
label->add_controller(gesture);
|
|
||||||
|
|
||||||
if (state != nullptr) {
|
|
||||||
if (state->urgent != true) {
|
|
||||||
if (state->focused) {
|
|
||||||
label->add_css_class("workspace-pill-focused");
|
|
||||||
} else if (state->active) {
|
|
||||||
label->add_css_class("workspace-pill-active");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
label->add_css_class("workspace-pill-urgent");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
append(*label);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void WorkspaceIndicator::clear_children() {
|
|
||||||
Gtk::Widget *child = get_first_child();
|
|
||||||
while (child != nullptr) {
|
|
||||||
Gtk::Widget *next = child->get_next_sibling();
|
|
||||||
remove(*child);
|
|
||||||
child = next;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
10
tmp_test.cpp
10
tmp_test.cpp
@@ -1,10 +0,0 @@
|
|||||||
#include <giomm/menumodel.h>
|
|
||||||
#include <gio/gio.h>
|
|
||||||
#include <gio/gdbusmenumodel.h>
|
|
||||||
|
|
||||||
int main(){
|
|
||||||
GDBusMenuModel *dbusModel = g_dbus_menu_model_get_for_bus_sync(G_BUS_TYPE_SESSION, G_DBUS_MENU_MODEL_FLAGS_NONE, "org.freedesktop.Notifications", "/Menu", nullptr, nullptr);
|
|
||||||
if(!dbusModel) return 0;
|
|
||||||
Glib::RefPtr<Gio::MenuModel> model = Glib::wrap(G_MENU_MODEL(dbusModel));
|
|
||||||
return model ? 0 : 1;
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user