summaryrefslogtreecommitdiff
path: root/src/managers
diff options
context:
space:
mode:
authorVaxry <vaxry@vaxry.net>2024-05-10 18:27:57 +0100
committerVaxry <43317083+vaxerski@users.noreply.github.com>2024-05-14 23:02:24 +0100
commit121d3a72137d4780602cf245704615f63357ea22 (patch)
treeb25c8a3ee7b239006281f0e00110d1c324b8cedc /src/managers
parent4cdddcfe466cb21db81af0ac39e51cc15f574da9 (diff)
wl_seat: move to hyprland impl
Diffstat (limited to 'src/managers')
-rw-r--r--src/managers/KeybindManager.cpp64
-rw-r--r--src/managers/PointerManager.cpp5
-rw-r--r--src/managers/ProtocolManager.cpp5
-rw-r--r--src/managers/SeatManager.cpp391
-rw-r--r--src/managers/SeatManager.hpp106
-rw-r--r--src/managers/input/InputManager.cpp134
-rw-r--r--src/managers/input/InputManager.hpp4
-rw-r--r--src/managers/input/Tablets.cpp5
-rw-r--r--src/managers/input/Touch.cpp14
9 files changed, 605 insertions, 123 deletions
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index c5d7067d..ead83fa8 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -6,6 +6,7 @@
#include "TokenManager.hpp"
#include "../protocols/ShortcutsInhibit.hpp"
#include "../devices/IKeyboard.hpp"
+#include "../managers/SeatManager.hpp"
#include <regex>
#include <tuple>
@@ -522,7 +523,7 @@ void CKeybindManager::onSwitchOffEvent(const std::string& switchName) {
int repeatKeyHandler(void* data) {
SKeybind** ppActiveKeybind = (SKeybind**)data;
- if (!*ppActiveKeybind || g_pCompositor->m_sSeat.keyboard.expired())
+ if (!*ppActiveKeybind || g_pSeatManager->keyboard.expired())
return 0;
const auto DISPATCHER = g_pKeybindManager->m_mDispatchers.find((*ppActiveKeybind)->handler);
@@ -530,16 +531,13 @@ int repeatKeyHandler(void* data) {
Debug::log(LOG, "Keybind repeat triggered, calling dispatcher.");
DISPATCHER->second((*ppActiveKeybind)->arg);
- wl_event_source_timer_update(g_pKeybindManager->m_pActiveKeybindEventSource, 1000 / g_pCompositor->m_sSeat.keyboard->repeatRate);
+ wl_event_source_timer_update(g_pKeybindManager->m_pActiveKeybindEventSource, 1000 / g_pSeatManager->keyboard->wlr()->repeat_info.rate);
return 0;
}
bool CKeybindManager::handleKeybinds(const uint32_t modmask, const SPressedKeyWithMods& key, bool pressed) {
- bool found = false;
-
- if (g_pCompositor->m_sSeat.exclusiveClient)
- Debug::log(LOG, "Keybind handling only locked (inhibitor)");
+ bool found = false;
static auto PDISABLEINHIBIT = CConfigValue<Hyprlang::INT>("binds:disable_keybind_grabbing");
@@ -558,8 +556,7 @@ bool CKeybindManager::handleKeybinds(const uint32_t modmask, const SPressedKeyWi
if (!k.locked && g_pSessionLockManager->isSessionLocked())
continue;
- if (!IGNORECONDITIONS &&
- ((modmask != k.modmask && !k.ignoreMods) || (g_pCompositor->m_sSeat.exclusiveClient && !k.locked) || k.submap != m_szCurrentSelectedSubmap || k.shadowed))
+ if (!IGNORECONDITIONS && ((modmask != k.modmask && !k.ignoreMods) || k.submap != m_szCurrentSelectedSubmap || k.shadowed))
continue;
if (!key.keyName.empty()) {
@@ -653,7 +650,7 @@ bool CKeybindManager::handleKeybinds(const uint32_t modmask, const SPressedKeyWi
m_pActiveKeybind = &k;
m_pActiveKeybindEventSource = wl_event_loop_add_timer(g_pCompositor->m_sWLEventLoop, repeatKeyHandler, &m_pActiveKeybind);
- const auto PACTIVEKEEB = g_pCompositor->m_sSeat.keyboard.lock();
+ const auto PACTIVEKEEB = g_pSeatManager->keyboard.lock();
wl_event_source_timer_update(m_pActiveKeybindEventSource, PACTIVEKEEB->repeatDelay);
}
@@ -1901,47 +1898,42 @@ void CKeybindManager::pass(std::string regexp) {
return;
}
- const auto KEYBOARD = wlr_seat_get_keyboard(g_pCompositor->m_sSeat.seat);
-
- if (!KEYBOARD) {
+ if (!g_pSeatManager->keyboard) {
Debug::log(ERR, "No kb in pass?");
return;
}
- const auto XWTOXW = PWINDOW->m_bIsX11 && g_pCompositor->m_pLastWindow.lock() && g_pCompositor->m_pLastWindow->m_bIsX11;
- const auto SL = Vector2D(g_pCompositor->m_sSeat.seat->pointer_state.sx, g_pCompositor->m_sSeat.seat->pointer_state.sy);
- uint32_t keycodes[32] = {0};
- const auto LASTSRF = g_pCompositor->m_pLastFocus;
+ const auto XWTOXW = PWINDOW->m_bIsX11 && g_pCompositor->m_pLastWindow.lock() && g_pCompositor->m_pLastWindow->m_bIsX11;
+ const auto LASTSRF = g_pCompositor->m_pLastFocus;
// pass all mf shit
if (!XWTOXW) {
if (g_pKeybindManager->m_uLastCode != 0)
- wlr_seat_keyboard_enter(g_pCompositor->m_sSeat.seat, PWINDOW->m_pWLSurface.wlr(), keycodes, 0, &KEYBOARD->modifiers);
+ g_pSeatManager->setKeyboardFocus(PWINDOW->m_pWLSurface.wlr());
else
- wlr_seat_pointer_enter(g_pCompositor->m_sSeat.seat, PWINDOW->m_pWLSurface.wlr(), 1, 1);
+ g_pSeatManager->setPointerFocus(PWINDOW->m_pWLSurface.wlr(), {1, 1});
}
- wlr_keyboard_modifiers kbmods = {g_pInputManager->accumulateModsFromAllKBs(), 0, 0, 0};
- wlr_seat_keyboard_notify_modifiers(g_pCompositor->m_sSeat.seat, &kbmods);
+ g_pSeatManager->sendKeyboardMods(g_pInputManager->accumulateModsFromAllKBs(), 0, 0, 0);
if (g_pKeybindManager->m_iPassPressed == 1) {
if (g_pKeybindManager->m_uLastCode != 0)
- wlr_seat_keyboard_notify_key(g_pCompositor->m_sSeat.seat, g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastCode - 8, WLR_BUTTON_PRESSED);
+ g_pSeatManager->sendKeyboardKey(g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastCode - 8, WL_KEYBOARD_KEY_STATE_PRESSED);
else
- wlr_seat_pointer_notify_button(g_pCompositor->m_sSeat.seat, g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastMouseCode, WL_POINTER_BUTTON_STATE_PRESSED);
+ g_pSeatManager->sendPointerButton(g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastMouseCode, WL_POINTER_BUTTON_STATE_PRESSED);
} else if (g_pKeybindManager->m_iPassPressed == 0)
if (g_pKeybindManager->m_uLastCode != 0)
- wlr_seat_keyboard_notify_key(g_pCompositor->m_sSeat.seat, g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastCode - 8, WLR_BUTTON_RELEASED);
+ g_pSeatManager->sendKeyboardKey(g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastCode - 8, WL_KEYBOARD_KEY_STATE_RELEASED);
else
- wlr_seat_pointer_notify_button(g_pCompositor->m_sSeat.seat, g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastMouseCode, WL_POINTER_BUTTON_STATE_RELEASED);
+ g_pSeatManager->sendPointerButton(g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastMouseCode, WL_POINTER_BUTTON_STATE_RELEASED);
else {
// dynamic call of the dispatcher
if (g_pKeybindManager->m_uLastCode != 0) {
- wlr_seat_keyboard_notify_key(g_pCompositor->m_sSeat.seat, g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastCode - 8, WLR_BUTTON_PRESSED);
- wlr_seat_keyboard_notify_key(g_pCompositor->m_sSeat.seat, g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastCode - 8, WLR_BUTTON_RELEASED);
+ g_pSeatManager->sendKeyboardKey(g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastCode - 8, WL_KEYBOARD_KEY_STATE_PRESSED);
+ g_pSeatManager->sendKeyboardKey(g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastCode - 8, WL_KEYBOARD_KEY_STATE_RELEASED);
} else {
- wlr_seat_pointer_notify_button(g_pCompositor->m_sSeat.seat, g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastMouseCode, WL_POINTER_BUTTON_STATE_PRESSED);
- wlr_seat_pointer_notify_button(g_pCompositor->m_sSeat.seat, g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastMouseCode, WL_POINTER_BUTTON_STATE_RELEASED);
+ g_pSeatManager->sendPointerButton(g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastMouseCode, WL_POINTER_BUTTON_STATE_PRESSED);
+ g_pSeatManager->sendPointerButton(g_pKeybindManager->m_uTimeLastMs, g_pKeybindManager->m_uLastMouseCode, WL_POINTER_BUTTON_STATE_RELEASED);
}
}
@@ -1949,22 +1941,24 @@ void CKeybindManager::pass(std::string regexp) {
return;
// Massive hack:
- // this will make wlroots NOT send the leave event to XWayland apps, provided we are not on an XWayland window already.
+ // this will make g_pSeatManager NOT send the leave event to XWayland apps, provided we are not on an XWayland window already.
// please kill me
if (PWINDOW->m_bIsX11) {
if (g_pKeybindManager->m_uLastCode != 0) {
- g_pCompositor->m_sSeat.seat->keyboard_state.focused_client = nullptr;
- g_pCompositor->m_sSeat.seat->keyboard_state.focused_surface = nullptr;
+ g_pSeatManager->state.keyboardFocus = nullptr;
+ g_pSeatManager->state.keyboardFocusResource.reset();
} else {
- g_pCompositor->m_sSeat.seat->pointer_state.focused_client = nullptr;
- g_pCompositor->m_sSeat.seat->pointer_state.focused_surface = nullptr;
+ g_pSeatManager->state.pointerFocus = nullptr;
+ g_pSeatManager->state.pointerFocusResource.reset();
}
}
+ const auto SL = PWINDOW->m_vRealPosition.goal() - g_pInputManager->getMouseCoordsInternal();
+
if (g_pKeybindManager->m_uLastCode != 0)
- wlr_seat_keyboard_enter(g_pCompositor->m_sSeat.seat, LASTSRF, KEYBOARD->keycodes, KEYBOARD->num_keycodes, &KEYBOARD->modifiers);
+ g_pSeatManager->setKeyboardFocus(LASTSRF);
else
- wlr_seat_pointer_enter(g_pCompositor->m_sSeat.seat, PWINDOW->m_pWLSurface.wlr(), SL.x, SL.y);
+ g_pSeatManager->setPointerFocus(PWINDOW->m_pWLSurface.wlr(), SL);
}
void CKeybindManager::layoutmsg(std::string msg) {
diff --git a/src/managers/PointerManager.cpp b/src/managers/PointerManager.cpp
index 3ddd7c23..60d11e7f 100644
--- a/src/managers/PointerManager.cpp
+++ b/src/managers/PointerManager.cpp
@@ -3,6 +3,7 @@
#include "../config/ConfigValue.hpp"
#include "../protocols/PointerGestures.hpp"
#include "../protocols/FractionalScale.hpp"
+#include "SeatManager.hpp"
#include <wlr/interfaces/wlr_output.h>
#include <wlr/render/interface.h>
#include <wlr/render/wlr_renderer.h>
@@ -774,7 +775,7 @@ void CPointerManager::attachPointer(SP<IPointer> pointer) {
});
listener->frame = pointer->pointerEvents.frame.registerListener([this] (std::any e) {
- wlr_seat_pointer_notify_frame(g_pCompositor->m_sSeat.seat);
+ g_pSeatManager->sendPointerFrame();
});
listener->swipeBegin = pointer->pointerEvents.swipeBegin.registerListener([this] (std::any e) {
@@ -865,7 +866,7 @@ void CPointerManager::attachTouch(SP<ITouch> touch) {
});
listener->frame = touch->touchEvents.frame.registerListener([this] (std::any e) {
- wlr_seat_touch_notify_frame(g_pCompositor->m_sSeat.seat);
+ g_pSeatManager->sendTouchFrame();
});
// clang-format on
diff --git a/src/managers/ProtocolManager.cpp b/src/managers/ProtocolManager.cpp
index 2904ed53..f853e16f 100644
--- a/src/managers/ProtocolManager.cpp
+++ b/src/managers/ProtocolManager.cpp
@@ -28,9 +28,14 @@
#include "../protocols/Tablet.hpp"
#include "../protocols/LayerShell.hpp"
#include "../protocols/PresentationTime.hpp"
+#include "../protocols/core/Seat.hpp"
CProtocolManager::CProtocolManager() {
+ // Core
+ PROTO::seat = std::make_unique<CWLSeatProtocol>(&wl_seat_interface, 9, "WLSeat");
+
+ // Extensions
PROTO::tearing = std::make_unique<CTearingControlProtocol>(&wp_tearing_control_manager_v1_interface, 1, "TearingControl");
PROTO::fractional = std::make_unique<CFractionalScaleProtocol>(&wp_fractional_scale_manager_v1_interface, 1, "FractionalScale");
PROTO::xdgOutput = std::make_unique<CXDGOutputProtocol>(&zxdg_output_manager_v1_interface, 3, "XDGOutput");
diff --git a/src/managers/SeatManager.cpp b/src/managers/SeatManager.cpp
new file mode 100644
index 00000000..f9d394b5
--- /dev/null
+++ b/src/managers/SeatManager.cpp
@@ -0,0 +1,391 @@
+#include "SeatManager.hpp"
+#include "../protocols/core/Seat.hpp"
+#include "../Compositor.hpp"
+#include "../devices/IKeyboard.hpp"
+#include <algorithm>
+
+CSeatManager::CSeatManager() {
+ listeners.newSeatResource = PROTO::seat->events.newSeatResource.registerListener([this](std::any res) { onNewSeatResource(std::any_cast<SP<CWLSeatResource>>(res)); });
+}
+
+CSeatManager::SSeatResourceContainer::SSeatResourceContainer(SP<CWLSeatResource> res) {
+ resource = res;
+ listeners.destroy = res->events.destroy.registerListener(
+ [this](std::any data) { std::erase_if(g_pSeatManager->seatResources, [this](const auto& e) { return e->resource.expired() || e->resource == resource; }); });
+}
+
+void CSeatManager::onNewSeatResource(SP<CWLSeatResource> resource) {
+ seatResources.emplace_back(makeShared<SSeatResourceContainer>(resource));
+}
+
+SP<CSeatManager::SSeatResourceContainer> CSeatManager::containerForResource(SP<CWLSeatResource> seatResource) {
+ for (auto& c : seatResources) {
+ if (c->resource == seatResource)
+ return c;
+ }
+
+ return nullptr;
+}
+
+uint32_t CSeatManager::nextSerial(SP<CWLSeatResource> seatResource) {
+ if (!seatResource)
+ return 0;
+
+ auto container = containerForResource(seatResource);
+
+ ASSERT(container);
+
+ auto serial = wl_display_next_serial(g_pCompositor->m_sWLDisplay);
+
+ container->serials.emplace_back(serial);
+
+ if (container->serials.size() > MAX_SERIAL_STORE_LEN)
+ container->serials.erase(container->serials.begin());
+
+ return serial;
+}
+
+bool CSeatManager::serialValid(SP<CWLSeatResource> seatResource, uint32_t serial) {
+ if (!seatResource)
+ return false;
+
+ auto container = containerForResource(seatResource);
+
+ ASSERT(container);
+
+ for (auto it = container->serials.begin(); it != container->serials.end(); ++it) {
+ if (*it == serial) {
+ container->serials.erase(it);
+ return true;
+ }
+ }
+
+ return false;
+}
+
+void CSeatManager::updateCapabilities(uint32_t capabilities) {
+ PROTO::seat->updateCapabilities(capabilities);
+}
+
+void CSeatManager::setMouse(SP<IPointer> MAUZ) {
+ if (mouse == MAUZ)
+ return;
+
+ mouse = MAUZ;
+}
+
+void CSeatManager::setKeyboard(SP<IKeyboard> KEEB) {
+ if (keyboard == KEEB)
+ return;
+
+ if (keyboard)
+ keyboard->active = false;
+ keyboard = KEEB;
+
+ if (KEEB) {
+ KEEB->active = true;
+ PROTO::seat->updateRepeatInfo(KEEB->wlr()->repeat_info.rate, KEEB->wlr()->repeat_info.delay);
+ }
+ PROTO::seat->updateKeymap();
+}
+
+void CSeatManager::setKeyboardFocus(wlr_surface* surf) {
+ if (state.keyboardFocus == surf)
+ return;
+
+ if (!keyboard || !keyboard->wlr()) {
+ Debug::log(ERR, "BUG THIS: setKeyboardFocus without a valid keyboard set");
+ return;
+ }
+
+ hyprListener_keyboardSurfaceDestroy.removeCallback();
+
+ if (state.keyboardFocusResource) {
+ for (auto& k : state.keyboardFocusResource->keyboards) {
+ if (!k)
+ continue;
+
+ k->sendLeave();
+ }
+ }
+
+ state.keyboardFocusResource.reset();
+ state.keyboardFocus = surf;
+
+ if (!surf) {
+ events.keyboardFocusChange.emit();
+ return;
+ }
+
+ auto client = wl_resource_get_client(surf->resource);
+ for (auto& r : seatResources) {
+ if (r->resource->client() == client) {
+ state.keyboardFocusResource = r->resource;
+ for (auto& k : state.keyboardFocusResource->keyboards) {
+ if (!k)
+ continue;
+
+ k->sendEnter(surf);
+ k->sendMods(keyboard->wlr()->modifiers.depressed, keyboard->wlr()->modifiers.latched, keyboard->wlr()->modifiers.locked, keyboard->wlr()->modifiers.group);
+ }
+
+ break;
+ }
+ }
+
+ hyprListener_keyboardSurfaceDestroy.initCallback(
+ &surf->events.destroy, [this](void* owner, void* data) { setKeyboardFocus(nullptr); }, nullptr, "CSeatManager");
+
+ events.keyboardFocusChange.emit();
+}
+
+void CSeatManager::sendKeyboardKey(uint32_t timeMs, uint32_t key, wl_keyboard_key_state state_) {
+ if (!state.keyboardFocusResource)
+ return;
+
+ for (auto& k : state.keyboardFocusResource->keyboards) {
+ if (!k)
+ continue;
+
+ k->sendKey(timeMs, key, state_);
+ }
+}
+
+void CSeatManager::sendKeyboardMods(uint32_t depressed, uint32_t latched, uint32_t locked, uint32_t group) {
+ if (!state.keyboardFocusResource)
+ return;
+
+ for (auto& k : state.keyboardFocusResource->keyboards) {
+ if (!k)
+ continue;
+
+ k->sendMods(depressed, latched, locked, group);
+ }
+}
+
+void CSeatManager::setPointerFocus(wlr_surface* surf, const Vector2D& local) {
+ if (state.pointerFocus == surf)
+ return;
+
+ if (!mouse || !mouse->wlr()) {
+ Debug::log(ERR, "BUG THIS: setPointerFocus without a valid mouse set");
+ return;
+ }
+
+ hyprListener_pointerSurfaceDestroy.removeCallback();
+
+ if (state.pointerFocusResource) {
+ for (auto& p : state.pointerFocusResource->pointers) {
+ if (!p)
+ continue;
+
+ p->sendLeave();
+ }
+ }
+
+ state.pointerFocusResource.reset();
+ state.pointerFocus = surf;
+
+ if (!surf) {
+ events.pointerFocusChange.emit();
+ return;
+ }
+
+ auto client = wl_resource_get_client(surf->resource);
+ for (auto& r : seatResources) {
+ if (r->resource->client() == client) {
+ state.pointerFocusResource = r->resource;
+ for (auto& p : state.pointerFocusResource->pointers) {
+ if (!p)
+ continue;
+
+ p->sendEnter(surf, local);
+ }
+
+ break;
+ }
+ }
+
+ hyprListener_pointerSurfaceDestroy.initCallback(
+ &surf->events.destroy, [this](void* owner, void* data) { setPointerFocus(nullptr, {}); }, nullptr, "CSeatManager");
+
+ events.pointerFocusChange.emit();
+}
+
+void CSeatManager::sendPointerMotion(uint32_t timeMs, const Vector2D& local) {
+ if (!state.pointerFocusResource)
+ return;
+
+ for (auto& p : state.pointerFocusResource->pointers) {
+ if (!p)
+ continue;
+
+ p->sendMotion(timeMs, local);
+ }
+}
+
+void CSeatManager::sendPointerButton(uint32_t timeMs, uint32_t key, wl_pointer_button_state state_) {
+ if (!state.pointerFocusResource)
+ return;
+
+ for (auto& p : state.pointerFocusResource->pointers) {
+ if (!p)
+ continue;
+
+ p->sendButton(timeMs, key, state_);
+ }
+}
+
+void CSeatManager::sendPointerFrame() {
+ if (!state.pointerFocusResource)
+ return;
+
+ for (auto& p : state.pointerFocusResource->pointers) {
+ if (!p)
+ continue;
+
+ p->sendFrame();
+ }
+}
+
+void CSeatManager::sendPointerAxis(uint32_t timeMs, wl_pointer_axis axis, double value, int32_t discrete, wl_pointer_axis_source source,
+ wl_pointer_axis_relative_direction relative) {
+ if (!state.pointerFocusResource)
+ return;
+
+ for (auto& p : state.pointerFocusResource->pointers) {
+ if (!p)
+ continue;
+
+ p->sendAxis(timeMs, axis, value);
+ p->sendAxisSource(source);
+ p->sendAxisRelativeDirection(axis, relative);
+ }
+}
+
+void CSeatManager::sendTouchDown(wlr_surface* surf, uint32_t timeMs, int32_t id, const Vector2D& local) {
+ if (state.touchFocus == surf)
+ return;
+
+ hyprListener_touchSurfaceDestroy.removeCallback();
+
+ if (state.touchFocusResource) {
+ for (auto& t : state.touchFocusResource->touches) {
+ if (!t)
+ continue;
+
+ t->sendUp(timeMs, id);
+ }
+ }
+
+ state.touchFocusResource.reset();
+ state.touchFocus = surf;
+
+ if (!surf) {
+ events.touchFocusChange.emit();
+ return;
+ }
+
+ auto client = wl_resource_get_client(surf->resource);
+ for (auto& r : seatResources) {
+ if (r->resource->client() == client) {
+ state.touchFocusResource = r->resource;
+ for (auto& t : state.touchFocusResource->touches) {
+ if (!t)
+ continue;
+
+ t->sendDown(surf, timeMs, id, local);
+ }
+
+ break;
+ }
+ }
+
+ hyprListener_touchSurfaceDestroy.initCallback(
+ &surf->events.destroy, [this, timeMs, id](void* owner, void* data) { sendTouchUp(timeMs + 10, id); }, nullptr, "CSeatManager");
+
+ events.touchFocusChange.emit();
+}
+
+void CSeatManager::sendTouchUp(uint32_t timeMs, int32_t id) {
+ sendTouchDown(nullptr, timeMs, id, {});
+}
+
+void CSeatManager::sendTouchMotion(uint32_t timeMs, int32_t id, const Vector2D& local) {
+ if (!state.touchFocusResource)
+ return;
+
+ for (auto& t : state.touchFocusResource->touches) {
+ if (!t)
+ continue;
+
+ t->sendMotion(timeMs, id, local);
+ }
+}
+
+void CSeatManager::sendTouchFrame() {
+ if (!state.touchFocusResource)
+ return;
+
+ for (auto& t : state.touchFocusResource->touches) {
+ if (!t)
+ continue;
+
+ t->sendFrame();
+ }
+}
+
+void CSeatManager::sendTouchCancel() {
+ if (!state.touchFocusResource)
+ return;
+
+ for (auto& t : state.touchFocusResource->touches) {
+ if (!t)
+ continue;
+
+ t->sendCancel();
+ }
+}
+
+void CSeatManager::sendTouchShape(int32_t id, const Vector2D& shape) {
+ if (!state.touchFocusResource)
+ return;
+
+ for (auto& t : state.touchFocusResource->touches) {
+ if (!t)
+ continue;
+
+ t->sendShape(id, shape);
+ }
+}
+
+void CSeatManager::sendTouchOrientation(int32_t id, double angle) {
+ if (!state.touchFocusResource)
+ return;
+
+ for (auto& t : state.touchFocusResource->touches) {
+ if (!t)
+ continue;
+
+ t->sendOrientation(id, angle);
+ }
+}
+
+void CSeatManager::onSetCursor(SP<CWLSeatResource> seatResource, uint32_t serial, wlr_surface* surf, const Vector2D& hotspot) {
+ if (!state.pointerFocusResource || !seatResource || seatResource->client() != state.pointerFocusResource->client()) {
+ Debug::log(LOG, "[seatmgr] Rejecting a setCursor because the client ain't in focus");
+ return;
+ }
+
+ // TODO: fix this. Probably should be done in the CWlPointer as the serial could be lost by us.
+ // if (!serialValid(seatResource, serial)) {
+ // Debug::log(LOG, "[seatmgr] Rejecting a setCursor because the serial is invalid");
+ // return;
+ // }
+
+ events.setCursor.emit(SSetCursorEvent{surf, hotspot});
+}
+
+SP<CWLSeatResource> CSeatManager::seatResourceForClient(wl_client* client) {
+ return PROTO::seat->seatResourceForClient(client);
+}
diff --git a/src/managers/SeatManager.hpp b/src/managers/SeatManager.hpp
new file mode 100644
index 00000000..ef114024
--- /dev/null
+++ b/src/managers/SeatManager.hpp
@@ -0,0 +1,106 @@
+#pragma once
+
+#include <wayland-server-protocol.h>
+#include "../helpers/WLListener.hpp"
+#include "../macros.hpp"
+#include "../helpers/signal/Signal.hpp"
+#include "../helpers/Vector2D.hpp"
+#include <vector>
+
+constexpr size_t MAX_SERIAL_STORE_LEN = 100;
+
+struct wlr_surface;
+class CWLSeatResource;
+class IPointer;
+class IKeyboard;
+
+class CSeatManager {
+ public:
+ CSeatManager();
+
+ void updateCapabilities(uint32_t capabilities); // in IHID caps
+
+ void setMouse(SP<IPointer> mouse);
+ void setKeyboard(SP<IKeyboard> keeb);
+
+ void setKeyboardFocus(wlr_surface* surf);
+ void sendKeyboardKey(uint32_t timeMs, uint32_t key, wl_keyboard_key_state state);
+ void sendKeyboardMods(uint32_t depressed, uint32_t latched, uint32_t locked, uint32_t group);
+
+ void setPointerFocus(wlr_surface* surf, const Vector2D& local);
+ void sendPointerMotion(uint32_t timeMs, const Vector2D& local);
+ void sendPointerButton(uint32_t timeMs, uint32_t key, wl_pointer_button_state state);
+ void sendPointerFrame();
+ void sendPointerAxis(uint32_t timeMs, wl_pointer_axis axis, double value, int32_t discrete, wl_pointer_axis_source source, wl_pointer_axis_relative_direction relative);
+
+ void sendTouchDown(wlr_surface* surf, uint32_t timeMs, int32_t id, const Vector2D& local);
+ void sendTouchUp(uint32_t timeMs, int32_t id);
+ void sendTouchMotion(uint32_t timeMs, int32_t id, const Vector2D& local);
+ void sendTouchFrame();
+ void sendTouchCancel();
+ void sendTouchShape(int32_t id, const Vector2D& shape);
+ void sendTouchOrientation(int32_t id, double angle);
+
+ uint32_t nextSerial(SP<CWLSeatResource> seatResource);
+ // pops the serial if it was valid, meaning it is consumed.
+ bool serialValid(SP<CWLSeatResource> seatResource, uint32_t serial);
+
+ void onSetCursor(SP<CWLSeatResource> seatResource, uint32_t serial, wlr_surface* surf, const Vector2D& hotspot);
+
+ SP<CWLSeatResource> seatResourceForClient(wl_client* client);
+
+ struct {
+ wlr_surface* keyboardFocus = nullptr;
+ WP<CWLSeatResource> keyboardFocusResource;
+
+ wlr_surface* pointerFocus = nullptr;
+ WP<CWLSeatResource> pointerFocusResource;
+
+ wlr_surface* touchFocus = nullptr;
+ WP<CWLSeatResource> touchFocusResource;
+ } state;
+
+ struct SSetCursorEvent {
+ wlr_surface* surf = nullptr;
+ Vector2D hotspot;
+ };
+
+ struct {
+ CSignal keyboardFocusChange;
+ CSignal pointerFocusChange;
+ CSignal touchFocusChange;
+ CSignal setCursor; // SSetCursorEvent
+ } events;
+
+ // do not write to directly, use set...
+ WP<IPointer> mouse;
+ WP<IKeyboard> keyboard;
+
+ private:
+ struct SSeatResourceContainer {
+ SSeatResourceContainer(SP<CWLSeatResource>);
+
+ WP<CWLSeatResource> resource;
+ std::vector<uint32_t> serials; // old -> new
+
+ struct {
+ CHyprSignalListener destroy;
+ } listeners;
+ };
+
+ std::vector<SP<SSeatResourceContainer>> seatResources;
+ void onNewSeatResource(SP<CWLSeatResource> resource);
+ SP<SSeatResourceContainer> containerForResource(SP<CWLSeatResource> seatResource);
+
+ struct {
+ CHyprSignalListener newSeatResource;
+ } listeners;
+
+ DYNLISTENER(keyboardSurfaceDestroy);
+ DYNLISTENER(pointerSurfaceDestroy);
+ DYNLISTENER(touchSurfaceDestroy);
+
+ friend struct SSeatResourceContainer;
+};
+
+inline UP<CSeatManager> g_pSeatManager;
diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
index 958fb255..62d9e687 100644
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@@ -14,6 +14,7 @@
#include "../../protocols/VirtualKeyboard.hpp"
#include "../../protocols/VirtualPointer.hpp"
#include "../../protocols/LayerShell.hpp"
+#include "../../protocols/core/Seat.hpp"
#include "../../devices/Mouse.hpp"
#include "../../devices/VirtualPointer.hpp"
@@ -22,6 +23,7 @@
#include "../../devices/TouchDevice.hpp"
#include "../../managers/PointerManager.hpp"
+#include "../../managers/SeatManager.hpp"
CInputManager::CInputManager() {
m_sListeners.setCursorShape = PROTO::cursorShape->events.setShape.registerListener([this](std::any data) {
@@ -30,10 +32,10 @@ CInputManager::CInputManager() {
auto event = std::any_cast<CCursorShapeProtocol::SSetShapeEvent>(data);
- if (!g_pCompositor->m_sSeat.seat->pointer_state.focused_client)
+ if (!g_pSeatManager->state.pointerFocusResource)
return;
- if (wl_resource_get_client(event.pMgr->resource()) != g_pCompositor->m_sSeat.seat->pointer_state.focused_client->client)
+ if (wl_resource_get_client(event.pMgr->resource()) != g_pSeatManager->state.pointerFocusResource->client())
return;
Debug::log(LOG, "cursorImage request: shape {} -> {}", (uint32_t)event.shape, event.shapeName);
@@ -52,6 +54,7 @@ CInputManager::CInputManager() {
PROTO::virtualKeyboard->events.newKeyboard.registerListener([this](std::any data) { this->newVirtualKeyboard(std::any_cast<SP<CVirtualKeyboardV1Resource>>(data)); });
m_sListeners.newVirtualMouse =
PROTO::virtualPointer->events.newPointer.registerListener([this](std::any data) { this->newVirtualMouse(std::any_cast<SP<CVirtualPointerV1Resource>>(data)); });
+ m_sListeners.setCursor = g_pSeatManager->events.setCursor.registerListener([this](std::any d) { this->processMouseRequest(d); });
}
CInputManager::~CInputManager() {
@@ -119,8 +122,7 @@ void CInputManager::sendMotionEventsToFocused() {
m_bEmptyFocusCursorSet = false;
- wlr_seat_pointer_notify_enter(g_pCompositor->m_sSeat.seat, g_pCompositor->m_pLastFocus, LOCAL.x, LOCAL.y);
- wlr_seat_pointer_notify_motion(g_pCompositor->m_sSeat.seat, now.tv_sec * 1000 + now.tv_nsec / 10000000, LOCAL.x, LOCAL.y);
+ g_pSeatManager->setPointerFocus(g_pCompositor->m_pLastFocus, LOCAL);
}
void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
@@ -190,7 +192,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
}
// constraints
- if (!g_pCompositor->m_sSeat.mouse.expired() && isConstrained()) {
+ if (!g_pSeatManager->mouse.expired() && isConstrained()) {
const auto SURF = CWLSurface::surfaceFromWlr(g_pCompositor->m_pLastFocus);
const auto CONSTRAINT = SURF->constraint();
@@ -205,7 +207,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
const auto CLOSESTLOCAL = (CLOSEST - (BOX.has_value() ? BOX->pos() : Vector2D{})) * (SURF->getWindow() ? SURF->getWindow()->m_fX11SurfaceScaledBy : 1.0);
g_pCompositor->warpCursorTo(CLOSEST, true);
- wlr_seat_pointer_send_motion(g_pCompositor->m_sSeat.seat, time, CLOSESTLOCAL.x, CLOSESTLOCAL.y);
+ g_pSeatManager->sendPointerMotion(time, CLOSESTLOCAL);
PROTO::relativePointer->sendRelativeMotion((uint64_t)time * 1000, {}, {});
}
@@ -218,8 +220,8 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
// update stuff
updateDragIcon();
- if (!m_sDrag.drag && !m_lCurrentlyHeldButtons.empty() && g_pCompositor->m_pLastFocus && m_pLastMouseSurface) {
- foundSurface = m_pLastMouseSurface;
+ if (!m_sDrag.drag && !m_lCurrentlyHeldButtons.empty() && g_pCompositor->m_pLastFocus && g_pSeatManager->state.pointerFocus) {
+ foundSurface = g_pSeatManager->state.pointerFocus;
pFoundLayerSurface = g_pCompositor->getLayerSurfaceFromSurface(foundSurface);
if (pFoundLayerSurface) {
surfacePos = pFoundLayerSurface->position;
@@ -232,7 +234,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
m_bFocusHeldByButtons = true;
m_bRefocusHeldByButtons = refocus;
} else if (!g_pCompositor->m_pLastWindow.expired()) {
- foundSurface = m_pLastMouseSurface;
+ foundSurface = g_pSeatManager->state.pointerFocus;
pFoundWindow = g_pCompositor->m_pLastWindow.lock();
surfaceCoords = g_pCompositor->vectorToSurfaceLocal(mouseCoords, pFoundWindow, foundSurface);
@@ -371,8 +373,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
m_bEmptyFocusCursorSet = true;
}
- wlr_seat_pointer_clear_focus(g_pCompositor->m_sSeat.seat);
- m_pLastMouseSurface = nullptr;
+ g_pSeatManager->setPointerFocus(nullptr, {});
if (refocus || g_pCompositor->m_pLastWindow.expired()) // if we are forcing a refocus, and we don't find a surface, clear the kb focus too!
g_pCompositor->focusWindow(nullptr);
@@ -412,8 +413,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
}
if (currentlyDraggedWindow.lock() && pFoundWindow != currentlyDraggedWindow) {
- 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);
+ g_pSeatManager->setPointerFocus(foundSurface, surfaceLocal);
return;
}
@@ -441,20 +441,15 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
// enter if change floating style
if (FOLLOWMOUSE != 3 && allowKeyboardRefocus)
g_pCompositor->focusWindow(pFoundWindow, foundSurface);
- m_pLastMouseSurface = foundSurface;
- wlr_seat_pointer_notify_enter(g_pCompositor->m_sSeat.seat, foundSurface, surfaceLocal.x, surfaceLocal.y);
- } else if (FOLLOWMOUSE == 2 || FOLLOWMOUSE == 3) {
- m_pLastMouseSurface = foundSurface;
- wlr_seat_pointer_notify_enter(g_pCompositor->m_sSeat.seat, foundSurface, surfaceLocal.x, surfaceLocal.y);
- }
+ g_pSeatManager->setPointerFocus(foundSurface, surfaceLocal);
+ } else if (FOLLOWMOUSE == 2 || FOLLOWMOUSE == 3)
+ g_pSeatManager->setPointerFocus(foundSurface, surfaceLocal);
- if (pFoundWindow == g_pCompositor->m_pLastWindow) {
- m_pLastMouseSurface = foundSurface;
- wlr_seat_pointer_notify_enter(g_pCompositor->m_sSeat.seat, foundSurface, surfaceLocal.x, surfaceLocal.y);
- }
+ if (pFoundWindow == g_pCompositor->m_pLastWindow)
+ g_pSeatManager->setPointerFocus(foundSurface, surfaceLocal);
if (FOLLOWMOUSE != 0 || pFoundWindow == g_pCompositor->m_pLastWindow)
- wlr_seat_pointer_notify_motion(g_pCompositor->m_sSeat.seat, time, surfaceLocal.x, surfaceLocal.y);
+ g_pSeatManager->setPointerFocus(foundSurface, surfaceLocal);
m_bLastFocusOnLS = false;
return; // don't enter any new surfaces
@@ -489,9 +484,8 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
m_bLastFocusOnLS = true;
}
- m_pLastMouseSurface = foundSurface;
- 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);
+ g_pSeatManager->setPointerFocus(foundSurface, surfaceLocal);
+ g_pSeatManager->sendPointerMotion(time, surfaceLocal);
}
void CInputManager::onMouseButton(IPointer::SButtonEvent e) {
@@ -526,34 +520,33 @@ void CInputManager::onMouseButton(IPointer::SButtonEvent e) {
}
}
-void CInputManager::processMouseRequest(wlr_seat_pointer_request_set_cursor_event* e) {
+void CInputManager::processMouseRequest(std::any E) {
if (!cursorImageUnlocked())
return;
- Debug::log(LOG, "cursorImage request: surface {:x}", (uintptr_t)e->surface);
+ auto e = std::any_cast<CSeatManager::SSetCursorEvent>(E);
- if (e->seat_client == g_pCompositor->m_sSeat.seat->pointer_state.focused_client) {
+ Debug::log(LOG, "cursorImage request: surface {:x}", (uintptr_t)e.surf);
- if (e->surface != m_sCursorSurfaceInfo.wlSurface.wlr()) {
- m_sCursorSurfaceInfo.wlSurface.unassign();
+ if (e.surf != m_sCursorSurfaceInfo.wlSurface.wlr()) {
+ m_sCursorSurfaceInfo.wlSurface.unassign();
- if (e->surface)
- m_sCursorSurfaceInfo.wlSurface.assign(e->surface);
- }
+ if (e.surf)
+ m_sCursorSurfaceInfo.wlSurface.assign(e.surf);
+ }
- if (e->surface) {
- m_sCursorSurfaceInfo.vHotspot = {e->hotspot_x, e->hotspot_y};
- m_sCursorSurfaceInfo.hidden = false;
- } else {
- m_sCursorSurfaceInfo.vHotspot = {};
- m_sCursorSurfaceInfo.hidden = true;
- }
+ if (e.surf) {
+ m_sCursorSurfaceInfo.vHotspot = e.hotspot;
+ m_sCursorSurfaceInfo.hidden = false;
+ } else {
+ m_sCursorSurfaceInfo.vHotspot = {};
+ m_sCursorSurfaceInfo.hidden = true;
+ }
- m_sCursorSurfaceInfo.name = "";
+ m_sCursorSurfaceInfo.name = "";
- m_sCursorSurfaceInfo.inUse = true;
- g_pHyprRenderer->setCursorSurface(&m_sCursorSurfaceInfo.wlSurface, e->hotspot_x, e->hotspot_y);
- }
+ m_sCursorSurfaceInfo.inUse = true;
+ g_pHyprRenderer->setCursorSurface(&m_sCursorSurfaceInfo.wlSurface, e.hotspot.x, e.hotspot.y);
}
void CInputManager::restoreCursorIconToApp() {
@@ -659,7 +652,7 @@ void CInputManager::processMouseDownNormal(const IPointer::SButtonEvent& e) {
if (*PFOLLOWMOUSE == 3) // don't refocus on full loose
break;
- if ((g_pCompositor->m_sSeat.mouse.expired() || !isConstrained()) /* No constraints */
+ if ((g_pSeatManager->mouse.expired() || !isConstrained()) /* No constraints */
&& (w && g_pCompositor->m_pLastWindow.lock() != w) /* window should change */) {
// a bit hacky
// if we only pressed one button, allow us to refocus. m_lCurrentlyHeldButtons.size() > 0 will stick the focus
@@ -681,8 +674,7 @@ void CInputManager::processMouseDownNormal(const IPointer::SButtonEvent& e) {
}
// notify app if we didnt handle it
- if (g_pCompositor->doesSeatAcceptInput(g_pCompositor->m_pLastFocus))
- wlr_seat_pointer_notify_button(g_pCompositor->m_sSeat.seat, e.timeMs, e.button, e.state);
+ g_pSeatManager->sendPointerButton(e.timeMs, e.button, e.state);
if (const auto PMON = g_pCompositor->getMonitorFromVector(mouseCoords); PMON != g_pCompositor->m_pLastMonitor.get() && PMON)
g_pCompositor->setActiveMonitor(PMON);
@@ -747,14 +739,13 @@ void CInputManager::onMouseWheel(IPointer::SAxisEvent e) {
if (*POFFWINDOWAXIS == 3)
g_pCompositor->warpCursorTo({TEMPCURX, TEMPCURY}, true);
- wlr_seat_pointer_notify_motion(g_pCompositor->m_sSeat.seat, e.timeMs, TEMPCURX - BOX.x, TEMPCURY - BOX.y);
- wlr_seat_pointer_notify_frame(g_pCompositor->m_sSeat.seat);
+ g_pSeatManager->sendPointerMotion(e.timeMs, Vector2D{TEMPCURX, TEMPCURY} - BOX.pos());
+ g_pSeatManager->sendPointerFrame();
}
}
}
- wlr_seat_pointer_notify_axis(g_pCompositor->m_sSeat.seat, e.timeMs, e.axis, factor * e.delta, std::round(factor * e.deltaDiscrete), e.source,
- WL_POINTER_AXIS_RELATIVE_DIRECTION_IDENTICAL);
+ g_pSeatManager->sendPointerAxis(e.timeMs, e.axis, factor * e.delta, std::round(factor * e.deltaDiscrete), e.source, WL_POINTER_AXIS_RELATIVE_DIRECTION_IDENTICAL);
}
Vector2D CInputManager::getMouseCoordsInternal() {
@@ -826,13 +817,9 @@ void CInputManager::setupKeyboard(SP<IKeyboard> keeb) {
disableAllKeyboards(false);
- g_pCompositor->m_sSeat.keyboard = keeb;
-
- keeb->active = true;
-
applyConfigToKeyboard(keeb);
- wlr_seat_set_keyboard(g_pCompositor->m_sSeat.seat, keeb->wlr());
+ g_pSeatManager->setKeyboard(keeb);
}
void CInputManager::setKeyboardLayout() {
@@ -1015,7 +1002,7 @@ void CInputManager::setupMouse(SP<IPointer> mauz) {
},
mauz.get());
- g_pCompositor->m_sSeat.mouse = mauz;
+ g_pSeatManager->setMouse(mauz);
m_tmrLastCursorMovement.reset();
}
@@ -1185,12 +1172,11 @@ void CInputManager::destroyKeyboard(SP<IKeyboard> pKeyboard) {
std::erase_if(m_vKeyboards, [pKeyboard](const auto& other) { return other == pKeyboard; });
if (m_vKeyboards.size() > 0) {
- g_pCompositor->m_sSeat.keyboard = m_vKeyboards.back();
- g_pCompositor->m_sSeat.keyboard->active = true;
- wlr_seat_set_keyboard(g_pCompositor->m_sSeat.seat, g_pCompositor->m_sSeat.keyboard->wlr());
+ const auto PNEWKEYBOARD = m_vKeyboards.back();
+ g_pSeatManager->setKeyboard(PNEWKEYBOARD);
+ PNEWKEYBOARD->active = true;
} else {
- g_pCompositor->m_sSeat.keyboard.reset();
- wlr_seat_set_keyboard(g_pCompositor->m_sSeat.seat, nullptr);
+ g_pSeatManager->setKeyboard(nullptr);
}
removeFromHIDs(pKeyboard);
@@ -1199,9 +1185,9 @@ void CInputManager::destroyKeyboard(SP<IKeyboard> pKeyboard) {
void CInputManager::destroyPointer(SP<IPointer> mouse) {
std::erase_if(m_vPointers, [mouse](const auto& other) { return other == mouse; });
- g_pCompositor->m_sSeat.mouse = m_vPointers.size() > 0 ? m_vPointers.front() : nullptr;
+ g_pSeatManager->setMouse(m_vPointers.size() > 0 ? m_vPointers.front() : nullptr);
- if (!g_pCompositor->m_sSeat.mouse.expired())
+ if (!g_pSeatManager->mouse.expired())
unconstrainMouse();
removeFromHIDs(mouse);
@@ -1287,8 +1273,8 @@ void CInputManager::onKeyboardKey(std::any event, SP<IKeyboard> pKeyboard) {
IME->setKeyboard(pKeyboard->wlr());
IME->sendKey(e.timeMs, e.keycode, e.state);
} else {
- wlr_seat_set_keyboard(g_pCompositor->m_sSeat.seat, pKeyboard->wlr());
- wlr_seat_keyboard_notify_key(g_pCompositor->m_sSeat.seat, e.timeMs, e.keycode, e.state);
+ g_pSeatManager->setKeyboard(pKeyboard);
+ g_pSeatManager->sendKeyboardKey(e.timeMs, e.keycode, e.state);
}
updateKeyboardsLeds(pKeyboard);
@@ -1313,8 +1299,8 @@ void CInputManager::onKeyboardMod(SP<IKeyboard> pKeyboard) {
IME->setKeyboard(PWLRKB);
IME->sendMods(MODS.depressed, MODS.latched, MODS.locked, MODS.group);
} else {
- wlr_seat_set_keyboard(g_pCompositor->m_sSeat.seat, PWLRKB);
- wlr_seat_keyboard_notify_modifiers(g_pCompositor->m_sSeat.seat, &MODS);
+ g_pSeatManager->setKeyboard(pKeyboard);
+ g_pSeatManager->sendKeyboardMods(MODS.depressed, MODS.latched, MODS.locked, MODS.group);
}
updateKeyboardsLeds(pKeyboard);
@@ -1361,7 +1347,7 @@ void CInputManager::updateDragIcon() {
}
void CInputManager::unconstrainMouse() {
- if (g_pCompositor->m_sSeat.mouse.expired())
+ if (g_pSeatManager->mouse.expired())
return;
for (auto& c : m_vConstraints) {
@@ -1410,7 +1396,7 @@ void CInputManager::updateCapabilities() {
caps |= WL_SEAT_CAPABILITY_TOUCH;
}
- wlr_seat_set_capabilities(g_pCompositor->m_sSeat.seat, caps);
+ g_pSeatManager->updateCapabilities(caps);
m_uiCapabilities = caps;
}
@@ -1422,7 +1408,7 @@ uint32_t CInputManager::accumulateModsFromAllKBs() {
if (kb->isVirtual() && shouldIgnoreVirtualKeyboard(kb))
continue;
- if (!kb->enabled)
+ if (!kb->enabled || !kb->wlr())
continue;
finalMask |= wlr_keyboard_get_modifiers(kb->wlr());
@@ -1657,7 +1643,7 @@ void CInputManager::releaseAllMouseButtons() {
return;
for (auto& mb : buttonsCopy) {
- wlr_seat_pointer_notify_button(g_pCompositor->m_sSeat.seat, 0, mb, WL_POINTER_BUTTON_STATE_RELEASED);
+ g_pSeatManager->sendPointerButton(0, mb, WL_POINTER_BUTTON_STATE_RELEASED);
}
m_lCurrentlyHeldButtons.clear();
diff --git a/src/managers/input/InputManager.hpp b/src/managers/input/InputManager.hpp
index df36b975..42c9d3da 100644
--- a/src/managers/input/InputManager.hpp
+++ b/src/managers/input/InputManager.hpp
@@ -118,7 +118,7 @@ class CInputManager {
void setClickMode(eClickBehaviorMode);
eClickBehaviorMode getClickMode();
- void processMouseRequest(wlr_seat_pointer_request_set_cursor_event* e);
+ void processMouseRequest(std::any e);
void onTouchDown(ITouch::SDownEvent);
void onTouchUp(ITouch::SUpEvent);
@@ -197,7 +197,6 @@ class CInputManager {
// for tracking mouse refocus
PHLWINDOWREF m_pLastMouseFocus;
- wlr_surface* m_pLastMouseSurface = nullptr;
//
bool m_bEmptyFocusCursorSet = false;
@@ -209,6 +208,7 @@ class CInputManager {
CHyprSignalListener newIdleInhibitor;
CHyprSignalListener newVirtualKeyboard;
CHyprSignalListener newVirtualMouse;
+ CHyprSignalListener setCursor;
} m_sListeners;
bool m_bCursorImageOverridden = false;
diff --git a/src/managers/input/Tablets.cpp b/src/managers/input/Tablets.cpp
index cf666ec6..56e817ec 100644
--- a/src/managers/input/Tablets.cpp
+++ b/src/managers/input/Tablets.cpp
@@ -4,6 +4,7 @@
#include "../../protocols/Tablet.hpp"
#include "../../devices/Tablet.hpp"
#include "../../managers/PointerManager.hpp"
+#include "../../managers/SeatManager.hpp"
#include "../../protocols/PointerConstraints.hpp"
static void unfocusTool(SP<CTabletTool> tool) {
@@ -36,7 +37,7 @@ static void focusTool(SP<CTabletTool> tool, SP<CTablet> tablet, wlr_surface* sur
}
static void refocusTablet(SP<CTablet> tab, SP<CTabletTool> tool, bool motion = false) {
- const auto LASTHLSURFACE = CWLSurface::surfaceFromWlr(g_pInputManager->m_pLastMouseSurface);
+ const auto LASTHLSURFACE = CWLSurface::surfaceFromWlr(g_pSeatManager->state.pointerFocus);
if (!LASTHLSURFACE || !tool->active) {
if (tool->getSurface())
@@ -56,7 +57,7 @@ static void refocusTablet(SP<CTablet> tab, SP<CTabletTool> tool, bool motion = f
const auto CURSORPOS = g_pInputManager->getMouseCoordsInternal();
- focusTool(tool, tab, g_pInputManager->m_pLastMouseSurface);
+ focusTool(tool, tab, g_pSeatManager->state.pointerFocus);
if (!motion)
return;
diff --git a/src/managers/input/Touch.cpp b/src/managers/input/Touch.cpp
index 4a6484c2..7748813b 100644
--- a/src/managers/input/Touch.cpp
+++ b/src/managers/input/Touch.cpp
@@ -3,6 +3,7 @@
#include "../../config/ConfigValue.hpp"
#include "../../protocols/IdleNotify.hpp"
#include "../../devices/ITouch.hpp"
+#include "../SeatManager.hpp"
void CInputManager::onTouchDown(ITouch::SDownEvent e) {
static auto PSWIPETOUCH = CConfigValue<Hyprlang::INT>("gestures:workspace_swipe_touch");
@@ -76,7 +77,7 @@ void CInputManager::onTouchDown(ITouch::SDownEvent e) {
} else
return; // oops, nothing found.
- wlr_seat_touch_notify_down(g_pCompositor->m_sSeat.seat, m_sTouchData.touchFocusSurface, e.timeMs, e.touchID, local.x, local.y);
+ g_pSeatManager->sendTouchDown(m_sTouchData.touchFocusSurface, e.timeMs, e.touchID, local);
PROTO::idle->onActivity();
}
@@ -90,9 +91,8 @@ void CInputManager::onTouchUp(ITouch::SUpEvent e) {
return;
}
- if (m_sTouchData.touchFocusSurface) {
- wlr_seat_touch_notify_up(g_pCompositor->m_sSeat.seat, e.timeMs, e.touchID);
- }
+ if (m_sTouchData.touchFocusSurface)
+ g_pSeatManager->sendTouchUp(e.timeMs, e.touchID);
}
void CInputManager::onTouchMove(ITouch::SMotionEvent e) {
@@ -131,8 +131,7 @@ void CInputManager::onTouchMove(ITouch::SMotionEvent e) {
if (m_sTouchData.touchFocusWindow->m_bIsX11)
local = local * m_sTouchData.touchFocusWindow->m_fX11SurfaceScaledBy;
- wlr_seat_touch_notify_motion(g_pCompositor->m_sSeat.seat, e.timeMs, e.touchID, local.x, local.y);
- // wlr_seat_pointer_notify_motion(g_pCompositor->m_sSeat.seat, e->time_msec, local.x, local.y);
+ g_pSeatManager->sendTouchMotion(e.timeMs, e.touchID, local);
} else if (!m_sTouchData.touchFocusLS.expired()) {
const auto PMONITOR = g_pCompositor->getMonitorFromID(m_sTouchData.touchFocusLS->monitorID);
@@ -140,7 +139,6 @@ void CInputManager::onTouchMove(ITouch::SMotionEvent e) {
const auto local = g_pInputManager->getMouseCoordsInternal() - m_sTouchData.touchSurfaceOrigin;
- wlr_seat_touch_notify_motion(g_pCompositor->m_sSeat.seat, e.timeMs, e.touchID, local.x, local.y);
- // wlr_seat_pointer_notify_motion(g_pCompositor->m_sSeat.seat, e->time_msec, local.x, local.y);
+ g_pSeatManager->sendTouchMotion(e.timeMs, e.touchID, local);
}
}