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.c: set cursor_name correctly when not over decoration

Browse source
This commit is contained in:
Johan Malm 2021-02-27 19:26:13 +00:00
parent 133ea96f64
commit 2ce58f2950
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/cursor.c
View file

@ -114,6 +114,8 @@ process_cursor_resize(struct server *server, uint32_t time)
static void static void
process_cursor_motion(struct server *server, uint32_t time) process_cursor_motion(struct server *server, uint32_t time)
{ {
static bool cursor_name_set_by_server;
/* If the mode is non-passthrough, delegate to those functions. */ /* If the mode is non-passthrough, delegate to those functions. */
if (server->input_mode == LAB_INPUT_STATE_MOVE) { if (server->input_mode == LAB_INPUT_STATE_MOVE) {
process_cursor_move(server, time); process_cursor_move(server, time);
@ -138,11 +140,6 @@ process_cursor_motion(struct server *server, uint32_t time)
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) {
/*
* If there's no view under the cursor, set the cursor image to
* a default. This is what makes the cursor image appear when
* you move it around the screen, not over any views.
*/
cursor_name = XCURSOR_DEFAULT; cursor_name = XCURSOR_DEFAULT;
} else { } else {
uint32_t resize_edges = get_resize_edges( uint32_t resize_edges = get_resize_edges(
@ -172,11 +169,13 @@ process_cursor_motion(struct server *server, uint32_t time)
case WLR_EDGE_BOTTOM | WLR_EDGE_RIGHT: case WLR_EDGE_BOTTOM | WLR_EDGE_RIGHT:
cursor_name = "bottom_right_corner"; cursor_name = "bottom_right_corner";
break; break;
case 0:
if (view_area != LAB_DECO_NONE) {
cursor_name = XCURSOR_DEFAULT;
} }
break; if (resize_edges) {
cursor_name_set_by_server = true;
}
if (!resize_edges && cursor_name_set_by_server) {
cursor_name = XCURSOR_DEFAULT;
cursor_name_set_by_server = false;
} }
} }
if (cursor_name) { if (cursor_name) {