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

Revision: 3744
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3744&view=rev
Author:   matzon
Date:     2012-02-18 18:38:57 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
added win32 display get x/y 

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2012-02-18 16:30:38 UTC (rev 3743)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2012-02-18 18:38:57 UTC (rev 3744)
@@ -52,6 +52,7 @@
 final class WindowsDisplay implements DisplayImplementation {
 	private static final int GAMMA_LENGTH = 256;
 
+	private static final int WM_MOVE                          = 0x0003;
 	private static final int WM_CANCELMODE                    = 0x001F;
 	private static final int WM_MOUSEMOVE                     = 0x0200;
 	private static final int WM_LBUTTONDOWN                   = 0x0201;
@@ -182,6 +183,8 @@
 	private boolean resized;
 	private boolean resizable;
 	private boolean maximized;
+	private int x;
+	private int y;
 	private int width;
 	private int height;
 
@@ -1009,17 +1012,21 @@
 					captureMouse = -1;
 				}
 				return 0;
+			case WM_MOVE:
+				x = (int)(short)(lParam & 0xFFFF);
+				y = (int)(short)(lParam >> 16);
+				return defWindowProc(hwnd, msg, wParam, lParam);
 			default:
 				return defWindowProc(hwnd, msg, wParam, lParam);
 		}
 	}
 	
 	public int getX() {
-		return 0; // placeholder until implemented
+		return x;
 	}
 
 	public int getY() {
-		return 0; // placeholder until implemented
+		return y;
 	}
 
 	public int getWidth() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3743
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3743&view=rev
Author:   kappa1
Date:     2012-02-18 16:30:38 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
Added the new public API's Display.getX() and Display.getY(). Currently implemented for Linux and Mac. Windows implementation pending.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2012-02-18 01:49:46 UTC (rev 3742)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2012-02-18 16:30:38 UTC (rev 3743)
@@ -1282,10 +1282,50 @@
 	}
 
 	/**
+	 * @return this method will return the x position (top-left) of the Display window.
+	 *
+	 * If running in fullscreen mode it will return 0.
+	 * If Display.setParent(Canvas parent) is being used, the x position of 
+	 * the parent will be returned.
+	 */
+	public static int getX() {
+
+		if (Display.isFullscreen()) {
+			return 0;
+		}
+
+		if (parent != null) {
+			return parent.getX();
+		}
+
+		return display_impl.getX();
+	}
+	
+	/**
+	 * @return this method will return the y position (top-left) of the Display window.
+	 *
+	 * If running in fullscreen mode it will return 0.
+	 * If Display.setParent(Canvas parent) is being used, the y position of 
+	 * the parent will be returned.
+	 */
+	public static int getY() {
+
+		if (Display.isFullscreen()) {
+			return 0;
+		}
+
+		if (parent != null) {
+			return parent.getY();
+		}
+
+		return display_impl.getY();
+	}
+	
+	/**
 	 * @return this method will return the width of the Display window.
 	 *
 	 * If running in fullscreen mode it will return the width of the current set DisplayMode.
-	 * If running Display.setParent(Canvas parent) is being used, the width of the parent
+	 * If Display.setParent(Canvas parent) is being used, the width of the parent
 	 * will be returned.
 	 *
 	 * This value will be updated after a call to Display.update().
@@ -1307,7 +1347,7 @@
 	 * @return this method will return the height of the Display window.
 	 *
 	 * If running in fullscreen mode it will return the height of the current set DisplayMode.
-	 * If running Display.setParent(Canvas parent) is being used, the height of the parent
+	 * If Display.setParent(Canvas parent) is being used, the height of the parent
 	 * will be returned.
 	 *
 	 * This value will be updated after a call to Display.update().

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java	2012-02-18 01:49:46 UTC (rev 3742)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/DisplayImplementation.java	2012-02-18 16:30:38 UTC (rev 3743)
@@ -174,12 +174,22 @@
 	boolean wasResized();
 
 	/**
-	 * @return this method will return a the width of the Display window.
+	 * @return this method will return the width of the Display window.
 	 */
 	int getWidth();
 
 	/**
-	 * @return this method will return a the height of the Display window.
+	 * @return this method will return the height of the Display window.
 	 */
 	int getHeight();
+	
+	/**
+	 * @return this method will return the top-left x position of the Display window.
+	 */
+	int getX();
+
+	/**
+	 * @return this method will return the top-left y position of the Display window.
+	 */
+	int getY();
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2012-02-18 01:49:46 UTC (rev 3742)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2012-02-18 16:30:38 UTC (rev 3743)
@@ -473,6 +473,8 @@
 					parent_window = parent != null ? getHandle(parent) : getRootWindow(getDisplay(), getDefaultScreen());
 					resizable = Display.isResizable();
 					resized = false;
