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

compositor-drm: Fix cursor view size check

Browse Source 
Instead of testing against a hardcoded 64x64 pixel size to see if a view
is suitable for promotion to a cursor plane, use our cursor_width and
cursor_height variables.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Daniel Stone
2015-06-16 18:42:23 +01:00
parent 36609c740f
commit 70d337dfd2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-drm.c
+4 -3
View File
@@ -127,8 +127,8 @@ struct drm_backend {
struct udev_input input; struct udev_input input;
uint32_t cursor_width; int32_t cursor_width;
uint32_t cursor_height; int32_t cursor_height;
}; };
struct drm_mode { struct drm_mode {
@@ -1081,7 +1081,8 @@ drm_output_prepare_cursor_view(struct drm_output *output,
return NULL; return NULL;
if (ev->surface->buffer_ref.buffer == NULL || if (ev->surface->buffer_ref.buffer == NULL ||
!wl_shm_buffer_get(ev->surface->buffer_ref.buffer->resource) || !wl_shm_buffer_get(ev->surface->buffer_ref.buffer->resource) ||
ev->surface->width > 64 || ev->surface->height > 64) ev->surface->width > b->cursor_width ||
ev->surface->height > b->cursor_height)
return NULL; return NULL;
output->cursor_view = ev; output->cursor_view = ev;