src/solaris/classes/sun/awt/X11/XWindowPeer.java

*** 1,7 ****
  /*
!  * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 289,299 ****
          // no need in updateOpaque() as it is no-op
      }
  
      public void updateIconImages() {
          Window target = (Window)this.target;
!         java.util.List<Image> iconImages = ((Window)target).getIconImages();
          XWindowPeer ownerPeer = getOwnerPeer();
          winAttr.icons = new ArrayList<IconInfo>();
          if (iconImages.size() != 0) {
              //read icon images from target
              winAttr.iconsInherited = false;
--- 289,299 ----
          // no need in updateOpaque() as it is no-op
      }
  
      public void updateIconImages() {
          Window target = (Window)this.target;
!         java.util.List<Image> iconImages = target.getIconImages();
          XWindowPeer ownerPeer = getOwnerPeer();
          winAttr.icons = new ArrayList<IconInfo>();
          if (iconImages.size() != 0) {
              //read icon images from target
              winAttr.iconsInherited = false;
*** 461,472 ****
      }
  
      public void updateMinimumSize() {
          //This function only saves minimumSize value in XWindowPeer
          //Setting WMSizeHints is implemented in XDecoratedPeer
!         targetMinimumSize = (((Component)target).isMinimumSizeSet()) ?
!             ((Component)target).getMinimumSize() : null;
      }
  
      public Dimension getTargetMinimumSize() {
          return (targetMinimumSize == null) ? null : new Dimension(targetMinimumSize);
      }
--- 461,472 ----
      }
  
      public void updateMinimumSize() {
          //This function only saves minimumSize value in XWindowPeer
          //Setting WMSizeHints is implemented in XDecoratedPeer
!         targetMinimumSize = (target.isMinimumSizeSet()) ?
!             target.getMinimumSize() : null;
      }
  
      public Dimension getTargetMinimumSize() {
          return (targetMinimumSize == null) ? null : new Dimension(targetMinimumSize);
      }
*** 717,730 ****
       */
      private void executeDisplayChangedOnEDT(final GraphicsConfiguration gc) {
          Runnable dc = new Runnable() {
              public void run() {
                  AWTAccessor.getComponentAccessor().
!                     setGraphicsConfiguration((Component)target, gc);
              }
          };
!         SunToolkit.executeOnEventHandlerThread((Component)target, dc);
      }
  
      /**
       * From the DisplayChangedListener interface; called from
       * X11GraphicsDevice when the display mode has been changed.
--- 717,730 ----
       */
      private void executeDisplayChangedOnEDT(final GraphicsConfiguration gc) {
          Runnable dc = new Runnable() {
              public void run() {
                  AWTAccessor.getComponentAccessor().
!                     setGraphicsConfiguration(target, gc);
              }
          };
!         SunToolkit.executeOnEventHandlerThread(target, dc);
      }
  
      /**
       * From the DisplayChangedListener interface; called from
       * X11GraphicsDevice when the display mode has been changed.
*** 748,758 ****
              new Point(0, 0));
      }
  
      protected Point getNewLocation(XConfigureEvent xe, int leftInset, int topInset) {
          // Bounds of the window
!         Rectangle targetBounds = AWTAccessor.getComponentAccessor().getBounds((Component)target);
  
          int runningWM = XWM.getWMID();
          Point newLocation = targetBounds.getLocation();
          if (xe.get_send_event() || runningWM == XWM.NO_WM || XWM.isNonReparentingWM()) {
              // Location, Client size + insets
--- 748,758 ----
              new Point(0, 0));
      }
  
      protected Point getNewLocation(XConfigureEvent xe, int leftInset, int topInset) {
          // Bounds of the window
!         Rectangle targetBounds = AWTAccessor.getComponentAccessor().getBounds(target);
  
          int runningWM = XWM.getWMID();
          Point newLocation = targetBounds.getLocation();
          if (xe.get_send_event() || runningWM == XWM.NO_WM || XWM.isNonReparentingWM()) {
              // Location, Client size + insets
*** 1106,1116 ****
              XToolkit.awtLock();
              try {
                  XUnmapEvent unmap = new XUnmapEvent();
                  unmap.set_window(window);
                  unmap.set_event(XToolkit.getDefaultRootWindow());
!                 unmap.set_type((int)XConstants.UnmapNotify);
                  unmap.set_from_configure(false);
                  XlibWrapper.XSendEvent(XToolkit.getDisplay(), XToolkit.getDefaultRootWindow(),
                          false, XConstants.SubstructureNotifyMask | XConstants.SubstructureRedirectMask,
                          unmap.pData);
                  unmap.dispose();
--- 1106,1116 ----
              XToolkit.awtLock();
              try {
                  XUnmapEvent unmap = new XUnmapEvent();
                  unmap.set_window(window);
                  unmap.set_event(XToolkit.getDefaultRootWindow());
!                 unmap.set_type(XConstants.UnmapNotify);
                  unmap.set_from_configure(false);
                  XlibWrapper.XSendEvent(XToolkit.getDisplay(), XToolkit.getDefaultRootWindow(),
                          false, XConstants.SubstructureNotifyMask | XConstants.SubstructureRedirectMask,
                          unmap.pData);
                  unmap.dispose();