java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv4849/linux

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Linux mouse buttons now match those on win32 (again)

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- org_lwjgl_input_Mouse.cpp	26 Feb 2003 17:49:09 -0000	1.17
+++ org_lwjgl_input_Mouse.cpp	26 Feb 2003 18:11:32 -0000	1.18
@@ -234,10 +234,10 @@
 			buttons[0] = JNI_FALSE;
 			break;
 		case Button2:
-			buttons[1] = JNI_FALSE;
+			buttons[2] = JNI_FALSE;
 			break;
 		case Button3:
-			buttons[2] = JNI_FALSE;
+			buttons[1] = JNI_FALSE;
 			break;
 		case Button4: /* Fall through */
 		case Button5:

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv25078/linux

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Linux mouse buttons now match those on win32

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- org_lwjgl_input_Mouse.cpp	24 Feb 2003 19:46:52 -0000	1.16
+++ org_lwjgl_input_Mouse.cpp	26 Feb 2003 17:49:09 -0000	1.17
@@ -213,10 +213,10 @@
 			buttons[0] = JNI_TRUE;
 			break;
 		case Button2:
-			buttons[1] = JNI_TRUE;
+			buttons[2] = JNI_TRUE;
 			break;
 		case Button3:
-			buttons[2] = JNI_TRUE;
+			buttons[1] = JNI_TRUE;
 			break;
 		case Button4:
 			current_z += WHEEL_SCALE;

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv26632/linux

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
linux scroller now match win32 behaviour more precisely - scrolling reversed and scaled 120

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- org_lwjgl_input_Mouse.cpp	14 Feb 2003 11:23:01 -0000	1.15
+++ org_lwjgl_input_Mouse.cpp	24 Feb 2003 19:46:52 -0000	1.16
@@ -51,6 +51,8 @@
 
 #define POINTER_WARP_BORDER 10
 #define WARP_RETRY 5
+// scale the mouse wheel according to win32
+#define WHEEL_SCALE 120 
 
 extern Display *disp;
 extern Window win;
@@ -217,10 +219,10 @@
 			buttons[2] = JNI_TRUE;
 			break;
 		case Button4:
-			current_z--;
+			current_z += WHEEL_SCALE;
 			break;
 		case Button5:
-			current_z++;
+			current_z -= WHEEL_SCALE;
 			break;
 		default: assert(0);
 	}

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv17541/win32

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:
Fixed a buffer overflow problem in dåz

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- org_lwjgl_input_Keyboard.cpp	13 Feb 2003 15:32:15 -0000	1.11
+++ org_lwjgl_input_Keyboard.cpp	20 Feb 2003 15:13:37 -0000	1.12
@@ -47,7 +47,7 @@
 #include "org_lwjgl_input_Keyboard.h"
 
 #define KEYBOARD_BUFFER_SIZE 50
-BYTE readBuffer[KEYBOARD_BUFFER_SIZE];
+BYTE readBuffer[KEYBOARD_BUFFER_SIZE*4];
 LPDIRECTINPUTDEVICE lpdiKeyboard		= NULL;
 jfieldID fid_readBuffer;
 bool translationEnabled;

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv28456/linux

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Fixed bug when a X display connection cannot be established (again)

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- org_lwjgl_Display.cpp	20 Feb 2003 13:20:54 -0000	1.20
+++ org_lwjgl_Display.cpp	20 Feb 2003 13:27:20 -0000	1.21
@@ -454,7 +454,7 @@
 		return NULL;
 	}
 	
-	int screen = DefaultScreen(disp);
+	screen = DefaultScreen(disp);
 	
 	if (!loadGL(disp, screen)) {
 #ifdef _DEBUG

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv25219/linux

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Fixed bug when a X display connection cannot be established

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- org_lwjgl_Display.cpp	14 Feb 2003 11:23:01 -0000	1.19
+++ org_lwjgl_Display.cpp	20 Feb 2003 13:20:54 -0000	1.20
@@ -443,7 +443,7 @@
 	int num_modes, i;
 
 	Display *disp = XOpenDisplay(NULL);
-	int screen = DefaultScreen(disp);
+	int screen;
 	XF86VidModeModeInfo **avail_modes;
 
 	if (disp == NULL) {
@@ -453,6 +453,9 @@
 		XCloseDisplay(disp);
 		return NULL;
 	}
+	
+	int screen = DefaultScreen(disp);
+	
 	if (!loadGL(disp, screen)) {
 #ifdef _DEBUG
 		printf("Could not load GL\n");

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector
In directory sc8-pr-cvs1:/tmp/cvs-serv29213/src/java/org/lwjgl/vector

Modified Files:
	Vector3f.java 
Log Message:


Index: Vector3f.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector3f.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/vector/Vector3f.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Vector3f.java	21 Dec 2002 12:37:20 -0000	1.9
+++ Vector3f.java	20 Feb 2003 12:16:49 -0000	1.10
@@ -283,5 +283,22 @@
 		
 		return this;
 	}
+	
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString() {
+		StringBuffer sb = new StringBuffer(64);
+		
+		sb.append("Vector3f[");
+		sb.append(x);
+		sb.append(", ");
+		sb.append(y);
+		sb.append(", ");
+		sb.append(z);
+		sb.append(']');
+		return sb.toString();
+	}
+
 
 }

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv26541/src/native/common

Modified Files:
	org_lwjgl_opengl_CoreGL.cpp 
Log Message:


Index: org_lwjgl_opengl_CoreGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_opengl_CoreGL.cpp	17 Feb 2003 15:13:41 -0000	1.3
+++ org_lwjgl_opengl_CoreGL.cpp	20 Feb 2003 12:14:27 -0000	1.4
@@ -183,7 +183,6 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_arrayElement(JNIEnv * env, jobject obj, jint p0)
 {
 	glArrayElement((GLint) p0);
-	CHECK_GL_ERROR
 }
 
 /*

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv5121/src/native/common

Modified Files:
	org_lwjgl_opengl_CoreGL.cpp org_lwjgl_opengl_CoreGL.h 
Log Message:
Added glMultiDrawArrays and glMultiDrawElements

Index: org_lwjgl_opengl_CoreGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_CoreGL.cpp	10 Feb 2003 00:00:48 -0000	1.2
+++ org_lwjgl_opengl_CoreGL.cpp	17 Feb 2003 15:13:41 -0000	1.3
@@ -3887,6 +3887,27 @@
 
 /*
  * Class:     org_lwjgl_opengl_CoreGL
+ * Method:    multiDrawArrays
+ * Signature: (IIII)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_multiDrawArrays
+  (JNIEnv *, jobject, jint mode, jint first, jint count, jint primcount) {
+	glMultiDrawArrays(mode, (GLint *)first, (GLsizei *)count, primcount);
+}
+  
+/*
+ * Class:     org_lwjgl_opengl_CoreGL
+ * Method:    multiDrawElements
+ * Signature: (IIIII)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_multiDrawElements
+  (JNIEnv *, jobject, jint mode, jint count, jint type, jint indices, jint primcount) {
+	glMultiDrawElements(mode, (GLsizei *)count, type, (const void **)indices, primcount);
+}
+    
+    
+/*
+ * Class:     org_lwjgl_opengl_CoreGL
  * Method:    multiTexCoord1d
  * Signature: (ID)V
  */

