changing naming to "Display" instead of "Monitor"

Author: bob0bob

jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java

@@ -557,13 +557,13 @@ private Rect getSurfaceFrame() {
     }
 
     @Override
-    public Monitors getMonitors() {
+    public Displays getDisplays() {
       // TODO Auto-generated method stub
       return null;
     }
 
     @Override
-    public int getPrimaryMonitor() {
+    public int getPrimaryDisplay() {
       // TODO Auto-generated method stub
       return 0;
     }

jme3-core/src/main/java/com/jme3/app/LegacyApplication.java

@@ -50,6 +50,7 @@
 import com.jme3.renderer.Renderer;
 import com.jme3.renderer.ViewPort;
 import com.jme3.system.AppSettings;
+import com.jme3.system.Displays;
 import com.jme3.system.JmeContext;
 import com.jme3.system.JmeContext.Type;
 import com.jme3.system.JmeSystem;
@@ -882,4 +883,29 @@ public Object call() {
             return null;
         }
     }
+    
+    
+    /**
+     * This call will return a list of Monitors that glfwGetMonitors()
+     * returns and information about the monitor, like width, height, 
+     * and refresh rate.
+     * 
+     * @return returns a list of monitors and their information.
+     */
+    public Displays getDisplays()
+    {
+       return context.getDisplays();
+    }
+    
+    /**
+     * Use this to get the positional number of the primary
+     * monitor from the glfwGetMonitors() function call.
+     * 
+     * @return the position of the value in the arraylist of
+     *         the primary monitor.
+     */
+    public int getPrimaryDisplay()
+    {
+       return context.getPrimaryDisplay();
+    }
 }

jme3-core/src/main/java/com/jme3/system/AppSettings.java

