aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/devices
diff options
context:
space:
mode:
authorVaxry <[email protected]>2024-05-05 17:16:00 +0100
committerGitHub <[email protected]>2024-05-05 17:16:00 +0100
commit1ed1ce9506e65f76fe5236194516f23d662bba0b (patch)
tree124556baadfe27587d025913bfbdd579060ed317 /src/devices
parent589f758d947cb4e8b888d2da00076a9fb0a6d521 (diff)
downloadHyprland-1ed1ce9506e65f76fe5236194516f23d662bba0b.tar.gz
Hyprland-1ed1ce9506e65f76fe5236194516f23d662bba0b.zip
internal: new shared_ptr and weak_ptr implementation (#5883)
moves std::shared_ptrs to a new implementation Advantages: - you can dereference a weak_ptr directly. This will obviously segfault on a nullptr deref if it's expired. - this is useful to avoid the .lock() hell where we are 100% sure the pointer _should_ be valid. (and if it isn't, it should throw.) - weak_ptrs are still valid while the SP is being destroyed. - reasoning: while an object (e.g. CWindow) is being destroyed, its `weak_ptr self` should be accessible (the sp is still alive, and so is CWindow), but it's not because by stl it's already expired (to prevent resurrection) - this impl solves it differently. w_p is expired, but can still be dereferenced and used. Creating `s_p`s is not possible anymore, though. - this is useful in destructors and callbacks.
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/VirtualKeyboard.cpp4
-rw-r--r--src/devices/VirtualPointer.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/VirtualKeyboard.cpp b/src/devices/VirtualKeyboard.cpp
index dfe3c6df..e2be0078 100644
--- a/src/devices/VirtualKeyboard.cpp
+++ b/src/devices/VirtualKeyboard.cpp
@@ -57,7 +57,7 @@ bool CVirtualKeyboard::isVirtual() {
wlr_keyboard* CVirtualKeyboard::wlr() {
if (keyboard.expired())
return nullptr;
- return keyboard.lock()->wlr();
+ return keyboard->wlr();
}
void CVirtualKeyboard::disconnectCallbacks() {
@@ -71,5 +71,5 @@ void CVirtualKeyboard::disconnectCallbacks() {
wl_client* CVirtualKeyboard::getClient() {
if (keyboard.expired())
return nullptr;
- return keyboard.lock()->client();
+ return keyboard->client();
}
diff --git a/src/devices/VirtualPointer.cpp b/src/devices/VirtualPointer.cpp
index 2b46ff28..4ebf8865 100644
--- a/src/devices/VirtualPointer.cpp
+++ b/src/devices/VirtualPointer.cpp
@@ -168,5 +168,5 @@ void CVirtualPointer::disconnectCallbacks() {
wlr_pointer* CVirtualPointer::wlr() {
if (pointer.expired())
return nullptr;
- return pointer.lock()->wlr();
+ return pointer->wlr();
}