Index: org_lwjgl_opengl_CoreGL.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_opengl_CoreGL.h	26 Nov 2002 23:22:49 -0000	1.6
+++ org_lwjgl_opengl_CoreGL.h	17 Feb 2003 15:13:41 -0000	1.7
@@ -3346,6 +3346,22 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_viewport
   (JNIEnv *, jobject, jint, jint, jint, jint);
 
+/*
+ * Class:     org_lwjgl_opengl_CoreGL
+ * Method:    multiDrawArrays
+ * Signature: (IIII)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_multiDrawArrays
+  (JNIEnv *, jobject, jint, jint, jint, jint);
+
+/*
+ * Class:     org_lwjgl_opengl_CoreGL
+ * Method:    multiDrawElements
+ * Signature: (IIIII)V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_multiDrawElements
+  (JNIEnv *, jobject, jint, jint, jint, jint, jint);
+
 #ifdef __cplusplus
 }
 #endif

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1:/tmp/cvs-serv5121/src/java/org/lwjgl/opengl

Modified Files:
	CoreGL.java 
Log Message:
Added glMultiDrawArrays and glMultiDrawElements

Index: CoreGL.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CoreGL.java	21 Dec 2002 12:37:19 -0000	1.10
+++ CoreGL.java	17 Feb 2003 15:13:40 -0000	1.11
@@ -495,7 +495,18 @@
 	public native void stencilOp(int fail, int zfail, int zpass);
 	public native void stencilMask(int mask);
 	public native void viewport(int x, int y, int width, int height);
+        public native void multiDrawArrays(
+                int mode,
+                int piFirst,
+                int piCount,
+                int primcount);
 
+        public native void multiDrawElements(
+                int mode,
+                int piCount,
+                int type,
+                int pIndices,
+                int primcount);
 }
 
 

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv7005/linux

Modified Files:
	org_lwjgl_Display.cpp org_lwjgl_input_Keyboard.cpp 
	org_lwjgl_input_Mouse.cpp org_lwjgl_opengl_BaseGL.cpp 
Log Message:
Don't fail create if grab doesn't succeed on the first try

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- org_lwjgl_Display.cpp	12 Feb 2003 17:12:01 -0000	1.18
+++ org_lwjgl_Display.cpp	14 Feb 2003 11:23:01 -0000	1.19
@@ -84,7 +84,7 @@
 	int stencil;
 };
 
-int fillFormat(struct pixelformat *formats, int index, int bpp, int depth, int alpha, int stencil) {
+static int fillFormat(struct pixelformat *formats, int index, int bpp, int depth, int alpha, int stencil) {
 	for (int i = 0; i < index; i++)
 		if (formats[i].bpp == bpp &&
 		    formats[i].depth == depth &&
@@ -98,7 +98,7 @@
 	return 1;
 }
 
-struct pixelformat *getGLXAvailablePixelFormats(Display *disp, int screen, int *length) {
+static struct pixelformat *getGLXAvailablePixelFormats(Display *disp, int screen, int *length) {
 	if (extgl_Extensions.glx.GLX13 == 1) {
 		int num_formats;
 		int attriblist[] = {GLX_DOUBLEBUFFER, True,
@@ -148,7 +148,7 @@
 	return NULL;
 }
 
-XVisualInfo *chooseVisual(Display *disp, int screen, int bpp, int depth, int alpha, int stencil) {
+static XVisualInfo *chooseVisual(Display *disp, int screen, int bpp, int depth, int alpha, int stencil) {
 	int bpe;
 	switch (bpp) {
 		case 32:
@@ -174,7 +174,7 @@
 	return glXChooseVisual(disp, screen, attriblist);
 }
 
-struct pixelformat *getAvailablePixelFormats(Display *disp, int screen, int *length) {
+static struct pixelformat *getAvailablePixelFormats(Display *disp, int screen, int *length) {
 	struct pixelformat *formats = getGLXAvailablePixelFormats(disp, screen, length);
 	if (formats != NULL)
 		return formats;
@@ -195,7 +195,7 @@
 	return formats;
 }
 
-void waitMapped(Display *disp, Window win) {
+static void waitMapped(Display *disp, Window win) {
 	XEvent event;
 
 	do {
@@ -250,7 +250,7 @@
 	}
 }
 
-bool loadGL(Display *disp, int screen) {
+static bool loadGL(Display *disp, int screen) {
 	if (gl_loaded == true)
 		return true;
 	if (extgl_Open(disp, screen) != 0) {
@@ -263,12 +263,12 @@
 	return true;
 }
 
-void closeGL(void) {
+static void closeGL(void) {
 	gl_loaded = false;
 	extgl_Close();
 }
 
-int getDisplayModes(Display *disp, int screen, int *num_modes, XF86VidModeModeInfo ***avail_modes) {
+static int getDisplayModes(Display *disp, int screen, int *num_modes, XF86VidModeModeInfo ***avail_modes) {
 	int event_base, error_base, xvid_ver, xvid_rev;
 	
 	if (!XF86VidModeQueryExtension(disp, &event_base, &error_base)) {
@@ -285,7 +285,7 @@
 	return 1;
 }
 
-bool isMinimized() {
+static bool isMinimized() {
 	handleMessages();
 	return current_minimized;
 }

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- org_lwjgl_input_Keyboard.cpp	12 Feb 2003 17:12:01 -0000	1.14
+++ org_lwjgl_input_Keyboard.cpp	14 Feb 2003 11:23:01 -0000	1.15
@@ -63,6 +63,7 @@
 static bool buffer_enabled;
 static bool translation_enabled;
 static bool created = false;
+static bool should_grab = false;
 
 extern Display *disp;
 extern Window win;
@@ -88,14 +89,14 @@
 	fid_readBuffer = env->GetStaticFieldID(clazz, "readBuffer", "Ljava/nio/ByteBuffer;");
 }
 
-int grabKeyboard(void) {
+static int grabKeyboard(void) {
 	int result = XGrabKeyboard(disp, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
 	if (result == GrabSuccess)
 		keyboard_grabbed = true;
 	return result;
 }
 
-void ungrabKeyboard(void) {
+static void ungrabKeyboard(void) {
 	keyboard_grabbed = false;
 	XUngrabKeyboard(disp, CurrentTime);
 }
@@ -103,13 +104,23 @@
 void acquireKeyboard(void) {
 	if (!created)
 		return;
-	grabKeyboard();
+	should_grab = true;
 }
 
 void releaseKeyboard(void) {
 	if (!created)
 		return;
-	ungrabKeyboard();
+	should_grab = false;
+}
+
+static void updateGrab(void) {
+	if (should_grab) {
+		if (!keyboard_grabbed)
+			grabKeyboard();
+	} else {
+		if (keyboard_grabbed)
+			ungrabKeyboard();
+	}
 }
 
 /*
@@ -123,13 +134,8 @@
 	keyboard_grabbed = false;
 	translation_enabled = false;
 	buffer_enabled = false;
-
-	if (grabKeyboard() != GrabSuccess) {
-#ifdef _DEBUG
-		printf("Could not grab keyboard\n");
-#endif
-		return JNI_FALSE;
-	}
+	should_grab = true;
+	updateGrab();
 	for (int i =  0; i < KEYBOARD_SIZE; i++)
 		key_map[i] = i;
 	key_map[0x6b] = 0xdb; // Left doze key
@@ -169,7 +175,7 @@
 	created = false;
 }
 
-XKeyEvent *nextEventElement(void) {
+static XKeyEvent *nextEventElement(void) {
 	if (list_start == list_end)
 		return NULL;
 	XKeyEvent *result = &(saved_key_events[list_start]);
@@ -177,7 +183,7 @@
 	return result;
 }
 
-void putEventElement(XKeyEvent *event) {
+static void putEventElement(XKeyEvent *event) {
 	int next_index = (list_end + 1)%KEY_EVENT_BACKLOG;
 	if (next_index == list_start)
 		return;
@@ -185,13 +191,13 @@
 	list_end = next_index;
 }
 
-unsigned char getKeycode(XKeyEvent *event) {
+static unsigned char getKeycode(XKeyEvent *event) {
 	unsigned char keycode = (unsigned char)((event->keycode - 8) & 0xff);
 	keycode = key_map[keycode];
 	return keycode;
 }
 
-int translateEvent(int *position, XKeyEvent *event) {
+static int translateEvent(int *position, XKeyEvent *event) {
 	static char temp_translation_buffer[KEYBOARD_BUFFER_SIZE];
 	static XComposeStatus status;
         int num_chars, i;
@@ -222,7 +228,7 @@
 	return num_chars;
 }
 
-unsigned char eventState(XKeyEvent *event) {
+static unsigned char eventState(XKeyEvent *event) {
 	if (event->type == KeyPress) {
 		return 1;
 	} else if (event->type == KeyRelease) {
@@ -262,7 +268,7 @@
 	unsigned char state;
 	
 	handleMessages();
-
+	updateGrab();
 	memcpy((unsigned char*)buf, key_buf, KEYBOARD_SIZE*sizeof(unsigned char));
 }
 
@@ -281,7 +287,7 @@
 	int num_events = 0;
 
 	handleMessages();
-
+	updateGrab();
 	while (buf_count < KEYBOARD_BUFFER_SIZE * 2 && (key_event = nextEventElement()) != NULL) {
 		num_events++;
 		unsigned char keycode = getKeycode(key_event);

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- org_lwjgl_input_Mouse.cpp	12 Feb 2003 17:12:01 -0000	1.14
+++ org_lwjgl_input_Mouse.cpp	14 Feb 2003 11:23:01 -0000	1.15
@@ -61,6 +61,7 @@
 
 static bool pointer_grabbed;
 static bool created = false;
+static bool should_grab = false;
 
 static jfieldID fid_has_wheel = NULL;
 static jfieldID fid_button_count = NULL;
@@ -101,7 +102,7 @@
 		fid_dwheel = env->GetStaticFieldID(clazz, "dwheel", "I");
 }
 
-int blankCursor(void) {
+static int blankCursor(void) {
 	unsigned int best_width, best_height;
 	if (XQueryBestCursor(disp, win, 1, 1, &best_width, &best_height) == 0) {
 #ifdef _DEBUG
@@ -121,7 +122,7 @@
 	return 1;
 }
 
-int grabPointer(void) {
+static int grabPointer(void) {
 	int result;
 	int mask = FocusChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
 	result = XGrabPointer(disp, win, False, mask, GrabModeAsync, GrabModeAsync, win, blank_cursor, CurrentTime);
@@ -132,7 +133,7 @@
 	return result;
 }
 
-void ungrabPointer(void) {
+static void ungrabPointer(void) {
 	pointer_grabbed = false;
 	XUngrabPointer(disp, CurrentTime);
 }
@@ -140,13 +141,24 @@
 void acquirePointer(void) {
 	if (!created)
 		return;
-	grabPointer();
+	should_grab = true;
 }
 
 void releasePointer(void) {
 	if (!created)
 		return;
-	ungrabPointer();
+	should_grab = false;
+}
+
+
+static void updateGrab(void) {
+	if (should_grab) {
+		if (!pointer_grabbed)
+			grabPointer();
+	} else {
+		if (pointer_grabbed)
+			ungrabPointer();
+	}
 }
 
 /*
@@ -172,13 +184,9 @@
 #endif
 		return JNI_FALSE;
 	}
-	if (grabPointer() != GrabSuccess) {
-#ifdef _DEBUG
-		printf("Could not grab pointer\n");
-#endif
-		return JNI_FALSE;
-	}
 	created = true;
+	should_grab = true;
+	updateGrab();
 	return JNI_TRUE;
 }
 
@@ -194,6 +202,7 @@
 		ungrabPointer();
 	XFreeCursor(disp, blank_cursor);
 	created = false;
+	should_grab = false;
 }
 
 void handleButtonPress(XButtonEvent *event) {
@@ -240,7 +249,7 @@
 	current_y = event->y;
 }
 
-void warpPointer(void) {
+static void warpPointer(void) {
 	int i;
 	if (!pointer_grabbed)
 		return;
@@ -279,6 +288,7 @@
   (JNIEnv * env, jclass clazz)
 {
 	handleMessages();
+	updateGrab();
 	int moved_x = current_x - last_x;
 	int moved_y = current_y - last_y;
 	int moved_z = current_z - last_z;

Index: org_lwjgl_opengl_BaseGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_BaseGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_BaseGL.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_opengl_BaseGL.cpp	9 Feb 2003 17:01:01 -0000	1.7
+++ org_lwjgl_opengl_BaseGL.cpp	14 Feb 2003 11:23:01 -0000	1.8
@@ -49,11 +49,11 @@
 
 extern void handleMessages();
 
-void makeCurrent(void) {
+static void makeCurrent(void) {
 	glXMakeCurrent(disp, win, context);
 }
 
-void releaseContext(void) {
+static void releaseContext(void) {
 	glXMakeCurrent(disp, None, NULL);
 }
 

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv15361/win32

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:
replaced PeekMessage() -> handleMessages()

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- org_lwjgl_input_Keyboard.cpp	12 Feb 2003 11:27:48 -0000	1.10
+++ org_lwjgl_input_Keyboard.cpp	13 Feb 2003 15:32:15 -0000	1.11
@@ -52,7 +52,9 @@
 jfieldID fid_readBuffer;
 bool translationEnabled;
 extern LPDIRECTINPUT lpdi;
-extern HWND hwnd;
+extern HWND hwnd;
+
+extern void handleMessages(void);
 
 /*
  * Class:     org_lwjgl_input_Keyboard
@@ -185,7 +187,6 @@
 	
 	static DIDEVICEOBJECTDATA rgdod[KEYBOARD_BUFFER_SIZE];
 	wchar_t transBuf[KEYBOARD_BUFFER_SIZE];
-	MSG msg;
 
 	BYTE state[256];
 	DWORD bufsize = KEYBOARD_BUFFER_SIZE;
@@ -210,9 +211,8 @@
 			num_events++;
 			*buf++ = (unsigned char) rgdod[i].dwOfs;
 			*buf++ = (unsigned char) rgdod[i].dwData;
-			if (translationEnabled) {
-				while (PeekMessage(&msg, hwnd, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) != 0)
-					; // Flush keyboard messages to update keyboard state
+			if (translationEnabled) {
+				handleMessages();
 				UINT virt_key = MapVirtualKey(rgdod[i].dwOfs, 1);
 				if (virt_key != 0) {
 					if (!GetKeyboardState(state))

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv13251/linux

Modified Files:
	org_lwjgl_Display.cpp org_lwjgl_input_Keyboard.cpp 
	org_lwjgl_input_Mouse.cpp 
Log Message:
Added preliminary alt-tab support on linux

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- org_lwjgl_Display.cpp	9 Feb 2003 17:01:01 -0000	1.17
+++ org_lwjgl_Display.cpp	12 Feb 2003 17:12:01 -0000	1.18
@@ -57,8 +57,8 @@
 
 static jfieldID fid_close;
 static bool current_fullscreen;
-static bool current_focused;
 static bool current_minimized;
+static bool input_released;
 static int win_width;
 static int win_height;
 static XF86VidModeModeInfo **avail_modes;
@@ -72,6 +72,10 @@
 extern void handleButtonPress(XButtonEvent *);
 extern void handleButtonRelease(XButtonEvent *);
 extern void handleKeyEvent(XKeyEvent *);
+extern void releaseKeyboard(void);
+extern void releasePointer(void);
+extern void acquireKeyboard(void);
+extern void acquirePointer(void);
 
 struct pixelformat {
 	int bpp;
@@ -199,6 +203,15 @@
 	} while ((event.type != MapNotify) || (event.xmap.event != win));
 }
 
+bool releaseInput(void) {
+	if (current_fullscreen)
+		return false;
+	releaseKeyboard();
+	releasePointer();
+	input_released = true;
+	return true;
+}
+
 void handleMessages(void) {
 	XEvent event;
 	while (XPending(disp) > 0) {
@@ -208,11 +221,11 @@
 				if ((event.xclient.format == 32) && (event.xclient.data.l[0] == delete_atom))
 					saved_env->SetStaticBooleanField(saved_clazz, fid_close, JNI_TRUE);
 				break;
-			case EnterNotify:
-				current_focused = true;
-				break;
-			case LeaveNotify:
-				current_focused = false;
+			case FocusIn:
+				if (input_released) {
+					acquireKeyboard();
+					acquirePointer();
+				}
 				break;
 			case MapNotify:
 				current_minimized = false;
@@ -272,15 +285,6 @@
 	return 1;
 }
 
-bool isFullscreen(void) {
-	return current_fullscreen;
-}
-
-bool isFocused() {
-	handleMessages();
-	return current_focused;
-}
-
 bool isMinimized() {
 	handleMessages();
 	return current_minimized;
@@ -325,7 +329,7 @@
 	else
 		current_fullscreen = false;
 	current_minimized = false;
-	current_focused = false;
+	input_released = false;
 	disp = XOpenDisplay(NULL);
 	if (disp == NULL) {
 #ifdef _DEBUG
@@ -359,7 +363,7 @@
 
 	cmap = XCreateColormap(disp, root_win, vis_info->visual, AllocNone);
 	attribs.colormap = cmap;
-	attribs.event_mask = VisibilityChangeMask| StructureNotifyMask | EnterWindowMask | LeaveWindowMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
+	attribs.event_mask = FocusChangeMask | VisibilityChangeMask| StructureNotifyMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
 	attribs.background_pixel = 0xFF000000;
 	attribmask = CWColormap | CWBackPixel | CWEventMask;
 	if (fullscreen) {
@@ -407,7 +411,6 @@
 	}
 	XClearWindow(disp, win);
 	XSync(disp, True);
-        isFocused();
 	return JNI_TRUE;
 }
 

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- org_lwjgl_input_Keyboard.cpp	9 Feb 2003 17:01:01 -0000	1.13
+++ org_lwjgl_input_Keyboard.cpp	12 Feb 2003 17:12:01 -0000	1.14
@@ -62,13 +62,12 @@
 static bool keyboard_grabbed;
 static bool buffer_enabled;
 static bool translation_enabled;
+static bool created = false;
 
 extern Display *disp;
 extern Window win;
 
-extern bool isFullscreen(void);
-
-extern bool isFocused(void);
+extern bool releaseInput(void);
 extern void handleMessages(void);
 
 /*
@@ -101,20 +100,16 @@
 	XUngrabKeyboard(disp, CurrentTime);
 }
 
-int updateKeyboardGrab() {
-	if (isFullscreen()) {
-		if (!keyboard_grabbed)
-			return grabKeyboard();
-	} else {
-		if (isFocused()) {
-			if (!keyboard_grabbed)
-				return grabKeyboard();
-		} else {
-			if (keyboard_grabbed)
-				ungrabKeyboard();
-		}
-	}
-	return GrabSuccess;
+void acquireKeyboard(void) {
+	if (!created)
+		return;
+	grabKeyboard();
+}
+
+void releaseKeyboard(void) {
+	if (!created)
+		return;
+	ungrabKeyboard();
 }
 
 /*
@@ -129,7 +124,7 @@
 	translation_enabled = false;
 	buffer_enabled = false;
 
-	if (updateKeyboardGrab() != GrabSuccess) {
+	if (grabKeyboard() != GrabSuccess) {
 #ifdef _DEBUG
 		printf("Could not grab keyboard\n");
 #endif
@@ -157,6 +152,7 @@
 	key_map[0x68] = 0xb5; // Numpad divide
 	
 	memset(key_buf, 0, KEYBOARD_SIZE*sizeof(unsigned char));
+	created = true;
 	return JNI_TRUE;
 }
 
@@ -170,6 +166,7 @@
 {
 	if (keyboard_grabbed)
 		ungrabKeyboard();
+	created = false;
 }
 
 XKeyEvent *nextEventElement(void) {
@@ -238,6 +235,17 @@
 	unsigned char keycode = getKeycode(event);
 	unsigned char state = eventState(event);
 	key_buf[keycode] = state;
+	if (key_buf[org_lwjgl_input_Keyboard_KEY_LMENU] == 1 ||
+			key_buf[org_lwjgl_input_Keyboard_KEY_RMENU] == 1) {
+		if (key_buf[org_lwjgl_input_Keyboard_KEY_TAB] == 1) {
+			if (releaseInput()) {
+				key_buf[org_lwjgl_input_Keyboard_KEY_RMENU] = 0;
+				key_buf[org_lwjgl_input_Keyboard_KEY_LMENU] = 0;
+				key_buf[org_lwjgl_input_Keyboard_KEY_TAB] = 0;
+				return;
+			}
+		}
+	}
 	if (buffer_enabled)
 		putEventElement(event);
 }
@@ -253,7 +261,6 @@
 	XEvent event;
 	unsigned char state;
 	
-	updateKeyboardGrab();
 	handleMessages();
 
 	memcpy((unsigned char*)buf, key_buf, KEYBOARD_SIZE*sizeof(unsigned char));
@@ -273,7 +280,6 @@
 	int state;
 	int num_events = 0;
 
-	updateKeyboardGrab();
 	handleMessages();
 
 	while (buf_count < KEYBOARD_BUFFER_SIZE * 2 && (key_event = nextEventElement()) != NULL) {

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- org_lwjgl_input_Mouse.cpp	9 Feb 2003 17:01:01 -0000	1.13
+++ org_lwjgl_input_Mouse.cpp	12 Feb 2003 17:12:01 -0000	1.14
@@ -55,13 +55,12 @@
 extern Display *disp;
 extern Window win;
 extern int screen;
-extern bool isFullscreen(void);
-extern bool isFocused(void);
 extern int getWindowWidth(void);
 extern int getWindowHeight(void);
 extern void handleMessages(void);
 
 static bool pointer_grabbed;
+static bool created = false;
 
 static jfieldID fid_has_wheel = NULL;
 static jfieldID fid_button_count = NULL;
@@ -124,13 +123,10 @@
 
 int grabPointer(void) {
 	int result;
-	int mask = EnterWindowMask | LeaveWindowMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
-	if (isFullscreen()) {
-		result = XGrabPointer(disp, win, False, mask, GrabModeAsync, GrabModeAsync, win, blank_cursor, CurrentTime);
-		XWarpPointer(disp, None, win, 0, 0, 0, 0, current_x, current_y);
-		XF86VidModeSetViewPort(disp, screen, 0, 0); // make sure we have a centered window
-	} else
-		result = XGrabPointer(disp, win, False, mask, GrabModeAsync, GrabModeAsync, None, blank_cursor, CurrentTime);
+	int mask = FocusChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
+	result = XGrabPointer(disp, win, False, mask, GrabModeAsync, GrabModeAsync, win, blank_cursor, CurrentTime);
+	XWarpPointer(disp, None, win, 0, 0, 0, 0, current_x, current_y);
+	XF86VidModeSetViewPort(disp, screen, 0, 0); // make sure we have a centered window
 	if (result == GrabSuccess)
 		pointer_grabbed = true;
 	return result;
@@ -141,20 +137,16 @@
 	XUngrabPointer(disp, CurrentTime);
 }
 
-int updatePointerGrab(JNIEnv *env, jclass clazz) {
-	if (isFullscreen()) {
-		if (!pointer_grabbed)
-			return grabPointer();
-	} else {
-		if (isFocused()) {
-			if (!pointer_grabbed)
-				return grabPointer();
-		} else {
-			if (pointer_grabbed)
-				ungrabPointer();
-		}
-	}
-	return GrabSuccess;
+void acquirePointer(void) {
+	if (!created)
+		return;
+	grabPointer();
+}
+
+void releasePointer(void) {
+	if (!created)
+		return;
+	ungrabPointer();
 }
 
 /*
@@ -180,12 +172,13 @@
 #endif
 		return JNI_FALSE;
 	}
-	if (updatePointerGrab(env, clazz) != GrabSuccess) {
+	if (grabPointer() != GrabSuccess) {
 #ifdef _DEBUG
 		printf("Could not grab pointer\n");
 #endif
 		return JNI_FALSE;
 	}
+	created = true;
 	return JNI_TRUE;
 }
 
@@ -200,6 +193,7 @@
 	if (pointer_grabbed)
 		ungrabPointer();
 	XFreeCursor(disp, blank_cursor);
+	created = false;
 }
 
 void handleButtonPress(XButtonEvent *event) {
@@ -248,6 +242,8 @@
 
 void warpPointer(void) {
 	int i;
+	if (!pointer_grabbed)
+		return;
 	// Reset pointer to middle of screen if inside a certain inner border
 	if (current_x < POINTER_WARP_BORDER || current_y < POINTER_WARP_BORDER || 
 			current_x > getWindowWidth() - POINTER_WARP_BORDER || current_y > getWindowHeight() - POINTER_WARP_BORDER) {
@@ -282,7 +278,6 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll
   (JNIEnv * env, jclass clazz)
 {
-	updatePointerGrab(env, clazz);
 	handleMessages();
 	int moved_x = current_x - last_x;
 	int moved_y = current_y - last_y;
@@ -295,17 +290,5 @@
 	last_z = current_z;
 	jbooleanArray buttons_array = (jbooleanArray)env->GetStaticObjectField(clazz, fid_buttons);
 	env->SetBooleanArrayRegion(buttons_array, 0, NUM_BUTTONS, buttons);
-	if (isFullscreen())
-		warpPointer();
-}
-
-
-/*
- * Class:     org_lwjgl_input_Mouse
- * Method:    nEnableBuffer
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_lwjgl_input_Mouse_nEnableBuffer
-  (JNIEnv * env, jclass clazz) {
-      printf("*** FIXME: nEnableBuffer not implemented!\n*");
+	warpPointer();
 }

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv29536/win32

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:
Don't allow the mouse to drift when failing poll

Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_input_Mouse.cpp	9 Feb 2003 19:51:53 -0000	1.9
+++ org_lwjgl_input_Mouse.cpp	12 Feb 2003 12:11:05 -0000	1.10
@@ -266,9 +266,13 @@
   HRESULT                 hRes; 
 
   // get data from the Mouse 
-  hRes = mDIDevice->GetDeviceState(sizeof(DIMOUSESTATE), &diMouseState); 
-
+  hRes = mDIDevice->GetDeviceState(sizeof(DIMOUSESTATE), &diMouseState);
   if (hRes != DI_OK) { 
+    // Don't allow the mouse to drift when failed
+    diMouseState.lX = 0;
+    diMouseState.lY = 0;
+    diMouseState.lZ = 0;
+
     // did the read fail because we lost input for some reason? 
     // if so, then attempt to reacquire. 
     if(hRes == DIERR_INPUTLOST || hRes == DIERR_NOTACQUIRED) {
@@ -281,7 +285,6 @@
       printf("Error getting mouse state: %d\n", hRes);
 #endif
     }
-    return;
   }
 
   mEnvironment->SetStaticIntField(clsMouse, fidMDX, (jint) diMouseState.lX);

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv28402/win32

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Don't allow to show the window menu

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- org_lwjgl_Display.cpp	12 Feb 2003 09:33:11 -0000	1.23
+++ org_lwjgl_Display.cpp	12 Feb 2003 12:07:50 -0000	1.24
@@ -148,36 +148,42 @@
 			case SC_SCREENSAVE:
 			case SC_MONITORPOWER:
 				return 0L;
+			case SC_MINIMIZE:
+				isMinimized = true;
+				appActivate(true);
 				break;
-      case SC_MINIMIZE:
-        isMinimized = true;
-        appActivate(true);
-        break;
-      case SC_RESTORE:
-        isMinimized = false;
-        appActivate(false);
-        break;
-      case SC_CLOSE:
-        environment->SetStaticBooleanField(clsDisplay, fidclose, true);
-        //don't continue processing this command since this 
-        //would shutdown the window, which the application might not want to
-        return 0L;
-			default:
-				break;
+			case SC_RESTORE:
+				isMinimized = false;
+				appActivate(false);
+				break;
+			case SC_CLOSE:
+				environment->SetStaticBooleanField(clsDisplay, fidclose, true);
+				//don't continue processing this command since this 
+				//would shutdown the window, which the application might not want to
+				return 0L;
+			default:
+				return 0L; // don't allow the window menu to show
 			}
-		}
+		}
+		break;
 		case WM_ACTIVATE:
 		{
-      switch(LOWORD(wParam)) {
-        case WA_ACTIVE:
-        case WA_CLICKACTIVE:
-          isMinimized = false;
-          break;
-        case WA_INACTIVE:
-          isMinimized = true;
-          break;
-      }
-      appActivate(!isMinimized);
+			switch(LOWORD(wParam)) {
+			case WA_ACTIVE:
+			case WA_CLICKACTIVE:
+				isMinimized = false;
+				break;
+			case WA_INACTIVE:
+				isMinimized = true;
+				break;
+			}
+			appActivate(!isMinimized);
+		}
+		break;
+		case WM_QUIT:
+		{
+			environment->SetStaticBooleanField(clsDisplay, fidclose, true);
+			return 0L;
 		}
 	}
 
@@ -201,15 +207,9 @@
 		hwnd,           // handle to window
 		0,  // first message
 		0,  // last message
-		PM_NOREMOVE      // removal options
+		PM_REMOVE      // removal options
 		)) {
 
-		if (GetMessage (&msg, NULL, 0, 0) <= 0) {
-#ifdef _DEBUG
-			printf("We should quit here...\n");
-#endif
-			return;
-		}
 		TranslateMessage(&msg);
       	DispatchMessage(&msg);
 	};

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv9263/win32

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:
Don't return -1 on keyboard read failure

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_input_Keyboard.cpp	12 Feb 2003 09:55:17 -0000	1.9
+++ org_lwjgl_input_Keyboard.cpp	12 Feb 2003 11:27:48 -0000	1.10
@@ -216,7 +216,7 @@
 				UINT virt_key = MapVirtualKey(rgdod[i].dwOfs, 1);
 				if (virt_key != 0) {
 					if (!GetKeyboardState(state))
-						return -1;
+						return 0;
 					num_chars = ToUnicode(virt_key, 
 										  rgdod[i].dwOfs,
 										  state,

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv4859/win32

Modified Files:
	org_lwjgl_input_Keyboard.cpp 
Log Message:
Don't return -1 on keyboard read failure

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_lwjgl_input_Keyboard.cpp	8 Feb 2003 16:33:00 -0000	1.8
+++ org_lwjgl_input_Keyboard.cpp	12 Feb 2003 09:55:17 -0000	1.9
@@ -244,43 +244,36 @@
 				}
 			}
 		}
-		return num_events;
 	} else if (ret == DI_BUFFEROVERFLOW) { 
 #ifdef _DEBUG
 		printf("Keyboard buffer overflowed\n");
 #endif
-		return -1;
 	} else if (ret == DIERR_INPUTLOST) {
 #ifdef _DEBUG
 		printf("Input lost\n");
 #endif
-		return -1;
 	} else if (ret == DIERR_NOTACQUIRED) {
 #ifdef _DEBUG
 		printf("not acquired\n");
 #endif
-		return -1;
 	} else if (ret == DIERR_INVALIDPARAM) {
 #ifdef _DEBUG
 		printf("invalid parameter\n");
 #endif
-		return -1;
 	} else if (ret == DIERR_NOTBUFFERED) {
 #ifdef _DEBUG
 		printf("not buffered\n");
 #endif
-		return -1;
 	} else if (ret == DIERR_NOTINITIALIZED) {
 #ifdef _DEBUG
 		printf("not inited\n");
 #endif
-		return -1;
 	} else {
 #ifdef _DEBUG
 		printf("unknown keyboard error\n");
 #endif
-		return -1;
 	}
+	return num_events;
 }
 
 /*

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv29660/win32

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
added check for software only modes

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- org_lwjgl_Display.cpp	10 Feb 2003 22:13:46 -0000	1.22
+++ org_lwjgl_Display.cpp	12 Feb 2003 09:33:11 -0000	1.23
@@ -445,9 +445,8 @@
 		return JNI_FALSE;
 	}
 
-	int flags = PFD_DRAW_TO_WINDOW |   // support window 
+	unsigned int flags = PFD_DRAW_TO_WINDOW |   // support window 
 		PFD_SUPPORT_OPENGL |   // support OpenGL 
-		PFD_GENERIC_ACCELERATED |
 		PFD_DOUBLEBUFFER;      // double buffered 
 
 	PIXELFORMATDESCRIPTOR pfd = { 
@@ -518,7 +517,13 @@
 		return JNI_FALSE;
 	}
 
-	if ((desc.dwFlags & flags) == 0) {
+	if ((desc.dwFlags & PFD_GENERIC_FORMAT) != 0 || (desc.dwFlags & PFD_GENERIC_ACCELERATED) != 0) {
+		printf("Mode not supported by hardware.\n");
+		destroyAll();
+		return JNI_FALSE;
+	}
+
+	if ((desc.dwFlags & flags) != flags) {
 		printf("Capabilities not supported.\n");
 		destroyAll();
 		return JNI_FALSE;

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv28210/win32

Modified Files:
	org_lwjgl_opengl_BaseGL.cpp 
Log Message:
replaced wglSwapLayerBuffers -> SwapBuffers

Index: org_lwjgl_opengl_BaseGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- org_lwjgl_opengl_BaseGL.cpp	8 Feb 2003 23:25:11 -0000	1.12
+++ org_lwjgl_opengl_BaseGL.cpp	12 Feb 2003 09:29:07 -0000	1.13
@@ -116,7 +116,7 @@
 	// Handle OS messages here
 	handleMessages();
 	// Then do the flip
-	wglSwapLayerBuffers(hdc, WGL_SWAP_MAIN_PLANE);
+	SwapBuffers(hdc);
 }
 
 /*

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input
In directory sc8-pr-cvs1:/tmp/cvs-serv13498

Modified Files:
	Mouse.java 
Log Message:
formatting and better javadoc

Index: Mouse.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Mouse.java	8 Feb 2003 19:30:07 -0000	1.12
+++ Mouse.java	10 Feb 2003 23:09:54 -0000	1.13
@@ -41,8 +41,9 @@
  * A raw Mouse interface. This can be used to poll the current state of the
  * mouse buttons, and determine the mouse movement delta since the last poll.
  * 
- * Up to 8 buttons are available. A scrolly wheel, if present, is the z
- * value. This will be in the range of -10000 to +10000.
+ * n buttons supported, n being a native limit. A scrolly wheel is also
+ * supported, if one such is available. All movement is reported as delta from
+ * last position.
  * 
  * @author cix_foo <ci...@us...>
  * @version $Revision$
@@ -68,8 +69,10 @@
 	/** Delta Z */
 	public static int dwheel;
   
