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

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

Modified Files:
	org_lwjgl_input_Controller.cpp org_lwjgl_input_Mouse.cpp 
Log Message:


Index: org_lwjgl_input_Controller.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Controller.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Controller.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- org_lwjgl_input_Controller.cpp	30 Sep 2003 11:14:06 -0000	1.13
+++ org_lwjgl_input_Controller.cpp	30 Sep 2003 11:52:32 -0000	1.14
@@ -37,13 +37,15 @@
  * @author Brian Matzon <br...@ma...>
  * @version $Revision$
  */
+

 
 #define WIN32_LEAN_AND_MEAN
 #include "org_lwjgl_input_Controller.h"
 #include <windows.h>
 #undef  DIRECTINPUT_VERSION
 #define DIRECTINPUT_VERSION 0x0500
-#include <dinput.h>
+#include <dinput.h>

+#include <Window.h>

 
 #define CONTROLLER_AXISMAX 1000       // Maxmimum range to which we'll gauge the swing
 #define CONTROLLER_AXISMIN -1000      // Minimum range to which we'll gauge the swing
@@ -183,7 +185,6 @@
     ShutdownController();
     return;
   }
-  return cCreate_success ? JNI_TRUE : JNI_FALSE;
 }
 
 /*

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.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- org_lwjgl_input_Mouse.cpp	30 Sep 2003 11:14:06 -0000	1.28
+++ org_lwjgl_input_Mouse.cpp	30 Sep 2003 11:52:32 -0000	1.29
@@ -142,7 +142,6 @@
 		printf("Failed to acquire mouse\n");
 #endif
 	}
-	return mCreate_success ? JNI_TRUE : JNI_FALSE;
 }
 
 /*

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

Modified Files:
	org_lwjgl_input_Controller.cpp org_lwjgl_input_Keyboard.cpp 
	org_lwjgl_input_Mouse.cpp 
Log Message:


Index: org_lwjgl_input_Controller.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Controller.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Controller.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_input_Controller.cpp	7 Apr 2003 17:49:13 -0000	1.3
+++ org_lwjgl_input_Controller.cpp	30 Sep 2003 11:14:06 -0000	1.4
@@ -38,6 +38,7 @@
  * @version $Revision$
  */
 #include <jni.h>
