projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing Bug Report [ 1160442 ] glutGet(GLUT_ELAPSED_TIME) is too granular
[freeglut]
/
src
/
freeglut_state.c
diff --git
a/src/freeglut_state.c
b/src/freeglut_state.c
index
f8b70e9
..
4968b47
100644
(file)
--- a/
src/freeglut_state.c
+++ b/
src/freeglut_state.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"
@@
-57,8
+53,8
@@
static int fghGetConfig( int attribute )
{
int returnValue = 0;
{
int returnValue = 0;
- if( fgStructure.Window )
- glXGetConfig( fgDisplay.Display, fgStructure.Window->Window.VisualInfo,
+ if( fgStructure.CurrentWindow )
+ glXGetConfig( fgDisplay.Display, fgStructure.CurrentWindow->Window.VisualInfo,
attribute, &returnValue );
return returnValue;
attribute, &returnValue );
return returnValue;
@@
-72,7
+68,7
@@
static int fghGetConfig( int attribute )
*/
void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
{
*/
void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
{
- freeglut_assert_ready;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetOption" );
/*
* XXX In chronological code add order. (WHY in that order?)
/*
* XXX In chronological code add order. (WHY in that order?)
@@
-113,8
+109,8
@@
void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
break;
case GLUT_WINDOW_CURSOR:
break;
case GLUT_WINDOW_CURSOR:
- if( fgStructure.Window != NULL )
- fgStructure.Window->State.Cursor = value;
+ if( fgStructure.CurrentWindow != NULL )
+ fgStructure.CurrentWindow->State.Cursor = value;
break;
default:
break;
default:
@@
-142,7
+138,7
@@
int FGAPIENTRY glutGet( GLenum eWhat )
return fgElapsedTime();
}
return fgElapsedTime();
}
- freeglut_assert_ready;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGet" );
/* XXX In chronological code add order. (WHY in that order?) */
switch( eWhat )
/* XXX In chronological code add order. (WHY in that order?) */
switch( eWhat )
@@
-192,7
+188,7
@@
int FGAPIENTRY glutGet( GLenum eWhat )
/* Colormap size is handled in a bit different way than all the rest */
case GLUT_WINDOW_COLORMAP_SIZE:
/* Colormap size is handled in a bit different way than all the rest */
case GLUT_WINDOW_COLORMAP_SIZE:
- if( (fghGetConfig( GLX_RGBA )) || (fgStructure.Window == NULL) )
+ if( (fghGetConfig( GLX_RGBA )) || (fgStructure.CurrentWindow == NULL) )
{
/*
* We've got a RGBA visual, so there is no colormap at all.
{
/*
* We've got a RGBA visual, so there is no colormap at all.
@@
-200,7
+196,7
@@
int FGAPIENTRY glutGet( GLenum eWhat )
*/
return 0;
}
*/
return 0;
}
- return fgStructure.Window->Window.VisualInfo->visual->map_entries;
+ return fgStructure.CurrentWindow->Window.VisualInfo->visual->map_entries;
/*
* Those calls are somewhat similiar, as they use XGetWindowAttributes()
/*
* Those calls are somewhat similiar, as they use XGetWindowAttributes()
@@
-214,12
+210,12
@@
int FGAPIENTRY glutGet( GLenum eWhat )
int x, y;
Window w;
int x, y;
Window w;
- if( fgStructure.Window == NULL )
+ if( fgStructure.CurrentWindow == NULL )
return 0;
XTranslateCoordinates(
fgDisplay.Display,
return 0;
XTranslateCoordinates(
fgDisplay.Display,
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
fgDisplay.RootWindow,
0, 0, &x, &y, &w);
fgDisplay.RootWindow,
0, 0, &x, &y, &w);
@@
-233,7
+229,7
@@
int FGAPIENTRY glutGet( GLenum eWhat )
return 0;
XTranslateCoordinates(
fgDisplay.Display,
return 0;
XTranslateCoordinates(
fgDisplay.Display,
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
w, 0, 0, &x, &y, &w);
switch ( eWhat )
w, 0, 0, &x, &y, &w);
switch ( eWhat )
@@
-248,11
+244,11
@@
int FGAPIENTRY glutGet( GLenum eWhat )
{
XWindowAttributes winAttributes;
{
XWindowAttributes winAttributes;
- if( fgStructure.Window == NULL )
+ if( fgStructure.CurrentWindow == NULL )
return 0;
XGetWindowAttributes(
fgDisplay.Display,
return 0;
XGetWindowAttributes(
fgDisplay.Display,
- fgStructure.Window->Window.Handle,
+ fgStructure.CurrentWindow->Window.Handle,
&winAttributes
);
switch ( eWhat )
&winAttributes
);
switch ( eWhat )
@@
-268,10
+264,10
@@
int FGAPIENTRY glutGet( GLenum eWhat )
/* This is system-dependant */
case GLUT_WINDOW_FORMAT_ID:
/* This is system-dependant */
case GLUT_WINDOW_FORMAT_ID:
- if( fgStructure.Window == NULL )
+ if( fgStructure.CurrentWindow == NULL )
return 0;
return 0;
- return fgStructure.Window->Window.VisualInfo->visualid;
+ return fgStructure.CurrentWindow->Window.VisualInfo->visualid;
#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
@@
-355,19
+351,19
@@
int FGAPIENTRY glutGet( GLenum eWhat )
RECT winRect;
RECT winRect;
- freeglut_return_val_if_fail( fgStructure.Window != NULL, 0 );
+ freeglut_return_val_if_fail( fgStructure.CurrentWindow != NULL, 0 );
/*
* We need to call GetWindowRect() first...
* (this returns the pixel coordinates of the outside of the window)
*/
/*
* We need to call GetWindowRect() first...
* (this returns the pixel coordinates of the outside of the window)
*/
- GetWindowRect( fgStructure.Window->Window.Handle, &winRect );
+ GetWindowRect( fgStructure.CurrentWindow->Window.Handle, &winRect );
/* ...then we've got to correct the results we've just received... */
#if !TARGET_HOST_WINCE
/* ...then we've got to correct the results we've just received... */
#if !TARGET_HOST_WINCE
- if ( ( fgStructure.GameMode != fgStructure.Window ) && ( fgStructure.Window->Parent == NULL ) &&
- ( ! fgStructure.Window->IsMenu ) )
+ if ( ( fgStructure.GameMode != fgStructure.CurrentWindow ) && ( fgStructure.CurrentWindow->Parent == NULL ) &&
+ ( ! fgStructure.CurrentWindow->IsMenu ) )
{
winRect.left += GetSystemMetrics( SM_CXSIZEFRAME );
winRect.right -= GetSystemMetrics( SM_CXSIZEFRAME );
{
winRect.left += GetSystemMetrics( SM_CXSIZEFRAME );
winRect.right -= GetSystemMetrics( SM_CXSIZEFRAME );
@@
-404,15
+400,15
@@
int FGAPIENTRY glutGet( GLenum eWhat )
#if TARGET_HOST_WINCE
return GL_FALSE;
#else
#if TARGET_HOST_WINCE
return GL_FALSE;
#else
- return fgSetupPixelFormat( fgStructure.Window, GL_TRUE,
+ return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE,
PFD_MAIN_PLANE );
#endif /* TARGET_HOST_WINCE */
case GLUT_WINDOW_FORMAT_ID:
#if !TARGET_HOST_WINCE
PFD_MAIN_PLANE );
#endif /* TARGET_HOST_WINCE */
case GLUT_WINDOW_FORMAT_ID:
#if !TARGET_HOST_WINCE
- if( fgStructure.Window != NULL )
- return GetPixelFormat( fgStructure.Window->Window.Device );
+ if( fgStructure.CurrentWindow != NULL )
+ return GetPixelFormat( fgStructure.CurrentWindow->Window.Device );
#endif /* TARGET_HOST_WINCE */
return 0;
#endif /* TARGET_HOST_WINCE */
return 0;
@@
-420,24
+416,24
@@
int FGAPIENTRY glutGet( GLenum eWhat )
/* The window structure queries */
case GLUT_WINDOW_PARENT:
/* The window structure queries */
case GLUT_WINDOW_PARENT:
- if( fgStructure.Window == NULL ) return 0;
- if( fgStructure.Window->Parent == NULL ) return 0;
- return fgStructure.Window->Parent->ID;
+ if( fgStructure.CurrentWindow == NULL ) return 0;
+ if( fgStructure.CurrentWindow->Parent == NULL ) return 0;
+ return fgStructure.CurrentWindow->Parent->ID;
case GLUT_WINDOW_NUM_CHILDREN:
case GLUT_WINDOW_NUM_CHILDREN:
- if( fgStructure.Window == NULL )
+ if( fgStructure.CurrentWindow == NULL )
return 0;
return 0;
- return fgListLength( &fgStructure.Window->Children );
+ return fgListLength( &fgStructure.CurrentWindow->Children );
case GLUT_WINDOW_CURSOR:
case GLUT_WINDOW_CURSOR:
- if( fgStructure.Window == NULL )
+ if( fgStructure.CurrentWindow == NULL )
return 0;
return 0;
- return fgStructure.Window->State.Cursor;
+ return fgStructure.CurrentWindow->State.Cursor;
case GLUT_MENU_NUM_ITEMS:
case GLUT_MENU_NUM_ITEMS:
- if( fgStructure.Menu == NULL )
+ if( fgStructure.CurrentMenu == NULL )
return 0;
return 0;
- return fgListLength( &fgStructure.Menu->Entries );
+ return fgListLength( &fgStructure.CurrentMenu->Entries );
case GLUT_ACTION_ON_WINDOW_CLOSE:
return fgState.ActionOnWindowClose;
case GLUT_ACTION_ON_WINDOW_CLOSE:
return fgState.ActionOnWindowClose;
@@
-465,7
+461,7
@@
int FGAPIENTRY glutGet( GLenum eWhat )
*/
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
{
*/
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
{
- freeglut_assert_ready;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutDeviceGet" );
/* XXX WARNING: we are mostly lying in this function. */
switch( eWhat )
/* XXX WARNING: we are mostly lying in this function. */
switch( eWhat )
@@
-528,13
+524,21
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
#endif
#endif
- case GLUT_JOYSTICK_POLL_RATE:
case GLUT_HAS_JOYSTICK:
case GLUT_HAS_JOYSTICK:
+ return fgJoystickDetect ();
+
case GLUT_OWNS_JOYSTICK:
case GLUT_OWNS_JOYSTICK:
+ return fgState.JoysticksInitialised;
+
+ case GLUT_JOYSTICK_POLL_RATE:
+ return fgStructure.CurrentWindow ? fgStructure.CurrentWindow->State.JoystickPollRate : 0;
+
+ /* XXX The following two are only for Joystick 0 but this is an improvement */
case GLUT_JOYSTICK_BUTTONS:
case GLUT_JOYSTICK_BUTTONS:
+ return glutJoystickGetNumButtons ( 0 );
+
case GLUT_JOYSTICK_AXES:
case GLUT_JOYSTICK_AXES:
- /* XXX WARNING: THIS IS A BIG LIE! */
- return 0;
+ return glutJoystickGetNumAxes ( 0 );
case GLUT_HAS_SPACEBALL:
case GLUT_HAS_DIAL_AND_BUTTON_BOX:
case GLUT_HAS_SPACEBALL:
case GLUT_HAS_DIAL_AND_BUTTON_BOX:
@@
-548,11
+552,10
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
return 0;
case GLUT_DEVICE_IGNORE_KEY_REPEAT:
return 0;
case GLUT_DEVICE_IGNORE_KEY_REPEAT:
- return fgStructure.Window ? fgStructure.Window->State.IgnoreKeyRepeat : 0;
+ return fgStructure.CurrentWindow ? fgStructure.CurrentWindow->State.IgnoreKeyRepeat : 0;
case GLUT_DEVICE_KEY_REPEAT:
case GLUT_DEVICE_KEY_REPEAT:
- /* XXX WARNING: THIS IS A BIG LIE! */
- return GLUT_KEY_REPEAT_DEFAULT;
+ return fgState.KeyRepeat;
default:
fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
default:
fgWarning( "glutDeviceGet(): missing enum handle %d", eWhat );
@@
-568,6
+571,7
@@
int FGAPIENTRY glutDeviceGet( GLenum eWhat )
*/
int FGAPIENTRY glutGetModifiers( void )
{
*/
int FGAPIENTRY glutGetModifiers( void )
{
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutGetModifiers" );
if( fgState.Modifiers == 0xffffffff )
{
fgWarning( "glutGetModifiers() called outside an input callback" );
if( fgState.Modifiers == 0xffffffff )
{
fgWarning( "glutGetModifiers() called outside an input callback" );
@@
-582,7
+586,7
@@
int FGAPIENTRY glutGetModifiers( void )
*/
int FGAPIENTRY glutLayerGet( GLenum eWhat )
{
*/
int FGAPIENTRY glutLayerGet( GLenum eWhat )
{
- freeglut_assert_ready;
+ FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutLayerGet" );
/*
* This is easy as layers are not implemented ;-)
/*
* This is easy as layers are not implemented ;-)
@@
-622,7
+626,7
@@
int FGAPIENTRY glutLayerGet( GLenum eWhat )
#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
case GLUT_OVERLAY_POSSIBLE:
#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
case GLUT_OVERLAY_POSSIBLE:
-/* return fgSetupPixelFormat( fgStructure.Window, GL_TRUE,
+/* return fgSetupPixelFormat( fgStructure.CurrentWindow, GL_TRUE,
PFD_OVERLAY_PLANE ); */
return FALSE ;
PFD_OVERLAY_PLANE ); */
return FALSE ;