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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24139/src/java/org/lwjgl/opengl

Modified Files:
	MacOSXDisplay.java 
Log Message:
Mac OS X: Enable native cursor in Mac OS X 10.4 and later because Apple fixed the outstanding bugs

Index: MacOSXDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31

--- MacOSXDisplay.java	4 May 2005 20:59:33 -0000	1.30
+++ MacOSXDisplay.java	5 May 2005 11:04:17 -0000	1.31
@@ -39,6 +39,8 @@
  */
 
 import java.awt.Cursor;
+import java.awt.Robot;
+import java.awt.AWTException;
 import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -265,10 +267,15 @@
 	 * when the OS version is 10.3 or lower.
 	 */
 	private void hideUI(boolean hide) {
+		if (!isMacOSXEqualsOrBetterThan(10, 4))
+			nHideUI(hide);
+	}
+
+	private static boolean isMacOSXEqualsOrBetterThan(int major_required, int minor_required) {
 		String os_version = System.getProperty("os.version");
 		StringTokenizer version_tokenizer = new StringTokenizer(os_version, ".");
-		int major = 10;
-		int minor = 4;
+		int major;
+		int minor;
 		try {
 			String major_str = version_tokenizer.nextToken();
 			String minor_str = version_tokenizer.nextToken();
@@ -276,9 +283,10 @@
 			minor = Integer.parseInt(minor_str);
 		} catch (Exception e) {
 			LWJGLUtil.log("Exception occurred while trying to determine OS version: " + e);
+			// Best guess, no
+			return false;
 		}
-		if (major == 10 && minor <= 3)
-			nHideUI(hide);
+		return major > major_required || (major == major_required && minor >= minor_required);
 	}
 	
 	private native void nHideUI(boolean hide);
