projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Joe Krahn's changes to "TARGET_HOST" defined constants
[freeglut]
/
src
/
freeglut_main.c
diff --git
a/src/freeglut_main.c
b/src/freeglut_main.c
index
febd4bc
..
c78dab8
100644
(file)
--- a/
src/freeglut_main.c
+++ b/
src/freeglut_main.c
@@
-29,19
+29,15
@@
#include "freeglut_internal.h"
#include <errno.h>
#include <stdarg.h>
#include "freeglut_internal.h"
#include <errno.h>
#include <stdarg.h>
-#if TARGET_HOST_WIN32
+#if HAVE_VPRINTF
# define VFPRINTF(s,f,a) vfprintf((s),(f),(a))
# define VFPRINTF(s,f,a) vfprintf((s),(f),(a))
+#elif HAVE_DOPRNT
+# define VFPRINTF(s,f,a) _doprnt((f),(a),(s))
#else
#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
#endif
-#if TARGET_HOST_WINCE
+#ifdef _WIN32_WCE
typedef struct GXDisplayProperties GXDisplayProperties;
typedef struct GXKeyList GXKeyList;
typedef struct GXDisplayProperties GXDisplayProperties;
typedef struct GXKeyList GXKeyList;
@@
-55,7
+51,7
@@
GXOPENINPUT GXOpenInput_ = NULL;
struct GXKeyList gxKeyList;
struct GXKeyList gxKeyList;
-#endif
+#endif /* _WIN32_WCE */
/*
* Try to get the maximum value allowed for ints, falling back to the minimum
/*
* Try to get the maximum value allowed for ints, falling back to the minimum
@@
-69,7
+65,7
@@
struct GXKeyList gxKeyList;
#endif
#ifndef MIN
#endif
#ifndef MIN
-#define MIN(a,b) (((a)<(b)) ? (a) : (b))
+# define MIN(a,b) (((a)<(b)) ? (a) : (b))
#endif
#endif
@@
-98,13
+94,13
@@
static void fghReshapeWindow ( SFG_Window *window, int width, int height )
freeglut_return_if_fail( window != NULL );
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 */
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;
{
RECT winRect;
int x, y, w, h;
@@
-158,7
+154,7
@@
static void fghReshapeWindow ( SFG_Window *window, int width, int height )
/*
* XXX Should update {window->State.OldWidth, window->State.OldHeight}
/*
* 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 ) );
*/
if( FETCH_WCB( *window, Reshape ) )
INVOKE_WCB( *window, Reshape, ( width, height ) );
@@
-225,9
+221,9
@@
static void fghcbDisplayWindow( SFG_Window *window,
{
window->State.Redisplay = GL_FALSE;
{
window->State.Redisplay = GL_FALSE;
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
fghRedrawWindow ( window ) ;
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
RedrawWindow(
window->Window.Handle, NULL, NULL,
RDW_NOERASE | RDW_INTERNALPAINT | RDW_INVALIDATE | RDW_UPDATENOW
@@
-262,9
+258,9
@@
static void fghcbCheckJoystickPolls( SFG_Window *window,
if( window->State.JoystickLastPoll + window->State.JoystickPollRate <=
checkTime )
{
if( window->State.JoystickLastPoll + window->State.JoystickPollRate <=
checkTime )
{
-#if !TARGET_HOST_WINCE
+#if !defined(_WIN32_WCE)
fgJoystickPollWindow( window );
fgJoystickPollWindow( window );
-#endif /* !TARGET_HOST_WINCE */
+#endif /* !defined(_WIN32_WCE) */
window->State.JoystickLastPoll = checkTime;
}
window->State.JoystickLastPoll = checkTime;
}
@@
-312,7
+308,7
@@
long fgElapsedTime( void )
{
if ( fgState.Time.Set )
{
{
if ( fgState.Time.Set )
{
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
struct timeval now;
long elapsed;
struct timeval now;
long elapsed;
@@
-322,20
+318,24
@@
long fgElapsedTime( void )
elapsed += (now.tv_sec - fgState.Time.Value.tv_sec) * 1000;
return elapsed;
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
+#elif TARGET_HOST_MS_WINDOWS
+# if defined(_WIN32_WCE)
return GetTickCount() - fgState.Time.Value;
return GetTickCount() - fgState.Time.Value;
+# else
+ return timeGetTime() - fgState.Time.Value;
+# endif
#endif
}
else
{
#endif
}
else
{
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
gettimeofday( &fgState.Time.Value, NULL );
gettimeofday( &fgState.Time.Value, NULL );
-#elif TARGET_HOST_WIN32
- fgState.Time.Value = timeGetTime ();
-#elif TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
+# if defined(_WIN32_WCE)
fgState.Time.Value = GetTickCount();
fgState.Time.Value = GetTickCount();
+# else
+ fgState.Time.Value = timeGetTime ();
+# endif
#endif
fgState.Time.Set = GL_TRUE ;
#endif
fgState.Time.Set = GL_TRUE ;
@@
-413,7
+413,7
@@
static int fghHaveJoystick( void )
}
static void fghHavePendingRedisplaysCallback( SFG_Window* w, SFG_Enumerator* e)
{
}
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;
{
e->found = GL_TRUE;
e->data = w;
@@
-461,7
+461,7
@@
static void fghSleepForEvents( void )
if( fghHaveJoystick( ) && ( msec > 10 ) )
msec = 10;
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
/*
* Possibly due to aggressive use of XFlush() and friends,
* it is possible to have our socket drained but still have
@@
-488,24
+488,24
@@
static void fghSleepForEvents( void )
if( ( -1 == err ) && ( errno != EINTR ) )
fgWarning ( "freeglut select() error: %d", errno );
}
if( ( -1 == err ) && ( errno != EINTR ) )
fgWarning ( "freeglut select() error: %d", errno );
}
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLEVENTS );
#endif
}
MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLEVENTS );
#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;
{
int ret = 0;
- if( event->xkey.state & ( ShiftMask | LockMask ) )
+ if( state & ( ShiftMask | LockMask ) )
ret |= GLUT_ACTIVE_SHIFT;
ret |= GLUT_ACTIVE_SHIFT;
- if( event->xkey.state & ControlMask )
+ if( state & ControlMask )
ret |= GLUT_ACTIVE_CTRL;
ret |= GLUT_ACTIVE_CTRL;
- if( event->xkey.state & Mod1Mask )
+ if( state & Mod1Mask )
ret |= GLUT_ACTIVE_ALT;
return ret;
ret |= GLUT_ACTIVE_ALT;
return ret;
@@
-513,7
+513,7
@@
static int fghGetXModifiers( XEvent *event )
#endif
#endif
-#if TARGET_HOST_UNIX_X11 && _DEBUG
+#if TARGET_HOST_POSIX_X11 && _DEBUG
static const char* fghTypeToString( int type )
{
static const char* fghTypeToString( int type )
{
@@
-964,7
+964,7
@@
static void fghPrintEvent( XEvent *event )
*/
void FGAPIENTRY glutMainLoopEvent( void )
{
*/
void FGAPIENTRY glutMainLoopEvent( void )
{
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
SFG_Window* window;
XEvent event;
SFG_Window* window;
XEvent event;
@@
-1080,11
+1080,13
@@
void FGAPIENTRY glutMainLoopEvent( void )
break;
case MapNotify:
break;
case MapNotify:
+ break;
+
case UnmapNotify:
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:
break;
case MappingNotify:
@@
-1097,20
+1099,15
@@
void FGAPIENTRY glutMainLoopEvent( void )
case VisibilityNotify:
{
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
/*
* 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:
switch( event.xvisibility.state )
{
case VisibilityUnobscured:
@@
-1176,14
+1173,15
@@
void FGAPIENTRY glutMainLoopEvent( void )
* XXX track ButtonPress/ButtonRelease events in our own
* XXX bit-mask?
*/
* 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 ) );
INVOKE_WCB( *window, Motion, ( event.xmotion.x,
event.xmotion.y ) );
- else
+ } else {
INVOKE_WCB( *window, Passive, ( event.xmotion.x,
event.xmotion.y ) );
INVOKE_WCB( *window, Passive, ( event.xmotion.x,
event.xmotion.y ) );
+ }
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
}
break;
@@
-1229,7
+1227,7
@@
void FGAPIENTRY glutMainLoopEvent( void )
! FETCH_WCB( *window, MouseWheel ) )
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 ) ) )
/* Finally execute the mouse or mouse wheel callback */
if( ( button < glutDeviceGet ( GLUT_NUM_MOUSE_BUTTONS ) ) || ( ! FETCH_WCB( *window, MouseWheel ) ) )
@@
-1264,9
+1262,7
@@
void FGAPIENTRY glutMainLoopEvent( void )
event.xbutton.y )
);
}
event.xbutton.y )
);
}
-
- /* Trash the modifiers state */
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
}
break;
@@
-1341,11
+1337,11
@@
void FGAPIENTRY glutMainLoopEvent( void )
if( keyboard_cb )
{
fgSetWindow( window );
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
);
keyboard_cb( asciiCode[ 0 ],
event.xkey.x, event.xkey.y
);
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
}
else
}
}
else
@@
-1395,9
+1391,9
@@
void FGAPIENTRY glutMainLoopEvent( void )
if( special_cb && (special != -1) )
{
fgSetWindow( window );
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 );
special_cb( special, event.xkey.x, event.xkey.y );
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
}
}
}
}
}
@@
-1408,12
+1404,12
@@
void FGAPIENTRY glutMainLoopEvent( void )
break; /* XXX Should disable this event */
default:
break; /* XXX Should disable this event */
default:
- fgWarning ("Unknown X event type: %d", event.type);
+ fgWarning ("Unknown X event type: %d\n", event.type);
break;
}
}
break;
}
}
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
MSG stMsg;
MSG stMsg;
@@
-1455,13
+1451,13
@@
void FGAPIENTRY glutMainLoop( void )
{
int action;
{
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" );
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,
/*
* 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,
@@
-1540,7
+1536,7
@@
void FGAPIENTRY glutLeaveMainLoop( void )
}
}
-#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#if TARGET_HOST_MS_WINDOWS
/*
* Determine a GLUT modifer mask based on MS-WINDOWS system info.
*/
/*
* Determine a GLUT modifer mask based on MS-WINDOWS system info.
*/
@@
-1588,20
+1584,20
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
{
unsigned int current_DisplayMode = fgState.DisplayMode;
fgState.DisplayMode = GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH;
{
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,
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) );
);
else
{
fgStructure.MenuContext =
(SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) );
- fgStructure.MenuContext->Context =
+ fgStructure.MenuContext->MContext =
wglCreateContext( window->Window.Device );
}
wglCreateContext( window->Window.Device );
}
@@
-1610,7
+1606,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
}
else
{
}
else
{
-#if !TARGET_HOST_WINCE
+#if !defined(_WIN32_WCE)
fgSetupPixelFormat( window, GL_FALSE, PFD_MAIN_PLANE );
#endif
fgSetupPixelFormat( window, GL_FALSE, PFD_MAIN_PLANE );
#endif
@@
-1632,7
+1628,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
ReleaseDC( window->Window.Handle, window->Window.Device );
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"));
/* Take over button handling */
{
HINSTANCE dxDllLib=LoadLibrary(_T("gx.dll"));
@@
-1648,7
+1644,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
gxKeyList = (*GXGetDefaultKeys_)(GX_LANDSCAPEKEYS);
}
gxKeyList = (*GXGetDefaultKeys_)(GX_LANDSCAPEKEYS);
}
-#endif /* TARGET_HOST_WINCE */
+#endif /* defined(_WIN32_WCE) */
break;
case WM_SIZE:
break;
case WM_SIZE:
@@
-1660,13
+1656,13
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
if( window->State.Visible )
{
window->State.NeedToResize = GL_TRUE;
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);
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;
}
break;
@@
-1737,13
+1733,13
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
case WM_MOUSEMOVE:
{
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 );
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;
/* 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;
@@
-1766,7
+1762,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
INVOKE_WCB( *window, Passive, ( window->State.MouseX,
window->State.MouseY ) );
INVOKE_WCB( *window, Passive, ( window->State.MouseX,
window->State.MouseY ) );
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
}
break;
@@
-1780,13
+1776,13
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
GLboolean pressed = GL_TRUE;
int button;
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 );
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 */
/* Restrict to [-32768, 32767] to match X11 behaviour */
/* See comment in "freeglut_developer" mailing list 10/4/04 */
@@
-1825,7
+1821,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
break;
}
break;
}
-#if !TARGET_HOST_WINCE
+#if !defined(_WIN32_WCE)
if( GetSystemMetrics( SM_SWAPBUTTON ) )
{
if( button == GLUT_LEFT_BUTTON )
if( GetSystemMetrics( SM_SWAPBUTTON ) )
{
if( button == GLUT_LEFT_BUTTON )
@@
-1834,7
+1830,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
if( button == GLUT_RIGHT_BUTTON )
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 );
if( button == -1 )
return DefWindowProc( hWnd, uMsg, lParam, wParam );
@@
-1876,7
+1872,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
)
);
)
);
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
}
break;
@@
-1943,7
+1939,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
);
}
);
}
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break ;
}
break ;
@@
-2002,7
+1998,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
);
}
);
}
-#if TARGET_HOST_WINCE
+#if defined(_WIN32_WCE)
if(!(lParam & 0x40000000)) /* Prevent auto-repeat */
{
if(wParam==(unsigned)gxKeyList.vkRight)
if(!(lParam & 0x40000000)) /* Prevent auto-repeat */
{
if(wParam==(unsigned)gxKeyList.vkRight)
@@
-2030,7
+2026,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
window->State.MouseX, window->State.MouseY )
);
window->State.MouseX, window->State.MouseY )
);
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
}
break;
@@
-2090,7
+2086,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
default:
{
default:
{
-#if !TARGET_HOST_WINCE
+#if !defined(_WIN32_WCE)
BYTE state[ 256 ];
WORD code[ 2 ];
BYTE state[ 256 ];
WORD code[ 2 ];
@@
-2103,7
+2099,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
( (char)wParam,
window->State.MouseX, window->State.MouseY )
);
( (char)wParam,
window->State.MouseX, window->State.MouseY )
);
-#endif /* !TARGET_HOST_WINCE */
+#endif /* !defined(_WIN32_WCE) */
}
}
}
}
@@
-2113,7
+2109,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
window->State.MouseX, window->State.MouseY )
);
window->State.MouseX, window->State.MouseY )
);
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
}
break;
@@
-2128,7
+2124,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
( (char)wParam,
window->State.MouseX, window->State.MouseY )
);
( (char)wParam,
window->State.MouseX, window->State.MouseY )
);
- fgState.Modifiers = 0xffffffff;
+ fgState.Modifiers = INVALID_MODIFIERS;
}
break;
}
break;
@@
-2163,7
+2159,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );
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 WM_SYNCPAINT: /* 0x0088 */
/* Another window has moved, need to update this one */
window->State.Redisplay = GL_TRUE;
@@
-2251,7
+2247,7
@@
LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
break;
}
}
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 );
/* We need to pass the message on to the operating system as well */
lRet = DefWindowProc( hWnd, uMsg, wParam, lParam );