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: 2804
          http://svn.sourceforge.net/java-game-lib/?rev=2804&view=rev
Author:   elias_naur
Date:     2007-04-24 07:41:17 -0700 (Tue, 24 Apr 2007)

Log Message:
-----------
Windows: Use TranslateMessage and WM_CHAR to receive character input instead of manual translation. This change fixes composed characters.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

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

--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-04-24 14:13:42 UTC (rev 2803)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-04-24 14:41:17 UTC (rev 2804)
@@ -62,8 +62,9 @@
 	private final static int WM_MOUSEWHEEL                    = 0x020A;
 	private final static int WM_KEYDOWN						  = 256;
 	private final static int WM_KEYUP						  = 257;
-	private final static int WM_SYSKEYUP						  = 261;
-	private final static int WM_SYSKEYDOWN						  = 260;
+	private final static int WM_SYSKEYUP					  = 261;
+	private final static int WM_SYSKEYDOWN					  = 260;
+	private final static int WM_CHAR                          = 258;
 
 	private final static int WM_QUIT						  = 0x0012;
 	private final static int WM_SYSCOMMAND					  = 0x0112;
@@ -595,6 +596,15 @@
 
 	private static native void getClientRect(long hwnd, IntBuffer rect);
 
+	private void handleChar(long wParam, long lParam, long millis) {
+		byte previous_state = (byte)((lParam >>> 30) & 0x1);
+		byte state = (byte)(1 - ((lParam >>> 31) & 0x1));
+		if (state == previous_state)
+			return; // Auto-repeat message
+		if (keyboard != null)
+			keyboard.handleChar((int)(wParam & 0xFF), millis);
+	}
+
 	private void handleKeyButton(long wParam, long lParam, long millis) {
 		byte previous_state = (byte)((lParam >>> 30) & 0x1);
 		byte state = (byte)(1 - ((lParam >>> 31) & 0x1));
@@ -682,6 +692,9 @@
 			case WM_MBUTTONUP:
 				handleMouseButton(2, 0, millis);
 				return true;
+			case WM_CHAR:
+				handleChar(wParam, lParam, millis);
+				return true;
 			case WM_SYSKEYDOWN: /* Fall through */
 			case WM_SYSKEYUP: /* Fall through */
 			case WM_KEYUP: /* Fall through */

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2007-04-24 14:13:42 UTC (rev 2803)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsKeyboard.java	2007-04-24 14:41:17 UTC (rev 2804)
@@ -55,24 +55,18 @@
 	private final byte[] key_down_buffer = new byte[Keyboard.KEYBOARD_SIZE];
 	private final EventQueue event_queue = new EventQueue(Keyboard.EVENT_SIZE);
 	private final ByteBuffer tmp_event = ByteBuffer.allocate(Keyboard.EVENT_SIZE);
-	private final boolean unicode;
-	private final CharBuffer unicode_buffer;
-	private final ByteBuffer ascii_buffer;
 
 	private boolean grabbed;
 
+	private boolean has_retained_event; // Indicates if we're waiting for a WM_CHAR
+	private int retained_key_code;
+	private byte retained_state;
+	private int retained_char;
+	private long retained_millis;
+
 	public WindowsKeyboard(long hwnd) throws LWJGLException {
 		this.hwnd = hwnd;
 		keyboard_state = BufferUtils.createByteBuffer(256);
-		unicode = isWindowsNT();
-		if (unicode) {
-			unicode_buffer = BufferUtils.createCharBuffer(BUFFER_SIZE);
-			ascii_buffer = null;
-		} else {
-			unicode_buffer = null;
-			// ToAscii returns at most 2 characters
-			ascii_buffer = BufferUtils.createByteBuffer(2);
-		}
 	}
 	private static native boolean isWindowsNT();
 
@@ -97,66 +91,15 @@
 		keyDownBuffer.position(old_position);
 	}
 	
