diff --git a/gen/cursors.py b/gen/cursors.py index 193895562..03b539b7c 100755 --- a/gen/cursors.py +++ b/gen/cursors.py @@ -43,8 +43,8 @@ w-resize w-resize w-resize,!left_side w_resize ew-resize ew-resize ew-resize,!sb_h_double_arrow,split_h ew_resize resizeLeftRightCursor ns-resize ns-resize ns-resize,!sb_v_double_arrow,split_v ns_resize resizeUpDownCursor -nesw-resize nesw-resize nesw-resize,size_bdiag,!sb_v_double_arrow nesw_resize _windowResizeNorthEastSouthWestCursor -nwse-resize nwse-resize nwse-resize,size_fdiag,!sb_h_double_arrow nwse_resize _windowResizeNorthWestSouthEastCursor +nesw-resize nesw-resize nesw-resize,size_bdiag,size-bdiag nesw_resize _windowResizeNorthEastSouthWestCursor +nwse-resize nwse-resize nwse-resize,size_fdiag,size-fdiag nwse_resize _windowResizeNorthWestSouthEastCursor zoom-in zoom-in zoom-in,zoom_in zoom_in zoomin:arrowCursor zoom-out zoom-out zoom-out,zoom_out zoom_out zoomout:arrowCursor diff --git a/glfw/wl_window.c b/glfw/wl_window.c index f812d4e63..c277bd0ab 100644 --- a/glfw/wl_window.c +++ b/glfw/wl_window.c @@ -852,8 +852,8 @@ struct wl_cursor* _glfwLoadCursor(GLFWCursorShape shape, struct wl_cursor_theme* C(GLFW_W_RESIZE_CURSOR, "w-resize", "left_side"); C(GLFW_EW_RESIZE_CURSOR, "ew-resize", "sb_h_double_arrow", "split_h"); C(GLFW_NS_RESIZE_CURSOR, "ns-resize", "sb_v_double_arrow", "split_v"); - C(GLFW_NESW_RESIZE_CURSOR, "nesw-resize", "size_bdiag", "sb_v_double_arrow"); - C(GLFW_NWSE_RESIZE_CURSOR, "nwse-resize", "size_fdiag", "sb_h_double_arrow"); + C(GLFW_NESW_RESIZE_CURSOR, "nesw-resize", "size_bdiag", "size-bdiag"); + C(GLFW_NWSE_RESIZE_CURSOR, "nwse-resize", "size_fdiag", "size-fdiag"); C(GLFW_ZOOM_IN_CURSOR, "zoom-in", "zoom_in"); C(GLFW_ZOOM_OUT_CURSOR, "zoom-out", "zoom_out"); C(GLFW_ALIAS_CURSOR, "dnd-link"); diff --git a/glfw/x11_window.c b/glfw/x11_window.c index 23efd4893..3b940d2ee 100644 --- a/glfw/x11_window.c +++ b/glfw/x11_window.c @@ -2867,8 +2867,8 @@ int _glfwPlatformCreateStandardCursor(_GLFWcursor* cursor, GLFWCursorShape shape case GLFW_W_RESIZE_CURSOR: return set_cursor_from_font(cursor, XC_left_side); case GLFW_EW_RESIZE_CURSOR: return set_cursor_from_font(cursor, XC_sb_h_double_arrow); case GLFW_NS_RESIZE_CURSOR: return set_cursor_from_font(cursor, XC_sb_v_double_arrow); - case GLFW_NESW_RESIZE_CURSOR: return set_cursor_from_font(cursor, XC_sb_v_double_arrow); - case GLFW_NWSE_RESIZE_CURSOR: return set_cursor_from_font(cursor, XC_sb_h_double_arrow); + case GLFW_NESW_RESIZE_CURSOR: return try_cursor_names(cursor, 3, "nesw-resize", "size_bdiag", "size-bdiag"); + case GLFW_NWSE_RESIZE_CURSOR: return try_cursor_names(cursor, 3, "nwse-resize", "size_fdiag", "size-fdiag"); case GLFW_ZOOM_IN_CURSOR: return try_cursor_names(cursor, 2, "zoom-in", "zoom_in"); case GLFW_ZOOM_OUT_CURSOR: return try_cursor_names(cursor, 2, "zoom-out", "zoom_out"); case GLFW_ALIAS_CURSOR: return try_cursor_names(cursor, 1, "dnd-link"); diff --git a/kitty/screen.c b/kitty/screen.c index b5c516a23..d33fa06ca 100644 --- a/kitty/screen.c +++ b/kitty/screen.c @@ -1261,12 +1261,14 @@ change_pointer_shape(Screen *self, PyObject *args) { else if (strcmp("bottom_left_corner", css_name) == 0) s = SW_RESIZE_POINTER; else if (strcmp("bottom_side", css_name) == 0) s = S_RESIZE_POINTER; else if (strcmp("left_side", css_name) == 0) s = W_RESIZE_POINTER; - else if (strcmp("sb_h_double_arrow", css_name) == 0) s = NWSE_RESIZE_POINTER; + else if (strcmp("sb_h_double_arrow", css_name) == 0) s = EW_RESIZE_POINTER; else if (strcmp("split_h", css_name) == 0) s = EW_RESIZE_POINTER; - else if (strcmp("sb_v_double_arrow", css_name) == 0) s = NESW_RESIZE_POINTER; + else if (strcmp("sb_v_double_arrow", css_name) == 0) s = NS_RESIZE_POINTER; else if (strcmp("split_v", css_name) == 0) s = NS_RESIZE_POINTER; else if (strcmp("size_bdiag", css_name) == 0) s = NESW_RESIZE_POINTER; + else if (strcmp("size-bdiag", css_name) == 0) s = NESW_RESIZE_POINTER; else if (strcmp("size_fdiag", css_name) == 0) s = NWSE_RESIZE_POINTER; + else if (strcmp("size-fdiag", css_name) == 0) s = NWSE_RESIZE_POINTER; else if (strcmp("zoom_in", css_name) == 0) s = ZOOM_IN_POINTER; else if (strcmp("zoom_out", css_name) == 0) s = ZOOM_OUT_POINTER; else if (strcmp("dnd-link", css_name) == 0) s = ALIAS_POINTER;