2008-05-07 Mario Torre <neugens@limasoftware.net>

	* gnu/java/awt/peer/x/XEventPump.java (handleEvent):
	Fixed mouse dragging and movement in XEventPump. Patch from Roman Kennke.

1 files changed, 10 insertions, 2 deletions

diff --git a/gnu/java/awt/peer/x/XEventPump.java b/gnu/java/awt/peer/x/XEventPump.java
index df144c827..214aefba0 100644
--- a/gnu/java/awt/peer/x/XEventPump.java
+++ b/gnu/java/awt/peer/x/XEventPump.java
@@ -203,18 +203,26 @@ public class XEventPump
       key= new Integer(mn.event_window_id);
       awtWindow = (Window) windows.get(key);
 
+      button = mn.detail();
+      // AWT cannot handle more than 3 buttons and expects 0 instead.
+      if (button >= gnu.x11.Input.BUTTON3)
+        button = 0;
+
       MouseEvent mm;
       if (drag == -1)
         {
           mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_MOVED,
-                              System.currentTimeMillis(), 0,
+                              System.currentTimeMillis(),
+                              KeyboardMapping.mapModifiers(mn.state()) | buttonToModifier(button),
                               mn.event_x(), mn.event_y(),
                               1, false);
+
         }
       else
         {
           mm = new MouseEvent(awtWindow, MouseEvent.MOUSE_DRAGGED,
-                              System.currentTimeMillis(), 0,
+                              System.currentTimeMillis(),
+                              KeyboardMapping.mapModifiers(mn.state()) | buttonToModifier(drag),
                               mn.event_x(), mn.event_y(),
                               1, false);
         }