--- ./programs/Xserver/hw/xwin/save_wincursor.c	2005-11-15 12:14:18.000000000 +0000
+++ ./programs/Xserver/hw/xwin/wincursor.c	2005-11-15 12:28:20.000000000 +0000
@@ -41,6 +41,8 @@
 #include <mipointrst.h>
 #include <servermd.h>
 
+extern Bool	g_fSoftwareCursor;
+
 
 #ifndef MIN
 #define MIN(x,y) ((x)<(y)?(x):(y))
@@ -438,8 +440,6 @@
 static Bool
 winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
 {
-  WIN_DEBUG_MSG("winRealizeCursor: cursor=%p\n", pCursor); 
-
   if(pCursor == NULL || pCursor->bits == NULL)
     return FALSE;
   
@@ -456,7 +456,6 @@
 static Bool
 winUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
 {
-  WIN_DEBUG_MSG("winUnrealizeCursor: cursor=%p\n", pCursor); 
   return TRUE;
 }
 
@@ -508,7 +507,7 @@
     {
       if (pScreenPriv->cursor.visible)
 	{
-	  if (!bInhibit)
+	  if (!bInhibit && g_fSoftwareCursor)
 	    ShowCursor (FALSE);
 	  pScreenPriv->cursor.visible = FALSE;
 	}
@@ -531,7 +530,7 @@
 
       if (!pScreenPriv->cursor.visible)
 	{
-	  if (!bInhibit)
+	  if (!bInhibit && g_fSoftwareCursor)
 	    ShowCursor (TRUE);
 	  pScreenPriv->cursor.visible = TRUE;
 	}
--- ./programs/Xserver/hw/xwin/save_winresource.h	2005-08-19 17:48:32.000000000 +0100
+++ ./programs/Xserver/hw/xwin/winresource.h	2005-08-19 17:48:57.000000000 +0100
@@ -46,7 +46,6 @@
 #define ID_APP_HIDE_ROOT	201
 #define ID_APP_ALWAYS_ON_TOP	202
 #define ID_APP_ABOUT		203
-#define ID_APP_SHOWCURSOR		204
 
 #define ID_ABOUT_UG		300
 #define ID_ABOUT_FAQ		301
--- ./programs/Xserver/hw/xwin/save_winwndproc.c	2005-08-19 17:49:10.000000000 +0100
+++ ./programs/Xserver/hw/xwin/winwndproc.c	2005-08-19 17:50:18.000000000 +0100
@@ -1206,9 +1206,6 @@
 	  /* Display Exit dialog */
 	  winDisplayExitDialog (s_pScreenPriv);
 	  return 0;
-	case ID_APP_SHOWCURSOR:
-	  winDebug("ShowCursor: %d\n", ShowCursor(TRUE));
-	  return 0;
 
 #ifdef XWIN_MULTIWINDOW
 	case ID_APP_HIDE_ROOT:
--- ./programs/Xserver/hw/xwin/save_XWin.rc	2005-11-16 07:46:42.000000000 +0000
+++ ./programs/Xserver/hw/xwin/XWin.rc	2005-11-16 07:47:18.000000000 +0000
@@ -94,7 +94,6 @@
 	POPUP "TRAYICON_MENU"
 	BEGIN
 		MENUITEM "&Hide Root Window", ID_APP_HIDE_ROOT
-		MENUITEM "Show Cursor", ID_APP_SHOWCURSOR
 		MENUITEM "&About...", ID_APP_ABOUT
 		MENUITEM SEPARATOR
 		MENUITEM "E&xit", ID_APP_EXIT