X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_main.c;h=134ffb3071ccb7cffdb71f3e25ad35d26295f187;hb=0fd65e65061141e7317caba38801580374f09d0b;hp=06da108511dff5eaa50c73af1f4d8342a72f7ee1;hpb=a630da4d7b24b4147120facf3f7a6a6839d31fb5;p=freeglut diff --git a/src/freeglut_main.c b/src/freeglut_main.c index 06da108..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" @@ -42,41 +37,18 @@ #include #elif TARGET_HOST_WIN32 #elif TARGET_HOST_WINCE - // including gx.h does only work in c++ (thanks MS...), - // so we define this on our own... -struct GXKeyList { - short vkUp; // key for up - POINT ptUp; // x,y position of key/button. Not on screen but in screen coordinates. - short vkDown; - POINT ptDown; - short vkLeft; - POINT ptLeft; - short vkRight; - POINT ptRight; - short vkA; - POINT ptA; - short vkB; - POINT ptB; - short vkC; - POINT ptC; - short vkStart; - POINT ptStart; -}; -/*__declspec(dllimport) struct GXKeyList GXGetDefaultKeys(int iOptions); -__declspec(dllimport) int GXOpenInput(); -#include "my_gx.h"*/ - -extern void wince_GetDefaultKeys(void* nData, int iOptions); -extern void wince_OpenInput(); - -/*void wince_GetDefaultKeys(void* nData, int iOptions) -{ - *(struct GXKeyList*)nData = GXGetDefaultKeys(iOptions); -} -void wince_OpenInput() -{ - GXOpenInput(); -}*/ + +typedef struct GXDisplayProperties GXDisplayProperties; +typedef struct GXKeyList GXKeyList; +#include + +typedef struct GXKeyList (*GXGETDEFAULTKEYS)(int); +typedef int (*GXOPENINPUT)(); + +GXGETDEFAULTKEYS GXGetDefaultKeys_ = NULL; +GXOPENINPUT GXOpenInput_ = NULL; + +struct GXKeyList gxKeyList; #endif @@ -107,12 +79,10 @@ void wince_OpenInput() * 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* window = fgWindowByHandle( handle ); freeglut_return_if_fail( window != NULL ); @@ -126,7 +96,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 @@ -134,24 +105,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 ); } /* @@ -163,10 +139,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 ); @@ -204,9 +177,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.Window; + freeglut_return_if_fail( window ); freeglut_return_if_fail( FETCH_WCB ( *window, Display ) ); @@ -214,23 +188,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 ); } /* @@ -239,34 +212,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, @@ -433,44 +385,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; @@ -486,16 +440,16 @@ 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( ); + if( fghHaveJoystick( ) ) /* XXX Use GLUT timers for joysticks... */ + msec = MIN( msec, 10 ); /* XXX Dumb; forces granularity to .01sec */ #if TARGET_HOST_UNIX_X11 /* @@ -503,7 +457,7 @@ static void fgSleepForEvents( void ) * it is possible to have our socket drained but still have * unprocessed events. (Or, this may just be normal with * X, anyway?) We do non-trivial processing of X events - * after tham in event-reading loop, in any case, so we + * after the event-reading loop, in any case, so we * need to allow that we may have an empty socket but non- * empty event queue. */ @@ -522,7 +476,7 @@ static void fgSleepForEvents( void ) err = select( socket+1, &fdset, NULL, NULL, &wait ); if( -1 == err ) - fgWarning ( "freeglut select() error: %d\n", errno ); + fgWarning ( "freeglut select() error: %d", errno ); } #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLEVENTS ); @@ -533,7 +487,7 @@ static void fgSleepForEvents( void ) /* * Returns GLUT modifier mask for an XEvent. */ -int fgGetXModifiers( XEvent *event ) +static int fghGetXModifiers( XEvent *event ) { int ret = 0; @@ -560,9 +514,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) SFG_Window* window; XEvent event; - /* - * This code was repeated constantly, so here it goes into a definition: - */ + /* This code was repeated constantly, so here it goes into a definition: */ #define GETWINDOW(a) \ window = fgWindowByHandle( event.a.window ); \ if( window == NULL ) \ @@ -572,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 ) ) { @@ -581,9 +533,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) switch( event.type ) { case ClientMessage: - /* - * Destroy the window when the WM_DELETE_WINDOW message arrives - */ + /* Destroy the window when the WM_DELETE_WINDOW message arrives */ if( (Atom) event.xclient.data.l[ 0 ] == fgDisplay.DeleteWindow ) { GETWINDOW( xclient ); @@ -595,8 +545,9 @@ void FGAPIENTRY glutMainLoopEvent( void ) fgDeinitialize( ); exit( 0 ); } + else if( fgState.ActionOnWindowClose == GLUT_ACTION_GLUTMAINLOOP_RETURNS ) + fgState.ExecState = GLUT_EXEC_STATE_STOP; - fgState.ExecState = GLUT_EXEC_STATE_STOP; return; } break; @@ -719,7 +670,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) break; default: - fgWarning( "Uknown X visibility state: %d", + fgWarning( "Unknown X visibility state: %d", event.xvisibility.state ); break; } @@ -798,97 +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; - 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 @@ -898,7 +765,7 @@ 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 @@ -938,9 +805,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) ); } - /* - * Trash the modifiers state - */ + /* Trash the modifiers state */ fgState.Modifiers = 0xffffffff; } break; @@ -968,10 +833,13 @@ void FGAPIENTRY glutMainLoopEvent( void ) char keys[32]; XQueryKeymap( fgDisplay.Display, keys ); /* Look at X11 keystate to detect repeat mode */ - if ( keys[event.xkey.keycode>>3] & (1<<(event.xkey.keycode%8)) ) - window->State.KeyRepeating = GL_TRUE; - else - window->State.KeyRepeating = GL_FALSE; + if ( event.xkey.keycode<256 ) /* XQueryKeymap is limited to 256 keycodes */ + { + if ( keys[event.xkey.keycode>>3] & (1<<(event.xkey.keycode%8)) ) + window->State.KeyRepeating = GL_TRUE; + else + window->State.KeyRepeating = GL_FALSE; + } } } else @@ -993,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; @@ -1003,25 +869,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 ); @@ -1075,7 +935,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; } @@ -1097,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 ) @@ -1106,7 +968,9 @@ void FGAPIENTRY glutMainLoopEvent( void ) fgDeinitialize( ); exit( 0 ); } - fgState.ExecState = GLUT_EXEC_STATE_STOP; + else if( fgState.ActionOnWindowClose == GLUT_ACTION_GLUTMAINLOOP_RETURNS ) + fgState.ExecState = GLUT_EXEC_STATE_STOP; + return; } @@ -1135,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 /* @@ -1184,7 +1048,7 @@ void FGAPIENTRY glutMainLoop( void ) if( fgState.IdleCallback ) fgState.IdleCallback( ); - fgSleepForEvents( ); + fghSleepForEvents( ); } } @@ -1205,6 +1069,7 @@ void FGAPIENTRY glutMainLoop( void ) */ void FGAPIENTRY glutLeaveMainLoop( void ) { + FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutLeaveMainLoop" ); fgState.ExecState = GLUT_EXEC_STATE_STOP ; } @@ -1213,7 +1078,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 ) || @@ -1230,10 +1095,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 ); @@ -1242,11 +1111,10 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, switch( uMsg ) { case WM_CREATE: - /* - * The window structure is passed as the creation structure paramter... - */ + /* 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 ); @@ -1299,8 +1167,21 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, ReleaseDC( window->Window.Handle, window->Window.Device ); #if TARGET_HOST_WINCE - // Take over button handling - wince_OpenInput(); + /* Take over button handling */ + { + HINSTANCE dxDllLib=LoadLibrary(_T("gx.dll")); + if (dxDllLib) + { + GXGetDefaultKeys_=(GXGETDEFAULTKEYS)GetProcAddress(dxDllLib, _T("?GXGetDefaultKeys@@YA?AUGXKeyList@@H@Z")); + GXOpenInput_=(GXOPENINPUT)GetProcAddress(dxDllLib, _T("?GXOpenInput@@YAHXZ")); + } + + if(GXOpenInput_) + (*GXOpenInput_)(); + if(GXGetDefaultKeys_) + gxKeyList = (*GXGetDefaultKeys_)(GX_LANDSCAPEKEYS); + } + #endif /* TARGET_HOST_WINCE */ break; @@ -1325,7 +1206,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, break; #if 0 case WM_SETFOCUS: - printf("WM_SETFOCUS: %p\n", window ); +/* printf("WM_SETFOCUS: %p\n", window ); */ lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); break; @@ -1333,8 +1214,8 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, if (LOWORD(wParam) != WA_INACTIVE) { /* glutSetCursor( fgStructure.Window->State.Cursor ); */ - printf("WM_ACTIVATE: glutSetCursor( %p, %d)\n", window, - window->State.Cursor ); +/* printf("WM_ACTIVATE: glutSetCursor( %p, %d)\n", window, + window->State.Cursor ); */ glutSetCursor( window->State.Cursor ); } @@ -1347,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: @@ -1363,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 ) { @@ -1395,7 +1277,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; @@ -1420,6 +1302,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 ) { @@ -1428,7 +1314,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, break; } - fgState.Modifiers = fgGetWin32Modifiers( ); + fgState.Modifiers = fghGetWin32Modifiers( ); if( ( wParam & MK_LBUTTON ) || ( wParam & MK_MBUTTON ) || @@ -1461,6 +1347,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: @@ -1508,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 ) { @@ -1576,11 +1416,24 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, 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, @@ -1625,7 +1478,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 ) ) @@ -1662,9 +1515,6 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, case WM_SYSKEYDOWN: case WM_KEYDOWN: { -#if TARGET_HOST_WINCE - struct GXKeyList gxKeyList; -#endif /* TARGET_HOST_WINCE */ int keypress = -1; POINT mouse_pos ; @@ -1675,7 +1525,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 ); @@ -1683,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 ) @@ -1713,19 +1561,15 @@ 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 ) ); } #if TARGET_HOST_WINCE - if(!(lParam & 0x40000000)) // Prevent auto-repeat + if(!(lParam & 0x40000000)) /* Prevent auto-repeat */ { - wince_GetDefaultKeys(&gxKeyList, 0x03); - if(wParam==(unsigned)gxKeyList.vkRight) keypress = GLUT_KEY_RIGHT; else if(wParam==(unsigned)gxKeyList.vkLeft) @@ -1765,7 +1609,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 ); @@ -1803,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 ) ); @@ -1846,7 +1688,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 ) @@ -1862,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 */ @@ -1906,11 +1746,15 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, { /* * 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. + * The commands are passed in through the "wParam" parameter: + * The least significant digit seems to be which edge of the window + * is being used for a resize event: + * 4 3 5 + * 1 2 + * 7 6 8 + * Congratulations and thanks to Richard Rauch for figuring this out.. */ - switch ( lParam ) + switch ( wParam & 0xfff0 ) { case SC_SIZE : break ; @@ -1964,6 +1808,12 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, case SC_HOTKEY : break ; + + default: +#if _DEBUG + fgWarning( "Unknown wParam type 0x%x", wParam ); +#endif + break; } } #endif /* !TARGET_HOST_WINCE */ @@ -1973,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; }