X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_main.c;h=da5bcfed961e2d36783a76c76d4069d1c053800a;hb=cef996c3fac108d491a7b05c616ccc04c6851cd0;hp=2e22721781b941a580772d2f4a7259d89d810fc6;hpb=4fa63bbb5637f30db8eec9de49c0b2c4830cb866;p=freeglut diff --git a/src/freeglut_main.c b/src/freeglut_main.c index 2e22721..da5bcfe 100644 --- a/src/freeglut_main.c +++ b/src/freeglut_main.c @@ -25,23 +25,19 @@ * 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" - -#include -#if TARGET_HOST_UNIX_X11 -#include -#include -#include #include -#include -#elif TARGET_HOST_WIN32 -#elif TARGET_HOST_WINCE +#include +#if HAVE_VPRINTF +# define VFPRINTF(s,f,a) vfprintf((s),(f),(a)) +#elif HAVE_DOPRNT +# define VFPRINTF(s,f,a) _doprnt((f),(a),(s)) +#else +# define VFPRINTF(s,f,a) +#endif + +#if TARGET_HOST_WINCE typedef struct GXDisplayProperties GXDisplayProperties; typedef struct GXKeyList GXKeyList; @@ -57,8 +53,15 @@ struct GXKeyList gxKeyList; #endif -#ifndef MAX -#define MAX(a,b) (((a)>(b)) ? (a) : (b)) +/* + * Try to get the maximum value allowed for ints, falling back to the minimum + * guaranteed by ISO C99 if there is no suitable header. + */ +#if HAVE_LIMITS_H +# include +#endif +#ifndef INT_MAX +# define INT_MAX 32767 #endif #ifndef MIN @@ -84,12 +87,10 @@ struct GXKeyList gxKeyList; * callback is hooked, the viewport size is updated to * match the new window size. */ -static void fghReshapeWindowByHandle ( SFG_WindowHandleType handle, - int width, int height ) +static void fghReshapeWindow ( SFG_Window *window, int width, int height ) { - SFG_Window *current_window = fgStructure.Window; + SFG_Window *current_window = fgStructure.CurrentWindow; - SFG_Window* window = fgWindowByHandle( handle ); freeglut_return_if_fail( window != NULL ); @@ -103,7 +104,8 @@ static void fghReshapeWindowByHandle ( SFG_WindowHandleType handle, #if !TARGET_HOST_WINCE { - RECT rect; + RECT winRect; + int x, y, w, h; /* * For windowed mode, get the current position of the @@ -111,24 +113,29 @@ static void fghReshapeWindowByHandle ( SFG_WindowHandleType handle, * decorations into account. */ - GetWindowRect( window->Window.Handle, &rect ); - rect.right = rect.left + width; - rect.bottom = rect.top + height; + /* "GetWindowRect" returns the pixel coordinates of the outside of the window */ + GetWindowRect( window->Window.Handle, &winRect ); + x = winRect.left; + y = winRect.top; + w = width; + h = height; if ( window->Parent == NULL ) { if ( ! window->IsMenu && !window->State.IsGameMode ) { - rect.right += GetSystemMetrics( SM_CXSIZEFRAME ) * 2; - rect.bottom += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 + - GetSystemMetrics( SM_CYCAPTION ); + w += GetSystemMetrics( SM_CXSIZEFRAME ) * 2; + h += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 + + GetSystemMetrics( SM_CYCAPTION ); } } else { - GetWindowRect( window->Parent->Window.Handle, &rect ); - AdjustWindowRect ( &rect, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | - WS_CLIPCHILDREN, FALSE ); + RECT parentRect; + GetWindowRect( window->Parent->Window.Handle, &parentRect ); + x -= parentRect.left + GetSystemMetrics( SM_CXSIZEFRAME ) * 2; + y -= parentRect.top + GetSystemMetrics( SM_CYSIZEFRAME ) * 2 + + GetSystemMetrics( SM_CYCAPTION ); } /* @@ -140,10 +147,7 @@ static void fghReshapeWindowByHandle ( SFG_WindowHandleType handle, SetWindowPos( window->Window.Handle, HWND_TOP, - rect.left, - rect.top, - rect.right - rect.left, - rect.bottom - rect.top, + x, y, w, h, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSENDCHANGING | SWP_NOZORDER ); @@ -181,9 +185,10 @@ static void fghReshapeWindowByHandle ( SFG_WindowHandleType handle, * Calls a window's redraw method. This is used when * a redraw is forced by the incoming window messages. */ -static void fghRedrawWindowByHandle ( SFG_WindowHandleType handle ) +static void fghRedrawWindow ( SFG_Window *window ) { - SFG_Window* window = fgWindowByHandle( handle ); + SFG_Window *current_window = fgStructure.CurrentWindow; + freeglut_return_if_fail( window ); freeglut_return_if_fail( FETCH_WCB ( *window, Display ) ); @@ -191,23 +196,22 @@ static void fghRedrawWindowByHandle ( SFG_WindowHandleType handle ) freeglut_return_if_fail( window->State.Visible ); + fgSetWindow( window ); + if( window->State.NeedToResize ) { - SFG_Window *current_window = fgStructure.Window; - - fgSetWindow( window ); - - fghReshapeWindowByHandle( - window->Window.Handle, + fghReshapeWindow( + window, window->State.Width, window->State.Height ); window->State.NeedToResize = GL_FALSE; - fgSetWindow( current_window ); } INVOKE_WCB( *window, Display, ( ) ); + + fgSetWindow( current_window ); } /* @@ -216,34 +220,13 @@ static void fghRedrawWindowByHandle ( SFG_WindowHandleType handle ) static void fghcbDisplayWindow( SFG_Window *window, SFG_Enumerator *enumerator ) { - if( window->State.NeedToResize ) - { - SFG_Window *current_window = fgStructure.Window; - - fgSetWindow( window ); - - fghReshapeWindowByHandle( - window->Window.Handle, - window->State.Width, - window->State.Height - ); - - window->State.NeedToResize = GL_FALSE; - fgSetWindow ( current_window ); - } - if( window->State.Redisplay && window->State.Visible ) { window->State.Redisplay = GL_FALSE; #if TARGET_HOST_UNIX_X11 - { - SFG_Window *current_window = fgStructure.Window; - - INVOKE_WCB( *window, Display, ( ) ); - fgSetWindow( current_window ); - } + fghRedrawWindow ( window ) ; #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE RedrawWindow( window->Window.Handle, NULL, NULL, @@ -371,8 +354,8 @@ void fgError( const char *fmt, ... ) fprintf( stderr, "freeglut "); if( fgState.ProgramName ) - fprintf (stderr, "(%s): ", fgState.ProgramName); - vfprintf( stderr, fmt, ap ); + fprintf( stderr, "(%s): ", fgState.ProgramName ); + VFPRINTF( stderr, fmt, ap ); fprintf( stderr, "\n" ); va_end( ap ); @@ -392,7 +375,7 @@ void fgWarning( const char *fmt, ... ) fprintf( stderr, "freeglut "); if( fgState.ProgramName ) fprintf( stderr, "(%s): ", fgState.ProgramName ); - vfprintf( stderr, fmt, ap ); + VFPRINTF( stderr, fmt, ap ); fprintf( stderr, "\n" ); va_end( ap ); @@ -410,44 +393,46 @@ void fgWarning( const char *fmt, ... ) * and all other "joystick timer" code can be yanked. * */ -static void fgCheckJoystickCallback( SFG_Window* w, SFG_Enumerator* e) +static void fghCheckJoystickCallback( SFG_Window* w, SFG_Enumerator* e) { if( FETCH_WCB( *w, Joystick ) ) { e->found = GL_TRUE; e->data = w; } - fgEnumSubWindows( w, fgCheckJoystickCallback, e ); + fgEnumSubWindows( w, fghCheckJoystickCallback, e ); } -static int fgHaveJoystick( void ) +static int fghHaveJoystick( void ) { SFG_Enumerator enumerator; + enumerator.found = GL_FALSE; enumerator.data = NULL; - fgEnumWindows( fgCheckJoystickCallback, &enumerator ); + fgEnumWindows( fghCheckJoystickCallback, &enumerator ); return !!enumerator.data; } -static void fgHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e) +static void fghHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e) { if( w->State.Redisplay ) { e->found = GL_TRUE; e->data = w; } - fgEnumSubWindows( w, fgHavePendingRedisplaysCallback, e ); + fgEnumSubWindows( w, fghHavePendingRedisplaysCallback, e ); } -static int fgHavePendingRedisplays (void) +static int fghHavePendingRedisplays (void) { SFG_Enumerator enumerator; + enumerator.found = GL_FALSE; enumerator.data = NULL; - fgEnumWindows( fgHavePendingRedisplaysCallback, &enumerator ); + fgEnumWindows( fghHavePendingRedisplaysCallback, &enumerator ); return !!enumerator.data; } /* * Returns the number of GLUT ticks (milliseconds) till the next timer event. */ -static long fgNextTimer( void ) +static long fghNextTimer( void ) { long ret = INT_MAX; SFG_Timer *timer = fgState.Timers.First; @@ -463,16 +448,18 @@ static long fgNextTimer( void ) * Does the magic required to relinquish the CPU until something interesting * happens. */ -static void fgSleepForEvents( void ) +static void fghSleepForEvents( void ) { long msec; - if( fgState.IdleCallback || fgHavePendingRedisplays( ) ) + if( fgState.IdleCallback || fghHavePendingRedisplays( ) ) return; - msec = fgNextTimer( ); - if( fgHaveJoystick( ) ) /* XXX Use GLUT timers for joysticks... */ - msec = MIN( msec, 10 ); /* XXX Dumb; forces granularity to .01sec */ + msec = fghNextTimer( ); + /* XXX Use GLUT timers for joysticks... */ + /* XXX Dumb; forces granularity to .01sec */ + if( fghHaveJoystick( ) && ( msec < 10 ) ) + msec = 10; #if TARGET_HOST_UNIX_X11 /* @@ -498,8 +485,8 @@ static void fgSleepForEvents( void ) wait.tv_usec = (msec % 1000) * 1000; err = select( socket+1, &fdset, NULL, NULL, &wait ); - if( -1 == err ) - fgWarning ( "freeglut select() error: %d\n", errno ); + if( ( -1 == err ) && ( errno != EINTR ) ) + fgWarning ( "freeglut select() error: %d", errno ); } #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLEVENTS ); @@ -510,7 +497,7 @@ static void fgSleepForEvents( void ) /* * Returns GLUT modifier mask for an XEvent. */ -int fgGetXModifiers( XEvent *event ) +static int fghGetXModifiers( XEvent *event ) { int ret = 0; @@ -547,7 +534,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 ) ) { @@ -693,7 +680,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) break; default: - fgWarning( "Uknown X visibility state: %d", + fgWarning( "Unknown X visibility state: %d", event.xvisibility.state ); break; } @@ -772,93 +759,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; - 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 ); + if( fgCheckActiveMenu( window, button, pressed, + event.xbutton.x_root, event.xbutton.y_root ) ) break; - } /* * Check if there is a mouse or mouse wheel callback hooked to the @@ -868,14 +775,10 @@ void FGAPIENTRY glutMainLoopEvent( void ) ! FETCH_WCB( *window, MouseWheel ) ) break; - fgState.Modifiers = fgGetXModifiers( &event ); + fgState.Modifiers = fghGetXModifiers( &event ); - /* - * Finally execute the mouse or mouse wheel callback - * - * XXX Use a symbolic constant, *not* "4"! ("3, sire!") - */ - if( ( button < 3 ) || ( ! FETCH_WCB( *window, MouseWheel ) ) ) + /* Finally execute the mouse or mouse wheel callback */ + if( ( button < glutDeviceGet ( GLUT_NUM_MOUSE_BUTTONS ) ) || ( ! FETCH_WCB( *window, MouseWheel ) ) ) INVOKE_WCB( *window, Mouse, ( button, pressed ? GLUT_DOWN : GLUT_UP, event.xbutton.x, @@ -895,7 +798,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) * XXX Note that {button} has already been decremeted * XXX in mapping from X button numbering to GLUT. */ - int wheel_number = (button - 3) / 2; + int wheel_number = (button - glutDeviceGet ( GLUT_NUM_MOUSE_BUTTONS )) / 2; int direction = -1; if( button % 2 ) direction = 1; @@ -964,9 +867,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; @@ -974,25 +875,19 @@ 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 ); - fgState.Modifiers = fgGetXModifiers( &event ); + fgState.Modifiers = fghGetXModifiers( &event ); keyboard_cb( asciiCode[ 0 ], event.xkey.x, event.xkey.y ); @@ -1046,7 +941,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) if( special_cb && (special != -1) ) { fgSetWindow( window ); - fgState.Modifiers = fgGetXModifiers( &event ); + fgState.Modifiers = fghGetXModifiers( &event ); special_cb( special, event.xkey.x, event.xkey.y ); fgState.Modifiers = 0xffffffff; } @@ -1068,6 +963,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 ) @@ -1108,7 +1005,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 /* @@ -1124,7 +1021,7 @@ void FGAPIENTRY glutMainLoop( void ) { if ( FETCH_WCB( *window, Visibility ) ) { - SFG_Window *current_window = fgStructure.Window ; + SFG_Window *current_window = fgStructure.CurrentWindow ; INVOKE_WCB( *window, Visibility, ( window->State.Visible ) ); fgSetWindow( current_window ); @@ -1157,7 +1054,7 @@ void FGAPIENTRY glutMainLoop( void ) if( fgState.IdleCallback ) fgState.IdleCallback( ); - fgSleepForEvents( ); + fghSleepForEvents( ); } } @@ -1178,6 +1075,7 @@ void FGAPIENTRY glutMainLoop( void ) */ void FGAPIENTRY glutLeaveMainLoop( void ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutLeaveMainLoop" ); fgState.ExecState = GLUT_EXEC_STATE_STOP ; } @@ -1186,7 +1084,7 @@ void FGAPIENTRY glutLeaveMainLoop( void ) /* * Determine a GLUT modifer mask based on MS-WINDOWS system info. */ -int fgGetWin32Modifiers (void) +static int fghGetWin32Modifiers (void) { return ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) || @@ -1203,10 +1101,14 @@ int fgGetWin32Modifiers (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 ); @@ -1217,7 +1119,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 ); @@ -1316,56 +1219,19 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, case WM_ACTIVATE: if (LOWORD(wParam) != WA_INACTIVE) { - /* glutSetCursor( fgStructure.Window->State.Cursor ); */ -/* printf("WM_ACTIVATE: glutSetCursor( %p, %d)\n", window, +/* printf("WM_ACTIVATE: fgSetCursor( %p, %d)\n", window, window->State.Cursor ); */ - glutSetCursor( window->State.Cursor ); + fgSetCursor( window, window->State.Cursor ); } lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); break; #endif - /* - * 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. - */ 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; - - /* Nuke the cursor AND change it for this window class. */ -#define ZAP_CURSOR(a,b) \ - case a: \ - 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 ) - { - 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 ); - } + fgSetCursor ( window, window->State.Cursor ) ; else lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); break; @@ -1379,7 +1245,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, /* Turn on the visibility in case it was turned off somehow */ window->State.Visible = GL_TRUE; BeginPaint( hWnd, &ps ); - fghRedrawWindowByHandle( hWnd ); + fghRedrawWindow( window ); EndPaint( hWnd, &ps ); break; @@ -1395,6 +1261,16 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, */ return 0; + /* XXX For a future patch: we need a mouse entry event. Unfortunately Windows + * XXX doesn't give us one, so we will probably need a "MouseInWindow" flag in + * XXX the SFG_Window structure. Set it to true to begin with and then have the + * XXX WM_MOUSELEAVE code set it to false. Then when we get a WM_MOUSEMOVE event, + * XXX if the flag is false we invoke the Entry callback and set the flag to true. + */ + case 0x02a2: /* This is the message we get when the mouse is leaving the window */ + INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) ); + break ; + case WM_MOUSEMOVE: { #if TARGET_HOST_WINCE @@ -1404,6 +1280,10 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, window->State.MouseX = LOWORD( lParam ); window->State.MouseY = HIWORD( lParam ); #endif /* TARGET_HOST_WINCE */ + /* Restrict to [-32768, 32767] to match X11 behaviour */ + /* See comment in "freeglut_developer" mailing list 10/4/04 */ + if ( window->State.MouseX > 32767 ) window->State.MouseX -= 65536; + if ( window->State.MouseY > 32767 ) window->State.MouseY -= 65536; if ( window->ActiveMenu ) { @@ -1412,7 +1292,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, break; } - fgState.Modifiers = fgGetWin32Modifiers( ); + fgState.Modifiers = fghGetWin32Modifiers( ); if( ( wParam & MK_LBUTTON ) || ( wParam & MK_MBUTTON ) || @@ -1445,6 +1325,11 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, window->State.MouseY = HIWORD( lParam ); #endif /* TARGET_HOST_WINCE */ + /* Restrict to [-32768, 32767] to match X11 behaviour */ + /* See comment in "freeglut_developer" mailing list 10/4/04 */ + if ( window->State.MouseX > 32767 ) window->State.MouseX -= 65536; + if ( window->State.MouseY > 32767 ) window->State.MouseY -= 65536; + switch( uMsg ) { case WM_LBUTTONDOWN: @@ -1492,79 +1377,32 @@ 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 ) - { - window->State.Redisplay = GL_TRUE; - fgSetWindow( window ); - fgActivateMenu( window, button ); - break; - } + /* Set capture so that the window captures all the mouse messages */ + /* + * XXX - Multiple button support: Under X11, the mouse is not released + * XXX - from the window until all buttons have been released, even if the + * XXX - user presses a button in another window. This will take more + * XXX - code changes than I am up to at the moment (10/5/04). The present + * XXX - is a 90 percent solution. + */ + if ( pressed == GL_TRUE ) + SetCapture ( window->Window.Handle ) ; + else + ReleaseCapture () ; if( ! FETCH_WCB( *window, Mouse ) ) break; fgSetWindow( window ); - fgState.Modifiers = fgGetWin32Modifiers( ); + fgState.Modifiers = fghGetWin32Modifiers( ); INVOKE_WCB( *window, Mouse, @@ -1609,7 +1447,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, break; fgSetWindow( window ); - fgState.Modifiers = fgGetWin32Modifiers( ); + fgState.Modifiers = fghGetWin32Modifiers( ); while( ticks-- ) if( FETCH_WCB( *window, MouseWheel ) ) @@ -1656,7 +1494,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. */ - fgState.Modifiers = fgGetWin32Modifiers( ); + fgState.Modifiers = fghGetWin32Modifiers( ); GetCursorPos( &mouse_pos ); ScreenToClient( window->Window.Handle, &mouse_pos ); @@ -1664,9 +1502,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 ) @@ -1694,9 +1530,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 ) ); @@ -1744,7 +1578,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. */ - fgState.Modifiers = fgGetWin32Modifiers( ); + fgState.Modifiers = fghGetWin32Modifiers( ); GetCursorPos( &mouse_pos ); ScreenToClient( window->Window.Handle, &mouse_pos ); @@ -1782,9 +1616,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 ) ); @@ -1825,7 +1657,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, if( (fgState.KeyRepeat==GLUT_KEY_REPEAT_OFF || window->State.IgnoreKeyRepeat==GL_TRUE) && (HIWORD(lParam) & KF_REPEAT) ) break; - fgState.Modifiers = fgGetWin32Modifiers( ); + fgState.Modifiers = fghGetWin32Modifiers( ); INVOKE_WCB( *window, Keyboard, ( (char)wParam, window->State.MouseX, window->State.MouseY ) @@ -1841,9 +1673,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 */ @@ -1950,7 +1780,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, default: #if _DEBUG - fgWarning( "Unknown wParam type 0x%x\n", wParam ); + fgWarning( "Unknown wParam type 0x%x", wParam ); #endif break; } @@ -1962,9 +1792,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; }