-  /* Mouse capabilities */
+  /** Number of buttons supported by the mouse */
   public static int buttonCount = -1;
+  
+  /** Does this mouse support a scroll wheel */
   public static boolean hasWheel = false;
 
 	/**
@@ -93,6 +96,7 @@
 	
 	/**
 	 * "Create" the mouse. The display must first have been created.
+   * 
 	 * @throws Exception if the mouse could not be created for any reason
 	 */
 	public static void create() throws Exception {
@@ -143,7 +147,7 @@
 	/**
 	 * See if a particular mouse button is down.
 	 * 
-	 * @param button The index of the button you wish to test (0..buttonCount)
+	 * @param button The index of the button you wish to test (0..buttonCount-1)
 	 * @return true if the specified button is down
 	 */
 	public static boolean isButtonDown(int button) {

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input
In directory sc8-pr-cvs1:/tmp/cvs-serv11844

Modified Files:
	Controller.java 
Log Message:
formatting and better javadoc

Index: Controller.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Controller.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Controller.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Controller.java	23 Jan 2003 21:38:18 -0000	1.2
+++ Controller.java	10 Feb 2003 23:07:12 -0000	1.3
@@ -43,10 +43,8 @@
  * 
  * No buffering is available.
  *
- * Currently n (native limits, currently 128 - might change) buttons, the x, y,
- * z axis is supported along with a POV (or HAT) and a slider, where the z axis
- * represents a throttle. In the future the controller may support more buttons
- * and axises and other features. but this is a platform issue.
+ * Currently n (native limits) buttons, the x, y, z axis (also rotational x,y ,
+ * z axis) is supported along with a POV (or HAT) and a slider
  *
  * The Controller implementation currently only supports the first attached device.
  *
@@ -67,27 +65,27 @@
 
 	/** X position, range -1000 to 1000 */
 	public static int x = 0;
-  
-  /** X rotational position, range -1000 to 1000 */
-  public static int rx = 0;
-  
+
+	/** X rotational position, range -1000 to 1000 */
+	public static int rx = 0;
+
 	/** Y position, range -1000 to 1000 */
 	public static int y = 0;
-  
-  /** Y rotational position, range -1000 to 1000 */
-  public static int ry = 0;
-  
+
+	/** Y rotational position, range -1000 to 1000 */
+	public static int ry = 0;
+
 	/** Z position, range -1000 to 1000 */
 	public static int z = 0;
 
-  /** Z rotational position, range -1000 to 1000 */
-  public static int rz = 0;
+	/** Z rotational position, range -1000 to 1000 */
+	public static int rz = 0;
 
 	/** Position of Point of View from -1 to 27000 (360 degrees) */
 	public static int pov;
-  
-  /** Slider position, range -1000 to 1000 */
-  public static int slider = 0;  
+
+	/** Slider position, range -1000 to 1000 */
+	public static int slider = 0;
 
 	/** Constant specifying centered POV */
 	public static final int POV_CENTER = -1;
@@ -104,16 +102,32 @@
 	/** Constant specifying westward POV */
 	public static final int POV_WEST = 9000;
 
-	/* Controller capabilities */
+	/** Number of buttons on the controller */
 	public static int buttonCount = -1;
-  public static boolean hasXAxis = false;
-  public static boolean hasRXAxis = false;
-  public static boolean hasYAxis = false;
-  public static boolean hasRYAxis = false;
-  public static boolean hasZAxis = false;
-  public static boolean hasRZAxis = false;
+
+	/** Does this controller support a x axis */
+	public static boolean hasXAxis = false;
+
+	/** Does this controller support a rotational x axis */
+	public static boolean hasRXAxis = false;
+
+	/** Does this controller support an y axis */
+	public static boolean hasYAxis = false;
+
+	/** Does this controller support a rotational y axis */
+	public static boolean hasRYAxis = false;
+
+	/** Does this controller support a z axis */
+	public static boolean hasZAxis = false;
+
+	/** Does this controller support a rotational z axis */
+	public static boolean hasRZAxis = false;
+
+	/** Does this controller support a Point-Of-View (hat) */
 	public static boolean hasPOV = false;
-  public static boolean hasSlider = false;
+
+	/** Does this controller support a slider */
+	public static boolean hasSlider = false;
 
 	/**
 	 * Controller cannot be constructed.
@@ -165,9 +179,9 @@
 	}
 
 	/**
-	 * See if a particular button is down.
+	 * Tests if a particular button is down.
 	 * 
-	 * @param button The index of the button you wish to test (0..buttonCount)
+	 * @param button The index of the button you wish to test (0..buttonCount-1)
 	 * @return true if the specified button is down
 	 * @see #buttonCount
 	 */

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1:/tmp/cvs-serv9257

Modified Files:
	DisplayMode.java 
Log Message:
formatting and better javadoc

Index: DisplayMode.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/DisplayMode.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/DisplayMode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DisplayMode.java	22 Dec 2002 19:52:15 -0000	1.6
+++ DisplayMode.java	10 Feb 2003 23:02:32 -0000	1.7
@@ -35,7 +35,9 @@
 /**
  * $Id$
  *
- * Describes a display mode.
+ * This class encapsulates the properties for a given display mode.
+ * This class is not instantiable, and is aquired from the <code>Display.
+ * getAvailableDisplayModes()</code> method.
  * 
  * @author cix_foo <ci...@us...>
  * @version $Revision$
@@ -43,6 +45,7 @@
 
 public final class DisplayMode {
 	
+  /** properties of the display mode */
 	public final int width, height, bpp, freq, alpha, depth, stencil;
 
 	/**
@@ -61,12 +64,15 @@
 	}
 	
 
-	/* (non-Javadoc)
+	/**
+   * Tests for <code>DisplayMode</code> equality
+   * 
 	 * @see java.lang.Object#equals(Object)
 	 */
 	public boolean equals(Object obj) {
-		if (obj == null || !(obj instanceof DisplayMode))
+		if (obj == null || !(obj instanceof DisplayMode)) {
 			return false;
+		}
 			
 		DisplayMode dm = (DisplayMode) obj;
 		return dm.width == width
@@ -78,14 +84,18 @@
 			&& dm.stencil == stencil;
 	}
 
-	/* (non-Javadoc)
+	/**
+   * Retrieves the hashcode for this object
+   * 
 	 * @see java.lang.Object#hashCode()
 	 */
 	public int hashCode() {
 		return width ^ height ^ freq ^ bpp ^ alpha ^ (depth << 8) ^ (stencil << 24);
 	}
 
-	/* (non-Javadoc)
+	/**
+   * Retrieves a String representation of this <code>DisplayMode</code>
+   * 
 	 * @see java.lang.Object#toString()
 	 */
 	public String toString() {
@@ -106,5 +116,4 @@
 		sb.append("bit stencil");
 		return sb.toString();
 	}
-
-}
+}
\ No newline at end of file

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1:/tmp/cvs-serv6554