+#include <Window.h>
 #include "org_lwjgl_input_Controller.h"
 
 /**
@@ -49,8 +50,8 @@
 /**
  * Called when the Controller instance is to be created
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Controller_nCreate(JNIEnv *env, jclass clazz) {
-  return JNI_FALSE;
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Controller_nCreate(JNIEnv *env, jclass clazz) {
+	throwException(env, "Controller not implemented");
 }
 
 /*

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.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- org_lwjgl_input_Keyboard.cpp	23 Aug 2003 09:47:58 -0000	1.26
+++ org_lwjgl_input_Keyboard.cpp	30 Sep 2003 11:14:06 -0000	1.27
@@ -131,7 +131,7 @@
  * Method:    nCreate
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nCreate
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nCreate
   (JNIEnv * env, jclass clazz)
 {
 	for (int i =  0; i < KEYBOARD_SIZE; i++)
@@ -162,7 +162,6 @@
 	buffer_enabled = false;
 	should_grab = true;
 	updateGrab();
-	return JNI_TRUE;
 }
 
 /*
@@ -300,11 +299,10 @@
  * Method:    nEnableTranslation
  * Signature: ()I
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation
   (JNIEnv *env, jclass clazz)
 {
 	translation_enabled = true;
-	return JNI_TRUE;
 }
 
 /*

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.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- org_lwjgl_input_Mouse.cpp	29 Aug 2003 08:00:44 -0000	1.32
+++ org_lwjgl_input_Mouse.cpp	30 Sep 2003 11:14:06 -0000	1.33
@@ -265,7 +265,7 @@
  * Method:    nCreate
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Mouse_nCreate
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nCreate
   (JNIEnv * env, jclass clazz)
 {
 	int i;
@@ -276,10 +276,8 @@
 	for (i = 0; i < NUM_BUTTONS; i++)
 		buttons[i] = JNI_FALSE;
 	if (!blankCursor()) {
-#ifdef _DEBUG
-		printf("Could not create blank cursor\n");
-#endif
-		return JNI_FALSE;
+		throwException(env, "Could not create blank cursor");
+		return;
 	}
 	current_cursor = blank_cursor;
         native_cursor = false;
@@ -288,7 +286,6 @@
         pointer_grabbed = false;
 	updateGrab();
 	loadXcursor();
-	return JNI_TRUE;
 }
 
 /*

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

Modified Files:
	org_lwjgl_input_Controller.cpp org_lwjgl_input_Keyboard.cpp 
	org_lwjgl_input_Mouse.cpp 
Log Message:


Index: org_lwjgl_input_Controller.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Controller.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Controller.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- org_lwjgl_input_Controller.cpp	16 May 2003 18:39:46 -0000	1.12
+++ org_lwjgl_input_Controller.cpp	30 Sep 2003 11:14:06 -0000	1.13
@@ -118,7 +118,7 @@
 /**
  * Called when the Controller instance is to be created
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Controller_nCreate(JNIEnv *env, jclass clazz) {
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Controller_nCreate(JNIEnv *env, jclass clazz) {
   // Create the DirectInput object. 
   HRESULT hr;
   hr = DirectInputCreate(dll_handle, DIRECTINPUT_VERSION, &cDI, NULL); 
@@ -127,26 +127,22 @@
     printf("DirectInputCreate failed\n");
  #endif
     ShutdownController();
-    return JNI_FALSE;
+    return;
   }
 
   /*  Find all Controllers */
   EnumerateControllers();
   if (!cCreate_success) {
-#if _DEBUG
-    printf("EnumerateControllers failed\n");
-#endif
+    throwException(env, "Failed to enumerate.");
     ShutdownController();
-    return JNI_FALSE;
+    return;
   }
 
   /* check that we got at least 1 controller */
   if (cDIDevice == NULL) {
-#if _DEBUG
-    printf("No devices found during enumeration\n");
-#endif
+    throwException(env, "No devices found.");
     ShutdownController();
-    return JNI_FALSE;
+    return;
   }
 
   //check for first time initialization - need to detect capabilities
@@ -157,11 +153,9 @@
   /* Enumerate capabilities of Controller */
   EnumerateControllerCapabilities();
   if (!cCreate_success) {
-#if _DEBUG
-    printf("EnumerateControllerCapabilities failed\n");
-#endif
+    throwException(env, "Falied to enumerate capabilities.");
     ShutdownController();
-    return JNI_FALSE;
+    return;
   }
 
   /* Do setup of Controller */
@@ -185,11 +179,9 @@
   /* Aquire the Controller */
   hr = cDIDevice->Acquire();
   if(FAILED(hr)) {
-#if _DEBUG
-    printf("Acquire failed\n");
-#endif
+    throwException(env, "Acquire failed");
     ShutdownController();
-    return JNI_FALSE;
+    return;
   }
   return cCreate_success ? JNI_TRUE : JNI_FALSE;
 }
@@ -234,7 +226,7 @@
 /**
  * Shutdown DI
  */
