mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Track pointer image protocol change

Browse Source 
The request pointer.attach was replaced with pointer.set_cursor that
lets a client set the cursor surface for a given pointer.
This commit is contained in:
Ander Conselvan de Oliveira
2012-06-15 17:27:35 +03:00
committed by Kristian Høgsberg
parent 912f20b9b7
commit 37ffc3c14b
5 changed files with 100 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/simple-egl.c
+1 -1
View File
@@ -360,7 +360,7 @@ pointer_handle_enter(void *data, struct wl_pointer *pointer,
struct display *display = data;
if (display->window->fullscreen)
wl_pointer_attach(pointer, serial, NULL, 0, 0);
wl_pointer_set_cursor(pointer, serial, NULL, 0, 0);
}
static void
clients/window.c
+11 -2
View File
@@ -189,6 +189,7 @@ struct input {
struct window *pointer_focus;
struct window *keyboard_focus;
int current_cursor;
struct wl_surface *pointer_surface;
uint32_t modifiers;
uint32_t pointer_enter_serial;
float sx, sy;
@@ -2295,8 +2296,12 @@ input_set_pointer_image_index(struct input *input, int pointer, int index)
return;
input->current_cursor = pointer;
wl_pointer_attach(input->pointer, input->pointer_enter_serial,
buffer, image->hotspot_x, image->hotspot_y);
wl_pointer_set_cursor(input->pointer, input->display->serial,
input->pointer_surface,
image->hotspot_x, image->hotspot_y);
wl_surface_attach(input->pointer_surface, buffer, 0, 0);
wl_surface_damage(input->pointer_surface, 0, 0,
image->width, image->height);
}
void
@@ -3168,6 +3173,8 @@ display_add_input(struct display *d, uint32_t id)
input->seat);
wl_data_device_add_listener(input->data_device, &data_device_listener,
input);
input->pointer_surface = wl_compositor_create_surface(d->compositor);
}
static void
@@ -3190,6 +3197,8 @@ input_destroy(struct input *input)
wl_data_device_destroy(input->data_device);
fini_xkb(input);
wl_surface_destroy(input->pointer_surface);
wl_list_remove(&input->link);
wl_seat_destroy(input->seat);
free(input);