X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_main.c;h=134ffb3071ccb7cffdb71f3e25ad35d26295f187;hb=0fd65e65061141e7317caba38801580374f09d0b;hp=705f52be04664c483502811e63438c0c77fda8c2;hpb=de5c5ab4dfed8e63997f1d5045385ef2d5453aea;p=freeglut diff --git a/src/freeglut_main.c b/src/freeglut_main.c index 705f52b..134ffb3 100644 --- a/src/freeglut_main.c +++ b/src/freeglut_main.c @@ -25,11 +25,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include #include "freeglut_internal.h" @@ -402,6 +397,7 @@ static void fghCheckJoystickCallback( SFG_Window* w, SFG_Enumerator* e) static int fghHaveJoystick( void ) { SFG_Enumerator enumerator; + enumerator.found = GL_FALSE; enumerator.data = NULL; fgEnumWindows( fghCheckJoystickCallback, &enumerator ); @@ -419,6 +415,7 @@ static void fghHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e) static int fghHavePendingRedisplays (void) { SFG_Enumerator enumerator; + enumerator.found = GL_FALSE; enumerator.data = NULL; fgEnumWindows( fghHavePendingRedisplaysCallback, &enumerator ); @@ -478,7 +475,7 @@ static void fghSleepForEvents( void ) wait.tv_usec = (msec % 1000) * 1000; err = select( socket+1, &fdset, NULL, NULL, &wait ); - if( ( -1 == err ) && ( errno != EINTR ) ) + if( -1 == err ) fgWarning ( "freeglut select() error: %d", errno ); } #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE @@ -527,7 +524,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) window->State.MouseX = event.a.x; \ window->State.MouseY = event.a.y; - freeglut_assert_ready; + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMainLoopEvent" ); while( XPending( fgDisplay.Display ) ) { @@ -752,93 +749,13 @@ 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. - * Near as I can tell, this is the menu behaviour: - * - Down-click the menu button, menu not active: activate - * the menu with its upper left-hand corner at the mouse - * location. - * - Down-click any button outside the menu, menu active: - * deactivate the menu - * - Down-click any button inside the menu, menu active: - * select the menu entry and deactivate the menu - * - Up-click the menu button, menu not active: nothing happens - * - Up-click the menu button outside the menu, menu active: - * nothing happens - * - Up-click the menu button inside the menu, menu active: - * select the menu entry and deactivate the menu */ - /* Window has an active menu, it absorbs any mouse click */ - if( window->ActiveMenu ) - { - if( window == window->ActiveMenu->ParentWindow ) - { - window->ActiveMenu->Window->State.MouseX = - event.xbutton.x_root - window->ActiveMenu->X; - window->ActiveMenu->Window->State.MouseY = - event.xbutton.y_root - window->ActiveMenu->Y; - } - - /* In the menu, invoke the callback and deactivate the menu*/ - if( fgCheckActiveMenu( window->ActiveMenu->Window, - window->ActiveMenu ) ) - { - /* - * Save the current window and menu and set the current - * window to the window whose menu this is - */ - SFG_Window *save_window = fgStructure.Window; - SFG_Menu *save_menu = fgStructure.Menu; - SFG_Window *parent_window = - window->ActiveMenu->ParentWindow; - fgSetWindow( parent_window ); - fgStructure.Menu = window->ActiveMenu; - - /* Execute the menu callback */ - fgExecuteMenuCallback( window->ActiveMenu ); - fgDeactivateMenu( parent_window ); - - /* Restore the current window and menu */ - fgSetWindow( save_window ); - fgStructure.Menu = save_menu; - } - else if( pressed ) - /* - * Outside the menu, deactivate if it's a downclick - * - * XXX This isn't enough. A downclick outside of - * XXX the interior of our freeglut windows should also - * XXX deactivate the menu. This is more complicated. - */ - fgDeactivateMenu( window->ActiveMenu->ParentWindow ); - - /* - * XXX Why does an active menu require a redisplay at - * XXX this point? If this can come out cleanly, then - * XXX it probably should do so; if not, a comment should - * XXX explain it. - */ - window->State.Redisplay = GL_TRUE; + if( fgCheckActiveMenu( window, button, pressed, + event.xbutton.x_root, event.xbutton.y_root ) ) break; - } - - /* No active menu, let's check whether we need to activate one. */ - if( ( 0 <= button ) && - ( FREEGLUT_MAX_MENUS > button ) && - ( window->Menu[ button ] ) && - pressed ) - { - /* XXX Posting a requisite Redisplay seems bogus. */ - window->State.Redisplay = GL_TRUE; - fgSetWindow( window ); - fgActivateMenu( window, button ); - break; - } /* * Check if there is a mouse or mouse wheel callback hooked to the @@ -944,9 +861,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) special_cb = FETCH_WCB( *window, SpecialUp ); } - /* - * Is there a keyboard/special callback hooked for this window? - */ + /* Is there a keyboard/special callback hooked for this window? */ if( keyboard_cb || special_cb ) { XComposeStatus composeStatus; @@ -954,21 +869,15 @@ void FGAPIENTRY glutMainLoopEvent( void ) KeySym keySym; int len; - /* - * Check for the ASCII/KeySym codes associated with the event: - */ + /* Check for the ASCII/KeySym codes associated with the event: */ len = XLookupString( &event.xkey, asciiCode, sizeof(asciiCode), &keySym, &composeStatus ); - /* - * GLUT API tells us to have two separate callbacks... - */ + /* GLUT API tells us to have two separate callbacks... */ if( len > 0 ) { - /* - * ...one for the ASCII translateable keypresses... - */ + /* ...one for the ASCII translateable keypresses... */ if( keyboard_cb ) { fgSetWindow( window ); @@ -1048,6 +957,8 @@ void FGAPIENTRY glutMainLoopEvent( void ) MSG stMsg; + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMainLoopEvent" ); + while( PeekMessage( &stMsg, NULL, 0, 0, PM_NOREMOVE ) ) { if( GetMessage( &stMsg, NULL, 0, 0 ) == 0 ) @@ -1088,7 +999,7 @@ void FGAPIENTRY glutMainLoop( void ) SFG_Window *window = (SFG_Window *)fgStructure.Windows.First ; #endif - freeglut_assert_ready; + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMainLoop" ); #if TARGET_HOST_WIN32 || TARGET_HOST_WINCE /* @@ -1158,6 +1069,7 @@ void FGAPIENTRY glutMainLoop( void ) */ void FGAPIENTRY glutLeaveMainLoop( void ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutLeaveMainLoop" ); fgState.ExecState = GLUT_EXEC_STATE_STOP ; } @@ -1183,10 +1095,14 @@ static int fghGetWin32Modifiers (void) LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { - SFG_Window* window = fgWindowByHandle( hWnd ); + SFG_Window* window; PAINTSTRUCT ps; LONG lRet = 1; + FREEGLUT_INTERNAL_ERROR_EXIT_IF_NOT_INITIALISED ( "Event Handler" ) ; + + window = fgWindowByHandle( hWnd ); + if ( ( window == NULL ) && ( uMsg != WM_CREATE ) ) return DefWindowProc( hWnd, uMsg, wParam, lParam ); @@ -1197,7 +1113,8 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, case WM_CREATE: /* The window structure is passed as the creation structure paramter... */ window = (SFG_Window *) (((LPCREATESTRUCT) lParam)->lpCreateParams); - assert( window != NULL ); + FREEGLUT_INTERNAL_ERROR_EXIT ( ( window != NULL ), "Cannot create window", + "fgWindowProc" ); window->Window.Handle = hWnd; window->Window.Device = GetDC( hWnd ); @@ -1311,7 +1228,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, * 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 call glutSetCursor() instead of defining two macros * XXX and implementing a nested case in-line. */ case WM_SETCURSOR: @@ -1327,6 +1244,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, SetCursor( NULL ); \ break; +/* printf ( "Cursor event %x %x %x %x\n", window, window->State.Cursor, lParam, wParam ) ; */ if( LOWORD( lParam ) == HTCLIENT ) switch( window->State.Cursor ) { @@ -1481,64 +1399,13 @@ 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. - * Near as I can tell, this is the menu behaviour: - * - Down-click the menu button, menu not active: activate - * the menu with its upper left-hand corner at the mouse location. - * - Down-click any button outside the menu, menu active: - * deactivate the menu - * - Down-click any button inside the menu, menu active: - * select the menu entry and deactivate the menu - * - Up-click the menu button, menu not active: nothing happens - * - Up-click the menu button outside the menu, menu active: - * nothing happens - * - Up-click the menu button inside the menu, menu active: - * select the menu entry and deactivate the menu + * 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. */ - /* Window has an active menu, it absorbs any mouse click */ - if( window->ActiveMenu ) - { - /* 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 - * window to the window whose menu this is - */ - SFG_Window *save_window = fgStructure.Window; - SFG_Menu *save_menu = fgStructure.Menu; - SFG_Window *parent_window = window->ActiveMenu->ParentWindow; - fgSetWindow( parent_window ); - fgStructure.Menu = window->ActiveMenu; - - /* Execute the menu callback */ - fgExecuteMenuCallback( window->ActiveMenu ); - fgDeactivateMenu( parent_window ); - - /* Restore the current window and menu */ - fgSetWindow( save_window ); - fgStructure.Menu = save_menu; - } - - /* - * Let's make the window redraw as a result of the mouse - * click and menu activity. - */ - if( ! window->IsMenu ) - window->State.Redisplay = GL_TRUE; - + if( fgCheckActiveMenu( window, button, pressed, + window->State.MouseX, window->State.MouseY ) ) break; - } if( window->Menu[ button ] && pressed ) { @@ -1666,9 +1533,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, window->State.MouseX = mouse_pos.x; window->State.MouseY = mouse_pos.y; - /* - * Convert the Win32 keystroke codes to GLUTtish way - */ + /* Convert the Win32 keystroke codes to GLUTtish way */ # define KEY(a,b) case a: keypress = b; break; switch( wParam ) @@ -1696,9 +1561,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, KEY( VK_INSERT, GLUT_KEY_INSERT ); case VK_DELETE: - /* - * The delete key should be treated as an ASCII keypress: - */ + /* The delete key should be treated as an ASCII keypress: */ INVOKE_WCB( *window, Keyboard, ( 127, window->State.MouseX, window->State.MouseY ) ); @@ -1784,9 +1647,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, KEY( VK_INSERT, GLUT_KEY_INSERT ); case VK_DELETE: - /* - * The delete key should be treated as an ASCII keypress: - */ + /* The delete key should be treated as an ASCII keypress: */ INVOKE_WCB( *window, KeyboardUp, ( 127, window->State.MouseX, window->State.MouseY ) ); @@ -1843,9 +1704,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, /*lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); */ break; - /* - * Other messages that I have seen and which are not handled already - */ + /* Other messages that I have seen and which are not handled already */ case WM_SETTEXT: /* 0x000c */ lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); /* Pass it on to "DefWindowProc" to set the window text */ @@ -1964,9 +1823,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, break; default: - /* - * Handle unhandled messages - */ + /* Handle unhandled messages */ lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); break; }