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
This commit is contained in:
parent
2abe3abee5
commit
b46806dc31
@ -61,7 +61,7 @@ static int fghGetConfig( int attribute )
|
|||||||
|
|
||||||
if( fgStructure.Window )
|
if( fgStructure.Window )
|
||||||
glXGetConfig( fgDisplay.Display, fgStructure.Window->Window.VisualInfo,
|
glXGetConfig( fgDisplay.Display, fgStructure.Window->Window.VisualInfo,
|
||||||
attribute, &returnValue );
|
attribute, &returnValue );
|
||||||
|
|
||||||
return returnValue;
|
return returnValue;
|
||||||
}
|
}
|
||||||
@ -107,12 +107,12 @@ void FGAPIENTRY glutSetOption( GLenum eWhat, int value )
|
|||||||
|
|
||||||
case GLUT_RENDERING_CONTEXT:
|
case GLUT_RENDERING_CONTEXT:
|
||||||
fgState.UseCurrentContext =
|
fgState.UseCurrentContext =
|
||||||
( value == GLUT_USE_CURRENT_CONTEXT ) ? TRUE : FALSE;
|
( value == GLUT_USE_CURRENT_CONTEXT ) ? TRUE : FALSE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GLUT_WINDOW_CURSOR:
|
case GLUT_WINDOW_CURSOR:
|
||||||
if( fgStructure.Window != NULL )
|
if( fgStructure.Window != NULL )
|
||||||
fgStructure.Window->State.Cursor = value;
|
fgStructure.Window->State.Cursor = value;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
@ -368,21 +368,27 @@ int FGAPIENTRY glutGet( GLenum eWhat )
|
|||||||
case GLUT_WINDOW_HEIGHT:
|
case GLUT_WINDOW_HEIGHT:
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* There is considerable confusion about the "right thing to do" concerning window
|
* There is considerable confusion about the "right thing to
|
||||||
* size and position. GLUT itself is not consistent between Windows and Linux; since
|
* do" concerning window size and position. GLUT itself is
|
||||||
* platform independence is a virtue for "freeglut", we decided to break with GLUT's
|
* not consistent between Windows and UNIX/X11; since
|
||||||
* behaviour.
|
* platform independence is a virtue for "freeglut", we
|
||||||
* Under Linux, it is apparently not possible to get the window border sizes in order
|
* decided to break with GLUT's behaviour.
|
||||||
* 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
|
* Under UNIX/X11, it is apparently not possible to get the
|
||||||
* Windows and under Linux:
|
* window border sizes in order to subtract them off the
|
||||||
* - When you create a window with position (x,y) and size (w,h), the upper left hand
|
* window's initial position until some time after the window
|
||||||
* corner of the outside of the window is at (x,y) and the size of the drawable area
|
* has been created. Therefore we decided on the following
|
||||||
* is (w,h).
|
* behaviour, both under Windows and under UNIX/X11:
|
||||||
* - When you query the size and position of the window--as is happening here for
|
* - When you create a window with position (x,y) and size
|
||||||
* Windows--"freeglut" will return the size of the drawable area--the (w,h) that you
|
* (w,h), the upper left hand corner of the outside of the
|
||||||
* specified when you created the window--and the coordinates of the upper left hand
|
* window is at (x,y) and the size of the drawable area is
|
||||||
* corner of the drawable area--which is NOT the (x,y) you specified.
|
* (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;
|
RECT winRect;
|
||||||
|
Reference in New Issue
Block a user