#include <GL/freeglut.h>
#include "freeglut_internal.h"
-#include <errno.h>
+#ifdef HAVE_ERRNO_H
+# include <errno.h>
+#endif
#include <stdarg.h>
-#if TARGET_HOST_WIN32
+#ifdef HAVE_VFPRINTF
# define VFPRINTF(s,f,a) vfprintf((s),(f),(a))
+#elif defined(HAVE__DOPRNT)
+# define VFPRINTF(s,f,a) _doprnt((f),(a),(s))
#else
-# if HAVE_VPRINTF
-# define VFPRINTF(s,f,a) vfprintf((s),(f),(a))
-# elif HAVE_DOPRNT
-# define VFPRINTF(s,f,a) _doprnt((f),(a),(s))
-# else
-# define VFPRINTF(s,f,a)
-# endif
+# define VFPRINTF(s,f,a)
#endif
-#if TARGET_HOST_WINCE
+#ifdef _WIN32_WCE
typedef struct GXDisplayProperties GXDisplayProperties;
typedef struct GXKeyList GXKeyList;
struct GXKeyList gxKeyList;
-#endif
+#endif /* _WIN32_WCE */
/*
* Try to get the maximum value allowed for ints, falling back to the minimum
* guaranteed by ISO C99 if there is no suitable header.
*/
-#if HAVE_LIMITS_H
+#ifdef HAVE_LIMITS_H
# include <limits.h>
#endif
#ifndef INT_MAX
#endif
#ifndef MIN
-#define MIN(a,b) (((a)<(b)) ? (a) : (b))
+# define MIN(a,b) (((a)<(b)) ? (a) : (b))
#endif
freeglut_return_if_fail( window != NULL );
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
XResizeWindow( fgDisplay.Display, window->Window.Handle,
width, height );
XFlush( fgDisplay.Display ); /* XXX Shouldn't need this */
-#elif TARGET_HOST_WIN32
+#elif TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
{
RECT winRect;
int x, y, w, h;
if ( window->Parent == NULL )
{
- if ( ! window->IsMenu && !window->State.IsGameMode )
+ if ( ! window->IsMenu && (window != fgStructure.GameModeWindow) )
{
w += GetSystemMetrics( SM_CXSIZEFRAME ) * 2;
h += GetSystemMetrics( SM_CYSIZEFRAME ) * 2 +
/*
* XXX Should update {window->State.OldWidth, window->State.OldHeight}
- * XXX to keep in lockstep with UNIX_X11 code.
+ * XXX to keep in lockstep with POSIX_X11 code.
*/
if( FETCH_WCB( *window, Reshape ) )
INVOKE_WCB( *window, Reshape, ( width, height ) );
{
window->State.Redisplay = GL_FALSE;
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
fghRedrawWindow ( window ) ;
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
RedrawWindow(
window->Window.Handle, NULL, NULL,
RDW_NOERASE | RDW_INTERNALPAINT | RDW_INVALIDATE | RDW_UPDATENOW
if( window->State.JoystickLastPoll + window->State.JoystickPollRate <=
checkTime )
{
-#if !TARGET_HOST_WINCE
+#if !defined(_WIN32_WCE)
fgJoystickPollWindow( window );
-#endif /* !TARGET_HOST_WINCE */
+#endif /* !defined(_WIN32_WCE) */
window->State.JoystickLastPoll = checkTime;
}
}
}
+
+/* Platform-dependent time in milliseconds, as an unsigned 32-bit integer.
+ * This value wraps every 49.7 days, but integer overflows cancel
+ * when subtracting an initial start time, unless the total time exceeds
+ * 32-bit, where the GLUT API return value is also overflowed.
+ */
+unsigned long fgSystemTime(void) {
+#if TARGET_HOST_SOLARIS || HAVE_GETTIMEOFDAY
+ struct timeval now;
+ gettimeofday( &now, NULL );
+ return now.tv_usec/1000 + now.tv_sec*1000;
+#elif TARGET_HOST_MS_WINDOWS
+# if defined(_WIN32_WCE)
+ return GetTickCount();
+# else
+ return timeGetTime();
+# endif
+#endif
+}
+
/*
* Elapsed Time
*/
long fgElapsedTime( void )
{
- if ( fgState.Time.Set )
- {
-#if TARGET_HOST_UNIX_X11
- struct timeval now;
- long elapsed;
-
- gettimeofday( &now, NULL );
-
- elapsed = (now.tv_usec - fgState.Time.Value.tv_usec) / 1000;
- elapsed += (now.tv_sec - fgState.Time.Value.tv_sec) * 1000;
-
- return elapsed;
-#elif TARGET_HOST_WIN32
- return timeGetTime() - fgState.Time.Value;
-#elif TARGET_HOST_WINCE
- return GetTickCount() - fgState.Time.Value;
-#endif
- }
- else
- {
-#if TARGET_HOST_UNIX_X11
- gettimeofday( &fgState.Time.Value, NULL );
-#elif TARGET_HOST_WIN32
- fgState.Time.Value = timeGetTime ();
-#elif TARGET_HOST_WINCE
- fgState.Time.Value = GetTickCount();
-#endif
- fgState.Time.Set = GL_TRUE ;
-
- return 0 ;
- }
+ return (long) (fgSystemTime() - fgState.Time);
}
/*
}
static void fghHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e)
{
- if( w->State.Redisplay )
+ if( w->State.Redisplay && w->State.Visible )
{
e->found = GL_TRUE;
e->data = w;
if( fghHaveJoystick( ) && ( msec > 10 ) )
msec = 10;
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
/*
* Possibly due to aggressive use of XFlush() and friends,
* it is possible to have our socket drained but still have
wait.tv_usec = (msec % 1000) * 1000;
err = select( socket+1, &fdset, NULL, NULL, &wait );
+#ifdef HAVE_ERRNO_H
if( ( -1 == err ) && ( errno != EINTR ) )
fgWarning ( "freeglut select() error: %d", errno );
+#endif
}
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
- MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLEVENTS );
+#elif TARGET_HOST_MS_WINDOWS
+ MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLINPUT );
#endif
}
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
/*
- * Returns GLUT modifier mask for an XEvent.
+ * Returns GLUT modifier mask for the state field of an X11 event.
*/
-static int fghGetXModifiers( XEvent *event )
+static int fghGetXModifiers( int state )
{
int ret = 0;
- if( event->xkey.state & ( ShiftMask | LockMask ) )
+ if( state & ( ShiftMask | LockMask ) )
ret |= GLUT_ACTIVE_SHIFT;
- if( event->xkey.state & ControlMask )
+ if( state & ControlMask )
ret |= GLUT_ACTIVE_CTRL;
- if( event->xkey.state & Mod1Mask )
+ if( state & Mod1Mask )
ret |= GLUT_ACTIVE_ALT;
return ret;
#endif
-#if TARGET_HOST_UNIX_X11 && _DEBUG
+#if TARGET_HOST_POSIX_X11 && _DEBUG
static const char* fghTypeToString( int type )
{
"%02x", e->key_vector[ i ] );
}
buf[ i ] = '\0';
- fgWarning( "%s: %s", fghTypeToString( e->type ), buf );
+ fgWarning( "%s: window=0x%x, %s", fghTypeToString( e->type ), e->window,
+ buf );
break;
}
case Expose: {
XExposeEvent *e = &event->xexpose;
- fgWarning( "%s: (x,y)=(%d,%d), (width,height)=(%d,%d), count=%d",
- fghTypeToString( e->type ), e->x, e->y, e->width, e->height,
- e->count );
+ fgWarning( "%s: window=0x%x, (x,y)=(%d,%d), (width,height)=(%d,%d), "
+ "count=%d", fghTypeToString( e->type ), e->window, e->x,
+ e->y, e->width, e->height, e->count );
break;
}
case GraphicsExpose: {
XGraphicsExposeEvent *e = &event->xgraphicsexpose;
- fgWarning( "%s: (x,y)=(%d,%d), (width,height)=(%d,%d), count=%d, "
- "(major_code,minor_code)=(%d,%d)",
- fghTypeToString( e->type ), e->x, e->y, e->width, e->height,
- e->count, e->major_code, e->minor_code );
+ fgWarning( "%s: drawable=0x%x, (x,y)=(%d,%d), (width,height)=(%d,%d), "
+ "count=%d, (major_code,minor_code)=(%d,%d)",
+ fghTypeToString( e->type ), e->drawable, e->x, e->y,
+ e->width, e->height, e->count, e->major_code,
+ e->minor_code );
break;
}
case NoExpose: {
XNoExposeEvent *e = &event->xnoexpose;
- fgWarning( "%s: (major_code,minor_code)=(%d,%d)",
- fghTypeToString( e->type ), e->major_code, e->minor_code );
+ fgWarning( "%s: drawable=0x%x, (major_code,minor_code)=(%d,%d)",
+ fghTypeToString( e->type ), e->drawable, e->major_code,
+ e->minor_code );
break;
}
*/
void FGAPIENTRY glutMainLoopEvent( void )
{
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
SFG_Window* window;
XEvent event;
switch( event.type )
{
case ClientMessage:
+ if(fgIsSpaceballXEvent(&event)) {
+ fgSpaceballHandleXEvent(&event);
+ break;
+ }
/* Destroy the window when the WM_DELETE_WINDOW message arrives */
if( (Atom) event.xclient.data.l[ 0 ] == fgDisplay.DeleteWindow )
{
*
* GLUT presumably does this because it generally tries to treat
* sub-windows the same as windows.
- *
- * XXX Technically, GETWINDOW( xconfigure ) and
- * XXX {event.xconfigure} may not be legit ways to get at
- * XXX data for CreateNotify events. In practice, the data
- * XXX is in a union which is laid out much the same either
- * XXX way. But if you want to split hairs, this isn't legit,
- * XXX and we should instead duplicate some code.
*/
case CreateNotify:
case ConfigureNotify:
- GETWINDOW( xconfigure );
{
- int width = event.xconfigure.width;
- int height = event.xconfigure.height;
+ int width, height;
+ if( event.type == CreateNotify ) {
+ GETWINDOW( xcreatewindow );
+ width = event.xcreatewindow.width;
+ height = event.xcreatewindow.height;
+ } else {
+ GETWINDOW( xconfigure );
+ width = event.xconfigure.width;
+ height = event.xconfigure.height;
+ }
if( ( width != window->State.OldWidth ) ||
( height != window->State.OldHeight ) )
break;
case MapNotify:
+ break;
+
case UnmapNotify:
- /*
- * If we never do anything with this, can we just not ask to
- * get these messages?
- */
+ /* We get this when iconifying a window. */
+ GETWINDOW( xunmap );
+ INVOKE_WCB( *window, WindowStatus, ( GLUT_HIDDEN ) );
+ window->State.Visible = GL_FALSE;
break;
case MappingNotify:
case VisibilityNotify:
{
- GETWINDOW( xvisibility );
- /*
- * XXX INVOKE_WCB() does this check for us.
- */
- if( ! FETCH_WCB( *window, WindowStatus ) )
- break;
- fgSetWindow( window );
-
/*
* Sending this event, the X server can notify us that the window
* has just acquired one of the three possible visibility states:
* VisibilityUnobscured, VisibilityPartiallyObscured or
- * VisibilityFullyObscured
+ * VisibilityFullyObscured. Note that we DO NOT receive a
+ * VisibilityNotify event when iconifying a window, we only get an
+ * UnmapNotify then.
*/
+ GETWINDOW( xvisibility );
switch( event.xvisibility.state )
{
case VisibilityUnobscured:
* XXX track ButtonPress/ButtonRelease events in our own
* XXX bit-mask?
*/
-#define BUTTON_MASK \
- ( Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask )
- if ( event.xmotion.state & BUTTON_MASK )
+ fgState.Modifiers = fghGetXModifiers( event.xmotion.state );
+ if ( event.xmotion.state & ( Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask ) ) {
INVOKE_WCB( *window, Motion, ( event.xmotion.x,
event.xmotion.y ) );
- else
+ } else {
INVOKE_WCB( *window, Passive, ( event.xmotion.x,
event.xmotion.y ) );
+ }
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
! FETCH_WCB( *window, MouseWheel ) )
break;
- fgState.Modifiers = fghGetXModifiers( &event );
+ fgState.Modifiers = fghGetXModifiers( event.xbutton.state );
/* Finally execute the mouse or mouse wheel callback */
if( ( button < glutDeviceGet ( GLUT_NUM_MOUSE_BUTTONS ) ) || ( ! FETCH_WCB( *window, MouseWheel ) ) )
event.xbutton.y )
);
}
-
- /* Trash the modifiers state */
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
/* Cease processing this event if it is auto repeated */
if (window->State.KeyRepeating)
+ {
+ if (event.type == KeyPress) window->State.KeyRepeating = GL_FALSE;
break;
+ }
if( event.type == KeyPress )
{
if( keyboard_cb )
{
fgSetWindow( window );
- fgState.Modifiers = fghGetXModifiers( &event );
+ fgState.Modifiers = fghGetXModifiers( event.xkey.state );
keyboard_cb( asciiCode[ 0 ],
event.xkey.x, event.xkey.y
);
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
}
else
case XK_F11: special = GLUT_KEY_F11; break;
case XK_F12: special = GLUT_KEY_F12; break;
+ case XK_KP_Left:
case XK_Left: special = GLUT_KEY_LEFT; break;
+ case XK_KP_Right:
case XK_Right: special = GLUT_KEY_RIGHT; break;
+ case XK_KP_Up:
case XK_Up: special = GLUT_KEY_UP; break;
+ case XK_KP_Down:
case XK_Down: special = GLUT_KEY_DOWN; break;
case XK_KP_Prior:
case XK_End: special = GLUT_KEY_END; break;
case XK_KP_Insert:
case XK_Insert: special = GLUT_KEY_INSERT; break;
+
+ case XK_Num_Lock : special = GLUT_KEY_NUM_LOCK; break;
+ case XK_KP_Begin : special = GLUT_KEY_BEGIN; break;
+ case XK_KP_Delete: special = GLUT_KEY_DELETE; break;
}
/*
if( special_cb && (special != -1) )
{
fgSetWindow( window );
- fgState.Modifiers = fghGetXModifiers( &event );
+ fgState.Modifiers = fghGetXModifiers( event.xkey.state );
special_cb( special, event.xkey.x, event.xkey.y );
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
}
}
case ReparentNotify:
break; /* XXX Should disable this event */
+ /* Not handled */
+ case GravityNotify:
+ break;
+
default:
- fgWarning ("Unknown X event type: %d", event.type);
+ fgWarning ("Unknown X event type: %d\n", event.type);
break;
}
}
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
MSG stMsg;
{
int action;
-#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#if TARGET_HOST_MS_WINDOWS
SFG_Window *window = (SFG_Window *)fgStructure.Windows.First ;
#endif
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutMainLoop" );
-#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#if TARGET_HOST_MS_WINDOWS
/*
* Processing before the main loop: If there is a window which is open and
* which has a visibility callback, call it. I know this is an ugly hack,
}
-#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#if TARGET_HOST_MS_WINDOWS
/*
* Determine a GLUT modifer mask based on MS-WINDOWS system info.
*/
{
SFG_Window* window;
PAINTSTRUCT ps;
- LONG lRet = 1;
+ LRESULT lRet = 1;
FREEGLUT_INTERNAL_ERROR_EXIT_IF_NOT_INITIALISED ( "Event Handler" ) ;
{
unsigned int current_DisplayMode = fgState.DisplayMode;
fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH;
-#if !TARGET_HOST_WINCE
+#if !defined(_WIN32_WCE)
fgSetupPixelFormat( window, GL_FALSE, PFD_MAIN_PLANE );
#endif
fgState.DisplayMode = current_DisplayMode;
if( fgStructure.MenuContext )
wglMakeCurrent( window->Window.Device,
- fgStructure.MenuContext->Context
+ fgStructure.MenuContext->MContext
);
else
{
fgStructure.MenuContext =
(SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) );
- fgStructure.MenuContext->Context =
+ fgStructure.MenuContext->MContext =
wglCreateContext( window->Window.Device );
}
}
else
{
-#if !TARGET_HOST_WINCE
+#if !defined(_WIN32_WCE)
fgSetupPixelFormat( window, GL_FALSE, PFD_MAIN_PLANE );
#endif
window->Window.Context =
wglCreateContext( window->Window.Device );
}
+
+#if !defined(_WIN32_WCE)
+ fgNewWGLCreateContext( window );
+#endif
}
window->State.NeedToResize = GL_TRUE;
- window->State.Width = fgState.Size.X;
- window->State.Height = fgState.Size.Y;
+ if( ( window->State.Width < 0 ) || ( window->State.Height < 0 ) )
+ {
+ SFG_Window *current_window = fgStructure.CurrentWindow;
+
+ fgSetWindow( window );
+ window->State.Width = glutGet( GLUT_WINDOW_WIDTH );
+ window->State.Height = glutGet( GLUT_WINDOW_HEIGHT );
+ fgSetWindow( current_window );
+ }
ReleaseDC( window->Window.Handle, window->Window.Device );
-#if TARGET_HOST_WINCE
+#if defined(_WIN32_WCE)
/* Take over button handling */
{
HINSTANCE dxDllLib=LoadLibrary(_T("gx.dll"));
gxKeyList = (*GXGetDefaultKeys_)(GX_LANDSCAPEKEYS);
}
-#endif /* TARGET_HOST_WINCE */
+#endif /* defined(_WIN32_WCE) */
break;
case WM_SIZE:
if( window->State.Visible )
{
window->State.NeedToResize = GL_TRUE;
-#if TARGET_HOST_WINCE
+#if defined(_WIN32_WCE)
window->State.Width = HIWORD(lParam);
window->State.Height = LOWORD(lParam);
#else
window->State.Width = LOWORD(lParam);
window->State.Height = HIWORD(lParam);
-#endif /* TARGET_HOST_WINCE */
+#endif /* defined(_WIN32_WCE) */
}
break;
-#if 0
+
case WM_SETFOCUS:
/* printf("WM_SETFOCUS: %p\n", window ); */
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
+ INVOKE_WCB( *window, Entry, ( GLUT_ENTERED ) );
break;
+ case WM_KILLFOCUS:
+/* printf("WM_KILLFOCUS: %p\n", window ); */
+ lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
+ INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
+
+ if( window->IsMenu &&
+ window->ActiveMenu && window->ActiveMenu->IsActive )
+ fgUpdateMenuHighlight( window->ActiveMenu );
+
+ break;
+
+#if 0
case WM_ACTIVATE:
if (LOWORD(wParam) != WA_INACTIVE)
{
*/
return 0;
- /* XXX For a future patch: we need a mouse entry event. Unfortunately Windows
- * XXX doesn't give us one, so we will probably need a "MouseInWindow" flag in
- * XXX the SFG_Window structure. Set it to true to begin with and then have the
- * XXX WM_MOUSELEAVE code set it to false. Then when we get a WM_MOUSEMOVE event,
- * XXX if the flag is false we invoke the Entry callback and set the flag to true.
- */
- case 0x02a2: /* This is the message we get when the mouse is leaving the window */
- if( window->IsMenu &&
- window->ActiveMenu && window->ActiveMenu->IsActive )
- fgUpdateMenuHighlight( window->ActiveMenu );
-
- INVOKE_WCB( *window, Entry, ( GLUT_LEFT ) );
- break ;
-
case WM_MOUSEMOVE:
{
-#if TARGET_HOST_WINCE
+#if defined(_WIN32_WCE)
window->State.MouseX = 320-HIWORD( lParam );
window->State.MouseY = LOWORD( lParam );
#else
window->State.MouseX = LOWORD( lParam );
window->State.MouseY = HIWORD( lParam );
-#endif /* TARGET_HOST_WINCE */
+#endif /* defined(_WIN32_WCE) */
/* Restrict to [-32768, 32767] to match X11 behaviour */
/* See comment in "freeglut_developer" mailing list 10/4/04 */
if ( window->State.MouseX > 32767 ) window->State.MouseX -= 65536;
INVOKE_WCB( *window, Passive, ( window->State.MouseX,
window->State.MouseY ) );
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
GLboolean pressed = GL_TRUE;
int button;
-#if TARGET_HOST_WINCE
+#if defined(_WIN32_WCE)
window->State.MouseX = 320-HIWORD( lParam );
window->State.MouseY = LOWORD( lParam );
#else
window->State.MouseX = LOWORD( lParam );
window->State.MouseY = HIWORD( lParam );
-#endif /* TARGET_HOST_WINCE */
+#endif /* defined(_WIN32_WCE) */
/* Restrict to [-32768, 32767] to match X11 behaviour */
/* See comment in "freeglut_developer" mailing list 10/4/04 */
break;
}
-#if !TARGET_HOST_WINCE
+#if !defined(_WIN32_WCE)
if( GetSystemMetrics( SM_SWAPBUTTON ) )
{
if( button == GLUT_LEFT_BUTTON )
if( button == GLUT_RIGHT_BUTTON )
button = GLUT_LEFT_BUTTON;
}
-#endif /* !TARGET_HOST_WINCE */
+#endif /* !defined(_WIN32_WCE) */
if( button == -1 )
return DefWindowProc( hWnd, uMsg, lParam, wParam );
)
);
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
);
}
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break ;
);
}
-#if TARGET_HOST_WINCE
+#if defined(_WIN32_WCE)
if(!(lParam & 0x40000000)) /* Prevent auto-repeat */
{
if(wParam==(unsigned)gxKeyList.vkRight)
window->State.MouseX, window->State.MouseY )
);
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
default:
{
-#if !TARGET_HOST_WINCE
+#if !defined(_WIN32_WCE)
BYTE state[ 256 ];
WORD code[ 2 ];
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,
( (char)wParam,
window->State.MouseX, window->State.MouseY )
);
-#endif /* !TARGET_HOST_WINCE */
+#endif /* !defined(_WIN32_WCE) */
}
}
window->State.MouseX, window->State.MouseY )
);
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
( (char)wParam,
window->State.MouseX, window->State.MouseY )
);
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
break;
-#if !TARGET_HOST_WINCE
+#if !defined(_WIN32_WCE)
case WM_SYNCPAINT: /* 0x0088 */
/* Another window has moved, need to update this one */
window->State.Redisplay = GL_TRUE;
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 );
break;
}
}
-#endif /* !TARGET_HOST_WINCE */
+#endif /* !defined(_WIN32_WCE) */
/* We need to pass the message on to the operating system as well */
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
projects / freeglut / blobdiff