--- old/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java	2016-08-31 16:52:24.828059810 +0300
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java	2016-08-31 16:52:24.684059815 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -785,7 +785,7 @@
                 numItemsDisplayed = Math.min(MAX_UNFURLED_ITEMS, numItems);
             }
             Point global = XChoicePeer.this.toGlobal(0,0);
-            Rectangle screen = graphicsConfig.getBounds();
+            Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
 
             if (alignUnder != null) {
                 Rectangle choiceRec = XChoicePeer.this.getBounds();
--- old/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java	2016-08-31 16:52:25.132059799 +0300
+++ new/src/java.desktop/unix/classes/sun/awt/X11/InfoWindow.java	2016-08-31 16:52:24.996059804 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
@@ -79,7 +79,7 @@
         pack();
 
         Dimension size = getSize();
-        Rectangle scrSize = getGraphicsConfiguration().getBounds();
+        Dimension scrSize = Toolkit.getDefaultToolkit().getScreenSize();
 
         if (corner.x < scrSize.width/2 && corner.y < scrSize.height/2) { // 1st square
             setLocation(corner.x + indent, corner.y + indent);
--- old/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java	2016-08-31 16:52:25.440059788 +0300
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java	2016-08-31 16:52:25.304059793 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, 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
@@ -296,7 +296,7 @@
      */
     protected Rectangle getSubmenuBounds(Rectangle itemBounds, Dimension windowSize) {
         Rectangle globalBounds = toGlobal(itemBounds);
-        Dimension screenSize = graphicsConfig.getBounds().getSize();
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
         Rectangle res;
         res = fitWindowBelow(globalBounds, windowSize, screenSize);
         if (res != null) {
--- old/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java	2016-08-31 16:52:25.748059777 +0300
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XMenuWindow.java	2016-08-31 16:52:25.604059782 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, 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
@@ -278,7 +278,7 @@
      */
     protected Rectangle getSubmenuBounds(Rectangle itemBounds, Dimension windowSize) {
         Rectangle globalBounds = toGlobal(itemBounds);
-        Dimension screenSize = graphicsConfig.getBounds().getSize();
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
         Rectangle res;
         res = fitWindowRight(globalBounds, windowSize, screenSize);
         if (res != null) {
--- old/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java	2016-08-31 16:52:26.076059766 +0300
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XPopupMenuPeer.java	2016-08-31 16:52:25.928059771 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, 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
@@ -215,7 +215,7 @@
      */
     protected Rectangle getWindowBounds(Point origin, Dimension windowSize) {
         Rectangle globalBounds = new Rectangle(origin.x, origin.y, 0, 0);
-        Dimension screenSize = graphicsConfig.getBounds().getSize();
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
         Rectangle res;
         res = fitWindowRight(globalBounds, windowSize, screenSize);
         if (res != null) {