Merge branch 'hyprlandLanguage' of https://github.com/vaxerski/Waybar into hyprlandLanguage
This commit is contained in:
commit
c5910ae19a
|
@ -18,6 +18,7 @@ private:
|
|||
void onEvent(const std::string&);
|
||||
|
||||
void initLanguage();
|
||||
std::string getShortFrom(const std::string&);
|
||||
|
||||
std::mutex mutex_;
|
||||
const Bar& bar_;
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
#include "modules/hyprland/language.hpp"
|
||||
|
||||
#include <spdlog/spdlog.h>
|
||||
#include <xkbcommon/xkbcommon.h>
|
||||
#include <xkbcommon/xkbregistry.h>
|
||||
|
||||
#include "modules/hyprland/backend.hpp"
|
||||
|
||||
|
@ -30,7 +32,7 @@ auto Language::update() -> void {
|
|||
|
||||
if (!format_.empty()) {
|
||||
label_.show();
|
||||
label_.set_markup(fmt::format(format_, layoutName_));
|
||||
label_.set_markup(layoutName_);
|
||||
} else {
|
||||
label_.hide();
|
||||
}
|
||||
|
@ -57,6 +59,15 @@ void Language::onEvent(const std::string& ev) {
|
|||
return str;
|
||||
};
|
||||
|
||||
const auto BRIEFNAME = getShortFrom(layoutName);
|
||||
|
||||
if (config_.isMember("format-" + BRIEFNAME)) {
|
||||
const auto PROPNAME = "format-" + BRIEFNAME;
|
||||
layoutName = fmt::format(format_, config_[PROPNAME].asString());
|
||||
} else {
|
||||
layoutName = fmt::format(format_, layoutName);
|
||||
}
|
||||
|
||||
layoutName = replaceAll(layoutName, "&", "&");
|
||||
|
||||
if (layoutName == layoutName_) return;
|
||||
|
@ -92,4 +103,30 @@ void Language::initLanguage() {
|
|||
}
|
||||
}
|
||||
|
||||
std::string Language::getShortFrom(const std::string& fullName) {
|
||||
const auto CONTEXT = rxkb_context_new(RXKB_CONTEXT_LOAD_EXOTIC_RULES);
|
||||
rxkb_context_parse_default_ruleset(CONTEXT);
|
||||
|
||||
std::string foundName = "";
|
||||
rxkb_layout* layout = rxkb_layout_first(CONTEXT);
|
||||
while (layout) {
|
||||
std::string nameOfLayout = rxkb_layout_get_description(layout);
|
||||
|
||||
if (nameOfLayout != fullName) {
|
||||
layout = rxkb_layout_next(layout);
|
||||
continue;
|
||||
}
|
||||
|
||||
std::string briefName = rxkb_layout_get_brief(layout);
|
||||
|
||||
rxkb_context_unref(CONTEXT);
|
||||
|
||||
return briefName;
|
||||
}
|
||||
|
||||
rxkb_context_unref(CONTEXT);
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
} // namespace waybar::modules::hyprland
|
Loading…
Reference in New Issue