@@ -336,27 +344,35 @@
 	private native void nGrabMouse(boolean grab);
 
 	public int getNativeCursorCapabilities() {
-		/*
-		int cursor_colors = Toolkit.getDefaultToolkit().getMaximumCursorColors();
-		boolean supported = cursor_colors >= Short.MAX_VALUE && getMaxCursorSize() > 0;
-		int caps = supported ? Mouse.CURSOR_8_BIT_ALPHA | Mouse.CURSOR_ONE_BIT_TRANSPARENCY: 0;
-		return caps;
-		*/
-		/* Return no capability, as there are two unsolved bugs (both reported to apple along with
-		   minimal test case):
-		   1. When a custom cursor (or some standard) java.awt.Cursor is assigned to a
-		      Componennt, it is reset to the default pointer cursor when the window is de-
-			  activated and the re-activated. The Cursor can not be reset to the custom cursor,
-			  with another setCursor.
-		   2. When the cursor is moving in the top pixel row (y = 0 in AWT coordinates) in fullscreen
-		   	  mode, no mouse moved events are reported, even though mouse pressed/released and dragged
-			  events are reported
-		*/
-		return 0;
+		if (isMacOSXEqualsOrBetterThan(10, 4)) {
+			int cursor_colors = Toolkit.getDefaultToolkit().getMaximumCursorColors();
+			boolean supported = cursor_colors >= Short.MAX_VALUE && getMaxCursorSize() > 0;
+			int caps = supported ? org.lwjgl.input.Cursor.CURSOR_8_BIT_ALPHA | org.lwjgl.input.Cursor.CURSOR_ONE_BIT_TRANSPARENCY: 0;
+			return caps;
+		} else {
+			/* Return no capability in Mac OS X 10.3 and earlier , as there are two unsolved bugs (both reported to apple along with
+			   minimal test case):
+			   1. When a custom cursor (or some standard) java.awt.Cursor is assigned to a
+			   Componennt, it is reset to the default pointer cursor when the window is de-
+			   activated and the re-activated. The Cursor can not be reset to the custom cursor,
+			   with another setCursor.
+			   2. When the cursor is moving in the top pixel row (y = 0 in AWT coordinates) in fullscreen
+			   mode, no mouse moved events are reported, even though mouse pressed/released and dragged
+			   events are reported
+			 */
+			return 0;
+		}
 	}
 
 	public void setCursorPosition(int x, int y) {
-		throw new UnsupportedOperationException();
+		try {
+			Robot robot = new Robot(frame.getGraphicsConfiguration().getDevice());
+			int transformed_x = frame.getX() + x;
+			int transformed_y = frame.getY() + frame.getHeight() - 1 - y;
+			robot.mouseMove(transformed_x, transformed_y);
+		} catch (AWTException e) {
+			LWJGLUtil.log("Got exception while setting mouse cursor position: " + e);
+		}
 	}
 
 	public void setNativeCursor(Object handle) throws LWJGLException {
@@ -419,19 +435,10 @@
 	}
 
 	public int getPbufferCapabilities() {
-		int major_version;
-		int minor_version;
-		String os_version = System.getProperty("os.version");
-		StringTokenizer tokenizer = new StringTokenizer(os_version, ".");
-		try  {
-			major_version = Integer.parseInt(tokenizer.nextToken());
-			minor_version = Integer.parseInt(tokenizer.nextToken());
-			if (major_version > 10 || (major_version == 10 && minor_version >= 3))
-				return Pbuffer.PBUFFER_SUPPORTED;
-		} catch (Exception e) {
-			LWJGLUtil.log("Exception occurred when trying to determine OS version: " + e);
-		}
-		return 0;
+		if (isMacOSXEqualsOrBetterThan(10, 3))
+			return Pbuffer.PBUFFER_SUPPORTED;
+		else
+			return 0;
 	}
 
 	/**





2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (134)	Sep (52)	Oct (13)	Nov (342)	Dec (163)
2003	Jan (44)	Feb (62)	Mar (158)	Apr (38)	May (70)	Jun (58)	Jul (104)	Aug (207)	Sep (83)	Oct (122)	Nov (23)	Dec (49)
2004	Jan (119)	Feb (132)	Mar (192)	Apr (140)	May (77)	Jun (74)	Jul (201)	Aug (63)	Sep (102)	Oct (70)	Nov (173)	Dec (78)
2005	Jan (174)	Feb (197)	Mar (105)	Apr (59)	May (77)	Jun (43)	Jul (21)	Aug (18)	Sep (47)	Oct (37)	Nov (74)	Dec (50)
2006	Jan (44)	Feb (19)	Mar (32)	Apr (24)	May (31)	Jun (55)	Jul (138)	Aug (28)	Sep (12)	Oct (41)	Nov (58)	Dec (24)
2007	Jan (28)	Feb (14)	Mar (10)	Apr (68)	May (30)	Jun (26)	Jul (18)	Aug (63)	Sep (19)	Oct (29)	Nov (20)	Dec (10)
2008	Jan (38)	Feb (7)	Mar (37)	Apr (120)	May (41)	Jun (36)	Jul (39)	Aug (24)	Sep (28)	Oct (30)	Nov (36)	Dec (75)
2009	Jan (46)	Feb (22)	Mar (50)	Apr (70)	May (134)	Jun (105)	Jul (75)	Aug (34)	Sep (38)	Oct (34)	Nov (19)	Dec (20)
2010	Jan (11)	Feb (20)	Mar (65)	Apr (83)	May (104)	Jun (73)	Jul (78)	Aug (57)	Sep (43)	Oct (35)	Nov (9)	Dec (4)
2011	Jan (21)	Feb (11)	Mar (18)	Apr (10)	May (18)	Jun (15)	Jul (48)	Aug (25)	Sep (17)	Oct (45)	Nov (15)	Dec (12)
2012	Jan (21)	Feb (9)	Mar (12)	Apr (9)	May (9)	Jun (5)	Jul (1)	Aug (10)	Sep (12)	Oct (1)	Nov (28)	Dec (5)
2013	Jan (4)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb (1)	Mar (1)	Apr	May (2)	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2015	Jan (1)	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (2)	Nov	Dec
2016	Jan (2)	Feb (1)	Mar (1)	Apr (1)	May (2)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec

S	M	T	W	T	F	S
1	2	3 (2)	4 (15)	5 (5)	6 (2)	7
8	9	10 (1)	11 (1)	12 (8)	13	14
15	16	17 (2)	18 (12)	19 (6)	20	21
22 (13)	23	24	25	26	27 (2)	28 (1)
29 (4)	30 (3)	31

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

java-game-lib-cvs — Commits to the repository will be send to this list.