*** empty log message ***

src/java/org/lwjgl/Sys.java

@@ -107,6 +107,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

@@ -47,87 +47,90 @@ import java.util.StringTokenizer;
  * @version $Revision$
  */
 public abstract class BaseAL {
-  /** Have we been created? */
+	/** Have we been created? */
-  protected static boolean created;  
+	protected static boolean created;
-    
-  static {
-    initialize();
-  }
-    
-  /**
-   * Override to provide any initialization code after creation.
-   */
-  protected void init() throws OpenALException {
-  }
-    
-  /**
-   * Static initialization
-   */
-  private static void initialize() {
-    System.loadLibrary(org.lwjgl.Sys.getLibraryName());
-  }
-    
-  /**
-   * Creates the AL instance
-   * 
-   * @throws Exception if a failiure occured in the AL creation process
-   */
-  public void create() throws OpenALException {
-    if (created) {
-      return;
-    }
 
-    // need to pass path of possible locations of OAL to native side
+	static {
-    String libpath = System.getProperty("java.library.path");
+		initialize();
-    String seperator = System.getProperty("path.separator");
+	}
-    String libname;
 
-    // libname is hardcoded atm - this will change in a near future...
+	/**
-    libname = (System.getProperty("os.name").toLowerCase().indexOf("windows") == -1) 
+	 * Override to provide any initialization code after creation.
-            ? "libopenal.so" 
+	 */
-            : "OpenAL32.dll";     
+	protected void init() throws OpenALException {
+	}
 
-    StringTokenizer st = new StringTokenizer(libpath, seperator);
+	/**
-            
+	 * Static initialization
-    //create needed string array
+	 */
-    String[] oalPaths = new String[st.countTokens()+1];
+	private static void initialize() {
+		System.loadLibrary(org.lwjgl.Sys.getLibraryName());
+		try {
+			System.loadLibrary("OpenAL32");
+		} catch (Exception e) {
+			System.loadLibrary("openal");
+		}
+	}
 
-    //build paths
+	/**
-    for(int i=0;i<oalPaths.length - 1;i++) {
+	 * Creates the AL instance
-      oalPaths[i] = st.nextToken() + File.separator + libname; 
+	 * 
-    }
+	 * @throws Exception if a failiure occured in the AL creation process
+	 */
+	public void create() throws OpenALException {
+		if (created) {
+			return;
+		}
 
-    //add cwd path
+		// need to pass path of possible locations of OAL to native side
-    oalPaths[oalPaths.length-1] = libname;
+		String libpath = System.getProperty("java.library.path");
-    if (!nCreate(oalPaths)) {
+		String seperator = System.getProperty("path.separator");
-      throw new OpenALException("AL instance could not be created.");
+		String libname;
-    }
+
-    
+		// libname is hardcoded atm - this will change in a near future...
-    init();
+		libname = (System.getProperty("os.name").toLowerCase().indexOf("windows") == -1) ? "libopenal.so" : "OpenAL32.dll";
-    created = true;
+
-  }
+		StringTokenizer st = new StringTokenizer(libpath, seperator);
-  
+
-  /**
+		//create needed string array
-   * Native method to create AL instance
+		String[] oalPaths = new String[st.countTokens() + 1];
-   * 
+
-   * @param oalPaths Array of strings containing paths to search for OpenAL library
+		//build paths
-   * @return true if the AL creation process succeeded
+		for (int i = 0; i < oalPaths.length - 1; i++) {
-   */
+			oalPaths[i] = st.nextToken() + File.separator + libname;
-  protected native boolean nCreate(String[] oalPaths);
+		}
-    
+
-  /**
+		//add cwd path
-   * Calls whatever destruction rutines that are needed
+		oalPaths[oalPaths.length - 1] = libname;
-   */
+		if (!nCreate(oalPaths)) {
-  public void destroy() {
+			throw new OpenALException("AL instance could not be created.");
-    if (!created) {
+		}
-      return;
+
-    }
+		init();
-    created = false;
+		created = true;
-    nDestroy();
+	}
-  }
+
-  
+	/**
-  /**
+	 * Native method to create AL instance
-   * Native method the destroy the AL
+	 * 
-   */
+	 * @param oalPaths Array of strings containing paths to search for OpenAL library
-  protected native void nDestroy(); 
+	 * @return true if the AL creation process succeeded
+	 */
+	protected native boolean nCreate(String[] oalPaths);
+
+	/**
+	 * Calls whatever destruction rutines that are needed
+	 */
+	public void destroy() {
+		if (!created) {
+			return;
+		}
+		created = false;
+		nDestroy();
+	}
+
+	/**
+	 * Native method the destroy the AL
+	 */
+	protected native void nDestroy();
 }

src/native/common/extal.cpp

@@ -174,7 +174,24 @@ void* GetFunctionPointer(const char* function) {
  * Loads the OpenAL Library
  */
 void LoadOpenAL(JNIEnv *env, jobjectArray oalPaths) {
-  jsize pathcount = env->GetArrayLength(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);
 #endif  
@@ -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);
 }