X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=freeglut-1.3%2Ffreeglut_main.c;h=1c11f0d30801079b6250992b6fe770684b6414df;hb=9ddfa4b5ee92933e7ff826ea6685cab44d7a04cd;hp=9d982845c2ba97bcda048478dd0a2f8a2d0d14b5;hpb=9777fcaf88f0f791fdd6b78f86fde4ac066d1c1e;p=freeglut diff --git a/freeglut-1.3/freeglut_main.c b/freeglut-1.3/freeglut_main.c index 9d98284..1c11f0d 100644 --- a/freeglut-1.3/freeglut_main.c +++ b/freeglut-1.3/freeglut_main.c @@ -447,7 +447,7 @@ static void fgCleanUpGlutsMess( void ) /* -- INTERFACE FUNCTIONS -------------------------------------------------- */ /* - * Executes a single iteration in the FreeGLUT processing loop. + * Executes a single iteration in the freeglut processing loop. */ void FGAPIENTRY glutMainLoopEvent( void ) { @@ -476,6 +476,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) * Grab the next event to be processed... */ XNextEvent( fgDisplay.Display, &event ); + window = fgWindowByHandle ( event.xany.window ) ; /* * Check the event's type @@ -495,7 +496,8 @@ void FGAPIENTRY glutMainLoopEvent( void ) /* * Call the window closure callback, remove from the structure, etc. */ - fgAddToWindowDestroyList ( window, FALSE ); + fgStructure.Window = window ; +/* fgAddToWindowDestroyList ( window, FALSE ); */ break; @@ -505,6 +507,17 @@ void FGAPIENTRY glutMainLoopEvent( void ) */ if( (Atom) event.xclient.data.l[ 0 ] == fgDisplay.DeleteWindow ) { + fgStructure.Window = window ; + + /* + * Call the XWindows functions to close the window + */ + fgCloseWindow ( window ) ; + + /* + * Call the window closure callback, remove from the structure, etc. + */ + fgAddToWindowDestroyList ( window, FALSE ); } break; @@ -519,7 +532,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) * We are too dumb to process partial exposes... */ if( event.xexpose.count == 0 ) - fghRedrawWindowByHandle( event.xexpose.window ); + fghRedrawWindowByHandle( window->Window.Handle ); break; case ConfigureNotify: @@ -546,8 +559,6 @@ void FGAPIENTRY glutMainLoopEvent( void ) /* * The window's visiblity might have changed */ - GETWINDOW( xvisibility ); - /* * Break now if no window status callback has been hooked to that window */ @@ -598,7 +609,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) /* * Mouse is over one of our windows */ - GETWINDOW( xcrossing ); GETMOUSE( xcrossing ); + GETMOUSE( xcrossing ); /* * Is there an entry callback hooked to the window? @@ -618,7 +629,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) /* * Mouse is no longer over one of our windows */ - GETWINDOW( xcrossing ); GETMOUSE( xcrossing ); + GETMOUSE( xcrossing ); /* * Is there an entry callback hooked to the window? @@ -638,7 +649,12 @@ void FGAPIENTRY glutMainLoopEvent( void ) /* * The mouse cursor was moved... */ - GETWINDOW( xmotion ); GETMOUSE( xmotion ); + GETMOUSE( xmotion ); + + /* + * Set the current window + */ + fgStructure.Window = window ; /* * What kind of a movement was it? @@ -687,7 +703,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) * A mouse button has been pressed or released. Traditionally, * break if the window was found within the freeglut structures. */ - GETWINDOW( xbutton ); GETMOUSE( xbutton ); + GETMOUSE( xbutton ); /* * GLUT API assumes that you can't have more than three mouse buttons, so: @@ -819,7 +835,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) /* * A key has been pressed, find the window that had the focus: */ - GETWINDOW( xkey ); GETMOUSE( xkey ); + GETMOUSE( xkey ); if( event.type == KeyPress ) { @@ -1035,7 +1051,7 @@ void FGAPIENTRY glutMainLoopEvent( void ) } /* - * Enters the FreeGLUT processing loop. Stays until the "ExecState" changes to "GLUT_EXEC_STATE_STOP". + * Enters the freeglut processing loop. Stays until the "ExecState" changes to "GLUT_EXEC_STATE_STOP". */ void FGAPIENTRY glutMainLoop( void ) { @@ -1110,7 +1126,7 @@ void FGAPIENTRY glutMainLoop( void ) } /* - * Leaves the FreeGLUT processing loop. + * Leaves the freeglut processing loop. */ void FGAPIENTRY glutLeaveMainLoop( void ) { @@ -1189,7 +1205,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara case WM_ACTIVATE: if (LOWORD(wParam) != WA_INACTIVE) { - //glutSetCursor( fgStructure.Window->State.Cursor ); + /* glutSetCursor( fgStructure.Window->State.Cursor ); */ printf("WM_ACTIVATE: glutSetCursor( %p, %d)\n", window, window->State.Cursor ); glutSetCursor( window->State.Cursor ); @@ -1208,10 +1224,10 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara (fgStructure.Window->State.Cursor == GLUT_CURSOR_NONE)) SetCursor( NULL ); #else - // Set the cursor AND change it for this window class. + /* 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. + /* Nuke the cursor AND change it for this window class. */ # define ZAP_CURSOR(a,b) case a: SetCursor( NULL ); \ break; @@ -1228,7 +1244,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara 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 ); + /* MAP_CURSOR( GLUT_CURSOR_NONE, IDC_NO ); */ ZAP_CURSOR( GLUT_CURSOR_NONE, NULL ); default: @@ -1511,6 +1527,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara case WM_KEYDOWN: { int keypress = -1; + POINT mouse_pos ; /* * Ignore the automatic key repetition if needed: @@ -1533,6 +1550,15 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara ( ( (GetKeyState( VK_LMENU ) < 0 ) || ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); /* + * Set the mouse position + */ + GetCursorPos ( &mouse_pos ) ; + ScreenToClient ( window->Window.Handle, &mouse_pos ) ; + + window->State.MouseX = mouse_pos.x ; + window->State.MouseY = mouse_pos.y ; + + /* * Convert the Win32 keystroke codes to GLUTtish way */ # define KEY(a,b) case a: keypress = b; break; @@ -1587,6 +1613,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara case WM_KEYUP: { int keypress = -1; + POINT mouse_pos ; /* * Set the current window @@ -1603,6 +1630,15 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara ( ( (GetKeyState( VK_LMENU ) < 0 ) || ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); /* + * Set the mouse position + */ + GetCursorPos ( &mouse_pos ) ; + ScreenToClient ( window->Window.Handle, &mouse_pos ) ; + + window->State.MouseX = mouse_pos.x ; + window->State.MouseY = mouse_pos.y ; + + /* * Convert the Win32 keystroke codes to GLUTtish way. "KEY(a,b)" was defined under "WM_KEYDOWN" */ @@ -1632,12 +1668,24 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara */ if( window->Callbacks.KeyboardUp != NULL ) window->Callbacks.KeyboardUp( 127, window->State.MouseX, window->State.MouseY ); + + break ; default: - /* - * Call the KeyboardUp callback for a regular character if there is one. - */ - if( window->Callbacks.KeyboardUp != NULL ) - window->Callbacks.KeyboardUp( wParam, window->State.MouseX, window->State.MouseY ); + { + /* + * Call the KeyboardUp callback for a regular character if there is one. + */ + BYTE state[ 256 ]; + WORD code[ 2 ]; + + GetKeyboardState(state); + + if ( ToAscii( wParam, 0, state, code, 0 ) == 1 ) + wParam=code[ 0 ]; + + if( window->Callbacks.KeyboardUp != NULL ) + window->Callbacks.KeyboardUp( (char)wParam, window->State.MouseX, window->State.MouseY ); + } } /* @@ -1683,7 +1731,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara /* * Have the special callback executed: */ - window->Callbacks.Keyboard( wParam, window->State.MouseX, window->State.MouseY ); + window->Callbacks.Keyboard( (char)wParam, window->State.MouseX, window->State.MouseY ); /* * Thrash the modifiers register now @@ -1697,7 +1745,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara if ( window->Callbacks.Display ) window->Callbacks.Display () ; -// lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ) ; +/* lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ) ; */ break ; /*