+					window_x = x;
+					window_y = y;
 					window_width = mode.getWidth();
 					window_height = mode.getHeight();
 					current_window = nCreateWindow(getDisplay(), getDefaultScreen(), handle, mode, current_window_mode, x, y, undecorated, parent_window, resizable);
@@ -1387,6 +1389,14 @@
 
 	private static native void nSetWindowIcon(long display, long window, ByteBuffer icon_rgb, int icon_rgb_size, ByteBuffer icon_mask, int icon_mask_size, int width, int height);
 
+	public int getX() {
+		return window_x;
+	}
+
+	public int getY() {
+		return window_y;
+	}
+	
 	public int getWidth() {
 		return window_width;
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2012-02-18 01:49:46 UTC (rev 3742)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2012-02-18 16:30:38 UTC (rev 3743)
@@ -495,7 +495,15 @@
 		// Don't use any icon, since Mac OS X windows don't have window icons
 		return 0;
 	}
+	
+	public int getX() {
+		return frame.getX();
+	}
 
+	public int getY() {
+		return frame.getY();
+	}
+
 	public int getWidth() {
 		return frame.getWidth();
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2012-02-18 01:49:46 UTC (rev 3742)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2012-02-18 16:30:38 UTC (rev 3743)
@@ -1013,7 +1013,15 @@
 				return defWindowProc(hwnd, msg, wParam, lParam);
 		}
 	}
+	
+	public int getX() {
+		return 0; // placeholder until implemented
+	}
 
