tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(workspaces): scroll output aware

Browse Source
This commit is contained in:
Alex 2019-03-18 14:44:07 +01:00
parent 1ccf372f8e
commit 22cddc5e26
6 changed files with 46 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/modules/sway/workspaces.hpp
View File

@ -23,9 +23,8 @@ class Workspaces : public IModule {
void onButtonReady(const Json::Value&, Gtk::Button&);
std::string getIcon(const std::string&, const Json::Value&);
bool handleScroll(GdkEventScroll*);
std::string getPrevWorkspace();
std::string getNextWorkspace();
uint16_t getWorkspaceIndex(const std::string &name);
const std::string getCycleWorkspace(uint8_t current, bool prev) const;
uint16_t getWorkspaceIndex(const std::string &name) const;
std::string trimWorkspaceName(std::string);
const Bar& bar_;

1
src/bar.cpp
View File

@ -216,7 +216,6 @@ void waybar::Bar::layerSurfaceHandleClosed(void* data,
struct zwlr_layer_surface_v1* /*surface*/)
{
auto o = static_cast<waybar::Bar *>(data);
std::cout << "Bar removed from output: " + o->output_name << std::endl;
zwlr_layer_surface_v1_destroy(o->layer_surface);
wl_output_destroy(*o->output);
zxdg_output_v1_destroy(o->xdg_output_);

4
src/client.cpp
View File

@ -67,8 +67,10 @@ void waybar::Client::handleGlobalRemove(void* data,
{
auto o = static_cast<waybar::Client *>(data);
for (auto it = o->bars.begin(); it != o->bars.end(); ++it) {
if ((**it).wl_name == name) {
if ((*it)->wl_name == name) {
auto output_name = (*it)->output_name;
o->bars.erase(it);
std::cout << "Bar removed from output: " + output_name << std::endl;
break;
}
}

1
src/modules/custom.cpp
View File

@ -66,7 +66,6 @@ void waybar::modules::Custom::continuousWorker()
}
return;
}
std::string output = buff;
// Remove last newline

5
src/modules/network.cpp
View File

@ -1,5 +1,4 @@
#include <sys/eventfd.h>
#include <iostream>
#include "modules/network.hpp"
waybar::modules::Network::Network(const std::string& id, const Json::Value& config)
@ -117,9 +116,7 @@ void waybar::modules::Network::worker()
for (auto i = 0; i < ec; i++) {
if (events[i].data.fd == ev_fd_) {
thread_.stop();
return;
}
if (events[i].events & EPOLLIN) {
} else if (events[i].events & EPOLLIN) {
handleEvents();
}
}

89
src/modules/sway/workspaces.cpp
View File

@ -87,8 +87,7 @@ auto waybar::modules::sway::Workspaces::update() -> void
} else {
button.set_label(icon);
}
onButtonReady(node, button);
onButtonReady(node, button);
}
}
if (scrolling_) {
@ -117,8 +116,8 @@ void waybar::modules::sway::Workspaces::addWorkspace(const Json::Value &node)
std::cerr << e.what() << std::endl;
}
});
button.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
if (!config_["disable-scroll"].asBool()) {
button.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
button.signal_scroll_event()
.connect(sigc::mem_fun(*this, &Workspaces::handleScroll));
}
@ -158,86 +157,78 @@ bool waybar::modules::sway::Workspaces::handleScroll(GdkEventScroll *e)
if (scrolling_) {
return false;
}
std::lock_guard<std::mutex> lock(mutex_);
uint8_t idx;
scrolling_ = true;
std::string name;
uint16_t idx = 0;
{
std::lock_guard<std::mutex> lock(mutex_);
for (; idx < workspaces_.size(); idx += 1) {
if (workspaces_[idx]["focused"].asBool()) {
name = workspaces_[idx]["name"].asString();
break;
}
for (idx = 0; idx < workspaces_.size(); idx += 1) {
if (workspaces_[idx]["focused"].asBool()) {
break;
}
}
if (name.empty()) {
if (idx == workspaces_.size()) {
scrolling_ = false;
return false;
}
std::string name;
if (e->direction == GDK_SCROLL_UP) {
name = getNextWorkspace();
name = getCycleWorkspace(idx, false);
}
if (e->direction == GDK_SCROLL_DOWN) {
name = getPrevWorkspace();
name = getCycleWorkspace(idx, true);
}
if (e->direction == GDK_SCROLL_SMOOTH) {
gdouble delta_x, delta_y;
gdk_event_get_scroll_deltas(reinterpret_cast<const GdkEvent *>(e),
&delta_x, &delta_y);
if (delta_y < 0) {
name = getNextWorkspace();
name = getCycleWorkspace(idx, false);
} else if (delta_y > 0) {
name = getPrevWorkspace();
name = getCycleWorkspace(idx, true);
}
}
if (!name.empty()) {
std::lock_guard<std::mutex> lock(mutex_);
if (name == workspaces_[idx]["name"].asString()) {
scrolling_ = false;
return false;
}
ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
std::this_thread::sleep_for(std::chrono::milliseconds(150));
if (name.empty() || name == workspaces_[idx]["name"].asString()) {
scrolling_ = false;
return false;
}
ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
std::this_thread::sleep_for(std::chrono::milliseconds(150));
return true;
}
std::string waybar::modules::sway::Workspaces::getPrevWorkspace()
const std::string waybar::modules::sway::Workspaces::getCycleWorkspace(
uint8_t focused_workspace, bool prev) const
{
for (uint16_t i = 0; i < workspaces_.size(); i += 1) {
if (workspaces_[i]["focused"].asBool()) {
if (i > 0) {
return workspaces_[i - 1]["name"].asString();
}
return workspaces_[workspaces_.size() - 1]["name"].asString();
auto inc = prev ? -1 : 1;
int size = workspaces_.size();
uint8_t idx = 0;
for (int i = focused_workspace; i < size && i >= 0; i += inc) {
bool same_output = (workspaces_[i]["output"].asString() == bar_.output_name
&& !config_["all-outputs"].asBool()) || config_["all-outputs"].asBool();
bool same_name =
workspaces_[i]["name"].asString() == workspaces_[focused_workspace]["name"].asString();
if (same_output && !same_name) {
return workspaces_[i]["name"].asString();
}
if (prev && i - 1 < 0) {
i = size;
} else if (!prev && i + 1 >= size) {
i = -1;
} else if (idx >= workspaces_.size()) {
return "";
}
idx += 1;
}
return "";
}
std::string waybar::modules::sway::Workspaces::getNextWorkspace()
{
for (uint16_t i = 0; i < workspaces_.size(); i += 1) {
if (workspaces_[i]["focused"].asBool()) {
if (i + 1U < workspaces_.size()) {
return workspaces_[i + 1]["name"].asString();
}
return workspaces_[0]["String"].asString();
}
}
return "";
}
uint16_t waybar::modules::sway::Workspaces::getWorkspaceIndex(const std::string &name)
uint16_t waybar::modules::sway::Workspaces::getWorkspaceIndex(const std::string &name) const
{
uint16_t idx = 0;
for (const auto &workspace : workspaces_) {
if (workspace["name"].asString() == name) {
return idx;
}
if (!config_["all-outputs"].asBool() && workspace["output"].asString() != bar_.output_name) {
// Nothing here
} else {
if (!(!config_["all-outputs"].asBool() && workspace["output"].asString() != bar_.output_name)) {
idx += 1;
}
}