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

Merge pull request #2720 from zjeffer/master 

Applied clang-tidy suggestions for hyprland workspaces
This commit is contained in:
Alexis Rouillard 2023-12-07 08:34:19 +01:00 committed by GitHub
parent 77ebc45336 4d5b715dc4
commit dc208b66b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 545 additions and 547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-tidy
View File

@ -26,3 +26,4 @@ CheckOptions:
- { key: readability-identifier-naming.EnumCase, value: CamelCase } - { key: readability-identifier-naming.EnumCase, value: CamelCase }
- { key: readability-identifier-naming.EnumConstantCase, value: UPPER_CASE } - { key: readability-identifier-naming.EnumConstantCase, value: UPPER_CASE }
- { key: readability-identifier-naming.GlobalConstantCase, value: UPPER_CASE } - { key: readability-identifier-naming.GlobalConstantCase, value: UPPER_CASE }
- { key: readability-identifier-naming.StaticConstantCase, value: UPPER_CASE }

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

@ -34,82 +34,82 @@ class WindowCreationPayload {
std::string window_class, std::string window_title); std::string window_class, std::string window_title);
WindowCreationPayload(Json::Value const& client_data); WindowCreationPayload(Json::Value const& client_data);
int increment_time_spent_uncreated(); int incrementTimeSpentUncreated();
bool is_empty(Workspaces& workspace_manager); bool isEmpty(Workspaces& workspace_manager);
bool repr_is_ready() const { return std::holds_alternative<Repr>(window_); } bool reprIsReady() const { return std::holds_alternative<Repr>(m_window); }
std::string repr(Workspaces& workspace_manager); std::string repr(Workspaces& workspace_manager);
std::string workspace_name() const { return workspace_name_; } std::string getWorkspaceName() const { return m_workspaceName; }
WindowAddress addr() const { return window_address_; } WindowAddress getAddress() const { return m_windowAddress; }
void move_to_worksace(std::string& new_workspace_name); void moveToWorksace(std::string& new_workspace_name);
private: private:
void clear_addr(); void clearAddr();
void clear_workspace_name(); void clearWorkspaceName();
using Repr = std::string; using Repr = std::string;
using ClassAndTitle = std::pair<std::string, std::string>; using ClassAndTitle = std::pair<std::string, std::string>;
std::variant<Repr, ClassAndTitle> window_; std::variant<Repr, ClassAndTitle> m_window;
WindowAddress window_address_; WindowAddress m_windowAddress;
std::string workspace_name_; std::string m_workspaceName;
int time_spent_uncreated_ = 0; int m_timeSpentUncreated = 0;
}; };
class Workspace { class Workspace {
public: public:
explicit Workspace(const Json::Value& workspace_data, Workspaces& workspace_manager, explicit Workspace(const Json::Value& workspace_data, Workspaces& workspace_manager,
const Json::Value& clients_data = Json::Value::nullRef); const Json::Value& clients_data = Json::Value::nullRef);
std::string& select_icon(std::map<std::string, std::string>& icons_map); std::string& selectIcon(std::map<std::string, std::string>& icons_map);
Gtk::Button& button() { return button_; }; Gtk::Button& button() { return m_button; };
int id() const { return id_; }; int id() const { return m_id; };
std::string name() const { return name_; }; std::string name() const { return m_name; };
std::string output() const { return output_; }; std::string output() const { return m_output; };
bool active() const { return active_; }; bool isActive() const { return m_active; };
bool is_special() const { return is_special_; }; bool isSpecial() const { return m_isSpecial; };
bool is_persistent() const { return is_persistent_; }; bool isPersistent() const { return m_isPersistent; };
bool is_visible() const { return is_visible_; }; bool isVisible() const { return m_isVisible; };
bool is_empty() const { return windows_ == 0; }; bool isEmpty() const { return m_windows == 0; };
bool is_urgent() const { return is_urgent_; }; bool isUrgent() const { return m_isUrgent; };
bool handle_clicked(GdkEventButton* bt) const; bool handleClicked(GdkEventButton* bt) const;
void set_active(bool value = true) { active_ = value; }; void setActive(bool value = true) { m_active = value; };
void set_persistent(bool value = true) { is_persistent_ = value; }; void setPersistent(bool value = true) { m_isPersistent = value; };
void set_urgent(bool value = true) { is_urgent_ = value; }; void setUrgent(bool value = true) { m_isUrgent = value; };
void set_visible(bool value = true) { is_visible_ = value; }; void setVisible(bool value = true) { m_isVisible = value; };
void set_windows(uint value) { windows_ = value; }; void setWindows(uint value) { m_windows = value; };
void set_name(std::string const& value) { name_ = value; }; void setName(std::string const& value) { m_name = value; };
bool contains_window(WindowAddress const& addr) const { return window_map_.contains(addr); } bool containsWindow(WindowAddress const& addr) const { return m_windowMap.contains(addr); }
void insert_window(WindowCreationPayload create_window_paylod); void insertWindow(WindowCreationPayload create_window_paylod);
std::string remove_window(WindowAddress const& addr); std::string removeWindow(WindowAddress const& addr);
void initialize_window_map(const Json::Value& clients_data); void initializeWindowMap(const Json::Value& clients_data);
bool on_window_opened(WindowCreationPayload const& create_window_paylod); bool onWindowOpened(WindowCreationPayload const& create_window_paylod);
std::optional<std::string> close_window(WindowAddress const& addr); std::optional<std::string> closeWindow(WindowAddress const& addr);
void update(const std::string& format, const std::string& icon); void update(const std::string& format, const std::string& icon);
private: private:
Workspaces& workspace_manager_; Workspaces& m_workspaceManager;
int id_; int m_id;
std::string name_; std::string m_name;
std::string output_; std::string m_output;
uint windows_; uint m_windows;
bool active_ = false; bool m_active = false;
bool is_special_ = false; bool m_isSpecial = false;
bool is_persistent_ = false; bool m_isPersistent = false;
bool is_urgent_ = false; bool m_isUrgent = false;
bool is_visible_ = false; bool m_isVisible = false;
std::map<WindowAddress, std::string> window_map_; std::map<WindowAddress, std::string> m_windowMap;
Gtk::Button button_; Gtk::Button m_button;
Gtk::Box content_; Gtk::Box m_content;
Gtk::Label label_; Gtk::Label m_label;
}; };
class Workspaces : public AModule, public EventHandler { class Workspaces : public AModule, public EventHandler {
@ -119,85 +119,85 @@ class Workspaces : public AModule, public EventHandler {
void update() override; void update() override;
void init(); void init();
auto all_outputs() const -> bool { return all_outputs_; } auto allOutputs() const -> bool { return m_allOutputs; }
auto show_special() const -> bool { return show_special_; } auto showSpecial() const -> bool { return m_showSpecial; }
auto active_only() const -> bool { return active_only_; } auto activeOnly() const -> bool { return m_activeOnly; }
auto get_bar_output() const -> std::string { return bar_.output->name; } auto getBarOutput() const -> std::string { return m_bar.output->name; }
std::string get_rewrite(std::string window_class, std::string window_title); std::string getRewrite(std::string window_class, std::string window_title);
std::string& get_window_separator() { return format_window_separator_; } std::string& getWindowSeparator() { return m_formatWindowSeparator; }
bool is_workspace_ignored(std::string const& workspace_name); bool isWorkspaceIgnored(std::string const& workspace_name);
bool window_rewrite_config_uses_title() const { return any_window_rewrite_rule_uses_title_; } bool windowRewriteConfigUsesTitle() const { return m_anyWindowRewriteRuleUsesTitle; }
private: private:
void onEvent(const std::string& e) override; void onEvent(const std::string& e) override;
void update_window_count(); void updateWindowCount();
void sort_workspaces(); void sortWorkspaces();
void create_workspace(Json::Value const& workspace_data, void createWorkspace(Json::Value const& workspace_data,
Json::Value const& clients_data = Json::Value::nullRef); Json::Value const& clients_data = Json::Value::nullRef);
void remove_workspace(std::string const& name); void removeWorkspace(std::string const& name);
void set_urgent_workspace(std::string const& windowaddress); void setUrgentWorkspace(std::string const& windowaddress);
void parse_config(const Json::Value& config); void parseConfig(const Json::Value& config);
void register_ipc(); void registerIpc();
// workspace events // workspace events
void on_workspace_activated(std::string const& payload); void onWorkspaceActivated(std::string const& payload);
void on_workspace_destroyed(std::string const& payload); void onWorkspaceDestroyed(std::string const& payload);
void on_workspace_created(std::string const& payload); void onWorkspaceCreated(std::string const& payload);
void on_workspace_moved(std::string const& payload); void onWorkspaceMoved(std::string const& payload);
void on_workspace_renamed(std::string const& payload); void onWorkspaceRenamed(std::string const& payload);
// monitor events // monitor events
void on_monitor_focused(std::string const& payload); void onMonitorFocused(std::string const& payload);
// window events // window events
void on_window_opened(std::string const& payload); void onWindowOpened(std::string const& payload);
void on_window_closed(std::string const& payload); void onWindowClosed(std::string const& addr);
void on_window_moved(std::string const& payload); void onWindowMoved(std::string const& payload);
void on_window_title_event(std::string const& payload); void onWindowTitleEvent(std::string const& payload);
int window_rewrite_priority_function(std::string const& window_rule); int windowRewritePriorityFunction(std::string const& window_rule);
bool all_outputs_ = false; bool m_allOutputs = false;
bool show_special_ = false; bool m_showSpecial = false;
bool active_only_ = false; bool m_activeOnly = false;
enum class SORT_METHOD { ID, NAME, NUMBER, DEFAULT }; enum class SortMethod { ID, NAME, NUMBER, DEFAULT };
util::EnumParser<SORT_METHOD> enum_parser_; util::EnumParser<SortMethod> m_enumParser;
SORT_METHOD sort_by_ = SORT_METHOD::DEFAULT; SortMethod m_sortBy = SortMethod::DEFAULT;
std::map<std::string, SORT_METHOD> sort_map_ = {{"ID", SORT_METHOD::ID}, std::map<std::string, SortMethod> m_sortMap = {{"ID", SortMethod::ID},
{"NAME", SORT_METHOD::NAME}, {"NAME", SortMethod::NAME},
{"NUMBER", SORT_METHOD::NUMBER}, {"NUMBER", SortMethod::NUMBER},
{"DEFAULT", SORT_METHOD::DEFAULT}}; {"DEFAULT", SortMethod::DEFAULT}};
void fill_persistent_workspaces(); void fillPersistentWorkspaces();
void create_persistent_workspaces(); void createPersistentWorkspaces();
std::vector<std::string> persistent_workspaces_to_create_; std::vector<std::string> m_persistentWorkspacesToCreate;
bool persistent_created_ = false; bool m_persistentCreated = false;
std::string format_; std::string m_format;
std::map<std::string, std::string> icons_map_; std::map<std::string, std::string> m_iconsMap;
util::RegexCollection window_rewrite_rules_; util::RegexCollection m_windowRewriteRules;
bool any_window_rewrite_rule_uses_title_ = false; bool m_anyWindowRewriteRuleUsesTitle = false;
std::string format_window_separator_; std::string m_formatWindowSeparator;
bool with_icon_; bool m_withIcon;
uint64_t monitor_id_; uint64_t m_monitorId;
std::string active_workspace_name_; std::string m_activeWorkspaceName;
std::vector<std::unique_ptr<Workspace>> workspaces_; std::vector<std::unique_ptr<Workspace>> m_workspaces;
std::vector<Json::Value> workspaces_to_create_; std::vector<Json::Value> m_workspacesToCreate;
std::vector<std::string> workspaces_to_remove_; std::vector<std::string> m_workspacesToRemove;
std::vector<WindowCreationPayload> windows_to_create_; std::vector<WindowCreationPayload> m_windowsToCreate;
std::vector<std::regex> ignore_workspaces_; std::vector<std::regex> m_ignoreWorkspaces;
std::mutex mutex_; std::mutex m_mutex;
const Bar& bar_; const Bar& m_bar;
Gtk::Box box_; Gtk::Box m_box;
}; };
} // namespace waybar::modules::hyprland } // namespace waybar::modules::hyprland

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

