Index: visual.c
===================================================================
RCS file: /cvsroot/ggi/ggi-core/libggi/display/X/visual.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 visual.c
--- visual.c	2001/05/12 23:01:55	1.1.1.1
+++ visual.c	2001/05/22 16:49:04
@@ -34,16 +34,21 @@
 #include <ggi/internal/ggi-dl.h>
 #include <ggi/display/x.h>
 
+#define GGI_X_TARGET
+#include "./visual.inc"
+
 static const gg_option optlist[] =
 {
 	{ "inroot", "no" },
 	{ "inwin",  "no" },
-	{ "noinput", "no" }
+	{ "noinput", "no" },
+	{ "nocursor", "no" }
 };
 
 #define OPT_INROOT	0
 #define OPT_INWIN	1
 #define OPT_NOINPUT	2
+#define OPT_NOCURSOR	3
 
 #define NUM_OPTS	(sizeof(optlist)/sizeof(gg_option))
 
@@ -81,26 +86,6 @@
 }
 
 
-static inline Cursor make_cursor(Display *disp, Window root)
-{
-	char data[] = { 0xf8, 0xfa, 0xf8 };
-	char mask[] = { 0xfa, 0xff, 0xfa };
-	Pixmap crsrpix, crsrmask;
-	XColor black = { 0, 0x0, 0x0, 0x0 },
-	       white = { 0, 0xffff, 0xffff, 0xffff };
-	Cursor mycrsr;
-
-	crsrpix = XCreateBitmapFromData(disp, root, data, 3, 3);
-	crsrmask = XCreateBitmapFromData(disp, root, mask, 3, 3);
-	mycrsr = XCreatePixmapCursor(disp, crsrpix, crsrmask,
-				     &black, &white, 1, 1);
-	XFreePixmap(disp, crsrpix);
-	XFreePixmap(disp, crsrmask);
-
-	return mycrsr;
-}
-
-
 static int GGIclose(ggi_visual *vis, struct ggi_dlhandle *dlh)
 {
 	ggi_x_priv *priv = LIBGGI_PRIVATE(vis);
@@ -213,8 +198,10 @@
 		priv->xwin.wintype = GGIX_NORMAL;
 	}
 
-	priv->xwin.cursor = make_cursor(disp, RootWindow(priv->xwin.x.display,
-							 priv->xwin.x.screen));
+	priv->xwin.cursor =
+		_ggi_x_make_cursor(disp, RootWindow(priv->xwin.x.display,
+						    priv->xwin.x.screen),
+				   (options[OPT_NOCURSOR].result[0] == 'n'));
 
 	for(i = 0; i<8; i++) {
 		priv->ximage_list[i] = NULL;