X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2FCommon%2Ffreeglut_cursor.c;h=140c0ea2d78815f58f02f6256ffc5de9fd2878e5;hb=dd8896ee63aa0a066b0d591989b2ffb72fd08563;hp=1eddf87c8750c951133b6f1e4df2441a9ef27741;hpb=4e6742a8c1090137a36512d72271c160bd509e1f;p=freeglut

diff --git a/src/Common/freeglut_cursor.c b/src/Common/freeglut_cursor.c
index 1eddf87..140c0ea 100644
--- a/src/Common/freeglut_cursor.c
+++ b/src/Common/freeglut_cursor.c
@@ -39,8 +39,8 @@
 
 /* -- PRIVATE FUNCTIONS --------------------------------------------------- */
 
-extern void fghSetCursor ( SFG_Window *window, int cursorID );
-extern void fghWarpPointer ( int x, int y );
+extern void fgPlatformSetCursor ( SFG_Window *window, int cursorID );
+extern void fgPlatformWarpPointer ( int x, int y );
 
 #if TARGET_HOST_POSIX_X11 || TARGET_HOST_MAC_OSX || TARGET_HOST_SOLARIS
   #include <X11/cursorfont.h>
@@ -57,14 +57,14 @@ static Cursor getEmptyCursor( void )
         Pixmap cursorNonePixmap;
         memset( cursorNoneBits, 0, sizeof( cursorNoneBits ) );
         memset( &dontCare, 0, sizeof( dontCare ) );
-        cursorNonePixmap = XCreateBitmapFromData ( fgDisplay.Display,
-                                                   fgDisplay.RootWindow,
+        cursorNonePixmap = XCreateBitmapFromData ( fgDisplay.pDisplay.Display,
+                                                   fgDisplay.pDisplay.RootWindow,
                                                    cursorNoneBits, 16, 16 );
         if( cursorNonePixmap != None ) {
-            cursorNone = XCreatePixmapCursor( fgDisplay.Display,
+            cursorNone = XCreatePixmapCursor( fgDisplay.pDisplay.Display,
                                               cursorNonePixmap, cursorNonePixmap,
                                               &dontCare, &dontCare, 0, 0 );
-            XFreePixmap( fgDisplay.Display, cursorNonePixmap );
+            XFreePixmap( fgDisplay.pDisplay.Display, cursorNonePixmap );
         }
     }
     return cursorNone;
@@ -104,7 +104,7 @@ static cursorCacheEntry cursorCache[] = {
     { XC_bottom_left_corner,  None }  /* GLUT_CURSOR_BOTTOM_LEFT_CORNER */
 };
 
-static void fghSetCursor ( SFG_Window *window, int cursorID )
+void fgPlatformSetCursor ( SFG_Window *window, int cursorID )
 {
     Cursor cursor;
     /*
@@ -120,7 +120,7 @@ static void fghSetCursor ( SFG_Window *window, int cursorID )
         cursorCacheEntry *entry = &cursorCache[ cursorIDToUse ];
         if( entry->cachedCursor == None ) {
             entry->cachedCursor =
-                XCreateFontCursor( fgDisplay.Display, entry->cursorShape );
+                XCreateFontCursor( fgDisplay.pDisplay.Display, entry->cursorShape );
         }
         cursor = entry->cachedCursor;
     } else {
@@ -141,26 +141,26 @@ static void fghSetCursor ( SFG_Window *window, int cursorID )
     }
 
     if ( cursorIDToUse == GLUT_CURSOR_INHERIT ) {
-        XUndefineCursor( fgDisplay.Display, window->Window.Handle );
+        XUndefineCursor( fgDisplay.pDisplay.Display, window->Window.Handle );
     } else if ( cursor != None ) {
-        XDefineCursor( fgDisplay.Display, window->Window.Handle, cursor );
+        XDefineCursor( fgDisplay.pDisplay.Display, window->Window.Handle, cursor );
     } else if ( cursorIDToUse != GLUT_CURSOR_NONE ) {
         fgError( "Failed to create cursor" );
     }
 }
 
 
-static void fghWarpPointer ( int x, int y )
+void fgPlatformWarpPointer ( int x, int y )
 {
     XWarpPointer(
-        fgDisplay.Display,
+        fgDisplay.pDisplay.Display,
         None,
         fgStructure.CurrentWindow->Window.Handle,
         0, 0, 0, 0,
         x, y
     );
     /* Make the warp visible immediately. */
-    XFlush( fgDisplay.Display );
+    XFlush( fgDisplay.pDisplay.Display );
 }
 #endif
 
@@ -168,7 +168,7 @@ static void fghWarpPointer ( int x, int y )
 /* -- INTERNAL FUNCTIONS ---------------------------------------------------- */
 void fgSetCursor ( SFG_Window *window, int cursorID )
 {
-    fghSetCursor ( window, cursorID );
+    fgPlatformSetCursor ( window, cursorID );
 }
 
 
@@ -182,7 +182,7 @@ void FGAPIENTRY glutSetCursor( int cursorID )
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetCursor" );
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetCursor" );
 
-    fghSetCursor ( fgStructure.CurrentWindow, cursorID );
+    fgPlatformSetCursor ( fgStructure.CurrentWindow, cursorID );
     fgStructure.CurrentWindow->State.Cursor = cursorID;
 }
 
@@ -194,7 +194,7 @@ void FGAPIENTRY glutWarpPointer( int x, int y )
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWarpPointer" );
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutWarpPointer" );
 
-    fghWarpPointer ( x, y );
+    fgPlatformWarpPointer ( x, y );
 }
 
 /*** END OF FILE ***/