- freeglut_return_if_fail( window->Callbacks.Display != NULL );
+
+ /*
+ * XXX Other than clearing the Redisplay flag or not,
+ * XXX we may as well rely on the INVOK_WCB() doing this
+ * XXX pointer-check.
+ * XXX
+ * XXX If we do not invoke the display because the pointer
+ * XXX is not defined (should never happen, really), then
+ * XXX we may enter an infinite busy-loop trying to update
+ * XXX the window. Similarly, if we skip because the window
+ * XXX is not visible. However, if the window becomes visible
+ * XXX at a later time, the window should get its callback
+ * XXX invoked. I would recommend removing the first check,
+ * XXX and making the second check only affect whether the
+ * XXX callback is invoked---but always clear the flag, if
+ * XXX the {window} pointer is defined.
+ */
+ freeglut_return_if_fail( FETCH_WCB( *window, Display ) );
- if( (window->Callbacks.Display != NULL) &&
- (window->State.Redisplay == TRUE) &&
- (window->State.Visible == TRUE) )
+ /*
+ * XXX Do we need/want to check the callback pointer here?
+ * XXX INVOKE_WCB() will check for us. Arguably, the
+ * XXX Redisplay status flag should be cleared regardless
+ * XXX of any concern but that {window} is a valid pointer
+ * XXX (which this function is assuming anyway).
+ * XXX Especially since old GLUT wouldn't even enter its main
+ * XXX loop if you didn't have a display callback defined...
+ */
+ if( ( FETCH_WCB( *window, Display ) ) &&
+ ( window->State.Redisplay == TRUE ) &&
+ ( window->State.Visible == TRUE ) )
- window->Callbacks.Display();
- fgSetWindow( current_window ) ;
+ INVOKE_WCB( *window, Display, ( ) );
+ fgSetWindow( current_window );
- if( (window->Callbacks.Display != NULL) &&
- (window->State.Redisplay == TRUE) &&
- (window->State.Visible == TRUE) )
+ /*
+ * XXX See above comment about the Redisplay flag...
+ */
+ if( ( FETCH_WCB( *window, Display ) ) &&
+ ( window->State.Redisplay == TRUE ) &&
+ ( window->State.Visible == TRUE ) )
- RedrawWindow(
- window->Window.Handle, NULL, NULL,
- RDW_NOERASE | RDW_INTERNALPAINT | RDW_INVALIDATE | RDW_UPDATENOW
+ RedrawWindow(
+ window->Window.Handle, NULL, NULL,
+ RDW_NOERASE | RDW_INTERNALPAINT | RDW_INVALIDATE | RDW_UPDATENOW
static void fghcbCheckJoystickPolls( SFG_Window *window,
SFG_Enumerator *enumerator )
{
static void fghcbCheckJoystickPolls( SFG_Window *window,
SFG_Enumerator *enumerator )
{
return;
socket = ConnectionNumber( fgDisplay.Display );
FD_ZERO( &fdset );
FD_SET( socket, &fdset );
return;
socket = ConnectionNumber( fgDisplay.Display );
FD_ZERO( &fdset );
FD_SET( socket, &fdset );
+#if TARGET_HOST_UNIX_X11
+/*
+ * Returns GLUT modifier mask for an XEvent.
+ */
+int fgGetXModifiers( XEvent *event )
+{
+ int ret = 0;
+
+ if( event->xkey.state & ( ShiftMask | LockMask ) )
+ ret |= GLUT_ACTIVE_SHIFT;
+ if( event->xkey.state & ControlMask )
+ ret |= GLUT_ACTIVE_CTRL;
+ if( event->xkey.state & Mod1Mask )
+ ret |= GLUT_ACTIVE_ALT;
+
+ return ret;
+}
+#endif
+
+
- if( window->Callbacks.Entry )
- {
- fgSetWindow( window ) ;
- window->Callbacks.Entry( GLUT_ENTERED );
- }
+ INVOKE_WCB( *window, Entry, ( GLUT_ENTERED ) );
- if( window->Callbacks.Entry )
- {
- fgSetWindow( window ) ;
- window->Callbacks.Entry( GLUT_LEFT );
- }
+ INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
- /*
- * A mouse button was pressed during the movement...
- * Is there a motion callback hooked to the window?
- */
- if( window->Callbacks.Motion )
- {
- fgSetWindow ( window ) ;
- window->Callbacks.Motion( event.xmotion.x,
- event.xmotion.y );
- }
+ INVOKE_WCB( *window, Motion, ( event.xmotion.x,
+ event.xmotion.y ) );
- fgSetWindow ( window ) ;
- window->Callbacks.Passive( event.xmotion.x, event.xmotion.y );
+ INVOKE_WCB( *window, Passive, ( event.xmotion.x,
+ event.xmotion.y ) );
* Do not execute the application's mouse callback if a menu
* is hooked to this button. In that case an appropriate
* private call should be generated.
* Do not execute the application's mouse callback if a menu
* is hooked to this button. In that case an appropriate
* private call should be generated.
- if( ( window->Callbacks.Mouse == NULL ) &&
- ( window->Callbacks.MouseWheel == NULL ) )
+ if( ! FETCH_WCB( *window, Mouse ) &&
+ ! FETCH_WCB( *window, MouseWheel ) )
- fgSetWindow( window );
-
- modifiers = 0;
- if( event.xbutton.state & ( ShiftMask | LockMask ) )
- modifiers |= GLUT_ACTIVE_SHIFT;
- if( event.xbutton.state & ControlMask )
- modifiers |= GLUT_ACTIVE_CTRL;
- if( event.xbutton.state & Mod1Mask )
- modifiers |= GLUT_ACTIVE_ALT;
- fgStructure.Window->State.Modifiers = modifiers;
+ /*
+ * XXX Why don't we use {window}? Other code here does...
+ */
+ fgStructure.Window->State.Modifiers = fgGetXModifiers( &event );
/*
* Finally execute the mouse or mouse wheel callback
*
* XXX Use a symbolic constant, *not* "4"!
*/
/*
* Finally execute the mouse or mouse wheel callback
*
* XXX Use a symbolic constant, *not* "4"!
*/
- if( window->Callbacks.Mouse )
- fgStructure.Window->Callbacks.Mouse(
- button,
- event.type == ButtonPress ? GLUT_DOWN : GLUT_UP,
- event.xbutton.x,
- event.xbutton.y
- );
+ INVOKE_WCB( *window, Mouse, ( button,
+ pressed ? GLUT_DOWN : GLUT_UP,
+ event.xbutton.x,
+ event.xbutton.y )
+ );
- if( ( button >= 4 ) && window->Callbacks.MouseWheel )
- {
- /*
- * Map 4 and 5 to wheel zero; EVEN to +1, ODD to -1
- * " 6 and 7 " " one; ...
- *
- * XXX This *should* be behind some variables/macros,
- * XXX since the order and numbering isn't certain
- * XXX See XFree86 configuration docs (even back in the
- * XXX 3.x days, and especially with 4.x).
- */
- int wheel_number = (button - 4) / 2;
- int direction = (button & 1)*2 - 1;
-
- if( ButtonPress )
- fgStructure.Window->Callbacks.MouseWheel(
- wheel_number,
- direction,
- event.xbutton.x,
- event.xbutton.y
- );
- }
+ /*
+ * Map 4 and 5 to wheel zero; EVEN to +1, ODD to -1
+ * " 6 and 7 " " one; ...
+ *
+ * XXX This *should* be behind some variables/macros,
+ * XXX since the order and numbering isn't certain
+ * XXX See XFree86 configuration docs (even back in the
+ * XXX 3.x days, and especially with 4.x).
+ */
+ int wheel_number = (button - 4) / 2;
+ int direction = (button & 1)*2 - 1;
+
+ if( pressed )
+ INVOKE_WCB( *window, MouseWheel, ( wheel_number,
+ direction,
+ event.xbutton.x,
+ event.xbutton.y )
+ );
- keyboard_cb = window->Callbacks.Keyboard;
- special_cb = window->Callbacks.Special;
+ keyboard_cb = FETCH_WCB( *window, Keyboard );
+ special_cb = FETCH_WCB( *window, Special );
- keyboard_cb = window->Callbacks.KeyboardUp;
- special_cb = window->Callbacks.SpecialUp;
+ keyboard_cb = FETCH_WCB( *window, KeyboardUp );
+ special_cb = FETCH_WCB( *window, SpecialUp );
-
- /*
- * Remember the current modifiers state
- */
- modifiers = 0;
- if( event.xkey.state & ( ShiftMask | LockMask ) )
- modifiers |= GLUT_ACTIVE_SHIFT;
- if( event.xkey.state & ControlMask )
- modifiers |= GLUT_ACTIVE_CTRL;
- if( event.xkey.state & Mod1Mask )
- modifiers |= GLUT_ACTIVE_ALT;
- window->State.Modifiers = modifiers;
-
+ window->State.Modifiers = fgGetXModifiers( &event );
keyboard_cb( asciiCode[ 0 ],
event.xkey.x, event.xkey.y );
keyboard_cb( asciiCode[ 0 ],
event.xkey.x, event.xkey.y );
-
- /*
- * Remember the current modifiers state
- */
- modifiers = 0;
- if( event.xkey.state & ( ShiftMask | LockMask ) )
- modifiers |= GLUT_ACTIVE_SHIFT;
- if( event.xkey.state & ControlMask )
- modifiers |= GLUT_ACTIVE_CTRL;
- if( event.xkey.state & Mod1Mask )
- modifiers |= GLUT_ACTIVE_ALT;
- window->State.Modifiers = modifiers;
-
+ window->State.Modifiers = fgGetXModifiers( &event );
+
+#if TARGET_HOST_WIN32
+/*
+ * Determine a GLUT modifer mask based on MS-WINDOWS system info.
+ */
+int fgGetWin32Modifiers (void)
+{
+ return
+ ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) ||
+ ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) |
+ ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) ||
+ ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) |
+ ( ( ( GetKeyState( VK_LMENU ) < 0 ) ||
+ ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 );
+}
+
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
LPARAM lParam )
{
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
LPARAM lParam )
{
- unsigned int current_DisplayMode = fgState.DisplayMode;
- fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH;
- fgSetupPixelFormat( window, FALSE, PFD_MAIN_PLANE );
- fgState.DisplayMode = current_DisplayMode;
-
- if( fgStructure.MenuContext )
- wglMakeCurrent( window->Window.Device,
- fgStructure.MenuContext->Context ) ;
- else
- {
- fgStructure.MenuContext =
- (SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) );
- fgStructure.MenuContext->Context =
- wglCreateContext( window->Window.Device );
- }
-
- /* window->Window.Context = wglGetCurrentContext () ; */
- window->Window.Context = wglCreateContext( window->Window.Device );
+ unsigned int current_DisplayMode = fgState.DisplayMode;
+ fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH;
+ fgSetupPixelFormat( window, FALSE, PFD_MAIN_PLANE );
+ fgState.DisplayMode = current_DisplayMode;
+
+ if( fgStructure.MenuContext )
+ wglMakeCurrent( window->Window.Device,
+ fgStructure.MenuContext->Context ) ;
+ else
+ {
+ fgStructure.MenuContext =
+ (SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) );
+ fgStructure.MenuContext->Context =
+ wglCreateContext( window->Window.Device );
+ }
+
+ /* window->Window.Context = wglGetCurrentContext () ; */
+ window->Window.Context = wglCreateContext( window->Window.Device );
/* glutSetCursor( fgStructure.Window->State.Cursor ); */
printf("WM_ACTIVATE: glutSetCursor( %p, %d)\n", window,
window->State.Cursor );
/* glutSetCursor( fgStructure.Window->State.Cursor ); */
printf("WM_ACTIVATE: glutSetCursor( %p, %d)\n", window,
window->State.Cursor );
-# define MAP_CURSOR(a,b) case a: SetCursor( LoadCursor( NULL, b ) ); \
- break;
+#define MAP_CURSOR(a,b) \
+ case a: \
+ SetCursor( LoadCursor( NULL, b ) ); \
+ break;
+
- switch( window->State.Cursor )
- {
- MAP_CURSOR( GLUT_CURSOR_RIGHT_ARROW, IDC_ARROW );
- MAP_CURSOR( GLUT_CURSOR_LEFT_ARROW, IDC_ARROW );
- MAP_CURSOR( GLUT_CURSOR_INFO, IDC_HELP );
- MAP_CURSOR( GLUT_CURSOR_DESTROY, IDC_CROSS );
- MAP_CURSOR( GLUT_CURSOR_HELP, IDC_HELP );
- MAP_CURSOR( GLUT_CURSOR_CYCLE, IDC_SIZEALL );
- MAP_CURSOR( GLUT_CURSOR_SPRAY, IDC_CROSS );
- 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 ); */
- ZAP_CURSOR( GLUT_CURSOR_NONE, NULL );
-
- default:
- MAP_CURSOR( GLUT_CURSOR_UP_DOWN, IDC_ARROW );
- }
+ switch( window->State.Cursor )
+ {
+ MAP_CURSOR( GLUT_CURSOR_RIGHT_ARROW, IDC_ARROW );
+ MAP_CURSOR( GLUT_CURSOR_LEFT_ARROW, IDC_ARROW );
+ MAP_CURSOR( GLUT_CURSOR_INFO, IDC_HELP );
+ MAP_CURSOR( GLUT_CURSOR_DESTROY, IDC_CROSS );
+ MAP_CURSOR( GLUT_CURSOR_HELP, IDC_HELP );
+ MAP_CURSOR( GLUT_CURSOR_CYCLE, IDC_SIZEALL );
+ MAP_CURSOR( GLUT_CURSOR_SPRAY, IDC_CROSS );
+ 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 ); */
+ ZAP_CURSOR( GLUT_CURSOR_NONE, NULL );
+
+ default:
+ MAP_CURSOR( GLUT_CURSOR_UP_DOWN, IDC_ARROW );
+ }
#endif
else
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
#endif
else
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
- window->State.Redisplay = TRUE ;
-
- /*
- * Since the window is a menu, make the parent window current
- */
- fgSetWindow ( window->ActiveMenu->ParentWindow ) ;
-
+ window->State.Redisplay = TRUE;
+ fgSetWindow ( window->ActiveMenu->ParentWindow );
- window->State.Modifiers =
- ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) ||
- ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) |
- ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) ||
- ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) |
- ( ( ( GetKeyState( VK_LMENU ) < 0 ) ||
- ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 );
+ window->State.Modifiers = fgGetWin32Modifiers( );
if( ( wParam & MK_LBUTTON ) ||
( wParam & MK_MBUTTON ) ||
( wParam & MK_RBUTTON ) )
{
if( ( wParam & MK_LBUTTON ) ||
( wParam & MK_MBUTTON ) ||
( wParam & MK_RBUTTON ) )
{
- if( window->Callbacks.Motion )
- {
- fgSetWindow( window );
- window->Callbacks.Motion( window->State.MouseX,
- window->State.MouseY );
- }
+ INVOKE_WCB( *window, Motion, ( window->State.MouseX,
+ window->State.MouseY ) );
- if( window->Callbacks.Passive )
- {
- fgSetWindow( window );
- window->Callbacks.Passive( window->State.MouseX,
- window->State.MouseY );
- }
+ INVOKE_WCB( *window, Passive, ( window->State.MouseX,
+ window->State.MouseY ) );
-
- fgStructure.Window->State.Modifiers =
- ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) ||
- ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) |
- ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) ||
- ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) |
- ( ( ( GetKeyState( VK_LMENU ) < 0 ) ||
- ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 );
-
- window->Callbacks.Mouse(
- button,
- pressed == TRUE ? GLUT_DOWN : GLUT_UP,
- window->State.MouseX,
- window->State.MouseY
+ fgStructure.Window->State.Modifiers = fgGetWin32Modifiers( );
+
+ INVOKE_WCB(
+ *window, Mouse,
+ ( button,
+ pressed == TRUE ? GLUT_DOWN : GLUT_UP,
+ window->State.MouseX,
+ window->State.MouseY
+ )
- if( ( window->Callbacks.MouseWheel == NULL ) &&
- ( window->Callbacks.Mouse == NULL ) )
+ if( ! FETCH_WCB( *window, MouseWheel ) &&
+ ! FETCH_WCB( *window, Mouse ) )
- fgStructure.Window->State.Modifiers =
- ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) ||
- ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) |
- ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) ||
- ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) |
- ( ( ( GetKeyState( VK_LMENU ) < 0 ) ||
- ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 );
+ fgStructure.Window->State.Modifiers = fgGetWin32Modifiers( );
- if( window->Callbacks.MouseWheel )
- window->Callbacks.MouseWheel(
- wheel_number,
- direction,
- window->State.MouseX,
- window->State.MouseY
+ if( FETCH_WCB( *window, MouseWheel ) )
+ {
+ INVOKE_WCB( *window, MouseWheel,
+ ( wheel_number,
+ direction,
+ window->State.MouseX,
+ window->State.MouseY
+ )
- button += (1 + direction)/2;
- window->Callbacks.Mouse( button, GLUT_DOWN,
- window->State.MouseX,
- window->State.MouseY ) ;
- window->Callbacks.Mouse( button, GLUT_UP,
- window->State.MouseX,
- window->State.MouseY ) ;
+ if( direction > 0 )
+ ++button;
+ INVOKE_WCB( *window, Mouse,
+ ( button, GLUT_DOWN,
+ window->State.MouseX, window->State.MouseY )
+ );
+ INVOKE_WCB( *window, Mouse,
+ ( button, GLUT_UP,
+ window->State.MouseX, window->State.MouseX )
+ );
- window->State.Modifiers =
- ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) ||
- ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) |
- ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) ||
- ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) |
- ( ( ( GetKeyState( VK_LMENU ) < 0 ) ||
- ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 );
+ window->State.Modifiers = fgGetWin32Modifiers( );
GetCursorPos( &mouse_pos );
ScreenToClient( window->Window.Handle, &mouse_pos );
GetCursorPos( &mouse_pos );
ScreenToClient( window->Window.Handle, &mouse_pos );
- if( window->Callbacks.Keyboard )
- {
- fgSetWindow( window );
- window->Callbacks.Keyboard( 127, window->State.MouseX,
- window->State.MouseY );
- }
+ INVOKE_WCB( *window, Keyboard,
+ ( 127, window->State.MouseX, window->State.MouseY )
+ );
- if( ( keypress != -1 ) && window->Callbacks.Special )
- {
- fgSetWindow( window );
- window->Callbacks.Special( keypress, window->State.MouseX,
- window->State.MouseY );
- }
+ if( keypress != -1 )
+ INVOKE_WCB( *window, Special,
+ ( keypress,
+ window->State.MouseX, window->State.MouseY )
+ );
- window->State.Modifiers =
- ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) ||
- ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) |
- ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) ||
- ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) |
- ( ( ( GetKeyState( VK_LMENU ) < 0 ) ||
- ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 );
+ window->State.Modifiers = fgGetWin32Modifiers( );
GetCursorPos( &mouse_pos );
ScreenToClient( window->Window.Handle, &mouse_pos );
GetCursorPos( &mouse_pos );
ScreenToClient( window->Window.Handle, &mouse_pos );
- if( window->Callbacks.KeyboardUp )
- {
- fgSetWindow( window );
- window->Callbacks.KeyboardUp( 127, window->State.MouseX,
- window->State.MouseY );
- }
-
+ INVOKE_WCB( *window, KeyboardUp,
+ ( 127, window->State.MouseX, window->State.MouseY )
+ );
if( ToAscii( wParam, 0, state, code, 0 ) == 1 )
wParam=code[ 0 ];
if( ToAscii( wParam, 0, state, code, 0 ) == 1 )
wParam=code[ 0 ];
- if( window->Callbacks.KeyboardUp )
- {
- fgSetWindow( window );
- window->Callbacks.KeyboardUp( (char)wParam,
- window->State.MouseX,
- window->State.MouseY );
- }
+ INVOKE_WCB( *window, KeyboardUp,
+ ( (char)wParam,
+ window->State.MouseX, window->State.MouseY )
+ );
- if( (keypress != -1) && window->Callbacks.SpecialUp )
- {
- fgSetWindow( window );
- window->Callbacks.SpecialUp( keypress, window->State.MouseX,
- window->State.MouseY );
- }
+ if( keypress != -1 )
+ INVOKE_WCB( *window, SpecialUp,
+ ( keypress,
+ window->State.MouseX, window->State.MouseY )
+ );
- if( window->Callbacks.Keyboard )
+ /*
+ * XXX INVOKE_WCB() takes care of the callback-pointer check.
+ * XXX We could just uncoditionally find/trash the Modifiers
+ * XXX and get rid of the "if( ... ) {" and "}". Unconditinal
+ * XXX code is simpler code. (^&
+ */
+ if( FETCH_WCB( *window, Keyboard ) )
- fgSetWindow( window );
- window->State.Modifiers =
- ( ( ( GetKeyState( VK_LSHIFT ) < 0 ) ||
- ( GetKeyState( VK_RSHIFT ) < 0 )) ? GLUT_ACTIVE_SHIFT : 0 ) |
- ( ( ( GetKeyState( VK_LCONTROL ) < 0 ) ||
- ( GetKeyState( VK_RCONTROL ) < 0 )) ? GLUT_ACTIVE_CTRL : 0 ) |
- ( ( ( GetKeyState( VK_LMENU ) < 0 ) ||
- ( GetKeyState( VK_RMENU ) < 0 )) ? GLUT_ACTIVE_ALT : 0 );
-
- window->Callbacks.Keyboard( (char)wParam, window->State.MouseX,
- window->State.MouseY );
+ window->State.Modifiers = fgGetWin32Modifiers( );
+ INVOKE_WCB( *window, Keyboard,
+ ( (char)wParam,
+ window->State.MouseX, window->State.MouseY )
+ );
/*lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ) ; */
break;
/*lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ) ; */
break;