*** empty log message ***

src/java/org/lwjgl/Sys.java

@@ -108,6 +108,7 @@ public final class Sys {
 	}
 	
 	
+
 	/**
 	 * @return the name of the native library to load
 	 */

src/java/org/lwjgl/Window.java

@@ -149,7 +149,7 @@ public abstract class Window {
 	
 	/**
 	 * Minimize the game and allow the operating system's default display to become
-	 * visible. It is NOT the responsibility of LWJGL's native code to restore the display
+	 * visible. It is the responsibility of LWJGL's native code to restore the display
 	 * to its normal display settings.
 	 * 
 	 * If the display is already minimized then this is a no-op.
@@ -157,7 +157,7 @@ public abstract class Window {
 	public final native void minimize();
 	
 	/**
-	 * Restore the game and hide the operating system away. It is NOT the responsibility of
+	 * Restore the game and hide the operating system away. It is the responsibility of
 	 * LWJGL's native code to restore the display to its game display settings.
 	 * 
 	 * If the display is not minimized then this is a no-op/

src/java/org/lwjgl/openal/BaseAL.java

@@ -65,6 +65,11 @@ public abstract class BaseAL {
 	 */
 	private static void initialize() {
 		System.loadLibrary(org.lwjgl.Sys.getLibraryName());
+		try {
+			System.loadLibrary("OpenAL32");
+		} catch (Exception e) {
+			System.loadLibrary("openal");
+		}
 	}
 
 	/**
@@ -83,9 +88,7 @@ public abstract class BaseAL {
 		String libname;
 
 		// libname is hardcoded atm - this will change in a near future...
-    libname = (System.getProperty("os.name").toLowerCase().indexOf("windows") == -1) 
+		libname = (System.getProperty("os.name").toLowerCase().indexOf("windows") == -1) ? "libopenal.so" : "OpenAL32.dll";
-            ? "libopenal.so" 
-            : "OpenAL32.dll";     
 
 		StringTokenizer st = new StringTokenizer(libpath, seperator);
 

src/native/common/extal.cpp

@@ -174,6 +174,23 @@ void* GetFunctionPointer(const char* function) {
  * Loads the OpenAL Library
  */
 void LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) {
+
+	/*
+	 * CAS: Experimental new code for loading OpenAL. We're ignoring the paths
+	 * and just trying to load it once.
+	 */
+
+#ifdef _WIN32
+    handleOAL = LoadLibrary("OpenAL32.dll");
+#endif
+#ifdef _X11
+    handleOAL = dlopen("libopenal.so", RTLD_LAZY);
+#endif
+#ifdef TARGET_OS_MAC
+    oalInitEntryPoints();
+#endif
+
+	/*
 	jsize pathcount = env->GetArrayLength(oalPaths);
 #ifdef _DEBUG
   printf("Found %d OpenAL paths\n", pathcount);
@@ -201,7 +218,7 @@ void LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) {
       break;
     }
     env->ReleaseStringUTFChars(path, path_str);
-  }
+	*/
 }
 
 /**

src/native/win32/org_lwjgl_Window.cpp

@@ -149,12 +149,18 @@ void closeWindow()
  */
 void appActivate(bool active)
 {
+	if (!active) {
+		tempResetDisplayMode();
+	}
 	if (active) {
 		SetForegroundWindow(hwnd);
 		ShowWindow(hwnd, SW_RESTORE);
 	} else if (isFullScreen) {
 		ShowWindow(hwnd, SW_MINIMIZE);
 	}
+	if (active) {
+		tempRestoreDisplayMode();
+	}
 }
 
 /*
@@ -200,15 +206,11 @@ LRESULT CALLBACK lwjglWindowProc(HWND hWnd,
 			case WA_CLICKACTIVE:
 				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "minimized", "Z"), JNI_FALSE);
 				isMinimized = false;
-				// Change to game display settings
-				tempRestoreDisplayMode();
 
 				break;
 			case WA_INACTIVE:
 				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "minimized", "Z"), JNI_TRUE);
 				isMinimized = true;
-				// Restore display settings
-				tempResetDisplayMode();
 
 				break;
 			}
@@ -413,7 +415,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Window_minimize
 	if (isMinimized)
 		return;
 	ShowWindow(hwnd, SW_MINIMIZE);
-//	tempResetDisplayMode();
+	tempResetDisplayMode();
 }
 
 /*
@@ -427,6 +429,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Window_restore
 	if (!isMinimized)
 		return;
 
-//	tempRestoreDisplayMode();
+	tempRestoreDisplayMode();
 	ShowWindow(hwnd, SW_RESTORE);
 }