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

Update of /cvsroot/java-game-lib/LWJGL/platform_build/win32_ms_cmdline
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24385/platform_build/win32_ms_cmdline

Modified Files:
	build.bat 
Log Message:
Win32: Support accented characters better

Index: build.bat
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/platform_build/win32_ms_cmdline/build.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- build.bat	10 Sep 2004 09:56:25 -0000	1.4
+++ build.bat	18 Oct 2004 20:29:51 -0000	1.5
@@ -1,9 +1,9 @@
 @echo off
 
-set JAVAHOME=C:\j2sdk
+set JAVAHOME="C:\Program Files\Java\jdk1.5.0"
 set ALHOME="c:\Program Files\Creative Labs\OpenAL 1.0 SDK"
 set EAXHOME="c:\Program Files\Creative Labs\EAX 2.0 Extensions SDK"
-set DXHOME="C:\Program Files\DX90SDK"
+set DXHOME="C:\DXSDK"
 set PLTSDKHOME="C:\Program Files\Microsoft SDK"
 set COPTIONS=/I%DXHOME%\Include /I%PLTSDKHOME%\include /I%JAVAHOME%\include /I%JAVAHOME%\include\win32 /I%ALHOME%\Include /I%EAXHOME%\Include /I..\..\src\native\common /O2 /nologo /c
 set LINKEROPTS=/link /LIBPATH:%ALHOME%\libs /LIBPATH:%EAXHOME%\Libs /LIBPATH:%DXHOME%\Lib /LIBPATH:%PLTSDKHOME%\Lib

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24385/src/native/win32

Modified Files:
	Window.h org_lwjgl_input_Keyboard.cpp 
	org_lwjgl_opengl_Display.cpp 
Log Message:
Win32: Support accented characters better

Index: org_lwjgl_opengl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- org_lwjgl_opengl_Display.cpp	22 Sep 2004 18:21:28 -0000	1.26
+++ org_lwjgl_opengl_Display.cpp	18 Oct 2004 20:29:52 -0000	1.27
@@ -461,7 +461,6 @@
 		PM_REMOVE      // removal options
 		))
 	{
-		TranslateMessage(&msg);
       	DispatchMessage(&msg);
 	};
 }

Index: org_lwjgl_input_Keyboard.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Keyboard.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- org_lwjgl_input_Keyboard.cpp	22 Sep 2004 15:06:27 -0000	1.36
+++ org_lwjgl_input_Keyboard.cpp	18 Oct 2004 20:29:52 -0000	1.37
@@ -166,12 +166,6 @@
 	lpdiKeyboard->GetDeviceState((DWORD)buffer_size, keyboardBuffer);
 }
 
