cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devices: refactor class member vars (#10206)

Browse source
This commit is contained in:
davc0n 2025-04-29 19:51:07 +02:00 • committed by GitHub
parent 40147d3a3f
commit e9c3fcbb64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 585 additions and 578 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/devices/Tablet.hpp
View file

@ -86,20 +86,20 @@ class CTablet : public IHID {
CSignal proximity;
CSignal tip;
CSignal button;
} tabletEvents;
} m_tabletEvents;
WP<CTablet> self;
WP<CTablet> m_self;
bool relativeInput = false;
bool absolutePos = false;
std::string boundOutput = "";
CBox activeArea;
CBox boundBox;
bool m_relativeInput = false;
bool m_absolutePos = false;
std::string m_boundOutput = "";
CBox m_activeArea;
CBox m_boundBox;
private:
CTablet(SP<Aquamarine::ITablet> tablet);
WP<Aquamarine::ITablet> tablet;
WP<Aquamarine::ITablet> m_tablet;
struct {
CHyprSignalListener destroy;
@ -107,7 +107,7 @@ class CTablet : public IHID {
CHyprSignalListener proximity;
CHyprSignalListener tip;
CHyprSignalListener button;
} listeners;
} m_listeners;
};
class CTabletPad : public IHID {
@ -148,15 +148,15 @@ class CTabletPad : public IHID {
CSignal ring;
CSignal strip;
CSignal attach;
} padEvents;
} m_padEvents;
WP<CTabletPad> self;
WP<CTabletTool> parent;
WP<CTabletPad> m_self;
WP<CTabletTool> m_parent;
private:
CTabletPad(SP<Aquamarine::ITabletPad> pad);
WP<Aquamarine::ITabletPad> pad;
WP<Aquamarine::ITabletPad> m_pad;
struct {
CHyprSignalListener destroy;
@ -164,7 +164,7 @@ class CTabletPad : public IHID {
CHyprSignalListener strip;
CHyprSignalListener button;
CHyprSignalListener attach;
} listeners;
} m_listeners;
};
class CTabletTool : public IHID {
@ -198,23 +198,23 @@ class CTabletTool : public IHID {
SP<CWLSurfaceResource> getSurface();
void setSurface(SP<CWLSurfaceResource>);
WP<CTabletTool> self;
Vector2D tilt;
bool active = false; // true if in proximity
uint32_t toolCapabilities = 0;
WP<CTabletTool> m_self;
Vector2D m_tilt;
bool m_active = false; // true if in proximity
uint32_t m_toolCapabilities = 0;
bool isDown = false;
std::vector<uint32_t> buttonsDown;
Vector2D absolutePos; // last known absolute position.
bool m_isDown = false;
std::vector<uint32_t> m_buttonsDown;
Vector2D m_absolutePos; // last known absolute position.
private:
CTabletTool(SP<Aquamarine::ITabletTool> tool);
WP<CWLSurfaceResource> pSurface;
WP<Aquamarine::ITabletTool> tool;
WP<CWLSurfaceResource> m_surface;
WP<Aquamarine::ITabletTool> m_tool;
struct {
CHyprSignalListener destroySurface;
CHyprSignalListener destroyTool;
} listeners;
} m_listeners;
};