@@ -266,7 +266,7 @@ public final class AppSettings extends HashMap<String, Object> {
     public static final String JOAL = "JOAL";
 
     static {
-        defaults.put("Monitor", 0);
+        defaults.put("Display", 0);
         defaults.put("CenterWindow", true);
         defaults.put("Width", 640);
         defaults.put("Height", 480);
@@ -1483,31 +1483,30 @@ public void setWindowYPosition(int pos) {
 
 
     /**
-     * Gets the monitor number used when creating a window.
+     * Gets the display number used when creating a window.
      *
      * <p>
-     * This setting is used only with LWJGL3, it defines which monitor to use when creating a OpenGL
+     * This setting is used only with LWJGL3, it defines which display to use when creating a OpenGL
      * window.
      *
-     * @return the desired monitor used when creating a OpenGL window
-     * @see #setMonitor(long)
+     * @return the desired display used when creating a OpenGL window
      */
-    public int getMonitor() {
-      return getInteger("Monitor");
+    public int getDisplay() {
+      return getInteger("Display");
     }
 
     /**
-     * Sets the monitor number used when creating a window. The position number is the number in the
+     * Sets the display number used when creating a window. The position number is the number in the
      * list of monitors GlfwGetMonitors returns.
      *
      * <p>
-     * This setting is used only with LWJGL3, it defines which monitor to use when creating a OpenGL
+     * This setting is used only with LWJGL3, it defines which display to use when creating a OpenGL
      * window. its default value is 0.
      *
-     * @param mon the desired monitor used when creating a OpenGL window
+     * @param mon the desired display used when creating a OpenGL window
      * 
      */
-    public void setMonitor(int mon) {
-      putInteger("Monitor", mon);
+    public void setDisplay(int mon) {
+      putInteger("Display", mon);
     }
   }

jme3-core/src/main/java/com/jme3/system/DisplayInfo.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2009-2023 jMonkeyEngine All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this list of conditions
+ * and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * * Neither the name of 'jMonkeyEngine' nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.jme3.system;
+
+/**
+ * This class holds information about the display that was returned by glfwGetMonitors() calls in
+ * the context class
+ * 
+ * @author Kevin Bales
+ */
+public class DisplayInfo {
+
+  /**
+   * displayID - display id that was return from Lwjgl3.
+   */
+  public long displayID = 0;
+
+  /**
+   * width - width that was return from Lwjgl3.
+   */
+  public int width = 1080;
+
+  /**
+   * height - height that was return from Lwjgl3.
+   */
+  public int height = 1920;
+
+  /**
+   * rate - refresh rate that was return from Lwjgl3.
+   */
+  public int rate = 60;
+
+  /**
+   * primary - indicates if the display is the primary monitor.
+   */
+  public boolean primary = false;
+
+  /**
+   * name - display name that was return from Lwjgl3.
+   */
+  public String name = "Generic Monitor";
+
+}

jme3-core/src/main/java/com/jme3/system/Displays.java

@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2009-2023 jMonkeyEngine All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this list of conditions
+ * and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other materials provided with
+ * the distribution.
+ *
+ * * Neither the name of 'jMonkeyEngine' nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.jme3.system;
+
+import java.util.ArrayList;
+
+/**
+ * This class holds all information about all displays that where return from the glfwGetMonitors()
+ * call. It stores them into an ArrayList
+ * 
+ * @author Kevin Bales
+ */
+public class Displays {
+
+  private ArrayList<DisplayInfo> displays = new ArrayList<DisplayInfo>();
+
+  public int addNewMonitor(long displaysID) {
+    DisplayInfo info = new DisplayInfo();
+    info.displayID = displaysID;
+    displays.add(info);
+    return displays.size() - 1;
+  }
+
+  /**
+   * This function returns the size of the display ArrayList
+   * 
+   * @return the
+   */
+  public int size() {
+    return displays.size();
+  }
+
+  /**
+   * Call to get display information on a certain display.
+   * 
+   * @param pos the position in the ArrayList of the display information that you want to get.
+   * @return returns the DisplayInfo data for the display called for.
+   */
+  public DisplayInfo get(int pos) {
+    if (pos < displays.size())
+      return displays.get(pos);
+
+    return null;
+  }
+
+  /**
+   * Set information about this display stored in displayPos display in the array list.
+   * 
+   * @param displayPos ArrayList position of display to update
+   * @param name name of the display 
+   * @param width the current width the display is displaying
+   * @param height the current height the display is displaying
+   * @param rate the current refresh rate the display is set to
+   */
+  public void setInfo(int displayPos, String name, int width, int height, int rate) {
+    if (displayPos < displays.size()) {
+      DisplayInfo info = displays.get(displayPos);
+      if (info != null) {
+        info.width = width;
+        info.height = height;
+        info.rate = rate;
+        info.name = name;
+      }
+    }
+  }
+
+  /**
+   * This function will mark a certain display as the primary display.
+   * 
+   * @param displayPos the position in the ArrayList of which display is the primary display
+   */
+  public void setPrimaryDisplay(int displayPos) {
+    if (displayPos < displays.size()) {
+      DisplayInfo info = displays.get(displayPos);
+      if (info != null)
+        info.primary = true;
+    }
+
+  }
+
+
+
+}

jme3-core/src/main/java/com/jme3/system/JmeContext.java

@@ -232,13 +232,13 @@ public enum Type {
      * 
      * @return returns a list of monitors and their information.
      */
-    public Monitors getMonitors();
+    public Displays getDisplays();
 
     /**
      * Use this to get the positional number of the primary monitor from the glfwGetMonitors()
      * function call.
      * 
      * @return the position of the value in the arraylist of the primary monitor.
      */
-    public int getPrimaryMonitor();
+    public int getPrimaryDisplay();
   }

jme3-core/src/main/java/com/jme3/system/NullContext.java

@@ -308,13 +308,13 @@ public int getWindowYPosition() {
     }
 
     @Override
-    public Monitors getMonitors() {
+    public Displays getDisplays() {
       // TODO Auto-generated method stub
       return null;
     }
 
     @Override
-    public int getPrimaryMonitor() {
+    public int getPrimaryDisplay() {
       // TODO Auto-generated method stub
       return 0;
     }

jme3-desktop/src/main/java/com/jme3/system/AWTContext.java

@@ -277,13 +277,13 @@ public int getWindowYPosition() {
     }
 
    @Override
-   public Monitors getMonitors() {
+   public Displays getDisplays() {
       // TODO Auto-generated method stub
       return null;
    }
 
    @Override
-   public int getPrimaryMonitor() {
+   public int getPrimaryDisplay() {
       // TODO Auto-generated method stub
       return 0;
    }

jme3-desktop/src/main/java/com/jme3/system/awt/AwtPanelsContext.java

@@ -330,13 +330,13 @@ public int getWindowYPosition() {
     }
 
     @Override
-    public Monitors getMonitors() {
+    public Displays getDisplays() {
        // TODO Auto-generated method stub
        return null;
     }
 
     @Override
-    public int getPrimaryMonitor() {
+    public int getPrimaryDisplay() {
        // TODO Auto-generated method stub
        return 0;
     }