Modified Files:
	Display.java 
Log Message:
formatting and better javadoc

Index: Display.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Display.java	9 Feb 2003 17:55:30 -0000	1.14
+++ Display.java	10 Feb 2003 22:57:42 -0000	1.15
@@ -54,13 +54,13 @@
 
 	/** The current display mode, if created */
 	private static DisplayMode mode;
-	
+
 	/** A pointer to the native display window. On Windows this will be an hWnd. */
 	private static int handle;
-  
-  /** Whether or not the display has been requested to shutdown by the user */
-  private static boolean closeRequested = false;
-	
+
+	/** Whether or not the display has been requested to shutdown by the user */
+	private static boolean closeRequested = false;
+
 	/**
 	 * No construction allowed.
 	 */
@@ -95,8 +95,9 @@
 		String title)
 		throws Exception {
 
-		if (created)
+		if (created) {
 			return;
+		}
 
 		if (!nCreate(displayMode.width,
 			displayMode.height,
@@ -106,8 +107,9 @@
 			displayMode.depth,
 			displayMode.stencil,
 			fullscreen,
-			title))
+			title)) {
 			throw new Exception("Failed to set display mode to " + displayMode);
+		}
 
 		created = true;
 		mode = displayMode;
@@ -135,19 +137,23 @@
 	 * been created no action is taken.
 	 */
 	public static void destroy() {
-		if (!created)
+		if (!created) {
 			return;
+		}
+
 		nDestroy();
 		created = false;
 		mode = null;
 	}
