projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing the window position for asynchronous X11 implementations (e-mail by Jocelyn...
[freeglut]
/
src
/
freeglut_init.c
diff --git
a/src/freeglut_init.c
b/src/freeglut_init.c
index
0c67719
..
054285e
100644
(file)
--- a/
src/freeglut_init.c
+++ b/
src/freeglut_init.c
@@
-79,7
+79,9
@@
SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
GLUT_EXEC_STATE_INIT, /* ExecState */
NULL, /* ProgramName */
GL_FALSE, /* JoysticksInitialised */
GLUT_EXEC_STATE_INIT, /* ExecState */
NULL, /* ProgramName */
GL_FALSE, /* JoysticksInitialised */
- GL_FALSE /* InputDevsInitialised */
+ GL_FALSE, /* InputDevsInitialised */
+ 0, /* AuxiliaryBufferNumber */
+ 0 /* SampleNumber */
};
};
@@
-653,6
+655,14
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
}
/*
}
/*
+ * Undoes all the "glutInit" stuff
+ */
+void FGAPIENTRY glutExit ( void )
+{
+ fgDeinitialize ();
+}
+
+/*
* Sets the default initial window position for new windows
*/
void FGAPIENTRY glutInitWindowPosition( int x, int y )
* Sets the default initial window position for new windows
*/
void FGAPIENTRY glutInitWindowPosition( int x, int y )
@@
-712,7
+722,7
@@
void FGAPIENTRY glutInitDisplayString( const char* displayMode )
* delimited by blanks or tabs.
*/
char *token ;
* delimited by blanks or tabs.
*/
char *token ;
- int len = strlen ( displayMode );
+ size_t len = strlen ( displayMode );
char *buffer = (char *)malloc ( (len+1) * sizeof(char) );
memcpy ( buffer, displayMode, len );
buffer[len] = '\0';
char *buffer = (char *)malloc ( (len+1) * sizeof(char) );
memcpy ( buffer, displayMode, len );
buffer[len] = '\0';
@@
-885,7
+895,7
@@
void FGAPIENTRY glutInitDisplayString( const char* displayMode )
break ;
case 36 : /* "aux": some number of aux buffers */
break ;
case 36 : /* "aux": some number of aux buffers */
- glut_state_flag |= GLUT_AUX1;
+ glut_state_flag |= GLUT_AUX;
break ;
case 37 : /* Unrecognized */
break ;
case 37 : /* Unrecognized */