-
-/*
- * Class:     org_lwjgl_input_Keyboard
- * Method:    nRead
- * Signature: (I)V
- */
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nRead
   (JNIEnv * env, jclass clazz, jobject buffer_obj, jint buffer_position)
 {
@@ -206,18 +200,22 @@
 			num_events++;
 			buf[index++] = (unsigned char) rgdod[current_di_event].dwOfs;
 			buf[index++] = (unsigned char) rgdod[current_di_event].dwData;
-			if (translationEnabled) {
-				UINT virt_key = MapVirtualKey(rgdod[current_di_event].dwOfs, 1);
+			bool key_down = (rgdod[current_di_event].dwData & 0x80) != 0;
+			if (translationEnabled && key_down) {
+				UINT scan_code = rgdod[current_di_event].dwOfs;
+				UINT virt_key = MapVirtualKey(scan_code, 1);
 				if (virt_key != 0 && GetKeyboardState(state)) {
+					// Mark key down in the scan code
+					scan_code = scan_code & 0x7fff;
 					if (useUnicode) {
 						num_chars = ToUnicode(virt_key, 
-											  rgdod[current_di_event].dwOfs,
+											  scan_code,
 											  state,
 											  transBufUnicode,
 											  KEYBOARD_BUFFER_SIZE, 0);
 					} else {
 						num_chars = ToAscii(virt_key,
-											rgdod[current_di_event].dwOfs,
+											scan_code,
 											state,
 											transBufAscii,
 											0);
@@ -292,21 +290,11 @@
 	translationEnabled = true;
 }
 
-/*
- * Class:     org_lwjgl_input_Keyboard
- * Method:    nEnableBuffer
- * Signature: ()I
- */
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nEnableBuffer
   (JNIEnv * env, jclass clazz)
 {
 }
 
-/*
- * Class:     org_lwjgl_input_Keyboard
- * Method:    nisStateKeySet
- * Signature: (I)I
- */
 JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nisStateKeySet(JNIEnv *env, jclass clazz, jint key)
 {
   int state = org_lwjgl_input_Keyboard_STATE_UNKNOWN;

Index: Window.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/Window.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Window.h	22 Sep 2004 15:06:27 -0000	1.19
+++ Window.h	18 Oct 2004 20:29:52 -0000	1.20
@@ -1,113 +1,113 @@
-/* 
- * Copyright (c) 2002-2004 LWJGL Project
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are 
- * met:
- * 
- * * Redistributions of source code must retain the above copyright 
- *   notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * * Neither the name of 'LWJGL' nor the names of 
- *   its contributors may be used to endorse or promote products derived 
- *   from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- 
-/**
- * $Id$
- *
- * Include file to access public window features
- *
- * @author cix_foo <ci...@us...>
- * @version $Revision$
- */
-
-#ifndef _LWJGL_WINDOW_H_INCLUDED_
-	#define _LWJGL_WINDOW_H_INCLUDED_
-
-	#define WIN32_LEAN_AND_MEAN
-	#define _WIN32_WINDOWS 0x0410
-	#define WINVER 0x0410
-	#define _WIN32_WINNT 0x0400
-
-
-	#include <windows.h>
-	#include <jni.h>
-	#include "extgl.h"
-
-	#ifdef _PRIVATE_WINDOW_H_
-		#define WINDOW_H_API
-	#else
-		#define WINDOW_H_API extern
-
-		extern bool		isFullScreen;				// Whether we're fullscreen or not
-		extern bool		isMinimized;				// Whether we're minimized or not
-		extern bool		isFocused;					// Whether we're focused or not
-		extern bool		isDirty;					  // Whether we're dirty or not
-	#endif /* _PRIVATE_WINDOW_H_ */
-
-	WINDOW_H_API HWND getCurrentHWND();
-
-	WINDOW_H_API HGLRC getCurrentContext();
-
-	WINDOW_H_API bool applyPixelFormat(HDC hdc, int iPixelFormat);
-
-	WINDOW_H_API void closeWindow(HWND hwnd, HDC hdc);
-
-	WINDOW_H_API void handleMouseMoved(int x, int y);
-
-	WINDOW_H_API void handleMouseScrolled(int dwheel);
-
-	WINDOW_H_API void handleMouseButton(int button, int state);
-
-	WINDOW_H_API void handleMessages(void);
-
-	/*
-	 * Find a suitable pixel format
-	 */
-	WINDOW_H_API int findPixelFormat(JNIEnv *env, HDC hdc, jobject pixel_format);
-
-	/*
-	 * Find a suitable pixel format using the WGL_ARB_pixel_format extension
-	 */
-	WINDOW_H_API int findPixelFormatARB(JNIEnv *env, HDC hdc, jobject pixel_format, jobject pixelFormatCaps, bool use_hdc_bpp, bool window, bool pbuffer, bool double_buffer);
-
-	/*
-	 * Create a window with the specified title, position, size, and
-	 * fullscreen attribute. The window will have DirectInput associated
-	 * with it.
-	 * 
-	 * Returns true for success, or false for failure
-	 */
-	WINDOW_H_API HWND createWindow(int x, int y, int width, int height, bool fullscreen, bool undecorated);
-
-
-	/*
-	 * Handle native Win32 messages
-	 */
-	WINDOW_H_API void handleMessage(JNIEnv * env, jobject obj);
-
-
-	/*
-	 * Close the window
-	 */
-	WINDOW_H_API void closeWindow();
-
-#endif /* _LWJGL_WINDOW_H_INCLUDED_ */
+/* 
+ * Copyright (c) 2002-2004 LWJGL Project
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are 
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright 
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'LWJGL' nor the names of 
+ *   its contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+/**
+ * $Id$
+ *
+ * Include file to access public window features
+ *
+ * @author cix_foo <ci...@us...>
+ * @version $Revision$
+ */
+
+#ifndef _LWJGL_WINDOW_H_INCLUDED_
+	#define _LWJGL_WINDOW_H_INCLUDED_
+
+	#define WIN32_LEAN_AND_MEAN
+	#define _WIN32_WINDOWS 0x0410
+	#define WINVER 0x0410
+	#define _WIN32_WINNT 0x0400
+
+
+	#include <windows.h>
+	#include <jni.h>
+	#include "extgl.h"
+
+	#ifdef _PRIVATE_WINDOW_H_
+		#define WINDOW_H_API
+	#else
+		#define WINDOW_H_API extern
+
+		extern bool		isFullScreen;				// Whether we're fullscreen or not
+		extern bool		isMinimized;				// Whether we're minimized or not
+		extern bool		isFocused;					// Whether we're focused or not
+		extern bool		isDirty;					  // Whether we're dirty or not
+	#endif /* _PRIVATE_WINDOW_H_ */
+
+	WINDOW_H_API HWND getCurrentHWND();
+
+	WINDOW_H_API HGLRC getCurrentContext();
+
+	WINDOW_H_API bool applyPixelFormat(HDC hdc, int iPixelFormat);
+
+	WINDOW_H_API void closeWindow(HWND hwnd, HDC hdc);
+
+	WINDOW_H_API void handleMouseMoved(int x, int y);
+
+	WINDOW_H_API void handleMouseScrolled(int dwheel);
+
+	WINDOW_H_API void handleMouseButton(int button, int state);
+
+	WINDOW_H_API void handleMessages(void);
+
+	/*
+	 * Find a suitable pixel format
+	 */
+	WINDOW_H_API int findPixelFormat(JNIEnv *env, HDC hdc, jobject pixel_format);
+
+	/*
+	 * Find a suitable pixel format using the WGL_ARB_pixel_format extension
+	 */
+	WINDOW_H_API int findPixelFormatARB(JNIEnv *env, HDC hdc, jobject pixel_format, jobject pixelFormatCaps, bool use_hdc_bpp, bool window, bool pbuffer, bool double_buffer);
+
+	/*
+	 * Create a window with the specified title, position, size, and
+	 * fullscreen attribute. The window will have DirectInput associated
+	 * with it.
+	 * 
+	 * Returns true for success, or false for failure
+	 */
+	WINDOW_H_API HWND createWindow(int x, int y, int width, int height, bool fullscreen, bool undecorated);
+
+
+	/*
+	 * Handle native Win32 messages
+	 */
+	WINDOW_H_API void handleMessage(JNIEnv * env, jobject obj);
+
+
+	/*
+	 * Close the window
+	 */
+	WINDOW_H_API void closeWindow();
+
+#endif /* _LWJGL_WINDOW_H_INCLUDED_ */

Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27982/linux

Modified Files:
	org_lwjgl_input_Keyboard.c org_lwjgl_opengl_Display.c 
Log Message:
Linux: make accented character input work

Index: org_lwjgl_input_Keyboard.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Keyboard.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_input_Keyboard.c	16 Oct 2004 21:59:20 -0000	1.9
+++ org_lwjgl_input_Keyboard.c	18 Oct 2004 12:26:30 -0000	1.10
@@ -107,6 +107,16 @@
 	}
 }
 
+static void setupIMEventMask() {
+	long im_event_mask;
+	XWindowAttributes win_attributes;
+	
+	XGetWindowAttributes(getDisplay(), getCurrentWindow(), &win_attributes);
+	XGetICValues(xic, XNFilterEvents, &im_event_mask, NULL);
+	XSelectInput(getDisplay(), getCurrentWindow(), win_attributes.your_event_mask | im_event_mask);
+	XSetICFocus(xic);
+}
+
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nCreate
   (JNIEnv * env, jclass clazz)
 {
@@ -149,7 +159,9 @@
 		xim = XOpenIM(getDisplay(), NULL, NULL, NULL);
 		if (xim != NULL) {
 			xic = XCreateIC(xim,  XNClientWindow, getCurrentWindow(), XNFocusWindow, getCurrentWindow(), XNInputStyle, XIMPreeditNothing | XIMStatusNothing, NULL);
-			if (xic == NULL) {
+			if (xic != NULL) {
+				setupIMEventMask();
+			} else {
 				closeUnicodeStructs();
 			}
 		} else
@@ -190,6 +202,7 @@
 
 static int lookupStringUnicode(XKeyEvent *event, jint *translation_buffer) {
 	char utf8_translation_buffer[KEYBOARD_BUFFER_SIZE];
+	
 	jchar ucs2_translation_buffer[KEYBOARD_BUFFER_SIZE];
 	char *utf8_buf = utf8_translation_buffer;
 	jchar *ucs2_buf = ucs2_translation_buffer;
@@ -197,11 +210,9 @@
 	Status status;
 	int i;
 	
-	XSetICFocus(xic);
 	size_t utf8_bytes = Xutf8LookupString(xic, event, utf8_translation_buffer, KEYBOARD_BUFFER_SIZE*sizeof(char), NULL, &status);
 	if (status != XLookupChars && status != XLookupBoth)
 		return 0;
-	XUnsetICFocus(xic);
 	// reset converter
 	iconv(iconv_descriptor, NULL, NULL, NULL, NULL);
 	// convert from UTF-8 to UCS-2

Index: org_lwjgl_opengl_Display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_opengl_Display.c	22 Sep 2004 19:56:02 -0000	1.6
+++ org_lwjgl_opengl_Display.c	18 Oct 2004 12:26:30 -0000	1.7
@@ -254,6 +254,8 @@
 	int revert_mode;
 	while (XPending(getDisplay()) > 0) {
 		XNextEvent(getDisplay(), &event);
+		if (XFilterEvent(&event, None) == True)
+			continue;
 		switch (event.type) {
 			case ClientMessage:
 				if (event.xclient.message_type == warp_atom) {
@@ -367,7 +369,7 @@
 	root_win = RootWindow(getDisplay(), getCurrentScreen());
 	cmap = XCreateColormap(getDisplay(), root_win, vis_info->visual, AllocNone);
 	attribs.colormap = cmap;
-	attribs.event_mask = ExposureMask | FocusChangeMask | VisibilityChangeMask| StructureNotifyMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
+	attribs.event_mask = ExposureMask | FocusChangeMask | VisibilityChangeMask | StructureNotifyMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
 	attribs.background_pixel = 0xFF000000;
 	attribs.win_gravity = NorthWestGravity;
 	attribmask = CWColormap | CWBackPixel | CWEventMask | CWWinGravity;