File diff suppressed because it is too large Load Diff

4
src/util/enum.cpp
View File

@ -28,7 +28,7 @@ EnumType EnumParser<EnumType>::parseStringToEnum(const std::string& str,
std::map<std::string, EnumType> capitalizedEnumMap; std::map<std::string, EnumType> capitalizedEnumMap;
std::transform( std::transform(
enumMap.begin(), enumMap.end(), std::inserter(capitalizedEnumMap, capitalizedEnumMap.end()), enumMap.begin(), enumMap.end(), std::inserter(capitalizedEnumMap, capitalizedEnumMap.end()),
[this](const auto& pair) { return std::make_pair(capitalize(pair.first), pair.second); }); [](const auto& pair) { return std::make_pair(capitalize(pair.first), pair.second); });
// Return enum match of string // Return enum match of string
auto it = capitalizedEnumMap.find(uppercaseStr); auto it = capitalizedEnumMap.find(uppercaseStr);
@ -40,6 +40,6 @@ EnumType EnumParser<EnumType>::parseStringToEnum(const std::string& str,
// Explicit instantiations for specific EnumType types you intend to use // Explicit instantiations for specific EnumType types you intend to use
// Add explicit instantiations for all relevant EnumType types // Add explicit instantiations for all relevant EnumType types
template struct EnumParser<modules::hyprland::Workspaces::SORT_METHOD>; template struct EnumParser<modules::hyprland::Workspaces::SortMethod>;
} // namespace waybar::util } // namespace waybar::util