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

*** 992,1005 ****
           */
          if (xbe.get_button() > SunToolkit.MAX_BUTTONS_SUPPORTED) {
              return;
          }
          int buttonState = 0;
!         final int buttonsNumber = ((SunToolkit)(Toolkit.getDefaultToolkit())).getNumberOfButtons();
!         for (int i = 0; i<buttonsNumber; i++){
!             buttonState |= (xbe.get_state() & XConstants.buttonsMask[i]);
!         }
          switch (xev.get_type()) {
          case XConstants.ButtonPress:
              if (buttonState == 0) {
                  XWindowPeer parent = getToplevelXWindow();
                  // See 6385277, 6981400.
--- 992,1002 ----
           */
          if (xbe.get_button() > SunToolkit.MAX_BUTTONS_SUPPORTED) {
              return;
          }
          int buttonState = 0;
!         buttonState = xbe.get_state() & XConstants.ALL_BUTTONS_MASK;
          switch (xev.get_type()) {
          case XConstants.ButtonPress:
              if (buttonState == 0) {
                  XWindowPeer parent = getToplevelXWindow();
                  // See 6385277, 6981400.
*** 1032,1047 ****
      }
      /**
       * Checks ButtonRelease released all Mouse buttons
       */
      static boolean isFullRelease(int buttonState, int button) {
!         final int buttonsNumber = ((SunToolkit)(Toolkit.getDefaultToolkit())).getNumberOfButtons();
  
          if (button < 0 || button > buttonsNumber) {
              return buttonState == 0;
          } else {
!             return buttonState == XConstants.buttonsMask[button - 1];
          }
      }
  
      static boolean isGrabbedEvent(XEvent ev, XBaseWindow target) {
          switch (ev.get_type()) {
--- 1029,1044 ----
      }
      /**
       * Checks ButtonRelease released all Mouse buttons
       */
      static boolean isFullRelease(int buttonState, int button) {
!         final int buttonsNumber = XToolkit.getNumberOfButtonsForMask();
  
          if (button < 0 || button > buttonsNumber) {
              return buttonState == 0;
          } else {
!             return buttonState == XlibUtil.getButtonMask(button);
          }
      }
  
      static boolean isGrabbedEvent(XEvent ev, XBaseWindow target) {
          switch (ev.get_type()) {