emulate external message

codeanticode · codeanticode · commit 24e3f1ae23ca · 2015-01-23T15:35:36.000-05:00
diff --git a/java/libraries/lwjgl/src/processing/lwjgl/PSurfaceLWJGL.java b/java/libraries/lwjgl/src/processing/lwjgl/PSurfaceLWJGL.java
@@ -6,6 +6,7 @@
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
+import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
@@ -55,6 +56,8 @@ public class PSurfaceLWJGL implements PSurface {
   
   // Event handling
   
+  boolean externalMessages = false;
+  
   /** Poller threads to get the keyboard/mouse events from LWJGL */
   protected static KeyPoller keyPoller;
   protected static MousePoller mousePoller; 
@@ -225,20 +228,19 @@ public void placeWindow(int[] location) {
       // frame to the main display, which undermines the --display setting.
       setFrameCentered();
     }    
+    
+    if (Display.getY() < 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
+      Display.setLocation(Display.getX(), 30);
+    }    
   }
 
   @Override
   public void placeWindow(int[] location, int[] editorLocation) {
     // TODO Auto-generated method stub
     
   }
-  
-  private void setFrameCentered() {
-    // Can't use frame.setLocationRelativeTo(null) because it sends the
-    // frame to the main display, which undermines the --display setting.
-    Display.setLocation(screenRect.x + (screenRect.width - sketchWidth) / 2,
-                        screenRect.y + (screenRect.height - sketchHeight) / 2);
-  } 
 
   @Override
   public void placePresent(Color stopColor) {
@@ -248,10 +250,16 @@ public void placePresent(Color stopColor) {
 
   @Override
   public void setupExternalMessages() {
-    // TODO Auto-generated method stub
-    
+    externalMessages = true;
   }
 
+  private void setFrameCentered() {
+    // Can't use frame.setLocationRelativeTo(null) because it sends the
+    // frame to the main display, which undermines the --display setting.
+    Display.setLocation(screenRect.x + (screenRect.width - sketchWidth) / 2,
+                        screenRect.y + (screenRect.height - sketchHeight) / 2);
+  }   
+  
   @Override
   public void startThread() {
     if (thread == null) {
@@ -494,13 +502,17 @@ public void run() {  // not good to make this synchronized, locks things up
 
       // un-pause the sketch and get rolling
       sketch.start();
-
+      
+      int x0 = Display.getX();
+      int y0 = Display.getY();
       while ((Thread.currentThread() == thread) && !sketch.finished) {
         if (Display.wasResized()) {
           setSize(Display.getWidth(), Display.getHeight());
         }
         pgl.setThread(thread);
         checkPause();
+        
+        
 
         // Don't resize the renderer from the EDT (i.e. from a ComponentEvent),
         // otherwise it may attempt a resize mid-render.
@@ -548,9 +560,23 @@ public void run() {  // not good to make this synchronized, locks things up
 //        beforeTime = System.nanoTime();        
         Display.sync((int)frameRateTarget);
         
+        
+        int x = Display.getX();
+        int y = Display.getY();
+        if (externalMessages && (x != x0 || y0 != y)) {
+          System.err.println(PApplet.EXTERNAL_MOVE + " " + x + " " + y);
+          System.err.flush();  // doesn't seem to help or hurt          
+        }
+        x0 = x;
+        y0 = y;
+        
         if (Display.isCloseRequested()) break;
       }
 
+      if (externalMessages) {
+        sketch.exit();  // don't quit, need to just shut everything down (0133)
+      }
+      
       keyPoller.requestStop();
       mousePoller.requestStop();
       sketch.dispose();  // call to shutdown libs?
