java-game-lib-cvs Mailing List for Lightweight Java Game Library

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2669
          http://svn.sourceforge.net/java-game-lib/?rev=2669&view=rev
Author:   elias_naur
Date:     2006-11-19 15:02:25 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
Windows: Make sure AWTInputAdapter is not reporting events twice after a grab change

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
===================================================================

--- trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java	2006-11-19 22:06:46 UTC (rev 2668)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java	2006-11-19 23:02:25 UTC (rev 2669)
@@ -59,10 +59,14 @@
 		this.robot = AWTUtil.createRobot(canvas);
 	}
 
-	protected synchronized MouseEventQueue getMouseEventQueue() {
+	protected MouseEventQueue getMouseEventQueue() {
 		return mouse_queue;
 	}
 
+	protected KeyboardEventQueue getKeyboardEventQueue() {
+		return keyboard_queue;
+	}
+
 	public synchronized void grabMouse(boolean grab) {
 		this.grab = grab;
 		if (mouse_queue != null)

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java	2006-11-19 22:06:46 UTC (rev 2668)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java	2006-11-19 23:02:25 UTC (rev 2669)
@@ -115,9 +115,15 @@
 	private void grab(boolean grab) {
 		if (has_grabbed != grab) {
 			cached_mouse.grab(grab);
+			cached_keyboard.grab(grab);
 			has_grabbed = grab;
-			if (!grab)
+			cached_mouse.flush();
+			cached_keyboard.flush();
+			getMouseEventQueue().clearEvents();
+			getKeyboardEventQueue().clearEvents();
+			if (!grab) {
 				getCanvas().setCursor(cached_cursor);
+			}
 		}
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2006-11-19 22:06:46 UTC (rev 2668)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2006-11-19 23:02:25 UTC (rev 2669)
@@ -47,6 +47,7 @@
 final class WindowsKeyboard {
 	private final static int BUFFER_SIZE = 50;
 
+	private final long hwnd;
 	private final WindowsDirectInput dinput;
 	private final WindowsDirectInputDevice keyboard;
 	private final IntBuffer temp_data_buffer;
@@ -55,14 +56,17 @@
 	private final CharBuffer unicode_buffer;
 	private final ByteBuffer ascii_buffer;
 
+	private boolean grabbed;
+
 	public WindowsKeyboard(WindowsDirectInput dinput, long hwnd) throws LWJGLException {
+		this.hwnd = hwnd;
 		this.dinput = dinput;
 		try {
 			keyboard = dinput.createDevice(WindowsDirectInput.KEYBOARD_TYPE);
 			try {
-				keyboard.setCooperateLevel(hwnd, WindowsDirectInputDevice.DISCL_NONEXCLUSIVE | WindowsDirectInputDevice.DISCL_FOREGROUND);
 				keyboard.setDataFormat(WindowsDirectInput.KEYBOARD_TYPE);
 				keyboard.setBufferSize(BUFFER_SIZE);
+				acquireNonExclusive();
 			} catch (LWJGLException e) {
 				keyboard.release();
 				throw e;
@@ -84,15 +88,48 @@
 			ascii_buffer = BufferUtils.createByteBuffer(2);
 		}
 	}
-
 	private static native boolean isWindowsNT();
 
+	private boolean acquire(int flags) {
+		try {
+			keyboard.setCooperateLevel(hwnd, flags);
+			keyboard.acquire();
+			return true;
+		} catch (LWJGLException e) {
+			LWJGLUtil.log("Failed to acquire keyboard: " + e);
+			return false;
+		}
+	}
+
+	private boolean acquireNonExclusive() {
+		return acquire(WindowsDirectInputDevice.DISCL_NONEXCLUSIVE | WindowsDirectInputDevice.DISCL_FOREGROUND) ||
+			acquire(WindowsDirectInputDevice.DISCL_NONEXCLUSIVE | WindowsDirectInputDevice.DISCL_BACKGROUND);
+	}
+
 	public void destroy() {
 		keyboard.unacquire();
 		keyboard.release();
 		dinput.release();
 	}
 	
+	public void grab(boolean grab) {
+		if(grab) {
+			if (!grabbed) {
+				flush();
+				grabbed = true;
+				keyboard.unacquire();
+				if (!acquire(WindowsDirectInputDevice.DISCL_EXCLUSIVE | WindowsDirectInputDevice.DISCL_FOREGROUND))
+					LWJGLUtil.log("Failed to reset cooperative mode");
+			}
+		} else {
+			if (grabbed) {
+				grabbed = false;
+				keyboard.unacquire();
+				acquireNonExclusive();
+			}	
+		}
+	}
+
 	public void poll(ByteBuffer keyDownBuffer) {
 		int ret = keyboard.acquire();
 		if (ret != WindowsDirectInput.DI_OK && ret != WindowsDirectInput.DI_NOEFFECT)
@@ -181,7 +218,12 @@
 	private static native int ToAscii(int wVirtKey, int wScanCode, ByteBuffer lpKeyState, ByteBuffer lpChar, int flags);
 	private static native int GetKeyboardState(ByteBuffer lpKeyState);
 
-	public void read(ByteBuffer buffer) {
+	public void flush() {
+		processEvents();
+		temp_data_buffer.clear();
+	}
+
+	private void processEvents() {
 		int ret = keyboard.acquire();
 		if (ret != WindowsDirectInput.DI_OK && ret != WindowsDirectInput.DI_NOEFFECT)
 			return;
@@ -202,6 +244,10 @@
 				LWJGLUtil.log("Failed to read keyboard (0x" + Integer.toHexString(ret) + ")");
 				break;
 		}
+	}
+
+	public void read(ByteBuffer buffer) {
+		processEvents();
 		temp_data_buffer.flip();
 		translateData(temp_data_buffer, buffer);
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java	2006-11-19 22:06:46 UTC (rev 2668)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsMouse.java	2006-11-19 23:02:25 UTC (rev 2669)
@@ -246,32 +246,42 @@
 		temp_data_buffer.clear();
 		ret = mouse.getDeviceData(temp_data_buffer);
 
-		if (ret == WindowsDirectInput.DI_OK) {
-			if (mouse_grabbed) {
-				temp_data_buffer.flip();
-				copyDXEvents(temp_data_buffer);
-			}
-		} else if (ret == WindowsDirectInput.DI_BUFFEROVERFLOW) { 
-			LWJGLUtil.log("Mouse buffer overflowed");
-		} else if (ret == WindowsDirectInput.DIERR_INPUTLOST) {
-			LWJGLUtil.log("Mouse input lost");
-		} else if (ret == WindowsDirectInput.DIERR_NOTACQUIRED) {
-			LWJGLUtil.log("Mouse not acquired");
-		} else {
-			LWJGLUtil.log("unknown mouse error (" + Integer.toHexString(ret) + ")");
+		switch (ret) {
+			case WindowsDirectInput.DI_OK:
+				break;
+			case WindowsDirectInput.DI_BUFFEROVERFLOW:
+				LWJGLUtil.log("Mouse buffer overflowed");
+				break;
+			case WindowsDirectInput.DIERR_INPUTLOST:
+				LWJGLUtil.log("Mouse input lost");
+				break;
+			case WindowsDirectInput.DIERR_NOTACQUIRED:
+				LWJGLUtil.log("Mouse not acquired");
+				break;
+			default:
+				LWJGLUtil.log("unknown mouse error (" + Integer.toHexString(ret) + ")");
+				break;
 		}
 	}
 
+	public final void flush() {
+		readDXBuffer();
+		temp_data_buffer.clear();
+	}
+
 	public void read(ByteBuffer buffer) {
 		readDXBuffer();
+		if (mouse_grabbed) {
+			temp_data_buffer.flip();
+			copyDXEvents(temp_data_buffer);
+		}
 		event_queue.copyEvents(buffer);
 	}
 		
 	public void grab(boolean grab) {
 		if(grab) {
 			if (!mouse_grabbed) {
-				// flush DX event buffer
-				readDXBuffer();
+				flush();
 				mouse_grabbed = true;
 				mouse.unacquire();
 				if (!acquire(WindowsDirectInputDevice.DISCL_EXCLUSIVE | WindowsDirectInputDevice.DISCL_FOREGROUND))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (134)	Sep (52)	Oct (13)	Nov (342)	Dec (163)
2003	Jan (44)	Feb (62)	Mar (158)	Apr (38)	May (70)	Jun (58)	Jul (104)	Aug (207)	Sep (83)	Oct (122)	Nov (23)	Dec (49)
2004	Jan (119)	Feb (132)	Mar (192)	Apr (140)	May (77)	Jun (74)	Jul (201)	Aug (63)	Sep (102)	Oct (70)	Nov (173)	Dec (78)
2005	Jan (174)	Feb (197)	Mar (105)	Apr (59)	May (77)	Jun (43)	Jul (21)	Aug (18)	Sep (47)	Oct (37)	Nov (74)	Dec (50)
2006	Jan (44)	Feb (19)	Mar (32)	Apr (24)	May (31)	Jun (55)	Jul (138)	Aug (28)	Sep (12)	Oct (41)	Nov (58)	Dec (24)
2007	Jan (28)	Feb (14)	Mar (10)	Apr (68)	May (30)	Jun (26)	Jul (18)	Aug (63)	Sep (19)	Oct (29)	Nov (20)	Dec (10)
2008	Jan (38)	Feb (7)	Mar (37)	Apr (120)	May (41)	Jun (36)	Jul (39)	Aug (24)	Sep (28)	Oct (30)	Nov (36)	Dec (75)
2009	Jan (46)	Feb (22)	Mar (50)	Apr (70)	May (134)	Jun (105)	Jul (75)	Aug (34)	Sep (38)	Oct (34)	Nov (19)	Dec (20)
2010	Jan (11)	Feb (20)	Mar (65)	Apr (83)	May (104)	Jun (73)	Jul (78)	Aug (57)	Sep (43)	Oct (35)	Nov (9)	Dec (4)
2011	Jan (21)	Feb (11)	Mar (18)	Apr (10)	May (18)	Jun (15)	Jul (48)	Aug (25)	Sep (17)	Oct (45)	Nov (15)	Dec (12)
2012	Jan (21)	Feb (9)	Mar (12)	Apr (9)	May (9)	Jun (5)	Jul (1)	Aug (10)	Sep (12)	Oct (1)	Nov (28)	Dec (5)
2013	Jan (4)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb (1)	Mar (1)	Apr	May (2)	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2015	Jan (1)	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (2)	Nov	Dec
2016	Jan (2)	Feb (1)	Mar (1)	Apr (1)	May (2)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec

S	M	T	W	T	F	S
			1	2	3	4
5	6	7 (1)	8	9 (7)	10 (4)	11
12	13 (1)	14 (3)	15 (1)	16 (1)	17 (2)	18 (7)
19 (14)	20 (6)	21	22	23	24 (7)	25 (1)
26	27 (3)	28	29	30

java-game-lib-cvs Mailing List for Lightweight Java Game Library

java-game-lib-cvs — Commits to the repository will be send to this list.