8167652: Making a frame/dialog resizeble/unresizeble shifts its position on Unity

Reviewed-by: azvegint, serb

jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java

@@ -51,9 +51,9 @@ abstract class XDecoratedPeer extends XWindowPeer {
     boolean insets_corrected;
 
     XIconWindow iconWindow;
-    WindowDimensions dimensions;
+    volatile WindowDimensions dimensions;
     XContentWindow content;
-    Insets currentInsets;
+    volatile Insets currentInsets;
     XFocusProxyWindow focusProxy;
     static final Map<Class<?>,Insets> lastKnownInsets =
                                    Collections.synchronizedMap(new HashMap<>());
@@ -106,7 +106,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
 
         // The lines that follow need to be in a postInit, so they
         // happen after the X window is created.
-        initResizability();
+        setResizable(winAttr.initialResizability);
         XWM.requestWMExtents(getWindow());
 
         content = XContentWindow.createContent(this);
@@ -130,7 +130,12 @@ abstract class XDecoratedPeer extends XWindowPeer {
 
     public void updateMinimumSize() {
         super.updateMinimumSize();
+        XToolkit.awtLock();
+        try {
             updateMinSizeHints();
+        } finally {
+            XToolkit.awtUnlock();
+        }
     }
 
     private void updateMinSizeHints() {
@@ -193,8 +198,13 @@ abstract class XDecoratedPeer extends XWindowPeer {
         if (log.isLoggable(PlatformLogger.Level.FINE)) {
             log.fine("Title is " + title);
         }
+        XToolkit.awtLock();
+        try {
             winAttr.title = title;
             updateWMName();
+        } finally {
+            XToolkit.awtUnlock();
+        }
     }
 
     protected String getWMName() {
@@ -206,10 +216,10 @@ abstract class XDecoratedPeer extends XWindowPeer {
     }
 
     void updateWMName() {
-        super.updateWMName();
-        String name = getWMName();
         XToolkit.awtLock();
         try {
+            super.updateWMName();
+            String name = getWMName();
             if (name == null || name.trim().equals("")) {
                 name = "Java";
             }
@@ -304,6 +314,8 @@ abstract class XDecoratedPeer extends XWindowPeer {
         if (XWM.getWMID() != XWM.UNITY_COMPIZ_WM) {
             currentInsets = new Insets(0, 0, 0, 0);
             wm_set_insets = null;
+        } else {
+            insets_corrected = false;
         }
     }
 
@@ -377,8 +389,6 @@ abstract class XDecoratedPeer extends XWindowPeer {
             insLog.fine(xe.toString());
         }
         reparent_serial = xe.get_serial();
-        XToolkit.awtLock();
-        try {
         long root = XlibWrapper.RootWindow(XToolkit.getDisplay(), getScreenNumber());
 
         if (isEmbedded()) {
@@ -386,7 +396,6 @@ abstract class XDecoratedPeer extends XWindowPeer {
             insets_corrected = true;
             return;
         }
-            Component t = target;
         if (getDecorations() == XWindowAttributesData.AWT_DECOR_NONE) {
             setReparented(true);
             insets_corrected = true;
@@ -448,14 +457,9 @@ abstract class XDecoratedPeer extends XWindowPeer {
                 handleCorrectInsets(correctWM);
             }
         }
-        } finally {
-            XToolkit.awtUnlock();
-        }
     }
 
-    protected void handleCorrectInsets(Insets correctWM) {
+    private void handleCorrectInsets(Insets correctWM) {
-        XToolkit.awtLock();
-        try {
         /*
          * Ok, now see if we need adjust window size because
          * initial insets were wrong (most likely they were).
@@ -476,8 +480,9 @@ abstract class XDecoratedPeer extends XWindowPeer {
         if (insLog.isLoggable(PlatformLogger.Level.FINER)) {
             insLog.finer("Dimensions before reparent: " + dimensions);
         }
-
+        WindowDimensions newDimensions = new WindowDimensions(dimensions);
-            dimensions.setInsets(getRealInsets());
+        newDimensions.setInsets(getRealInsets());
+        dimensions = newDimensions;
         insets_corrected = true;
 
         if (isMaximized()) {
@@ -495,19 +500,16 @@ abstract class XDecoratedPeer extends XWindowPeer {
         } else {
             reshape(dimensions, SET_SIZE, false);
         }
-        } finally {
-            XToolkit.awtUnlock();
-        }
     }
 
-    public void handleMoved(WindowDimensions dims) {
+    void handleMoved(WindowDimensions dims) {
         Point loc = dims.getLocation();
         AWTAccessor.getComponentAccessor().setLocation(target, loc.x, loc.y);
         postEvent(new ComponentEvent(target, ComponentEvent.COMPONENT_MOVED));
     }
 
 
-    protected Insets guessInsets() {
+    private Insets guessInsets() {
         if (isEmbedded() || isTargetUndecorated()) {
             return new Insets(0, 0, 0, 0);
         } else {
@@ -532,16 +534,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
         currentInsets = copy(guessed);
     }
 
-    public void revalidate() {
+    private Insets getRealInsets() {
-        XToolkit.executeOnEventHandlerThread(target, new Runnable() {
-                public void run() {
-                    target.invalidate();
-                    target.validate();
-                }
-            });
-    }
-
-    Insets getRealInsets() {
         if (isNull(currentInsets)) {
             applyGuessedInsets();
         }
@@ -578,7 +571,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
 
     // Coordinates are that of the target
     // Called only on Toolkit thread
-    public void reshape(WindowDimensions newDimensions, int op,
+    private void reshape(WindowDimensions newDimensions, int op,
                         boolean userReshape)
     {
         if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
@@ -599,8 +592,6 @@ abstract class XDecoratedPeer extends XWindowPeer {
             }
             newDimensions = new WindowDimensions(newBounds, insets, newDimensions.isClientSizeSet());
         }
-        XToolkit.awtLock();
-        try {
         if (!isReparented() || !isVisible()) {
             if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
                 insLog.fine("- not reparented({0}) or not visible({1}), default reshape",
@@ -633,7 +624,6 @@ abstract class XDecoratedPeer extends XWindowPeer {
             return;
         }
 
-            int wm = XWM.getWMID();
         updateChildrenSizes();
         applyGuessedInsets();
 
@@ -671,9 +661,6 @@ abstract class XDecoratedPeer extends XWindowPeer {
         }
 
         reconfigureContentWindow(newDimensions);
-        } finally {
-            XToolkit.awtUnlock();
-        }
     }
 
     /**
@@ -682,8 +669,6 @@ abstract class XDecoratedPeer extends XWindowPeer {
     private void reshape(int x, int y, int width, int height, int operation,
                          boolean userReshape)
     {
-        Rectangle newRec;
-        boolean setClient = false;
         WindowDimensions dims = new WindowDimensions(dimensions);
         switch (operation & (~NO_EMBEDDED_CHECK)) {
           case SET_LOCATION:
@@ -726,7 +711,12 @@ abstract class XDecoratedPeer extends XWindowPeer {
      */
     public void setBounds(int x, int y, int width, int height, int op) {
         // TODO: Rewrite with WindowDimensions
+        XToolkit.awtLock();
+        try {
             reshape(x, y, width, height, op, true);
+        } finally {
+            XToolkit.awtUnlock();
+        }
         validateSurface();
     }
 
@@ -861,54 +851,37 @@ abstract class XDecoratedPeer extends XWindowPeer {
         checkShellRectPos(shellRect);
     }
 
-    public void setShellBounds(Rectangle rec) {
+    private void setShellBounds(Rectangle rec) {
         if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
             insLog.fine("Setting shell bounds on " + this + " to " + rec);
         }
-        XToolkit.awtLock();
-        try {
         updateSizeHints(rec.x, rec.y, rec.width, rec.height);
         XlibWrapper.XMoveResizeWindow(XToolkit.getDisplay(), getShell(),
                                       scaleUp(rec.x), scaleUp(rec.y),
                                       scaleUp(rec.width), scaleUp(rec.height));
     }
-        finally {
+
-            XToolkit.awtUnlock();
+    private void setShellSize(Rectangle rec) {
-        }
-    }
-    public void setShellSize(Rectangle rec) {
         if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
             insLog.fine("Setting shell size on " + this + " to " + rec);
         }
-        XToolkit.awtLock();
-        try {
         updateSizeHints(rec.x, rec.y, rec.width, rec.height);
         XlibWrapper.XResizeWindow(XToolkit.getDisplay(), getShell(),
                                   scaleUp(rec.width), scaleUp(rec.height));
     }
-        finally {
+
-            XToolkit.awtUnlock();
+    private void setShellPosition(Rectangle rec) {
-        }
-    }
-    public void setShellPosition(Rectangle rec) {
         if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
             insLog.fine("Setting shell position on " + this + " to " + rec);
         }
-        XToolkit.awtLock();
-        try {
         updateSizeHints(rec.x, rec.y, rec.width, rec.height);
         XlibWrapper.XMoveWindow(XToolkit.getDisplay(), getShell(),
                                 scaleUp(rec.x), scaleUp(rec.y));
     }
-        finally {
-            XToolkit.awtUnlock();
-        }
-    }
 
-    void initResizability() {
-        setResizable(winAttr.initialResizability);
-    }
     public void setResizable(boolean resizable) {
+        XToolkit.awtLock();
+        try {
             int fs = winAttr.functions;
             if (!isResizable() && resizable) {
                 resetWMSetInsets();
@@ -917,9 +890,11 @@ abstract class XDecoratedPeer extends XWindowPeer {
                 }
                 winAttr.isResizable = resizable;
                 if ((fs & MWMConstants.MWM_FUNC_ALL) != 0) {
-                fs &= ~(MWMConstants.MWM_FUNC_RESIZE | MWMConstants.MWM_FUNC_MAXIMIZE);
+                    fs &= ~(MWMConstants.MWM_FUNC_RESIZE
+                          | MWMConstants.MWM_FUNC_MAXIMIZE);
                 } else {
-                fs |= (MWMConstants.MWM_FUNC_RESIZE | MWMConstants.MWM_FUNC_MAXIMIZE);
+                    fs |= (MWMConstants.MWM_FUNC_RESIZE
+                         | MWMConstants.MWM_FUNC_MAXIMIZE);
                 }
                 winAttr.functions = fs;
                 XWM.setShellResizable(this);
@@ -930,12 +905,20 @@ abstract class XDecoratedPeer extends XWindowPeer {
                 }
                 winAttr.isResizable = resizable;
                 if ((fs & MWMConstants.MWM_FUNC_ALL) != 0) {
-                fs |= (MWMConstants.MWM_FUNC_RESIZE | MWMConstants.MWM_FUNC_MAXIMIZE);
+                    fs |= (MWMConstants.MWM_FUNC_RESIZE
+                         | MWMConstants.MWM_FUNC_MAXIMIZE);
                 } else {
-                fs &= ~(MWMConstants.MWM_FUNC_RESIZE | MWMConstants.MWM_FUNC_MAXIMIZE);
+                    fs &= ~(MWMConstants.MWM_FUNC_RESIZE
+                          | MWMConstants.MWM_FUNC_MAXIMIZE);
                 }
                 winAttr.functions = fs;
-            XWM.setShellNotResizable(this, dimensions, dimensions.getBounds(), false);
+                XWM.setShellNotResizable(this, dimensions,
+                        XWM.getWMID() == XWM.UNITY_COMPIZ_WM && configure_seen ?
+                        dimensions.getScreenBounds() :
+                        dimensions.getBounds(), false);
+            }
+        } finally {
+            XToolkit.awtUnlock();
         }
     }
 
@@ -990,7 +973,10 @@ abstract class XDecoratedPeer extends XWindowPeer {
         try {
             if (configure_seen) {
                 return toGlobal(0,0);
-            } else {
+            }
+        } finally {
+            XToolkit.awtUnlock();
+        }
         Point location = target.getLocation();
         if (insLog.isLoggable(PlatformLogger.Level.FINE)) {
             insLog.fine("getLocationOnScreen {0} not reparented: {1} ",
@@ -998,10 +984,6 @@ abstract class XDecoratedPeer extends XWindowPeer {
         }
         return location;
     }
-        } finally {
-            XToolkit.awtUnlock();
-        }
-    }
 
 
 /***************************************************************************************
@@ -1134,7 +1116,7 @@ abstract class XDecoratedPeer extends XWindowPeer {
         return focusProxy;
     }
 
-    public void handleQuit() {
+    private void handleQuit() {
         postEvent(new WindowEvent((Window)target, WindowEvent.WINDOW_CLOSING));
     }
 

jdk/src/java.desktop/unix/classes/sun/awt/X11/XWM.java

@@ -1029,8 +1029,14 @@ final class XWM
         }
         XToolkit.awtLock();
         try {
-            Rectangle shellBounds = window.getShellBounds();
+            Rectangle shellBounds;
-            shellBounds.translate(-window.currentInsets.left, -window.currentInsets.top);
+            if (getWMID() != UNITY_COMPIZ_WM) {
+                shellBounds = window.getShellBounds();
+                shellBounds.translate(-window.currentInsets.left,
+                                      -window.currentInsets.top);
+            } else {
+                shellBounds = window.getDimensions().getScreenBounds();
+            }
             window.updateSizeHints(window.getDimensions());
             requestWMExtents(window.getWindow());
             XlibWrapper.XMoveResizeWindow(XToolkit.getDisplay(),

jdk/test/java/awt/Window/ChangeWindowResizabilty/ChangeWindowResizabiltyTest.java

@@ -23,7 +23,7 @@
 
 /* @test
    @key headful
-   @bug      8166897
+   @bug      8166897 8167652
    @summary  Some font overlap in the Optionpane dialog.
    @run      main ChangeWindowResizabiltyTest
 */
@@ -34,24 +34,46 @@ import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.Panel;
 import java.awt.Robot;
+import java.awt.Point;
 
 public class ChangeWindowResizabiltyTest {
     public static void main(String[] args) throws Exception {
         Robot robot = new Robot();
         for(int i = 0; i < 10; i++) {
             Dialog dialog = new Dialog((Frame) null);
+            dialog.setLocation(100, 100);
             Component panel = new Panel();
             panel.setPreferredSize(new Dimension(200, 100));
             dialog.add(panel);
             dialog.pack();
             dialog.setVisible(true);
+            robot.waitForIdle();
+            robot.delay(200);
+
+            Point frameLoc = dialog.getLocationOnScreen();
+            Point contentLoc = panel.getLocationOnScreen();
+
+            System.out.println("Decor location " + frameLoc);
+            System.out.println("Content location " + contentLoc);
 
             dialog.setResizable(false);
             robot.waitForIdle();
             robot.delay(200);
 
-            System.out.println(panel.getLocationOnScreen());
+            Point l = dialog.getLocationOnScreen();
-            System.out.println(dialog.getLocationOnScreen());
+            if (!l.equals(frameLoc)) {
+                dialog.dispose();
+                throw new RuntimeException("Decorated frame location moved " +
+                        "after setResizable(false)" + l);
+            }
+
+            l = panel.getLocationOnScreen();
+            if (!l.equals(contentLoc)) {
+                dialog.dispose();
+                throw new RuntimeException("Content location moved after " +
+                        "setResizable(false)" + l);
+            }
+
             if (panel.getLocationOnScreen().y <
                       dialog.getLocationOnScreen().y + dialog.getInsets().top) {
                 dialog.dispose();
@@ -62,8 +84,20 @@ public class ChangeWindowResizabiltyTest {
             dialog.setResizable(true);
             robot.waitForIdle();
             robot.delay(200);
-            System.out.println(panel.getLocationOnScreen());
+
-            System.out.println(dialog.getLocationOnScreen());
+            l = dialog.getLocationOnScreen();
+            if (!l.equals(frameLoc)) {
+                dialog.dispose();
+                throw new RuntimeException("Decorated frame location moved " +
+                        "after setResizable(true)" + l);
+            }
+
+            l = panel.getLocationOnScreen();
+            if (!l.equals(contentLoc)) {
+                dialog.dispose();
+                throw new RuntimeException("Content location moved after " +
+                        "setResizable(true)" + l);
+            }
             if (panel.getLocationOnScreen().y <
                       dialog.getLocationOnScreen().y + dialog.getInsets().top) {
                 dialog.dispose();