sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #375 from davidB/wip_jogl

Browse Source 
jogl: some fixes about mouse handler
This commit is contained in:
Julien Gouesse 2015-11-07 15:29:45 +01:00
commit 8752c42aa6
1 changed files with 55 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
jme3-jogl/src/main/java/com/jme3/input/jogl/NewtMouseInput.java
View File

@ -50,6 +50,8 @@ import com.jogamp.nativewindow.util.DimensionImmutable;
import com.jogamp.nativewindow.util.PixelFormat; import com.jogamp.nativewindow.util.PixelFormat;
import com.jogamp.nativewindow.util.PixelRectangle; import com.jogamp.nativewindow.util.PixelRectangle;
import com.jogamp.nativewindow.util.Point; import com.jogamp.nativewindow.util.Point;
import com.jogamp.newt.event.WindowAdapter;
import com.jogamp.newt.event.WindowEvent;
public class NewtMouseInput implements MouseInput, MouseListener { public class NewtMouseInput implements MouseInput, MouseListener {
@ -106,40 +108,67 @@ public class NewtMouseInput implements MouseInput, MouseListener {
component = comp; component = comp;
component.addMouseListener(this); component.addMouseListener(this);
component.addWindowListener(new WindowAdapter(){
@Override
public void windowGainedFocus(WindowEvent e) {
setCursorVisible(visible);
}
@Override
public void windowLostFocus(WindowEvent e) {
//without those lines,
//on Linux (OpenBox) the mouse is not restored if invisible (eg via Alt-Tab)
component.setPointerVisible(true);
component.confinePointer(false);
}
});
} }
@Override
public void initialize() { public void initialize() {
} }
@Override
public void destroy() { public void destroy() {
} }
@Override
public boolean isInitialized() { public boolean isInitialized() {
return true; return true;
} }
@Override
public void setInputListener(RawInputListener listener) { public void setInputListener(RawInputListener listener) {
this.listener = listener; this.listener = listener;
} }
@Override
public long getInputTimeNanos() { public long getInputTimeNanos() {
return System.nanoTime(); return System.nanoTime();
} }
@Override
public void setCursorVisible(boolean visible) { public void setCursorVisible(boolean visible) {
if (this.visible != visible) { lastKnownLocation.setX(0);
lastKnownLocation.setX(0); lastKnownLocation.setY(0);
lastKnownLocation.setY(0);
this.visible = visible; this.visible = visible;
component.setPointerVisible(visible); component.setPointerVisible(visible);
if (!visible) { component.confinePointer(!visible);
recenterMouse(component); hack_confinePointer();
}
}
} }
private void hack_confinePointer() {
if (component.hasFocus() && component.isPointerConfined() && !component.isPointerVisible()) {
recenterMouse(component);
}
}
@Override
public void update() { public void update() {
if (!component.hasFocus()) return;
if (cursorMoved) { if (cursorMoved) {
int newX = location.getX(); int newX = location.getX();
int newY = location.getY(); int newY = location.getY();
@ -173,15 +202,18 @@ public class NewtMouseInput implements MouseInput, MouseListener {
} }
} }
@Override
public int getButtonCount() { public int getButtonCount() {
return 3; return 3;
} }
@Override
public void mouseClicked(MouseEvent awtEvt) { public void mouseClicked(MouseEvent awtEvt) {
// MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(arg0), false); // MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(arg0), false);
// listener.onMouseButtonEvent(evt); // listener.onMouseButtonEvent(evt);
} }
@Override
public void mousePressed(MouseEvent newtEvt) { public void mousePressed(MouseEvent newtEvt) {
MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(newtEvt), true, newtEvt.getX(), newtEvt.getY()); MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(newtEvt), true, newtEvt.getX(), newtEvt.getY());
evt.setTime(newtEvt.getWhen()); evt.setTime(newtEvt.getWhen());
@ -190,7 +222,8 @@ public class NewtMouseInput implements MouseInput, MouseListener {
} }
} }
public void mouseReleased(MouseEvent awtEvt) { @Override
public void mouseReleased(MouseEvent awtEvt) {
MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(awtEvt), false, awtEvt.getX(), awtEvt.getY()); MouseButtonEvent evt = new MouseButtonEvent(getJMEButtonIndex(awtEvt), false, awtEvt.getX(), awtEvt.getY());
evt.setTime(awtEvt.getWhen()); evt.setTime(awtEvt.getWhen());
synchronized (eventQueue) { synchronized (eventQueue) {
@ -198,18 +231,17 @@ public class NewtMouseInput implements MouseInput, MouseListener {
} }
} }
@Override
public void mouseEntered(MouseEvent awtEvt) { public void mouseEntered(MouseEvent awtEvt) {
if (!visible) { hack_confinePointer();
recenterMouse(component);
}
} }
@Override
public void mouseExited(MouseEvent awtEvt) { public void mouseExited(MouseEvent awtEvt) {
if (!visible) { hack_confinePointer();
recenterMouse(component);
}
} }
@Override
public void mouseWheelMoved(MouseEvent awtEvt) { public void mouseWheelMoved(MouseEvent awtEvt) {
//FIXME not sure this is the right way to handle this case //FIXME not sure this is the right way to handle this case
// [0] should be used when the shift key is down // [0] should be used when the shift key is down
@ -218,10 +250,12 @@ public class NewtMouseInput implements MouseInput, MouseListener {
cursorMoved = true; cursorMoved = true;
} }
@Override
public void mouseDragged(MouseEvent awtEvt) { public void mouseDragged(MouseEvent awtEvt) {
mouseMoved(awtEvt); mouseMoved(awtEvt);
} }
@Override
public void mouseMoved(MouseEvent awtEvt) { public void mouseMoved(MouseEvent awtEvt) {
if (isRecentering) { if (isRecentering) {
// MHenze (cylab) Fix Issue 35: // MHenze (cylab) Fix Issue 35:
@ -239,9 +273,7 @@ public class NewtMouseInput implements MouseInput, MouseListener {
int dy = awtEvt.getY() - lastKnownLocation.getY(); int dy = awtEvt.getY() - lastKnownLocation.getY();
location.setX(location.getX() + dx); location.setX(location.getX() + dx);
location.setY(location.getY() + dy); location.setY(location.getY() + dy);
if (!visible) { hack_confinePointer();
recenterMouse(component);
}
lastKnownLocation.setX(awtEvt.getX()); lastKnownLocation.setX(awtEvt.getX());
lastKnownLocation.setY(awtEvt.getY()); lastKnownLocation.setY(awtEvt.getY());
@ -287,12 +319,13 @@ public class NewtMouseInput implements MouseInput, MouseListener {
return index; return index;
} }
@Override
public void setNativeCursor(JmeCursor cursor) { public void setNativeCursor(JmeCursor cursor) {
final ByteBuffer pixels = Buffers.copyIntBufferAsByteBuffer(cursor.getImagesData()); final ByteBuffer pixels = Buffers.copyIntBufferAsByteBuffer(cursor.getImagesData());
final DimensionImmutable size = new Dimension(cursor.getWidth(), cursor.getHeight()); final DimensionImmutable size = new Dimension(cursor.getWidth(), cursor.getHeight());
final PixelFormat pixFormat = PixelFormat.RGBA8888; final PixelFormat pixFormat = PixelFormat.RGBA8888;
final PixelRectangle.GenericPixelRect rec = new PixelRectangle.GenericPixelRect(pixFormat, size, 0, true, pixels); final PixelRectangle.GenericPixelRect rec = new PixelRectangle.GenericPixelRect(pixFormat, size, 0, true, pixels);
final PointerIcon joglCursor = component.getScreen().getDisplay().createPointerIcon(rec, cursor.getXHotSpot(), cursor.getYHotSpot()); final PointerIcon joglCursor = component.getScreen().getDisplay().createPointerIcon(rec, cursor.getXHotSpot(), cursor.getHeight() - cursor.getYHotSpot());
component.setPointerIcon(joglCursor); component.setPointerIcon(joglCursor);
} }
} }