FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now implemented properly working mouse entry and exit (EntryFunc callback) support on windows

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1520 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2013-02-27 07:52:55 +00:00
parent eccb722d20
commit 3eda176577
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freeglut/freeglut/src/fg_internal.h
View File

@ -383,7 +383,7 @@ struct tagSFG_WindowState
int Width; /* Window's width in pixels */ int Width; /* Window's width in pixels */
int Height; /* The same about the height */ int Height; /* The same about the height */
SFG_PlatformWindowState pWState; /* Window width/height (X11) or rectangle/style (Windows) from before a resize */ SFG_PlatformWindowState pWState; /* Window width/height (X11) or rectangle/style (Windows) from before a resize, and other stuff only needed on specific platforms */
GLboolean Redisplay; /* Do we have to redisplay? */ GLboolean Redisplay; /* Do we have to redisplay? */
GLboolean Visible; /* Is the window visible now */ GLboolean Visible; /* Is the window visible now */

2
freeglut/freeglut/src/mswin/fg_internal_mswin.h
View File

@ -95,6 +95,8 @@ struct tagSFG_PlatformWindowState
DWORD OldStyle; /* window style - stored before the window is made fullscreen */ DWORD OldStyle; /* window style - stored before the window is made fullscreen */
DWORD OldStyleEx; /* window Ex style - stored before the window is made fullscreen */ DWORD OldStyleEx; /* window Ex style - stored before the window is made fullscreen */
BOOL OldMaximized; /* window maximized state - stored before the window is made fullscreen */ BOOL OldMaximized; /* window maximized state - stored before the window is made fullscreen */
GLboolean MouseTracking; /* Needed for generating GLUT_ENTERED and GLUT_LEFT entry func callbacks on windows */
}; };

37
freeglut/freeglut/src/mswin/fg_main_mswin.c
View File

@ -518,18 +518,14 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
SetActiveWindow( window->Window.Handle ); SetActiveWindow( window->Window.Handle );
INVOKE_WCB( *window, Entry, ( GLUT_ENTERED ) );
UpdateWindow ( hWnd ); UpdateWindow ( hWnd );
break; break;
case WM_KILLFOCUS: case WM_KILLFOCUS:
{ {
SFG_Window* saved_window = fgStructure.CurrentWindow;
/* printf("WM_KILLFOCUS: %p\n", window ); */ /* printf("WM_KILLFOCUS: %p\n", window ); */
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
fgSetWindow(saved_window);
/* Check if there are any open menus that need to be closed */ /* Check if there are any open menus that need to be closed */
fgPlatformCheckMenuDeactivate(); fgPlatformCheckMenuDeactivate();
@ -553,11 +549,39 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
case WM_SETCURSOR: case WM_SETCURSOR:
/* printf ( "Cursor event %x %x %x %x\n", window, window->State.Cursor, lParam, wParam ) ; */ /* printf ( "Cursor event %x %x %x %x\n", window, window->State.Cursor, lParam, wParam ) ; */
if( LOWORD( lParam ) == HTCLIENT ) if( LOWORD( lParam ) == HTCLIENT )
fgSetCursor ( window, window->State.Cursor ) ; {
if (!window->State.pWState.MouseTracking)
{
TRACKMOUSEEVENT tme;
/* Cursor just entered window, set cursor look, invoke callback and start tracking so that we get a WM_MOUSELEAVE message */
fgSetCursor ( window, window->State.Cursor ) ;
INVOKE_WCB( *window, Entry, ( GLUT_ENTERED ) );
tme.cbSize = sizeof(TRACKMOUSEEVENT);
tme.dwFlags = TME_LEAVE;
tme.hwndTrack = window->Window.Handle;
TrackMouseEvent(&tme);
window->State.pWState.MouseTracking = GL_TRUE;
}
}
else else
/* Only pass non-client WM_SETCURSOR to DefWindowProc, or we get WM_SETCURSOR on parents of children as well */
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
break; break;
case WM_MOUSELEAVE:
{
SFG_Window* saved_window = fgStructure.CurrentWindow;
INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
fgSetWindow(saved_window);
window->State.pWState.MouseTracking = GL_FALSE;
lRet = 0; /* As per docs, must return zero */
}
break;
case WM_SHOWWINDOW: case WM_SHOWWINDOW:
window->State.Visible = GL_TRUE; window->State.Visible = GL_TRUE;
window->State.Redisplay = GL_TRUE; window->State.Redisplay = GL_TRUE;
@ -828,8 +852,7 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
case WM_CAPTURECHANGED: case WM_CAPTURECHANGED:
/* User has finished resizing the window, force a redraw */ /* User has finished resizing the window, force a redraw */
INVOKE_WCB( *window, Display, ( ) ); INVOKE_WCB( *window, Display, ( ) );
lRet = 0; /* Per docs, should return zero */
/*lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ); */
break; 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 */