RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: lint 

chore: swap push_back to emplace_back
pull/2578/head
Brenno Lemos 2023-10-16 19:14:50 -03:00
parent 67c0c9a66c
commit e70a67d958
2 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,8 @@ class Workspaces;
class CreateWindow { class CreateWindow {
public: public:
CreateWindow(std::string workspace_name, WindowAddress window_address, std::string window_repr); CreateWindow(std::string workspace_name, WindowAddress window_address, std::string window_repr);
CreateWindow(std::string workspace_name, WindowAddress window_address, std::string window_class, std::string window_title); CreateWindow(std::string workspace_name, WindowAddress window_address, std::string window_class,
std::string window_title);
CreateWindow(Json::Value& client_data); CreateWindow(Json::Value& client_data);
int increment_time_spent_uncreated(); int increment_time_spent_uncreated();
@ -41,7 +42,6 @@ class CreateWindow {
WindowAddress addr() const { return window_address_; } WindowAddress addr() const { return window_address_; }
private: private:
void clear_addr(); void clear_addr();
using Repr = std::string; using Repr = std::string;
@ -52,7 +52,6 @@ class CreateWindow {
WindowAddress window_address_; WindowAddress window_address_;
std::string workspace_name_; std::string workspace_name_;
int time_spent_uncreated_ = 0; int time_spent_uncreated_ = 0;
}; };
class Workspace { class Workspace {

44
src/modules/hyprland/workspaces.cpp
View File

@ -320,8 +320,7 @@ void Workspaces::onEvent(const std::string &ev) {
}); });
if (!client->empty()) { if (!client->empty()) {
(*window_workspace) (*window_workspace)->insert_window({*client});
->insert_window({*client});
} }
} }
} }
@ -346,7 +345,8 @@ void Workspaces::on_window_opened(std::string payload) {
std::string window_title = payload.substr(next_comma_idx + 1, payload.length() - next_comma_idx); std::string window_title = payload.substr(next_comma_idx + 1, payload.length() - next_comma_idx);
windows_to_create_.push_back({workspace_name, window_address, window_class, window_title}); windows_to_create_.emplace_back(
CreateWindow(workspace_name, window_address, window_class, window_title));
} }
void Workspaces::on_window_closed(std::string addr) { void Workspaces::on_window_closed(std::string addr) {
@ -379,7 +379,7 @@ void Workspaces::on_window_moved(std::string payload) {
} }
// ...and add it to the new workspace // ...and add it to the new workspace
windows_to_create_.push_back({workspace_name, window_address, window_repr}); windows_to_create_.emplace_back(CreateWindow(workspace_name, window_address, window_repr));
} }
void Workspaces::update_window_count() { void Workspaces::update_window_count() {
@ -854,28 +854,28 @@ std::string Workspaces::get_rewrite(std::string window_class, std::string window
return window_rewrite_rules_.get(window_repr_key); return window_rewrite_rules_.get(window_repr_key);
} }
CreateWindow::CreateWindow(std::string workspace_name, WindowAddress window_address, std::string window_repr) CreateWindow::CreateWindow(std::string workspace_name, WindowAddress window_address,
: window_(window_repr), std::string window_repr)
window_address_(window_address), : window_(window_repr), window_address_(window_address), workspace_name_(workspace_name) {
workspace_name_(workspace_name) { clear_addr();
clear_addr();
} }
CreateWindow::CreateWindow(std::string workspace_name, WindowAddress window_address, std::string window_class, std::string window_title) CreateWindow::CreateWindow(std::string workspace_name, WindowAddress window_address,
: window_(std::make_pair(window_class, window_title)), std::string window_class, std::string window_title)
window_address_(window_address), : window_(std::make_pair(window_class, window_title)),
workspace_name_(workspace_name) { window_address_(window_address),
clear_addr(); workspace_name_(workspace_name) {
clear_addr();
} }
CreateWindow::CreateWindow(Json::Value& client_data) { CreateWindow::CreateWindow(Json::Value &client_data) {
window_address_ = client_data["address"].asString(); window_address_ = client_data["address"].asString();
workspace_name_ = client_data["workspace"]["name"].asString(); workspace_name_ = client_data["workspace"]["name"].asString();
window_ = std::make_pair(client_data["class"].asString(), client_data["title"].asString()); window_ = std::make_pair(client_data["class"].asString(), client_data["title"].asString());
clear_addr(); clear_addr();
} }
std::string CreateWindow::repr(Workspaces& workspace_manager) { std::string CreateWindow::repr(Workspaces &workspace_manager) {
if (std::holds_alternative<Repr>(window_)) { if (std::holds_alternative<Repr>(window_)) {
return std::get<Repr>(window_); return std::get<Repr>(window_);
} else if (std::holds_alternative<ClassAndTitle>(window_)) { } else if (std::holds_alternative<ClassAndTitle>(window_)) {
@ -887,24 +887,20 @@ std::string CreateWindow::repr(Workspaces& workspace_manager) {
} }
} }
bool CreateWindow::is_empty(Workspaces& workspace_manager) { bool CreateWindow::is_empty(Workspaces &workspace_manager) {
if (std::holds_alternative<Repr>(window_)) { if (std::holds_alternative<Repr>(window_)) {
return std::get<Repr>(window_).empty(); return std::get<Repr>(window_).empty();
} else if (std::holds_alternative<ClassAndTitle>(window_)) { } else if (std::holds_alternative<ClassAndTitle>(window_)) {
auto [window_class, window_title] = std::get<ClassAndTitle>(window_); auto [window_class, window_title] = std::get<ClassAndTitle>(window_);
return ( return (window_class.empty() &&
window_class.empty() && (!workspace_manager.window_rewrite_config_uses_title() || window_title.empty()));
(!workspace_manager.window_rewrite_config_uses_title() || window_title.empty())
);
} else { } else {
// Unreachable // Unreachable
return true; return true;
} }
} }
int CreateWindow::increment_time_spent_uncreated() { int CreateWindow::increment_time_spent_uncreated() { return time_spent_uncreated_++; }
return time_spent_uncreated_++;
}
void CreateWindow::clear_addr() { void CreateWindow::clear_addr() {
// substr(2, ...) is necessary because Hyprland's JSON follows this format: // substr(2, ...) is necessary because Hyprland's JSON follows this format: