[cairo-commit] xsvg/src xsvg.c,1.27,1.28

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/xsvg/src
In directory gabe:/tmp/cvs-serv27222/src

Modified Files:
	xsvg.c 
Log Message:

        * configure.in: Don't require an xcursor package, (since the code
        in xsvg that uses it seems to be broken anyway).

        * src/xsvg.c (win_init, busy): Disable Xcursor-using code which
        doesn't seem to be working.


Index: xsvg.c
===================================================================
RCS file: /cvs/cairo/xsvg/src/xsvg.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- xsvg.c	21 Feb 2005 20:43:30 -0000	1.27
+++ xsvg.c	21 Feb 2005 20:48:30 -0000	1.28
@@ -40,7 +40,13 @@
 
 #include "args.h"
 #include <X11/Xatom.h>
+
+/* XXX: The cursor code doesn't seem to be working, (and someone
+ * couldn't get it to compile on Solaris), so I'm just disabling it
+ * until someone fixes it. */
+#if CURSOR_CODE_IS_FIXED
 #include <X11/Xcursor/Xcursor.h>
+#endif
 
 #define SHIFT 10
 
@@ -57,8 +63,11 @@
     Visual *visual;
     Colormap cmap;
     int depth;
+
+#if CURSOR_CODE_IS_FIXED
     Cursor arrow;
     Cursor watch;
+#endif
 
     unsigned int width, height;
     int x_flip, y_flip;
@@ -271,8 +280,10 @@
 
 static void busy (win_t *win, int on)
 {
+#if CURSOR_CODE_IS_FIXED
     if (win->win)
 	XDefineCursor (win->dpy, win->win, on ? win->watch : win->arrow);
+#endif
 }
 
 static int
@@ -497,8 +508,10 @@
 	win->depth = DefaultDepth (dpy, win->scr);
     }
     
+#if CURSOR_CODE_IS_FIXED
     win->arrow = XcursorLibraryLoadCursor (dpy, "left_ptr");
     win->watch = XcursorLibraryLoadCursor (dpy, "watch");
+#endif
     if (win->full_mode) {
 	XWindowAttributes   root_attr;
 	XGetWindowAttributes (win->dpy,