Merge 0b1396558f into 9c5dd59d4b

input: fix capabilities enum types passed
hyprland down to the seat protocol impl expects IHID capabilities, not WL_ ones ref #6702 #6196
2024-06-28 17:24:49 -05:00 · 2024-06-29 00:23:02 +02:00 · 2024-06-29 00:18:24 +02:00 · 2024-06-27 20:16:13 -05:00 · 2024-06-26 22:18:31 -05:00
3 changed files with 9 additions and 16 deletions
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@ -1473,14 +1473,7 @@ void CInputManager::updateCapabilities() {
        if (h.expired())
            continue;

-        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;
+        caps |= h->getCapabilities();
    }

    g_pSeatManager->updateCapabilities(caps);
--- a/src/protocols/PointerConstraints.cpp
+++ b/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) {
+CPointerConstraint::CPointerConstraint(SP<CZwpLockedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime_) :
+    resourceL(resource_), locked(true), lifetime(lifetime_) {
    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) {
+CPointerConstraint::CPointerConstraint(SP<CZwpConfinedPointerV1> resource_, SP<CWLSurfaceResource> surf, wl_resource* region_, zwpPointerConstraintsV1Lifetime lifetime_) :
+    resourceC(resource_), locked(false), lifetime(lifetime_) {
    if (!resource_->resource())
        return;

--- a/src/protocols/PointerConstraints.hpp
+++ b/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();
@ -46,7 +46,7 @@ class CPointerConstraint {
    bool                            active              = false;
    bool                            locked              = false;
    bool                            dead                = false;
-    zwpPointerConstraintsV1Lifetime lifetime            = ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ONESHOT;
+    zwpPointerConstraintsV1Lifetime lifetime            = ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT;

    void                            sharedConstructions();
    void                            onSetRegion(wl_resource* region);
@ -78,4 +78,4 @@ class CPointerConstraintsProtocol : public IWaylandProtocol {

 namespace PROTO {
    inline UP<CPointerConstraintsProtocol> constraints;
-};
+};
Author	SHA1	Message	Date
Gregory	00db20b59f	Merge `0b1396558f` into `9c5dd59d4b`	2024-06-28 17:24:49 -05:00
Vaxry	9c5dd59d4b	input: fix capabilities enum types passed hyprland down to the seat protocol impl expects IHID capabilities, not WL_ ones ref #6702 #6196	2024-06-29 00:23:02 +02:00
Vaxry	d16c6aa1db	pointer-constraint: set lifetime correctly ref #6679	2024-06-29 00:18:24 +02:00
Trianta	0b1396558f	pointer-constraint: default to persistent lifetime instead	2024-06-27 20:16:13 -05:00
Trianta	f7cc1c539d	pointer-constraints: keep constraint alive until actual destruction	2024-06-26 22:18:31 -05:00