summaryrefslogtreecommitdiff
path: root/src/protocols/VirtualPointer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/protocols/VirtualPointer.cpp')
-rw-r--r--src/protocols/VirtualPointer.cpp86
1 files changed, 43 insertions, 43 deletions
diff --git a/src/protocols/VirtualPointer.cpp b/src/protocols/VirtualPointer.cpp
index ce64e1e5..e40d35f2 100644
--- a/src/protocols/VirtualPointer.cpp
+++ b/src/protocols/VirtualPointer.cpp
@@ -1,21 +1,21 @@
#include "VirtualPointer.hpp"
#include "core/Output.hpp"
-CVirtualPointerV1Resource::CVirtualPointerV1Resource(SP<CZwlrVirtualPointerV1> resource_, PHLMONITORREF boundOutput_) : boundOutput(boundOutput_), resource(resource_) {
+CVirtualPointerV1Resource::CVirtualPointerV1Resource(SP<CZwlrVirtualPointerV1> resource_, PHLMONITORREF boundOutput_) : m_boundOutput(boundOutput_), m_resource(resource_) {
if UNLIKELY (!good())
return;
- resource->setDestroy([this](CZwlrVirtualPointerV1* r) {
- events.destroy.emit();
+ m_resource->setDestroy([this](CZwlrVirtualPointerV1* r) {
+ m_events.destroy.emit();
PROTO::virtualPointer->destroyResource(this);
});
- resource->setOnDestroy([this](CZwlrVirtualPointerV1* r) {
- events.destroy.emit();
+ m_resource->setOnDestroy([this](CZwlrVirtualPointerV1* r) {
+ m_events.destroy.emit();
PROTO::virtualPointer->destroyResource(this);
});
- resource->setMotion([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, wl_fixed_t dx, wl_fixed_t dy) {
- events.move.emit(IPointer::SMotionEvent{
+ m_resource->setMotion([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, wl_fixed_t dx, wl_fixed_t dy) {
+ m_events.move.emit(IPointer::SMotionEvent{
.timeMs = timeMs,
.delta = {wl_fixed_to_double(dx), wl_fixed_to_double(dy)},
.unaccel = {wl_fixed_to_double(dx), wl_fixed_to_double(dy)},
@@ -23,84 +23,84 @@ CVirtualPointerV1Resource::CVirtualPointerV1Resource(SP<CZwlrVirtualPointerV1> r
});
});
- resource->setMotionAbsolute([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, uint32_t x, uint32_t y, uint32_t xExtent, uint32_t yExtent) {
+ m_resource->setMotionAbsolute([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, uint32_t x, uint32_t y, uint32_t xExtent, uint32_t yExtent) {
if (!xExtent || !yExtent)
return;
- events.warp.emit(IPointer::SMotionAbsoluteEvent{
+ m_events.warp.emit(IPointer::SMotionAbsoluteEvent{
.timeMs = timeMs,
.absolute = {(double)x / xExtent, (double)y / yExtent},
});
});
- resource->setButton([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, uint32_t button, uint32_t state) {
- events.button.emit(IPointer::SButtonEvent{
+ m_resource->setButton([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, uint32_t button, uint32_t state) {
+ m_events.button.emit(IPointer::SButtonEvent{
.timeMs = timeMs,
.button = button,
.state = (wl_pointer_button_state)state,
});
});
- resource->setAxis([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, uint32_t axis_, wl_fixed_t value) {
- if UNLIKELY (axis > WL_POINTER_AXIS_HORIZONTAL_SCROLL) {
+ m_resource->setAxis([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, uint32_t axis_, wl_fixed_t value) {
+ if UNLIKELY (m_axis > WL_POINTER_AXIS_HORIZONTAL_SCROLL) {
r->error(ZWLR_VIRTUAL_POINTER_V1_ERROR_INVALID_AXIS, "Invalid axis");
return;
}
- axis = axis_;
- axisEvents[axis] = IPointer::SAxisEvent{.timeMs = timeMs, .axis = (wl_pointer_axis)axis, .delta = wl_fixed_to_double(value)};
+ m_axis = axis_;
+ m_axisEvents[m_axis] = IPointer::SAxisEvent{.timeMs = timeMs, .axis = (wl_pointer_axis)m_axis, .delta = wl_fixed_to_double(value)};
});
- resource->setFrame([this](CZwlrVirtualPointerV1* r) {
- for (auto& e : axisEvents) {
+ m_resource->setFrame([this](CZwlrVirtualPointerV1* r) {
+ for (auto& e : m_axisEvents) {
if (!e.timeMs)
continue;
- events.axis.emit(e);
+ m_events.axis.emit(e);
e.timeMs = 0;
}
- events.frame.emit();
+ m_events.frame.emit();
});
- resource->setAxisSource([this](CZwlrVirtualPointerV1* r, uint32_t source) { axisEvents[axis].source = (wl_pointer_axis_source)source; });
+ m_resource->setAxisSource([this](CZwlrVirtualPointerV1* r, uint32_t source) { m_axisEvents[m_axis].source = (wl_pointer_axis_source)source; });
- resource->setAxisStop([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, uint32_t axis_) {
- if UNLIKELY (axis > WL_POINTER_AXIS_HORIZONTAL_SCROLL) {
+ m_resource->setAxisStop([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, uint32_t axis_) {
+ if UNLIKELY (m_axis > WL_POINTER_AXIS_HORIZONTAL_SCROLL) {
r->error(ZWLR_VIRTUAL_POINTER_V1_ERROR_INVALID_AXIS, "Invalid axis");
return;
}
- axis = axis_;
- axisEvents[axis].timeMs = timeMs;
- axisEvents[axis].axis = (wl_pointer_axis)axis;
- axisEvents[axis].delta = 0;
- axisEvents[axis].deltaDiscrete = 0;
+ m_axis = axis_;
+ m_axisEvents[m_axis].timeMs = timeMs;
+ m_axisEvents[m_axis].axis = (wl_pointer_axis)m_axis;
+ m_axisEvents[m_axis].delta = 0;
+ m_axisEvents[m_axis].deltaDiscrete = 0;
});
- resource->setAxisDiscrete([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, uint32_t axis_, wl_fixed_t value, int32_t discrete) {
- if UNLIKELY (axis > WL_POINTER_AXIS_HORIZONTAL_SCROLL) {
+ m_resource->setAxisDiscrete([this](CZwlrVirtualPointerV1* r, uint32_t timeMs, uint32_t axis_, wl_fixed_t value, int32_t discrete) {
+ if UNLIKELY (m_axis > WL_POINTER_AXIS_HORIZONTAL_SCROLL) {
r->error(ZWLR_VIRTUAL_POINTER_V1_ERROR_INVALID_AXIS, "Invalid axis");
return;
}
- axis = axis_;
- axisEvents[axis].timeMs = timeMs;
- axisEvents[axis].axis = (wl_pointer_axis)axis;
- axisEvents[axis].delta = wl_fixed_to_double(value);
- axisEvents[axis].deltaDiscrete = discrete * 120;
+ m_axis = axis_;
+ m_axisEvents[m_axis].timeMs = timeMs;
+ m_axisEvents[m_axis].axis = (wl_pointer_axis)m_axis;
+ m_axisEvents[m_axis].delta = wl_fixed_to_double(value);
+ m_axisEvents[m_axis].deltaDiscrete = discrete * 120;
});
}
CVirtualPointerV1Resource::~CVirtualPointerV1Resource() {
- events.destroy.emit();
+ m_events.destroy.emit();
}
bool CVirtualPointerV1Resource::good() {
- return resource->resource();
+ return m_resource->resource();
}
wl_client* CVirtualPointerV1Resource::client() {
- return resource->client();
+ return m_resource->client();
}
CVirtualPointerProtocol::CVirtualPointerProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) {
@@ -108,7 +108,7 @@ CVirtualPointerProtocol::CVirtualPointerProtocol(const wl_interface* iface, cons
}
void CVirtualPointerProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) {
- const auto RESOURCE = m_vManagers.emplace_back(makeUnique<CZwlrVirtualPointerManagerV1>(client, ver, id)).get();
+ const auto RESOURCE = m_managers.emplace_back(makeUnique<CZwlrVirtualPointerManagerV1>(client, ver, id)).get();
RESOURCE->setOnDestroy([this](CZwlrVirtualPointerManagerV1* p) { this->onManagerResourceDestroy(p->resource()); });
RESOURCE->setDestroy([this](CZwlrVirtualPointerManagerV1* p) { this->onManagerResourceDestroy(p->resource()); });
@@ -128,24 +128,24 @@ void CVirtualPointerProtocol::bindManager(wl_client* client, void* data, uint32_
}
void CVirtualPointerProtocol::onManagerResourceDestroy(wl_resource* res) {
- std::erase_if(m_vManagers, [&](const auto& other) { return other->resource() == res; });
+ std::erase_if(m_managers, [&](const auto& other) { return other->resource() == res; });
}
void CVirtualPointerProtocol::destroyResource(CVirtualPointerV1Resource* pointer) {
- std::erase_if(m_vPointers, [&](const auto& other) { return other.get() == pointer; });
+ std::erase_if(m_pointers, [&](const auto& other) { return other.get() == pointer; });
}
void CVirtualPointerProtocol::onCreatePointer(CZwlrVirtualPointerManagerV1* pMgr, wl_resource* seat, uint32_t id, PHLMONITORREF output) {
- const auto RESOURCE = m_vPointers.emplace_back(makeShared<CVirtualPointerV1Resource>(makeShared<CZwlrVirtualPointerV1>(pMgr->client(), pMgr->version(), id), output));
+ const auto RESOURCE = m_pointers.emplace_back(makeShared<CVirtualPointerV1Resource>(makeShared<CZwlrVirtualPointerV1>(pMgr->client(), pMgr->version(), id), output));
if UNLIKELY (!RESOURCE->good()) {
pMgr->noMemory();
- m_vPointers.pop_back();
+ m_pointers.pop_back();
return;
}
LOGM(LOG, "New VPointer at id {}", id);
- events.newPointer.emit(RESOURCE);
+ m_events.newPointer.emit(RESOURCE);
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-01 19:50:40 +0000