From 1d2872dd0830c8858621402328aa1a9322b66ea8 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 10 Apr 2014 07:35:50 +0100 Subject: sna: Prepare for an upcoming Cursor API change 1.16 now expects load-cursor-argb to return a boolean reporting success/failure. Signed-off-by: Chris Wilson --- src/sna/sna_display.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src') diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index a9558d22..528f21e5 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -3492,6 +3492,19 @@ disable: sigio_unblock(sigio); } +#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0) +static Bool +sna_load_cursor_argb(ScrnInfoPtr scrn, CursorPtr cursor) +{ + return TRUE; +} + +static Bool +sna_load_cursor_image(ScrnInfoPtr scrn, unsigned char *src) +{ + return TRUE; +} +#else static void sna_load_cursor_argb(ScrnInfoPtr scrn, CursorPtr cursor) { @@ -3501,6 +3514,7 @@ static void sna_load_cursor_image(ScrnInfoPtr scrn, unsigned char *src) { } +#endif static int __cursor_size(CursorPtr cursor) { -- cgit v1.2.3