protocols: refactor class member vars (n-t) (#10273)

This commit is contained in:
davc0n 2025-05-04 19:21:36 +02:00 committed by GitHub
parent adbae0f74d
commit 2626f89ea6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
41 changed files with 1507 additions and 1511 deletions

View file

@ -27,11 +27,10 @@ class CTextInputV1 {
wl_client* client();
private:
SP<CZwpTextInputV1> resource;
WP<CTextInputV1> self;
SP<CZwpTextInputV1> m_resource;
uint32_t serial = 0;
bool active = false;
uint32_t m_serial = 0;
bool m_active = false;
struct {
CSignal onCommit;
@ -39,22 +38,22 @@ class CTextInputV1 {
CSignal disable;
CSignal reset;
CSignal destroy;
} events;
} m_events;
struct SPendingSurr {
bool isPending = false;
std::string text = "";
uint32_t cursor = 0;
uint32_t anchor = 0;
} pendingSurrounding;
} m_pendingSurrounding;
struct SPendingCT {
bool isPending = false;
uint32_t hint = 0;
uint32_t purpose = 0;
} pendingContentType;
} m_pendingContentType;
CBox cursorRectangle = {0, 0, 0, 0};
CBox m_cursorRectangle = {0, 0, 0, 0};
friend class CTextInput;
friend class CTextInputV1Protocol;
@ -70,11 +69,11 @@ class CTextInputV1Protocol : public IWaylandProtocol {
struct {
CSignal newTextInput; // WP<CTextInputV3>
} events;
} m_events;
private:
std::vector<SP<CZwpTextInputManagerV1>> m_vManagers;
std::vector<SP<CTextInputV1>> m_vClients;
std::vector<SP<CZwpTextInputManagerV1>> m_managers;
std::vector<SP<CTextInputV1>> m_clients;
friend class CTextInputV1;
};