#include <GL/freeglut.h>
#include "freeglut_internal.h"
-#if HAVE_ERRNO
+#ifdef HAVE_ERRNO_H
# include <errno.h>
#endif
#include <stdarg.h>
-#if HAVE_VPRINTF
+#ifdef HAVE_VFPRINTF
# define VFPRINTF(s,f,a) vfprintf((s),(f),(a))
-#elif HAVE_DOPRNT
+#elif defined(HAVE__DOPRNT)
# define VFPRINTF(s,f,a) _doprnt((f),(a),(s))
#else
# define VFPRINTF(s,f,a)
* 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
wait.tv_usec = (msec % 1000) * 1000;
err = select( socket+1, &fdset, NULL, NULL, &wait );
-#if HAVE_ERRNO
+#ifdef HAVE_ERRNO_H
if( ( -1 == err ) && ( errno != EINTR ) )
fgWarning ( "freeglut select() error: %d", errno );
#endif
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 )
{
}
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 0x02a3: /* 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 defined(_WIN32_WCE)