brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Attach cursor buffer to input device when it enters the surface

Browse Source 
The Wayland semantics mean that we must attach a buffer to the input device
when the pointer enters the surface to provide a cursor.
This commit is contained in:
Rob Bradford 2012-01-10 17:25:35 +00:00
parent e1434cebdb
commit a9e6137f47
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clutter/wayland/clutter-input-device-wayland.c
View File

@ -39,6 +39,7 @@
#include "clutter-keysyms.h" #include "clutter-keysyms.h"
#include "evdev/clutter-xkb-utils.h" #include "evdev/clutter-xkb-utils.h"
#include "clutter-input-device-wayland.h" #include "clutter-input-device-wayland.h"
#include "clutter-backend-wayland.h"
#include "cogl/clutter-stage-cogl.h" #include "cogl/clutter-stage-cogl.h"
@ -165,6 +166,9 @@ clutter_wayland_handle_pointer_focus (void *data,
if (surface) if (surface)
{ {
ClutterBackend *backend;
ClutterBackendWayland *backend_wayland;
stage_cogl = wl_surface_get_user_data (surface); stage_cogl = wl_surface_get_user_data (surface);
device->pointer_focus = stage_cogl; device->pointer_focus = stage_cogl;
@ -186,8 +190,15 @@ clutter_wayland_handle_pointer_focus (void *data,
device->x = x; device->x = x;
device->y = y; device->y = y;
/* Revert back to default pointer for now. */ /* Set the cursor to the cursor loaded at backend initialisation */
wl_input_device_attach (input_device, _time, NULL, 0, 0); backend = clutter_get_default_backend ();
backend_wayland = CLUTTER_BACKEND_WAYLAND (backend);
wl_input_device_attach (input_device,
_time,
backend_wayland->cursor_buffer,
backend_wayland->cursor_x,
backend_wayland->cursor_y);
} }
} }