You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/08/18 19:54:10 UTC
svn commit: r986823 - in /pivot/trunk/wtk/src/org/apache/pivot/wtk:
ApplicationContext.java DesktopApplicationContext.java Keyboard.java
Mouse.java
Author: gbrown
Date: Wed Aug 18 17:54:10 2010
New Revision: 986823
URL: http://svn.apache.org/viewvc?rev=986823&view=rev
Log:
Minor keyboard/mouse handling updates.
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Mouse.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java?rev=986823&r1=986822&r2=986823&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java Wed Aug 18 17:54:10 2010
@@ -1135,12 +1135,11 @@ public abstract class ApplicationContext
keyboardModifiers |= Keyboard.Modifier.SHIFT.getMask();
}
- if ((modifiersEx & KeyEvent.CTRL_DOWN_MASK) > 0) {
- // Ignore Alt-Graphics key presses
- if ((modifiersEx & KeyEvent.ALT_DOWN_MASK) == 0
- || awtKeyLocation == KeyEvent.KEY_LOCATION_RIGHT) {
- keyboardModifiers |= Keyboard.Modifier.CTRL.getMask();
- }
+ // Ignore Control when Alt-Graphics is pressed
+ if ((modifiersEx & KeyEvent.CTRL_DOWN_MASK) > 0
+ && ((modifiersEx & KeyEvent.ALT_DOWN_MASK) == 0
+ || awtKeyLocation == KeyEvent.KEY_LOCATION_RIGHT)) {
+ keyboardModifiers |= Keyboard.Modifier.CTRL.getMask();
}
if ((modifiersEx & KeyEvent.ALT_DOWN_MASK) > 0) {
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java?rev=986823&r1=986822&r2=986823&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java Wed Aug 18 17:54:10 2010
@@ -615,7 +615,7 @@ public final class DesktopApplicationCon
try {
application.startup(primaryDisplayHost.getDisplay(),
new ImmutableMap<String, String>(properties));
- } catch(Exception exception) {
+ } catch (Exception exception) {
displayException(exception);
}
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java?rev=986823&r1=986822&r2=986823&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java Wed Aug 18 17:54:10 2010
@@ -35,10 +35,6 @@ public final class Keyboard {
public int getMask() {
return 1 << ordinal();
}
-
- public boolean isSelected(int modifiers) {
- return ((modifiers & getMask()) > 0);
- }
}
/**
@@ -98,19 +94,19 @@ public final class Keyboard {
public String toString() {
int awtModifiers = 0x00;
- if (Modifier.META.isSelected(modifiers)) {
+ if (isPressed(Modifier.META)) {
awtModifiers |= KeyEvent.META_DOWN_MASK;
}
- if (Modifier.CTRL.isSelected(modifiers)) {
+ if (isPressed(Modifier.CTRL)) {
awtModifiers |= KeyEvent.CTRL_DOWN_MASK;
}
- if (Modifier.ALT.isSelected(modifiers)) {
+ if (isPressed(Modifier.ALT)) {
awtModifiers |= KeyEvent.ALT_DOWN_MASK;
}
- if (Modifier.SHIFT.isSelected(modifiers)) {
+ if (isPressed(Modifier.SHIFT)) {
awtModifiers |= KeyEvent.SHIFT_DOWN_MASK;
}
@@ -270,7 +266,7 @@ public final class Keyboard {
* <tt>true</tt> if the modifier is pressed; <tt>false</tt>, otherwise.
*/
public static boolean isPressed(Modifier modifier) {
- return modifier.isSelected(getModifiers());
+ return (modifiers & modifier.getMask()) > 0;
}
/**
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Mouse.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Mouse.java?rev=986823&r1=986822&r2=986823&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Mouse.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Mouse.java Wed Aug 18 17:54:10 2010
@@ -33,10 +33,6 @@ public final class Mouse {
public int getMask() {
return 1 << ordinal();
}
-
- public boolean isSelected(int buttons) {
- return ((buttons & getMask()) > 0);
- }
}
/**
@@ -71,7 +67,7 @@ public final class Mouse {
* <tt>true</tt> if the button is pressed; <tt>false</tt>, otherwise.
*/
public static boolean isPressed(Button button) {
- return button.isSelected(getButtons());
+ return (buttons & button.getMask()) > 0;
}
/**