From 83cbc20173cda65aeef88ce4a1da6a08c1fd010f Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Mon, 23 Jan 2012 04:42:31 +0000 Subject: [PATCH] Splitting Windows-specific "freeglut_structure.c" code into its own file (there isn't any) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@999 7f0cb862-5218-0410-a997-914c9d46530a --- src/Common/freeglut_structure.c | 19 +++++++++++++------ src/mswin/freeglut_structure_mswin.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/src/Common/freeglut_structure.c b/src/Common/freeglut_structure.c index 4ae0e1f..f8d748f 100644 --- a/src/Common/freeglut_structure.c +++ b/src/Common/freeglut_structure.c @@ -48,6 +48,8 @@ SFG_Structure fgStructure = { { NULL, NULL }, /* The list of windows */ /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ +extern void fgPlatformCreateWindow ( SFG_Window *window ); + static void fghClearCallBacks( SFG_Window *window ) { if( window ) @@ -58,6 +60,15 @@ static void fghClearCallBacks( SFG_Window *window ) } } +#if TARGET_HOST_POSIX_X11 +void fgPlatformCreateWindow ( SFG_Window *window ) +{ + window->Window.FBConfig = NULL; + + window->State.OldHeight = window->State.OldWidth = -1; +} +#endif + /* * This private function creates, opens and adds to the hierarchy * a freeglut window complete with OpenGL context and stuff... @@ -72,16 +83,12 @@ SFG_Window* fgCreateWindow( SFG_Window* parent, const char* title, /* 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 + fgPlatformCreateWindow ( window ); + fghClearCallBacks( window ); /* Initialize the object properties */ window->ID = ++fgStructure.WindowID; -#if TARGET_HOST_POSIX_X11 - window->State.OldHeight = window->State.OldWidth = -1; -#endif fgListInit( &window->Children ); if( parent ) diff --git a/src/mswin/freeglut_structure_mswin.c b/src/mswin/freeglut_structure_mswin.c index e69de29..6f2b883 100644 --- a/src/mswin/freeglut_structure_mswin.c +++ b/src/mswin/freeglut_structure_mswin.c @@ -0,0 +1,34 @@ +/* + * freeglut_structure_mswin.c + * + * The Windows-specific mouse cursor related stuff. + * + * Copyright (c) 2012 Stephen J. Baker. All Rights Reserved. + * Written by John F. Fay, + * Creation date: Sun Jan 22, 2012 + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include "freeglut_internal_mswin.h" + + +void fgPlatformCreateWindow ( SFG_Window *window ) +{ +} -- 1.7.10.4