summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHonkazel <169346573+Honkazel@users.noreply.github.com>2025-11-30 20:05:31 +0500
committerGitHub <noreply@github.com>2025-11-30 15:05:31 +0000
commitbb963fb00263bac78a0c633d1d0d02ae4763222c (patch)
treeee37e1676760a618c2c5281a21418c2c395751c9 /src
parentf11cf6f1de708b6b3811788e8ff7984ff05a9546 (diff)
protocols/cursor-shape: impl version 2 (#12270)
Diffstat (limited to 'src')
-rw-r--r--src/helpers/CursorShapes.hpp4
-rw-r--r--src/managers/ProtocolManager.cpp2
-rw-r--r--src/managers/XCursorManager.cpp4
3 files changed, 8 insertions, 2 deletions
diff --git a/src/helpers/CursorShapes.hpp b/src/helpers/CursorShapes.hpp
index cb95cd8b..3882c593 100644
--- a/src/helpers/CursorShapes.hpp
+++ b/src/helpers/CursorShapes.hpp
@@ -3,7 +3,7 @@
#include <array>
// clang-format off
-constexpr std::array<const char*, 35> CURSOR_SHAPE_NAMES = {
+constexpr std::array<const char*, 37> CURSOR_SHAPE_NAMES = {
"invalid",
"default",
"context-menu",
@@ -39,5 +39,7 @@ constexpr std::array<const char*, 35> CURSOR_SHAPE_NAMES = {
"all-scroll",
"zoom-in",
"zoom-out",
+ "dnd-ask",
+ "all-resize"
};
// clang-format on
diff --git a/src/managers/ProtocolManager.cpp b/src/managers/ProtocolManager.cpp
index f9f90ffe..0f27ffd6 100644
--- a/src/managers/ProtocolManager.cpp
+++ b/src/managers/ProtocolManager.cpp
@@ -150,7 +150,7 @@ CProtocolManager::CProtocolManager() {
PROTO::tearing = makeUnique<CTearingControlProtocol>(&wp_tearing_control_manager_v1_interface, 1, "TearingControl");
PROTO::fractional = makeUnique<CFractionalScaleProtocol>(&wp_fractional_scale_manager_v1_interface, 1, "FractionalScale");
PROTO::xdgOutput = makeUnique<CXDGOutputProtocol>(&zxdg_output_manager_v1_interface, 3, "XDGOutput");
- PROTO::cursorShape = makeUnique<CCursorShapeProtocol>(&wp_cursor_shape_manager_v1_interface, 1, "CursorShape");
+ PROTO::cursorShape = makeUnique<CCursorShapeProtocol>(&wp_cursor_shape_manager_v1_interface, 2, "CursorShape");
PROTO::idleInhibit = makeUnique<CIdleInhibitProtocol>(&zwp_idle_inhibit_manager_v1_interface, 1, "IdleInhibit");
PROTO::relativePointer = makeUnique<CRelativePointerProtocol>(&zwp_relative_pointer_manager_v1_interface, 1, "RelativePointer");
PROTO::xdgDecoration = makeUnique<CXDGDecorationProtocol>(&zxdg_decoration_manager_v1_interface, 1, "XDGDecoration");
diff --git a/src/managers/XCursorManager.cpp b/src/managers/XCursorManager.cpp
index 307cbc84..5cde1dac 100644
--- a/src/managers/XCursorManager.cpp
+++ b/src/managers/XCursorManager.cpp
@@ -396,6 +396,10 @@ std::string CXCursorManager::getLegacyShapeName(std::string const& shape) {
return "left_ptr";
else if (shape == "zoom-out")
return "left_ptr";
+ else if (shape == "dnd-ask")
+ return "dnd-copy";
+ else if (shape == "all-resize")
+ return "fleur";
return std::string();
};