Merge pull request #103 from gohai/bcm-fix-mouse-button

Fix mouse button reporting in X11UnderlayTracker

1 files changed, 8 insertions, 8 deletions

diff --git a/src/newt/classes/jogamp/newt/driver/x11/X11UnderlayTracker.java b/src/newt/classes/jogamp/newt/driver/x11/X11UnderlayTracker.java
index 1be6dcea8..f9987860d 100644
--- a/src/newt/classes/jogamp/newt/driver/x11/X11UnderlayTracker.java
+++ b/src/newt/classes/jogamp/newt/driver/x11/X11UnderlayTracker.java
@@ -316,7 +316,7 @@ public class X11UnderlayTracker implements WindowListener, KeyListener, MouseLis
         if (underlayWindowMap.containsKey(s)) {
             WindowImpl overlayWindow = underlayWindowMap.get(s);
             overlayWindow.sendMouseEvent(MouseEvent.EVENT_MOUSE_CLICKED, 0,
-                                         e.getX(), e.getY(), (short) 0, 0);
+                                         e.getX(), e.getY(), e.getButton(), 0);
         }
     }
 
@@ -327,7 +327,7 @@ public class X11UnderlayTracker implements WindowListener, KeyListener, MouseLis
         if (underlayWindowMap.containsKey(s)) {
             WindowImpl overlayWindow = underlayWindowMap.get(s);
             overlayWindow.sendMouseEvent(MouseEvent.EVENT_MOUSE_ENTERED, 0,
-                                         e.getX(), e.getY(), (short) 0, 0);
+                                         e.getX(), e.getY(), e.getButton(), 0);
         }
     }
 
@@ -338,7 +338,7 @@ public class X11UnderlayTracker implements WindowListener, KeyListener, MouseLis
         if (underlayWindowMap.containsKey(s)) {
             WindowImpl overlayWindow = underlayWindowMap.get(s);
             overlayWindow.sendMouseEvent(MouseEvent.EVENT_MOUSE_EXITED, 0,
-                                         e.getX(), e.getY(), (short) 0, 0);
+                                         e.getX(), e.getY(), e.getButton(), 0);
         }
     }
 
@@ -349,7 +349,7 @@ public class X11UnderlayTracker implements WindowListener, KeyListener, MouseLis
         if (underlayWindowMap.containsKey(s)) {
             WindowImpl overlayWindow = underlayWindowMap.get(s);
             overlayWindow.sendMouseEvent(MouseEvent.EVENT_MOUSE_PRESSED, 0,
-                                         e.getX(), e.getY(), (short) 0, 0);
+                                         e.getX(), e.getY(), e.getButton(), 0);
         }
     }
 
@@ -360,7 +360,7 @@ public class X11UnderlayTracker implements WindowListener, KeyListener, MouseLis
         if (underlayWindowMap.containsKey(s)) {
             WindowImpl overlayWindow = underlayWindowMap.get(s);
             overlayWindow.sendMouseEvent(MouseEvent.EVENT_MOUSE_RELEASED, 0,
-                                         e.getX(), e.getY(), (short) 0, 0);
+                                         e.getX(), e.getY(), e.getButton(), 0);
         }
     }
 
@@ -371,7 +371,7 @@ public class X11UnderlayTracker implements WindowListener, KeyListener, MouseLis
         if (underlayWindowMap.containsKey(s)) {
             WindowImpl overlayWindow = underlayWindowMap.get(s);
             overlayWindow.sendMouseEvent(MouseEvent.EVENT_MOUSE_MOVED, 0,
-                                         e.getX(), e.getY(), (short) 0, 0);
+                                         e.getX(), e.getY(), e.getButton(), 0);
         }
     }
 
@@ -382,7 +382,7 @@ public class X11UnderlayTracker implements WindowListener, KeyListener, MouseLis
         if (underlayWindowMap.containsKey(s)) {
             WindowImpl overlayWindow = underlayWindowMap.get(s);
             overlayWindow.sendMouseEvent(MouseEvent.EVENT_MOUSE_DRAGGED, 0,
-                                         e.getX(), e.getY(), (short) 0, 0);
+                                         e.getX(), e.getY(), e.getButton(), 0);
         }
     }
 
@@ -393,7 +393,7 @@ public class X11UnderlayTracker implements WindowListener, KeyListener, MouseLis
         if (underlayWindowMap.containsKey(s)) {
             WindowImpl overlayWindow = underlayWindowMap.get(s);
             overlayWindow.sendMouseEvent(MouseEvent.EVENT_MOUSE_WHEEL_MOVED, 0,
-                                         e.getX(), e.getY(), (short) 0, 0);
+                                         e.getX(), e.getY(), e.getButton(), 0);
         }
     }