eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-11 17:40:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:processing/processing

Browse Source
This commit is contained in:
Ben Fry
2015-05-19 17:33:19 -04:00
parent 83d2a037a9 832b62f5d8
commit 8a28431505
1 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
core/src/processing/opengl/PSurfaceJOGL.java
View File

@@ -1,6 +1,8 @@
package processing.opengl;
import java.awt.Component;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
//import java.awt.Dimension;
import java.awt.Point;
//import java.awt.Frame;
@@ -96,14 +98,45 @@ public class PSurfaceJOGL implements PSurface {
screen.addReference();
ArrayList<MonitorDevice> monitors = new ArrayList<MonitorDevice>();
for (int i = 0; i < screen.getMonitorDevices().size(); i++) {
MonitorDevice monitor = screen.getMonitorDevices().get(i);
// System.out.println("Monitor " + monitor.getId() + " ************");
// System.out.println(monitor.toString());
// System.out.println(monitor.getViewportInWindowUnits());
// System.out.println(monitor.getViewport());
monitors.add(monitor);
GraphicsEnvironment environment =
GraphicsEnvironment.getLocalGraphicsEnvironment();
GraphicsDevice[] devices = environment.getScreenDevices();
for (GraphicsDevice device: devices) {
String did = device.getIDstring();
String[] parts = did.split("Display");
String id1 = "";
if (1 < parts.length) {
id1 = parts[1].trim();
}
MonitorDevice monitor = null;
for (int i = 0; i < screen.getMonitorDevices().size(); i++) {
MonitorDevice mon = screen.getMonitorDevices().get(i);
String mid = String.valueOf(mon.getId());
if (id1.equals(mid)) {
// System.out.println("Monitor " + monitor.getId() + " ************");
// System.out.println(monitor.toString());
// System.out.println(monitor.getViewportInWindowUnits());
// System.out.println(monitor.getViewport());
monitor = mon;
break;
}
}
if (monitor == null) {
// Didn't find a matching monitor, try using less stringent id check
for (int i = 0; i < screen.getMonitorDevices().size(); i++) {
MonitorDevice mon = screen.getMonitorDevices().get(i);
String mid = String.valueOf(mon.getId());
if (-1 < did.indexOf(mid)) {
monitor = mon;
break;
}
}
}
if (monitor != null) {
monitors.add(monitor);
}
}
// System.out.println("*******************************");
if (deviceIndex >= 0) { // if -1, use the default device
@@ -212,8 +245,8 @@ public class PSurfaceJOGL implements PSurface {
// This example could be useful:
// com.jogamp.opengl.test.junit.newt.mm.TestScreenMode01cNEWT
if (fullScreen) {
window.setPosition(sketchX, sketchY);
PApplet.hideMenuBar();
window.setTopLevelPosition(sketchX, sketchY);
if (spanDisplays) {
window.setFullscreen(monitors);
} else {
@@ -353,8 +386,8 @@ public class PSurfaceJOGL implements PSurface {
// h /= 2;
// }
window.setPosition(sketchX + screenRect.x + (screenRect.width - w) / 2,
sketchY + screenRect.y + (screenRect.height - h) / 2);
window.setTopLevelPosition(sketchX + screenRect.x + (screenRect.width - w) / 2,
sketchY + screenRect.y + (screenRect.height - h) / 2);
}
@@ -364,18 +397,23 @@ public class PSurfaceJOGL implements PSurface {
// int contentW = Math.max(sketchWidth, MIN_WINDOW_WIDTH);
// int contentH = Math.max(sketchHeight, MIN_WINDOW_HEIGHT);
int x = window.getX() - window.getInsets().getLeftWidth();
int y = window.getY() - window.getInsets().getTopHeight();
int w = window.getWidth() + window.getInsets().getTotalWidth();
int h = window.getHeight() + window.getInsets().getTotalHeight();
if (location != null) {
// System.err.println("place window at " + location[0] + ", " + location[1]);
window.setPosition(location[0], location[1]);
window.setTopLevelPosition(location[0], location[1]);
} else if (editorLocation != null) {
// System.err.println("place window at editor location " + editorLocation[0] + ", " + editorLocation[1]);
int locationX = editorLocation[0] - 20;
int locationY = editorLocation[1];
if (locationX - window.getWidth() > 10) {
if (locationX - w > 10) {
// if it fits to the left of the window
window.setPosition(locationX - window.getWidth(), locationY);
window.setTopLevelPosition(locationX - w, locationY);
} else { // doesn't fit
// if it fits inside the editor window,
@@ -384,22 +422,23 @@ public class PSurfaceJOGL implements PSurface {
locationX = editorLocation[0] + 66;
locationY = editorLocation[1] + 66;
if ((locationX + window.getWidth() > sketch.displayWidth - 33) ||
(locationY + window.getHeight() > sketch.displayHeight - 33)) {
if ((locationX + w > sketch.displayWidth - 33) ||
(locationY + h > sketch.displayHeight - 33)) {
// otherwise center on screen
locationX = (sketch.displayWidth - window.getWidth()) / 2;
locationY = (sketch.displayHeight - window.getHeight()) / 2;
locationX = (sketch.displayWidth - w) / 2;
locationY = (sketch.displayHeight - h) / 2;
}
window.setPosition(locationX, locationY);
window.setTopLevelPosition(locationX, locationY);
}
} else { // just center on screen
setFrameCentered();
}
Point frameLoc = new Point(window.getX(), window.getY());
Point frameLoc = new Point(x, y);
if (frameLoc.y < 0) {
// Windows actually allows you to place frames where they can't be
// closed. Awesome. http://dev.processing.org/bugs/show_bug.cgi?id=1508
window.setPosition(frameLoc.x, 30);
window.setTopLevelPosition(frameLoc.x, 30);
}
// canvas.setBounds((contentW - sketchWidth)/2,
@@ -433,7 +472,7 @@ public class PSurfaceJOGL implements PSurface {
if (0 < sketchX && 0 < sketchY) {
// System.err.println("5.1 set inital window position");
window.setPosition(sketchX, sketchY);
window.setTopLevelPosition(sketchX, sketchY);
sketchX = sketchY = 0;
}
// animator.getThread().setName("Processing-GL-draw");