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

compositor: Don't allow setting a NULL cursor without pointer focus

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-08-01 09:46:12 -04:00
parent ae27737b28
commit 649e1ce973
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+4 -5
View File
@@ -2213,15 +2213,14 @@ pointer_set_cursor(struct wl_client *client, struct wl_resource *resource,
surface = container_of(surface_resource->data, surface = container_of(surface_resource->data,
struct weston_surface, surface); struct weston_surface, surface);
if (seat->seat.pointer->focus == NULL)
return;
if (seat->seat.pointer->focus->resource.client != client)
return;
if (seat->seat.pointer->focus_serial - serial > UINT32_MAX / 2) if (seat->seat.pointer->focus_serial - serial > UINT32_MAX / 2)
return; return;
if (surface && surface != seat->sprite) { if (surface && surface != seat->sprite) {
if (seat->seat.pointer->focus == NULL)
return;
if (seat->seat.pointer->focus->resource.client != client)
return;
if (surface->configure) { if (surface->configure) {
wl_resource_post_error(&surface->surface.resource, wl_resource_post_error(&surface->surface.resource,
WL_DISPLAY_ERROR_INVALID_OBJECT, WL_DISPLAY_ERROR_INVALID_OBJECT,