projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strdup instead of malloc/strcpy
[freeglut]
/
src
/
fg_structure.c
diff --git
a/src/fg_structure.c
b/src/fg_structure.c
index
88b2614
..
be9d1ce
100644
(file)
--- a/
src/fg_structure.c
+++ b/
src/fg_structure.c
@@
-49,6
+49,7
@@
SFG_Structure fgStructure = { { NULL, NULL }, /* The list of windows */
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
extern void fgPlatformCreateWindow ( SFG_Window *window );
/* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
extern void fgPlatformCreateWindow ( SFG_Window *window );
+extern void fghDefaultReshape(int width, int height);
static void fghClearCallBacks( SFG_Window *window )
{
static void fghClearCallBacks( SFG_Window *window )
{
@@
-72,11
+73,12
@@
SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title,
GLboolean gameMode, GLboolean isMenu )
{
/* Have the window object created */
GLboolean gameMode, GLboolean isMenu )
{
/* Have the window object created */
- SFG_Window *window = (SFG_Window *)calloc( sizeof(SFG_Window), 1 );
+ SFG_Window *window = (SFG_Window *)calloc( 1, sizeof(SFG_Window) );
fgPlatformCreateWindow ( window );
fghClearCallBacks( window );
fgPlatformCreateWindow ( window );
fghClearCallBacks( window );
+ SET_WCB( *window, Reshape, fghDefaultReshape);
/* Initialize the object properties */
window->ID = ++fgStructure.WindowID;
/* Initialize the object properties */
window->ID = ++fgStructure.WindowID;
@@
-90,18
+92,11
@@
SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title,
else
fgListAppend( &fgStructure.Windows, &window->Node );
else
fgListAppend( &fgStructure.Windows, &window->Node );
- /* Set the default mouse cursor and reset the modifiers value */
+ /* Set the default mouse cursor */
window->State.Cursor = GLUT_CURSOR_INHERIT;
window->State.Cursor = GLUT_CURSOR_INHERIT;
-
- window->State.IgnoreKeyRepeat = GL_FALSE;
- window->State.KeyRepeating = GL_FALSE;
- window->State.IsFullscreen = GL_FALSE;
- window->State.VisualizeNormals= GL_FALSE;
- window->State.pWState.WindowTitle = NULL;
- window->State.pWState.IconTitle = NULL;
-
- window->IsMenu = isMenu;
+ /* Mark window as menu if a menu is to be created */
+ window->IsMenu = isMenu;
/*
* Open the window now. The fgOpenWindow() function is system
/*
* Open the window now. The fgOpenWindow() function is system