mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
feat(sway): add focused window name
This commit is contained in:
Alexis
95
src/modules/sway/ipc/client.cpp
Normal file
95
src/modules/sway/ipc/client.cpp
Normal file
@ -0,0 +1,95 @@
|
||||
#define _POSIX_C_SOURCE 200809L
|
||||
#include <string>
|
||||
#include <stdio.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
#include "modules/sway/ipc/client.hpp"
|
||||
|
||||
static const char ipc_magic[] = {'i', '3', '-', 'i', 'p', 'c'};
|
||||
static const size_t ipc_header_size = sizeof(ipc_magic)+8;
|
||||
|
||||
std::string get_socketpath(void) {
|
||||
const char *env = getenv("SWAYSOCK");
|
||||
if (env) return std::string(env);
|
||||
std::string str;
|
||||
{
|
||||
std::string str_buf;
|
||||
FILE* in;
|
||||
char buf[512] = { 0 };
|
||||
if (!(in = popen("sway --get-socketpath 2>/dev/null", "r"))) {
|
||||
throw std::runtime_error("Failed to get socket path");
|
||||
}
|
||||
while (fgets(buf, sizeof(buf), in) != nullptr) {
|
||||
str_buf.append(buf, sizeof(buf));
|
||||
}
|
||||
pclose(in);
|
||||
str = str_buf;
|
||||
}
|
||||
if (str.back() == '\n') {
|
||||
str.pop_back();
|
||||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
int ipc_open_socket(std::string socket_path) {
|
||||
struct sockaddr_un addr;
|
||||
int socketfd;
|
||||
if ((socketfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
|
||||
throw std::runtime_error("Unable to open Unix socket");
|
||||
}
|
||||
addr.sun_family = AF_UNIX;
|
||||
strncpy(addr.sun_path, socket_path.c_str(), sizeof(addr.sun_path) - 1);
|
||||
addr.sun_path[sizeof(addr.sun_path) - 1] = 0;
|
||||
int l = sizeof(struct sockaddr_un);
|
||||
if (connect(socketfd, (struct sockaddr *)&addr, l) == -1) {
|
||||
throw std::runtime_error("Unable to connect to " + socket_path);
|
||||
}
|
||||
return socketfd;
|
||||
}
|
||||
|
||||
struct ipc_response ipc_recv_response(int socketfd) {
|
||||
struct ipc_response response;
|
||||
char data[ipc_header_size];
|
||||
uint32_t *data32 = (uint32_t *)(data + sizeof(ipc_magic));
|
||||
size_t total = 0;
|
||||
|
||||
while (total < ipc_header_size) {
|
||||
ssize_t received = recv(socketfd, data + total, ipc_header_size - total, 0);
|
||||
if (received <= 0) {
|
||||
throw std::runtime_error("Unable to receive IPC response");
|
||||
}
|
||||
total += received;
|
||||
}
|
||||
|
||||
total = 0;
|
||||
response.size = data32[0];
|
||||
response.type = data32[1];
|
||||
char payload[response.size + 1];
|
||||
|
||||
while (total < response.size) {
|
||||
ssize_t received = recv(socketfd, payload + total, response.size - total, 0);
|
||||
if (received < 0) {
|
||||
throw std::runtime_error("Unable to receive IPC response");
|
||||
}
|
||||
total += received;
|
||||
}
|
||||
payload[response.size] = '\0';
|
||||
response.payload = std::string(payload);
|
||||
return response;
|
||||
}
|
||||
|
||||
std::string ipc_single_command(int socketfd, uint32_t type, const char *payload, uint32_t *len) {
|
||||
char data[ipc_header_size];
|
||||
uint32_t *data32 = (uint32_t *)(data + sizeof(ipc_magic));
|
||||
memcpy(data, ipc_magic, sizeof(ipc_magic));
|
||||
data32[0] = *len;
|
||||
data32[1] = type;
|
||||
|
||||
if (send(socketfd, data, ipc_header_size, 0) == -1)
|
||||
throw std::runtime_error("Unable to send IPC header");
|
||||
if (send(socketfd, payload, *len, 0) == -1)
|
||||
throw std::runtime_error("Unable to send IPC payload");
|
||||
struct ipc_response resp = ipc_recv_response(socketfd);
|
||||
*len = resp.size;
|
||||
return resp.payload;
|
||||
}
|
||||
66
src/modules/sway/window.cpp
Normal file
66
src/modules/sway/window.cpp
Normal file
@ -0,0 +1,66 @@
|
||||
#include "modules/sway/window.hpp"
|
||||
#include "modules/sway/ipc/client.hpp"
|
||||
|
||||
waybar::modules::sway::Window::Window(Bar &bar, Json::Value config)
|
||||
: _bar(bar), _config(config)
|
||||
{
|
||||
_label.set_name("window");
|
||||
std::string socketPath = get_socketpath();
|
||||
_ipcfd = ipc_open_socket(socketPath);
|
||||
_ipcEventfd = ipc_open_socket(socketPath);
|
||||
const char *subscribe = "[ \"window\" ]";
|
||||
uint32_t len = strlen(subscribe);
|
||||
ipc_single_command(_ipcEventfd, IPC_SUBSCRIBE, subscribe, &len);
|
||||
_getFocusedWindow();
|
||||
_thread = [this] {
|
||||
try {
|
||||
if (_bar.outputName.empty()) {
|
||||
// Wait for the name of the output
|
||||
while (_bar.outputName.empty())
|
||||
_thread.sleep_for(chrono::milliseconds(150));
|
||||
}
|
||||
auto res = ipc_recv_response(_ipcEventfd);
|
||||
auto parsed = _parser.parse(res.payload);
|
||||
if (parsed["change"] != "focus")
|
||||
return;
|
||||
_window = parsed["container"]["name"].asString();
|
||||
Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Window::update));
|
||||
} catch (const std::exception& e) {
|
||||
std::cerr << e.what() << std::endl;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
auto waybar::modules::sway::Window::update() -> void
|
||||
{
|
||||
_label.set_text(_window);
|
||||
}
|
||||
|
||||
std::string waybar::modules::sway::Window::_getFocusedNode(Json::Value nodes)
|
||||
{
|
||||
for (auto &node : nodes) {
|
||||
if (node["focused"].asBool())
|
||||
return node["name"].asString();
|
||||
auto res = _getFocusedNode(node["nodes"]);
|
||||
if (!res.empty())
|
||||
return res;
|
||||
}
|
||||
return std::string();
|
||||
}
|
||||
|
||||
void waybar::modules::sway::Window::_getFocusedWindow()
|
||||
{
|
||||
try {
|
||||
uint32_t len = 0;
|
||||
auto res = ipc_single_command(_ipcfd, IPC_GET_TREE, nullptr, &len);
|
||||
auto parsed = _parser.parse(res);
|
||||
_window = _getFocusedNode(parsed["nodes"]);
|
||||
Glib::signal_idle().connect_once(sigc::mem_fun(*this, &Window::update));
|
||||
} catch (const std::exception &e) {
|
||||
std::cerr << e.what() << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
waybar::modules::sway::Window::operator Gtk::Widget &() {
|
||||
return _label;
|
||||
}
|
||||
187
src/modules/sway/workspaces.cpp
Normal file
187
src/modules/sway/workspaces.cpp
Normal file
@ -0,0 +1,187 @@
|
||||
#include "modules/sway/workspaces.hpp"
|
||||
#include "modules/sway/ipc/client.hpp"
|
||||
|
||||
waybar::modules::sway::Workspaces::Workspaces(Bar &bar, Json::Value config)
|
||||
: _bar(bar), _config(config), _scrolling(false)
|
||||
{
|
||||
_box.set_name("workspaces");
|
||||
std::string socketPath = get_socketpath();
|
||||
_ipcfd = ipc_open_socket(socketPath);
|
||||
_ipcEventfd = ipc_open_socket(socketPath);
|
||||
const char *subscribe = "[ \"workspace\" ]";
|
||||
uint32_t len = strlen(subscribe);
|
||||
ipc_single_command(_ipcEventfd, IPC_SUBSCRIBE, subscribe, &len);
|
||||
_thread = [this] {
|
||||
try {
|
||||
if (_bar.outputName.empty()) {
|
||||
// Wait for the name of the output
|
||||
while (_bar.outputName.empty())
|
||||
_thread.sleep_for(chrono::milliseconds(150));
|
||||
} else
|
||||
ipc_recv_response(_ipcEventfd);
|
||||
uint32_t len = 0;
|
||||
std::lock_guard<std::mutex> lock(_mutex);
|
||||
auto str = ipc_single_command(_ipcfd, IPC_GET_WORKSPACES, nullptr, &len);
|
||||
_workspaces = _parser.parse(str);
|
||||
Glib::signal_idle()
|
||||
.connect_once(sigc::mem_fun(*this, &Workspaces::update));
|
||||
} catch (const std::exception& e) {
|
||||
std::cerr << e.what() << std::endl;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
auto waybar::modules::sway::Workspaces::update() -> void
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(_mutex);
|
||||
bool needReorder = false;
|
||||
for (auto it = _buttons.begin(); it != _buttons.end();) {
|
||||
auto ws = std::find_if(_workspaces.begin(), _workspaces.end(),
|
||||
[it](auto node) -> bool { return node["num"].asInt() == it->first; });
|
||||
if (ws == _workspaces.end()) {
|
||||
it = _buttons.erase(it);
|
||||
needReorder = true;
|
||||
} else
|
||||
++it;
|
||||
}
|
||||
for (auto node : _workspaces) {
|
||||
if (_bar.outputName != node["output"].asString())
|
||||
continue;
|
||||
auto it = _buttons.find(node["num"].asInt());
|
||||
if (it == _buttons.end()) {
|
||||
_addWorkspace(node);
|
||||
needReorder = true;
|
||||
} else {
|
||||
auto &button = it->second;
|
||||
if (node["focused"].asBool())
|
||||
button.get_style_context()->add_class("focused");
|
||||
else
|
||||
button.get_style_context()->remove_class("focused");
|
||||
if (node["visible"].asBool())
|
||||
button.get_style_context()->add_class("visible");
|
||||
else
|
||||
button.get_style_context()->remove_class("visible");
|
||||
if (node["urgent"].asBool())
|
||||
button.get_style_context()->add_class("urgent");
|
||||
else
|
||||
button.get_style_context()->remove_class("urgent");
|
||||
if (needReorder)
|
||||
_box.reorder_child(button, node["num"].asInt());
|
||||
button.show();
|
||||
}
|
||||
}
|
||||
if (_scrolling)
|
||||
_scrolling = false;
|
||||
}
|
||||
|
||||
void waybar::modules::sway::Workspaces::_addWorkspace(Json::Value node)
|
||||
{
|
||||
auto icon = _getIcon(node["name"].asString());
|
||||
auto pair = _buttons.emplace(node["num"].asInt(), icon);
|
||||
auto &button = pair.first->second;
|
||||
if (icon != node["name"].asString())
|
||||
button.get_style_context()->add_class("icon");
|
||||
_box.pack_start(button, false, false, 0);
|
||||
button.set_relief(Gtk::RELIEF_NONE);
|
||||
button.signal_clicked().connect([this, pair] {
|
||||
try {
|
||||
std::lock_guard<std::mutex> lock(_mutex);
|
||||
auto value = fmt::format("workspace \"{}\"", pair.first->first);
|
||||
uint32_t size = value.size();
|
||||
ipc_single_command(_ipcfd, IPC_COMMAND, value.c_str(), &size);
|
||||
} catch (const std::exception& e) {
|
||||
std::cerr << e.what() << std::endl;
|
||||
}
|
||||
});
|
||||
button.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
|
||||
button.signal_scroll_event()
|
||||
.connect(sigc::mem_fun(*this, &Workspaces::_handleScroll));
|
||||
_box.reorder_child(button, node["num"].asInt());
|
||||
if (node["focused"].asBool())
|
||||
button.get_style_context()->add_class("focused");
|
||||
if (node["visible"].asBool())
|
||||
button.get_style_context()->add_class("visible");
|
||||
if (node["urgent"].asBool())
|
||||
button.get_style_context()->add_class("urgent");
|
||||
button.show();
|
||||
}
|
||||
|
||||
std::string waybar::modules::sway::Workspaces::_getIcon(std::string name)
|
||||
{
|
||||
if (_config["format-icons"][name])
|
||||
return _config["format-icons"][name].asString();
|
||||
if (_config["format-icons"]["default"])
|
||||
return _config["format-icons"]["default"].asString();
|
||||
return name;
|
||||
}
|
||||
|
||||
bool waybar::modules::sway::Workspaces::_handleScroll(GdkEventScroll *e)
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(_mutex);
|
||||
// Avoid concurrent scroll event
|
||||
if (_scrolling)
|
||||
return false;
|
||||
_scrolling = true;
|
||||
int id = -1;
|
||||
uint16_t idx = 0;
|
||||
for (; idx < _workspaces.size(); idx += 1)
|
||||
if (_workspaces[idx]["focused"].asBool()) {
|
||||
id = _workspaces[idx]["num"].asInt();
|
||||
break;
|
||||
}
|
||||
if (id == -1) {
|
||||
_scrolling = false;
|
||||
return false;
|
||||
}
|
||||
if (e->direction == GDK_SCROLL_UP)
|
||||
id = _getNextWorkspace();
|
||||
if (e->direction == GDK_SCROLL_DOWN)
|
||||
id = _getPrevWorkspace();
|
||||
if (e->direction == GDK_SCROLL_SMOOTH) {
|
||||
gdouble delta_x, delta_y;
|
||||
gdk_event_get_scroll_deltas ((const GdkEvent *) e, &delta_x, &delta_y);
|
||||
if (delta_y < 0)
|
||||
id = _getNextWorkspace();
|
||||
else if (delta_y > 0)
|
||||
id = _getPrevWorkspace();
|
||||
}
|
||||
if (id == _workspaces[idx]["num"].asInt()) {
|
||||
_scrolling = false;
|
||||
return false;
|
||||
}
|
||||
auto value = fmt::format("workspace \"{}\"", id);
|
||||
uint32_t size = value.size();
|
||||
ipc_single_command(_ipcfd, IPC_COMMAND, value.c_str(), &size);
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(150));
|
||||
return true;
|
||||
}
|
||||
|
||||
int waybar::modules::sway::Workspaces::_getPrevWorkspace()
|
||||
{
|
||||
int current = -1;
|
||||
for (uint16_t i = 0; i != _workspaces.size(); i += 1)
|
||||
if (_workspaces[i]["focused"].asBool()) {
|
||||
current = _workspaces[i]["num"].asInt();
|
||||
if (i > 0)
|
||||
return _workspaces[i - 1]["num"].asInt();
|
||||
return _workspaces[_workspaces.size() - 1]["num"].asInt();
|
||||
}
|
||||
return current;
|
||||
}
|
||||
|
||||
int waybar::modules::sway::Workspaces::_getNextWorkspace()
|
||||
{
|
||||
int current = -1;
|
||||
for (uint16_t i = 0; i != _workspaces.size(); i += 1)
|
||||
if (_workspaces[i]["focused"].asBool()) {
|
||||
current = _workspaces[i]["num"].asInt();
|
||||
if (i + 1U < _workspaces.size())
|
||||
return _workspaces[i + 1]["num"].asInt();
|
||||
return _workspaces[0]["num"].asInt();
|
||||
}
|
||||
return current;
|
||||
}
|
||||
|
||||
waybar::modules::sway::Workspaces::operator Gtk::Widget &() {
|
||||
return _box;
|
||||
}
|
||||
Reference in New Issue
Block a user