4c71b2bf9f
- Replaced pass-by-value std::string parameters with const std::string& or std::string_view to prevent SSO overallocations. - Refactored static mapping functions in UPower to return std::string_view instead of constructing std::string literals, enabling perfect cache locality. - Optimized string concatenation in hot loops (network IPs, inhibitor lists, sway window marks) by using std::string::append() and pre-reserving capacity instead of overloaded operator+ which produces temporary heap instances. These optimizations reduce high-frequency memory churn and overall heap fragmentation within the main rendering loops. Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
69 lines
1.7 KiB
C++
69 lines
1.7 KiB
C++
#pragma once
|
|
|
|
#include <fmt/format.h>
|
|
#include <xkbcommon/xkbregistry.h>
|
|
|
|
#include <map>
|
|
#include <string>
|
|
|
|
#include "ALabel.hpp"
|
|
#include "bar.hpp"
|
|
#include "client.hpp"
|
|
#include "modules/sway/ipc/client.hpp"
|
|
#include "util/json.hpp"
|
|
|
|
namespace waybar::modules::sway {
|
|
|
|
class Language : public ALabel, public sigc::trackable {
|
|
public:
|
|
Language(const std::string& id, const Json::Value& config);
|
|
virtual ~Language() = default;
|
|
auto update() -> void override;
|
|
|
|
private:
|
|
enum class DisplayedShortFlag { None = 0, ShortName = 1, ShortDescription = 1 << 1 };
|
|
|
|
struct Layout {
|
|
std::string full_name;
|
|
std::string short_name;
|
|
std::string variant;
|
|
std::string short_description;
|
|
std::string country_flag() const;
|
|
};
|
|
|
|
class XKBContext {
|
|
public:
|
|
XKBContext();
|
|
~XKBContext();
|
|
auto next_layout() -> Layout*;
|
|
|
|
private:
|
|
rxkb_context* context_ = nullptr;
|
|
rxkb_layout* xkb_layout_ = nullptr;
|
|
Layout* layout_ = nullptr;
|
|
std::map<std::string, rxkb_layout*> base_layouts_by_name_;
|
|
};
|
|
|
|
void onEvent(const struct Ipc::ipc_response&);
|
|
void onCmd(const struct Ipc::ipc_response&);
|
|
|
|
auto set_current_layout(const std::string& current_layout) -> void;
|
|
auto init_layouts_map(const std::vector<std::string>& used_layouts) -> void;
|
|
|
|
const static std::string XKB_LAYOUT_NAMES_KEY;
|
|
const static std::string XKB_ACTIVE_LAYOUT_NAME_KEY;
|
|
|
|
Layout layout_;
|
|
std::string tooltip_format_ = "";
|
|
std::map<std::string, Layout> layouts_map_;
|
|
bool hide_single_;
|
|
bool is_variant_displayed;
|
|
std::byte displayed_short_flag = static_cast<std::byte>(DisplayedShortFlag::None);
|
|
|
|
util::JsonParser parser_;
|
|
std::mutex mutex_;
|
|
Ipc ipc_;
|
|
};
|
|
|
|
} // namespace waybar::modules::sway
|