summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-04-10 07:35:50 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2014-04-10 09:07:38 +0100
commit1d2872dd0830c8858621402328aa1a9322b66ea8 (patch)
treef109cda114eb7840d0b8db9f8d0720562d4c143f /src
parentf9a279b2dc8417b6504478ac96514125d6136523 (diff)
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 <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/sna/sna_display.c14
1 files changed, 14 insertions, 0 deletions
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)
{