X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_state.c;h=0ea47a40de0c29029bd304c3be4e0b51acf692e5;hb=5422ecc3a08d6c8a85b4693d227079c4d7ff0108;hp=6a7d515c0171dbd47b0f5fae3b60071fc063bd61;hpb=98ea79ef777bea593a87aef9600ee3d4fda6e110;p=freeglut

diff --git a/src/freeglut_state.c b/src/freeglut_state.c
index 6a7d515..0ea47a4 100644
--- a/src/freeglut_state.c
+++ b/src/freeglut_state.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*
@@ -507,7 +507,7 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat )
 
     case GLUT_HAS_MOUSE:
         /*
-         * The Windows can be booted without a mouse. 
+         * The Windows can be booted without a mouse.
          * It would be nice to have this reported.
          */
         return GetSystemMetrics( SM_MOUSEPRESENT );
@@ -522,6 +522,7 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat )
 
     case GLUT_JOYSTICK_POLL_RATE:
     case GLUT_HAS_JOYSTICK:
+    case GLUT_OWNS_JOYSTICK:
     case GLUT_JOYSTICK_BUTTONS:
     case GLUT_JOYSTICK_AXES:
         /*
@@ -541,7 +542,7 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat )
         return 0;
 
     case GLUT_DEVICE_IGNORE_KEY_REPEAT:
-        return fgState.IgnoreKeyRepeat;
+        return fgStructure.Window ? fgStructure.Window->State.IgnoreKeyRepeat : 0;
 
     case GLUT_DEVICE_KEY_REPEAT:
         /*