-	
+
 	/**
 	 * Native method to destroy the display. This will reset the handle.
 	 */
 	private static native void nDestroy();
 
 	/**
+	 * Retrieves the width of the created display
+	 * 
 	 * @return the current display width.
 	 * @throws AssertionError if the display has not been created yet.
 	 */
@@ -157,6 +163,8 @@
 	}
 
 	/**
+	 * Retrieves the height of the created display
+	 * 
 	 * @return the current display height.
 	 * @throws AssertionError if the display has not been created yet.
 	 */
@@ -166,6 +174,8 @@
 	}
 
 	/**
+	 * Retrieves the current display depth of the created display
+	 * 
 	 * @return the current display depth.
 	 * @throws AssertionError if the display has not been created yet.
 	 */
@@ -175,6 +185,8 @@
 	}
 
 	/**
+	 * Retrieves the current display frequency of the created display
+	 * 
 	 * @return the current display frequency.
 	 * @throws AssertionError if the display has not been created yet.
 	 */
@@ -182,8 +194,11 @@
 		assert created : "The display has not been created yet.";
 		return mode.freq;
 	}
-	
+
 	/**
+	 * Retrieves the <code>DisplayMode</code> that the display has currently been
+	 * set to.
+	 * 
 	 * @return the current display mode, or null if the display is not yet created
 	 * @throws AssertionError if the display has not been created yet.
 	 */
