diff options
Diffstat (limited to 'libjava/gnu/awt')
| -rw-r--r-- | libjava/gnu/awt/LightweightRedirector.java | 16 | ||||
| -rw-r--r-- | libjava/gnu/awt/xlib/XEventLoop.java | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libjava/gnu/awt/LightweightRedirector.java b/libjava/gnu/awt/LightweightRedirector.java index a0ea7bcff4b..41dc124279c 100644 --- a/libjava/gnu/awt/LightweightRedirector.java +++ b/libjava/gnu/awt/LightweightRedirector.java @@ -141,7 +141,7 @@ public class LightweightRedirector MouseEvent redirected = new MouseEvent(source, event.getID(), event.getWhen(), - event.getModifiers(), + event.getModifiersEx(), x, y, event.getClickCount(), event.isPopupTrigger()); @@ -157,20 +157,20 @@ public class LightweightRedirector */ int getButtonNumber(InputEvent event) { - int modifiers = event.getModifiers(); + int modifiers = event.getModifiersEx(); modifiers &= - InputEvent.BUTTON1_MASK | - InputEvent.BUTTON2_MASK | - InputEvent.BUTTON3_MASK; + InputEvent.BUTTON1_DOWN_MASK | + InputEvent.BUTTON2_DOWN_MASK | + InputEvent.BUTTON3_DOWN_MASK; switch (modifiers) { - case InputEvent.BUTTON1_MASK: + case InputEvent.BUTTON1_DOWN_MASK: return 1; - case InputEvent.BUTTON2_MASK: + case InputEvent.BUTTON2_DOWN_MASK: return 2; - case InputEvent.BUTTON3_MASK: + case InputEvent.BUTTON3_DOWN_MASK: return 3; case 0: return 0; diff --git a/libjava/gnu/awt/xlib/XEventLoop.java b/libjava/gnu/awt/xlib/XEventLoop.java index 5f5026b0cdb..66878185b51 100644 --- a/libjava/gnu/awt/xlib/XEventLoop.java +++ b/libjava/gnu/awt/xlib/XEventLoop.java @@ -197,13 +197,13 @@ public class XEventLoop implements Runnable switch (buttonEvt.button) { case 1: - modifiers = InputEvent.BUTTON1_MASK; + modifiers = InputEvent.BUTTON1_DOWN_MASK; break; case 2: - modifiers = InputEvent.BUTTON2_MASK; + modifiers = InputEvent.BUTTON2_DOWN_MASK; break; case 3: - modifiers = InputEvent.BUTTON2_MASK; + modifiers = InputEvent.BUTTON2_DOWN_MASK; break; } |
