cvs server: Diffing .
Index: KeyEventAdapter.java
===================================================================
RCS file: /cvs/gnome/java-access-bridge/bridge/org/GNOME/Accessibility/KeyEventAdapter.java,v
retrieving revision 1.5
diff -u -p -r1.5 KeyEventAdapter.java
--- KeyEventAdapter.java	15 Jul 2003 14:13:30 -0000	1.5
+++ KeyEventAdapter.java	28 Jul 2003 13:38:55 -0000
@@ -101,6 +101,8 @@ public class KeyEventAdapter {
             char [] chars = new char[1];
             if ( gki == null ) {
                 id =  e.getKeyChar ();
+		if (id < KeyEvent.VK_A)
+			id = e.getKeyCode () + 32;
                 chars[0] = (char) id;
                 string = new String (chars);
             }
@@ -111,13 +113,13 @@ public class KeyEventAdapter {
 		}
 
 		modifierMask = e.getModifiersEx ();
-		if ((modifierMask & InputEvent.SHIFT_MASK) != 0) 
+		if ((modifierMask & InputEvent.SHIFT_DOWN_MASK) != 0) 
 			modifiers |= (1 << ModifierType.MODIFIER_SHIFT.value());
-		if ((modifierMask & InputEvent.CTRL_MASK) != 0) 
+		if ((modifierMask & InputEvent.CTRL_DOWN_MASK) != 0) 
 			modifiers |= (1 << ModifierType.MODIFIER_CONTROL.value());
-		if ((modifierMask & InputEvent.ALT_MASK) != 0) 
+		if ((modifierMask & InputEvent.ALT_DOWN_MASK) != 0) 
 			modifiers |= (1 << ModifierType.MODIFIER_ALT.value());
-		if ((modifierMask & InputEvent.META_MASK) != 0) 
+		if ((modifierMask & InputEvent.META_DOWN_MASK) != 0) 
 			modifiers |= (1 << ModifierType.MODIFIER_META.value());
         if ( lockingKeyListener.numLockSet() ) {
 			modifiers |= (KeyMask.NUMLOCK.value());
@@ -154,6 +156,8 @@ public class KeyEventAdapter {
             char [] chars = new char[1];
             if ( gki == null ) {
                 id =  typedEvent.getKeyChar ();
+		if (id < KeyEvent.VK_A)
+			id = pressEvent.getKeyCode () + 32;
                 chars[0] = (char) id;
                 string = new String (chars);
             }
@@ -164,19 +168,19 @@ public class KeyEventAdapter {
 		}
 
 		modifierMask = typedEvent.getModifiersEx ();
-		if ((modifierMask & InputEvent.SHIFT_MASK) != 0) 
+		if ((modifierMask & InputEvent.SHIFT_DOWN_MASK) != 0) 
 			modifiers |= (1 << ModifierType.MODIFIER_SHIFT.value());
-		if ((modifierMask & InputEvent.CTRL_MASK) != 0) 
+		if ((modifierMask & InputEvent.CTRL_DOWN_MASK) != 0) 
 			modifiers |= (1 << ModifierType.MODIFIER_CONTROL.value());
-		if ((modifierMask & InputEvent.ALT_MASK) != 0) 
+		if ((modifierMask & InputEvent.ALT_DOWN_MASK) != 0) 
 			modifiers |= (1 << ModifierType.MODIFIER_ALT.value());
-		if ((modifierMask & InputEvent.META_MASK) != 0) 
+		if ((modifierMask & InputEvent.META_DOWN_MASK) != 0) 
 			modifiers |= (1 << ModifierType.MODIFIER_META.value());
         if ( lockingKeyListener.numLockSet() ) {
 			modifiers |= (KeyMask.NUMLOCK.value());
         }
 
-        // System.err.println("coalescePressAndTyped: device id = " + id ); 
+        // System.err.println("coalescePressAndTyped: device id = " + id + " " + string + " " + modifierMask + " " + modifiers);
 		if (pressEvent.getKeyChar () == typedEvent.getKeyChar ()) 
 			return new DeviceEvent (EventType.KEY_PRESSED_EVENT, 
 						id, 