+	public int getY() {
+		return 0; // placeholder until implemented
+	}
+
 	public int getWidth() {
 		return width;
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3742
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3742&view=rev
Author:   kappa1
Date:     2012-02-18 01:49:46 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
Implement the ability for the native Display window on Linux to get its x and y position. In preparation for adding the new Display.getX() & getY() API's.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxEvent.java
    trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Display.c
    trunk/LWJGL/src/native/linux/opengles/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2012-02-06 20:35:25 UTC (rev 3741)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2012-02-18 01:49:46 UTC (rev 3742)
@@ -144,6 +144,8 @@
 	private boolean resizable;
 	private boolean resized;
 	
+	private int window_x;
+	private int window_y;
 	private int window_width;
 	private int window_height;
 	
@@ -516,6 +518,8 @@
 	private static native long nGetInputFocus(long display) throws LWJGLException;
 	private static native void nSetInputFocus(long display, long window, long time);
 	private static native void nSetWindowSize(long display, long window, int width, int height, boolean resizable);
+	private static native int nGetX(long display, long window);
+	private static native int nGetY(long display, long window);
 	private static native int nGetWidth(long display, long window);
 	private static native int nGetHeight(long display, long window);
 
@@ -840,10 +844,17 @@
 					break;
 				case LinuxEvent.Expose:
 					dirty = true;
+					break;
+				case LinuxEvent.ConfigureNotify:
+					int x = nGetX(getDisplay(), getWindow());
+					int y = nGetY(getDisplay(), getWindow());
 					
 					int width = nGetWidth(getDisplay(), getWindow());
 					int height = nGetHeight(getDisplay(), getWindow());
 					
+					window_x = x;
+					window_y = y;
+					
 					if (window_width != width || window_height != height) {
 						resized = true;
 						window_width = width;

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxEvent.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxEvent.java	2012-02-06 20:35:25 UTC (rev 3741)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxEvent.java	2012-02-18 01:49:46 UTC (rev 3742)
@@ -53,6 +53,7 @@
 	public static final int UnmapNotify     = 18;
 	public static final int MapNotify       = 19;
 	public static final int Expose          = 12;
+	public static final int ConfigureNotify = 22;
 	public static final int ClientMessage   = 33;
 
 	private final ByteBuffer event_buffer;

Modified: trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Display.c	2012-02-06 20:35:25 UTC (rev 3741)
+++ trunk/LWJGL/src/native/linux/opengl/org_lwjgl_opengl_Display.c	2012-02-18 01:49:46 UTC (rev 3742)
@@ -283,6 +283,49 @@
 	return RootWindow(disp, screen);
 }
 
+static Window getCurrentWindow(JNIEnv *env, jlong display_ptr, jlong window_ptr) {
+	Display *disp = (Display *)(intptr_t)display_ptr;
+
+	Window parent = (Window)window_ptr;
+	Window win, root;
+
+	Window *children;
+	unsigned int nchildren;
+
+	do {
+		win = parent;
+
+		if (XQueryTree(disp, win, &root, &parent, &children, &nchildren) == 0) {
+			throwException(env, "XQueryTree failed");
+			return 0;
+		}
+
+		if (children != NULL) XFree(children);
+	} while (parent != root);
+
+	return win;
+}
+
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetX(JNIEnv *env, jclass unused, jlong display_ptr, jlong window_ptr) {
+	Display *disp = (Display *)(intptr_t)display_ptr;
+	Window win = getCurrentWindow(env, display_ptr, window_ptr);
+
+	XWindowAttributes win_attribs;
+	XGetWindowAttributes(disp, win, &win_attribs);
+
+	return win_attribs.x;
+}
+
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetY(JNIEnv *env, jclass unused, jlong display_ptr, jlong window_ptr) {
+	Display *disp = (Display *)(intptr_t)display_ptr;
+	Window win = getCurrentWindow(env, display_ptr, window_ptr);
+
+	XWindowAttributes win_attribs;
+	XGetWindowAttributes(disp, win, &win_attribs);
+
+	return win_attribs.y;
+}
+
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetWidth(JNIEnv *env, jclass unused, jlong display_ptr, jlong window_ptr) {
 	Display *disp = (Display *)(intptr_t)display_ptr;
 	Window win = (Window)window_ptr;
@@ -381,7 +424,7 @@
 		setDecorations(disp, win, 0);
 	}
 
-	if (RootWindow(disp, screen) == parent_handle) { // on set hints when Display.setParent isn't used
+	if (RootWindow(disp, screen) == parent_handle) { // only set hints when Display.setParent isn't used
 		updateWindowBounds(disp, win, x, y, width, height, JNI_TRUE, resizable);
 		updateWindowHints(env, disp, win);
 	}

Modified: trunk/LWJGL/src/native/linux/opengles/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/linux/opengles/org_lwjgl_opengl_Display.c	2012-02-06 20:35:25 UTC (rev 3741)
+++ trunk/LWJGL/src/native/linux/opengles/org_lwjgl_opengl_Display.c	2012-02-18 01:49:46 UTC (rev 3742)
@@ -273,6 +273,49 @@
 	return RootWindow(disp, screen);
 }
 
+static Window getCurrentWindow(JNIEnv *env, jlong display_ptr, jlong window_ptr) {
+	Display *disp = (Display *)(intptr_t)display_ptr;
+
+	Window parent = (Window)window_ptr;
+	Window win, root;
+
+	Window *children;
+	unsigned int nchildren;
+
+	do {
+		win = parent;
+
+		if (XQueryTree(disp, win, &root, &parent, &children, &nchildren) == 0) {
+			throwException(env, "XQueryTree failed");
+			return 0;
+		}
+
+		if (children != NULL) XFree(children);
+	} while (parent != root);
+
+	return win;
+}
+
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetX(JNIEnv *env, jclass unused, jlong display_ptr, jlong window_ptr) {
+	Display *disp = (Display *)(intptr_t)display_ptr;
+	Window win = getCurrentWindow(env, display_ptr, window_ptr);
+
+	XWindowAttributes win_attribs;
+	XGetWindowAttributes(disp, win, &win_attribs);
+
+	return win_attribs.x;
+}
+
+JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetY(JNIEnv *env, jclass unused, jlong display_ptr, jlong window_ptr) {
+	Display *disp = (Display *)(intptr_t)display_ptr;
+	Window win = getCurrentWindow(env, display_ptr, window_ptr);
+
+	XWindowAttributes win_attribs;
+	XGetWindowAttributes(disp, win, &win_attribs);
+
+	return win_attribs.y;
+}
+
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetWidth(JNIEnv *env, jclass unused, jlong display_ptr, jlong window_ptr) {
 	Display *disp = (Display *)(intptr_t)display_ptr;
 	Window win = (Window)window_ptr;
@@ -375,7 +418,7 @@
 		setDecorations(disp, win, 0);
 	}
 
-	if (RootWindow(disp, screen) == parent_handle) { // on set hints when Display.setParent isn't used
+	if (RootWindow(disp, screen) == parent_handle) { // only set hints when Display.setParent isn't used
 		updateWindowBounds(disp, win, x, y, width, height, JNI_TRUE, resizable);
 		updateWindowHints(env, disp, win);
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.