{
SFG_Window* window = fgWindowByHandle( handle );
freeglut_return_if_fail( window != NULL );
- freeglut_return_if_fail( window->Callbacks.Display != NULL );
- freeglut_return_if_fail( window->State.Visible == TRUE );
- fgSetWindow( window );
- window->State.Redisplay = FALSE;
- window->Callbacks.Display( );
+ /*
+ * 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 ) );
+ freeglut_return_if_fail( window->State.Visible );
+
+ window->State.Redisplay = GL_FALSE;
+ INVOKE_WCB( *window, Display, ( ) );
}
/*
SFG_Window* window = fgWindowByHandle( handle );
freeglut_return_if_fail( window != NULL );
- fgSetWindow( window );
- if( window->Callbacks.Reshape != NULL )
- window->Callbacks.Reshape( width, height );
- else
+ if( !( FETCH_WCB( *window, Reshape ) ) )
+ {
+ fgSetWindow( window );
glViewport( 0, 0, width, height );
+ }
+ else
+ INVOKE_WCB( *window, Reshape, ( width, height ) );
/*
* Force a window redraw. In Windows at least this is only a partial
* But without this we get this bad behaviour whenever we resize the
* window.
*/
- window->State.Redisplay = TRUE;
+ window->State.Redisplay = GL_TRUE;
if( window->IsMenu )
fgSetWindow( current_window );
static void fghcbDisplayWindow( SFG_Window *window, SFG_Enumerator *enumerator )
{
#if TARGET_HOST_UNIX_X11
- 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 &&
+ window->State.Visible )
{
- SFG_Window *current_window = fgStructure.Window ;
+ SFG_Window *current_window = fgStructure.Window;
- fgSetWindow( window );
- window->State.Redisplay = FALSE;
- window->Callbacks.Display( );
+ window->State.Redisplay = GL_FALSE;
+ INVOKE_WCB( *window, Display, ( ) );
fgSetWindow( current_window );
}
glutGet( GLUT_WINDOW_HEIGHT )
);
- window->State.NeedToResize = FALSE;
+ window->State.NeedToResize = GL_FALSE;
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 &&
+ window->State.Visible )
{
- window->State.Redisplay = FALSE;
+ window->State.Redisplay = GL_FALSE;
- RedrawWindow(
+ RedrawWindow(
window->Window.Handle, NULL, NULL,
RDW_NOERASE | RDW_INTERNALPAINT | RDW_INVALIDATE | RDW_UPDATENOW
);
{
SFG_Enumerator enumerator;
- enumerator.found = FALSE;
- enumerator.data = NULL;
+ enumerator.found = GL_FALSE;
+ enumerator.data = NULL;
fgEnumWindows( fghcbDisplayWindow, &enumerator );
}
{
SFG_Enumerator enumerator;
- enumerator.found = FALSE;
- enumerator.data = NULL;
+ enumerator.found = GL_FALSE;
+ enumerator.data = NULL;
fgEnumWindows( fghcbCheckJoystickPolls, &enumerator );
}
*/
long fgElapsedTime( void )
{
+ if (fgState.Time.Set)
+ {
#if TARGET_HOST_UNIX_X11
- struct timeval now;
- long elapsed;
+ struct timeval now;
+ long elapsed;
- gettimeofday( &now, NULL );
+ gettimeofday( &now, NULL );
- elapsed = (now.tv_usec - fgState.Time.Value.tv_usec) / 1000;
- elapsed += (now.tv_sec - fgState.Time.Value.tv_sec) * 1000;
+ elapsed = ( now.tv_usec - fgState.Time.Value.tv_usec ) / 1000;
+ elapsed += ( now.tv_sec - fgState.Time.Value.tv_sec ) * 1000;
- return elapsed;
+ return elapsed;
+#elif TARGET_HOST_WIN32
+ return timeGetTime( ) - fgState.Time.Value;
+#endif
+ }
+ else
+ {
+#if TARGET_HOST_UNIX_X11
+ gettimeofday( &fgState.Time.Value, NULL );
#elif TARGET_HOST_WIN32
- return timeGetTime() - fgState.Time.Value;
+ fgState.Time.Value = timeGetTime( );
#endif
+ fgState.Time.Set = GL_TRUE;
+ }
}
/*
va_start( ap, fmt );
- fprintf( stderr, "freeglut ");
+ fprintf( stderr, "freeglut " );
if( fgState.ProgramName )
- fprintf (stderr, "(%s): ", fgState.ProgramName);
+ fprintf( stderr, "(%s): ", fgState.ProgramName );
vfprintf( stderr, fmt, ap );
fprintf( stderr, "\n" );
va_end( ap );
+ if ( fgState.Initalized )
+ fgDeinitialize( );
+
exit( 1 );
}
va_start( ap, fmt );
- fprintf( stderr, "freeglut ");
+ fprintf( stderr, "freeglut " );
if( fgState.ProgramName )
fprintf( stderr, "(%s): ", fgState.ProgramName );
vfprintf( stderr, fmt, ap );
* an opaque wall.
*
*/
-static void fgCheckJoystickCallback( SFG_Window* w, SFG_Enumerator* e)
+static void fgCheckJoystickCallback( SFG_Window* w, SFG_Enumerator* e )
{
- if( w->Callbacks.Joystick )
+ if( FETCH_WCB( *w, Joystick ) )
{
- e->found = TRUE;
+ e->found = GL_TRUE;
e->data = w;
}
fgEnumSubWindows( w, fgCheckJoystickCallback, e );
static int fgHaveJoystick( void )
{
SFG_Enumerator enumerator;
- enumerator.found = FALSE;
+ enumerator.found = GL_FALSE;
enumerator.data = NULL;
fgEnumWindows( fgCheckJoystickCallback, &enumerator );
return !!enumerator.data;
}
-static void fgHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e)
+static void fgHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e )
{
if( w->State.Redisplay )
{
- e->found = TRUE;
+ e->found = GL_TRUE;
e->data = w;
}
fgEnumSubWindows( w, fgHavePendingRedisplaysCallback, e );
}
-static int fgHavePendingRedisplays (void)
+static int fgHavePendingRedisplays( void )
{
SFG_Enumerator enumerator;
- enumerator.found = FALSE;
+ enumerator.found = GL_FALSE;
enumerator.data = NULL;
fgEnumWindows( fgHavePendingRedisplaysCallback, &enumerator );
return !!enumerator.data;
*/
static long fgNextTimer( void )
{
- long now = fgElapsedTime();
+ long now = fgElapsedTime( );
long ret = INT_MAX;
SFG_Timer *timer;
- for( timer = (SFG_Timer *)fgState.Timers.First;
+ for( timer = ( SFG_Timer * )fgState.Timers.First;
timer;
- timer = (SFG_Timer *)timer->Node.Next )
- ret = MIN( ret, MAX( 0, (timer->TriggerTime) - now ) );
+ timer = ( SFG_Timer * )timer->Node.Next )
+ ret = MIN( ret, MAX( 0, timer->TriggerTime - now ) );
return ret;
}
if( fgHaveJoystick( ) )
msec = MIN( msec, 10 );
- wait.tv_sec = msec / 1000;
- wait.tv_usec = (msec % 1000) * 1000;
+ wait.tv_sec = msec / 1000;
+ wait.tv_usec = ( msec % 1000 ) * 1000;
err = select( socket+1, &fdset, NULL, NULL, &wait );
if( -1 == err )
- printf( "freeglut select() error: %d\n", errno );
+ fgWarning( "freeglut select() error: %d\n", errno );
#elif TARGET_HOST_WIN32
#endif
switch( event.type )
{
- case DestroyNotify:
- /*
- * This is sent to confirm the XDestroyWindow call.
- * XXX WHY is this commented out? Should we re-enable it?
- */
- /* fgAddToWindowDestroyList ( window, FALSE ); */
- break;
-
case ClientMessage:
/*
* Destroy the window when the WM_DELETE_WINDOW message arrives
{
GETWINDOW( xclient );
- fgCloseWindow ( window ) ;
- fgAddToWindowDestroyList ( window, FALSE );
+ fgCloseWindow ( window );
+ fgAddToWindowDestroyList ( window, GL_FALSE );
}
break;
- case MapNotify:
- case UnmapNotify:
- /*
- * If we never do anything with this, can we just not ask to
- * get these messages?
- */
- break;
-
- case Expose:
- /*
- * We are too dumb to process partial exposes...
- * XXX Well, we could do it. However, it seems to only
- * XXX be potentially useful for single-buffered (since
- * XXX double-buffered does not respect viewport when we
- * XXX do a buffer-swap).
- */
- if( event.xexpose.count == 0 )
- fghRedrawWindowByHandle( event.xexpose.window );
- break;
-
/*
* CreateNotify causes a configure-event so that sub-windows are
* handled compatibly with GLUT. Otherwise, your sub-windows
);
break;
+ case DestroyNotify:
+ /*
+ * This is sent to confirm the XDestroyWindow call.
+ * XXX WHY is this commented out? Should we re-enable it?
+ */
+ /* fgAddToWindowDestroyList ( window, GL_FALSE ); */
+ break;
+
+ case Expose:
+ /*
+ * We are too dumb to process partial exposes...
+ * XXX Well, we could do it. However, it seems to only
+ * XXX be potentially useful for single-buffered (since
+ * XXX double-buffered does not respect viewport when we
+ * XXX do a buffer-swap).
+ */
+ if( event.xexpose.count == 0 )
+ fghRedrawWindowByHandle( event.xexpose.window );
+ break;
+
+ case MapNotify:
+ case UnmapNotify:
+ /*
+ * If we never do anything with this, can we just not ask to
+ * get these messages?
+ */
+ break;
+
case MappingNotify:
/*
* Have the client's keyboard knowledge updated (xlib.ps,
case VisibilityNotify:
{
GETWINDOW( xvisibility );
- if( window->Callbacks.WindowStatus == NULL )
+ if( ! FETCH_WCB( *window, WindowStatus ) )
break;
fgSetWindow( window );
switch( event.xvisibility.state )
{
case VisibilityUnobscured:
- window->Callbacks.WindowStatus( GLUT_FULLY_RETAINED );
- window->State.Visible = TRUE;
+ INVOKE_WCB( *window, WindowStatus, ( GLUT_FULLY_RETAINED ) );
+ window->State.Visible = GL_TRUE;
break;
case VisibilityPartiallyObscured:
- window->Callbacks.WindowStatus( GLUT_PARTIALLY_RETAINED );
- window->State.Visible = TRUE;
+ INVOKE_WCB( *window, WindowStatus,
+ ( GLUT_PARTIALLY_RETAINED ) );
+ window->State.Visible = GL_TRUE;
break;
case VisibilityFullyObscured:
- window->Callbacks.WindowStatus( GLUT_FULLY_COVERED );
- window->State.Visible = FALSE;
+ INVOKE_WCB( *window, WindowStatus, ( GLUT_FULLY_COVERED ) );
+ window->State.Visible = GL_FALSE;
break;
default:
break;
case EnterNotify:
- {
- GETWINDOW( xcrossing );
- GETMOUSE( xcrossing );
- if( window->Callbacks.Entry )
- {
- fgSetWindow( window ) ;
- window->Callbacks.Entry( GLUT_ENTERED );
- }
- }
- break;
-
case LeaveNotify:
- {
GETWINDOW( xcrossing );
GETMOUSE( xcrossing );
- if( window->Callbacks.Entry )
- {
- fgSetWindow( window ) ;
- window->Callbacks.Entry( GLUT_LEFT );
- }
- }
- break;
+ INVOKE_WCB( *window, Entry, ( ( EnterNotify == event.type ) ?
+ GLUT_ENTERED :
+ GLUT_LEFT ) );
+ break;
case MotionNotify:
{
window->ActiveMenu->Window->State.MouseY =
event.xmotion.y_root - window->ActiveMenu->Y;
}
- window->ActiveMenu->Window->State.Redisplay = TRUE ;
- fgSetWindow( window->ActiveMenu->ParentWindow ) ;
+ window->ActiveMenu->Window->State.Redisplay = GL_TRUE;
+ fgSetWindow( window->ActiveMenu->ParentWindow );
break;
}
* XXX For more than 5 buttons, just check {event.xmotion.state},
* XXX rather than a host of bit-masks?
*/
- if( (event.xmotion.state & Button1Mask) ||
- (event.xmotion.state & Button2Mask) ||
- (event.xmotion.state & Button3Mask) ||
- (event.xmotion.state & Button4Mask) ||
- (event.xmotion.state & Button5Mask) )
- {
- /*
- * 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 );
- }
- }
+#define BUTTON_MASK \
+ ( Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask )
+ if( event.xmotion.state & BUTTON_MASK )
+ INVOKE_WCB( *window, Motion, ( event.xmotion.x,
+ event.xmotion.y ) );
else
- {
- if( window->Callbacks.Passive )
- {
- fgSetWindow( window );
- window->Callbacks.Passive( event.xmotion.x,
- event.xmotion.y );
- }
- }
+ INVOKE_WCB( *window, Passive, ( event.xmotion.x,
+ event.xmotion.y ) );
}
break;
case ButtonRelease:
case ButtonPress:
{
- GLboolean pressed = TRUE;
+ GLboolean pressed = GL_TRUE;
int button;
if( event.type == ButtonRelease )
- pressed = FALSE ;
+ pressed = GL_FALSE;
/*
* A mouse button has been pressed or released. Traditionally,
button = event.xbutton.button - 1;
/*
+ * XXX This comment is replicated in the WIN32 section and
+ * XXX maybe also in the menu code. Can we move the info
+ * XXX to one central place and *reference* it from here?
+ *
* 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.
/* In the menu, invoke the callback and deactivate the menu*/
if( fgCheckActiveMenu( window->ActiveMenu->Window,
- window->ActiveMenu ) == TRUE )
+ window->ActiveMenu ) )
{
/*
* Save the current window and menu and set the current
*/
fgDeactivateMenu( window->ActiveMenu->ParentWindow );
- window->State.Redisplay = TRUE;
+ window->State.Redisplay = GL_TRUE;
break;
}
* No active menu, let's check whether we need to activate one.
*/
if( ( 0 <= button ) &&
- ( 2 >= button ) &&
+ ( FREEGLUT_MAX_MENUS > button ) &&
( window->Menu[ button ] ) &&
pressed )
{
- window->State.Redisplay = TRUE;
+ window->State.Redisplay = GL_TRUE;
fgSetWindow( window );
fgActivateMenu( window, button );
break;
* Check if there is a mouse or mouse wheel callback hooked to the
* window
*/
- if( ( window->Callbacks.Mouse == NULL ) &&
- ( window->Callbacks.MouseWheel == NULL ) )
+ if( ! FETCH_WCB( *window, Mouse ) &&
+ ! FETCH_WCB( *window, MouseWheel ) )
break;
- fgSetWindow( window );
-
/*
* XXX Why don't we use {window}? Other code here does...
*/
*
* XXX Use a symbolic constant, *not* "4"!
*/
- if( ( button < 4 ) || ( !( window->Callbacks.MouseWheel ) ) )
- {
- if( window->Callbacks.Mouse )
- fgStructure.Window->Callbacks.Mouse(
- button,
- pressed ? GLUT_DOWN : GLUT_UP,
- event.xbutton.x,
- event.xbutton.y
- );
- }
+ if( ( button < 3 ) || ( ! FETCH_WCB( *window, MouseWheel ) ) )
+ INVOKE_WCB( *window, Mouse, ( button,
+ pressed ? GLUT_DOWN : GLUT_UP,
+ event.xbutton.x,
+ event.xbutton.y )
+ );
else
{
/*
* 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).
+ *
+ * XXX Note that {button} has already been decremeted
+ * XXX in mapping from X button numbering to GLUT.
*/
- int wheel_number = (button - 4) / 2;
- int direction = (button & 1)*2 - 1;
+ int wheel_number = ( button - 3 ) / 2;
+ int direction = -1;
+ if( button % 2 )
+ direction = 1;
if( pressed )
- fgStructure.Window->Callbacks.MouseWheel(
- wheel_number,
- direction,
- event.xbutton.x,
- event.xbutton.y
+ INVOKE_WCB( *window, MouseWheel, ( wheel_number,
+ direction,
+ event.xbutton.x,
+ event.xbutton.y )
);
}
case KeyRelease:
case KeyPress:
{
- FGCBkeyboard keyboard_cb;
- FGCBspecial special_cb;
+ FGCBKeyboard keyboard_cb;
+ FGCBSpecial special_cb;
GETWINDOW( xkey );
GETMOUSE( xkey );
if( event.type == KeyPress )
{
- keyboard_cb = window->Callbacks.Keyboard;
- special_cb = window->Callbacks.Special;
+ keyboard_cb = FETCH_WCB( *window, Keyboard );
+ special_cb = FETCH_WCB( *window, Special );
}
else
{
- keyboard_cb = window->Callbacks.KeyboardUp;
- special_cb = window->Callbacks.SpecialUp;
+ keyboard_cb = FETCH_WCB( *window, KeyboardUp );
+ special_cb = FETCH_WCB( *window, SpecialUp );
}
/*
* Check for the ASCII/KeySym codes associated with the event:
*/
len = XLookupString( &event.xkey, asciiCode, sizeof(asciiCode),
- &keySym, &composeStatus );
+ &keySym, &composeStatus
+ );
/*
* GLUT API tells us to have two separate callbacks...
fgSetWindow( window );
window->State.Modifiers = fgGetXModifiers( &event );
keyboard_cb( asciiCode[ 0 ],
- event.xkey.x, event.xkey.y );
+ event.xkey.x, event.xkey.y
+ );
window->State.Modifiers = 0xffffffff;
}
}
* Execute the callback (if one has been specified),
* given that the special code seems to be valid...
*/
- if( special_cb && (special != -1) )
+ if( special_cb && ( special != -1 ) )
{
fgSetWindow( window );
window->State.Modifiers = fgGetXModifiers( &event );
}
break;
+ case ReparentNotify:
+ break; /* XXX Should disable this event */
+
default:
- fgWarning ("Unknown X event type: %d", event.type);
+ fgWarning( "Unknown X event type: %d", event.type );
break;
}
}
while( PeekMessage( &stMsg, NULL, 0, 0, PM_NOREMOVE ) )
{
if( GetMessage( &stMsg, NULL, 0, 0 ) == 0 )
- fgState.ExecState = GLUT_EXEC_STATE_STOP ;
+ fgState.ExecState = GLUT_EXEC_STATE_STOP;
TranslateMessage( &stMsg );
DispatchMessage( &stMsg );
void FGAPIENTRY glutMainLoop( void )
{
#if TARGET_HOST_WIN32
- SFG_Window *window = (SFG_Window *)fgStructure.Windows.First ;
+ SFG_Window *window = (SFG_Window *)fgStructure.Windows.First;
#endif
freeglut_assert_ready;
*/
while( window )
{
- if ( window->Callbacks.Visibility )
+ if( FETCH_WCB( *window, Visibility ) )
{
- SFG_Window *current_window = fgStructure.Window ;
+ SFG_Window *current_window = fgStructure.Window;
- fgSetWindow( window );
- window->Callbacks.Visibility ( window->State.Visible ) ;
+ INVOKE_WCB( *window, Visibility, ( window->State.Visible ) );
fgSetWindow( current_window );
}
- window = (SFG_Window *)window->Node.Next ;
+ window = (SFG_Window *)window->Node.Next;
}
#endif
- fgState.ExecState = GLUT_EXEC_STATE_RUNNING ;
+ fgState.ExecState = GLUT_EXEC_STATE_RUNNING;
while( fgState.ExecState == GLUT_EXEC_STATE_RUNNING )
{
glutMainLoopEvent( );
if( fgState.IdleCallback )
fgState.IdleCallback( );
- fgSleepForEvents();
+ fgSleepForEvents( );
}
}
fgDeinitialize( );
if( execState == GLUT_ACTION_EXIT )
- exit( 0 ) ;
+ exit( 0 );
}
}
*/
void FGAPIENTRY glutLeaveMainLoop( void )
{
- fgState.ExecState = GLUT_EXEC_STATE_STOP ;
+ fgState.ExecState = GLUT_EXEC_STATE_STOP;
}
LONG lRet = 1;
if ( ( window == NULL ) && ( uMsg != WM_CREATE ) )
- return( DefWindowProc( hWnd, uMsg, wParam, lParam ) );
+ return DefWindowProc( hWnd, uMsg, wParam, lParam );
/* printf ( "Window %3d message <%04x> %12d %12d\n", window?window->ID:0,
uMsg, wParam, lParam ); */
window->Window.Handle = hWnd;
window->Window.Device = GetDC( hWnd );
- if( fgState.BuildingAMenu )
+ if( window->IsMenu )
{
unsigned int current_DisplayMode = fgState.DisplayMode;
fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH;
- fgSetupPixelFormat( window, FALSE, PFD_MAIN_PLANE );
+ fgSetupPixelFormat( window, GL_FALSE, PFD_MAIN_PLANE );
fgState.DisplayMode = current_DisplayMode;
if( fgStructure.MenuContext )
wglMakeCurrent( window->Window.Device,
- fgStructure.MenuContext->Context ) ;
+ fgStructure.MenuContext->Context
+ );
else
{
fgStructure.MenuContext =
wglCreateContext( window->Window.Device );
}
- /* window->Window.Context = wglGetCurrentContext () ; */
+ /* window->Window.Context = wglGetCurrentContext( ); */
window->Window.Context = wglCreateContext( window->Window.Device );
}
else
{
- fgSetupPixelFormat( window, FALSE, PFD_MAIN_PLANE );
+ fgSetupPixelFormat( window, GL_FALSE, PFD_MAIN_PLANE );
- if( fgState.UseCurrentContext != TRUE )
+ if( ! fgState.UseCurrentContext )
window->Window.Context =
wglCreateContext( window->Window.Device );
else
}
}
- window->State.NeedToResize = TRUE;
+ window->State.NeedToResize = GL_TRUE;
ReleaseDC( window->Window.Handle, window->Window.Device );
break;
break;
#if 0
case WM_SETFOCUS:
- printf("WM_SETFOCUS: %p\n", window );
+ printf( "WM_SETFOCUS: %p\n", window );
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
break;
case WM_ACTIVATE:
- if (LOWORD(wParam) != WA_INACTIVE)
+ if( LOWORD( wParam ) != WA_INACTIVE )
{
/* glutSetCursor( fgStructure.Window->State.Cursor ); */
printf("WM_ACTIVATE: glutSetCursor( %p, %d)\n", window,
/*
* Windows seems to need reminding to erase the cursor for NONE.
*/
+
+ /*
+ * XXX Is this #if 0 section anything that we need to worry
+ * XXX about? Can we delete it? If it will ever be used,
+ * XXX why not re-use some common code with the glutSetCursor()
+ * XXX function (or perhaps invoke glutSetCursor())?
+ */
#if 0
- if ((LOWORD(lParam) == HTCLIENT) &&
- (fgStructure.Window->State.Cursor == GLUT_CURSOR_NONE))
+ if( ( LOWORD( lParam ) == HTCLIENT ) &&
+ ( fgStructure.Window->State.Cursor == GLUT_CURSOR_NONE ) )
SetCursor( NULL );
#else
/* Set the cursor AND change it for this window class. */
-#define MAP_CURSOR(a,b) \
- case a: \
- SetCursor( LoadCursor( NULL, b ) ); \
- break;
+#define MAP_CURSOR(a,b) \
+ case a: \
+ SetCursor( LoadCursor( NULL, b ) ); \
+ break;
/* Nuke the cursor AND change it for this window class. */
-#define ZAP_CURSOR(a,b) \
- case a: \
- SetCursor( NULL ); \
- break;
+#define ZAP_CURSOR(a,b) \
+ case a: \
+ SetCursor( NULL ); \
+ break;
if( LOWORD( lParam ) == HTCLIENT )
switch( window->State.Cursor )
break;
case WM_SHOWWINDOW:
- window->State.Visible = TRUE;
- window->State.Redisplay = TRUE;
+ window->State.Visible = GL_TRUE;
+ window->State.Redisplay = GL_TRUE;
break;
case WM_PAINT:
+ /* Turn on the visibility in case it was turned off somehow */
+ window->State.Visible = GL_TRUE;
BeginPaint( hWnd, &ps );
fghRedrawWindowByHandle( hWnd );
EndPaint( hWnd, &ps );
*/
if( fgStructure.Window == window )
{
- int used = FALSE ;
- SFG_Window *iter ;
+ int used = FALSE;
+ SFG_Window *iter;
wglMakeCurrent( NULL, NULL );
/*
* Put on a linked list of windows to be removed after all the
* callbacks have returned
*/
- fgAddToWindowDestroyList( window, FALSE );
+ fgAddToWindowDestroyList( window, GL_FALSE );
DestroyWindow( hWnd );
break;
if ( window->ActiveMenu )
{
- window->State.Redisplay = TRUE;
+ window->State.Redisplay = GL_TRUE;
fgSetWindow ( window->ActiveMenu->ParentWindow );
break;
}
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 ) );
else
- {
- 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 ) );
window->State.Modifiers = 0xffffffff;
}
case WM_MBUTTONUP:
case WM_RBUTTONUP:
{
- GLboolean pressed = TRUE;
+ GLboolean pressed = GL_TRUE;
int button;
window->State.MouseX = LOWORD( lParam );
window->State.MouseY = HIWORD( lParam );
+ /*
+ * XXX Either these multi-statement lines should be broken
+ * XXX in the form:
+ * XXX pressed = GL_TRUE;
+ * XXX button = GLUT_LEFT_BUTTON;
+ * XXX break;
+ * XXX ...or we should use a macro (much as I dislike freeglut's
+ * XXX preponderance of using macros to "compress" code).
+ */
switch( uMsg )
{
case WM_LBUTTONDOWN:
- pressed = TRUE; button = GLUT_LEFT_BUTTON; break;
+ pressed = GL_TRUE; button = GLUT_LEFT_BUTTON; break;
case WM_MBUTTONDOWN:
- pressed = TRUE; button = GLUT_MIDDLE_BUTTON; break;
+ pressed = GL_TRUE; button = GLUT_MIDDLE_BUTTON; break;
case WM_RBUTTONDOWN:
- pressed = TRUE; button = GLUT_RIGHT_BUTTON; break;
+ pressed = GL_TRUE; button = GLUT_RIGHT_BUTTON; break;
case WM_LBUTTONUP:
- pressed = FALSE; button = GLUT_LEFT_BUTTON; break;
+ pressed = GL_FALSE; button = GLUT_LEFT_BUTTON; break;
case WM_MBUTTONUP:
- pressed = FALSE; button = GLUT_MIDDLE_BUTTON; break;
+ pressed = GL_FALSE; button = GLUT_MIDDLE_BUTTON; break;
case WM_RBUTTONUP:
- pressed = FALSE; button = GLUT_RIGHT_BUTTON; break;
+ pressed = GL_FALSE; button = GLUT_RIGHT_BUTTON; break;
default:
- pressed = FALSE; button = -1; break;
+ pressed = GL_FALSE; button = -1; break;
}
if( GetSystemMetrics( SM_SWAPBUTTON ) )
return DefWindowProc( hWnd, uMsg, lParam, wParam );
/*
+ * XXX This comment is duplicated in two other spots.
+ * XXX Can we centralize it?
+ *
* 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.
/* Window has an active menu, it absorbs any mouse click */
if( window->ActiveMenu )
{
- /* Inside the menu, invoke the callback and deactivate the menu*/
- if( fgCheckActiveMenu( window, window->ActiveMenu ) == TRUE )
+ /* Outside the menu, deactivate the menu if it's a downclick */
+ if( ! fgCheckActiveMenu( window, window->ActiveMenu ) )
+ {
+ if( pressed )
+ fgDeactivateMenu( window->ActiveMenu->ParentWindow );
+ }
+ else /* In menu, invoke the callback and deactivate the menu*/
{
/*
* Save the current window and menu and set the current
fgSetWindow( save_window );
fgStructure.Menu = save_menu;
}
- else /* Out of menu, deactivate the menu if it's a downclick */
- {
- if( pressed == TRUE )
- fgDeactivateMenu( window->ActiveMenu->ParentWindow );
- }
/*
* Let's make the window redraw as a result of the mouse
* click and menu activity.
*/
if( ! window->IsMenu )
- window->State.Redisplay = TRUE;
+ window->State.Redisplay = GL_TRUE;
break;
}
- if ( ( window->Menu[ button ] ) && ( pressed == TRUE ) )
+ if ( window->Menu[ button ] && pressed )
{
- window->State.Redisplay = TRUE;
+ window->State.Redisplay = GL_TRUE;
fgSetWindow( window );
fgActivateMenu( window, button );
break;
}
- if( window->Callbacks.Mouse == NULL )
+ if( ! FETCH_WCB( *window, Mouse ) )
break;
fgSetWindow( window );
fgStructure.Window->State.Modifiers = fgGetWin32Modifiers( );
- window->Callbacks.Mouse(
- button,
- pressed == TRUE ? GLUT_DOWN : GLUT_UP,
- window->State.MouseX,
- window->State.MouseY
+ INVOKE_WCB(
+ *window, Mouse,
+ ( button,
+ pressed ? GLUT_DOWN : GLUT_UP,
+ window->State.MouseX,
+ window->State.MouseY
+ )
);
fgStructure.Window->State.Modifiers = 0xffffffff;
case 0x020a:
/* Should be WM_MOUSEWHEEL but my compiler doesn't recognize it */
{
+ /*
+ * XXX THIS IS SPECULATIVE -- John Fay, 10/2/03
+ * XXX Should use WHEEL_DELTA instead of 120
+ */
int wheel_number = LOWORD( wParam );
- /* THIS IS SPECULATIVE -- John Fay, 10/2/03 */
- short ticks = HIWORD( lParam ) / 120;
- /* Should be WHEEL_DELTA instead of 120 */
+ short ticks = ( short )HIWORD( wParam ) / 120;
int direction = 1;
if( ticks < 0 )
/* window->State.MouseY = HIWORD( lParam ); */
/* change "lParam" to other parameter */
- if( ( window->Callbacks.MouseWheel == NULL ) &&
- ( window->Callbacks.Mouse == NULL ) )
+ if( ! FETCH_WCB( *window, MouseWheel ) &&
+ ! FETCH_WCB( *window, Mouse ) )
break;
fgSetWindow( window );
fgStructure.Window->State.Modifiers = fgGetWin32Modifiers( );
while( ticks-- )
- 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
+ )
);
else /* No mouse wheel, call the mouse button callback twice */
{
int button = wheel_number*2 + 4;
if( direction > 0 )
++button;
- window->Callbacks.Mouse( button, GLUT_DOWN,
- window->State.MouseX,
- window->State.MouseY
+ INVOKE_WCB( *window, Mouse,
+ ( button, GLUT_DOWN,
+ window->State.MouseX, window->State.MouseY )
);
- window->Callbacks.Mouse( button, GLUT_UP,
- window->State.MouseX,
- window->State.MouseY
+ INVOKE_WCB( *window, Mouse,
+ ( button, GLUT_UP,
+ window->State.MouseX, window->State.MouseX )
);
}
fgStructure.Window->State.Modifiers = 0xffffffff;
}
- break ;
+ break;
case WM_SYSKEYDOWN:
case WM_KEYDOWN:
{
int keypress = -1;
- POINT mouse_pos ;
+ POINT mouse_pos;
if( fgState.IgnoreKeyRepeat && (lParam & KF_REPEAT) )
break;
/*
* The delete key should be treated as an ASCII keypress:
*/
- 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 = 0xffffffff;
}
/*
* The delete key should be treated as an ASCII keypress:
*/
- 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 )
+ );
break;
default:
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 )
+ );
window->State.Modifiers = 0xffffffff;
}
if( fgState.IgnoreKeyRepeat && (lParam & KF_REPEAT) )
break;
- 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 = fgGetWin32Modifiers( );
- window->Callbacks.Keyboard( (char)wParam, window->State.MouseX,
- window->State.MouseY );
+ INVOKE_WCB( *window, Keyboard,
+ ( (char)wParam,
+ window->State.MouseX, window->State.MouseY )
+ );
window->State.Modifiers = 0xffffffff;
}
}
case WM_CAPTURECHANGED:
/* User has finished resizing the window, force a redraw */
- if( window->Callbacks.Display )
- {
- fgSetWindow( window );
- window->Callbacks.Display( );
- }
+ INVOKE_WCB( *window, Display, ( ) );
/*lRet = DefWindowProc( hWnd, uMsg, wParam, lParam ) ; */
break;
case WM_SYNCPAINT: /* 0x0088 */
/* Another window has moved, need to update this one */
- window->State.Redisplay = TRUE;
+ window->State.Redisplay = GL_TRUE;
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
/* Help screen says this message must be passed to "DefWindowProc" */
break;
/* Pass it on to "DefWindowProc" to repaint a standard border */
break;
+ case WM_SYSCOMMAND : /* 0x0112 */
+ {
+ /*
+ * We have received a system command message. Try to act on it.
+ * The commands are passed in through the "lParam" parameter:
+ * Clicking on a corner to resize the window gives a "F004" message
+ * but this is not defined in my header file.
+ */
+ switch ( lParam )
+ {
+ case SC_SIZE:
+ break;
+
+ case SC_MOVE:
+ break;
+
+ case SC_MINIMIZE:
+ /* User has clicked on the "-" to minimize the window */
+ /* Turn off the visibility */
+ window->State.Visible = GL_FALSE;
+ break;
+
+ case SC_MAXIMIZE:
+ break;
+
+ case SC_NEXTWINDOW:
+ break;
+
+ case SC_PREVWINDOW:
+ break;
+
+ case SC_CLOSE:
+ /* Followed very closely by a WM_CLOSE message */
+ break;
+
+ case SC_VSCROLL:
+ break;
+
+ case SC_HSCROLL:
+ break;
+
+ case SC_MOUSEMENU:
+ break;
+
+ case SC_KEYMENU:
+ break;
+
+ case SC_ARRANGE:
+ break;
+
+ case SC_RESTORE:
+ break;
+
+ case SC_TASKLIST:
+ break;
+
+ case SC_SCREENSAVE:
+ break;
+
+ case SC_HOTKEY:
+ break;
+ }
+ }
+
+ /* We need to pass the message on to the operating system as well */
+ lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
+ break;
+
default:
/*
* Handle unhandled messages
projects / freeglut / blobdiff