Cleaned up CreateNotify/ConfigureNotify handling.
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@648 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
a3c6ceb012
commit
49d5acfd00
@ -1062,3 +1062,5 @@ to crash if it called the code with a negative number of levels
|
|||||||
|
|
||||||
(274) Added --enable-debug configure flag. Currently it only turns on X11
|
(274) Added --enable-debug configure flag. Currently it only turns on X11
|
||||||
event tracing, but in the future we could add more.
|
event tracing, but in the future we could add more.
|
||||||
|
|
||||||
|
(275) Cleaned up CreateNotify/ConfigureNotify handling.
|
||||||
|
@ -1017,20 +1017,20 @@ void FGAPIENTRY glutMainLoopEvent( void )
|
|||||||
*
|
*
|
||||||
* GLUT presumably does this because it generally tries to treat
|
* GLUT presumably does this because it generally tries to treat
|
||||||
* sub-windows the same as windows.
|
* sub-windows the same as windows.
|
||||||
*
|
|
||||||
* XXX Technically, GETWINDOW( xconfigure ) and
|
|
||||||
* XXX {event.xconfigure} may not be legit ways to get at
|
|
||||||
* XXX data for CreateNotify events. In practice, the data
|
|
||||||
* XXX is in a union which is laid out much the same either
|
|
||||||
* XXX way. But if you want to split hairs, this isn't legit,
|
|
||||||
* XXX and we should instead duplicate some code.
|
|
||||||
*/
|
*/
|
||||||
case CreateNotify:
|
case CreateNotify:
|
||||||
case ConfigureNotify:
|
case ConfigureNotify:
|
||||||
GETWINDOW( xconfigure );
|
|
||||||
{
|
{
|
||||||
int width = event.xconfigure.width;
|
int width, height;
|
||||||
int height = event.xconfigure.height;
|
if( event.type == CreateNotify ) {
|
||||||
|
GETWINDOW( xcreatewindow );
|
||||||
|
width = event.xcreatewindow.width;
|
||||||
|
height = event.xcreatewindow.height;
|
||||||
|
} else {
|
||||||
|
GETWINDOW( xconfigure );
|
||||||
|
width = event.xconfigure.width;
|
||||||
|
height = event.xconfigure.height;
|
||||||
|
}
|
||||||
|
|
||||||
if( ( width != window->State.OldWidth ) ||
|
if( ( width != window->State.OldWidth ) ||
|
||||||
( height != window->State.OldHeight ) )
|
( height != window->State.OldHeight ) )
|
||||||
|
Reference in New Issue
Block a user