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

win API docs say that defWndProc must be called for system keydown/keyup

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1506 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2013-02-26 15:20:18 +00:00
parent cf6e2a419c
commit a6e021db4a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,7 @@ static int fgPlatformGetModifiers (void)
( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 ); ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 );
} }
static void fghKeyPress(SFG_Window *window, GLboolean keydown, WPARAM wParam, LPARAM lParam) static LRESULT fghKeyPress(SFG_Window *window, UINT uMsg, GLboolean keydown, WPARAM wParam, LPARAM lParam)
{ {
static unsigned char lControl = 0, lShift = 0, lAlt = 0, static unsigned char lControl = 0, lShift = 0, lAlt = 0,
rControl = 0, rShift = 0, rAlt = 0; rControl = 0, rShift = 0, rAlt = 0;
@ -180,7 +180,7 @@ static void fghKeyPress(SFG_Window *window, GLboolean keydown, WPARAM wParam, LP
/* if keydown, check for repeat */ /* if keydown, check for repeat */
if( keydown && ( fgState.KeyRepeat==GLUT_KEY_REPEAT_OFF || window->State.IgnoreKeyRepeat==GL_TRUE ) && (HIWORD(lParam) & KF_REPEAT) ) if( keydown && ( fgState.KeyRepeat==GLUT_KEY_REPEAT_OFF || window->State.IgnoreKeyRepeat==GL_TRUE ) && (HIWORD(lParam) & KF_REPEAT) )
return; return 1;
/* Remember the current modifiers state so user can query it from their callback */ /* Remember the current modifiers state so user can query it from their callback */
fgState.Modifiers = fgPlatformGetModifiers( ); fgState.Modifiers = fgPlatformGetModifiers( );
@ -315,6 +315,12 @@ static void fghKeyPress(SFG_Window *window, GLboolean keydown, WPARAM wParam, LP
); );
fgState.Modifiers = INVALID_MODIFIERS; fgState.Modifiers = INVALID_MODIFIERS;
/* SYSKEY events should be sent to default window proc for system to handle them */
if (uMsg==WM_SYSKEYDOWN || uMsg==WM_SYSKEYUP)
return DefWindowProc( window->Window.Handle, uMsg, wParam, lParam );
else
return 1;
} }
/* /*
@ -787,14 +793,14 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
case WM_KEYDOWN: case WM_KEYDOWN:
if (child_window) if (child_window)
window = child_window; window = child_window;
fghKeyPress(window,GL_TRUE,wParam,lParam); lRet = fghKeyPress(window,uMsg,GL_TRUE,wParam,lParam);
break; break;
case WM_SYSKEYUP: case WM_SYSKEYUP:
case WM_KEYUP: case WM_KEYUP:
if (child_window) if (child_window)
window = child_window; window = child_window;
fghKeyPress(window,GL_FALSE,wParam,lParam); lRet = fghKeyPress(window,uMsg,GL_FALSE,wParam,lParam);
break; break;
case WM_SYSCHAR: case WM_SYSCHAR: