pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27ea9773c6
polybar-dwm/include/modules/dwm.hpp

88 lines
2.8 KiB
C++
Raw Normal View History

Add dwm module The module is currently working, but not fully stable. All tags specified in config.cmake for internal/dwm are supported. This was implemented following the i3 and bspwm modules. There is still some cleaning/refactoring to do to polish the module up.
2020-07-17 04:35:15 +00:00
#pragma once
#include <dwmipcpp/connection.hpp>
#include "modules/meta/event_module.hpp"
#include "modules/meta/input_handler.hpp"
POLYBAR_NS
namespace modules {
class dwm_module : public event_module<dwm_module>, public input_handler {
public:
explicit dwm_module(const bar_settings&, string);
using tag_mask_t = unsigned int;
dwm: Use type aliases for bit mask and window id Do this for consistency and to avoid potential bugs by using the incorrect type.
2020-07-20 04:45:12 +00:00
using window_t = unsigned int;
Add dwm module The module is currently working, but not fully stable. All tags specified in config.cmake for internal/dwm are supported. This was implemented following the i3 and bspwm modules. There is still some cleaning/refactoring to do to polish the module up.
2020-07-17 04:35:15 +00:00
enum class state_t : uint8_t {
FOCUSED, ///< Monitor is selected and tag is selected, overrides all below
URGENT, ///< Tag is urgent, overrides all below
UNFOCUSED, ///< Monitor is not selected, but tag is selected
VISIBLE, ///< Tag is not selected, but occupied
dwm: Replace pin-tags with label-empty If pin-tags is set, there is no format defined for tags that are not occupied. However defining a format for unoccupied tags makes the pin-tags setting redundant since then the label can just be set to empty to not show unoccupied tags. Following the above reasoning, the pin tags setting is removed, and state_t::NONE is renamed to state_t::EMPTY. This way if a user wants to display empty tags, they can specify the format, otherwise they can simply set the label to an empty string.
2020-07-20 04:29:43 +00:00
EMPTY ///< Tag is unoccupied and unselected
Add dwm module The module is currently working, but not fully stable. All tags specified in config.cmake for internal/dwm are supported. This was implemented following the i3 and bspwm modules. There is still some cleaning/refactoring to do to polish the module up.
2020-07-17 04:35:15 +00:00
};
struct tag_t {
dwm: Use type aliases for bit mask and window id Do this for consistency and to avoid potential bugs by using the incorrect type.
2020-07-20 04:45:12 +00:00
tag_t(string& name, tag_mask_t bit_mask, state_t state, label_t&& label)
Add dwm module The module is currently working, but not fully stable. All tags specified in config.cmake for internal/dwm are supported. This was implemented following the i3 and bspwm modules. There is still some cleaning/refactoring to do to polish the module up.
2020-07-17 04:35:15 +00:00
: name(name), bit_mask(bit_mask), state(state), label(forward<label_t>(label)) {}
string name;
dwm: Use type aliases for bit mask and window id Do this for consistency and to avoid potential bugs by using the incorrect type.
2020-07-20 04:45:12 +00:00
tag_mask_t bit_mask;
Add dwm module The module is currently working, but not fully stable. All tags specified in config.cmake for internal/dwm are supported. This was implemented following the i3 and bspwm modules. There is still some cleaning/refactoring to do to polish the module up.
2020-07-17 04:35:15 +00:00
state_t state;
label_t label;
};
auto stop() -> void override;
auto has_event() -> bool;
auto update() -> bool;
auto build(builder* builder, const string& tag) const -> bool;
protected:
auto input(string&& cmd) -> bool override;
private:
static constexpr const char* DEFAULT_FORMAT_TAGS{"<label-state> <label-layout> <label-title>"};
dwm: Rename DEFAULT_TAG_LABEL to ..._STATE_LABEL State makes more sense than tag.
2020-07-20 04:27:46 +00:00
static constexpr const char* DEFAULT_STATE_LABEL{"%name%"};
Add dwm module The module is currently working, but not fully stable. All tags specified in config.cmake for internal/dwm are supported. This was implemented following the i3 and bspwm modules. There is still some cleaning/refactoring to do to polish the module up.
2020-07-17 04:35:15 +00:00
static constexpr const char* TAG_LABEL_STATE{"<label-state>"};
static constexpr const char* TAG_LABEL_LAYOUT{"<label-layout>"};
static constexpr const char* TAG_LABEL_TITLE{"<label-title>"};
dwm: Reorganize module Remove EVENT_SCROLL_{UP_DOWN} since it is not being used. Change EVENT_PREFIX to include dash and event names to be just the name without the prefix, for simplified parsing. Use check_send_cmd function to parse the cmd, using the event name as the IPC command name, and the section after the event name to be the argument. The format of a cmd would be "dwm-<event name>-<arg>", so the cmd can easily be translated into an IPC command. Call member functions for all dwmipc events for better organization and to avoid cluttering the constructor. The dwmipc event functions are now just assigned to a lambda that calls a member function. Add update_tag_labels function for updating the tag labels based on their state since this code is repetetive. Add update_title_labels function since that code is also somewhat repetetive. Move reconnect code to reconnect_dwm for better organization. Use pointers to m_monitors array elements instead of holding onto indices, since most of the time, a member of the Monitor element will need to be accessed. These variables should always hold a valid address starting in the constructor, so checks for nullptr should not be necessary. A monitor will always be active and the bar will always be mapped onto a monitor. Add some comments where needed. Reorganize the constructor into a more logical format Only subscribe to events if their labels are included in the default format. Follow clang-tidy warnings and use trailing return types. Move m_ipc->get_monitors to update_monitor_ref since in most cases where the monitor references would need to be updated using geometry, m_ipc->get_monitors would need to be called.
2020-07-20 02:52:50 +00:00
static constexpr const char* EVENT_PREFIX{"dwm-"};
static constexpr const char* EVENT_LCLICK{"view"};
static constexpr const char* EVENT_RCLICK{"toggleview"};
void on_layout_change(const dwmipc::LayoutChangeEvent& ev);
void on_monitor_focus_change(const dwmipc::MonitorFocusChangeEvent& ev);
void on_tag_change(const dwmipc::TagChangeEvent& ev);
void on_client_focus_change(const dwmipc::ClientFocusChangeEvent& ev);
void on_focused_title_change(const dwmipc::FocusedTitleChangeEvent& ev);
Add dwm module The module is currently working, but not fully stable. All tags specified in config.cmake for internal/dwm are supported. This was implemented following the i3 and bspwm modules. There is still some cleaning/refactoring to do to polish the module up.
2020-07-17 04:35:15 +00:00
void update_monitor_ref();
dwm: Reorganize module Remove EVENT_SCROLL_{UP_DOWN} since it is not being used. Change EVENT_PREFIX to include dash and event names to be just the name without the prefix, for simplified parsing. Use check_send_cmd function to parse the cmd, using the event name as the IPC command name, and the section after the event name to be the argument. The format of a cmd would be "dwm-<event name>-<arg>", so the cmd can easily be translated into an IPC command. Call member functions for all dwmipc events for better organization and to avoid cluttering the constructor. The dwmipc event functions are now just assigned to a lambda that calls a member function. Add update_tag_labels function for updating the tag labels based on their state since this code is repetetive. Add update_title_labels function since that code is also somewhat repetetive. Move reconnect code to reconnect_dwm for better organization. Use pointers to m_monitors array elements instead of holding onto indices, since most of the time, a member of the Monitor element will need to be accessed. These variables should always hold a valid address starting in the constructor, so checks for nullptr should not be necessary. A monitor will always be active and the bar will always be mapped onto a monitor. Add some comments where needed. Reorganize the constructor into a more logical format Only subscribe to events if their labels are included in the default format. Follow clang-tidy warnings and use trailing return types. Move m_ipc->get_monitors to update_monitor_ref since in most cases where the monitor references would need to be updated using geometry, m_ipc->get_monitors would need to be called.
2020-07-20 02:52:50 +00:00
void update_tag_labels();
dwm: Use type aliases for bit mask and window id Do this for consistency and to avoid potential bugs by using the incorrect type.
2020-07-20 04:45:12 +00:00
void update_title_label(window_t client_id);
dwm: Reorganize module Remove EVENT_SCROLL_{UP_DOWN} since it is not being used. Change EVENT_PREFIX to include dash and event names to be just the name without the prefix, for simplified parsing. Use check_send_cmd function to parse the cmd, using the event name as the IPC command name, and the section after the event name to be the argument. The format of a cmd would be "dwm-<event name>-<arg>", so the cmd can easily be translated into an IPC command. Call member functions for all dwmipc events for better organization and to avoid cluttering the constructor. The dwmipc event functions are now just assigned to a lambda that calls a member function. Add update_tag_labels function for updating the tag labels based on their state since this code is repetetive. Add update_title_labels function since that code is also somewhat repetetive. Move reconnect code to reconnect_dwm for better organization. Use pointers to m_monitors array elements instead of holding onto indices, since most of the time, a member of the Monitor element will need to be accessed. These variables should always hold a valid address starting in the constructor, so checks for nullptr should not be necessary. A monitor will always be active and the bar will always be mapped onto a monitor. Add some comments where needed. Reorganize the constructor into a more logical format Only subscribe to events if their labels are included in the default format. Follow clang-tidy warnings and use trailing return types. Move m_ipc->get_monitors to update_monitor_ref since in most cases where the monitor references would need to be updated using geometry, m_ipc->get_monitors would need to be called.
2020-07-20 02:52:50 +00:00
auto get_state(tag_mask_t bit_mask) const -> state_t;
dwm: Fix input handling The command strings were not updated since the event variable formats changed. Also, the EVENT_PREFIX already contained a dash, so an extra character would be erased when adding 1. Don't move the cmd string into the check_send_cmd function since if the first event doesn't match, the cmd string would have been modified when passed to the function again to check if the second event matches.
2020-07-20 04:13:10 +00:00
auto check_send_cmd(string cmd, const string& ev_name) -> bool;
dwm: Reorganize module Remove EVENT_SCROLL_{UP_DOWN} since it is not being used. Change EVENT_PREFIX to include dash and event names to be just the name without the prefix, for simplified parsing. Use check_send_cmd function to parse the cmd, using the event name as the IPC command name, and the section after the event name to be the argument. The format of a cmd would be "dwm-<event name>-<arg>", so the cmd can easily be translated into an IPC command. Call member functions for all dwmipc events for better organization and to avoid cluttering the constructor. The dwmipc event functions are now just assigned to a lambda that calls a member function. Add update_tag_labels function for updating the tag labels based on their state since this code is repetetive. Add update_title_labels function since that code is also somewhat repetetive. Move reconnect code to reconnect_dwm for better organization. Use pointers to m_monitors array elements instead of holding onto indices, since most of the time, a member of the Monitor element will need to be accessed. These variables should always hold a valid address starting in the constructor, so checks for nullptr should not be necessary. A monitor will always be active and the bar will always be mapped onto a monitor. Add some comments where needed. Reorganize the constructor into a more logical format Only subscribe to events if their labels are included in the default format. Follow clang-tidy warnings and use trailing return types. Move m_ipc->get_monitors to update_monitor_ref since in most cases where the monitor references would need to be updated using geometry, m_ipc->get_monitors would need to be called.
2020-07-20 02:52:50 +00:00
auto reconnect_dwm() -> bool;
Add dwm module The module is currently working, but not fully stable. All tags specified in config.cmake for internal/dwm are supported. This was implemented following the i3 and bspwm modules. There is still some cleaning/refactoring to do to polish the module up.
2020-07-17 04:35:15 +00:00
bool m_click{true};
dwm: Reorganize module Remove EVENT_SCROLL_{UP_DOWN} since it is not being used. Change EVENT_PREFIX to include dash and event names to be just the name without the prefix, for simplified parsing. Use check_send_cmd function to parse the cmd, using the event name as the IPC command name, and the section after the event name to be the argument. The format of a cmd would be "dwm-<event name>-<arg>", so the cmd can easily be translated into an IPC command. Call member functions for all dwmipc events for better organization and to avoid cluttering the constructor. The dwmipc event functions are now just assigned to a lambda that calls a member function. Add update_tag_labels function for updating the tag labels based on their state since this code is repetetive. Add update_title_labels function since that code is also somewhat repetetive. Move reconnect code to reconnect_dwm for better organization. Use pointers to m_monitors array elements instead of holding onto indices, since most of the time, a member of the Monitor element will need to be accessed. These variables should always hold a valid address starting in the constructor, so checks for nullptr should not be necessary. A monitor will always be active and the bar will always be mapped onto a monitor. Add some comments where needed. Reorganize the constructor into a more logical format Only subscribe to events if their labels are included in the default format. Follow clang-tidy warnings and use trailing return types. Move m_ipc->get_monitors to update_monitor_ref since in most cases where the monitor references would need to be updated using geometry, m_ipc->get_monitors would need to be called.
2020-07-20 02:52:50 +00:00
const dwmipc::Monitor* m_active_mon = nullptr;
const dwmipc::Monitor* m_bar_mon = nullptr;
dwm: Use type aliases for bit mask and window id Do this for consistency and to avoid potential bugs by using the incorrect type.
2020-07-20 04:45:12 +00:00
window_t m_focused_client_id = 0;
dwm: Reorganize module Remove EVENT_SCROLL_{UP_DOWN} since it is not being used. Change EVENT_PREFIX to include dash and event names to be just the name without the prefix, for simplified parsing. Use check_send_cmd function to parse the cmd, using the event name as the IPC command name, and the section after the event name to be the argument. The format of a cmd would be "dwm-<event name>-<arg>", so the cmd can easily be translated into an IPC command. Call member functions for all dwmipc events for better organization and to avoid cluttering the constructor. The dwmipc event functions are now just assigned to a lambda that calls a member function. Add update_tag_labels function for updating the tag labels based on their state since this code is repetetive. Add update_title_labels function since that code is also somewhat repetetive. Move reconnect code to reconnect_dwm for better organization. Use pointers to m_monitors array elements instead of holding onto indices, since most of the time, a member of the Monitor element will need to be accessed. These variables should always hold a valid address starting in the constructor, so checks for nullptr should not be necessary. A monitor will always be active and the bar will always be mapped onto a monitor. Add some comments where needed. Reorganize the constructor into a more logical format Only subscribe to events if their labels are included in the default format. Follow clang-tidy warnings and use trailing return types. Move m_ipc->get_monitors to update_monitor_ref since in most cases where the monitor references would need to be updated using geometry, m_ipc->get_monitors would need to be called.
2020-07-20 02:52:50 +00:00
Add dwm module The module is currently working, but not fully stable. All tags specified in config.cmake for internal/dwm are supported. This was implemented following the i3 and bspwm modules. There is still some cleaning/refactoring to do to polish the module up.
2020-07-17 04:35:15 +00:00
label_t m_layout_label;
label_t m_seperator_label;
label_t m_title_label;
dwm: Reorganize module Remove EVENT_SCROLL_{UP_DOWN} since it is not being used. Change EVENT_PREFIX to include dash and event names to be just the name without the prefix, for simplified parsing. Use check_send_cmd function to parse the cmd, using the event name as the IPC command name, and the section after the event name to be the argument. The format of a cmd would be "dwm-<event name>-<arg>", so the cmd can easily be translated into an IPC command. Call member functions for all dwmipc events for better organization and to avoid cluttering the constructor. The dwmipc event functions are now just assigned to a lambda that calls a member function. Add update_tag_labels function for updating the tag labels based on their state since this code is repetetive. Add update_title_labels function since that code is also somewhat repetetive. Move reconnect code to reconnect_dwm for better organization. Use pointers to m_monitors array elements instead of holding onto indices, since most of the time, a member of the Monitor element will need to be accessed. These variables should always hold a valid address starting in the constructor, so checks for nullptr should not be necessary. A monitor will always be active and the bar will always be mapped onto a monitor. Add some comments where needed. Reorganize the constructor into a more logical format Only subscribe to events if their labels are included in the default format. Follow clang-tidy warnings and use trailing return types. Move m_ipc->get_monitors to update_monitor_ref since in most cases where the monitor references would need to be updated using geometry, m_ipc->get_monitors would need to be called.
2020-07-20 02:52:50 +00:00
unique_ptr<dwmipc::Connection> m_ipc;
Add dwm module The module is currently working, but not fully stable. All tags specified in config.cmake for internal/dwm are supported. This was implemented following the i3 and bspwm modules. There is still some cleaning/refactoring to do to polish the module up.
2020-07-17 04:35:15 +00:00
shared_ptr<std::vector<dwmipc::Monitor>> m_monitors;
std::unordered_map<state_t, label_t> m_state_labels;
vector<tag_t> m_tags;
};
} // namespace modules
POLYBAR_NS_END
Reference in New Issue Copy Permalink