X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fx11%2Ffg_main_x11.c;h=0bf967dd1c1d5a4534a6246a710c16a42ed1b6f1;hb=18bf83a00e2af9d24ee171b70ec345b70fc661f0;hp=8387ba8b6b08b56d65d2bb646426c3d370877b2d;hpb=757e1ba2f548e903b960b19a39c3752a3be621f7;p=freeglut diff --git a/src/x11/fg_main_x11.c b/src/x11/fg_main_x11.c index 8387ba8..0bf967d 100644 --- a/src/x11/fg_main_x11.c +++ b/src/x11/fg_main_x11.c @@ -40,7 +40,6 @@ # define VFPRINTF(s,f,a) #endif -#include "fg_main.h" /* * Try to get the maximum value allowed for ints, falling back to the minimum @@ -72,25 +71,6 @@ static Bool match_motion(Display *dpy, XEvent *xev, XPointer arg); */ -/* - * Request a window resize - */ -void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height ) -{ - XResizeWindow( fgDisplay.pDisplay.Display, window->Window.Handle, - width, height ); - XFlush( fgDisplay.pDisplay.Display ); /* XXX Shouldn't need this */ -} - - -/* - * A static helper function to execute display callback for a window - */ -void fgPlatformDisplayWindow ( SFG_Window *window ) -{ - fghRedrawWindow ( window ) ; -} - fg_time_t fgPlatformSystemTime ( void ) { @@ -682,13 +662,7 @@ void fgPlatformProcessSingleEvent ( void ) window->State.pWState.OldWidth = width; window->State.pWState.OldHeight = height; - if( FETCH_WCB( *window, Reshape ) ) - INVOKE_WCB( *window, Reshape, ( width, height ) ); - else - { - fgSetWindow( window ); - glViewport( 0, 0, width, height ); - } + INVOKE_WCB( *window, Reshape, ( width, height ) ); glutPostRedisplay( ); if( window->IsMenu ) fgSetWindow( current_window );