@@ -191,8 +206,10 @@
 		assert created : "The display has not been created yet.";
 		return mode;
 	}
-	
+
 	/**
+	 * Retrieves the native handle to the created window
+	 * 
 	 * @return the native handle
 	 * @throws AssertionError if the display has not been created yet.
 	 */
@@ -200,8 +217,10 @@
 		assert created : "The display has not been created yet.";
 		return handle;
 	}
-	
+
 	/**
+	 * Tests whether or not the display has been created
+	 * 
 	 * @return true if the display has been created
 	 */
 	public static boolean isCreated() {
@@ -217,13 +236,16 @@
 	 * @return true if the display is minimized
 	 */
 	public static native boolean isMinimized();
-  
-  /**
-   * Determines if the user has requested that the application should close.
-   * 
-   * @return true if the user has requested that the application should close
-   */
-  public static boolean isCloseRequested() {
-    return closeRequested;
-  }
+
+	/**
+	 * Determines if the user has requested that the application should close.
+	 * When a user has requested that the application should shutdown, it is up to
+	 * the application to perform the actual shutdown and cleanup of any allocated
+	 * resources.
+	 * 
+	 * @return true if the user has requested that the application should close
+	 */
+	public static boolean isCloseRequested() {
+		return closeRequested;
+	}
 }

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv17380

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
fix: releasing device context for window, as per msdn docs

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- org_lwjgl_Display.cpp	8 Feb 2003 23:25:11 -0000	1.21
+++ org_lwjgl_Display.cpp	10 Feb 2003 22:13:46 -0000	1.22
@@ -75,6 +75,11 @@
 	if (isFullscreen)
 		ChangeDisplaySettings(NULL, 0);
 