-void ShutdownController() {
+static void ShutdownController() {
   // release device
   if (cDIDevice != NULL) {
     cDIDevice->Unacquire();
@@ -246,7 +238,7 @@
 /**
  * Enumerates the capabilities of the Controller attached to the system
  */
-void EnumerateControllerCapabilities() {
+static void EnumerateControllerCapabilities() {
   HRESULT hr;
   hr = cDIDevice->EnumObjects(EnumControllerObjectsCallback, NULL, DIDFT_ALL);
   if FAILED(hr) { 
@@ -262,7 +254,7 @@
 /**
  * Enumerates the Controllers attached to the system
  */
-void EnumerateControllers() {
+static void EnumerateControllers() {
   HRESULT hr;
   hr = cDI->EnumDevices(DIDEVTYPE_JOYSTICK, EnumControllerCallback, 0, DIEDFL_ATTACHEDONLY);
   if FAILED(hr) { 
@@ -322,7 +314,7 @@
 /**
  * Creates the specified device as a Controller
  */
-void CreateController(LPCDIDEVICEINSTANCE lpddi) {
+static void CreateController(LPCDIDEVICEINSTANCE lpddi) {
   HRESULT hr;
   hr = cDI->CreateDevice(lpddi->guidInstance, (LPDIRECTINPUTDEVICE*) &cDIDevice, NULL);
   if FAILED(hr) {	
@@ -338,7 +330,7 @@
 /**
  * Sets up the Controller properties
  */ 
-void SetupController() {
+static void SetupController() {
   // set Controller data format
   if(cDIDevice->SetDataFormat(&c_dfDIJoystick2) != DI_OK) {
 #if _DEBUG
@@ -460,7 +452,7 @@
 /**
  * Sets the fields on the Controller
  */
-void InitializeControllerFields() {
+static void InitializeControllerFields() {
   //create buttons array
   jbooleanArray cButtonsArray = cEnvironment->NewBooleanArray(cButtoncount);
   
@@ -471,7 +463,7 @@
 /**
  * Updates the fields on the Controller
  */
-void UpdateControllerFields() {
+static void UpdateControllerFields() {
   HRESULT                 hRes; 
 
   // get data from the Controller 
@@ -543,7 +535,7 @@
 /**
  * Sets the capabilities of the Controller
  */
-void SetControllerCapabilities() {
+static void SetControllerCapabilities() {
   //set buttoncount
   cEnvironment->SetStaticIntField(clsController, fidCButtonCount, cButtoncount);
 
@@ -567,7 +559,7 @@
 /**
  * Caches the field ids for quicker access
  */
-void CacheControllerFields() {
+static void CacheControllerFields() {
   fidCButtonCount  = cEnvironment->GetStaticFieldID(clsController, "buttonCount", "I");
   fidCHasXAxis     = cEnvironment->GetStaticFieldID(clsController, "hasXAxis", "Z");
   fidCHasRXAxis    = cEnvironment->GetStaticFieldID(clsController, "hasRXAxis", "Z");
@@ -586,4 +578,4 @@
   fidCRZ           = cEnvironment->GetStaticFieldID(clsController, "rz", "I");
   fidCPOV          = cEnvironment->GetStaticFieldID(clsController, "pov", "I");
   fidCSlider       = cEnvironment->GetStaticFieldID(clsController, "slider", "I");
-}
\ No newline at end of file
+}

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.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- org_lwjgl_input_Keyboard.cpp	11 Sep 2003 08:00:28 -0000	1.23
+++ org_lwjgl_input_Keyboard.cpp	30 Sep 2003 11:14:06 -0000	1.24
@@ -80,38 +80,30 @@
  * Method:    nCreate
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nCreate
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nCreate
   (JNIEnv * env, jclass clazz)
 {
 	translationEnabled = false;
 	// Check to see if we're already initialized
 	if (lpdiKeyboard != NULL) {
-#ifdef _DEBUG
-		printf("Keyboard already created.\n");
-#endif
-		return JNI_FALSE;
+		throwException(env, "Keyboard already created.");
+		return;
 	}
 
 	if (hwnd == NULL) {
-#ifdef _DEBUG
-		printf("No window\n");
-#endif
-		return JNI_FALSE;
+		throwException(env, "No window.");
+		return;
 	}
 
 	// Create a keyboard device
 	if (lpdi->CreateDevice(GUID_SysKeyboard, &lpdiKeyboard, NULL) != DI_OK) {
-#ifdef _DEBUG
-		printf("Failed to create keyboard\n");
-#endif
-		return JNI_FALSE;
+		throwException(env, "Failed to create keyboard.");
+		return;
 	}
 
 	if (lpdiKeyboard->SetCooperativeLevel(hwnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND) != DI_OK) {
-#ifdef _DEBUG
-		printf("Failed to set keyboard cooperation mode\n");
-#endif
-		return JNI_FALSE;
+		throwException(env, "Failed to set keyboard cooperation mode.");
+		return;
 	}
 
 	// Tell 'em wot format to be in (the default "you are a mouse and keyboard" format)
@@ -131,9 +123,6 @@
 		printf("Failed to acquire keyboard\n");
 #endif	
 	}
-
-	return JNI_TRUE;
-
 }
 
 /*
@@ -308,7 +297,7 @@
  * Method:    nEnableTranslation
  * Signature: ()V
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation
   (JNIEnv *, jclass)
 {
 	// We can't do translation on DOS boxes it seems so we'll have to throw a wobbler
@@ -318,13 +307,12 @@
 	osvi.dwOSVersionInfoSize = sizeof(osvi);
 	GetVersionEx(&osvi);
 	
-	if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {

+	if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
 		useUnicode = true;
 	} else {
 		useUnicode = false;
 	}
-	translationEnabled = true;

-	return JNI_TRUE;

+	translationEnabled = true;
 }
 
 /*

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.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- org_lwjgl_input_Mouse.cpp	29 Aug 2003 08:00:44 -0000	1.27
+++ org_lwjgl_input_Mouse.cpp	30 Sep 2003 11:14:06 -0000	1.28
@@ -102,7 +102,7 @@
 /**
  * Called when the Mouse instance is to be created
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Mouse_nCreate(JNIEnv *env, jclass clazz) {
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nCreate(JNIEnv *env, jclass clazz) {
 	HRESULT hr;
 
 	mEnvironment = env;
@@ -120,11 +120,9 @@
 		/* Enumerate capabilities of Mouse */
 		EnumerateMouseCapabilities();
 		if (!mCreate_success) {
-#if _DEBUG
-			printf("EnumerateMouseCapabilities failed\n");
-#endif
+			throwException(env, "Failed to enumerate.");
 			ShutdownMouse();
-			return JNI_FALSE;
+			return;
 		}
 		/* Do setup of Mouse */
 		SetupMouse();
@@ -171,9 +169,6 @@
 			throwException(env, "null device!");
 		mDIDevice->Unacquire();
 		if(mDIDevice->SetCooperativeLevel(hwnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND) != DI_OK) {
-#if _DEBUG
-			printf("SetCooperativeLevel failed\n");
-#endif
 			throwException(env, "Could not set the CooperativeLevel.");
 		    return;
 		}
@@ -197,9 +192,6 @@
 			SetCursor(NULL);
 			mDIDevice->Unacquire();
 			if(mDIDevice->SetCooperativeLevel(hwnd, DISCL_EXCLUSIVE | DISCL_FOREGROUND) != DI_OK) {
-#if _DEBUG
-				printf("SetCooperativeLevel failed\n");
-#endif
 				throwException(env, "Could not set the CooperativeLevel.");
 				return;
 			}

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

Modified Files:
	org_lwjgl_input_Keyboard.cpp org_lwjgl_opengl_Window.cpp 
Log Message:
boolean results -> Exceptions

Index: org_lwjgl_input_Keyboard.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_input_Keyboard.cpp	1 Jan 2003 03:58:03 -0000	1.4
+++ org_lwjgl_input_Keyboard.cpp	30 Sep 2003 10:52:05 -0000	1.5
@@ -39,11 +39,11 @@
  * @version $Revision$
  */
 
-#include <Carbon/Carbon.h>
-#include <assert.h>
 #include "org_lwjgl_input_Keyboard.h"
 
-KeyMap keyMap;
+#define KEYBOARD_BUFFER_SIZE 50
+#define KEYBOARD_SIZE 256
+#define KEY_EVENT_BACKLOG 40
 
 /*
  * Class:     org_lwjgl_input_Keyboard
@@ -53,32 +53,16 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_initIDs
   (JNIEnv * env, jclass clazz)
 {
-	// Get a global class instance, just to be sure
-	static jobject globalClassLock = NULL;
-
-	if (globalClassLock == NULL) {
-		globalClassLock = env->NewGlobalRef(clazz);
-	}
-
-	//fid_readBuffer = env->GetStaticFieldID(clazz, "readBuffer", "Ljava/nio/ByteBuffer;");
-	//fid_readBufferAddress = env->GetStaticFieldID(clazz, "readBufferAddress", "I");
 }
 
-
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nCreate
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nCreate
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nCreate
   (JNIEnv * env, jclass clazz)
 {
-
-#ifdef _DEBUG
-	printf("Creating OSX Carbon keyboard interface\n");
-#endif
-
-	return JNI_TRUE;
 }
 
 /*
@@ -89,24 +73,16 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nDestroy
   (JNIEnv * env, jclass clazz)
 {
-	// no specific methodology for doing this in OSX input system
-#ifdef _DEBUG
-	printf("Destroying OSX Carbon keyboard interface\n");
-#endif	
 }
 
-
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nPoll
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nPoll
-  (JNIEnv * env, jclass clazz, jint buf)
+  (JNIEnv * env, jclass clazz, jobject buffer)
 {
-	// get the keymap from the operating system's carbon layer
-	//
-	GetKeys( keyMap );
 }
 
 /*
@@ -114,10 +90,18 @@
  * Method:    nRead
  * Signature: (I)V
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nRead
-  (JNIEnv * env, jclass clazz, jint keys)
+JNIEXPORT int JNICALL Java_org_lwjgl_input_Keyboard_nRead
+  (JNIEnv * env, jclass clazz)
+{
+
+/*
+ * Class:     org_lwjgl_input_Keyboard
+ * Method:    nEnableTranslation
+ * Signature: ()I
+ */
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation
+  (JNIEnv *env, jclass clazz)
 {
-      return 0;
 }
 
 /*
@@ -128,7 +112,14 @@
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nEnableBuffer
   (JNIEnv * env, jclass clazz)
 {
-	printf("Buffered input is currently not available\n");
-	
-	return JNI_FALSE;
+}
+
+/*
+ * Class:     org_lwjgl_input_Keyboard
+ * Method:    nisStateKeySet
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nisStateKeySet(JNIEnv *env, jclass clazz, jint key)
+{
+  return org_lwjgl_input_Keyboard_STATE_UNKNOWN;
 }

Index: org_lwjgl_opengl_Window.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- org_lwjgl_opengl_Window.cpp	29 Sep 2003 11:58:35 -0000	1.8
+++ org_lwjgl_opengl_Window.cpp	30 Sep 2003 10:52:05 -0000	1.9
@@ -73,24 +73,22 @@
 }
 
 static pascal OSStatus doQuit(EventHandlerCallRef next_handler, EventRef event, void *user_data) {
-printf("Close requested\n");
 	close_requested = true;
 	return noErr;
 }
 
 static void registerEventHandlers(JNIEnv *env) {
-	EventTypeSpec event_type;
+	EventTypeSpec event_types[2];
 	OSStatus err;
 	EventHandlerUPP handler_upp = NewEventHandlerUPP(doQuit);
-	event_type.eventClass = kEventClassWindow;
-	event_type.eventKind  = kEventWindowClose;
-	err = InstallWindowEventHandler(win_ref, handler_upp, 1, &event_type, NULL, NULL);
+	event_types[0].eventClass = kEventClassWindow;
+	event_types[0].eventKind  = kEventWindowClose;
+	err = InstallWindowEventHandler(win_ref, handler_upp, 1, event_types, NULL, NULL);
+	DisposeEventHandlerUPP(handler_upp);
 	if (noErr != err) {
-		DisposeEventHandlerUPP(handler_upp);
 		throwException(env, "Could not register window event handler");
 		return;
 	}
-	DisposeEventHandlerUPP(handler_upp);
 }
 
 static void destroy(void) {
@@ -125,7 +123,6 @@
 		throwException(env, "Could not create context");
 		return false;
 	}
-	//if (aglSetFullScreen(context, 800, 600, 85, 0) == GL_FALSE) {
 	if (aglSetDrawable(context, drawable) == GL_FALSE) {
 		aglDestroyContext(context);
 		throwException(env, "Could not attach context");
@@ -180,15 +177,21 @@
 		throwException(env, "Could not load gl function pointers");
 		return;
 	}
-	TransitionWindow(win_ref, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL);
+	ShowWindow(win_ref);
 	SelectWindow(win_ref);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_update
   (JNIEnv *env, jclass clazz) 
 {
+	RunApplicationEventLoop();
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_swapBuffers(JNIEnv * env, jclass clazz)
+{                                                                                                                                                                                              
 	aglSwapBuffers(context);
 }
+                                                                                                                                                                
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nDestroy
   (JNIEnv *env, jclass clazz)

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

Modified Files:
	org_lwjgl_input_Controller.h org_lwjgl_input_Keyboard.h 
	org_lwjgl_input_Mouse.h 
Log Message:
boolean results -> Exceptions

Index: org_lwjgl_input_Controller.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Controller.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Controller.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- org_lwjgl_input_Controller.h	3 Jan 2003 18:47:42 -0000	1.1
+++ org_lwjgl_input_Controller.h	30 Sep 2003 10:52:05 -0000	1.2
@@ -11,9 +11,13 @@
 /* Inaccessible static: created */
 /* Inaccessible static: buttons */
 /* Inaccessible static: x */
+/* Inaccessible static: rx */
 /* Inaccessible static: y */
+/* Inaccessible static: ry */
 /* Inaccessible static: z */
+/* Inaccessible static: rz */
 /* Inaccessible static: pov */
+/* Inaccessible static: slider */
 #undef org_lwjgl_input_Controller_POV_CENTER
 #define org_lwjgl_input_Controller_POV_CENTER -1L
 #undef org_lwjgl_input_Controller_POV_NORTH
@@ -25,8 +29,17 @@
 #undef org_lwjgl_input_Controller_POV_WEST
 #define org_lwjgl_input_Controller_POV_WEST 9000L
 /* Inaccessible static: buttonCount */
+/* Inaccessible static: hasXAxis */
+/* Inaccessible static: hasRXAxis */
+/* Inaccessible static: hasYAxis */
+/* Inaccessible static: hasRYAxis */
 /* Inaccessible static: hasZAxis */
+/* Inaccessible static: hasRZAxis */
 /* Inaccessible static: hasPOV */
+/* Inaccessible static: hasSlider */
+/* Inaccessible static: buttonName */
+/* Inaccessible static: buttonMap */
+/* Inaccessible static: initialized */
 /* Inaccessible static: class_00024org_00024lwjgl_00024input_00024Controller */
 /*
  * Class:     org_lwjgl_input_Controller
@@ -39,9 +52,9 @@
 /*
  * Class:     org_lwjgl_input_Controller
  * Method:    nCreate
- * Signature: ()Z
+ * Signature: ()V
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Controller_nCreate
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Controller_nCreate
   (JNIEnv *, jclass);
 
 /*

Index: org_lwjgl_input_Keyboard.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Keyboard.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Keyboard.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_input_Keyboard.h	23 Aug 2003 09:45:22 -0000	1.6
+++ org_lwjgl_input_Keyboard.h	30 Sep 2003 10:52:05 -0000	1.7
@@ -276,8 +276,8 @@
 /* Inaccessible static: character */
 /* Inaccessible static: key */
 /* Inaccessible static: state */
-/* Inaccessible static: class_000240 */
-/* Inaccessible static: class_000241 */
+/* Inaccessible static: initialized */
+/* Inaccessible static: class_00024org_00024lwjgl_00024input_00024Keyboard */
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    initIDs
@@ -289,9 +289,9 @@
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nCreate
- * Signature: ()Z
+ * Signature: ()V
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nCreate
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nCreate
   (JNIEnv *, jclass);
 
 /*
@@ -321,9 +321,9 @@
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nEnableTranslation
- * Signature: ()Z
+ * Signature: ()V
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation
   (JNIEnv *, jclass);
 
 /*

Index: org_lwjgl_input_Mouse.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Mouse.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_input_Mouse.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_input_Mouse.h	29 Aug 2003 08:00:44 -0000	1.6
+++ org_lwjgl_input_Mouse.h	30 Sep 2003 10:52:05 -0000	1.7
@@ -24,6 +24,7 @@
 /* Inaccessible static: currentCursor */
 /* Inaccessible static: buttonName */
 /* Inaccessible static: buttonMap */
+/* Inaccessible static: initialized */
 /* Inaccessible static: class_00024org_00024lwjgl_00024input_00024Mouse */
 /*
  * Class:     org_lwjgl_input_Mouse
@@ -68,9 +69,9 @@
 /*
  * Class:     org_lwjgl_input_Mouse
  * Method:    nCreate
- * Signature: ()Z
+ * Signature: ()V
  */
-JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Mouse_nCreate
+JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nCreate
   (JNIEnv *, jclass);
 
 /*

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

Modified Files:
	Controller.java Keyboard.java Mouse.java 
Log Message:
boolean results -> Exceptions

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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Controller.java	16 Sep 2003 15:39:46 -0000	1.8
+++ Controller.java	30 Sep 2003 10:52:05 -0000	1.9
@@ -171,9 +171,7 @@
 			return;
 		}
 
-		if (!nCreate()) {
-			throw new Exception("The controller could not be created.");
-		}
+		nCreate();
 		
 		created = true;
 	}
@@ -248,10 +246,8 @@
 
 	/**
 	 * Native method to create the controller
-	 * 
-	 * @return true if the controller was created
 	 */
-	private static native boolean nCreate();
+	private static native void nCreate() throws Exception;
 
 	/**
 	* Native method the destroy the controller

Index: Keyboard.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Keyboard.java	10 Sep 2003 22:39:26 -0000	1.29
+++ Keyboard.java	30 Sep 2003 10:52:05 -0000	1.30
@@ -286,17 +286,14 @@
 			initialize();
 		if (created)
 			return;
-		if (!nCreate())
-			throw new Exception("The keyboard could not be created.");
+		nCreate();
 		created = true;
 	}
 	
 	/**
 	 * Native method to create the keyboard
-	 * 
-	 * @return true if the keyboard was created
 	 */
-	private static native boolean nCreate();
+	private static native void nCreate() throws Exception;
 
 	/**
 	 * @return true if the keyboard has been created
@@ -359,27 +356,26 @@
 	/**
 	 * Enable keyboard translation. Must be called after the keyboard is created,
 	 * and keyboard buffering must be enabled.
-	 * @return false if translation cannot be enabled; true if it can
 	 */
-	public static boolean enableTranslation() {
+	public static void enableTranslation() throws Exception {
 		assert created : "The keyboard has not been created.";
 		assert readBuffer != null : "Keyboard buffering has not been enabled.";
         
-		translationEnabled = nEnableTranslation();
-		return translationEnabled;
+		nEnableTranslation();
+		translationEnabled = true;
 	}
 	
 	/**
 	 * Native method to enable the translation buffer
 	 */
-	private static native boolean nEnableTranslation();
+	private static native void nEnableTranslation() throws Exception;
 	
 	/**
 	 * Enable keyboard buffering. Must be called after the keyboard is created.
 	 * @return the size of the keyboard buffer in events, or 0 if no buffering
 	 * can be enabled for any reason
 	 */
-	public static int enableBuffer() {
+	public static int enableBuffer() throws Exception {
 		assert created : "The keyboard has not been created.";
 		int buf_len = nEnableBuffer();
 		if (readBuffer != null)
@@ -392,7 +388,7 @@
 	 * @return the size of the buffer allocated, in events (1 event is 2 bytes),
 	 * or 0 if no buffer can be allocated
 	 */
-	private static native int nEnableBuffer();
+	private static native int nEnableBuffer() throws Exception;
 	
 	/**
 	 * Checks to see if a key is down.

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.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Mouse.java	16 Sep 2003 15:39:46 -0000	1.25
+++ Mouse.java	30 Sep 2003 10:52:05 -0000	1.26
@@ -146,7 +146,7 @@
 	}
 
 	/** Native method to set the native cursor */
-	private static native void nSetNativeCursor(int handle);
+	private static native void nSetNativeCursor(int handle) throws Exception;
 
 	/**
 	 * Gets the minimum size of a native cursor. Can only be called if
@@ -210,9 +210,7 @@
 		if (created) {
 			return;
 		}
-		if (!nCreate()) {
-			throw new Exception("The mouse could not be created.");
-		}
+		nCreate();
 		created = true;
 		currentCursor = null;
 
@@ -225,7 +223,7 @@
 	 * 
 	 * @return true if the mouse was created
 	 */
-	private static native boolean nCreate();
+	private static native void nCreate();
 
 	/**
 	 * @return true if the mouse has been created

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

Modified Files:
	KeyboardTest.java 
Log Message:
boolean results -> Exceptions

Index: KeyboardTest.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/input/KeyboardTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- KeyboardTest.java	23 Aug 2003 09:45:22 -0000	1.13
+++ KeyboardTest.java	30 Sep 2003 10:52:05 -0000	1.14
@@ -107,6 +107,8 @@
   private void createKeyboard() {
     try {
       Keyboard.create();
+      Keyboard.enableBuffer();
+      Keyboard.enableTranslation();
     } catch (Exception e) {
       e.printStackTrace();
       System.exit(-1);
@@ -114,8 +116,6 @@
   }
 
   private void wiggleKeyboard() {
-    Keyboard.enableBuffer();
-    Keyboard.enableTranslation();
 
     while (!Window.isCloseRequested()) {
       Window.update();