nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 08:32:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove wlr_cursor_set_xcursor for now

Browse Source
This commit is contained in:
emersion 2017-10-29 18:14:58 +01:00
parent 95566c6bdf
commit 4230a577cc
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/pointer.c
View File

@ -321,7 +321,9 @@ int main(int argc, char *argv[]) {
return 1; return 1;
} }
wlr_cursor_set_xcursor(state.cursor, state.xcursor); struct wlr_xcursor_image *image = state.xcursor->images[0];
wlr_cursor_set_image(state.cursor, image->buffer, image->width,
image->width, image->height, image->hotspot_x, image->hotspot_y);
compositor_init(&compositor); compositor_init(&compositor);
if (!wlr_backend_start(compositor.backend)) { if (!wlr_backend_start(compositor.backend)) {

2
include/wlr/types/wlr_cursor.h
View File

@ -36,8 +36,6 @@ struct wlr_cursor *wlr_cursor_create();
void wlr_cursor_destroy(struct wlr_cursor *cur); void wlr_cursor_destroy(struct wlr_cursor *cur);
void wlr_cursor_set_xcursor(struct wlr_cursor *cur, struct wlr_xcursor *xcur);
/** /**
* Warp the cursor to the given x and y in layout coordinates. If x and y are * Warp the cursor to the given x and y in layout coordinates. If x and y are
* out of the layout boundaries or constraints, no warp will happen. * out of the layout boundaries or constraints, no warp will happen.

5
rootston/input.c
View File

@ -118,7 +118,10 @@ struct roots_input *input_create(struct roots_server *server,
input->cursor = wlr_cursor_create(); input->cursor = wlr_cursor_create();
cursor_initialize(input); cursor_initialize(input);
wlr_cursor_set_xcursor(input->cursor, xcursor);
struct wlr_xcursor_image *image = xcursor->images[0];
wlr_cursor_set_image(input->cursor, image->buffer, image->width,
image->width, image->height, image->hotspot_x, image->hotspot_y);
wlr_cursor_attach_output_layout(input->cursor, server->desktop->layout); wlr_cursor_attach_output_layout(input->cursor, server->desktop->layout);
wlr_cursor_map_to_region(input->cursor, config->cursor.mapped_box); wlr_cursor_map_to_region(input->cursor, config->cursor.mapped_box);

5
types/wlr_cursor.c
View File

@ -46,7 +46,6 @@ struct wlr_cursor_state {
struct wl_list devices; // wlr_cursor_device::link struct wl_list devices; // wlr_cursor_device::link
struct wl_list output_cursors; // wlr_cursor_output_cursor::link struct wl_list output_cursors; // wlr_cursor_output_cursor::link
struct wlr_output_layout *layout; struct wlr_output_layout *layout;
struct wlr_xcursor *xcursor;
struct wlr_output *mapped_output; struct wlr_output *mapped_output;
struct wlr_box *mapped_box; struct wlr_box *mapped_box;
@ -123,10 +122,6 @@ void wlr_cursor_destroy(struct wlr_cursor *cur) {
free(cur); free(cur);
} }
void wlr_cursor_set_xcursor(struct wlr_cursor *cur, struct wlr_xcursor *xcur) {
cur->state->xcursor = xcur;
}
static struct wlr_cursor_device *get_cursor_device(struct wlr_cursor *cur, static struct wlr_cursor_device *get_cursor_device(struct wlr_cursor *cur,
struct wlr_input_device *device) { struct wlr_input_device *device) {
struct wlr_cursor_device *c_device, *ret = NULL; struct wlr_cursor_device *c_device, *ret = NULL;