Implemented mouse button buffering

src/native/common/Makefile.am

@@ -7,6 +7,8 @@ COMMON = \
   extal.h \
   extgl.cpp \
   extgl.h \
+  common_tools.cpp \
+  common_tools.h \
   org_lwjgl_Display.h \
   org_lwjgl_Sys.h \
   org_lwjgl_input_GamePad.h \

src/native/common/common_tools.cpp

@@ -0,0 +1,93 @@
+/* 
+ * Copyright (c) 2002 Light Weight Java Game Library 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 'Light Weight Java Game Library' 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$
+ *
+ * @author elias_naur <elias_naur@users.sourceforge.net>
+ * @version $Revision$
+ */
+
+#include "common_tools.h"
+
+void initEventQueue(event_queue_t *event_queue) {
+	event_queue->list_start = 0;
+	event_queue->list_end = 0;
+}
+
+void putEventElement(event_queue_t *queue, unsigned char byte) {
+	int next_index = (queue->list_end + 1)%EVENT_BUFFER_SIZE;
+	if (next_index == queue->list_start) {
+#ifdef _DEBUG
+		printf("Keyboard buffer overflow!\n");
+#endif
+		return;
+	}
+	queue->input_event_buffer[queue->list_end] = byte;
+	queue->list_end = next_index;
+}
+
+static bool hasMoreEvents(event_queue_t *queue) {
+	return queue->list_start != queue->list_end;
+}
+
+static void copyEvent(event_queue_t *queue, int event_size, int event_index) {
+	int output_index = event_index*event_size;
+	for (int i = 0; i < event_size; i++) {
+		queue->output_event_buffer[output_index] = queue->input_event_buffer[queue->list_start];
+		queue->list_start = (queue->list_start + 1)%EVENT_BUFFER_SIZE;
+		output_index++;
+	}
+}
+
+int copyEvents(event_queue_t *event_queue, int event_size) {
+	int num_events = 0;
+	while (hasMoreEvents(event_queue)) {
+		copyEvent(event_queue, event_size, num_events);
+		num_events++;
+	}
+	return num_events;
+}
+
+unsigned char *getOutputList(event_queue_t *queue) {
+	return queue->output_event_buffer;
+}
+
+int getEventBufferSize(event_queue_t *event_queue) {
+	return EVENT_BUFFER_SIZE;
+}
+
+void throwException(JNIEnv * env, const char * err) {
+	jclass cls = env->FindClass("java/lang/Exception");
+	env->ThrowNew(cls, err);
+	env->DeleteLocalRef(cls);
+}

src/native/common/common_tools.h

@@ -0,0 +1,62 @@
+/* 
+ * Copyright (c) 2002 Light Weight Java Game Library 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 'Light Weight Java Game Library' 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$
+ *
+ * @author elias_naur <elias_naur@users.sourceforge.net>
+ * @version $Revision$
+ */
+
+#ifndef _COMMON_TOOLS_H
+#define _COMMON_TOOLS_H
+
+#include <jni.h>
+
+#define EVENT_BUFFER_SIZE 100
+
+typedef struct {
+	unsigned char input_event_buffer[EVENT_BUFFER_SIZE];
+	unsigned char output_event_buffer[EVENT_BUFFER_SIZE];
+
+	int list_start;
+	int list_end;
+} event_queue_t;
+
+extern void initEventQueue(event_queue_t *event_queue);
+extern int copyEvents(event_queue_t *event_queue, int event_size);
+extern void putEventElement(event_queue_t *queue, unsigned char byte);
+extern unsigned char *getOutputList(event_queue_t *queue);
+extern int getEventBufferSize(event_queue_t *event_queue);
+extern void throwException(JNIEnv *env, const char *msg);
+
+#endif

src/native/common/org_lwjgl_input_Keyboard.h

@@ -329,9 +329,9 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nEnableTranslation
 /*
  * Class:     org_lwjgl_input_Keyboard
  * Method:    nEnableBuffer
- * Signature: ()I
+ * Signature: ()Ljava/nio/ByteBuffer;
  */
-JNIEXPORT jint JNICALL Java_org_lwjgl_input_Keyboard_nEnableBuffer
+JNIEXPORT jobject JNICALL Java_org_lwjgl_input_Keyboard_nEnableBuffer
   (JNIEnv *, jclass);
 
 /*

src/native/common/org_lwjgl_input_Mouse.h

@@ -25,6 +25,9 @@ extern "C" {
 /* Inaccessible static: buttonName */
 /* Inaccessible static: buttonMap */
 /* Inaccessible static: initialized */
+/* Inaccessible static: readBuffer */
+/* Inaccessible static: button */
+/* Inaccessible static: state */
 /* Inaccessible static: class_00024org_00024lwjgl_00024input_00024Mouse */
 /*
  * Class:     org_lwjgl_input_Mouse
@@ -106,6 +109,22 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nDestroy
 JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll
   (JNIEnv *, jclass);
 
+/*
+ * Class:     org_lwjgl_input_Mouse
+ * Method:    nEnableBuffer
+ * Signature: ()Ljava/nio/ByteBuffer;
+ */
+JNIEXPORT jobject JNICALL Java_org_lwjgl_input_Mouse_nEnableBuffer
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     org_lwjgl_input_Mouse
+ * Method:    nRead
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_Mouse_nRead
+  (JNIEnv *, jclass);
+
 #ifdef __cplusplus
 }
 #endif