input: cleanup device naming logic

ref #8301
This commit is contained in:
Vaxry 2024-11-09 01:53:01 +00:00
parent 3b66351eeb
commit 4c7a2faf85
7 changed files with 11 additions and 32 deletions

View file

@ -36,5 +36,5 @@ class IHID {
CSignal destroy;
} events;
std::string deviceName;
std::string deviceName, hlName;
};

View file

@ -94,7 +94,6 @@ class IKeyboard : public IHID {
std::array<xkb_mod_index_t, 8> modIndexes = {XKB_MOD_INVALID};
uint32_t leds = 0;
std::string hlName = "";
std::string xkbFilePath = "";
std::string xkbKeymapString = "";
int xkbKeymapFD = -1;

View file

@ -104,7 +104,6 @@ class IPointer : public IHID {
CSignal holdEnd;
} pointerEvents;
std::string hlName;
bool connected = false; // means connected to the cursor
std::string boundOutput = "";

View file

@ -44,7 +44,6 @@ class ITouch : public IHID {
CSignal frame;
} touchEvents;
std::string hlName = "";
std::string boundOutput = "";
WP<ITouch> self;

View file

@ -92,7 +92,6 @@ class CTablet : public IHID {
WP<CTablet> self;
bool relativeInput = false;
std::string hlName = "";
std::string boundOutput = "";
CBox activeArea;
CBox boundBox; // output-local
@ -154,8 +153,6 @@ class CTabletPad : public IHID {
WP<CTabletPad> self;
WP<CTabletTool> parent;
std::string hlName;
private:
CTabletPad(SP<Aquamarine::ITabletPad> pad);
@ -210,8 +207,6 @@ class CTabletTool : public IHID {
std::vector<uint32_t> buttonsDown;
Vector2D absolutePos; // last known absolute position.
std::string hlName;
private:
CTabletTool(SP<Aquamarine::ITabletTool> tool);