summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVaxry <vaxry@vaxry.net>2024-05-02 16:20:51 +0100
committerVaxry <vaxry@vaxry.net>2024-05-02 16:21:33 +0100
commita3ca016d42283ce1d2d5ffca40b93123b4290f4b (patch)
treead1243deff6adfe730b671ad03bc42fe1caedfb2 /src
parenteeb78ef965435b68ad0fbdcff6dfc4cdf4500bc5 (diff)
cursor-shape: use - instead of _ in shapes
ref #5824
Diffstat (limited to 'src')
-rw-r--r--src/managers/CursorManager.cpp6
-rw-r--r--src/protocols/CursorShape.cpp42
2 files changed, 24 insertions, 24 deletions
diff --git a/src/managers/CursorManager.cpp b/src/managers/CursorManager.cpp
index c7e47120..fa5ee8cd 100644
--- a/src/managers/CursorManager.cpp
+++ b/src/managers/CursorManager.cpp
@@ -117,16 +117,16 @@ void CCursorManager::setCursorFromName(const std::string& name) {
m_sCurrentCursorShapeData = m_pHyprcursor->getShape(name.c_str(), m_sCurrentStyleInfo);
if (m_sCurrentCursorShapeData.images.size() < 1) {
- // try with '-' first (xcursor, web, etc)
+ // try with '_' first (old hc, etc)
std::string newName = name;
- std::replace(newName.begin(), newName.end(), '_', '-');
+ std::replace(newName.begin(), newName.end(), '-', '_');
m_sCurrentCursorShapeData = m_pHyprcursor->getShape(newName.c_str(), m_sCurrentStyleInfo);
}
if (m_sCurrentCursorShapeData.images.size() < 1) {
// fallback to a default if available
- constexpr const std::array<const char*, 2> fallbackShapes = {"default", "left_ptr"};
+ constexpr const std::array<const char*, 3> fallbackShapes = {"default", "left_ptr", "left-ptr"};
for (auto& s : fallbackShapes) {
m_sCurrentCursorShapeData = m_pHyprcursor->getShape(s, m_sCurrentStyleInfo);
diff --git a/src/protocols/CursorShape.cpp b/src/protocols/CursorShape.cpp
index a390f852..73c03ef3 100644
--- a/src/protocols/CursorShape.cpp
+++ b/src/protocols/CursorShape.cpp
@@ -7,7 +7,7 @@
constexpr const char* SHAPE_NAMES[] = {
"invalid",
"default",
- "context_menu",
+ "context-menu",
"help",
"pointer",
"progress",
@@ -15,31 +15,31 @@ constexpr const char* SHAPE_NAMES[] = {
"cell",
"crosshair",
"text",
- "vertical_text",
+ "vertical-text",
"alias",
"copy",
"move",
- "no_drop",
- "not_allowed",
+ "no-drop",
+ "not-allowed",
"grab",
"grabbing",
- "e_resize",
- "n_resize",
- "ne_resize",
- "nw_resize",
- "s_resize",
- "se_resize",
- "sw_resize",
- "w_resize",
- "ew_resize",
- "ns_resize",
- "nesw_resize",
- "nwse_resize",
- "col_resize",
- "row_resize",
- "all_scroll",
- "zoom_in",
- "zoom_out",
+ "e-resize",
+ "n-resize",
+ "ne-resize",
+ "nw-resize",
+ "s-resize",
+ "se-resize",
+ "sw-resize",
+ "w-resize",
+ "ew-resize",
+ "ns-resize",
+ "nesw-resize",
+ "nwse-resize",
+ "col-resize",
+ "row-resize",
+ "all-scroll",
+ "zoom-in",
+ "zoom-out",
};
// clang-format on