X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_main.c;h=6413363df055a8f07593d8382de70c4abebbf0d0;hb=a5e39e2546cb979ef5a224a808229f27963537c7;hp=6a1b2c7c186eaa7e67985299a57f78e5840b5413;hpb=87474a5362f15affd6dbc3ce37cd9986b873562d;p=freeglut diff --git a/src/freeglut_main.c b/src/freeglut_main.c index 6a1b2c7..6413363 100644 --- a/src/freeglut_main.c +++ b/src/freeglut_main.c @@ -29,8 +29,6 @@ #include "config.h" #endif -#define G_LOG_DOMAIN "freeglut-main" - #include "../include/GL/freeglut.h" #include "freeglut_internal.h" @@ -67,54 +65,88 @@ /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ /* - * Calls a window's redraw method. This is used when - * a redraw is forced by the incoming window messages. - * - * XXX We can/should make a "unified" window handle type so that - * XXX the function headers don't need this silly #ifdef junk. - * XXX Make the type, say, {fgWindow}. On UNIX_X11, this is - * XXX {Window}. On WIN32, it is {HWND}. Then do the #ifdef - * XXX junk *once* in "freeglut_internal.h". + * Handle a window configuration change. When no reshape + * callback is hooked, the viewport size is updated to + * match the new window size. */ -static void fghRedrawWindowByHandle -#if TARGET_HOST_UNIX_X11 - ( Window handle ) -#elif TARGET_HOST_WIN32 - ( HWND handle ) -#endif +static void fghReshapeWindowByHandle ( SFG_WindowHandleType handle, + int width, int height ) { + SFG_Window *current_window = fgStructure.Window; + SFG_Window* window = fgWindowByHandle( handle ); freeglut_return_if_fail( window != NULL ); - freeglut_return_if_fail( window->Callbacks.Display != NULL ); - freeglut_return_if_fail( window->State.Visible == TRUE ); - fgSetWindow( window ); - window->State.Redisplay = FALSE; - window->Callbacks.Display(); -} -/* - * Handle a window configuration change. When no reshape - * callback is hooked, the viewport size is updated to - * match the new window size. - */ -static void fghReshapeWindowByHandle #if TARGET_HOST_UNIX_X11 - ( Window handle, int width, int height ) + + XResizeWindow( fgDisplay.Display, window->Window.Handle, + width, height ); + XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */ + /* + * XXX REALLY shouldn't be done. GLUT docs state that this + * XXX isn't even processed immediately, but rather waits + * XXX for return to the mainloop. "This allows multiple + * XXX glutReshapeWindow, glutPositionWindow, and glutFullScreen + * XXX requests to the same window to be coalesced." (This is + * XXX having some deleterious effect on a sample program of mine.) + * XXX Not only does GLUT not flush at this point, GLUT doesn't even + * XXX *do* the reshape at this point! We should probably rip this + * XXX out and do what GLUT promises. It would be more efficient, and + * XXX might be more compatible. + */ + #elif TARGET_HOST_WIN32 - ( HWND handle, int width, int height ) -#endif -{ - SFG_Window *current_window = fgStructure.Window ; - SFG_Window* window = fgWindowByHandle( handle ); - freeglut_return_if_fail( window != NULL ); + { + RECT winRect; + int x, y; - fgSetWindow( window ); - if( window->Callbacks.Reshape != NULL ) - window->Callbacks.Reshape( width, height ); - else + GetWindowRect( window->Window.Handle, &winRect ); + x = winRect.left; + y = winRect.top; + + if ( window->Parent == NULL ) + { + /* + * Adjust the size of the window to allow for the size of the + * frame, if we are not a menu + */ + if ( ! window->IsMenu ) + { + width += GetSystemMetrics( SM_CXSIZEFRAME ) * 2; + height += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 + + GetSystemMetrics( SM_CYCAPTION ); + } + } + else + { + GetWindowRect( window->Parent->Window.Handle, + &winRect ); + x -= winRect.left + GetSystemMetrics( SM_CXSIZEFRAME ); + y -= winRect.top + GetSystemMetrics( SM_CYSIZEFRAME ) + + GetSystemMetrics( SM_CYCAPTION ); + } + + MoveWindow( + window->Window.Handle, + x, + y, + width, + height, + TRUE + ); + } + +#endif + + if( !( FETCH_WCB( *window, Reshape ) ) ) + { + fgSetWindow( window ); glViewport( 0, 0, width, height ); + } + else + INVOKE_WCB( *window, Reshape, ( width, height ) ); /* * Force a window redraw. In Windows at least this is only a partial @@ -123,61 +155,111 @@ static void fghReshapeWindowByHandle * But without this we get this bad behaviour whenever we resize the * window. */ - window->State.Redisplay = TRUE ; + window->State.Redisplay = GL_TRUE; if( window->IsMenu ) - fgSetWindow( current_window ) ; + fgSetWindow( current_window ); } /* - * A static helper function to execute display callback for a window + * Calls a window's redraw method. This is used when + * a redraw is forced by the incoming window messages. */ -static void fghcbDisplayWindow( SFG_Window *window, SFG_Enumerator *enumerator ) +static void fghRedrawWindowByHandle ( SFG_WindowHandleType handle ) { -#if TARGET_HOST_UNIX_X11 - if( (window->Callbacks.Display != NULL) && - (window->State.Redisplay == TRUE) && - (window->State.Visible == TRUE) ) - { - SFG_Window *current_window = fgStructure.Window ; - - fgSetWindow( window ); - window->State.Redisplay = FALSE; - window->Callbacks.Display(); - fgSetWindow( current_window ) ; - } + SFG_Window* window = fgWindowByHandle( handle ); + freeglut_return_if_fail( window != NULL ); -#elif TARGET_HOST_WIN32 + /* + * XXX Other than clearing the Redisplay flag or not, + * XXX we may as well rely on the INVOK_WCB() doing this + * XXX pointer-check. + * XXX + * XXX If we do not invoke the display because the pointer + * XXX is not defined (should never happen, really), then + * XXX we may enter an infinite busy-loop trying to update + * XXX the window. Similarly, if we skip because the window + * XXX is not visible. However, if the window becomes visible + * XXX at a later time, the window should get its callback + * XXX invoked. I would recommend removing the first check, + * XXX and making the second check only affect whether the + * XXX callback is invoked---but always clear the flag, if + * XXX the {window} pointer is defined. + */ + freeglut_return_if_fail( FETCH_WCB( *window, Display ) ); + freeglut_return_if_fail( window->State.Visible ); if( window->State.NeedToResize ) { - SFG_Window *current_window = fgStructure.Window ; + SFG_Window *current_window = fgStructure.Window; fgSetWindow( window ); fghReshapeWindowByHandle( window->Window.Handle, - glutGet( GLUT_WINDOW_WIDTH ), - glutGet( GLUT_WINDOW_HEIGHT ) + window->State.Width, + window->State.Height ); - window->State.NeedToResize = FALSE; - fgSetWindow ( current_window ) ; + window->State.NeedToResize = GL_FALSE; + fgSetWindow ( current_window ); } - if( (window->Callbacks.Display != NULL) && - (window->State.Redisplay == TRUE) && - (window->State.Visible == TRUE) ) + window->State.Redisplay = GL_FALSE; + INVOKE_WCB( *window, Display, ( ) ); +} + +/* + * A static helper function to execute display callback for a window + */ +static void fghcbDisplayWindow( SFG_Window *window, + SFG_Enumerator *enumerator ) +{ + /* + * XXX Do we need/want to check the callback pointer here? + * XXX INVOKE_WCB() will check for us. Arguably, the + * XXX Redisplay status flag should be cleared regardless + * XXX of any concern but that {window} is a valid pointer + * XXX (which this function is assuming anyway). + * XXX Especially since old GLUT wouldn't even enter its main + * XXX loop if you didn't have a display callback defined... + */ + if( ( FETCH_WCB( *window, Display ) ) && + window->State.Redisplay && + window->State.Visible ) { - window->State.Redisplay = FALSE; + if( window->State.NeedToResize ) + { + SFG_Window *current_window = fgStructure.Window; + + fgSetWindow( window ); + + fghReshapeWindowByHandle( + window->Window.Handle, + window->State.Width, + window->State.Height + ); - RedrawWindow( + window->State.NeedToResize = GL_FALSE; + fgSetWindow ( current_window ); + } + + window->State.Redisplay = GL_FALSE; + +#if TARGET_HOST_UNIX_X11 + { + SFG_Window *current_window = fgStructure.Window; + + INVOKE_WCB( *window, Display, ( ) ); + fgSetWindow( current_window ); + } +#elif TARGET_HOST_WIN32 + RedrawWindow( window->Window.Handle, NULL, NULL, RDW_NOERASE | RDW_INTERNALPAINT | RDW_INVALIDATE | RDW_UPDATENOW ); - } - #endif + } fgEnumSubWindows( window, fghcbDisplayWindow, enumerator ); } @@ -189,7 +271,7 @@ static void fghDisplayAll( void ) { SFG_Enumerator enumerator; - enumerator.found = FALSE; + enumerator.found = GL_FALSE; enumerator.data = NULL; fgEnumWindows( fghcbDisplayWindow, &enumerator ); @@ -201,7 +283,7 @@ static void fghDisplayAll( void ) static void fghcbCheckJoystickPolls( SFG_Window *window, SFG_Enumerator *enumerator ) { - long int checkTime = fgElapsedTime(); + long int checkTime = fgElapsedTime( ); if( window->State.JoystickLastPoll + window->State.JoystickPollRate <= checkTime ) @@ -220,7 +302,7 @@ static void fghCheckJoystickPolls( void ) { SFG_Enumerator enumerator; - enumerator.found = FALSE; + enumerator.found = GL_FALSE; enumerator.data = NULL; fgEnumWindows( fghcbCheckJoystickPolls, &enumerator ); @@ -231,7 +313,7 @@ static void fghCheckJoystickPolls( void ) */ static void fghCheckTimers( void ) { - long checkTime = fgElapsedTime(); + long checkTime = fgElapsedTime( ); SFG_Timer *timer, *next; SFG_List timedOut; @@ -269,19 +351,33 @@ static void fghCheckTimers( void ) */ long fgElapsedTime( void ) { + if ( fgState.Time.Set ) + { #if TARGET_HOST_UNIX_X11 - struct timeval now; - long elapsed; - - gettimeofday( &now, NULL ); - - elapsed = (now.tv_usec - fgState.Time.Value.tv_usec) / 1000; - elapsed += (now.tv_sec - fgState.Time.Value.tv_sec) * 1000; - - return( elapsed ); + struct timeval now; + long elapsed; + + gettimeofday( &now, NULL ); + + elapsed = (now.tv_usec - fgState.Time.Value.tv_usec) / 1000; + elapsed += (now.tv_sec - fgState.Time.Value.tv_sec) * 1000; + + return elapsed; #elif TARGET_HOST_WIN32 - return (timeGetTime() - fgState.Time.Value); + return timeGetTime() - fgState.Time.Value; #endif + } + else + { +#if TARGET_HOST_UNIX_X11 + gettimeofday( &fgState.Time.Value, NULL ); +#elif TARGET_HOST_WIN32 + fgState.Time.Value = timeGetTime (); +#endif + fgState.Time.Set = GL_TRUE ; + + return 0 ; + } } /* @@ -301,6 +397,9 @@ void fgError( const char *fmt, ... ) va_end( ap ); + if ( fgState.Initialised ) + fgDeinitialize (); + exit( 1 ); } @@ -341,9 +440,9 @@ void fgWarning( const char *fmt, ... ) */ static void fgCheckJoystickCallback( SFG_Window* w, SFG_Enumerator* e) { - if( w->Callbacks.Joystick ) + if( FETCH_WCB( *w, Joystick ) ) { - e->found = TRUE; + e->found = GL_TRUE; e->data = w; } fgEnumSubWindows( w, fgCheckJoystickCallback, e ); @@ -351,7 +450,7 @@ static void fgCheckJoystickCallback( SFG_Window* w, SFG_Enumerator* e) static int fgHaveJoystick( void ) { SFG_Enumerator enumerator; - enumerator.found = FALSE; + enumerator.found = GL_FALSE; enumerator.data = NULL; fgEnumWindows( fgCheckJoystickCallback, &enumerator ); return !!enumerator.data; @@ -360,7 +459,7 @@ static void fgHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e) { if( w->State.Redisplay ) { - e->found = TRUE; + e->found = GL_TRUE; e->data = w; } fgEnumSubWindows( w, fgHavePendingRedisplaysCallback, e ); @@ -368,7 +467,7 @@ static void fgHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e) static int fgHavePendingRedisplays (void) { SFG_Enumerator enumerator; - enumerator.found = FALSE; + enumerator.found = GL_FALSE; enumerator.data = NULL; fgEnumWindows( fgHavePendingRedisplaysCallback, &enumerator ); return !!enumerator.data; @@ -376,10 +475,12 @@ static int fgHavePendingRedisplays (void) /* * Indicates whether there are any outstanding timers. */ +#if 0 /* Not used */ static int fgHaveTimers( void ) { return !!fgState.Timers.First; } +#endif /* * Returns the number of GLUT ticks (milliseconds) till the next timer event. */ @@ -392,7 +493,7 @@ static long fgNextTimer( void ) for( timer = (SFG_Timer *)fgState.Timers.First; timer; timer = (SFG_Timer *)timer->Node.Next ) - ret = MIN( ret, MAX( 0, (timer->TriggerTime) - now ) ); + ret = MIN( ret, MAX( 0, timer->TriggerTime - now ) ); return ret; } @@ -409,15 +510,14 @@ static void fgSleepForEvents( void ) struct timeval wait; long msec; - if( fgState.IdleCallback || - fgHavePendingRedisplays() ) + if( fgState.IdleCallback || fgHavePendingRedisplays( ) ) return; socket = ConnectionNumber( fgDisplay.Display ); FD_ZERO( &fdset ); FD_SET( socket, &fdset ); - msec = fgNextTimer(); - if( fgHaveJoystick() ) + msec = fgNextTimer( ); + if( fgHaveJoystick( ) ) msec = MIN( msec, 10 ); wait.tv_sec = msec / 1000; @@ -425,16 +525,17 @@ static void fgSleepForEvents( void ) err = select( socket+1, &fdset, NULL, NULL, &wait ); if( -1 == err ) - printf( "freeglut select() error: %d\n", errno ); + fgWarning ( "freeglut select() error: %d\n", errno ); #elif TARGET_HOST_WIN32 #endif } +#if TARGET_HOST_UNIX_X11 /* * Returns GLUT modifier mask for an XEvent. */ -int fgGetXModifiers(XEvent *event) +int fgGetXModifiers( XEvent *event ) { int ret = 0; @@ -447,6 +548,7 @@ int fgGetXModifiers(XEvent *event) return ret; } +#endif /* -- INTERFACE FUNCTIONS -------------------------------------------------- */ @@ -480,14 +582,6 @@ void FGAPIENTRY glutMainLoopEvent( void ) switch( event.type ) { - case DestroyNotify: - /* - * This is sent to confirm the XDestroyWindow call. - * XXX WHY is this commented out? Should we re-enable it? - */ - /* fgAddToWindowDestroyList ( window, FALSE ); */ - break; - case ClientMessage: /* * Destroy the window when the WM_DELETE_WINDOW message arrives @@ -496,17 +590,38 @@ void FGAPIENTRY glutMainLoopEvent( void ) { GETWINDOW( xclient ); - fgCloseWindow ( window ) ; - fgAddToWindowDestroyList ( window, FALSE ); + fgCloseWindow ( window ); + fgAddToWindowDestroyList ( window, GL_FALSE ); } break; - case MapNotify: - case UnmapNotify: /* - * If we never do anything with this, can we just not ask to - * get these messages? + * CreateNotify causes a configure-event so that sub-windows are + * handled compatibly with GLUT. Otherwise, your sub-windows + * (in freeglut only) will not get an initial reshape event, + * which can break things. + * + * XXX NOTE that it is possible that you will more than one Reshape + * XXX event for your top-level window, but something like this + * XXX appears to be required for compatbility. + * + * GLUT presumably does this because it generally tries to treat + * sub-windows the same as windows. + */ + case CreateNotify: + case ConfigureNotify: + GETWINDOW( xconfigure ); + window->State.NeedToResize = GL_TRUE ; + window->State.Width = event.xconfigure.width ; + window->State.Height = event.xconfigure.height; + break; + + case DestroyNotify: + /* + * This is sent to confirm the XDestroyWindow call. + * XXX WHY is this commented out? Should we re-enable it? */ + /* fgAddToWindowDestroyList ( window, GL_FALSE ); */ break; case Expose: @@ -521,26 +636,12 @@ void FGAPIENTRY glutMainLoopEvent( void ) fghRedrawWindowByHandle( event.xexpose.window ); break; + case MapNotify: + case UnmapNotify: /* - * CreateNotify causes a configure-event so that sub-windows are - * handled compatibly with GLUT. Otherwise, your sub-windows - * (in freeglut only) will not get an initial reshape event, - * which can break things. - * - * XXX NOTE that it is possible that you will more than one Reshape - * XXX event for your top-level window, but something like this - * XXX appears to be required for compatbility. - * - * GLUT presumably does this because it generally tries to treat - * sub-windows the same as windows. + * If we never do anything with this, can we just not ask to + * get these messages? */ - case CreateNotify: - case ConfigureNotify: - fghReshapeWindowByHandle( - event.xconfigure.window, - event.xconfigure.width, - event.xconfigure.height - ); break; case MappingNotify: @@ -554,7 +655,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) case VisibilityNotify: { GETWINDOW( xvisibility ); - if( window->Callbacks.WindowStatus == NULL ) + if( ! FETCH_WCB( *window, WindowStatus ) ) break; fgSetWindow( window ); @@ -567,18 +668,19 @@ void FGAPIENTRY glutMainLoopEvent( void ) switch( event.xvisibility.state ) { case VisibilityUnobscured: - window->Callbacks.WindowStatus( GLUT_FULLY_RETAINED ); - window->State.Visible = TRUE; + INVOKE_WCB( *window, WindowStatus, ( GLUT_FULLY_RETAINED ) ); + window->State.Visible = GL_TRUE; break; case VisibilityPartiallyObscured: - window->Callbacks.WindowStatus( GLUT_PARTIALLY_RETAINED ); - window->State.Visible = TRUE; + INVOKE_WCB( *window, WindowStatus, + ( GLUT_PARTIALLY_RETAINED ) ); + window->State.Visible = GL_TRUE; break; case VisibilityFullyObscured: - window->Callbacks.WindowStatus( GLUT_FULLY_COVERED ); - window->State.Visible = FALSE; + INVOKE_WCB( *window, WindowStatus, ( GLUT_FULLY_COVERED ) ); + window->State.Visible = GL_FALSE; break; default: @@ -590,28 +692,13 @@ void FGAPIENTRY glutMainLoopEvent( void ) break; case EnterNotify: - { - GETWINDOW( xcrossing ); - GETMOUSE( xcrossing ); - if( window->Callbacks.Entry ) - { - fgSetWindow( window ) ; - window->Callbacks.Entry( GLUT_ENTERED ); - } - } - break; - case LeaveNotify: - { GETWINDOW( xcrossing ); GETMOUSE( xcrossing ); - if( window->Callbacks.Entry ) - { - fgSetWindow( window ) ; - window->Callbacks.Entry( GLUT_LEFT ); - } - } - break; + INVOKE_WCB( *window, Entry, ( ( EnterNotify == event.type ) ? + GLUT_ENTERED : + GLUT_LEFT ) ); + break; case MotionNotify: { @@ -627,8 +714,8 @@ void FGAPIENTRY glutMainLoopEvent( void ) window->ActiveMenu->Window->State.MouseY = event.xmotion.y_root - window->ActiveMenu->Y; } - window->ActiveMenu->Window->State.Redisplay = TRUE ; - fgSetWindow( window->ActiveMenu->ParentWindow ) ; + window->ActiveMenu->Window->State.Redisplay = GL_TRUE ; + fgSetWindow( window->ActiveMenu->ParentWindow ); break; } @@ -637,39 +724,25 @@ void FGAPIENTRY glutMainLoopEvent( void ) * XXX For more than 5 buttons, just check {event.xmotion.state}, * XXX rather than a host of bit-masks? */ - if( (event.xmotion.state & Button1Mask) || - (event.xmotion.state & Button2Mask) || - (event.xmotion.state & Button3Mask) || - (event.xmotion.state & Button4Mask) || - (event.xmotion.state & Button5Mask) ) - { - /* - * A mouse button was pressed during the movement... - * Is there a motion callback hooked to the window? - */ - if( window->Callbacks.Motion ) - { - fgSetWindow ( window ) ; - window->Callbacks.Motion( event.xmotion.x, - event.xmotion.y ); - } - } - else if( window->Callbacks.Passive ) - { - fgSetWindow ( window ) ; - window->Callbacks.Passive( event.xmotion.x, event.xmotion.y ); - } +#define BUTTON_MASK \ + ( Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask ) + if ( event.xmotion.state & BUTTON_MASK ) + INVOKE_WCB( *window, Motion, ( event.xmotion.x, + event.xmotion.y ) ); + else + INVOKE_WCB( *window, Passive, ( event.xmotion.x, + event.xmotion.y ) ); } break; case ButtonRelease: case ButtonPress: { - GLboolean pressed = TRUE; + GLboolean pressed = GL_TRUE; int button; if( event.type == ButtonRelease ) - pressed = FALSE ; + pressed = GL_FALSE ; /* * A mouse button has been pressed or released. Traditionally, @@ -688,6 +761,10 @@ void FGAPIENTRY glutMainLoopEvent( void ) button = event.xbutton.button - 1; /* + * XXX This comment is replicated in the WIN32 section and + * XXX maybe also in the menu code. Can we move the info + * XXX to one central place and *reference* it from here? + * * Do not execute the application's mouse callback if a menu * is hooked to this button. In that case an appropriate * private call should be generated. @@ -718,7 +795,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) /* In the menu, invoke the callback and deactivate the menu*/ if( fgCheckActiveMenu( window->ActiveMenu->Window, - window->ActiveMenu ) == TRUE ) + window->ActiveMenu ) ) { /* * Save the current window and menu and set the current @@ -748,7 +825,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) */ fgDeactivateMenu( window->ActiveMenu->ParentWindow ); - window->State.Redisplay = TRUE; + window->State.Redisplay = GL_TRUE; break; } @@ -756,11 +833,11 @@ void FGAPIENTRY glutMainLoopEvent( void ) * No active menu, let's check whether we need to activate one. */ if( ( 0 <= button ) && - ( 2 >= button ) && + ( FREEGLUT_MAX_MENUS > button ) && ( window->Menu[ button ] ) && pressed ) { - window->State.Redisplay = TRUE; + window->State.Redisplay = GL_TRUE; fgSetWindow( window ); fgActivateMenu( window, button ); break; @@ -770,83 +847,78 @@ void FGAPIENTRY glutMainLoopEvent( void ) * Check if there is a mouse or mouse wheel callback hooked to the * window */ - if( ( window->Callbacks.Mouse == NULL ) && - ( window->Callbacks.MouseWheel == NULL ) ) + if( ! FETCH_WCB( *window, Mouse ) && + ! FETCH_WCB( *window, MouseWheel ) ) break; - fgSetWindow( window ); - /* * XXX Why don't we use {window}? Other code here does... */ - fgStructure.Window->State.Modifiers = fgGetXModifiers( &event ); + fgState.Modifiers = fgGetXModifiers( &event ); /* * Finally execute the mouse or mouse wheel callback * * XXX Use a symbolic constant, *not* "4"! */ - if( ( button < 4 ) || ( !( window->Callbacks.MouseWheel ) ) ) - { - if( window->Callbacks.Mouse ) - fgStructure.Window->Callbacks.Mouse( - button, - event.type == ButtonPress ? GLUT_DOWN : GLUT_UP, - event.xbutton.x, - event.xbutton.y - ); - } + if( ( button < 3 ) || ( ! FETCH_WCB( *window, MouseWheel ) ) ) + INVOKE_WCB( *window, Mouse, ( button, + pressed ? GLUT_DOWN : GLUT_UP, + event.xbutton.x, + event.xbutton.y ) + ); else { - if( ( button >= 4 ) && window->Callbacks.MouseWheel ) - { - /* - * Map 4 and 5 to wheel zero; EVEN to +1, ODD to -1 - * " 6 and 7 " " one; ... - * - * XXX This *should* be behind some variables/macros, - * XXX since the order and numbering isn't certain - * XXX See XFree86 configuration docs (even back in the - * XXX 3.x days, and especially with 4.x). - */ - int wheel_number = (button - 4) / 2; - int direction = (button & 1)*2 - 1; - - if( ButtonPress ) - fgStructure.Window->Callbacks.MouseWheel( - wheel_number, - direction, - event.xbutton.x, - event.xbutton.y - ); - } + /* + * Map 4 and 5 to wheel zero; EVEN to +1, ODD to -1 + * " 6 and 7 " " one; ... + * + * XXX This *should* be behind some variables/macros, + * XXX since the order and numbering isn't certain + * XXX See XFree86 configuration docs (even back in the + * XXX 3.x days, and especially with 4.x). + * + * XXX Note that {button} has already been decremeted + * XXX in mapping from X button numbering to GLUT. + */ + int wheel_number = (button - 3) / 2; + int direction = -1; + if( button % 2 ) + direction = 1; + + if( pressed ) + INVOKE_WCB( *window, MouseWheel, ( wheel_number, + direction, + event.xbutton.x, + event.xbutton.y ) + ); } /* * Trash the modifiers state */ - fgStructure.Window->State.Modifiers = 0xffffffff; - break; + fgState.Modifiers = 0xffffffff; } + break; case KeyRelease: case KeyPress: { - FGCBkeyboard keyboard_cb; - FGCBspecial special_cb; + FGCBKeyboard keyboard_cb; + FGCBSpecial special_cb; GETWINDOW( xkey ); GETMOUSE( xkey ); if( event.type == KeyPress ) { - keyboard_cb = window->Callbacks.Keyboard; - special_cb = window->Callbacks.Special; + keyboard_cb = FETCH_WCB( *window, Keyboard ); + special_cb = FETCH_WCB( *window, Special ); } else { - keyboard_cb = window->Callbacks.KeyboardUp; - special_cb = window->Callbacks.SpecialUp; + keyboard_cb = FETCH_WCB( *window, KeyboardUp ); + special_cb = FETCH_WCB( *window, SpecialUp ); } /* @@ -863,7 +935,8 @@ void FGAPIENTRY glutMainLoopEvent( void ) * Check for the ASCII/KeySym codes associated with the event: */ len = XLookupString( &event.xkey, asciiCode, sizeof(asciiCode), - &keySym, &composeStatus ); + &keySym, &composeStatus + ); /* * GLUT API tells us to have two separate callbacks... @@ -876,10 +949,11 @@ void FGAPIENTRY glutMainLoopEvent( void ) if( keyboard_cb ) { fgSetWindow( window ); - window->State.Modifiers = fgGetXModifiers( &event ); + fgState.Modifiers = fgGetXModifiers( &event ); keyboard_cb( asciiCode[ 0 ], - event.xkey.x, event.xkey.y ); - window->State.Modifiers = 0xffffffff; + event.xkey.x, event.xkey.y + ); + fgState.Modifiers = 0xffffffff; } } else @@ -929,15 +1003,18 @@ void FGAPIENTRY glutMainLoopEvent( void ) if( special_cb && (special != -1) ) { fgSetWindow( window ); - window->State.Modifiers = fgGetXModifiers( &event ); + fgState.Modifiers = fgGetXModifiers( &event ); special_cb( special, event.xkey.x, event.xkey.y ); - window->State.Modifiers = 0xffffffff; + fgState.Modifiers = 0xffffffff; } } } } break; + case ReparentNotify: + break; /* XXX Should disable this event */ + default: fgWarning ("Unknown X event type: %d", event.type); break; @@ -989,12 +1066,11 @@ void FGAPIENTRY glutMainLoop( void ) */ while( window ) { - if ( window->Callbacks.Visibility ) + if ( FETCH_WCB( *window, Visibility ) ) { SFG_Window *current_window = fgStructure.Window ; - fgSetWindow( window ); - window->Callbacks.Visibility ( window->State.Visible ) ; + INVOKE_WCB( *window, Visibility, ( window->State.Visible ) ); fgSetWindow( current_window ); } @@ -1019,7 +1095,7 @@ void FGAPIENTRY glutMainLoop( void ) } { - fgExecutionState execState = fgState.ActionOnWindowClose; + fgExecutionState execState = fgState.ExecState; /* * When this loop terminates, destroy the display, state and structure @@ -1028,7 +1104,7 @@ void FGAPIENTRY glutMainLoop( void ) fgDeinitialize( ); if( execState == GLUT_ACTION_EXIT ) - exit( 0 ) ; + exit( 0 ); } } @@ -1040,10 +1116,25 @@ void FGAPIENTRY glutLeaveMainLoop( void ) fgState.ExecState = GLUT_EXEC_STATE_STOP ; } + +#if TARGET_HOST_WIN32 +/* + * Determine a GLUT modifer mask based on MS-WINDOWS system info. + */ +int fgGetWin32Modifiers (void) +{ + return + ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) || + ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) | + ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) || + ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) | + ( ( ( GetKeyState( VK_LMENU ) < 0 ) || + ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); +} + /* * The window procedure for handling Win32 events */ -#if TARGET_HOST_WIN32 LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { @@ -1052,7 +1143,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LONG lRet = 1; if ( ( window == NULL ) && ( uMsg != WM_CREATE ) ) - return( DefWindowProc( hWnd, uMsg, wParam, lParam ) ); + return DefWindowProc( hWnd, uMsg, wParam, lParam ); /* printf ( "Window %3d message <%04x> %12d %12d\n", window?window->ID:0, uMsg, wParam, lParam ); */ @@ -1067,32 +1158,33 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, window->Window.Handle = hWnd; window->Window.Device = GetDC( hWnd ); - if( fgState.BuildingAMenu ) + if( window->IsMenu ) { - unsigned int current_DisplayMode = fgState.DisplayMode; - fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH; - fgSetupPixelFormat( window, FALSE, PFD_MAIN_PLANE ); - fgState.DisplayMode = current_DisplayMode; - - if( fgStructure.MenuContext ) - wglMakeCurrent( window->Window.Device, - fgStructure.MenuContext->Context ) ; - else - { - fgStructure.MenuContext = - (SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) ); - fgStructure.MenuContext->Context = - wglCreateContext( window->Window.Device ); - } - - /* window->Window.Context = wglGetCurrentContext () ; */ - window->Window.Context = wglCreateContext( window->Window.Device ); + unsigned int current_DisplayMode = fgState.DisplayMode; + fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH; + fgSetupPixelFormat( window, GL_FALSE, PFD_MAIN_PLANE ); + fgState.DisplayMode = current_DisplayMode; + + if( fgStructure.MenuContext ) + wglMakeCurrent( window->Window.Device, + fgStructure.MenuContext->Context + ); + else + { + fgStructure.MenuContext = + (SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) ); + fgStructure.MenuContext->Context = + wglCreateContext( window->Window.Device ); + } + + /* window->Window.Context = wglGetCurrentContext (); */ + window->Window.Context = wglCreateContext( window->Window.Device ); } else { - fgSetupPixelFormat( window, FALSE, PFD_MAIN_PLANE ); + fgSetupPixelFormat( window, GL_FALSE, PFD_MAIN_PLANE ); - if( fgState.UseCurrentContext != TRUE ) + if( ! fgState.UseCurrentContext ) window->Window.Context = wglCreateContext( window->Window.Device ); else @@ -1104,7 +1196,10 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, } } - window->State.NeedToResize = TRUE; + window->State.NeedToResize = GL_TRUE; + window->State.Width = fgState.Size.X; + window->State.Height = fgState.Size.Y; + ReleaseDC( window->Window.Handle, window->Window.Device ); break; @@ -1112,7 +1207,9 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, /* * We got resized... But check if the window has been already added... */ - fghReshapeWindowByHandle( hWnd, LOWORD(lParam), HIWORD(lParam) ); + window->State.NeedToResize = GL_TRUE; + window->State.Width = LOWORD(lParam); + window->State.Height = HIWORD(lParam); break; #if 0 case WM_SETFOCUS: @@ -1126,7 +1223,6 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, /* glutSetCursor( fgStructure.Window->State.Cursor ); */ printf("WM_ACTIVATE: glutSetCursor( %p, %d)\n", window, window->State.Cursor ); - glutSetCursor( window->State.Cursor ); } @@ -1134,52 +1230,58 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, break; #endif - case WM_SETCURSOR: /* - * Windows seems to need reminding to erase the cursor for NONE. + * XXX Why not re-use some common code with the glutSetCursor() + * XXX function (or perhaps invoke glutSetCursor())? + * XXX That is, why are we duplicating code, here, from + * XXX glutSetCursor()? The WIN32 code should be able to just + * XXX call glutSetCurdsor() instead of defining two macros + * XXX and implementing a nested case in-line. */ -#if 0 - if ((LOWORD(lParam) == HTCLIENT) && - (fgStructure.Window->State.Cursor == GLUT_CURSOR_NONE)) - SetCursor( NULL ); -#else + case WM_SETCURSOR: /* Set the cursor AND change it for this window class. */ -# define MAP_CURSOR(a,b) case a: SetCursor( LoadCursor( NULL, b ) ); \ - break; +#define MAP_CURSOR(a,b) \ + case a: \ + SetCursor( LoadCursor( NULL, b ) ); \ + break; + /* Nuke the cursor AND change it for this window class. */ -# define ZAP_CURSOR(a,b) case a: SetCursor( NULL ); \ - break; +#define ZAP_CURSOR(a,b) \ + case a: \ + SetCursor( NULL ); \ + break; if( LOWORD( lParam ) == HTCLIENT ) - switch( window->State.Cursor ) - { - MAP_CURSOR( GLUT_CURSOR_RIGHT_ARROW, IDC_ARROW ); - MAP_CURSOR( GLUT_CURSOR_LEFT_ARROW, IDC_ARROW ); - MAP_CURSOR( GLUT_CURSOR_INFO, IDC_HELP ); - MAP_CURSOR( GLUT_CURSOR_DESTROY, IDC_CROSS ); - MAP_CURSOR( GLUT_CURSOR_HELP, IDC_HELP ); - MAP_CURSOR( GLUT_CURSOR_CYCLE, IDC_SIZEALL ); - MAP_CURSOR( GLUT_CURSOR_SPRAY, IDC_CROSS ); - MAP_CURSOR( GLUT_CURSOR_WAIT, IDC_WAIT ); - MAP_CURSOR( GLUT_CURSOR_TEXT, IDC_UPARROW ); - MAP_CURSOR( GLUT_CURSOR_CROSSHAIR, IDC_CROSS ); - /* MAP_CURSOR( GLUT_CURSOR_NONE, IDC_NO ); */ - ZAP_CURSOR( GLUT_CURSOR_NONE, NULL ); - - default: - MAP_CURSOR( GLUT_CURSOR_UP_DOWN, IDC_ARROW ); - } -#endif + switch( window->State.Cursor ) + { + MAP_CURSOR( GLUT_CURSOR_RIGHT_ARROW, IDC_ARROW ); + MAP_CURSOR( GLUT_CURSOR_LEFT_ARROW, IDC_ARROW ); + MAP_CURSOR( GLUT_CURSOR_INFO, IDC_HELP ); + MAP_CURSOR( GLUT_CURSOR_DESTROY, IDC_CROSS ); + MAP_CURSOR( GLUT_CURSOR_HELP, IDC_HELP ); + MAP_CURSOR( GLUT_CURSOR_CYCLE, IDC_SIZEALL ); + MAP_CURSOR( GLUT_CURSOR_SPRAY, IDC_CROSS ); + MAP_CURSOR( GLUT_CURSOR_WAIT, IDC_WAIT ); + MAP_CURSOR( GLUT_CURSOR_TEXT, IDC_UPARROW ); + MAP_CURSOR( GLUT_CURSOR_CROSSHAIR, IDC_CROSS ); + /* MAP_CURSOR( GLUT_CURSOR_NONE, IDC_NO ); */ + ZAP_CURSOR( GLUT_CURSOR_NONE, NULL ); + + default: + MAP_CURSOR( GLUT_CURSOR_UP_DOWN, IDC_ARROW ); + } else lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); break; case WM_SHOWWINDOW: - window->State.Visible = TRUE; - window->State.Redisplay = TRUE; + window->State.Visible = GL_TRUE; + window->State.Redisplay = GL_TRUE; break; case WM_PAINT: + /* Turn on the visibility in case it was turned off somehow */ + window->State.Visible = GL_TRUE; BeginPaint( hWnd, &ps ); fghRedrawWindowByHandle( hWnd ); EndPaint( hWnd, &ps ); @@ -1208,7 +1310,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, used = TRUE; } - if( used == FALSE ) + if( ! used ) wglDeleteContext( window->Window.Context ); } @@ -1216,7 +1318,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, * Put on a linked list of windows to be removed after all the * callbacks have returned */ - fgAddToWindowDestroyList( window, FALSE ) ; + fgAddToWindowDestroyList( window, GL_FALSE ); DestroyWindow( hWnd ); break; @@ -1224,7 +1326,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, /* * The window already got destroyed, so don't bother with it. */ - return( 0 ); + return 0; case WM_MOUSEMOVE: { @@ -1233,46 +1335,23 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, if ( window->ActiveMenu ) { - window->State.Redisplay = TRUE ; - - /* - * Since the window is a menu, make the parent window current - */ - fgSetWindow ( window->ActiveMenu->ParentWindow ) ; - + window->State.Redisplay = GL_TRUE; + fgSetWindow ( window->ActiveMenu->ParentWindow ); break; } - window->State.Modifiers = - ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) || - ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) | - ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) || - ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) | - ( ( ( GetKeyState( VK_LMENU ) < 0 ) || - ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); + fgState.Modifiers = fgGetWin32Modifiers( ); if( ( wParam & MK_LBUTTON ) || ( wParam & MK_MBUTTON ) || ( wParam & MK_RBUTTON ) ) - { - if( window->Callbacks.Motion ) - { - fgSetWindow( window ); - window->Callbacks.Motion( window->State.MouseX, - window->State.MouseY ); - } - } + INVOKE_WCB( *window, Motion, ( window->State.MouseX, + window->State.MouseY ) ); else - { - if( window->Callbacks.Passive ) - { - fgSetWindow( window ); - window->Callbacks.Passive( window->State.MouseX, - window->State.MouseY ); - } - } + INVOKE_WCB( *window, Passive, ( window->State.MouseX, + window->State.MouseY ) ); - window->State.Modifiers = 0xffffffff; + fgState.Modifiers = 0xffffffff; } break; @@ -1283,7 +1362,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, case WM_MBUTTONUP: case WM_RBUTTONUP: { - GLboolean pressed = TRUE; + GLboolean pressed = GL_TRUE; int button; window->State.MouseX = LOWORD( lParam ); @@ -1292,19 +1371,33 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, switch( uMsg ) { case WM_LBUTTONDOWN: - pressed = TRUE; button = GLUT_LEFT_BUTTON; break; + pressed = GL_TRUE; + button = GLUT_LEFT_BUTTON; + break; case WM_MBUTTONDOWN: - pressed = TRUE; button = GLUT_MIDDLE_BUTTON; break; + pressed = GL_TRUE; + button = GLUT_MIDDLE_BUTTON; + break; case WM_RBUTTONDOWN: - pressed = TRUE; button = GLUT_RIGHT_BUTTON; break; + pressed = GL_TRUE; + button = GLUT_RIGHT_BUTTON; + break; case WM_LBUTTONUP: - pressed = FALSE; button = GLUT_LEFT_BUTTON; break; + pressed = GL_FALSE; + button = GLUT_LEFT_BUTTON; + break; case WM_MBUTTONUP: - pressed = FALSE; button = GLUT_MIDDLE_BUTTON; break; + pressed = GL_FALSE; + button = GLUT_MIDDLE_BUTTON; + break; case WM_RBUTTONUP: - pressed = FALSE; button = GLUT_RIGHT_BUTTON; break; + pressed = GL_FALSE; + button = GLUT_RIGHT_BUTTON; + break; default: - pressed = FALSE; button = -1; break; + pressed = GL_FALSE; + button = -1; + break; } if( GetSystemMetrics( SM_SWAPBUTTON ) ) @@ -1317,6 +1410,9 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, return DefWindowProc( hWnd, uMsg, lParam, wParam ); /* + * XXX This comment is duplicated in two other spots. + * XXX Can we centralize it? + * * Do not execute the application's mouse callback if a * menu is hooked to this button. * In that case an appropriate private call should be generated. @@ -1336,8 +1432,13 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, /* Window has an active menu, it absorbs any mouse click */ if( window->ActiveMenu ) { - /* Inside the menu, invoke the callback and deactivate the menu*/ - if( fgCheckActiveMenu( window, window->ActiveMenu ) == TRUE ) + /* Outside the menu, deactivate the menu if it's a downclick */ + if( ! fgCheckActiveMenu( window, window->ActiveMenu ) ) + { + if( pressed ) + fgDeactivateMenu( window->ActiveMenu->ParentWindow ); + } + else /* In menu, invoke the callback and deactivate the menu*/ { /* * Save the current window and menu and set the current @@ -1357,62 +1458,54 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, fgSetWindow( save_window ); fgStructure.Menu = save_menu; } - else /* Out of menu, deactivate the menu if it's a downclick */ - { - if( pressed == TRUE ) - fgDeactivateMenu( window->ActiveMenu->ParentWindow ); - } /* * Let's make the window redraw as a result of the mouse * click and menu activity. */ if( ! window->IsMenu ) - window->State.Redisplay = TRUE; + window->State.Redisplay = GL_TRUE; break; } - if ( ( window->Menu[ button ] != NULL ) && ( pressed == TRUE ) ) + if ( window->Menu[ button ] && pressed ) { - window->State.Redisplay = TRUE; + window->State.Redisplay = GL_TRUE; fgSetWindow( window ); fgActivateMenu( window, button ); break; } - if( window->Callbacks.Mouse == NULL ) + if( ! FETCH_WCB( *window, Mouse ) ) break; fgSetWindow( window ); - - fgStructure.Window->State.Modifiers = - ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) || - ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) | - ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) || - ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) | - ( ( ( GetKeyState( VK_LMENU ) < 0 ) || - ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); - - window->Callbacks.Mouse( - button, - pressed == TRUE ? GLUT_DOWN : GLUT_UP, - window->State.MouseX, - window->State.MouseY + fgState.Modifiers = fgGetWin32Modifiers( ); + + INVOKE_WCB( + *window, Mouse, + ( button, + pressed ? GLUT_DOWN : GLUT_UP, + window->State.MouseX, + window->State.MouseY + ) ); - fgStructure.Window->State.Modifiers = 0xffffffff; + fgState.Modifiers = 0xffffffff; } break; case 0x020a: /* Should be WM_MOUSEWHEEL but my compiler doesn't recognize it */ { - int wheel_number = LOWORD( lParam ); - /* THIS IS SPECULATIVE -- John Fay, 10/2/03 */ - int ticks = HIWORD( lParam ) / 120; - /* Should be WHEEL_DELTA instead of 120 */ + /* + * XXX THIS IS SPECULATIVE -- John Fay, 10/2/03 + * XXX Should use WHEEL_DELTA instead of 120 + */ + int wheel_number = LOWORD( wParam ); + short ticks = ( short )HIWORD( wParam ) / 120; int direction = 1; if( ticks < 0 ) @@ -1429,26 +1522,21 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, /* window->State.MouseY = HIWORD( lParam ); */ /* change "lParam" to other parameter */ - if( ( window->Callbacks.MouseWheel == NULL ) && - ( window->Callbacks.Mouse == NULL ) ) + if( ! FETCH_WCB( *window, MouseWheel ) && + ! FETCH_WCB( *window, Mouse ) ) break; fgSetWindow( window ); - fgStructure.Window->State.Modifiers = - ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) || - ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) | - ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) || - ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) | - ( ( ( GetKeyState( VK_LMENU ) < 0 ) || - ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); + fgState.Modifiers = fgGetWin32Modifiers( ); while( ticks-- ) - if( window->Callbacks.MouseWheel ) - window->Callbacks.MouseWheel( - wheel_number, - direction, - window->State.MouseX, - window->State.MouseY + if( FETCH_WCB( *window, MouseWheel ) ) + INVOKE_WCB( *window, MouseWheel, + ( wheel_number, + direction, + window->State.MouseX, + window->State.MouseY + ) ); else /* No mouse wheel, call the mouse button callback twice */ { @@ -1457,16 +1545,19 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, * XXX buttons. Sorry. */ int button = wheel_number*2 + 4; - button += (1 + direction)/2; - window->Callbacks.Mouse( button, GLUT_DOWN, - window->State.MouseX, - window->State.MouseY ) ; - window->Callbacks.Mouse( button, GLUT_UP, - window->State.MouseX, - window->State.MouseY ) ; + if( direction > 0 ) + ++button; + INVOKE_WCB( *window, Mouse, + ( button, GLUT_DOWN, + window->State.MouseX, window->State.MouseY ) + ); + INVOKE_WCB( *window, Mouse, + ( button, GLUT_UP, + window->State.MouseX, window->State.MouseX ) + ); } - fgStructure.Window->State.Modifiers = 0xffffffff; + fgState.Modifiers = 0xffffffff; } break ; @@ -1483,13 +1574,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, * Remember the current modifiers state. This is done here in order * to make sure the VK_DELETE keyboard callback is executed properly. */ - window->State.Modifiers = - ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) || - ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) | - ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) || - ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) | - ( ( ( GetKeyState( VK_LMENU ) < 0 ) || - ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); + fgState.Modifiers = fgGetWin32Modifiers( ); GetCursorPos( &mouse_pos ); ScreenToClient( window->Window.Handle, &mouse_pos ); @@ -1530,22 +1615,18 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, /* * The delete key should be treated as an ASCII keypress: */ - if( window->Callbacks.Keyboard ) - { - fgSetWindow( window ); - window->Callbacks.Keyboard( 127, window->State.MouseX, - window->State.MouseY ); - } + INVOKE_WCB( *window, Keyboard, + ( 127, window->State.MouseX, window->State.MouseY ) + ); } - if( ( keypress != -1 ) && window->Callbacks.Special ) - { - fgSetWindow( window ); - window->Callbacks.Special( keypress, window->State.MouseX, - window->State.MouseY ); - } + if( keypress != -1 ) + INVOKE_WCB( *window, Special, + ( keypress, + window->State.MouseX, window->State.MouseY ) + ); - window->State.Modifiers = 0xffffffff; + fgState.Modifiers = 0xffffffff; } break; @@ -1553,19 +1634,13 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, case WM_KEYUP: { int keypress = -1; - POINT mouse_pos ; + POINT mouse_pos; /* * Remember the current modifiers state. This is done here in order * to make sure the VK_DELETE keyboard callback is executed properly. */ - window->State.Modifiers = - ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) || - ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) | - ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) || - ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) | - ( ( ( GetKeyState( VK_LMENU ) < 0 ) || - ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); + fgState.Modifiers = fgGetWin32Modifiers( ); GetCursorPos( &mouse_pos ); ScreenToClient( window->Window.Handle, &mouse_pos ); @@ -1606,13 +1681,9 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, /* * The delete key should be treated as an ASCII keypress: */ - if( window->Callbacks.KeyboardUp ) - { - fgSetWindow( window ); - window->Callbacks.KeyboardUp( 127, window->State.MouseX, - window->State.MouseY ); - } - + INVOKE_WCB( *window, KeyboardUp, + ( 127, window->State.MouseX, window->State.MouseY ) + ); break; default: @@ -1625,24 +1696,20 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, if( ToAscii( wParam, 0, state, code, 0 ) == 1 ) wParam=code[ 0 ]; - if( window->Callbacks.KeyboardUp ) - { - fgSetWindow( window ); - window->Callbacks.KeyboardUp( (char)wParam, - window->State.MouseX, - window->State.MouseY ); - } + INVOKE_WCB( *window, KeyboardUp, + ( (char)wParam, + window->State.MouseX, window->State.MouseY ) + ); } } - if( (keypress != -1) && window->Callbacks.SpecialUp ) - { - fgSetWindow( window ); - window->Callbacks.SpecialUp( keypress, window->State.MouseX, - window->State.MouseY ); - } + if( keypress != -1 ) + INVOKE_WCB( *window, SpecialUp, + ( keypress, + window->State.MouseX, window->State.MouseY ) + ); - window->State.Modifiers = 0xffffffff; + fgState.Modifiers = 0xffffffff; } break; @@ -1652,34 +1719,29 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, if( fgState.IgnoreKeyRepeat && (lParam & KF_REPEAT) ) break; - if( window->Callbacks.Keyboard ) + /* + * XXX INVOKE_WCB() takes care of the callback-pointer check. + * XXX We could just uncoditionally find/trash the Modifiers + * XXX and get rid of the "if( ... ) {" and "}". Unconditinal + * XXX code is simpler code. (^& + */ + if( FETCH_WCB( *window, Keyboard ) ) { - fgSetWindow( window ); - window->State.Modifiers = - ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) || - ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) | - ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) || - ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) | - ( ( ( GetKeyState( VK_LMENU ) < 0 ) || - ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); - - window->Callbacks.Keyboard( (char)wParam, window->State.MouseX, - window->State.MouseY ); - window->State.Modifiers = 0xffffffff; + fgState.Modifiers = fgGetWin32Modifiers( ); + INVOKE_WCB( *window, Keyboard, + ( (char)wParam, + window->State.MouseX, window->State.MouseY ) + ); + fgState.Modifiers = 0xffffffff; } } break; case WM_CAPTURECHANGED: /* User has finished resizing the window, force a redraw */ - if( window->Callbacks.Display ) - { - fgSetWindow( window ); + INVOKE_WCB( *window, Display, ( ) ); - window->Callbacks.Display( ); - } - - /*lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ) ; */ + /*lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); */ break; /* @@ -1710,7 +1772,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, case WM_SYNCPAINT: /* 0x0088 */ /* Another window has moved, need to update this one */ - window->State.Redisplay = TRUE; + window->State.Redisplay = GL_TRUE; lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); /* Help screen says this message must be passed to "DefWindowProc" */ break; @@ -1721,6 +1783,75 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, /* Pass it on to "DefWindowProc" to repaint a standard border */ break; + case WM_SYSCOMMAND : /* 0x0112 */ + { + /* + * We have received a system command message. Try to act on it. + * The commands are passed in through the "lParam" parameter: + * Clicking on a corner to resize the window gives a "F004" message + * but this is not defined in my header file. + */ + switch ( lParam ) + { + case SC_SIZE : + break ; + + case SC_MOVE : + break ; + + case SC_MINIMIZE : + /* User has clicked on the "-" to minimize the window */ + /* Turn off the visibility */ + window->State.Visible = GL_FALSE ; + + break ; + + case SC_MAXIMIZE : + break ; + + case SC_NEXTWINDOW : + break ; + + case SC_PREVWINDOW : + break ; + + case SC_CLOSE : + /* Followed very closely by a WM_CLOSE message */ + break ; + + case SC_VSCROLL : + break ; + + case SC_HSCROLL : + break ; + + case SC_MOUSEMENU : + break ; + + case SC_KEYMENU : + break ; + + case SC_ARRANGE : + break ; + + case SC_RESTORE : + break ; + + case SC_TASKLIST : + break ; + + case SC_SCREENSAVE : + break ; + + case SC_HOTKEY : + break ; + } + } + + /* We need to pass the message on to the operating system as well */ + lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); + break; + default: /* * Handle unhandled messages @@ -1729,7 +1860,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, break; } - return lRet ; + return lRet; } #endif