-	private void translate(int virt_key, byte state, long nanos) {
-		int keycode = MapVirtualKey(virt_key, MAPVK_VK_TO_VSC); 
-		if (state != 0) {
-			if (virt_key != 0 && GetKeyboardState(keyboard_state) != 0) {
-				// Mark key down in the scan code
-				int key_down_code = keycode & 0x7fff;
-				int num_chars;
-				if (unicode) {
-					unicode_buffer.clear();
-					num_chars = ToUnicode(virt_key, 
-							key_down_code,
-							keyboard_state,
-							unicode_buffer,
-							unicode_buffer.capacity(), 0);
-				} else {
-					ascii_buffer.clear();
-					num_chars = ToAscii(virt_key, 
-							key_down_code,
-							keyboard_state,
-							ascii_buffer,
-							0);
-				}
-				if (num_chars > 0) {
-					int current_char = 0;
-					do {
-						int char_int;
-						if (unicode) {
-							char_int = ((int)unicode_buffer.get()) & 0xFFFF;
-						} else {
-							char_int = ((int)ascii_buffer.get()) & 0xFF;
-						}
-						if (current_char >= 1) {
-							putEvent(0, (byte)0, char_int, nanos);
-						} else {
-							putEvent(virt_key, state, char_int, nanos);
-						}
-						current_char++;
-					} while (current_char < num_chars);
-				} else {
-					putEvent(virt_key, state, 0, nanos);
-				}
-			} else {
-				putEvent(virt_key, state, 0, nanos);
-			}
-		} else {
-			putEvent(virt_key, state, 0, nanos);
-		}
-	}
 	private static native int MapVirtualKey(int uCode, int uMapType);
 	private static native int ToUnicode(int wVirtKey, int wScanCode, ByteBuffer lpKeyState, CharBuffer pwszBuff, int cchBuff, int flags);
 	private static native int ToAscii(int wVirtKey, int wScanCode, ByteBuffer lpKeyState, ByteBuffer lpChar, int flags);
 	private static native int GetKeyboardState(ByteBuffer lpKeyState);
 	private static native int GetKeyState(int virt_key);
 
-	private void putEvent(int virt_key, byte state, int ch, long nanos) {
-		int keycode = WindowsKeycodes.mapVirtualKeyToLWJGLCode(virt_key);
-		if (keycode < key_down_buffer.length)
-			key_down_buffer[keycode] = state;
+	private void putEvent(int keycode, byte state, int ch, long millis) {
 		tmp_event.clear();
-		tmp_event.putInt(keycode).put(state).putInt(ch).putLong(nanos);
+		tmp_event.putInt(keycode).put(state).putInt(ch).putLong(millis*1000000);
 		tmp_event.flip();
 		event_queue.putEvent(tmp_event);
 	}
@@ -198,13 +141,36 @@
 		}
 	}
 
+	private void flushRetained() {
+		if (has_retained_event) {
+			has_retained_event = false;
+			putEvent(retained_key_code, retained_state, retained_char, retained_millis);
+		}
+	}
+
 	public void handleKey(int virt_key, int scan_code, boolean extended, byte event_state, long millis) {
-		if (isWindowsNT())
-			virt_key = translateExtended(virt_key, scan_code, event_state, extended);
-		translate(virt_key, event_state, millis*1000000);
+		virt_key = translateExtended(virt_key, scan_code, event_state, extended);
+		flushRetained();
+		has_retained_event = true;
+		int keycode = WindowsKeycodes.mapVirtualKeyToLWJGLCode(virt_key);
+		if (keycode < key_down_buffer.length)
+			key_down_buffer[keycode] = event_state;
+		retained_key_code = keycode;
+		retained_state = event_state;
+		retained_millis = millis;
+		retained_char = 0;
+//		translate(virt_key, event_state, millis*1000000);
 	}
 
+	public void handleChar(int event_char, long millis) {
+		if (!has_retained_event) {
+			putEvent(0, (byte)0, event_char, millis);
+		} else
+			retained_char = event_char;
+	}
+
 	public void read(ByteBuffer buffer) {
+		flushRetained();
 		event_queue.copyEvents(buffer);
 	}
 }

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2007-04-24 14:13:42 UTC (rev 2803)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2007-04-24 14:41:17 UTC (rev 2804)
@@ -148,6 +148,7 @@
 					))
 		{
 			DispatchMessage(&msg);
+			TranslateMessage(&msg);
 		}
 	}
 }


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 (2)	3 (3)	4	5	6	7 (4)
8 (1)	9	10	11 (5)	12	13	14 (1)
15 (2)	16	17	18	19 (26)	20	21
22 (1)	23 (3)	24 (6)	25 (1)	26 (3)	27 (1)	28 (2)
29 (5)	30 (2)

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.