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

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

Modified Files:
	org_lwjgl_input_Keyboard.c 
Log Message:
Linux: use the correct KEYBOARD_SIZE

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.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- org_lwjgl_input_Keyboard.c	21 Nov 2005 13:22:52 -0000	1.22
+++ org_lwjgl_input_Keyboard.c	23 Nov 2005 17:08:17 -0000	1.23
@@ -53,10 +53,9 @@
 #include "org_lwjgl_opengl_LinuxDisplay.h"
 
 #define KEYBOARD_BUFFER_SIZE 50
-#define KEYBOARD_SIZE 256
 #define KEY_EVENT_BACKLOG 40
 
-static unsigned char key_buf[KEYBOARD_SIZE];
+static jbyte key_buf[org_lwjgl_input_Keyboard_KEYBOARD_SIZE];
 static int numlock_mask;
 static int modeswitch_mask;
 static int caps_lock_mask;
@@ -125,7 +124,7 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nCreateKeyboard
   (JNIEnv * env, jclass clazz, jint window_mode)
 {
-	memset(key_buf, 0, KEYBOARD_SIZE*sizeof(unsigned char));
+	memset(key_buf, 0, org_lwjgl_input_Keyboard_KEYBOARD_SIZE*sizeof(jbyte));
 	created = true;
 	keyboard_grabbed = false;
 	initEventQueue(&event_queue, 3);
@@ -660,7 +659,7 @@
 	}
 }
 
-static unsigned char eventState(XKeyEvent *event) {
+static jbyte eventState(XKeyEvent *event) {
 	if (event->type == KeyPress) {
 		return 1;
 	} else if (event->type == KeyRelease) {
@@ -677,14 +676,14 @@
 
 void handleKeyEvent(XKeyEvent *event) {
 	unsigned char keycode = getKeycode(event);
-	unsigned char state = eventState(event);
+	jbyte state = eventState(event);
 	key_buf[keycode] = state;
 	bufferEvent(event);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nPollKeyboard(JNIEnv * env, jclass clazz, jobject buffer) {
-	unsigned char *new_keyboard_buffer = (unsigned char *)(*env)->GetDirectBufferAddress(env, buffer);
-	memcpy(new_keyboard_buffer, key_buf, KEYBOARD_SIZE*sizeof(unsigned char));
+	jbyte *new_keyboard_buffer = (jbyte *)(*env)->GetDirectBufferAddress(env, buffer);
+	memcpy(new_keyboard_buffer, key_buf, org_lwjgl_input_Keyboard_KEYBOARD_SIZE*sizeof(jbyte));
 }
 
 JNIEXPORT int JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nReadKeyboard(JNIEnv * env, jclass clazz, jobject buffer, jint buffer_position) {

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

Modified Files:
	org_lwjgl_opengl_Display.c 
Log Message:
Linux: Removed unused vsync_enabled from Display.c

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.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- org_lwjgl_opengl_Display.c	23 Nov 2005 15:30:53 -0000	1.44
+++ org_lwjgl_opengl_Display.c	23 Nov 2005 15:56:57 -0000	1.45
@@ -80,7 +80,6 @@
 static bool input_released;
 
 static bool dirty;
-static bool vsync_enabled;
 static bool minimized;
 static bool focused;
 static bool closerequested;
@@ -366,7 +365,6 @@
 	focused = true;
 	minimized = false;
 	closerequested = false;
-	vsync_enabled = false;
 	grab = false;
 	Window root_win;
 	Window win;

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

Modified Files:
	org_lwjgl_input_Mouse.c 
Log Message:
Linux: Removed redundant initEventQueue from Mouse.c

Index: org_lwjgl_input_Mouse.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- org_lwjgl_input_Mouse.c	22 Nov 2005 14:30:00 -0000	1.42
+++ org_lwjgl_input_Mouse.c	23 Nov 2005 15:36:21 -0000	1.43
@@ -222,7 +222,6 @@
 	created = true;
 	pointer_grabbed = false;
 	updatePointerGrab(window_mode);
-	initEventQueue(&event_queue, EVENT_SIZE);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nDestroyMouse

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

Modified Files:
	org_lwjgl_opengl_Display.c 
Log Message:
Linux: Removed redundant global variables from Display.c

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.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- org_lwjgl_opengl_Display.c	23 Nov 2005 15:18:34 -0000	1.43
+++ org_lwjgl_opengl_Display.c	23 Nov 2005 15:30:53 -0000	1.44
@@ -73,8 +73,6 @@
 static Atom delete_atom;
 static Colormap cmap;
 static Window current_win;
-static int current_height;
-static int current_width;
 static int current_depth;
 
 static Visual *current_visual;
@@ -376,8 +374,6 @@
 	int attribmask;
 
 	input_released = false;
-	current_width = width;
-	current_height = height;
 	root_win = RootWindow(getDisplay(), getCurrentScreen());
 	XVisualInfo *vis_info = getVisualInfoFromPeerInfo(env, peer_info);
 	if (vis_info == NULL)

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

Modified Files:
	org_lwjgl_opengl_Display.c 
Log Message:
Linux: Made setIcon in Display.c static since it is not called elsewhere

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.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- org_lwjgl_opengl_Display.c	22 Nov 2005 14:30:00 -0000	1.42
+++ org_lwjgl_opengl_Display.c	23 Nov 2005 15:18:34 -0000	1.43
@@ -519,7 +519,7 @@
 	jawt.Unlock(env);
 }
 
-int setIcon(char *data,int width,int height) {
+static int setIcon(char *data,int width,int height) {
 	XWMHints* win_hints;
 	int x = 0;
 	int y = 5;

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

Modified Files:
	Makefile display.c org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c 
Log Message:
Linux: Added -lm and -std=c99 to fix the warning abount round(). Removed some unnecessary headers

Index: display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- display.c	22 Nov 2005 13:53:13 -0000	1.24
+++ display.c	23 Nov 2005 15:10:05 -0000	1.25
@@ -279,7 +279,7 @@
 	int i;
 	for (i = 0; i < length; i++) {
 		float scaled_gamma = ramp_ptr[i]*0xffff;
-		short scaled_gamma_short = (unsigned short)round(scaled_gamma);
+		short scaled_gamma_short = (unsigned short)roundf(scaled_gamma);
 		native_ramp_ptr[i] = scaled_gamma_short;
 		native_ramp_ptr[i + length] = scaled_gamma_short;
 		native_ramp_ptr[i + length*2] = scaled_gamma_short;

Index: Makefile
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile	10 Oct 2005 12:50:10 -0000	1.23
+++ Makefile	23 Nov 2005 15:10:05 -0000	1.24
@@ -4,8 +4,8 @@
 LINKER=gcc
 STRIP=strip
 CFLAGS_LINK=-shared -Wall
-LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared
-CFLAGS_O=-fPIC -O2 -D_X11 -Wall -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include
+LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared
+CFLAGS_O=-fPIC -O2 -D_X11 -Wall -std=c99 -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include
 SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c)
 OBJECTS=$(subst .c,.o,$(SRC))
 LIBRARY=liblwjgl.so

Index: org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c	27 May 2005 11:50:13 -0000	1.2
+++ org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c	23 Nov 2005 15:10:05 -0000	1.3
@@ -45,9 +45,7 @@
 #include <X11/Xutil.h>
 #include "awt_tools.h"
 #include "org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.h"
-#include "extgl_glx.h"
 #include "context.h"
-#include "Window.h"
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo_nInitHandle
   (JNIEnv *env, jclass clazz, int screen, jobject lock_buffer_handle, jobject peer_info_handle) {