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

Fixing the warning message when "glutGetModifiers" is called from within the special key callback; also removing some unused key codes in the special key processing code.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1338 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-06-09 19:43:44 +00:00
parent 0f6399c878
commit 79911c4228
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,6 +241,8 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
if ( window ) if ( window )
{ {
fgState.Modifiers = fgPlatformGetModifiers( );
/* Checking for CTRL, ALT, and SHIFT key positions: Key Down! */ /* Checking for CTRL, ALT, and SHIFT key positions: Key Down! */
if ( !lControl && GetAsyncKeyState ( VK_LCONTROL ) ) if ( !lControl && GetAsyncKeyState ( VK_LCONTROL ) )
{ {
@ -350,6 +352,8 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
rAlt = 0; rAlt = 0;
} }
fgState.Modifiers = INVALID_MODIFIERS;
} }
switch( uMsg ) switch( uMsg )
@ -789,12 +793,6 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
KEY( VK_RIGHT, GLUT_KEY_RIGHT ); KEY( VK_RIGHT, GLUT_KEY_RIGHT );
KEY( VK_DOWN, GLUT_KEY_DOWN ); KEY( VK_DOWN, GLUT_KEY_DOWN );
KEY( VK_INSERT, GLUT_KEY_INSERT ); KEY( VK_INSERT, GLUT_KEY_INSERT );
KEY( VK_LCONTROL, GLUT_KEY_CTRL_L );
KEY( VK_RCONTROL, GLUT_KEY_CTRL_R );
KEY( VK_LSHIFT, GLUT_KEY_SHIFT_L );
KEY( VK_RSHIFT, GLUT_KEY_SHIFT_R );
KEY( VK_LMENU, GLUT_KEY_ALT_L );
KEY( VK_RMENU, GLUT_KEY_ALT_R );
case VK_DELETE: case VK_DELETE:
/* The delete key should be treated as an ASCII keypress: */ /* The delete key should be treated as an ASCII keypress: */
@ -881,12 +879,6 @@ LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
KEY( VK_RIGHT, GLUT_KEY_RIGHT ); KEY( VK_RIGHT, GLUT_KEY_RIGHT );
KEY( VK_DOWN, GLUT_KEY_DOWN ); KEY( VK_DOWN, GLUT_KEY_DOWN );
KEY( VK_INSERT, GLUT_KEY_INSERT ); KEY( VK_INSERT, GLUT_KEY_INSERT );
KEY( VK_LCONTROL, GLUT_KEY_CTRL_L );
KEY( VK_RCONTROL, GLUT_KEY_CTRL_R );
KEY( VK_LSHIFT, GLUT_KEY_SHIFT_L );
KEY( VK_RSHIFT, GLUT_KEY_SHIFT_R );
KEY( VK_LMENU, GLUT_KEY_ALT_L );
KEY( VK_RMENU, GLUT_KEY_ALT_R );
case VK_DELETE: case VK_DELETE:
/* The delete key should be treated as an ASCII keypress: */ /* The delete key should be treated as an ASCII keypress: */