mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cursor: simplify process_cursor_motion()

Browse source 
...by using wlr_xcursor_get_resize_name() instead of handling each
'resize_edge' case.
This commit is contained in:
Johan Malm 2021-07-30 14:26:54 +01:00
parent 1dc3059707
commit fc542e6da1
1 changed files with 20 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/cursor.c
View file

@ -85,6 +85,13 @@ process_cursor_resize(struct server *server, uint32_t time)
view_move_resize(view, new_view_geo); view_move_resize(view, new_view_geo);
} }
static void
set_cursor(struct server *server, const char *cursor_name)
{
wlr_xcursor_manager_set_cursor_image(
server->seat.xcursor_manager, cursor_name, server->seat.cursor);
}
static void static void
process_cursor_motion(struct server *server, uint32_t time) process_cursor_motion(struct server *server, uint32_t time)
{ {
@ -109,63 +116,34 @@ process_cursor_motion(struct server *server, uint32_t time)
struct wlr_seat *wlr_seat = server->seat.seat; struct wlr_seat *wlr_seat = server->seat.seat;
struct wlr_surface *surface = NULL; struct wlr_surface *surface = NULL;
int view_area = LAB_SSD_NONE; int view_area = LAB_SSD_NONE;
char *cursor_name = NULL;
struct view *view = struct view *view =
desktop_view_at(server, server->seat.cursor->x, server->seat.cursor->y, desktop_view_at(server, server->seat.cursor->x, server->seat.cursor->y,
&surface, &sx, &sy, &view_area); &surface, &sx, &sy, &view_area);
if (!view) { if (!view) {
cursor_name = XCURSOR_DEFAULT; set_cursor(server, XCURSOR_DEFAULT);
} else { } else {
uint32_t resize_edges = ssd_resize_edges(view_area); uint32_t resize_edges = ssd_resize_edges(view_area);
switch (resize_edges) { if (resize_edges) {
case 0: cursor_name_set_by_server = true;
if (rc.focus_follow_mouse) { set_cursor(server, wlr_xcursor_get_resize_name(resize_edges));
} else if (view_area != LAB_SSD_NONE) {
/* title and buttons */
set_cursor(server, XCURSOR_DEFAULT);
cursor_name_set_by_server = true;
} else if (cursor_name_set_by_server) {
set_cursor(server, XCURSOR_DEFAULT);
cursor_name_set_by_server = false;
}
}
if (view && rc.focus_follow_mouse) {
if (rc.raise_on_focus) { if (rc.raise_on_focus) {
desktop_focus_view(&server->seat, view); desktop_focus_view(&server->seat, view);
} else { } else {
desktop_set_focus_view_only(&server->seat, view); desktop_set_focus_view_only(&server->seat, view);
} }
} }
break;
case WLR_EDGE_TOP:
cursor_name = "top_side";
break;
case WLR_EDGE_RIGHT:
cursor_name = "right_side";
break;
case WLR_EDGE_BOTTOM:
cursor_name = "bottom_side";
break;
case WLR_EDGE_LEFT:
cursor_name = "left_side";
break;
case WLR_EDGE_TOP | WLR_EDGE_LEFT:
cursor_name = "top_left_corner";
break;
case WLR_EDGE_TOP | WLR_EDGE_RIGHT:
cursor_name = "top_right_corner";
break;
case WLR_EDGE_BOTTOM | WLR_EDGE_LEFT:
cursor_name = "bottom_left_corner";
break;
case WLR_EDGE_BOTTOM | WLR_EDGE_RIGHT:
cursor_name = "bottom_right_corner";
break;
}
if (resize_edges) {
cursor_name_set_by_server = true;
} else if (view_area != LAB_SSD_NONE) {
cursor_name = XCURSOR_DEFAULT;
cursor_name_set_by_server = true;
} else if (cursor_name_set_by_server) {
cursor_name = XCURSOR_DEFAULT;
cursor_name_set_by_server = false;
}
}
if (cursor_name) {
wlr_xcursor_manager_set_cursor_image(
server->seat.xcursor_manager, cursor_name, server->seat.cursor);
}
/* Required for iconify/maximize/close button mouse-over deco */ /* Required for iconify/maximize/close button mouse-over deco */
damage_all_outputs(server); damage_all_outputs(server);