mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set compositor cursor for move, resize and rotate

Browse source
This commit is contained in:
emersion 2017-10-27 18:41:31 +02:00
parent 4bee96bd30
commit ad27cc3bff
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 64 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

84
rootston/cursor.c
View file

@ -31,6 +31,28 @@ const struct roots_input_event *get_input_event(struct roots_input *input,
return NULL; return NULL;
} }
static void cursor_set_xcursor_image(struct roots_input *input,
struct wlr_xcursor_image *image) {
struct roots_output *output;
wl_list_for_each(output, &input->server->desktop->outputs, link) {
if (!wlr_output_set_cursor(output->wlr_output, image->buffer,
image->width, image->width, image->height,
image->hotspot_x, image->hotspot_y)) {
wlr_log(L_DEBUG, "Failed to set hardware cursor");
return;
}
}
}
static void cursor_set_surface(struct roots_input *input,
struct wlr_surface *surface, int32_t hotspot_x, int32_t hotspot_y) {
struct roots_output *output;
wl_list_for_each(output, &input->server->desktop->outputs, link) {
wlr_output_set_cursor_surface(output->wlr_output, surface,
hotspot_x, hotspot_y);
}
}
void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor, void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor,
struct roots_view *view) { struct roots_view *view) {
input->mode = ROOTS_CURSOR_MOVE; input->mode = ROOTS_CURSOR_MOVE;
@ -39,6 +61,35 @@ void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor,
input->view_x = view->x; input->view_x = view->x;
input->view_y = view->y; input->view_y = view->y;
wlr_seat_pointer_clear_focus(input->wl_seat); wlr_seat_pointer_clear_focus(input->wl_seat);
struct wlr_xcursor *xcursor = wlr_xcursor_theme_get_cursor(input->theme,
"grabbing");
if (xcursor != NULL) {
cursor_set_xcursor_image(input, xcursor->images[0]);
}
}
static const char *get_resize_cursor_name(uint32_t edges) {
if (edges & ROOTS_CURSOR_RESIZE_EDGE_TOP) {
if (edges & ROOTS_CURSOR_RESIZE_EDGE_RIGHT) {
return "ne-resize";
} else if (edges & ROOTS_CURSOR_RESIZE_EDGE_LEFT) {
return "nw-resize";
}
return "n-resize";
} else if (edges & ROOTS_CURSOR_RESIZE_EDGE_BOTTOM) {
if (edges & ROOTS_CURSOR_RESIZE_EDGE_RIGHT) {
return "se-resize";
} else if (edges & ROOTS_CURSOR_RESIZE_EDGE_LEFT) {
return "sw-resize";
}
return "s-resize";
} else if (edges & ROOTS_CURSOR_RESIZE_EDGE_RIGHT) {
return "e-resize";
} else if (edges & ROOTS_CURSOR_RESIZE_EDGE_LEFT) {
return "w-resize";
}
return "se-resize"; // fallback
} }
void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor, void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor,
@ -54,6 +105,12 @@ void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor,
input->view_height = size.height; input->view_height = size.height;
input->resize_edges = edges; input->resize_edges = edges;
wlr_seat_pointer_clear_focus(input->wl_seat); wlr_seat_pointer_clear_focus(input->wl_seat);
struct wlr_xcursor *xcursor = wlr_xcursor_theme_get_cursor(input->theme,
get_resize_cursor_name(edges));
if (xcursor != NULL) {
cursor_set_xcursor_image(input, xcursor->images[0]);
}
} }
void view_begin_rotate(struct roots_input *input, struct wlr_cursor *cursor, void view_begin_rotate(struct roots_input *input, struct wlr_cursor *cursor,
@ -63,18 +120,11 @@ void view_begin_rotate(struct roots_input *input, struct wlr_cursor *cursor,
input->offs_y = cursor->y; input->offs_y = cursor->y;
input->view_rotation = view->rotation; input->view_rotation = view->rotation;
wlr_seat_pointer_clear_focus(input->wl_seat); wlr_seat_pointer_clear_focus(input->wl_seat);
}
static void cursor_set_xcursor_image(struct roots_input *input, struct wlr_xcursor *xcursor = wlr_xcursor_theme_get_cursor(input->theme,
struct wlr_xcursor_image *image) { "grabbing");
struct roots_output *output; if (xcursor != NULL) {
wl_list_for_each(output, &input->server->desktop->outputs, link) { cursor_set_xcursor_image(input, xcursor->images[0]);
if (!wlr_output_set_cursor(output->wlr_output, image->buffer,
image->width, image->width, image->height,
image->hotspot_x, image->hotspot_y)) {
wlr_log(L_DEBUG, "Failed to set hardware cursor");
return;
}
} }
} }
@ -94,7 +144,6 @@ void cursor_update_position(struct roots_input *input, uint32_t time) {
set_compositor_cursor = view_client != input->cursor_client; set_compositor_cursor = view_client != input->cursor_client;
} }
if (set_compositor_cursor) { if (set_compositor_cursor) {
wlr_log(L_DEBUG, "Switching to compositor cursor");
cursor_set_xcursor_image(input, input->xcursor->images[0]); cursor_set_xcursor_image(input, input->xcursor->images[0]);
input->cursor_client = NULL; input->cursor_client = NULL;
} }
@ -274,6 +323,7 @@ static void do_cursor_button_press(struct roots_input *input,
switch (state) { switch (state) {
case WLR_BUTTON_RELEASED: case WLR_BUTTON_RELEASED:
set_view_focus(input, desktop, NULL); set_view_focus(input, desktop, NULL);
cursor_update_position(input, time);
break; break;
case WLR_BUTTON_PRESSED: case WLR_BUTTON_PRESSED:
i = input->input_events_idx; i = input->input_events_idx;
@ -437,19 +487,13 @@ static void handle_request_set_cursor(struct wl_listener *listener,
wl_resource_get_client(focused_surface->resource); wl_resource_get_client(focused_surface->resource);
ok = event->client == focused_client; ok = event->client == focused_client;
} }
if (!ok) { if (!ok || input->mode != ROOTS_CURSOR_PASSTHROUGH) {
wlr_log(L_DEBUG, "Denying request to set cursor from unfocused client"); wlr_log(L_DEBUG, "Denying request to set cursor from unfocused client");
return; return;
} }
wlr_log(L_DEBUG, "Setting client cursor"); wlr_log(L_DEBUG, "Setting client cursor");
cursor_set_surface(input, event->surface, event->hotspot_x, event->hotspot_y);
struct roots_output *output;
wl_list_for_each(output, &input->server->desktop->outputs, link) {
wlr_output_set_cursor_surface(output->wlr_output, event->surface,
event->hotspot_x, event->hotspot_y);
}
input->cursor_client = event->client; input->cursor_client = event->client;
} }