26be83f893
* module: Implement proof of concept action router Action implementation inside module becomes much cleaner because each module just registers action names together with a callback (pointer to member function) and the action router does the rest. * Make input function final This forces all modules to use the action router * modules: Catch exceptions in action handlers * Use action router for all modules * Use action_ prefix for function names The mpd module's 'stop' action overwrote the base module's stop function which caused difficult to debug behavior. To prevent this in the future we now prefix each function that is responsible for an action with 'action_' * Cleanup * actions: Throw exception when re-registering action Action names are unique inside modules. Unfortunately there is no way to ensure this statically, the next best thing is to crash the module and let the user know that this is a bug. * Formatting * actions: Ignore data for actions without data This is the same behavior as before. * action_router: Write tests
71 lines
2.1 KiB
C++
71 lines
2.1 KiB
C++
#pragma once
|
|
|
|
#include "common.hpp"
|
|
#include "components/config.hpp"
|
|
#include "components/types.hpp"
|
|
#include "modules/meta/event_handler.hpp"
|
|
#include "modules/meta/static_module.hpp"
|
|
#include "x11/extensions/xkb.hpp"
|
|
#include "x11/window.hpp"
|
|
|
|
POLYBAR_NS
|
|
|
|
class connection;
|
|
|
|
namespace modules {
|
|
/**
|
|
* Keyboard module using the X keyboard extension
|
|
*/
|
|
class xkeyboard_module
|
|
: public static_module<xkeyboard_module>,
|
|
public event_handler<evt::xkb_new_keyboard_notify, evt::xkb_state_notify, evt::xkb_indicator_state_notify> {
|
|
public:
|
|
explicit xkeyboard_module(const bar_settings& bar, string name_);
|
|
|
|
string get_output();
|
|
void update();
|
|
bool build(builder* builder, const string& tag) const;
|
|
|
|
static constexpr auto TYPE = "internal/xkeyboard";
|
|
|
|
static constexpr const char* EVENT_SWITCH = "switch";
|
|
|
|
protected:
|
|
bool query_keyboard();
|
|
bool blacklisted(const string& indicator_name);
|
|
|
|
void handle(const evt::xkb_new_keyboard_notify& evt);
|
|
void handle(const evt::xkb_state_notify& evt);
|
|
void handle(const evt::xkb_indicator_state_notify& evt);
|
|
|
|
void action_switch();
|
|
|
|
private:
|
|
static constexpr const char* TAG_LABEL_LAYOUT{"<label-layout>"};
|
|
static constexpr const char* TAG_LABEL_INDICATOR{"<label-indicator>"};
|
|
static constexpr const char* FORMAT_DEFAULT{"<label-layout> <label-indicator>"};
|
|
static constexpr const char* DEFAULT_LAYOUT_ICON{"layout-icon-default"};
|
|
static constexpr const char* DEFAULT_INDICATOR_ICON{"indicator-icon-default"};
|
|
|
|
connection& m_connection;
|
|
event_timer m_xkb_newkb_notify{};
|
|
event_timer m_xkb_state_notify{};
|
|
event_timer m_xkb_indicator_notify{};
|
|
unique_ptr<keyboard> m_keyboard;
|
|
|
|
label_t m_layout;
|
|
label_t m_indicator_state_on;
|
|
label_t m_indicator_state_off;
|
|
map<keyboard::indicator::type, label_t> m_indicators;
|
|
map<keyboard::indicator::type, label_t> m_indicator_on_labels;
|
|
map<keyboard::indicator::type, label_t> m_indicator_off_labels;
|
|
|
|
vector<string> m_blacklist;
|
|
iconset_t m_layout_icons;
|
|
iconset_t m_indicator_icons_on;
|
|
iconset_t m_indicator_icons_off;
|
|
};
|
|
} // namespace modules
|
|
|
|
POLYBAR_NS_END
|