summaryrefslogtreecommitdiff
path: root/src/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'src/protocols')
-rw-r--r--src/protocols/VirtualKeyboard.cpp14
-rw-r--r--src/protocols/VirtualKeyboard.hpp12
-rw-r--r--src/protocols/VirtualPointer.cpp16
-rw-r--r--src/protocols/VirtualPointer.hpp14
4 files changed, 28 insertions, 28 deletions
diff --git a/src/protocols/VirtualKeyboard.cpp b/src/protocols/VirtualKeyboard.cpp
index fa364a96..1cc76447 100644
--- a/src/protocols/VirtualKeyboard.cpp
+++ b/src/protocols/VirtualKeyboard.cpp
@@ -7,7 +7,7 @@ static const struct wlr_keyboard_impl virtualKeyboardImpl = {
.name = "virtual-keyboard",
};
-CVirtualKeyboard::CVirtualKeyboard(SP<CZwpVirtualKeyboardV1> resource_) : resource(resource_) {
+CVirtualKeyboardV1Resource::CVirtualKeyboardV1Resource(SP<CZwpVirtualKeyboardV1> resource_) : resource(resource_) {
if (!good())
return;
@@ -84,20 +84,20 @@ CVirtualKeyboard::CVirtualKeyboard(SP<CZwpVirtualKeyboardV1> resource_) : resour
wlr_keyboard_init(&keyboard, &virtualKeyboardImpl, "CVirtualKeyboard");
}
-CVirtualKeyboard::~CVirtualKeyboard() {
+CVirtualKeyboardV1Resource::~CVirtualKeyboardV1Resource() {
wlr_keyboard_finish(&keyboard);
events.destroy.emit();
}
-bool CVirtualKeyboard::good() {
+bool CVirtualKeyboardV1Resource::good() {
return resource->resource();
}
-wlr_keyboard* CVirtualKeyboard::wlr() {
+wlr_keyboard* CVirtualKeyboardV1Resource::wlr() {
return &keyboard;
}
-wl_client* CVirtualKeyboard::client() {
+wl_client* CVirtualKeyboardV1Resource::client() {
return resource->client();
}
@@ -116,13 +116,13 @@ void CVirtualKeyboardProtocol::onManagerResourceDestroy(wl_resource* res) {
std::erase_if(m_vManagers, [&](const auto& other) { return other->resource() == res; });
}
-void CVirtualKeyboardProtocol::destroyResource(CVirtualKeyboard* keeb) {
+void CVirtualKeyboardProtocol::destroyResource(CVirtualKeyboardV1Resource* keeb) {
std::erase_if(m_vKeyboards, [&](const auto& other) { return other.get() == keeb; });
}
void CVirtualKeyboardProtocol::onCreateKeeb(CZwpVirtualKeyboardManagerV1* pMgr, wl_resource* seat, uint32_t id) {
- const auto RESOURCE = m_vKeyboards.emplace_back(std::make_shared<CVirtualKeyboard>(std::make_shared<CZwpVirtualKeyboardV1>(pMgr->client(), pMgr->version(), id)));
+ const auto RESOURCE = m_vKeyboards.emplace_back(std::make_shared<CVirtualKeyboardV1Resource>(std::make_shared<CZwpVirtualKeyboardV1>(pMgr->client(), pMgr->version(), id)));
if (!RESOURCE->good()) {
pMgr->noMemory();
diff --git a/src/protocols/VirtualKeyboard.hpp b/src/protocols/VirtualKeyboard.hpp
index b922b0c5..5ce3d748 100644
--- a/src/protocols/VirtualKeyboard.hpp
+++ b/src/protocols/VirtualKeyboard.hpp
@@ -7,10 +7,10 @@
#include "virtual-keyboard-unstable-v1.hpp"
#include "../helpers/signal/Signal.hpp"
-class CVirtualKeyboard {
+class CVirtualKeyboardV1Resource {
public:
- CVirtualKeyboard(SP<CZwpVirtualKeyboardV1> resource_);
- ~CVirtualKeyboard();
+ CVirtualKeyboardV1Resource(SP<CZwpVirtualKeyboardV1> resource_);
+ ~CVirtualKeyboardV1Resource();
struct {
CSignal destroy;
@@ -39,14 +39,14 @@ class CVirtualKeyboardProtocol : public IWaylandProtocol {
private:
void onManagerResourceDestroy(wl_resource* res);
- void destroyResource(CVirtualKeyboard* keeb);
+ void destroyResource(CVirtualKeyboardV1Resource* keeb);
void onCreateKeeb(CZwpVirtualKeyboardManagerV1* pMgr, wl_resource* seat, uint32_t id);
//
std::vector<UP<CZwpVirtualKeyboardManagerV1>> m_vManagers;
- std::vector<SP<CVirtualKeyboard>> m_vKeyboards;
+ std::vector<SP<CVirtualKeyboardV1Resource>> m_vKeyboards;
- friend class CVirtualKeyboard;
+ friend class CVirtualKeyboardV1Resource;
};
namespace PROTO {
diff --git a/src/protocols/VirtualPointer.cpp b/src/protocols/VirtualPointer.cpp
index 287e7bad..cad8af67 100644
--- a/src/protocols/VirtualPointer.cpp
+++ b/src/protocols/VirtualPointer.cpp
@@ -6,7 +6,7 @@ static const wlr_pointer_impl pointerImpl = {
.name = "virtual-pointer-v1",
};
-CVirtualPointer::CVirtualPointer(SP<CZwlrVirtualPointerV1> resource_) : resource(resource_) {
+CVirtualPointerV1Resource::CVirtualPointerV1Resource(SP<CZwlrVirtualPointerV1> resource_) : resource(resource_) {
if (!good())
return;
@@ -19,7 +19,7 @@ CVirtualPointer::CVirtualPointer(SP<CZwlrVirtualPointerV1> resource_) : resource
PROTO::virtualPointer->destroyResource(this);
});
- wlr_pointer_init(&pointer, &pointerImpl, "CVirtualPointer");
+ wlr_pointer_init(&pointer, &pointerImpl, "CVirtualPointerV1Resource");
resource->setMotion([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, wl_fixed_t dx, wl_fixed_t dy) {
wlr_pointer_motion_event event = {
@@ -108,20 +108,20 @@ CVirtualPointer::CVirtualPointer(SP<CZwlrVirtualPointerV1> resource_) : resource
});
}
-CVirtualPointer::~CVirtualPointer() {
+CVirtualPointerV1Resource::~CVirtualPointerV1Resource() {
wlr_pointer_finish(&pointer);
events.destroy.emit();
}
-bool CVirtualPointer::good() {
+bool CVirtualPointerV1Resource::good() {
return resource->resource();
}
-wlr_pointer* CVirtualPointer::wlr() {
+wlr_pointer* CVirtualPointerV1Resource::wlr() {
return &pointer;
}
-wl_client* CVirtualPointer::client() {
+wl_client* CVirtualPointerV1Resource::client() {
return resource->client();
}
@@ -145,13 +145,13 @@ void CVirtualPointerProtocol::onManagerResourceDestroy(wl_resource* res) {
std::erase_if(m_vManagers, [&](const auto& other) { return other->resource() == res; });
}
-void CVirtualPointerProtocol::destroyResource(CVirtualPointer* pointer) {
+void CVirtualPointerProtocol::destroyResource(CVirtualPointerV1Resource* pointer) {
std::erase_if(m_vPointers, [&](const auto& other) { return other.get() == pointer; });
}
void CVirtualPointerProtocol::onCreatePointer(CZwlrVirtualPointerManagerV1* pMgr, wl_resource* seat, uint32_t id) {
- const auto RESOURCE = m_vPointers.emplace_back(std::make_shared<CVirtualPointer>(std::make_shared<CZwlrVirtualPointerV1>(pMgr->client(), pMgr->version(), id)));
+ const auto RESOURCE = m_vPointers.emplace_back(std::make_shared<CVirtualPointerV1Resource>(std::make_shared<CZwlrVirtualPointerV1>(pMgr->client(), pMgr->version(), id)));
if (!RESOURCE->good()) {
pMgr->noMemory();
diff --git a/src/protocols/VirtualPointer.hpp b/src/protocols/VirtualPointer.hpp
index 4528b491..59a7e739 100644
--- a/src/protocols/VirtualPointer.hpp
+++ b/src/protocols/VirtualPointer.hpp
@@ -8,10 +8,10 @@
#include "wlr-virtual-pointer-unstable-v1.hpp"
#include "../helpers/signal/Signal.hpp"
-class CVirtualPointer {
+class CVirtualPointerV1Resource {
public:
- CVirtualPointer(SP<CZwlrVirtualPointerV1> resource_);
- ~CVirtualPointer();
+ CVirtualPointerV1Resource(SP<CZwlrVirtualPointerV1> resource_);
+ ~CVirtualPointerV1Resource();
struct {
CSignal destroy;
@@ -37,19 +37,19 @@ class CVirtualPointerProtocol : public IWaylandProtocol {
virtual void bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id);
struct {
- CSignal newPointer; // SP<CVirtualPointer>
+ CSignal newPointer; // SP<CVirtualPointerV1Resource>
} events;
private:
void onManagerResourceDestroy(wl_resource* res);
- void destroyResource(CVirtualPointer* pointer);
+ void destroyResource(CVirtualPointerV1Resource* pointer);
void onCreatePointer(CZwlrVirtualPointerManagerV1* pMgr, wl_resource* seat, uint32_t id);
//
std::vector<UP<CZwlrVirtualPointerManagerV1>> m_vManagers;
- std::vector<SP<CVirtualPointer>> m_vPointers;
+ std::vector<SP<CVirtualPointerV1Resource>> m_vPointers;
- friend class CVirtualPointer;
+ friend class CVirtualPointerV1Resource;
};
namespace PROTO {
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-05 12:39:42 +0000