cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cursor: refactor override handling (#12166)

Browse source 
much cleaner and more reliable. Should fix https://github.com/hyprwm/Hyprland/issues/12088
This commit is contained in:
Vaxry 2025-10-31 00:14:08 +00:00 • committed by GitHub
parent 6ade4d58ca
commit 5e6cec962c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 152 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/protocols/core/DataDevice.cpp
View file

@ -11,6 +11,7 @@
#include "../../xwayland/Server.hpp"
#include "../../managers/input/InputManager.hpp"
#include "../../managers/HookSystemManager.hpp"
#include "../../managers/cursor/CursorShapeOverrideController.hpp"
#include "../../helpers/Monitor.hpp"
#include "../../render/Renderer.hpp"
#include "../../xwayland/Dnd.hpp"
@ -553,7 +554,7 @@ void CWLDataDeviceProtocol::initiateDrag(WP<CWLDataSourceResource> currentSource
abortDrag();
}
g_pInputManager->setCursorImageUntilUnset("grabbing");
Cursor::overrideController->setOverride("grabbing", Cursor::CURSOR_OVERRIDE_DND);
m_dnd.overriddenCursor = true;
LOGM(LOG, "initiateDrag: source {:x}, surface: {:x}, origin: {:x}", (uintptr_t)currentSource.get(), (uintptr_t)dragSurface, (uintptr_t)origin);
@ -734,7 +735,7 @@ void CWLDataDeviceProtocol::dropDrag() {
if (m_dnd.focusedDevice->getX11()) {
m_dnd.focusedDevice->sendLeave();
if (m_dnd.overriddenCursor)
g_pInputManager->unsetCursorImage();
Cursor::overrideController->unsetOverride(Cursor::CURSOR_OVERRIDE_DND);
m_dnd.overriddenCursor = false;
cleanupDndState(true, true, true);
return;
@ -743,7 +744,7 @@ void CWLDataDeviceProtocol::dropDrag() {
m_dnd.focusedDevice->sendLeave();
if (m_dnd.overriddenCursor)
g_pInputManager->unsetCursorImage();
Cursor::overrideController->unsetOverride(Cursor::CURSOR_OVERRIDE_DND);
m_dnd.overriddenCursor = false;
cleanupDndState(false, false, false);
}
@ -784,7 +785,7 @@ void CWLDataDeviceProtocol::abortDrag() {
cleanupDndState(false, false, false);
if (m_dnd.overriddenCursor)
g_pInputManager->unsetCursorImage();
Cursor::overrideController->unsetOverride(Cursor::CURSOR_OVERRIDE_DND);
m_dnd.overriddenCursor = false;
if (!m_dnd.focusedDevice && !m_dnd.currentSource)