src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java

*** 614,631 ****
                          if (ownerWindow != null) {
                              w = ownerWindow.getContentWindow();
                          }
                      }
                  }
!                 if( keyEventLog.isLoggable(PlatformLogger.Level.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) {
!                     keyEventLog.fine("before XFilterEvent:"+ev);
                  }
                  if (XlibWrapper.XFilterEvent(ev.getPData(), w)) {
                      continue;
                  }
!                 if( keyEventLog.isLoggable(PlatformLogger.Level.FINE) && (ev.get_type() == XConstants.KeyPress || ev.get_type() == XConstants.KeyRelease) ) {
!                     keyEventLog.fine("after XFilterEvent:"+ev); // IS THIS CORRECT?
                  }
  
                  dispatchEvent(ev);
              } catch (ThreadDeath td) {
                  XBaseWindow.ungrabInput();
--- 614,636 ----
                          if (ownerWindow != null) {
                              w = ownerWindow.getContentWindow();
                          }
                      }
                  }
!                 if (keyEventLog.isLoggable(PlatformLogger.Level.FINE) && (
!                         ev.get_type() == XConstants.KeyPress
!                                 || ev.get_type() == XConstants.KeyRelease)) {
!                     keyEventLog.fine("before XFilterEvent:" + ev);
                  }
                  if (XlibWrapper.XFilterEvent(ev.getPData(), w)) {
                      continue;
                  }
!                 if (keyEventLog.isLoggable(PlatformLogger.Level.FINE) && (
!                         ev.get_type() == XConstants.KeyPress
!                                 || ev.get_type() == XConstants.KeyRelease)) {
!                     keyEventLog.fine(
!                             "after XFilterEvent:" + ev); // IS THIS CORRECT?
                  }
  
                  dispatchEvent(ev);
              } catch (ThreadDeath td) {
                  XBaseWindow.ungrabInput();
*** 637,671 ****
                  awtUnlock();
              }
          }
      }
  
!     static {
!         GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
!         if (ge instanceof SunGraphicsEnvironment) {
!             ((SunGraphicsEnvironment)ge).addDisplayChangedListener(
                  new DisplayChangedListener() {
                      @Override
                      public void displayChanged() {
                          // 7045370: Reset the cached values
                          XToolkit.screenWidth = -1;
                          XToolkit.screenHeight = -1;
                      }
  
                      @Override
!                     public void paletteChanged() {}
!             });
          }
      }
  
      private static void initScreenSize() {
          if (screenWidth == -1 || screenHeight == -1) {
              awtLock();
              try {
                  XWindowAttributes pattr = new XWindowAttributes();
                  try {
!                     XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(), XToolkit.getDefaultRootWindow(), pattr.pData);
                      screenWidth  = pattr.get_width();
                      screenHeight = pattr.get_height();
                  } finally {
                      pattr.dispose();
                  }
--- 642,685 ----
                  awtUnlock();
              }
          }
      }
  
!     /**
!      * Listener installed to detect display changes.
!      */
!     private static final DisplayChangedListener displayChangedHandler =
              new DisplayChangedListener() {
                  @Override
                  public void displayChanged() {
                      // 7045370: Reset the cached values
                      XToolkit.screenWidth = -1;
                      XToolkit.screenHeight = -1;
                  }
  
                  @Override
!                 public void paletteChanged() {
!                 }
!             };
! 
!     static {
!         GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
!         if (ge instanceof SunGraphicsEnvironment) {
!             ((SunGraphicsEnvironment) ge).addDisplayChangedListener(
!                     displayChangedHandler);
          }
      }
  
      private static void initScreenSize() {
          if (screenWidth == -1 || screenHeight == -1) {
              awtLock();
              try {
                  XWindowAttributes pattr = new XWindowAttributes();
                  try {
!                     XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(),
!                                                      XToolkit.getDefaultRootWindow(),
!                                                      pattr.pData);
                      screenWidth  = pattr.get_width();
                      screenHeight = pattr.get_height();
                  } finally {
                      pattr.dispose();
                  }