summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorvaxerski <43317083+vaxerski@users.noreply.github.com>2022-04-17 21:40:04 +0200
committervaxerski <43317083+vaxerski@users.noreply.github.com>2022-04-17 21:40:04 +0200
commit7b1eaca84014d88a420bcbd3f97467f74e82ab33 (patch)
treee5147e4b6eeed31a9e1827e582e79852ed74e5f9 /src
parentb0f5e4ab5656fb3b72efa7ce646d4b47ae82b814 (diff)
Implemented mouse constraints
has some todos but mostly works
Diffstat (limited to 'src')
-rw-r--r--src/Compositor.cpp5
-rw-r--r--src/Compositor.hpp2
-rw-r--r--src/events/Devices.cpp36
-rw-r--r--src/events/Events.hpp5
-rw-r--r--src/helpers/WLClasses.hpp28
-rw-r--r--src/includes.hpp2
-rw-r--r--src/managers/InputManager.cpp99
-rw-r--r--src/managers/InputManager.hpp7
8 files changed, 181 insertions, 3 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 95e2ac48..a6bd140b 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -93,6 +93,10 @@ CCompositor::CCompositor() {
m_sWLRKbShInhibitMgr = wlr_keyboard_shortcuts_inhibit_v1_create(m_sWLDisplay);
m_sWLREXTWorkspaceMgr = wlr_ext_workspace_manager_v1_create(m_sWLDisplay);
+
+ m_sWLRPointerConstraints = wlr_pointer_constraints_v1_create(m_sWLDisplay);
+
+ m_sWLRRelPointerMgr = wlr_relative_pointer_manager_v1_create(m_sWLDisplay);
}
CCompositor::~CCompositor() {
@@ -118,6 +122,7 @@ void CCompositor::initAllSignals() {
addWLSignal(&m_sWLROutputMgr->events.test, &Events::listen_outputMgrTest, m_sWLROutputMgr, "OutputMgr");
addWLSignal(&m_sWLRInhibitMgr->events.activate, &Events::listen_InhibitActivate, m_sWLRInhibitMgr, "InhibitMgr");
addWLSignal(&m_sWLRInhibitMgr->events.deactivate, &Events::listen_InhibitDeactivate, m_sWLRInhibitMgr, "InhibitMgr");
+ addWLSignal(&m_sWLRPointerConstraints->events.new_constraint, &Events::listen_newConstraint, m_sWLRPointerConstraints, "PointerConstraints");
}
void CCompositor::startCompositor() {
diff --git a/src/Compositor.hpp b/src/Compositor.hpp
index 2435b972..0e036079 100644
--- a/src/Compositor.hpp
+++ b/src/Compositor.hpp
@@ -51,6 +51,8 @@ public:
int m_iDRMFD;
wlr_ext_workspace_manager_v1* m_sWLREXTWorkspaceMgr;
wlr_linux_dmabuf_v1* m_sWLRDmabuf;
+ wlr_pointer_constraints_v1* m_sWLRPointerConstraints;
+ wlr_relative_pointer_manager_v1* m_sWLRRelPointerMgr;
// ------------------------------------------------- //
diff --git a/src/events/Devices.cpp b/src/events/Devices.cpp
index 57fb221f..ade94b5d 100644
--- a/src/events/Devices.cpp
+++ b/src/events/Devices.cpp
@@ -80,4 +80,40 @@ void Events::listener_newInput(wl_listener* listener, void* data) {
uint32_t capabilities = WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_KEYBOARD;
wlr_seat_set_capabilities(g_pCompositor->m_sSeat.seat, capabilities);
+}
+
+void Events::listener_newConstraint(wl_listener* listener, void* data) {
+ const auto PCONSTRAINT = (wlr_pointer_constraint_v1*)data;
+
+ Debug::log(LOG, "New mouse constraint at %x", PCONSTRAINT);
+
+ g_pInputManager->m_lConstraints.emplace_back();
+ const auto CONSTRAINT = &g_pInputManager->m_lConstraints.back();
+
+ CONSTRAINT->pMouse = g_pCompositor->m_sSeat.mouse;
+ CONSTRAINT->constraint = PCONSTRAINT;
+
+ CONSTRAINT->hyprListener_destroyConstraint.initCallback(&PCONSTRAINT->events.destroy, &Events::listener_destroyConstraint, CONSTRAINT, "Constraint");
+ CONSTRAINT->hyprListener_setConstraintRegion.initCallback(&PCONSTRAINT->events.set_region, &Events::listener_setConstraintRegion, CONSTRAINT, "Constraint");
+
+ if (g_pCompositor->m_pLastFocus == PCONSTRAINT->surface) {
+ g_pInputManager->constrainMouse(CONSTRAINT->pMouse, PCONSTRAINT);
+ }
+}
+
+void Events::listener_destroyConstraint(void* owner, void* data) {
+ const auto PCONSTRAINT = (SConstraint*)owner;
+
+ if (PCONSTRAINT->pMouse->currentConstraint == PCONSTRAINT->constraint) {
+ PCONSTRAINT->pMouse->hyprListener_commitConstraint.removeCallback();
+ PCONSTRAINT->pMouse->currentConstraint = nullptr;
+ }
+
+ Debug::log(LOG, "Unconstrained mouse from %x", PCONSTRAINT->constraint);
+
+ g_pInputManager->m_lConstraints.remove(*PCONSTRAINT);
+}
+
+void Events::listener_setConstraintRegion(void* owner, void* data) {
+ // no
} \ No newline at end of file
diff --git a/src/events/Events.hpp b/src/events/Events.hpp
index 4e8246fe..ab910aee 100644
--- a/src/events/Events.hpp
+++ b/src/events/Events.hpp
@@ -65,6 +65,11 @@ namespace Events {
DYNLISTENFUNC(keyboardKey);
DYNLISTENFUNC(keyboardMod);
DYNLISTENFUNC(keyboardDestroy);
+
+ DYNLISTENFUNC(commitConstraint);
+ LISTENER(newConstraint);
+ DYNLISTENFUNC(setConstraintRegion);
+ DYNLISTENFUNC(destroyConstraint);
// Various
LISTENER(requestMouse);
diff --git a/src/helpers/WLClasses.hpp b/src/helpers/WLClasses.hpp
index 295ec41f..4011dc06 100644
--- a/src/helpers/WLClasses.hpp
+++ b/src/helpers/WLClasses.hpp
@@ -60,6 +60,32 @@ struct SKeyboard {
}
};
+struct SMouse {
+ wlr_input_device* mouse = nullptr;
+
+ wlr_pointer_constraint_v1* currentConstraint = nullptr;
+
+ pixman_region32_t confinedTo;
+
+ DYNLISTENER(commitConstraint);
+
+ bool operator==(const SMouse& b) {
+ return mouse == b.mouse;
+ }
+};
+
+struct SConstraint {
+ SMouse* pMouse = nullptr;
+ wlr_pointer_constraint_v1* constraint = nullptr;
+
+ DYNLISTENER(setConstraintRegion);
+ DYNLISTENER(destroyConstraint);
+
+ bool operator==(const SConstraint& b) {
+ return constraint == b.constraint;
+ }
+};
+
struct SMonitor;
struct SXDGPopup {
@@ -87,6 +113,8 @@ struct SXDGPopup {
struct SSeat {
wlr_seat* seat = nullptr;
wl_client* exclusiveClient = nullptr;
+
+ SMouse* mouse = nullptr;
};
struct SDrag {
diff --git a/src/includes.hpp b/src/includes.hpp
index 45347672..0b77cdb8 100644
--- a/src/includes.hpp
+++ b/src/includes.hpp
@@ -79,6 +79,8 @@ extern "C" {
#include <X11/Xproto.h>
#include <wlr/render/gles2.h>
#include <wlr/render/wlr_texture.h>
+#include <wlr/types/wlr_pointer_constraints_v1.h>
+#include <wlr/types/wlr_relative_pointer_v1.h>
}
#undef class
diff --git a/src/managers/InputManager.cpp b/src/managers/InputManager.cpp
index c45a5530..8380d92d 100644
--- a/src/managers/InputManager.cpp
+++ b/src/managers/InputManager.cpp
@@ -5,6 +5,8 @@ void CInputManager::onMouseMoved(wlr_pointer_motion_event* e) {
float sensitivity = g_pConfigManager->getFloat("general:sensitivity");
+ wlr_relative_pointer_manager_v1_send_relative_motion(g_pCompositor->m_sWLRRelPointerMgr, g_pCompositor->m_sSeat.seat, (uint64_t)e->time_msec * 1000, e->delta_x, e->delta_y, e->unaccel_dx, e->unaccel_dy);
+
wlr_cursor_move(g_pCompositor->m_sWLRCursor, &e->pointer->base, e->delta_x * sensitivity, e->delta_y * sensitivity);
mouseMoveUnified(e->time_msec);
@@ -129,6 +131,19 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
wlr_seat_pointer_notify_enter(g_pCompositor->m_sSeat.seat, foundSurface, surfaceLocal.x, surfaceLocal.y);
wlr_seat_pointer_notify_motion(g_pCompositor->m_sSeat.seat, time, surfaceLocal.x, surfaceLocal.y);
+
+ // constraints
+ // All constraints TODO: multiple mice?
+ if (g_pCompositor->m_sSeat.mouse->currentConstraint) {
+ const auto CONSTRAINTWINDOW = g_pCompositor->getWindowFromSurface(g_pCompositor->m_sSeat.mouse->currentConstraint->surface);
+
+ if (g_pCompositor->m_pLastWindow == CONSTRAINTWINDOW) {
+ // todo: this is incorrect, but it will work in most cases for now
+ // i made this cuz i wanna play minecraft lol
+ Vector2D deltaToMiddle = (CONSTRAINTWINDOW->m_vRealPosition + CONSTRAINTWINDOW->m_vRealSize / 2.f) - mouseCoords;
+ wlr_cursor_move(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sSeat.mouse->mouse, deltaToMiddle.x, deltaToMiddle.y);
+ }
+ }
}
void CInputManager::onMouseButton(wlr_pointer_button_event* e) {
@@ -239,6 +254,11 @@ void CInputManager::setKeyboardLayout() {
}
void CInputManager::newMouse(wlr_input_device* mouse) {
+ m_lMice.emplace_back();
+ const auto PMOUSE = &m_lMice.back();
+
+ PMOUSE->mouse = mouse;
+
if (wlr_input_device_is_libinput(mouse)) {
const auto LIBINPUTDEV = (libinput_device*)wlr_libinput_get_device_handle(mouse);
@@ -251,6 +271,8 @@ void CInputManager::newMouse(wlr_input_device* mouse) {
wlr_cursor_attach_input_device(g_pCompositor->m_sWLRCursor, mouse);
+ g_pCompositor->m_sSeat.mouse = PMOUSE;
+
Debug::log(LOG, "New mouse created, pointer WLR: %x", mouse);
}
@@ -263,7 +285,14 @@ void CInputManager::destroyKeyboard(SKeyboard* pKeyboard) {
}
void CInputManager::destroyMouse(wlr_input_device* mouse) {
- //
+ for (auto& m : m_lMice) {
+ if (m.mouse == mouse) {
+ m_lMice.remove(m);
+ return;
+ }
+ }
+
+ g_pCompositor->m_sSeat.mouse = m_lMice.size() > 0 ? &m_lMice.front() : nullptr;
}
void CInputManager::onKeyboardKey(wlr_keyboard_key_event* e, SKeyboard* pKeyboard) {
@@ -314,4 +343,70 @@ void CInputManager::updateDragIcon() {
default:
break;
}
-} \ No newline at end of file
+}
+
+void CInputManager::recheckConstraint(SMouse* pMouse) {
+ if (!pMouse->currentConstraint)
+ return;
+
+ const auto MOUSECOORDS = getMouseCoordsInternal();
+ const auto PWINDOW = g_pCompositor->getWindowFromSurface(pMouse->currentConstraint->surface);
+ const auto PREGION = &pMouse->currentConstraint->region;
+
+ if (pMouse->currentConstraint->type == WLR_POINTER_CONSTRAINT_V1_CONFINED) {
+ pixman_region32_copy(&pMouse->confinedTo, PREGION);
+ } else {
+ pixman_region32_clear(&pMouse->confinedTo);
+ }
+
+ Debug::log(LOG, "Constraint rechecked: %i, %i to %i, %i", PREGION->extents.x1, PREGION->extents.y1, PREGION->extents.x2, PREGION->extents.y2);
+}
+
+void CInputManager::constrainMouse(SMouse* pMouse, wlr_pointer_constraint_v1* constraint) {
+
+ if (pMouse->currentConstraint == constraint)
+ return;
+
+ const auto PWINDOW = g_pCompositor->getWindowFromSurface(constraint->surface);
+ const auto MOUSECOORDS = getMouseCoordsInternal();
+
+ pMouse->hyprListener_commitConstraint.removeCallback();
+
+ if (pMouse->currentConstraint) {
+ if (!constraint) {
+ // warpe to hint
+
+ if (constraint->current.committed & WLR_POINTER_CONSTRAINT_V1_STATE_CURSOR_HINT) {
+ if (PWINDOW) {
+ wlr_cursor_warp(g_pCompositor->m_sWLRCursor, nullptr,
+ constraint->current.cursor_hint.x + PWINDOW->m_vRealPosition.x, constraint->current.cursor_hint.y + PWINDOW->m_vRealPosition.y);
+
+ wlr_seat_pointer_warp(constraint->seat, constraint->current.cursor_hint.x, constraint->current.cursor_hint.y);
+ }
+ }
+ }
+
+ wlr_pointer_constraint_v1_send_deactivated(pMouse->currentConstraint);
+ }
+
+ pMouse->currentConstraint = constraint;
+
+ if (pixman_region32_not_empty(&constraint->current.region)) {
+ pixman_region32_intersect(&constraint->region, &constraint->surface->input_region, &constraint->current.region);
+ } else {
+ pixman_region32_copy(&constraint->region, &constraint->surface->input_region);
+ }
+
+ // warp to the constraint
+ recheckConstraint(pMouse);
+
+ wlr_pointer_constraint_v1_send_activated(pMouse->currentConstraint);
+
+ pMouse->hyprListener_commitConstraint.initCallback(&pMouse->currentConstraint->surface->events.commit, &Events::listener_commitConstraint, pMouse, "Mouse constraint commit");
+
+ Debug::log(LOG, "Constrained mouse to %x", pMouse->currentConstraint);
+}
+
+void Events::listener_commitConstraint(void* owner, void* data) {
+ //g_pInputManager->recheckConstraint((SMouse*)owner);
+}
diff --git a/src/managers/InputManager.hpp b/src/managers/InputManager.hpp
index c0d2c708..6850929b 100644
--- a/src/managers/InputManager.hpp
+++ b/src/managers/InputManager.hpp
@@ -19,6 +19,9 @@ public:
void destroyKeyboard(SKeyboard*);
void destroyMouse(wlr_input_device*);
+ void constrainMouse(SMouse*, wlr_pointer_constraint_v1*);
+ void recheckConstraint(SMouse*);
+
Vector2D getMouseCoordsInternal();
void refocus();
@@ -33,12 +36,14 @@ public:
SDrag m_sDrag;
+ std::list<SConstraint> m_lConstraints;
+
private:
std::list<SKeyboard> m_lKeyboards;
+ std::list<SMouse> m_lMice;
void mouseMoveUnified(uint32_t, bool refocus = false);
-
};
inline std::unique_ptr<CInputManager> g_pInputManager; \ No newline at end of file