highlight urgent workspace

This commit is contained in:
2025-12-11 00:41:47 +01:00
parent 0a94acb8f4
commit e1eeb370da
9 changed files with 139 additions and 19 deletions

View File

@@ -1,11 +1,13 @@
#include "bar/bar.hpp"
#include "gtk/gtk.h"
#include "widgets/date.hpp"
#include "widgets/spacer.hpp"
#include "widgets/volumeWidget.hpp"
#include "widgets/workspaceIndicator.hpp"
#include "helpers/systemHelper.hpp"
#include <filesystem>
#include <gtkmm/enums.h>
#include <gtkmm/label.h>
#include <gtkmm/window.h>
@@ -33,6 +35,9 @@ Bar::Bar(GdkMonitor *monitor, HyprlandService &hyprlandService,
set_child(main_box);
this->volumeWidget = Gtk::make_managed<VolumeWidget>();
load_css();
setup_ui();
@@ -41,6 +46,13 @@ Bar::Bar(GdkMonitor *monitor, HyprlandService &hyprlandService,
Glib::signal_timeout().connect(sigc::mem_fun(clock, &Clock::onUpdate),
1000);
date.onUpdate();
Glib::signal_timeout().connect(sigc::mem_fun(date, &Date::onUpdate),
1000);
}
void Bar::setup_ui() {
@@ -65,14 +77,11 @@ void Bar::setup_ui() {
left_box.append(*workspaceIndicator);
clock.set_name("clock-label");
clock.set_hexpand(false);
clock.set_halign(Gtk::Align::CENTER);
clock.set_valign(Gtk::Align::CENTER);
center_box.append(clock);
center_box.append(this->date);
center_box.append(*(new Spacer()));
volumeWidget = Gtk::make_managed<VolumeWidget>();
center_box.append(*volumeWidget);
center_box.append(this->clock);
center_box.append(*(new Spacer()));
center_box.append(*this->volumeWidget);
trayWidget = Gtk::make_managed<TrayWidget>(trayService);
@@ -83,8 +92,17 @@ void Bar::setup_ui() {
void Bar::load_css() {
auto css_provider = Gtk::CssProvider::create();
std::string css_path = "resources/bar.css";
const char* home = std::getenv("HOME");
if (home) {
std::filesystem::path config_path = std::filesystem::path(home) / ".config/bar/bar.css";
if (std::filesystem::exists(config_path)) {
css_path = config_path.string();
}
}
const std::string css =
SystemHelper::read_file_to_string("resources/bar.css");
SystemHelper::read_file_to_string(css_path);
css_provider->load_from_data(css);
Gtk::StyleContext::add_provider_for_display(

View File

@@ -17,6 +17,7 @@
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;
@@ -32,8 +33,11 @@ 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") {
handle_urgent_window(data);
}
if (is_workspace_event(event) || event == "focusedmon" ||
event == "monitoradded" || event == "monitorremoved") {
refresh_monitors();
@@ -326,4 +330,58 @@ HyprlandService::getMonitorByIndex(std::size_t index) const {
auto it = monitors.begin();
std::advance(it, static_cast<long>(index));
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);
}
}
}

16
src/widgets/date.cpp Normal file
View File

@@ -0,0 +1,16 @@
#include "widgets/date.hpp"
#include <chrono>
#include <iomanip>
bool Date::onUpdate() {
auto now =
std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
std::stringstream ss;
ss << std::put_time(std::localtime(&now), "%a, %d.%m.%Y");
set_text(ss.str());
return true;
}

View File

@@ -31,7 +31,7 @@ WorkspaceIndicator::~WorkspaceIndicator() {
}
void WorkspaceIndicator::on_workspace_update(int monitorId) {
if (monitorId != monitorId && monitorId != -1) {
if (this->monitorId != monitorId && monitorId != -1) {
return;
}
@@ -81,13 +81,13 @@ void WorkspaceIndicator::rebuild() {
label->add_controller(gesture);
if (state != nullptr) {
if (state->focused) {
label->add_css_class("workspace-pill-focused");
} else if (state->active) {
label->add_css_class("workspace-pill-active");
}
if (state->urgent) {
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");
}
}