src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 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
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 2015, 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
*** 52,63 ****
  
      /**
       * Handles mouse events.
       */
      void handleMouseEvent(int eventType, int modifierFlags, int buttonNumber,
!                           int clickCount, int x, int y, int absoluteX,
!                           int absoluteY) {
          final SunToolkit tk = (SunToolkit)Toolkit.getDefaultToolkit();
          if ((buttonNumber > 2 && !tk.areExtraMouseButtonsEnabled())
                  || buttonNumber > tk.getNumberOfButtons() - 1) {
              return;
          }
--- 52,62 ----
  
      /**
       * Handles mouse events.
       */
      void handleMouseEvent(int eventType, int modifierFlags, int buttonNumber,
!                           int clickCount, int x, int y, int absX, int absY) {
          final SunToolkit tk = (SunToolkit)Toolkit.getDefaultToolkit();
          if ((buttonNumber > 2 && !tk.areExtraMouseButtonsEnabled())
                  || buttonNumber > tk.getNumberOfButtons() - 1) {
              return;
          }
*** 79,127 ****
          int jmodifiers = NSEvent.nsToJavaMouseModifiers(buttonNumber,
                                                          modifierFlags);
          boolean jpopupTrigger = NSEvent.isPopupTrigger(jmodifiers);
  
          eventNotifier.notifyMouseEvent(jeventType, System.currentTimeMillis(), jbuttonNumber,
!                 x, y, absoluteX, absoluteY, jmodifiers, jclickCount,
                  jpopupTrigger, null);
      }
  
      /**
       * Handles scroll events.
       */
!     void handleScrollEvent(final int x, final int y, final int modifierFlags,
                             final double deltaX, final double deltaY) {
          final int buttonNumber = CocoaConstants.kCGMouseButtonCenter;
          int jmodifiers = NSEvent.nsToJavaMouseModifiers(buttonNumber,
                                                          modifierFlags);
          final boolean isShift = (jmodifiers & InputEvent.SHIFT_DOWN_MASK) != 0;
  
          // Vertical scroll.
          if (!isShift && deltaY != 0.0) {
!             dispatchScrollEvent(x, y, jmodifiers, deltaY);
          }
          // Horizontal scroll or shirt+vertical scroll.
          final double delta = isShift && deltaY != 0.0 ? deltaY : deltaX;
          if (delta != 0.0) {
              jmodifiers |= InputEvent.SHIFT_DOWN_MASK;
!             dispatchScrollEvent(x, y, jmodifiers, delta);
          }
      }
  
!     private void dispatchScrollEvent(final int x, final int y,
!                                      final int modifiers, final double delta) {
          final long when = System.currentTimeMillis();
          final int scrollType = MouseWheelEvent.WHEEL_UNIT_SCROLL;
          final int scrollAmount = 1;
          int wheelRotation = (int) delta;
          int signum = (int) Math.signum(delta);
          if (signum * delta < 1) {
              wheelRotation = signum;
          }
          // invert the wheelRotation for the peer
!         eventNotifier.notifyMouseWheelEvent(when, x, y, modifiers, scrollType,
!                 scrollAmount, -wheelRotation, -delta, null);
      }
  
      /**
       * Handles key events.
       */
--- 78,129 ----
          int jmodifiers = NSEvent.nsToJavaMouseModifiers(buttonNumber,
                                                          modifierFlags);
          boolean jpopupTrigger = NSEvent.isPopupTrigger(jmodifiers);
  
          eventNotifier.notifyMouseEvent(jeventType, System.currentTimeMillis(), jbuttonNumber,
!                 x, y, absX, absY, jmodifiers, jclickCount,
                  jpopupTrigger, null);
      }
  
      /**
       * Handles scroll events.
       */
!     void handleScrollEvent(final int x, final int y, final int absX,
!                            final int absY, final int modifierFlags,
                             final double deltaX, final double deltaY) {
          final int buttonNumber = CocoaConstants.kCGMouseButtonCenter;
          int jmodifiers = NSEvent.nsToJavaMouseModifiers(buttonNumber,
                                                          modifierFlags);
          final boolean isShift = (jmodifiers & InputEvent.SHIFT_DOWN_MASK) != 0;
  
          // Vertical scroll.
          if (!isShift && deltaY != 0.0) {
!             dispatchScrollEvent(x, y, absX, absY, jmodifiers, deltaY);
          }
          // Horizontal scroll or shirt+vertical scroll.
          final double delta = isShift && deltaY != 0.0 ? deltaY : deltaX;
          if (delta != 0.0) {
              jmodifiers |= InputEvent.SHIFT_DOWN_MASK;
!             dispatchScrollEvent(x, y, absX, absY, jmodifiers, delta);
          }
      }
  
!     private void dispatchScrollEvent(final int x, final int y, final int absX,
!                                      final int absY, final int modifiers,
!                                      final double delta) {
          final long when = System.currentTimeMillis();
          final int scrollType = MouseWheelEvent.WHEEL_UNIT_SCROLL;
          final int scrollAmount = 1;
          int wheelRotation = (int) delta;
          int signum = (int) Math.signum(delta);
          if (signum * delta < 1) {
              wheelRotation = signum;
          }
          // invert the wheelRotation for the peer
!         eventNotifier.notifyMouseWheelEvent(when, x, y, absX, absY, modifiers,
!                                             scrollType, scrollAmount,
!                                             -wheelRotation, -delta, null);
      }
  
      /**
       * Handles key events.
       */