X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_structure.c;h=e092429d77651e04ee327b0d15eb27a6a0a3543d;hb=3c7c46e5846a39dde8be85c131e69cab1d8cb1ec;hp=2c2ebf6aaa6e9952fc5a0fb7110ac5e1556079f2;hpb=6d46097d532c3c09537423f2a701717d390a3f05;p=freeglut diff --git a/src/freeglut_structure.c b/src/freeglut_structure.c index 2c2ebf6..e092429 100644 --- a/src/freeglut_structure.c +++ b/src/freeglut_structure.c @@ -65,12 +65,16 @@ static void fghClearCallBacks( SFG_Window *window ) * If parent is set to NULL, the window created will be a topmost one. */ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title, - int x, int y, int w, int h, + GLboolean positionUse, int x, int y, + GLboolean sizeUse, int w, int h, GLboolean gameMode, GLboolean isMenu ) { /* Have the window object created */ SFG_Window *window = (SFG_Window *)calloc( sizeof(SFG_Window), 1 ); +#if TARGET_HOST_UNIX_X11 + window->Window.FBConfig = NULL; +#endif fghClearCallBacks( window ); /* Initialize the object properties */ @@ -93,12 +97,13 @@ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title, window->State.IgnoreKeyRepeat = GL_FALSE; window->State.KeyRepeating = GL_FALSE; + window->State.IsFullscreen = GL_FALSE; /* * Open the window now. The fgOpenWindow() function is system * dependant, and resides in freeglut_window.c. Uses fgState. */ - fgOpenWindow( window, title, x, y, w, h, gameMode, + fgOpenWindow( window, title, positionUse, x, y, sizeUse, w, h, gameMode, (GLboolean)(parent ? GL_TRUE : GL_FALSE) ); return window; @@ -119,7 +124,8 @@ SFG_Menu* fgCreateMenu( FGCBMenu menuCallback ) /* Create a window for the menu to reside in. */ - fgCreateWindow( NULL, "freeglut menu", x, y, w, h, GL_FALSE, GL_TRUE ); + fgCreateWindow( NULL, "freeglut menu", GL_TRUE, x, y, GL_TRUE, w, h, + GL_FALSE, GL_TRUE ); menu->Window = fgStructure.CurrentWindow; glutDisplayFunc( fgDisplayMenu );