Fixed the GLUT_CURSOR_INHERIT logic once again...

Note that this commit is untested, but at least it looks better than
before. We really a need a cursor test program.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@678 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/ChangeLog b/ChangeLog
index e28f1e6..77eecdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1126,3 +1126,5 @@ for some bit-fiddling, anyway.
 
 (293) Improve autoconf magic: To detect headers like GL/gl.h, it might be
 necessary to temporarily use the X11 flags found by AC_PATH_XTRA.
+
+(294) Fixed the GLUT_CURSOR_INHERIT logic once again...

diff --git a/src/freeglut_cursor.c b/src/freeglut_cursor.c
index 5542a2d..66ed155 100644 (file)
--- a/src/freeglut_cursor.c
+++ b/src/freeglut_cursor.c
@@ -147,13 +147,13 @@ void fgSetCursor ( SFG_Window *window, int cursorID )
             }
         }
 
-        if ( cursorIDToUse == GLUT_CURSOR_INHERIT )
+        if ( cursorIDToUse == GLUT_CURSOR_INHERIT ) {
             XUndefineCursor( fgDisplay.Display, window->Window.Handle );
-        if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) )
+        } else if ( cursor != None ) {
+            XDefineCursor( fgDisplay.Display, window->Window.Handle, cursor );
+        } else if ( cursorIDToUse != GLUT_CURSOR_NONE ) {
             fgError( "Failed to create cursor" );
-        else
-            XDefineCursor( fgDisplay.Display,
-                           window->Window.Handle, cursor );
+        }
     }
 
 #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE