From 5b1b513aab951ecadacc193115c5b8c106aeee73 Mon Sep 17 00:00:00 2001
From: Elias Naur <elias.naur@gmail.com>
Date: Thu, 11 Nov 2004 13:27:59 +0000
Subject: [PATCH] Moved native cursors to DisplayImplementation

---
 src/java/org/lwjgl/input/Cursor.java          | 26 +++++--------------
 .../lwjgl/opengl/DisplayImplementation.java   |  7 ++++-
 src/java/org/lwjgl/opengl/LinuxDisplay.java   | 16 +++++++++++-
 src/java/org/lwjgl/opengl/Win32Display.java   | 16 +++++++++++-
 src/native/linux/org_lwjgl_input_Cursor.c     |  6 ++---
 src/native/win32/org_lwjgl_input_Cursor.cpp   |  5 ++--
 6 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/src/java/org/lwjgl/input/Cursor.java b/src/java/org/lwjgl/input/Cursor.java
index 73e59790..2b439754 100644
--- a/src/java/org/lwjgl/input/Cursor.java
+++ b/src/java/org/lwjgl/input/Cursor.java
@@ -38,6 +38,7 @@ import org.lwjgl.LWJGLException;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.BufferChecks;
 import org.lwjgl.Sys;
+import org.lwjgl.opengl.Display;
 
 /**
  * $Id$
@@ -50,7 +51,6 @@ import org.lwjgl.Sys;
  */
 
 public class Cursor {
-	private final static int HANDLE_SIZE = 8;
 	/** First element to display */
 	private final CursorElement[] cursors;
 	
@@ -115,8 +115,7 @@ public class Cursor {
 			// create our cursor elements
 			cursors = new CursorElement[numImages];
 			for(int i=0; i<numImages; i++) {
-				ByteBuffer handle = BufferUtils.createByteBuffer(HANDLE_SIZE);
-				nCreateCursor(handle, width, height, xHotspot, yHotspot, 1, images_copy, images_copy.position(), null, 0);
+				Object handle = Display.getImplementation().createCursor(width, height, xHotspot, yHotspot, 1, images_copy, null);
 				long delay = (delays != null) ? delays.get(i) : 0;
 				long timeout = System.currentTimeMillis();
 				cursors[i] = new CursorElement(handle, delay, timeout);
@@ -126,8 +125,7 @@ public class Cursor {
 			}
 		} else if (osName.startsWith("Lin")) {
 			// create our cursor elements
-			ByteBuffer handle = BufferUtils.createByteBuffer(HANDLE_SIZE);
-			nCreateCursor(handle, width, height, xHotspot, yHotspot, numImages, images_copy, images_copy.position(), delays, delays != null ? delays.position() : -1);
+			Object handle = Display.getImplementation().createCursor(width, height, xHotspot, yHotspot, numImages, images_copy, delays);
 			CursorElement cursor_element = new CursorElement(handle, -1, -1);
 			cursors = new CursorElement[]{cursor_element};
 		} else {
@@ -176,7 +174,7 @@ public class Cursor {
 	/**
 	 * Gets the native handle associated with the cursor object.
 	 */
-	ByteBuffer getHandle() {
+	Object getHandle() {
 		return cursors[index].cursorHandle;
 	}
 	
@@ -194,7 +192,7 @@ public class Cursor {
 			}
 		}
 		for(int i=0; i<cursors.length; i++) {
-			nDestroyCursor(cursors[i].cursorHandle);
+			Display.getImplementation().destroyCursor(cursors[i].cursorHandle);
 		}
 	}
 
@@ -220,22 +218,12 @@ public class Cursor {
 		index = ++index % cursors.length;
 	}
 	
-	/**
-	 * Native method to create a native cursor
-	 */
-	private static native void nCreateCursor(ByteBuffer handle, int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, int images_offset, IntBuffer delays, int delays_offset) throws LWJGLException;
-
-	/**
-	 * Native method to destroy a native cursor
-	 */
-	private static native void nDestroyCursor(ByteBuffer cursorHandle);
-	
 	/**
 	 * A single cursor element, used when animating
 	 */
 	private static class CursorElement {
 		/** Handle to cursor */
-		final ByteBuffer cursorHandle;
+		final Object cursorHandle;
 		
 		/** How long a delay this element should have */
 		final long delay;
@@ -243,7 +231,7 @@ public class Cursor {
 		/** Absolute time this element times out */
 		long timeout;
 
-		CursorElement(ByteBuffer cursorHandle, long delay, long timeout) {
+		CursorElement(Object cursorHandle, long delay, long timeout) {
 			this.cursorHandle = cursorHandle;
 			this.delay = delay;
 			this.timeout = timeout;
diff --git a/src/java/org/lwjgl/opengl/DisplayImplementation.java b/src/java/org/lwjgl/opengl/DisplayImplementation.java
index 96d4d535..4d79d3fb 100644
--- a/src/java/org/lwjgl/opengl/DisplayImplementation.java
+++ b/src/java/org/lwjgl/opengl/DisplayImplementation.java
@@ -180,7 +180,7 @@ public interface DisplayImplementation {
 	public int getNativeCursorCaps();
 
 	/** Native method to set the native cursor */
-	public void setNativeCursor(ByteBuffer handle) throws LWJGLException;
+	public void setNativeCursor(Object handle) throws LWJGLException;
 
 	/** Native method returning the minimum cursor size */
 	public int getMinCursorSize();
@@ -229,4 +229,9 @@ public interface DisplayImplementation {
 	public void enableKeyboardBuffer() throws LWJGLException;
 	
 	public int isStateKeySet(int key);
+	
+	/** Native cursor handles */
+	public Object createCursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, IntBuffer delays) throws LWJGLException;
+
+	public void destroyCursor(Object cursor_handle);
 }
diff --git a/src/java/org/lwjgl/opengl/LinuxDisplay.java b/src/java/org/lwjgl/opengl/LinuxDisplay.java
index 988a4d90..fbd23ebb 100644
--- a/src/java/org/lwjgl/opengl/LinuxDisplay.java
+++ b/src/java/org/lwjgl/opengl/LinuxDisplay.java
@@ -41,10 +41,14 @@ package org.lwjgl.opengl;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
 
 import org.lwjgl.LWJGLException;
+import org.lwjgl.BufferUtils;
 
 final class LinuxDisplay implements DisplayImplementation {
+	private final static int CURSOR_HANDLE_SIZE = 8;
+
 	public native void createWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException;
 	public native void destroyWindow();
 	public native void switchDisplayMode(DisplayMode mode) throws LWJGLException;
@@ -77,7 +81,7 @@ final class LinuxDisplay implements DisplayImplementation {
 	public native int readMouse(IntBuffer buffer, int buffer_position);
 	public native void grabMouse(boolean grab);
 	public native int getNativeCursorCaps();
-	public native void setNativeCursor(ByteBuffer handle) throws LWJGLException;
+	public native void setNativeCursor(Object handle) throws LWJGLException;
 	public native int getMinCursorSize();
 	public native int getMaxCursorSize();
 	/* Keyboard */
@@ -88,4 +92,14 @@ final class LinuxDisplay implements DisplayImplementation {
 	public native void enableTranslation() throws LWJGLException;
 	public native void enableKeyboardBuffer() throws LWJGLException;
 	public native int isStateKeySet(int key);
+
+	public native void nCreateCursor(ByteBuffer handle, int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, int images_offset, IntBuffer delays, int delays_offset) throws LWJGLException;
+
+	public Object createCursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, IntBuffer delays) throws LWJGLException {
+		ByteBuffer handle = BufferUtils.createByteBuffer(CURSOR_HANDLE_SIZE);
+		nCreateCursor(handle, width, height, xHotspot, yHotspot, numImages, images, images.position(), delays, delays != null ? delays.position() : -1);
+		return handle;
+	}
+
+	public native void destroyCursor(Object cursorHandle);
 }
diff --git a/src/java/org/lwjgl/opengl/Win32Display.java b/src/java/org/lwjgl/opengl/Win32Display.java
index b6fbf1d9..153a2dea 100644
--- a/src/java/org/lwjgl/opengl/Win32Display.java
+++ b/src/java/org/lwjgl/opengl/Win32Display.java
@@ -41,10 +41,14 @@ package org.lwjgl.opengl;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
 
 import org.lwjgl.LWJGLException;
+import org.lwjgl.BufferUtils;
 
 final class Win32Display implements DisplayImplementation {
+	private final static int CURSOR_HANDLE_SIZE = 8;
+
 	public native void createWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException;
 	public native void destroyWindow();
 	public native void switchDisplayMode(DisplayMode mode) throws LWJGLException;
@@ -77,7 +81,7 @@ final class Win32Display implements DisplayImplementation {
 	public native int readMouse(IntBuffer buffer, int buffer_position);
 	public native void grabMouse(boolean grab);
 	public native int getNativeCursorCaps();
-	public native void setNativeCursor(ByteBuffer handle) throws LWJGLException;
+	public native void setNativeCursor(Object handle) throws LWJGLException;
 	public native int getMinCursorSize();
 	public native int getMaxCursorSize();
 	/* Keyboard */
@@ -88,4 +92,14 @@ final class Win32Display implements DisplayImplementation {
 	public native void enableTranslation() throws LWJGLException;
 	public native void enableKeyboardBuffer() throws LWJGLException;
 	public native int isStateKeySet(int key);
+
+	public native void nCreateCursor(ByteBuffer handle, int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, int images_offset, IntBuffer delays, int delays_offset) throws LWJGLException;
+
+	public Object createCursor(int width, int height, int xHotspot, int yHotspot, int numImages, IntBuffer images, IntBuffer delays) throws LWJGLException {
+		ByteBuffer handle = BufferUtils.createByteBuffer(CURSOR_HANDLE_SIZE);
+		nCreateCursor(handle, width, height, xHotspot, yHotspot, numImages, images, images.position(), delays, delays != null ? delays.position() : -1);
+		return handle;
+	}
+
+	public native void destroyCursor(Object cursorHandle);
 }
diff --git a/src/native/linux/org_lwjgl_input_Cursor.c b/src/native/linux/org_lwjgl_input_Cursor.c
index c3b69836..b228cd99 100644
--- a/src/native/linux/org_lwjgl_input_Cursor.c
+++ b/src/native/linux/org_lwjgl_input_Cursor.c
@@ -43,11 +43,11 @@
 #include <X11/Xlib.h>
 #include <X11/Xcursor/Xcursor.h>
 #include "org_lwjgl_input_Cursor.h"
-//#include "extxcursor.h"
+#include "org_lwjgl_opengl_LinuxDisplay.h"
 #include "Window.h"
 #include "common_tools.h"
 
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Cursor_nCreateCursor
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nCreateCursor
   (JNIEnv *env, jclass clazz, jobject handle_buffer, jint width, jint height, jint x_hotspot, jint y_hotspot, jint num_images, jobject image_buffer, jint images_offset, jobject delay_buffer, jint delays_offset)
 {
 	if ((*env)->GetDirectBufferCapacity(env, handle_buffer) < sizeof(Cursor)) {
@@ -84,7 +84,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Cursor_nCreateCursor
 	XcursorImagesDestroy(cursor_images);
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Cursor_nDestroyCursor
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay__destroyCursor
   (JNIEnv *env, jclass clazz, jobject cursor_handle_buffer)
 {
 	Cursor *cursor = (Cursor *)(*env)->GetDirectBufferAddress(env, cursor_handle_buffer);
diff --git a/src/native/win32/org_lwjgl_input_Cursor.cpp b/src/native/win32/org_lwjgl_input_Cursor.cpp
index 007418e2..cf83566e 100755
--- a/src/native/win32/org_lwjgl_input_Cursor.cpp
+++ b/src/native/win32/org_lwjgl_input_Cursor.cpp
@@ -41,9 +41,10 @@
 
 #include "Window.h"
 #include "org_lwjgl_input_Cursor.h"
+#include "org_lwjgl_opengl_Win32Display.h"
 #include "common_tools.h"
 
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Cursor_nCreateCursor
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_nCreateCursor
   (JNIEnv *env, jclass clazz, jobject handle_buffer, jint width, jint height, jint x_hotspot, jint y_hotspot, jint num_images, jobject image_buffer, jint images_offset, jobject delay_buffer, jint delays_offset)
 {
 	if (env->GetDirectBufferCapacity(handle_buffer) < sizeof(HCURSOR)) {
@@ -144,7 +145,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Cursor_nCreateCursor
  * Method:    nDestroyCursor
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_input_Cursor_nDestroyCursor
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Win32Display_destroyCursor
   (JNIEnv *env, jclass clazz, jobject handle_buffer)
 {
 //	HCURSOR cursor = (HCURSOR)cursor_handle;