+  //release dc
+  if (hdc != NULL) {
+    ReleaseDC(hwnd, hdc);
+  }
+
 	if (hwnd != NULL) {
 		// Vape the window
 		DestroyWindow(hwnd);
@@ -163,7 +168,6 @@
 		}
 		case WM_ACTIVATE:
 		{
-
       switch(LOWORD(wParam)) {
         case WA_ACTIVE:
         case WA_CLICKACTIVE:

Update of /cvsroot/java-game-lib/LWJGL/src/native/common
In directory sc8-pr-cvs1:/tmp/cvs-serv6225/src/native/common

Modified Files:
	org_lwjgl_opengl_CoreGL.cpp 
Log Message:
Fixed CHECK ERROR bug

Index: org_lwjgl_opengl_CoreGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_opengl_CoreGL.cpp	25 Nov 2002 13:33:12 -0000	1.1
+++ org_lwjgl_opengl_CoreGL.cpp	10 Feb 2003 00:00:48 -0000	1.2
@@ -470,7 +470,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor3bv((signed char *)v);
-	CHECK_GL_ERROR
 }
 
 /*
@@ -482,7 +481,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor3dv((double *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -495,7 +493,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor3fv((float *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -508,7 +505,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor3iv((int *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -521,7 +517,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor3sv((short *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -534,7 +529,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor3ubv((unsigned char *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -547,7 +541,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor3uiv((unsigned int *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -560,7 +553,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor3usv((unsigned short *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -573,7 +565,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor4bv((signed char *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -586,7 +577,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor4dv((double *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -599,7 +589,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor4fv((float *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -612,7 +601,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor4iv((int *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -625,7 +613,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor4sv((short *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -638,7 +625,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor4ubv((unsigned char *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -651,7 +637,6 @@
   (JNIEnv *env, jobject obj, jint v)
 {
 	glColor4uiv((unsigned int *)v);
-	CHECK_GL_ERROR
 }
 
 
@@ -862,7 +847,6 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_edgeFlag(JNIEnv * env, jobject obj, jboolean p0)
 {
 	glEdgeFlag((GLboolean) p0);
-	CHECK_GL_ERROR
 }
 
 /*
@@ -872,7 +856,6 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CoreGL_edgeFlagv(JNIEnv * env, jobject obj, jint p0)
 {
 	glEdgeFlagv((const unsigned char *) p0);
-	CHECK_GL_ERROR
 }
 
 /*