projects / freeglut / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Removing a bunch of "static" declarations from the "fgPlatform" function definitions...
[freeglut] / src / Common / freeglut_cursor.c
diff --git a/src/Common/freeglut_cursor.c b/src/Common/freeglut_cursor.c
index e467353..ca87127 100644 (file)
--- a/src/Common/freeglut_cursor.c
+++ b/src/Common/freeglut_cursor.c
@@ -39,6 +39,9 @@
 \r
 /* -- PRIVATE FUNCTIONS --------------------------------------------------- */\r
 \r
+extern void fgPlatformSetCursor ( SFG_Window *window, int cursorID );\r
+extern void fgPlatformWarpPointer ( int x, int y );\r
+\r
 #if TARGET_HOST_POSIX_X11 || TARGET_HOST_MAC_OSX || TARGET_HOST_SOLARIS\r
   #include <X11/cursorfont.h>\r
 \r
@@ -101,7 +104,7 @@ static cursorCacheEntry cursorCache[] = {
     { XC_bottom_left_corner,  None }  /* GLUT_CURSOR_BOTTOM_LEFT_CORNER */\r
 };\r
 \r
-static void fghSetCursor ( SFG_Window *window, int cursorID )\r
+void fgPlatformSetCursor ( SFG_Window *window, int cursorID )\r
 {\r
     Cursor cursor;\r
     /*\r
@@ -147,7 +150,7 @@ static void fghSetCursor ( SFG_Window *window, int cursorID )
 }\r
 \r
 \r
-static void fghWarpPointer ( int x, int y )\r
+void fgPlatformWarpPointer ( int x, int y )\r
 {\r
     XWarpPointer(\r
         fgDisplay.Display,\r
@@ -162,95 +165,10 @@ static void fghWarpPointer ( int x, int y )
 #endif\r
 \r
 \r
-#if TARGET_HOST_MS_WINDOWS\r
-static void fghSetCursor ( SFG_Window *window, int cursorID )\r
-{\r
-    /*\r
-     * Joe Krahn is re-writing the following code.\r
-     */\r
-    /* Set the cursor AND change it for this window class. */\r
-#if !defined(__MINGW64__) && _MSC_VER <= 1200\r
-#       define MAP_CURSOR(a,b)                                   \\r
-        case a:                                                  \\r
-            SetCursor( LoadCursor( NULL, b ) );                  \\r
-            SetClassLong( window->Window.Handle,                 \\r
-                          GCL_HCURSOR,                           \\r
-                          ( LONG )LoadCursor( NULL, b ) );       \\r
-        break;\r
-    /* Nuke the cursor AND change it for this window class. */\r
-#       define ZAP_CURSOR(a,b)                                   \\r
-        case a:                                                  \\r
-            SetCursor( NULL );                                   \\r
-            SetClassLong( window->Window.Handle,                 \\r
-                          GCL_HCURSOR, ( LONG )NULL );           \\r
-        break;\r
-#else\r
-#       define MAP_CURSOR(a,b)                                   \\r
-        case a:                                                  \\r
-            SetCursor( LoadCursor( NULL, b ) );                  \\r
-            SetClassLongPtr( window->Window.Handle,              \\r
-                          GCLP_HCURSOR,                          \\r
-                          ( LONG )( LONG_PTR )LoadCursor( NULL, b ) );       \\r
-        break;\r
-    /* Nuke the cursor AND change it for this window class. */\r
-#       define ZAP_CURSOR(a,b)                                   \\r
-        case a:                                                  \\r
-            SetCursor( NULL );                                   \\r
-            SetClassLongPtr( window->Window.Handle,              \\r
-                          GCLP_HCURSOR, ( LONG )( LONG_PTR )NULL );          \\r
-        break;\r
-#endif\r
-\r
-    switch( cursorID )\r
-    {\r
-        MAP_CURSOR( GLUT_CURSOR_RIGHT_ARROW,         IDC_ARROW     );\r
-        MAP_CURSOR( GLUT_CURSOR_LEFT_ARROW,          IDC_ARROW     );\r
-        MAP_CURSOR( GLUT_CURSOR_INFO,                IDC_HELP      );\r
-        MAP_CURSOR( GLUT_CURSOR_DESTROY,             IDC_CROSS     );\r
-        MAP_CURSOR( GLUT_CURSOR_HELP,                IDC_HELP      );\r
-        MAP_CURSOR( GLUT_CURSOR_CYCLE,               IDC_SIZEALL   );\r
-        MAP_CURSOR( GLUT_CURSOR_SPRAY,               IDC_CROSS     );\r
-        MAP_CURSOR( GLUT_CURSOR_WAIT,                IDC_WAIT      );\r
-        MAP_CURSOR( GLUT_CURSOR_TEXT,                IDC_IBEAM     );\r
-        MAP_CURSOR( GLUT_CURSOR_CROSSHAIR,           IDC_CROSS     );\r
-        MAP_CURSOR( GLUT_CURSOR_UP_DOWN,             IDC_SIZENS    );\r
-        MAP_CURSOR( GLUT_CURSOR_LEFT_RIGHT,          IDC_SIZEWE    );\r
-        MAP_CURSOR( GLUT_CURSOR_TOP_SIDE,            IDC_ARROW     ); /* XXX ToDo */\r
-        MAP_CURSOR( GLUT_CURSOR_BOTTOM_SIDE,         IDC_ARROW     ); /* XXX ToDo */\r
-        MAP_CURSOR( GLUT_CURSOR_LEFT_SIDE,           IDC_ARROW     ); /* XXX ToDo */\r
-        MAP_CURSOR( GLUT_CURSOR_RIGHT_SIDE,          IDC_ARROW     ); /* XXX ToDo */\r
-        MAP_CURSOR( GLUT_CURSOR_TOP_LEFT_CORNER,     IDC_SIZENWSE  );\r
-        MAP_CURSOR( GLUT_CURSOR_TOP_RIGHT_CORNER,    IDC_SIZENESW  );\r
-        MAP_CURSOR( GLUT_CURSOR_BOTTOM_RIGHT_CORNER, IDC_SIZENWSE  );\r
-        MAP_CURSOR( GLUT_CURSOR_BOTTOM_LEFT_CORNER,  IDC_SIZENESW  );\r
-        MAP_CURSOR( GLUT_CURSOR_INHERIT,             IDC_ARROW     ); /* XXX ToDo */\r
-        ZAP_CURSOR( GLUT_CURSOR_NONE,                NULL          );\r
-        MAP_CURSOR( GLUT_CURSOR_FULL_CROSSHAIR,      IDC_CROSS     ); /* XXX ToDo */\r
-\r
-    default:\r
-        fgError( "Unknown cursor type: %d", cursorID );\r
-        break;\r
-    }\r
-}\r
-\r
-\r
-static void fghWarpPointer ( int x, int y )\r
-{\r
-    POINT coords;\r
-    coords.x = x;\r
-    coords.y = y;\r
-\r
-    /* ClientToScreen() translates {coords} for us. */\r
-    ClientToScreen( fgStructure.CurrentWindow->Window.Handle, &coords );\r
-    SetCursorPos( coords.x, coords.y );\r
-}\r
-#endif\r
-\r
-\r
 /* -- INTERNAL FUNCTIONS ---------------------------------------------------- */\r
 void fgSetCursor ( SFG_Window *window, int cursorID )\r
 {\r
-    fghSetCursor ( window, cursorID );\r
+    fgPlatformSetCursor ( window, cursorID );\r
 }\r
 \r
 \r
@@ -264,7 +182,7 @@ void FGAPIENTRY glutSetCursor( int cursorID )
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetCursor" );\r
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetCursor" );\r
 \r
-    fghSetCursor ( fgStructure.CurrentWindow, cursorID );\r
+    fgPlatformSetCursor ( fgStructure.CurrentWindow, cursorID );\r
     fgStructure.CurrentWindow->State.Cursor = cursorID;\r
 }\r
 \r
@@ -276,7 +194,7 @@ void FGAPIENTRY glutWarpPointer( int x, int y )
     FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWarpPointer" );\r
     FREEGLUT_EXIT_IF_NO_WINDOW ( "glutWarpPointer" );\r
 \r
-    fghWarpPointer ( x, y );\r
+    fgPlatformWarpPointer ( x, y );\r
 }\r
 \r
 /*** END OF FILE ***/\r
FreeGLUT