db9a83a83b
* `layout-icon-*` list that maps layouts to icons. * `indicator-icon-*` list that maps indicators to off and on icons * `label-indicator-off` * `label-indicator-on` which replaces the now deprecated `label-indicator` * `label-indicator-[on|off]-*` for each indicator. Overrides `label-indicator-on` and `label-indicator-off` Fixes #1558 Closes #1048 * add icon support for xkeyboard layouts * removed unneeded #include * add sperate %icon% token that can be used in <label-layout> * removed unneeded #include * added caps lock indicator (was mentioned in wiki, but not actually implememnted) and support for indicator icons * a few more fixes to make sure existing user configs are not broken * ready to go * Added an option to replace xkb indicator names * Added labels for each indicator state * Removed print left on accident * Fixed review comments * Update src/modules/xkeyboard.cpp Co-Authored-By: Gilnaa <gilad@naaman.io>
71 lines
2.2 KiB
C++
71 lines
2.2 KiB
C++
#pragma once
|
|
|
|
#include "common.hpp"
|
|
#include "components/config.hpp"
|
|
#include "components/types.hpp"
|
|
#include "modules/meta/event_handler.hpp"
|
|
#include "modules/meta/input_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 input_handler {
|
|
public:
|
|
explicit xkeyboard_module(const bar_settings& bar, string name_);
|
|
|
|
string get_output();
|
|
void update();
|
|
bool build(builder* builder, const string& tag) const;
|
|
|
|
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);
|
|
|
|
bool input(string&& cmd);
|
|
|
|
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"};
|
|
|
|
static constexpr const char* EVENT_SWITCH{"xkeyboard/switch"};
|
|
|
|
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;
|
|
};
|
|
}
|
|
|
|
POLYBAR_NS_END
|