This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[gui][PATCH] Use new button and modifier masks
- From: Thomas Fitzsimmons <fitzsim at redhat dot com>
- To: java-patches at gcc dot gnu dot org
- Date: Fri, 30 Jul 2004 15:47:24 -0400
- Subject: [gui][PATCH] Use new button and modifier masks
Hi,
I committed this to java-gui-branch. It updates all classes that
referred to the old-style shift/alt/ctrl and mouse button modifier
constants to use the new-style modifiers.
Tom
2004-07-30 Thomas Fitzsimmons <fitzsim@redhat.com>
PR AWT/16040
* gnu/awt/LightweightRedirector.java: Call getModifiersEx, not
getModifiers. Replace old button masks with new ones.
* gnu/awt/xlib/XEventLoop.java: Likewise.
* gnu/java/awt/peer/gtk/GtkButtonPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise.
* gnu/java/awt/peer/gtk/GtkListPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise.
* java/awt/AWTKeyStroke.java: Remove old modifier masks.
* java/awt/Component.java: Replace old modifier masks with new
ones.
* java/awt/Container.java: Call getModifiersEx, not
getModifiers.
* java/awt/DefaultKeyboardFocusManager.java: Likewise. Remove
old modifier masks.
* javax/swing/JMenuItem.java: Replace old button masks with new
ones.
* javax/swing/KeyStroke.java: Call getModifiersEx, not
getModifiers.
* javax/swing/SwingUtilities.java: Likewise.
* javax/swing/plaf/basic/BasicButtonListener.java: Likewise.
* javax/swing/plaf/basic/BasicInternalFrameUI.java: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Replace old
mask macros with new ones.
* jni/gtk-peer/gtkpeer.h: Replace old button and modifier mask
macros with new ones representing new masks.
Index: gnu/awt/LightweightRedirector.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/LightweightRedirector.java,v
retrieving revision 1.1
diff -u -r1.1 LightweightRedirector.java
--- gnu/awt/LightweightRedirector.java 22 Oct 2000 17:46:08 -0000 1.1
+++ gnu/awt/LightweightRedirector.java 30 Jul 2004 19:42:08 -0000
@@ -141,7 +141,7 @@
MouseEvent redirected = new MouseEvent(source, event.getID(),
event.getWhen(),
- event.getModifiers(),
+ event.getModifiersEx(),
x, y,
event.getClickCount(),
event.isPopupTrigger());
@@ -157,20 +157,20 @@
*/
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;
Index: gnu/awt/xlib/XEventLoop.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/xlib/XEventLoop.java,v
retrieving revision 1.3
diff -u -r1.3 XEventLoop.java
--- gnu/awt/xlib/XEventLoop.java 25 Aug 2003 19:02:28 -0000 1.3
+++ gnu/awt/xlib/XEventLoop.java 30 Jul 2004 19:42:08 -0000
@@ -197,13 +197,13 @@
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;
}
Index: gnu/java/awt/peer/gtk/GtkButtonPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java,v
retrieving revision 1.8.2.4
diff -u -r1.8.2.4 GtkButtonPeer.java
--- gnu/java/awt/peer/gtk/GtkButtonPeer.java 30 Jul 2004 09:47:57 -0000 1.8.2.4
+++ gnu/java/awt/peer/gtk/GtkButtonPeer.java 30 Jul 2004 19:42:08 -0000
@@ -84,10 +84,10 @@
p.translate(((Component) me.getSource()).getX(),
((Component) me.getSource()).getY());
if (!me.isConsumed ()
- && (me.getModifiers () & MouseEvent.BUTTON1_MASK) != 0
+ && (me.getModifiersEx () & MouseEvent.BUTTON1_DOWN_MASK) != 0
&& awtComponent.getBounds().contains(p))
postActionEvent (((Button)awtComponent).getActionCommand (),
- me.getModifiers ());
+ me.getModifiersEx ());
}
if (e.getID () == KeyEvent.KEY_PRESSED)
@@ -96,7 +96,7 @@
if (!ke.isConsumed () && ke.getKeyCode () == KeyEvent.VK_SPACE)
{
postActionEvent (((Button) awtComponent).getActionCommand (),
- ke.getModifiers ());
+ ke.getModifiersEx ());
gtkActivate ();
}
}
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.16.2.17
diff -u -r1.16.2.17 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java 30 Jul 2004 14:04:41 -0000 1.16.2.17
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java 30 Jul 2004 19:42:08 -0000
@@ -283,12 +283,12 @@
break;
case KeyEvent.KEY_PRESSED:
ke = (KeyEvent) event;
- gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiers (),
+ gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiersEx (),
ke.getKeyCode (), ke.getKeyLocation ());
break;
case KeyEvent.KEY_RELEASED:
ke = (KeyEvent) event;
- gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiers (),
+ gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiersEx (),
ke.getKeyCode (), ke.getKeyLocation ());
break;
}
Index: gnu/java/awt/peer/gtk/GtkListPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java,v
retrieving revision 1.7.2.3
diff -u -r1.7.2.3 GtkListPeer.java
--- gnu/java/awt/peer/gtk/GtkListPeer.java 25 May 2004 15:21:20 -0000 1.7.2.3
+++ gnu/java/awt/peer/gtk/GtkListPeer.java 30 Jul 2004 19:42:08 -0000
@@ -144,7 +144,7 @@
// multiple click.
MouseEvent me = (MouseEvent) e;
if (!me.isConsumed ()
- && (me.getModifiers () & MouseEvent.BUTTON1_MASK) != 0
+ && (me.getModifiersEx () & MouseEvent.BUTTON1_DOWN_MASK) != 0
&& me.getClickCount() == 2)
{
String selectedItem = ((List) awtComponent).getSelectedItem ();
@@ -153,7 +153,7 @@
// something is selected.
if (selectedItem != null)
postActionEvent (((List) awtComponent).getSelectedItem (),
- me.getModifiers ());
+ me.getModifiersEx ());
}
}
@@ -167,7 +167,7 @@
// Enter only generates an Action event if something is
// selected.
if (selectedItem != null)
- postActionEvent (selectedItem, ke.getModifiers ());
+ postActionEvent (selectedItem, ke.getModifiersEx ());
}
}
Index: gnu/java/awt/peer/gtk/GtkTextFieldPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,v
retrieving revision 1.9.4.4
diff -u -r1.9.4.4 GtkTextFieldPeer.java
--- gnu/java/awt/peer/gtk/GtkTextFieldPeer.java 26 Jul 2004 05:59:25 -0000 1.9.4.4
+++ gnu/java/awt/peer/gtk/GtkTextFieldPeer.java 30 Jul 2004 19:42:08 -0000
@@ -166,7 +166,7 @@
if (!ke.isConsumed ()
&& ke.getKeyCode () == KeyEvent.VK_ENTER)
- postActionEvent (getText (), ke.getModifiers ());
+ postActionEvent (getText (), ke.getModifiersEx ());
}
super.handleEvent (e);
Index: java/awt/AWTKeyStroke.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/AWTKeyStroke.java,v
retrieving revision 1.1
diff -u -r1.1 AWTKeyStroke.java
--- java/awt/AWTKeyStroke.java 9 Aug 2002 04:26:13 -0000 1.1
+++ java/awt/AWTKeyStroke.java 30 Jul 2004 19:42:10 -0000
@@ -409,13 +409,13 @@
{
token = t.nextToken();
if ("shift".equals(token))
- modifiers |= KeyEvent.SHIFT_MASK | KeyEvent.SHIFT_DOWN_MASK;
+ modifiers |= KeyEvent.SHIFT_DOWN_MASK;
else if ("ctrl".equals(token) || "control".equals(token))
- modifiers |= KeyEvent.CTRL_MASK | KeyEvent.CTRL_DOWN_MASK;
+ modifiers |= KeyEvent.CTRL_DOWN_MASK;
else if ("meta".equals(token))
- modifiers |= KeyEvent.META_MASK | KeyEvent.META_DOWN_MASK;
+ modifiers |= KeyEvent.META_DOWN_MASK;
else if ("alt".equals(token))
- modifiers |= KeyEvent.ALT_MASK | KeyEvent.ALT_DOWN_MASK;
+ modifiers |= KeyEvent.ALT_DOWN_MASK;
else if ("button1".equals(token))
modifiers |= KeyEvent.BUTTON1_DOWN_MASK;
else if ("button2".equals(token))
Index: java/awt/Component.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Component.java,v
retrieving revision 1.37.2.17
diff -u -r1.37.2.17 Component.java
--- java/awt/Component.java 28 Jul 2004 22:25:20 -0000 1.37.2.17
+++ java/awt/Component.java 30 Jul 2004 19:42:11 -0000
@@ -4507,23 +4507,23 @@
int id = e.getID ();
int oldMods = 0;
- int mods = ie.getModifiers ();
+ int mods = ie.getModifiersEx ();
- if ((mods & InputEvent.BUTTON2_MASK) != 0)
+ if ((mods & InputEvent.BUTTON2_DOWN_MASK) != 0)
oldMods |= Event.META_MASK;
- else if ((mods & InputEvent.BUTTON3_MASK) != 0)
+ else if ((mods & InputEvent.BUTTON3_DOWN_MASK) != 0)
oldMods |= Event.ALT_MASK;
- if ((mods & (InputEvent.SHIFT_MASK | InputEvent.SHIFT_DOWN_MASK)) != 0)
+ if ((mods & InputEvent.SHIFT_DOWN_MASK) != 0)
oldMods |= Event.SHIFT_MASK;
- if ((mods & (InputEvent.CTRL_MASK | InputEvent.CTRL_DOWN_MASK)) != 0)
+ if ((mods & InputEvent.CTRL_DOWN_MASK) != 0)
oldMods |= Event.CTRL_MASK;
- if ((mods & (InputEvent.META_MASK | InputEvent.META_DOWN_MASK)) != 0)
+ if ((mods & InputEvent.META_DOWN_MASK) != 0)
oldMods |= Event.META_MASK;
- if ((mods & (InputEvent.ALT_MASK | InputEvent.ALT_DOWN_MASK)) != 0)
+ if ((mods & InputEvent.ALT_DOWN_MASK) != 0)
oldMods |= Event.ALT_MASK;
if (e instanceof MouseEvent)
Index: java/awt/Container.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Container.java,v
retrieving revision 1.34.2.15
diff -u -r1.34.2.15 Container.java
--- java/awt/Container.java 29 Jul 2004 16:02:26 -0000 1.34.2.15
+++ java/awt/Container.java 30 Jul 2004 19:42:16 -0000
@@ -1888,7 +1888,7 @@
MouseEvent exited = new MouseEvent (lastComponentEntered,
MouseEvent.MOUSE_EXITED,
me.getWhen (),
- me.getModifiers (),
+ me.getModifiersEx (),
tp.x, tp.y,
me.getClickCount (),
me.isPopupTrigger (),
@@ -1912,7 +1912,7 @@
MouseEvent entered = new MouseEvent (lastComponentEntered,
MouseEvent.MOUSE_ENTERED,
me.getWhen (),
- me.getModifiers (),
+ me.getModifiersEx (),
cp.x, cp.y,
me.getClickCount (),
me.isPopupTrigger (),
Index: java/awt/DefaultKeyboardFocusManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/DefaultKeyboardFocusManager.java,v
retrieving revision 1.1.54.7
diff -u -r1.1.54.7 DefaultKeyboardFocusManager.java
--- java/awt/DefaultKeyboardFocusManager.java 30 Jul 2004 13:59:19 -0000 1.1.54.7
+++ java/awt/DefaultKeyboardFocusManager.java 30 Jul 2004 19:42:16 -0000
@@ -285,10 +285,9 @@
// Check if this event represents a menu shortcut.
// MenuShortcuts are activated by Ctrl- KeyEvents, only on KEY_PRESSED.
- int modifiers = e.getModifiers ();
+ int modifiers = e.getModifiersEx ();
if (e.getID() == KeyEvent.KEY_PRESSED
- && ((modifiers & KeyEvent.CTRL_MASK) != 0
- || (modifiers & KeyEvent.CTRL_DOWN_MASK) != 0))
+ && (modifiers & KeyEvent.CTRL_DOWN_MASK) != 0)
{
Window focusedWindow = getGlobalFocusedWindow ();
if (focusedWindow instanceof Frame)
@@ -324,10 +323,8 @@
// modifier.
if (shortcut.getKey () == e.getKeyCode ()
&& ((shortcut.usesShiftModifier ()
- && ((modifiers & KeyEvent.SHIFT_MASK) != 0
- || (modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0))
+ && (modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0)
|| (! shortcut.usesShiftModifier ()
- && (modifiers & KeyEvent.SHIFT_MASK) == 0
&& (modifiers & KeyEvent.SHIFT_DOWN_MASK) == 0)))
{
item.dispatchEvent (new ActionEvent (item,
@@ -354,7 +351,7 @@
// KEY_PRESSED TAB is a focus traversal keystroke, we also need to
// consume KEY_RELEASED and KEY_TYPED TAB key events).
AWTKeyStroke oppositeKeystroke = AWTKeyStroke.getAWTKeyStroke (e.getKeyCode (),
- e.getModifiers (),
+ e.getModifiersEx (),
!(e.id == KeyEvent.KEY_RELEASED));
Set forwardKeystrokes = comp.getFocusTraversalKeys (KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS);
Index: javax/swing/JMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenuItem.java,v
retrieving revision 1.2.18.13
diff -u -r1.2.18.13 JMenuItem.java
--- javax/swing/JMenuItem.java 13 Jul 2004 15:45:36 -0000 1.2.18.13
+++ javax/swing/JMenuItem.java 30 Jul 2004 19:42:17 -0000
@@ -313,7 +313,8 @@
MenuSelectionManager manager)
{
// Fire MenuDragMouseEvents if mouse is being dragged.
- boolean dragged = (event.getModifiers() & InputEvent.BUTTON1_MASK) != 0;
+ boolean dragged
+ = (event.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0;
if (dragged)
processMenuDragMouseEvent(createMenuDragMouseEvent(event, path, manager));
@@ -335,7 +336,7 @@
setArmed(false);
break;
case MouseEvent.MOUSE_PRESSED:
- if ((event.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+ if ((event.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0)
{
model.setArmed(true);
model.setPressed(true);
Index: javax/swing/KeyStroke.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/KeyStroke.java,v
retrieving revision 1.3.18.2
diff -u -r1.3.18.2 KeyStroke.java
--- javax/swing/KeyStroke.java 10 Jun 2004 07:31:01 -0000 1.3.18.2
+++ javax/swing/KeyStroke.java 30 Jul 2004 19:42:17 -0000
@@ -222,7 +222,7 @@
// Get Event ID
eventID = event.getID();
- eventMod = event.getModifiers();
+ eventMod = event.getModifiersEx();
// Check for KEY_TYPED event
if (eventID == KeyEvent.KEY_TYPED) {
Index: javax/swing/SwingUtilities.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/SwingUtilities.java,v
retrieving revision 1.6.2.12
diff -u -r1.6.2.12 SwingUtilities.java
--- javax/swing/SwingUtilities.java 10 Jul 2004 17:53:04 -0000 1.6.2.12
+++ javax/swing/SwingUtilities.java 30 Jul 2004 19:42:17 -0000
@@ -441,7 +441,7 @@
destination);
return new MouseEvent(destination, sourceEvent.getID(),
- sourceEvent.getWhen(), sourceEvent.getModifiers(),
+ sourceEvent.getWhen(), sourceEvent.getModifiersEx(),
newpt.x, newpt.y, sourceEvent.getClickCount(),
sourceEvent.isPopupTrigger(), sourceEvent.getButton());
}
@@ -863,7 +863,7 @@
*/
public static boolean isLeftMouseButton(MouseEvent event)
{
- return ((event.getModifiers() & InputEvent.BUTTON1_DOWN_MASK)
+ return ((event.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK)
== InputEvent.BUTTON1_DOWN_MASK);
}
@@ -876,7 +876,7 @@
*/
public static boolean isMiddleMouseButton(MouseEvent event)
{
- return ((event.getModifiers() & InputEvent.BUTTON2_DOWN_MASK)
+ return ((event.getModifiersEx() & InputEvent.BUTTON2_DOWN_MASK)
== InputEvent.BUTTON2_DOWN_MASK);
}
@@ -889,7 +889,7 @@
*/
public static boolean isRightMouseButton(MouseEvent event)
{
- return ((event.getModifiers() & InputEvent.BUTTON3_DOWN_MASK)
+ return ((event.getModifiersEx() & InputEvent.BUTTON3_DOWN_MASK)
== InputEvent.BUTTON3_DOWN_MASK);
}
Index: javax/swing/plaf/basic/BasicButtonListener.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicButtonListener.java,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 BasicButtonListener.java
--- javax/swing/plaf/basic/BasicButtonListener.java 9 Jun 2004 08:40:08 -0000 1.1.2.2
+++ javax/swing/plaf/basic/BasicButtonListener.java 30 Jul 2004 19:42:17 -0000
@@ -105,7 +105,7 @@
{
AbstractButton button = (AbstractButton) e.getSource();
ButtonModel model = button.getModel();
- if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+ if ((e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0)
{
// It is important that these transitions happen in this order.
model.setArmed(true);
@@ -128,7 +128,7 @@
{
AbstractButton button = (AbstractButton) e.getSource();
ButtonModel model = button.getModel();
- if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+ if ((e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0)
{
// It is important that these transitions happen in this order.
model.setPressed(false);
@@ -156,7 +156,7 @@
model.setRollover(true);
if (model.isPressed()
- && (e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+ && (e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0)
model.setArmed(true);
else
model.setArmed(false);
Index: javax/swing/plaf/basic/BasicInternalFrameUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicInternalFrameUI.java,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 BasicInternalFrameUI.java
--- javax/swing/plaf/basic/BasicInternalFrameUI.java 16 Jul 2004 02:29:23 -0000 1.1.2.2
+++ javax/swing/plaf/basic/BasicInternalFrameUI.java 30 Jul 2004 19:42:17 -0000
@@ -765,7 +765,7 @@
lastComponentEntered);
MouseEvent exited = new MouseEvent(lastComponentEntered,
MouseEvent.MOUSE_EXITED,
- me.getWhen(), me.getModifiers(),
+ me.getWhen(), me.getModifiersEx(),
tp.x, tp.y, me.getClickCount(),
me.isPopupTrigger(),
me.getButton());
@@ -787,7 +787,7 @@
MouseEvent entered = new MouseEvent(lastComponentEntered,
MouseEvent.MOUSE_ENTERED,
me.getWhen(),
- me.getModifiers(), cp.x,
+ me.getModifiersEx(), cp.x,
cp.y, me.getClickCount(),
me.isPopupTrigger(),
me.getButton());
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.15.2.20
diff -u -r1.15.2.20 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 30 Jul 2004 09:47:58 -0000 1.15.2.20
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 30 Jul 2004 19:42:17 -0000
@@ -582,11 +582,11 @@
event->key.send_event = 0;
event->key.time = (guint32) when;
- if (mods & AWT_SHIFT_MASK)
+ if (mods & AWT_SHIFT_DOWN_MASK)
event->key.state |= GDK_SHIFT_MASK;
- if (mods & AWT_CTRL_MASK)
+ if (mods & AWT_CTRL_DOWN_MASK)
event->key.state |= GDK_CONTROL_MASK;
- if (mods & AWT_ALT_MASK)
+ if (mods & AWT_ALT_DOWN_MASK)
event->key.state |= GDK_MOD1_MASK;
/* This hack is needed because the AWT has no notion of num lock.
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,v
retrieving revision 1.19.2.9
diff -u -r1.19.2.9 gnu_java_awt_peer_gtk_GtkEvents.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c 24 Jun 2004 05:31:40 -0000 1.19.2.9
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c 30 Jul 2004 19:42:18 -0000
@@ -58,11 +58,11 @@
switch (button)
{
case 1:
- return AWT_BUTTON1_MASK;
+ return AWT_BUTTON1_DOWN_MASK;
case 2:
- return AWT_BUTTON2_MASK;
+ return AWT_BUTTON2_DOWN_MASK;
case 3:
- return AWT_BUTTON3_MASK;
+ return AWT_BUTTON3_DOWN_MASK;
}
return 0;
@@ -74,11 +74,11 @@
jint result = 0;
if (state & GDK_SHIFT_MASK)
- result |= AWT_SHIFT_MASK;
+ result |= AWT_SHIFT_DOWN_MASK;
if (state & GDK_CONTROL_MASK)
- result |= AWT_CTRL_MASK;
+ result |= AWT_CTRL_DOWN_MASK;
if (state & GDK_MOD1_MASK)
- result |= AWT_ALT_MASK;
+ result |= AWT_ALT_DOWN_MASK;
return result;
}
@@ -89,17 +89,17 @@
jint result = 0;
if (state & GDK_SHIFT_MASK)
- result |= AWT_SHIFT_MASK;
+ result |= AWT_SHIFT_DOWN_MASK;
if (state & GDK_CONTROL_MASK)
- result |= AWT_CTRL_MASK;
+ result |= AWT_CTRL_DOWN_MASK;
if (state & GDK_MOD1_MASK)
- result |= AWT_ALT_MASK;
+ result |= AWT_ALT_DOWN_MASK;
if (state & GDK_BUTTON1_MASK)
- result |= AWT_BUTTON1_MASK;
+ result |= AWT_BUTTON1_DOWN_MASK;
if (state & GDK_BUTTON2_MASK)
- result |= AWT_BUTTON2_MASK;
+ result |= AWT_BUTTON2_DOWN_MASK;
if (state & GDK_BUTTON3_MASK)
- result |= AWT_BUTTON3_MASK;
+ result |= AWT_BUTTON3_DOWN_MASK;
return result;
}
@@ -124,29 +124,29 @@
if (event->key.keyval == GDK_Shift_L
|| event->key.keyval == GDK_Shift_R)
- result |= AWT_SHIFT_MASK;
+ result |= AWT_SHIFT_DOWN_MASK;
else
{
if (state & GDK_SHIFT_MASK)
- result |= AWT_SHIFT_MASK;
+ result |= AWT_SHIFT_DOWN_MASK;
}
if (event->key.keyval == GDK_Control_L
|| event->key.keyval == GDK_Control_R)
- result |= AWT_CTRL_MASK;
+ result |= AWT_CTRL_DOWN_MASK;
else
{
if (state & GDK_CONTROL_MASK)
- result |= AWT_CTRL_MASK;
+ result |= AWT_CTRL_DOWN_MASK;
}
if (event->key.keyval == GDK_Alt_L
|| event->key.keyval == GDK_Alt_R)
- result |= AWT_ALT_MASK;
+ result |= AWT_ALT_DOWN_MASK;
else
{
if (state & GDK_MOD1_MASK)
- result |= AWT_ALT_MASK;
+ result |= AWT_ALT_DOWN_MASK;
}
}
else if (event->type == GDK_KEY_RELEASE)
@@ -157,20 +157,20 @@
&& event->key.keyval != GDK_Shift_R)
{
if (state & GDK_SHIFT_MASK)
- result |= AWT_SHIFT_MASK;
+ result |= AWT_SHIFT_DOWN_MASK;
}
if (event->key.keyval != GDK_Control_L
&& event->key.keyval != GDK_Control_R)
{
if (state & GDK_CONTROL_MASK)
- result |= AWT_CTRL_MASK;
+ result |= AWT_CTRL_DOWN_MASK;
}
if (event->key.keyval != GDK_Alt_L
&& event->key.keyval != GDK_Alt_R)
{
if (state & GDK_MOD1_MASK)
- result |= AWT_ALT_MASK;
+ result |= AWT_ALT_DOWN_MASK;
}
}
@@ -885,8 +885,8 @@
postMouseEventID,
AWT_MOUSE_PRESSED,
(jlong)event->button.time,
- state_to_awt_mods (event->button.state) |
- button_to_awt_mods (event->button.button),
+ state_to_awt_mods (event->button.state)
+ | button_to_awt_mods (event->button.button),
(jint)event->button.x,
(jint)event->button.y,
click_count,
@@ -902,8 +902,8 @@
postMouseEventID,
AWT_MOUSE_RELEASED,
(jlong)event->button.time,
- state_to_awt_mods (event->button.state) |
- button_to_awt_mods (event->button.button),
+ state_to_awt_mods (event->button.state)
+ | button_to_awt_mods (event->button.button),
(jint)event->button.x,
(jint)event->button.y,
click_count,
@@ -923,8 +923,8 @@
postMouseEventID,
AWT_MOUSE_CLICKED,
(jlong)event->button.time,
- state_to_awt_mods (event->button.state) |
- button_to_awt_mods (event->button.button),
+ state_to_awt_mods (event->button.state)
+ | button_to_awt_mods (event->button.button),
(jint)event->button.x,
(jint)event->button.y,
click_count,
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,v
retrieving revision 1.11.8.4
diff -u -r1.11.8.4 gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c 6 Jul 2004 19:36:31 -0000 1.11.8.4
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c 30 Jul 2004 19:42:18 -0000
@@ -151,7 +151,6 @@
GtkWidget *text = NULL;
GtkTextBuffer *buf;
GtkTextIter iter;
- GtkTextMark *mark;
GtkTextMark *oldmark;
GtkTextIter olditer;
int oldpos;
Index: jni/gtk-peer/gtkpeer.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gtkpeer.h,v
retrieving revision 1.12.8.4
diff -u -r1.12.8.4 gtkpeer.h
--- jni/gtk-peer/gtkpeer.h 30 Jul 2004 09:47:59 -0000 1.12.8.4
+++ jni/gtk-peer/gtkpeer.h 30 Jul 2004 19:42:18 -0000
@@ -118,14 +118,14 @@
#define SYNTHETIC_EVENT_MASK (1 << 10)
-#define AWT_SHIFT_MASK (1 << 0)
-#define AWT_CTRL_MASK (1 << 1)
-#define AWT_META_MASK (1 << 2)
-#define AWT_ALT_MASK (1 << 3)
-
-#define AWT_BUTTON1_MASK (1 << 4)
-#define AWT_BUTTON2_MASK AWT_ALT_MASK
-#define AWT_BUTTON3_MASK AWT_META_MASK
+#define AWT_SHIFT_DOWN_MASK (1 << 6)
+#define AWT_CTRL_DOWN_MASK (1 << 7)
+#define AWT_META_DOWN_MASK (1 << 8)
+#define AWT_ALT_DOWN_MASK (1 << 9)
+
+#define AWT_BUTTON1_DOWN_MASK (1 << 10)
+#define AWT_BUTTON2_DOWN_MASK (1 << 11)
+#define AWT_BUTTON3_DOWN_MASK (1 << 12)
#define MULTI_CLICK_TIME 250
/* as opposed to a MULTI_PASS_TIME :) */