projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed part of bug #926883 (Video mode matching code, memory leaks,
[freeglut]
/
src
/
freeglut_cursor.c
diff --git
a/src/freeglut_cursor.c
b/src/freeglut_cursor.c
index
0d30c32
..
bbe27cd
100644
(file)
--- a/
src/freeglut_cursor.c
+++ b/
src/freeglut_cursor.c
@@
-25,10
+25,6
@@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <GL/freeglut.h>
#include "freeglut_internal.h"
#include <GL/freeglut.h>
#include "freeglut_internal.h"
@@
-83,7
+79,7
@@
static int fghGetCursorError( Cursor cursor )
*/
void FGAPIENTRY glutSetCursor( int cursorID )
{
*/
void FGAPIENTRY glutSetCursor( int cursorID )
{
- freeglut_assert_ready; /* XXX WHY do we need the timer active for this? */
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetCursor" );
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetCursor" );
#if TARGET_HOST_UNIX_X11
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetCursor" );
#if TARGET_HOST_UNIX_X11
@@
-144,7
+140,7
@@
void FGAPIENTRY glutSetCursor( int cursorID )
* need to pick a color for foreground/background---but what
* one we pick doesn't matter for GLUT_CURSOR_NONE.
*/
* need to pick a color for foreground/background---but what
* one we pick doesn't matter for GLUT_CURSOR_NONE.
*/
- static unsigned char no_cursor_bits[ 32 ];
+ static char no_cursor_bits[ 32 ];
XColor black;
no_cursor = XCreatePixmapFromBitmapData( fgDisplay.Display,
fgDisplay.RootWindow,
XColor black;
no_cursor = XCreatePixmapFromBitmapData( fgDisplay.Display,
fgDisplay.RootWindow,
@@
-236,7
+232,7
@@
void FGAPIENTRY glutSetCursor( int cursorID )
*/
void FGAPIENTRY glutWarpPointer( int x, int y )
{
*/
void FGAPIENTRY glutWarpPointer( int x, int y )
{
- freeglut_assert_ready; /* XXX WHY do we need the timer active for this? */
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWarpPointer" );
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutWarpPointer" );
#if TARGET_HOST_UNIX_X11
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutWarpPointer" );
#if TARGET_HOST_UNIX_X11