From 37d383963d8ef2f29844d3e3b1f26178c6cd3e24 Mon Sep 17 00:00:00 2001
From: Brian Matzon <brian@matzon.dk>
Date: Sun, 22 Dec 2002 20:49:18 +0000
Subject: [PATCH] fix: updated to new display creation

---
 .../lwjgl/test/openal/MovingSoundTest.java    | 12 ++++++++-
 src/java/org/lwjgl/test/opengl/Game.java      | 16 ++++++++----
 src/java/org/lwjgl/test/opengl/Grass.java     | 25 +++++++++++++++----
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/java/org/lwjgl/test/openal/MovingSoundTest.java b/src/java/org/lwjgl/test/openal/MovingSoundTest.java
index dcf297f6..ecbe700e 100644
--- a/src/java/org/lwjgl/test/openal/MovingSoundTest.java
+++ b/src/java/org/lwjgl/test/openal/MovingSoundTest.java
@@ -82,7 +82,17 @@ public class MovingSoundTest extends BasicTest {
     
     //initialize display
     try {
-      Display.create(new DisplayMode(320, 240, 32, 60), 8, 24, 0, false);
+      int mode = -1;
+      DisplayMode[] modes = Display.getAvailableDisplayModes();
+      for (int i = 0; i < modes.length; i ++) {
+        if( modes[i].width == 640 && 
+            modes[i].height == 480 && 
+            modes[i].bpp == 16 && 
+            modes[i].freq == 60) {
+              mode = i;
+        }       
+      }       
+      Display.create(modes[mode], false);
     } catch (Exception e) {
       e.printStackTrace();
       exit(-1);
diff --git a/src/java/org/lwjgl/test/opengl/Game.java b/src/java/org/lwjgl/test/opengl/Game.java
index 4b1b94da..bb45681f 100644
--- a/src/java/org/lwjgl/test/opengl/Game.java
+++ b/src/java/org/lwjgl/test/opengl/Game.java
@@ -50,12 +50,18 @@ import java.nio.*;
 public final class Game {
      static {
          try {
-             DisplayMode[] modes = Display.getAvailableDisplayModes();
-             System.out.println("Available display modes:");
-             for (int i = 0; i < modes.length; i ++)
-                 System.out.println(modes[i]);
+          int mode = -1;
+          DisplayMode[] modes = Display.getAvailableDisplayModes();
+          for (int i = 0; i < modes.length; i ++) {
+            if( modes[i].width == 640 && 
+                modes[i].height == 480 && 
+                modes[i].bpp == 16 && 
+                modes[i].freq == 60) {
+                  mode = i;
+            }       
+          } 
              // For now let's just pick a mode we're certain to have
-             Display.create(new DisplayMode(640, 480, 16, 60), 8, 16, 0, true);
+             Display.create(modes[mode], false);
              System.out.println("Created display.");
          } catch (Exception e) {
              System.err.println("Failed to create display due to "+e);
diff --git a/src/java/org/lwjgl/test/opengl/Grass.java b/src/java/org/lwjgl/test/opengl/Grass.java
index d9d7bc8c..d530a314 100644
--- a/src/java/org/lwjgl/test/opengl/Grass.java
+++ b/src/java/org/lwjgl/test/opengl/Grass.java
@@ -64,15 +64,30 @@ public class Grass {
 
 	static {
 		try {
+      int mode = -1;
 			DisplayMode[] modes = Display.getAvailableDisplayModes();
-			System.out.println("Available display modes:");
-			for (int i = 0; i < modes.length; i ++)
-				System.out.println(modes[i]);
+			System.out.println("Available display modes(" + modes.length + "):");
+			for (int i = 0; i < modes.length; i ++) {
+				//System.out.println(modes[i]);
+        if( modes[i].width == 640 && 
+            modes[i].height == 480 && 
+            modes[i].bpp == 16 && 
+            modes[i].freq == 60) {
+              mode = i;
+        }       
+      }
+      
+      if (mode == -1) {
+        System.out.println("did not find suitable mode");
+      } else {
+        System.out.println("Display mode: " + modes[mode]);
+      }
 			// For now let's just pick a mode we're certain to have
-			Display.create(new DisplayMode(800, 600, 16, 60), 8, 16, 0, false);
+      
+			Display.create(modes[mode], false);
 			System.out.println("Created display.");
 		} catch (Exception e) {
-			System.err.println("Failed to create display due to "+e);
+      e.printStackTrace();
 			System.exit(1);
 		}
 	}