aboutsummaryrefslogtreecommitdiffstats
path: root/src/newt
diff options
context:
space:
mode:
Diffstat (limited to 'src/newt')
-rw-r--r--src/newt/classes/com/jogamp/newt/event/InputEvent.java27
-rw-r--r--src/newt/classes/com/jogamp/newt/event/MouseEvent.java1
-rw-r--r--src/newt/classes/jogamp/newt/WindowImpl.java8
-rw-r--r--src/newt/classes/jogamp/newt/awt/event/AWTNewtEventFactory.java14
-rw-r--r--src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java16
5 files changed, 51 insertions, 15 deletions
diff --git a/src/newt/classes/com/jogamp/newt/event/InputEvent.java b/src/newt/classes/com/jogamp/newt/event/InputEvent.java
index 40a5c84a8..dcbd1eb94 100644
--- a/src/newt/classes/com/jogamp/newt/event/InputEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/InputEvent.java
@@ -34,16 +34,19 @@
package com.jogamp.newt.event;
+@SuppressWarnings("serial")
public abstract class InputEvent extends NEWTEvent
{
- public static final int SHIFT_MASK = 1 << 0;
- public static final int CTRL_MASK = 1 << 1;
- public static final int META_MASK = 1 << 2;
- public static final int ALT_MASK = 1 << 3;
- public static final int ALT_GRAPH_MASK = 1 << 5;
- public static final int BUTTON1_MASK = 1 << 6;
- public static final int BUTTON2_MASK = 1 << 7;
- public static final int BUTTON3_MASK = 1 << 8;
+ public static final int SHIFT_MASK = 1 << 0;
+ public static final int CTRL_MASK = 1 << 1;
+ public static final int META_MASK = 1 << 2;
+ public static final int ALT_MASK = 1 << 3;
+ public static final int ALT_GRAPH_MASK = 1 << 5;
+ public static final int BUTTON1_MASK = 1 << 6;
+ public static final int BUTTON2_MASK = 1 << 7;
+ public static final int BUTTON3_MASK = 1 << 8;
+ public static final int CONFINED_MASK = 1 << 16;
+ public static final int INVISIBLE_MASK = 1 << 16;
protected InputEvent(int eventType, Object source, long when, int modifiers) {
super(eventType, source, when);
@@ -68,6 +71,12 @@ public abstract class InputEvent extends NEWTEvent
public boolean isShiftDown() {
return (modifiers&SHIFT_MASK)!=0;
}
+ public boolean isConfined() {
+ return (modifiers&CONFINED_MASK)!=0;
+ }
+ public boolean isInvisible() {
+ return (modifiers&INVISIBLE_MASK)!=0;
+ }
/**
* @return Array of pressed mouse buttons [{@link MouseEvent#BUTTON1} ..].
@@ -100,7 +109,7 @@ public abstract class InputEvent extends NEWTEvent
}
public String toString() {
- return "InputEvent[modifiers:"+modifiers+", "+super.toString()+"]";
+ return "InputEvent[modifiers: 0x"+Integer.toHexString(modifiers)+", "+super.toString()+"]";
}
private final int modifiers;
diff --git a/src/newt/classes/com/jogamp/newt/event/MouseEvent.java b/src/newt/classes/com/jogamp/newt/event/MouseEvent.java
index 2c12049c4..ccc674f1d 100644
--- a/src/newt/classes/com/jogamp/newt/event/MouseEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/MouseEvent.java
@@ -34,6 +34,7 @@
package com.jogamp.newt.event;
+@SuppressWarnings("serial")
public class MouseEvent extends InputEvent
{
public static final int BUTTON1 = 1;
diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java
index b5cd3e5fd..637f36594 100644
--- a/src/newt/classes/jogamp/newt/WindowImpl.java
+++ b/src/newt/classes/jogamp/newt/WindowImpl.java
@@ -45,6 +45,7 @@ import com.jogamp.newt.Window;
import com.jogamp.common.util.locks.LockFactory;
import com.jogamp.common.util.locks.RecursiveLock;
import com.jogamp.newt.ScreenMode;
+import com.jogamp.newt.event.InputEvent;
import com.jogamp.newt.event.KeyEvent;
import com.jogamp.newt.event.KeyListener;
import com.jogamp.newt.event.MouseEvent;
@@ -1897,6 +1898,13 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
MouseEvent eClicked = null;
MouseEvent e = null;
+ if(isPointerConfined()) {
+ modifiers |= InputEvent.CONFINED_MASK;
+ }
+ if(!isPointerVisible()) {
+ modifiers |= InputEvent.INVISIBLE_MASK;
+ }
+
if(MouseEvent.EVENT_MOUSE_PRESSED==eventType) {
if(when-lastMousePressed<MouseEvent.getClickTimeout()) {
lastMouseClickCount++;
diff --git a/src/newt/classes/jogamp/newt/awt/event/AWTNewtEventFactory.java b/src/newt/classes/jogamp/newt/awt/event/AWTNewtEventFactory.java
index b9c8d2c7b..d64cc9359 100644
--- a/src/newt/classes/jogamp/newt/awt/event/AWTNewtEventFactory.java
+++ b/src/newt/classes/jogamp/newt/awt/event/AWTNewtEventFactory.java
@@ -29,6 +29,7 @@
package jogamp.newt.awt.event;
import com.jogamp.common.util.IntIntHashMap;
+import com.jogamp.newt.event.InputEvent;
public class AWTNewtEventFactory {
@@ -122,10 +123,19 @@ public class AWTNewtEventFactory {
rotation = ((java.awt.event.MouseWheelEvent)event).getWheelRotation();
}
+ int mods = awtModifiers2Newt(event.getModifiers(), true);
+ if(null!=newtSource) {
+ if(newtSource.isPointerConfined()) {
+ mods |= InputEvent.CONFINED_MASK;
+ }
+ if(!newtSource.isPointerVisible()) {
+ mods |= InputEvent.INVISIBLE_MASK;
+ }
+ }
+
return new com.jogamp.newt.event.MouseEvent(
type, (null==newtSource)?(Object)event.getComponent():(Object)newtSource, event.getWhen(),
- awtModifiers2Newt(event.getModifiers(), true),
- event.getX(), event.getY(), event.getClickCount(),
+ mods, event.getX(), event.getY(), event.getClickCount(),
awtButton2Newt(event.getButton()), rotation);
}
return null; // no mapping ..
diff --git a/src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java b/src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java
index ecf1f72cd..863bfd372 100644
--- a/src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java
+++ b/src/newt/classes/jogamp/newt/driver/android/event/AndroidNewtEventFactory.java
@@ -32,6 +32,7 @@ import java.awt.event.MouseEvent;
import com.jogamp.common.util.IntIntHashMap;
import com.jogamp.newt.Window;
+import com.jogamp.newt.event.InputEvent;
public class AndroidNewtEventFactory {
@@ -157,14 +158,22 @@ public class AndroidNewtEventFactory {
index++;
}
+ if(null!=newtSource) {
+ if(newtSource.isPointerConfined()) {
+ modifiers |= InputEvent.CONFINED_MASK;
+ }
+ if(!newtSource.isPointerVisible()) {
+ modifiers |= InputEvent.INVISIBLE_MASK;
+ }
+ }
+
com.jogamp.newt.event.MouseEvent res[];
com.jogamp.newt.event.MouseEvent me1 =
new com.jogamp.newt.event.MouseEvent(
type,
(null==newtSource)?null:(Object)newtSource, event.getEventTime(),
- modifiers ,
- x, y, pressure, pointers, clickCount,
+ modifiers, x, y, pressure, pointers, clickCount,
pointers.length==1 ? MouseEvent.BUTTON1 : 0, rotation);
if(type == com.jogamp.newt.event.MouseEvent.EVENT_MOUSE_RELEASED) {
@@ -172,8 +181,7 @@ public class AndroidNewtEventFactory {
new com.jogamp.newt.event.MouseEvent(
com.jogamp.newt.event.MouseEvent.EVENT_MOUSE_CLICKED,
(null==newtSource)?null:(Object)newtSource, event.getEventTime(),
- modifiers ,
- x, y, pressure, pointers, clickCount,
+ modifiers, x, y, pressure, pointers, clickCount,
pointers.length==1 ? MouseEvent.BUTTON1 : 0, rotation);
res = new com.jogamp.newt.event.MouseEvent[2];
res[0] = me1;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 09:15:20 +0000