projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added OpenGL 3.0 context creation API entries
[freeglut]
/
src
/
freeglut_main.c
diff --git
a/src/freeglut_main.c
b/src/freeglut_main.c
index
44876f2
..
1b75e7d
100644
(file)
--- a/
src/freeglut_main.c
+++ b/
src/freeglut_main.c
@@
-1290,7
+1290,10
@@
void FGAPIENTRY glutMainLoopEvent( void )
/* Cease processing this event if it is auto repeated */
if (window->State.KeyRepeating)
/* Cease processing this event if it is auto repeated */
if (window->State.KeyRepeating)
+ {
+ if (event.type == KeyPress) window->State.KeyRepeating = GL_FALSE;
break;
break;
+ }
if( event.type == KeyPress )
{
if( event.type == KeyPress )
{
@@
-1389,6
+1392,10
@@
void FGAPIENTRY glutMainLoopEvent( void )
case ReparentNotify:
break; /* XXX Should disable this event */
case ReparentNotify:
break; /* XXX Should disable this event */
+ /* Not handled */
+ case GravityNotify:
+ break;
+
default:
fgWarning ("Unknown X event type: %d\n", event.type);
break;
default:
fgWarning ("Unknown X event type: %d\n", event.type);
break;
@@
-1545,7
+1552,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
{
SFG_Window* window;
PAINTSTRUCT ps;
{
SFG_Window* window;
PAINTSTRUCT ps;
- LONG lRet = 1;
+ LRESULT lRet = 1;
FREEGLUT_INTERNAL_ERROR_EXIT_IF_NOT_INITIALISED ( "Event Handler" ) ;
FREEGLUT_INTERNAL_ERROR_EXIT_IF_NOT_INITIALISED ( "Event Handler" ) ;
@@
-2085,7
+2092,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
GetKeyboardState( state );
GetKeyboardState( state );
- if( ToAscii( wParam, 0, state, code, 0 ) == 1 )
+ if( ToAscii( (UINT)wParam, 0, state, code, 0 ) == 1 )
wParam=code[ 0 ];
INVOKE_WCB( *window, KeyboardUp,
wParam=code[ 0 ];
INVOKE_WCB( *window, KeyboardUp,
@@
-2233,6
+2240,17
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
case SC_HOTKEY :
break ;
case SC_HOTKEY :
break ;
+#if(WINVER >= 0x0400)
+ case SC_DEFAULT :
+ break ;
+
+ case SC_MONITORPOWER :
+ break ;
+
+ case SC_CONTEXTHELP :
+ break ;
+#endif /* WINVER >= 0x0400 */
+
default:
#if _DEBUG
fgWarning( "Unknown wParam type 0x%x", wParam );
default:
#if _DEBUG
fgWarning( "Unknown wParam type 0x%x", wParam );