From 2626f89ea6fe0df585df28052bf1fcca2c50fe8e Mon Sep 17 00:00:00 2001 From: davc0n Date: Sun, 4 May 2025 19:21:36 +0200 Subject: protocols: refactor class member vars (n-t) (#10273) --- src/protocols/TextInputV1.cpp | 84 +++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'src/protocols/TextInputV1.cpp') diff --git a/src/protocols/TextInputV1.cpp b/src/protocols/TextInputV1.cpp index 4bf5e9e1..d7a0eb49 100644 --- a/src/protocols/TextInputV1.cpp +++ b/src/protocols/TextInputV1.cpp @@ -3,94 +3,94 @@ #include "core/Compositor.hpp" CTextInputV1::~CTextInputV1() { - events.destroy.emit(); + m_events.destroy.emit(); } -CTextInputV1::CTextInputV1(SP resource_) : resource(resource_) { +CTextInputV1::CTextInputV1(SP resource_) : m_resource(resource_) { if UNLIKELY (!good()) return; - resource->setOnDestroy([this](CZwpTextInputV1* pMgr) { PROTO::textInputV1->destroyResource(this); }); + m_resource->setOnDestroy([this](CZwpTextInputV1* pMgr) { PROTO::textInputV1->destroyResource(this); }); - resource->setActivate([this](CZwpTextInputV1* pMgr, wl_resource* seat, wl_resource* surface) { + m_resource->setActivate([this](CZwpTextInputV1* pMgr, wl_resource* seat, wl_resource* surface) { if UNLIKELY (!surface) { LOGM(WARN, "Text-input-v1 PTI{:x}: No surface to activate text input on!", (uintptr_t)this); return; } - active = true; - events.enable.emit(CWLSurfaceResource::fromResource(surface)); + m_active = true; + m_events.enable.emit(CWLSurfaceResource::fromResource(surface)); }); - resource->setDeactivate([this](CZwpTextInputV1* pMgr, wl_resource* seat) { - active = false; - events.disable.emit(); + m_resource->setDeactivate([this](CZwpTextInputV1* pMgr, wl_resource* seat) { + m_active = false; + m_events.disable.emit(); }); - resource->setReset([this](CZwpTextInputV1* pMgr) { - pendingSurrounding.isPending = false; - pendingContentType.isPending = false; - events.reset.emit(); + m_resource->setReset([this](CZwpTextInputV1* pMgr) { + m_pendingSurrounding.isPending = false; + m_pendingContentType.isPending = false; + m_events.reset.emit(); }); - resource->setSetSurroundingText( - [this](CZwpTextInputV1* pMgr, const char* text, uint32_t cursor, uint32_t anchor) { pendingSurrounding = {true, std::string(text), cursor, anchor}; }); + m_resource->setSetSurroundingText( + [this](CZwpTextInputV1* pMgr, const char* text, uint32_t cursor, uint32_t anchor) { m_pendingSurrounding = {true, std::string(text), cursor, anchor}; }); - resource->setSetContentType([this](CZwpTextInputV1* pMgr, uint32_t hint, uint32_t purpose) { - pendingContentType = {true, hint == (uint32_t)ZWP_TEXT_INPUT_V1_CONTENT_HINT_DEFAULT ? (uint32_t)ZWP_TEXT_INPUT_V1_CONTENT_HINT_NONE : hint, - purpose > (uint32_t)ZWP_TEXT_INPUT_V1_CONTENT_PURPOSE_PASSWORD ? hint + 1 : hint}; + m_resource->setSetContentType([this](CZwpTextInputV1* pMgr, uint32_t hint, uint32_t purpose) { + m_pendingContentType = {true, hint == (uint32_t)ZWP_TEXT_INPUT_V1_CONTENT_HINT_DEFAULT ? (uint32_t)ZWP_TEXT_INPUT_V1_CONTENT_HINT_NONE : hint, + purpose > (uint32_t)ZWP_TEXT_INPUT_V1_CONTENT_PURPOSE_PASSWORD ? hint + 1 : hint}; }); - resource->setSetCursorRectangle([this](CZwpTextInputV1* pMgr, int32_t x, int32_t y, int32_t width, int32_t height) { cursorRectangle = CBox{x, y, width, height}; }); + m_resource->setSetCursorRectangle([this](CZwpTextInputV1* pMgr, int32_t x, int32_t y, int32_t width, int32_t height) { m_cursorRectangle = CBox{x, y, width, height}; }); - resource->setCommitState([this](CZwpTextInputV1* pMgr, uint32_t serial_) { - serial = serial_; - events.onCommit.emit(); + m_resource->setCommitState([this](CZwpTextInputV1* pMgr, uint32_t serial_) { + m_serial = serial_; + m_events.onCommit.emit(); }); // nothing - resource->setShowInputPanel([](CZwpTextInputV1* pMgr) {}); - resource->setHideInputPanel([](CZwpTextInputV1* pMgr) {}); - resource->setSetPreferredLanguage([](CZwpTextInputV1* pMgr, const char* language) {}); - resource->setInvokeAction([](CZwpTextInputV1* pMgr, uint32_t button, uint32_t index) {}); + m_resource->setShowInputPanel([](CZwpTextInputV1* pMgr) {}); + m_resource->setHideInputPanel([](CZwpTextInputV1* pMgr) {}); + m_resource->setSetPreferredLanguage([](CZwpTextInputV1* pMgr, const char* language) {}); + m_resource->setInvokeAction([](CZwpTextInputV1* pMgr, uint32_t button, uint32_t index) {}); } bool CTextInputV1::good() { - return resource->resource(); + return m_resource->resource(); } wl_client* CTextInputV1::client() { - return resource->client(); + return m_resource->client(); } void CTextInputV1::enter(SP surface) { - resource->sendEnter(surface->getResource()->resource()); - active = true; + m_resource->sendEnter(surface->getResource()->resource()); + m_active = true; } void CTextInputV1::leave() { - resource->sendLeave(); - active = false; + m_resource->sendLeave(); + m_active = false; } void CTextInputV1::preeditCursor(int32_t index) { - resource->sendPreeditCursor(index); + m_resource->sendPreeditCursor(index); } void CTextInputV1::preeditStyling(uint32_t index, uint32_t length, zwpTextInputV1PreeditStyle style) { - resource->sendPreeditStyling(index, length, style); + m_resource->sendPreeditStyling(index, length, style); } void CTextInputV1::preeditString(uint32_t serial, const char* text, const char* commit) { - resource->sendPreeditString(serial, text, commit); + m_resource->sendPreeditString(serial, text, commit); } void CTextInputV1::commitString(uint32_t serial, const char* text) { - resource->sendCommitString(serial, text); + m_resource->sendCommitString(serial, text); } void CTextInputV1::deleteSurroundingText(int32_t index, uint32_t length) { - resource->sendDeleteSurroundingText(index, length); + m_resource->sendDeleteSurroundingText(index, length); } CTextInputV1Protocol::CTextInputV1Protocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) { @@ -98,11 +98,11 @@ CTextInputV1Protocol::CTextInputV1Protocol(const wl_interface* iface, const int& } void CTextInputV1Protocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) { - const auto RESOURCE = m_vManagers.emplace_back(makeShared(client, ver, id)); + const auto RESOURCE = m_managers.emplace_back(makeShared(client, ver, id)); RESOURCE->setOnDestroy([](CZwpTextInputManagerV1* pMgr) { PROTO::textInputV1->destroyResource(pMgr); }); RESOURCE->setCreateTextInput([this](CZwpTextInputManagerV1* pMgr, uint32_t id) { - const auto PTI = m_vClients.emplace_back(makeShared(makeShared(pMgr->client(), pMgr->version(), id))); + const auto PTI = m_clients.emplace_back(makeShared(makeShared(pMgr->client(), pMgr->version(), id))); LOGM(LOG, "New TI V1 at {:x}", (uintptr_t)PTI.get()); if UNLIKELY (!PTI->good()) { @@ -112,14 +112,14 @@ void CTextInputV1Protocol::bindManager(wl_client* client, void* data, uint32_t v return; } - events.newTextInput.emit(WP(PTI)); + m_events.newTextInput.emit(WP(PTI)); }); } void CTextInputV1Protocol::destroyResource(CTextInputV1* client) { - std::erase_if(m_vClients, [&](const auto& other) { return other.get() == client; }); + std::erase_if(m_clients, [&](const auto& other) { return other.get() == client; }); } void CTextInputV1Protocol::destroyResource(CZwpTextInputManagerV1* client) { - std::erase_if(m_vManagers, [&](const auto& other) { return other.get() == client; }); + std::erase_if(m_managers, [&](const auto& other) { return other.get() == client; }); } -- cgit v1.2.3