From b46806dc314596e5943c5cf63044305168f7f5a8 Mon Sep 17 00:00:00 2001 From: rkrolib Date: Wed, 29 Oct 2003 07:13:55 +0000 Subject: [PATCH] Previous changes were made without the freeglut major mode in EMACS. Re-tweaked some lines (mostly got rid of some TABs, but also resulted in some changed indentation). Reformatted a big comment to fit to 80 columns. Removed bogus references to "Linux". (UNIX, and/or X11 were relavent, and "UNIX/X11" was substituted for "Linux" in those places. This includes UNIX-alike systems.) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@259 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/freeglut_state.c | 42 +++++++++++++++----------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/freeglut/freeglut/src/freeglut_state.c b/freeglut/freeglut/src/freeglut_state.c index 5ab9048..e139bc6 100644 --- a/freeglut/freeglut/src/freeglut_state.c +++ b/freeglut/freeglut/src/freeglut_state.c @@ -61,7 +61,7 @@ static int fghGetConfig( int attribute ) if( fgStructure.Window ) glXGetConfig( fgDisplay.Display, fgStructure.Window->Window.VisualInfo, - attribute, &returnValue ); + attribute, &returnValue ); return returnValue; } @@ -107,12 +107,12 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value ) case GLUT_RENDERING_CONTEXT: fgState.UseCurrentContext = - ( value == GLUT_USE_CURRENT_CONTEXT ) ? TRUE : FALSE; + ( value == GLUT_USE_CURRENT_CONTEXT ) ? TRUE : FALSE; break; case GLUT_WINDOW_CURSOR: if( fgStructure.Window != NULL ) - fgStructure.Window->State.Cursor = value; + fgStructure.Window->State.Cursor = value; break; default: @@ -368,21 +368,27 @@ int FGAPIENTRY glutGet( GLenum eWhat ) case GLUT_WINDOW_HEIGHT: { /* - * There is considerable confusion about the "right thing to do" concerning window - * size and position. GLUT itself is not consistent between Windows and Linux; since - * platform independence is a virtue for "freeglut", we decided to break with GLUT's - * behaviour. - * Under Linux, it is apparently not possible to get the window border sizes in order - * to subtract them off the window's initial position until some time after the window - * has been created. Therefore we decided on the following behaviour, both under - * Windows and under Linux: - * - When you create a window with position (x,y) and size (w,h), the upper left hand - * corner of the outside of the window is at (x,y) and the size of the drawable area - * is (w,h). - * - When you query the size and position of the window--as is happening here for - * Windows--"freeglut" will return the size of the drawable area--the (w,h) that you - * specified when you created the window--and the coordinates of the upper left hand - * corner of the drawable area--which is NOT the (x,y) you specified. + * There is considerable confusion about the "right thing to + * do" concerning window size and position. GLUT itself is + * not consistent between Windows and UNIX/X11; since + * platform independence is a virtue for "freeglut", we + * decided to break with GLUT's behaviour. + * + * Under UNIX/X11, it is apparently not possible to get the + * window border sizes in order to subtract them off the + * window's initial position until some time after the window + * has been created. Therefore we decided on the following + * behaviour, both under Windows and under UNIX/X11: + * - When you create a window with position (x,y) and size + * (w,h), the upper left hand corner of the outside of the + * window is at (x,y) and the size of the drawable area is + * (w,h). + * - When you query the size and position of the window--as + * is happening here for Windows--"freeglut" will return + * the size of the drawable area--the (w,h) that you + * specified when you created the window--and the coordinates + * of the upper left hand corner of the drawable + * area--which is NOT the (x,y) you specified. */ RECT winRect;