Menu
▾
▴
java-game-lib-cvs
|
From: <eli...@us...> - 2006-11-10 15:12:55
|
Revision: 2640
http://svn.sourceforge.net/java-game-lib/?rev=2640&view=rev
Author: elias_naur
Date: 2006-11-10 07:12:49 -0800 (Fri, 10 Nov 2006)
Log Message:
-----------
Windows: Use WindowsKeyboard in WindowsAWTInput to ensure keyboard input.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-10 13:52:18 UTC (rev 2639)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-10 15:12:49 UTC (rev 2640)
@@ -54,6 +54,7 @@
private long cached_hwnd;
private WindowsMouse cached_mouse;
+ private WindowsKeyboard cached_keyboard;
private boolean has_grabbed;
public WindowsAWTInput(AWTGLCanvas canvas) throws LWJGLException {
@@ -81,7 +82,9 @@
cached_hwnd = hwnd;
if (cached_mouse != null)
cached_mouse.destroy();
- cached_mouse = new WindowsMouse(WindowsDisplay.createDirectInput(), hwnd);
+ WindowsDirectInput dinput = WindowsDisplay.createDirectInput();
+ cached_mouse = new WindowsMouse(dinput, hwnd);
+ cached_keyboard = new WindowsKeyboard(dinput, hwnd);
}
if (isGrabbed() && getCanvas().getCursor() != blank_cursor) {
cached_cursor = getCanvas().getCursor();
@@ -144,4 +147,20 @@
} else
super.readMouse(buffer);
}
+
+ public synchronized void readKeyboard(ByteBuffer buffer) {
+ if (isGrabbed()) {
+ if (cached_keyboard != null)
+ cached_keyboard.read(buffer);
+ } else
+ super.readKeyboard(buffer);
+ }
+
+ public synchronized void pollKeyboard(ByteBuffer keyDownBuffer) {
+ if (isGrabbed()) {
+ if (cached_keyboard != null)
+ cached_keyboard.poll(keyDownBuffer);
+ } else
+ super.pollKeyboard(keyDownBuffer);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-20 08:14:51
|
Revision: 2671
http://svn.sourceforge.net/java-game-lib/?rev=2671&view=rev
Author: elias_naur
Date: 2006-11-20 00:14:50 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
Windows: Destroy the keyboard when we create a new one
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-20 08:04:56 UTC (rev 2670)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-20 08:14:50 UTC (rev 2671)
@@ -68,10 +68,19 @@
if (cached_mouse != null) {
grab(false);
cached_mouse.destroy();
+ cached_mouse = null;
}
super.destroyMouse();
}
+ public synchronized void destroyKeyboard() {
+ if (cached_keyboard != null) {
+ cached_keyboard.destroy();
+ cached_keyboard = null;
+ }
+ super.destroyKeyboard();
+ }
+
public synchronized void processInput(PeerInfo peer_info) {
WindowsPeerInfo windows_peerinfo = (WindowsPeerInfo)peer_info;
long hwnd = windows_peerinfo.getHwnd();
@@ -80,8 +89,12 @@
if (cached_mouse == null || hwnd != cached_hwnd) {
has_grabbed = false;
cached_hwnd = hwnd;
- if (cached_mouse != null)
+ if (cached_mouse != null) {
cached_mouse.destroy();
+ }
+ if (cached_keyboard != null) {
+ cached_keyboard.destroy();
+ }
WindowsDirectInput dinput = WindowsDisplay.createDirectInput();
cached_mouse = new WindowsMouse(dinput, hwnd);
cached_keyboard = new WindowsKeyboard(dinput, hwnd);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-20 09:26:47
|
Revision: 2673
http://svn.sourceforge.net/java-game-lib/?rev=2673&view=rev
Author: elias_naur
Date: 2006-11-20 01:26:44 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
Windows: Dont use DirectInput for keyboard input. This fixes shifted typing.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-20 08:39:22 UTC (rev 2672)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-20 09:26:44 UTC (rev 2673)
@@ -54,7 +54,7 @@
private long cached_hwnd;
private WindowsMouse cached_mouse;
- private WindowsKeyboard cached_keyboard;
+// private WindowsKeyboard cached_keyboard;
private boolean has_grabbed;
public WindowsAWTInput(AWTGLCanvas canvas) throws LWJGLException {
@@ -73,14 +73,14 @@
super.destroyMouse();
}
- public synchronized void destroyKeyboard() {
+/* public synchronized void destroyKeyboard() {
if (cached_keyboard != null) {
cached_keyboard.destroy();
cached_keyboard = null;
}
super.destroyKeyboard();
}
-
+*/
public synchronized void processInput(PeerInfo peer_info) {
WindowsPeerInfo windows_peerinfo = (WindowsPeerInfo)peer_info;
long hwnd = windows_peerinfo.getHwnd();
@@ -92,12 +92,12 @@
if (cached_mouse != null) {
cached_mouse.destroy();
}
- if (cached_keyboard != null) {
+/* if (cached_keyboard != null) {
cached_keyboard.destroy();
- }
+ }*/
WindowsDirectInput dinput = WindowsDisplay.createDirectInput();
cached_mouse = new WindowsMouse(dinput, hwnd);
- cached_keyboard = new WindowsKeyboard(dinput, hwnd);
+// cached_keyboard = new WindowsKeyboard(dinput, hwnd);
}
if (isGrabbed() && getCanvas().getCursor() != blank_cursor) {
cached_cursor = getCanvas().getCursor();
@@ -128,12 +128,12 @@
private void grab(boolean grab) {
if (has_grabbed != grab) {
cached_mouse.grab(grab);
- cached_keyboard.grab(grab);
+// cached_keyboard.grab(grab);
has_grabbed = grab;
cached_mouse.flush();
- cached_keyboard.flush();
+// cached_keyboard.flush();
getMouseEventQueue().clearEvents();
- getKeyboardEventQueue().clearEvents();
+// getKeyboardEventQueue().clearEvents();
if (!grab) {
getCanvas().setCursor(cached_cursor);
}
@@ -167,7 +167,7 @@
super.readMouse(buffer);
}
- public synchronized void readKeyboard(ByteBuffer buffer) {
+/* public synchronized void readKeyboard(ByteBuffer buffer) {
if (isGrabbed()) {
if (cached_keyboard != null)
cached_keyboard.read(buffer);
@@ -181,5 +181,5 @@
cached_keyboard.poll(keyDownBuffer);
} else
super.pollKeyboard(keyDownBuffer);
- }
+ }*/
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2006-11-24 15:21:05
|
Revision: 2681
http://svn.sourceforge.net/java-game-lib/?rev=2681&view=rev
Author: elias_naur
Date: 2006-11-24 07:21:02 -0800 (Fri, 24 Nov 2006)
Log Message:
-----------
Windows: Make sure that the cursor position doesn't jump when switching grab mode
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-24 15:10:15 UTC (rev 2680)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2006-11-24 15:21:02 UTC (rev 2681)
@@ -142,12 +142,12 @@
public synchronized void grabMouse(boolean grab) {
if (grab != isGrabbed()) {
- super.grabMouse(grab);
/* Only ungrab since grabbing can only occur in processInput
* when the hwnd is guaranteed valid
*/
if (cached_mouse != null && !grab)
grab(grab);
+ super.grabMouse(grab);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eli...@us...> - 2007-04-24 13:22:52
|
Revision: 2800
http://svn.sourceforge.net/java-game-lib/?rev=2800&view=rev
Author: elias_naur
Date: 2007-04-24 06:22:35 -0700 (Tue, 24 Apr 2007)
Log Message:
-----------
Compile fix
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2007-04-24 09:30:03 UTC (rev 2799)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java 2007-04-24 13:22:35 UTC (rev 2800)
@@ -105,7 +105,7 @@
* task bar and clicking on it. So we'll use ClipCursor to
* contain it while the cursor is grabbed.
*/
- WindowsDisplay.setupCursorClipping(hwnd, true); // Just clip it to a fullscreen window
+ WindowsDisplay.setupCursorClipping(hwnd); // Just clip it to a fullscreen window
if (getCanvas().getCursor() != blank_cursor) {
cached_cursor = getCanvas().getCursor();
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X