X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_main.c;h=5ad233c96ec8f68662bf0cd2f01c29f099f9e0a1;hb=fc3fee8fa830aaba7aaa585cb021d5867c89385d;hp=25c8e38ba35022776c0348078b9a62d397f68823;hpb=0b29e3bf6d3736fa2dac4dfd792db622d490f004;p=freeglut diff --git a/src/freeglut_main.c b/src/freeglut_main.c index 25c8e38..5ad233c 100644 --- a/src/freeglut_main.c +++ b/src/freeglut_main.c @@ -42,41 +42,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 @@ -126,7 +103,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 +112,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 +146,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 ); @@ -503,7 +483,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. */ @@ -560,9 +540,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 ) \ @@ -581,9 +559,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 +571,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; @@ -873,17 +850,13 @@ void FGAPIENTRY glutMainLoopEvent( void ) break; } - /* - * No active menu, let's check whether we need to activate one. - */ + /* 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. - */ + /* XXX Posting a requisite Redisplay seems bogus. */ window->State.Redisplay = GL_TRUE; fgSetWindow( window ); fgActivateMenu( window, button ); @@ -938,9 +911,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) ); } - /* - * Trash the modifiers state - */ + /* Trash the modifiers state */ fgState.Modifiers = 0xffffffff; } break; @@ -1109,7 +1080,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; } @@ -1245,9 +1218,7 @@ 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 ); @@ -1302,8 +1273,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; @@ -1328,7 +1312,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; @@ -1336,8 +1320,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 ); } @@ -1665,9 +1649,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 ; @@ -1725,10 +1706,8 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, } #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) @@ -1909,11 +1888,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 ; @@ -1967,6 +1950,12 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, case SC_HOTKEY : break ; + + default: +#if _DEBUG + fgWarning( "Unknown wParam type 0x%x\n", wParam ); +#endif + break; } } #endif /* !TARGET_HOST_WINCE */