From 1ed1ce9506e65f76fe5236194516f23d662bba0b Mon Sep 17 00:00:00 2001
From: Vaxry <43317083+vaxerski@users.noreply.github.com>
Date: Sun, 5 May 2024 17:16:00 +0100
Subject: 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.
---
 src/managers/input/TextInput.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/managers/input/TextInput.cpp')

diff --git a/src/managers/input/TextInput.cpp b/src/managers/input/TextInput.cpp
index 77718174..b3f0b0cb 100644
--- a/src/managers/input/TextInput.cpp
+++ b/src/managers/input/TextInput.cpp
@@ -11,7 +11,7 @@ CTextInput::CTextInput(STextInputV1* ti) : pV1Input(ti) {
     initCallbacks();
 }
 
-CTextInput::CTextInput(std::weak_ptr<CTextInputV3> ti) : pV3Input(ti) {
+CTextInput::CTextInput(WP<CTextInputV3> ti) : pV3Input(ti) {
     initCallbacks();
 }
 
@@ -109,7 +109,7 @@ void CTextInput::onCommit() {
         return;
     }
 
-    if (!(isV3() ? pV3Input.lock()->current.enabled : pV1Input->active)) {
+    if (!(isV3() ? pV3Input->current.enabled : pV1Input->active)) {
         Debug::log(WARN, "Disabled TextInput commit?");
         return;
     }
@@ -180,7 +180,7 @@ void CTextInput::enter(wlr_surface* pSurface) {
     }
 
     if (isV3())
-        pV3Input.lock()->enter(pSurface);
+        pV3Input->enter(pSurface);
     else {
         zwp_text_input_v1_send_enter(pV1Input->resourceImpl, pSurface->resource);
         pV1Input->active = true;
@@ -200,7 +200,7 @@ void CTextInput::leave() {
     }
 
     if (isV3() && focusedSurface())
-        pV3Input.lock()->leave(focusedSurface());
+        pV3Input->leave(focusedSurface());
     else if (focusedSurface() && pV1Input) {
         zwp_text_input_v1_send_leave(pV1Input->resourceImpl);
         pV1Input->active = false;
@@ -216,7 +216,7 @@ wlr_surface* CTextInput::focusedSurface() {
 }
 
 wl_client* CTextInput::client() {
-    return isV3() ? pV3Input.lock()->client() : pV1Input->client;
+    return isV3() ? pV3Input->client() : pV1Input->client;
 }
 
 void CTextInput::commitStateToIME(SP<CInputMethodV2> ime) {
@@ -284,9 +284,9 @@ void CTextInput::updateIMEState(SP<CInputMethodV2> ime) {
 }
 
 bool CTextInput::hasCursorRectangle() {
-    return !isV3() || pV3Input.lock()->current.box.updated;
+    return !isV3() || pV3Input->current.box.updated;
 }
 
 CBox CTextInput::cursorBox() {
-    return CBox{isV3() ? pV3Input.lock()->current.box.cursorBox : pV1Input->cursorRectangle};
+    return CBox{isV3() ? pV3Input->current.box.cursorBox : pV1Input->cursorRectangle};
 }
\ No newline at end of file
-- 
cgit v1.2.3