Merge 846fcd3683 into f2dc48d92f

src/helpers/Watchdog.cpp

@@ -7,9 +7,7 @@ CWatchdog::~CWatchdog() {
     m_bExitThread = true;
     m_bNotified   = true;
     m_cvWatchdogCondition.notify_all();
-
-    if (m_pWatchdog && m_pWatchdog->joinable())
-        m_pWatchdog->join();
+    m_pWatchdog.reset();
 }
 
 CWatchdog::CWatchdog() {
@@ -35,6 +33,8 @@ CWatchdog::CWatchdog() {
             m_bNotified = false;
         }
     });
+
+    m_pWatchdog->detach();
 }
 
 void CWatchdog::startWatching() {

src/managers/input/InputManager.cpp

@@ -1473,7 +1473,14 @@ void CInputManager::updateCapabilities() {
         if (h.expired())
             continue;
 
-        caps |= h->getCapabilities();
+        auto cap = h->getCapabilities();
+
+        if (cap & HID_INPUT_CAPABILITY_KEYBOARD)
+            caps |= WL_SEAT_CAPABILITY_KEYBOARD;
+        if (cap & HID_INPUT_CAPABILITY_POINTER)
+            caps |= WL_SEAT_CAPABILITY_POINTER;
+        if (cap & HID_INPUT_CAPABILITY_TOUCH)
+            caps |= WL_SEAT_CAPABILITY_TOUCH;
     }
 
     g_pSeatManager->updateCapabilities(caps);

src/protocols/PointerConstraints.cpp

@@ -7,8 +7,8 @@
 
 #define LOGM PROTO::constraints->protoLog
 
-CPointerConstraint::CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime_) :
-    resourceL(resource_), locked(true), lifetime(lifetime_) {
+CPointerConstraint::CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime) :
+    resourceL(resource_), locked(true) {
     if (!resource_->resource())
         return;
 
@@ -46,8 +46,8 @@ CPointerConstraint::CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWL
     sharedConstructions();
 }
 
-CPointerConstraint::CPointerConstraint(SP<CZwpConfinedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime_) :
-    resourceC(resource_), locked(false), lifetime(lifetime_) {
+CPointerConstraint::CPointerConstraint(SP<CZwpConfinedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime) :
+    resourceC(resource_), locked(false) {
     if (!resource_->resource())
         return;
 

src/protocols/PointerConstraints.hpp

@@ -16,8 +16,8 @@ class CWLSurfaceResource;
 
 class CPointerConstraint {
   public:
-    CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region, zwpPointerConstraintsV1Lifetime lifetime_);
-    CPointerConstraint(SP<CZwpConfinedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region, zwpPointerConstraintsV1Lifetime lifetime_);
+    CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region, zwpPointerConstraintsV1Lifetime lifetime);
+    CPointerConstraint(SP<CZwpConfinedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region, zwpPointerConstraintsV1Lifetime lifetime);
     ~CPointerConstraint();
 
     bool           good();

src/render/Renderbuffer.cpp

@@ -6,7 +6,7 @@
 #include <dlfcn.h>
 
 CRenderbuffer::~CRenderbuffer() {
-    if (!g_pCompositor || g_pCompositor->m_bIsShuttingDown || !g_pHyprRenderer)
+    if (!g_pCompositor)
         return;
 
     g_pHyprRenderer->makeEGLCurrent();

src/render/Texture.cpp

@@ -9,7 +9,7 @@ CTexture::CTexture() {
 }
 
 CTexture::~CTexture() {
-    if (m_bNonOwning || !g_pCompositor || g_pCompositor->m_bIsShuttingDown || !g_pHyprRenderer)
+    if (m_bNonOwning)
         return;
 
     g_pHyprRenderer->makeEGLCurrent();