Splitting out the Windows-specific cursor code into its own file
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@982 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf
parent
95a4d59bc8
commit
f565d17162
@ -39,6 +39,9 @@
|
|||||||
|
|
||||||
/* -- PRIVATE FUNCTIONS --------------------------------------------------- */
|
/* -- PRIVATE FUNCTIONS --------------------------------------------------- */
|
||||||
|
|
||||||
|
extern void fghSetCursor ( SFG_Window *window, int cursorID );
|
||||||
|
extern void fghWarpPointer ( int x, int y );
|
||||||
|
|
||||||
#if TARGET_HOST_POSIX_X11 || TARGET_HOST_MAC_OSX || TARGET_HOST_SOLARIS
|
#if TARGET_HOST_POSIX_X11 || TARGET_HOST_MAC_OSX || TARGET_HOST_SOLARIS
|
||||||
#include <X11/cursorfont.h>
|
#include <X11/cursorfont.h>
|
||||||
|
|
||||||
@ -162,91 +165,6 @@ static void fghWarpPointer ( int x, int y )
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if TARGET_HOST_MS_WINDOWS
|
|
||||||
static void fghSetCursor ( SFG_Window *window, int cursorID )
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Joe Krahn is re-writing the following code.
|
|
||||||
*/
|
|
||||||
/* Set the cursor AND change it for this window class. */
|
|
||||||
#if !defined(__MINGW64__) && _MSC_VER <= 1200
|
|
||||||
# define MAP_CURSOR(a,b) \
|
|
||||||
case a: \
|
|
||||||
SetCursor( LoadCursor( NULL, b ) ); \
|
|
||||||
SetClassLong( window->Window.Handle, \
|
|
||||||
GCL_HCURSOR, \
|
|
||||||
( LONG )LoadCursor( NULL, b ) ); \
|
|
||||||
break;
|
|
||||||
/* Nuke the cursor AND change it for this window class. */
|
|
||||||
# define ZAP_CURSOR(a,b) \
|
|
||||||
case a: \
|
|
||||||
SetCursor( NULL ); \
|
|
||||||
SetClassLong( window->Window.Handle, \
|
|
||||||
GCL_HCURSOR, ( LONG )NULL ); \
|
|
||||||
break;
|
|
||||||
#else
|
|
||||||
# define MAP_CURSOR(a,b) \
|
|
||||||
case a: \
|
|
||||||
SetCursor( LoadCursor( NULL, b ) ); \
|
|
||||||
SetClassLongPtr( window->Window.Handle, \
|
|
||||||
GCLP_HCURSOR, \
|
|
||||||
( LONG )( LONG_PTR )LoadCursor( NULL, b ) ); \
|
|
||||||
break;
|
|
||||||
/* Nuke the cursor AND change it for this window class. */
|
|
||||||
# define ZAP_CURSOR(a,b) \
|
|
||||||
case a: \
|
|
||||||
SetCursor( NULL ); \
|
|
||||||
SetClassLongPtr( window->Window.Handle, \
|
|
||||||
GCLP_HCURSOR, ( LONG )( LONG_PTR )NULL ); \
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
switch( cursorID )
|
|
||||||
{
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_RIGHT_ARROW, IDC_ARROW );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_LEFT_ARROW, IDC_ARROW );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_INFO, IDC_HELP );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_DESTROY, IDC_CROSS );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_HELP, IDC_HELP );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_CYCLE, IDC_SIZEALL );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_SPRAY, IDC_CROSS );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_WAIT, IDC_WAIT );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_TEXT, IDC_IBEAM );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_CROSSHAIR, IDC_CROSS );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_UP_DOWN, IDC_SIZENS );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_LEFT_RIGHT, IDC_SIZEWE );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_TOP_SIDE, IDC_ARROW ); /* XXX ToDo */
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_BOTTOM_SIDE, IDC_ARROW ); /* XXX ToDo */
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_LEFT_SIDE, IDC_ARROW ); /* XXX ToDo */
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_RIGHT_SIDE, IDC_ARROW ); /* XXX ToDo */
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_TOP_LEFT_CORNER, IDC_SIZENWSE );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_TOP_RIGHT_CORNER, IDC_SIZENESW );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_BOTTOM_RIGHT_CORNER, IDC_SIZENWSE );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_BOTTOM_LEFT_CORNER, IDC_SIZENESW );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_INHERIT, IDC_ARROW ); /* XXX ToDo */
|
|
||||||
ZAP_CURSOR( GLUT_CURSOR_NONE, NULL );
|
|
||||||
MAP_CURSOR( GLUT_CURSOR_FULL_CROSSHAIR, IDC_CROSS ); /* XXX ToDo */
|
|
||||||
|
|
||||||
default:
|
|
||||||
fgError( "Unknown cursor type: %d", cursorID );
|
|
||||||
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
|
|
||||||
|
|
||||||
|
|
||||||
/* -- INTERNAL FUNCTIONS ---------------------------------------------------- */
|
/* -- INTERNAL FUNCTIONS ---------------------------------------------------- */
|
||||||
void fgSetCursor ( SFG_Window *window, int cursorID )
|
void fgSetCursor ( SFG_Window *window, int cursorID )
|
||||||
{
|
{
|
||||||
|
|||||||
@ -0,0 +1,115 @@
|
|||||||
|
/*
|
||||||
|
* freeglut_cursor_mswin.c
|
||||||
|
*
|
||||||
|
* The Windows-specific mouse cursor related stuff.
|
||||||
|
*
|
||||||
|
* Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
|
||||||
|
* Written by John F. Fay, <fayjf@sourceforge.net>
|
||||||
|
* Creation date: Thu Jan 19, 2012
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the "Software"),
|
||||||
|
* to deal in the Software without restriction, including without limitation
|
||||||
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
|
* and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
* Software is furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included
|
||||||
|
* in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||||
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||||
|
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <GL/freeglut.h>
|
||||||
|
#include "freeglut_internal_mswin.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void fghSetCursor ( SFG_Window *window, int cursorID )
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Joe Krahn is re-writing the following code.
|
||||||
|
*/
|
||||||
|
/* Set the cursor AND change it for this window class. */
|
||||||
|
#if !defined(__MINGW64__) && _MSC_VER <= 1200
|
||||||
|
# define MAP_CURSOR(a,b) \
|
||||||
|
case a: \
|
||||||
|
SetCursor( LoadCursor( NULL, b ) ); \
|
||||||
|
SetClassLong( window->Window.Handle, \
|
||||||
|
GCL_HCURSOR, \
|
||||||
|
( LONG )LoadCursor( NULL, b ) ); \
|
||||||
|
break;
|
||||||
|
/* Nuke the cursor AND change it for this window class. */
|
||||||
|
# define ZAP_CURSOR(a,b) \
|
||||||
|
case a: \
|
||||||
|
SetCursor( NULL ); \
|
||||||
|
SetClassLong( window->Window.Handle, \
|
||||||
|
GCL_HCURSOR, ( LONG )NULL ); \
|
||||||
|
break;
|
||||||
|
#else
|
||||||
|
# define MAP_CURSOR(a,b) \
|
||||||
|
case a: \
|
||||||
|
SetCursor( LoadCursor( NULL, b ) ); \
|
||||||
|
SetClassLongPtr( window->Window.Handle, \
|
||||||
|
GCLP_HCURSOR, \
|
||||||
|
( LONG )( LONG_PTR )LoadCursor( NULL, b ) ); \
|
||||||
|
break;
|
||||||
|
/* Nuke the cursor AND change it for this window class. */
|
||||||
|
# define ZAP_CURSOR(a,b) \
|
||||||
|
case a: \
|
||||||
|
SetCursor( NULL ); \
|
||||||
|
SetClassLongPtr( window->Window.Handle, \
|
||||||
|
GCLP_HCURSOR, ( LONG )( LONG_PTR )NULL ); \
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
switch( cursorID )
|
||||||
|
{
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_RIGHT_ARROW, IDC_ARROW );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_LEFT_ARROW, IDC_ARROW );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_INFO, IDC_HELP );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_DESTROY, IDC_CROSS );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_HELP, IDC_HELP );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_CYCLE, IDC_SIZEALL );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_SPRAY, IDC_CROSS );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_WAIT, IDC_WAIT );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_TEXT, IDC_IBEAM );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_CROSSHAIR, IDC_CROSS );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_UP_DOWN, IDC_SIZENS );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_LEFT_RIGHT, IDC_SIZEWE );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_TOP_SIDE, IDC_ARROW ); /* XXX ToDo */
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_BOTTOM_SIDE, IDC_ARROW ); /* XXX ToDo */
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_LEFT_SIDE, IDC_ARROW ); /* XXX ToDo */
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_RIGHT_SIDE, IDC_ARROW ); /* XXX ToDo */
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_TOP_LEFT_CORNER, IDC_SIZENWSE );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_TOP_RIGHT_CORNER, IDC_SIZENESW );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_BOTTOM_RIGHT_CORNER, IDC_SIZENWSE );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_BOTTOM_LEFT_CORNER, IDC_SIZENESW );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_INHERIT, IDC_ARROW ); /* XXX ToDo */
|
||||||
|
ZAP_CURSOR( GLUT_CURSOR_NONE, NULL );
|
||||||
|
MAP_CURSOR( GLUT_CURSOR_FULL_CROSSHAIR, IDC_CROSS ); /* XXX ToDo */
|
||||||
|
|
||||||
|
default:
|
||||||
|
fgError( "Unknown cursor type: %d", cursorID );
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
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 );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* freeglut_internal_mswin.h
|
||||||
|
*
|
||||||
|
* The freeglut library private include file.
|
||||||
|
*
|
||||||
|
* Copyright (c) 2012 Stephen J. Baker. All Rights Reserved.
|
||||||
|
* Written by John F. Fay, <fayjf@sourceforge.net>
|
||||||
|
* Creation date: Thu Jan 19, 2012
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the "Software"),
|
||||||
|
* to deal in the Software without restriction, including without limitation
|
||||||
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
|
* and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
* Software is furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included
|
||||||
|
* in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||||
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||||
|
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef FREEGLUT_INTERNAL_MSWIN_H
|
||||||
|
#define FREEGLUT_INTERNAL_MSWIN_H
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#include "..\Common\freeglut_internal.h"
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* FREEGLUT_INTERNAL_MSWIN_H */
|
||||||
Reference in New Issue
Block a user