projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
...AND a tab snuck into my changes for GLUT_OFFSCREEN support. Mea culpa.
[freeglut]
/
src
/
freeglut_cursor.c
diff --git
a/src/freeglut_cursor.c
b/src/freeglut_cursor.c
index
0e24a74
..
63b9070
100644
(file)
--- a/
src/freeglut_cursor.c
+++ b/
src/freeglut_cursor.c
@@
-49,7
+49,7
@@
#if TARGET_HOST_UNIX_X11
#if TARGET_HOST_UNIX_X11
-fgGetCursorError( Cursor cursor )
+int fgGetCursorError( Cursor cursor )
{
int ret = 0;
char buf[ 256 ];
{
int ret = 0;
char buf[ 256 ];
@@
-99,8
+99,8
@@
void FGAPIENTRY glutSetCursor( int cursorID )
* (c) Out-of-range cursor-types generate warnings. Should we abort?
*/
{
* (c) Out-of-range cursor-types generate warnings. Should we abort?
*/
{
- Cursor cursor;
- Pixmap no_cursor; /* Used for GLUT_CURSOR_NONE */
+ Cursor cursor = None;
+ Pixmap no_cursor = None ; /* Used for GLUT_CURSOR_NONE */
int error = 0;
#define MAP_CURSOR(a,b) \
int error = 0;
#define MAP_CURSOR(a,b) \
@@
-253,7
+253,10
@@
void FGAPIENTRY glutWarpPointer( int x, int y )
#elif TARGET_HOST_WIN32
{
#elif TARGET_HOST_WIN32
{
- POINT coords = { x, y };
+ POINT coords;
+ coords.x = x;
+ coords.y = y;
+
/*
* ClientToScreen() translates {coords} for us.
*/
/*
* ClientToScreen() translates {coords} for us.
*/