added mouseButton and getCount() for compatibility

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -178,6 +178,7 @@ public class PApplet extends Object implements ActivityAPI, PConstants {
    */
   public int pmouseX, pmouseY;
 
+  public int mouseButton;
 
   public boolean mousePressed;
 
@@ -2089,7 +2090,7 @@ protected void handleMouseEvent(MouseEvent event) {
 //    }
 
     // Get the (already processed) button code
-//    mouseButton = event.getButton();
+    mouseButton = event.getButton();
 
     // Added in 0215 (2.0b7) so that pmouseX/Y behave more like one would
     // expect from the desktop. This makes the ContinousLines example behave.

core/src/processing/event/MouseEvent.java

@@ -36,7 +36,7 @@ public class MouseEvent extends Event {
 
   protected int x, y;
   protected int button;
-  protected int clickCount;
+  protected int count;
 
 
 //  public MouseEvent(int x, int y) {
@@ -48,13 +48,13 @@ public class MouseEvent extends Event {
 
   public MouseEvent(Object nativeObject,
                     long millis, int action, int modifiers,
-                    int x, int y, int button, int clickCount) {
+                    int x, int y, int button, int count) {
     super(nativeObject, millis, action, modifiers);
     this.flavor = MOUSE;
     this.x = x;
     this.y = y;
     this.button = button;
-    this.clickCount = clickCount;
+    this.count = count;
   }
 
 
@@ -79,8 +79,23 @@ public int getButton() {
 //  }
 
 
+  @Deprecated
   public int getClickCount() {
-    return clickCount;
+    return count;
+  }
+
+
+  /**
+   * Number of clicks for mouse button events, or the number of steps (positive
+   * or negative depending on direction) for a mouse wheel event.
+   * Wheel events follow Java (see <a href="http://docs.oracle.com/javase/6/docs/api/java/awt/event/MouseWheelEvent.html#getWheelRotation()">here</a>), so
+   * getAmount() will return "negative values if the mouse wheel was rotated
+   * up or away from the user" and positive values in the other direction.
+   * On Mac OS X, this will be reversed when "natural" scrolling is enabled
+   * in System Preferences &rarr Mouse.
+   */
+  public int getCount() {
+    return count;
   }