FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplifying the system-dependent conditional code in "freeglut_cursor.c"

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@859 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2009-12-05 14:58:24 +00:00
parent 439af1ae86
commit f2e555b6e6
1 changed files with 77 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
freeglut/freeglut/src/freeglut_cursor.c
View File

@ -28,10 +28,6 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal.h" #include "freeglut_internal.h"
#if TARGET_HOST_POSIX_X11
#include <X11/cursorfont.h>
#endif
/* /*
* TODO BEFORE THE STABLE RELEASE: * TODO BEFORE THE STABLE RELEASE:
* glutSetCursor() -- Win32 mappings are incomplete. * glutSetCursor() -- Win32 mappings are incomplete.
@ -44,6 +40,8 @@
/* -- PRIVATE FUNCTIONS --------------------------------------------------- */ /* -- PRIVATE FUNCTIONS --------------------------------------------------- */
#if TARGET_HOST_POSIX_X11 #if TARGET_HOST_POSIX_X11
#include <X11/cursorfont.h>
/* /*
* A factory method for an empty cursor * A factory method for an empty cursor
*/ */
@ -102,17 +100,9 @@ static cursorCacheEntry cursorCache[] = {
{ XC_bottom_right_corner, None }, /* GLUT_CURSOR_BOTTOM_RIGHT_CORNER */ { XC_bottom_right_corner, None }, /* GLUT_CURSOR_BOTTOM_RIGHT_CORNER */
{ XC_bottom_left_corner, None } /* GLUT_CURSOR_BOTTOM_LEFT_CORNER */ { XC_bottom_left_corner, None } /* GLUT_CURSOR_BOTTOM_LEFT_CORNER */
}; };
#endif
/* -- INTERNAL FUNCTIONS ---------------------------------------------------- */ static void fghSetCursor ( SFG_Window *window, int cursorID )
/*
* Set the cursor image to be used for the current window
*/
void fgSetCursor ( SFG_Window *window, int cursorID )
{ {
#if TARGET_HOST_POSIX_X11
{
Cursor cursor; Cursor cursor;
/* /*
* XXX FULL_CROSSHAIR demotes to plain CROSSHAIR. Old GLUT allows * XXX FULL_CROSSHAIR demotes to plain CROSSHAIR. Old GLUT allows
@ -154,10 +144,27 @@ void fgSetCursor ( SFG_Window *window, int cursorID )
} else if ( cursorIDToUse != GLUT_CURSOR_NONE ) { } else if ( cursorIDToUse != GLUT_CURSOR_NONE ) {
fgError( "Failed to create cursor" ); fgError( "Failed to create cursor" );
} }
} }
#elif TARGET_HOST_MS_WINDOWS
static void fghWarpPointer ( int x, int y )
{
XWarpPointer(
fgDisplay.Display,
None,
fgStructure.CurrentWindow->Window.Handle,
0, 0, 0, 0,
x, y
);
/* Make the warp visible immediately. */
XFlush( fgDisplay.Display );
}
#endif
#if TARGET_HOST_MS_WINDOWS
static void fghSetCursor ( SFG_Window *window, int cursorID )
{
/* /*
* Joe Krahn is re-writing the following code. * Joe Krahn is re-writing the following code.
*/ */
@ -224,10 +231,24 @@ void fgSetCursor ( SFG_Window *window, int cursorID )
fgError( "Unknown cursor type: %d", cursorID ); fgError( "Unknown cursor type: %d", cursorID );
break; break;
} }
}
static void fghWarpPointer ( int x, int y )
{
POINT coords;
coords.x = x;
coords.y = y;
/* ClientToScreen() translates {coords} for us. */
ClientToScreen( fgStructure.CurrentWindow->Window.Handle, &coords );
SetCursorPos( coords.x, coords.y );
}
#endif #endif
window->State.Cursor = cursorID;
} /* -- INTERNAL FUNCTIONS ---------------------------------------------------- */
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */ /* -- INTERFACE FUNCTIONS -------------------------------------------------- */
@ -239,7 +260,8 @@ void FGAPIENTRY glutSetCursor( int cursorID )
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetCursor" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetCursor" );
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetCursor" ); FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetCursor" );
fgSetCursor ( fgStructure.CurrentWindow, cursorID ); fghSetCursor ( fgStructure.CurrentWindow, cursorID );
fgStructure.CurrentWindow->State.Cursor = cursorID;
} }
/* /*
@ -250,31 +272,7 @@ void FGAPIENTRY glutWarpPointer( int x, int y )
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWarpPointer" ); FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWarpPointer" );
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutWarpPointer" ); FREEGLUT_EXIT_IF_NO_WINDOW ( "glutWarpPointer" );
#if TARGET_HOST_POSIX_X11 fghWarpPointer ( x, y );
XWarpPointer(
fgDisplay.Display,
None,
fgStructure.CurrentWindow->Window.Handle,
0, 0, 0, 0,
x, y
);
/* Make the warp visible immediately. */
XFlush( fgDisplay.Display );
#elif TARGET_HOST_MS_WINDOWS
{
POINT coords;
coords.x = x;
coords.y = y;
/* ClientToScreen() translates {coords} for us. */
ClientToScreen( fgStructure.CurrentWindow->Window.Handle, &coords );
SetCursorPos( coords.x, coords.y );
}
#endif
} }
/*** END OF FILE ***/ /*** END OF FILE ***/