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

Revision: 2613
          http://svn.sourceforge.net/java-game-lib/?rev=2613&view=rev
Author:   elias_naur
Date:     2006-10-26 14:39:37 -0700 (Thu, 26 Oct 2006)

Log Message:
-----------
Mac OS X: Implemented AWTInputAdapter

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasImplementation.java

Added Paths:
-----------
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java
===================================================================

--- trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java	2006-10-26 21:15:50 UTC (rev 2612)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AbstractAWTInput.java	2006-10-26 21:39:37 UTC (rev 2613)
@@ -37,7 +37,6 @@
 import org.lwjgl.LWJGLException;
 import org.lwjgl.LWJGLUtil;
 
-import java.awt.event.FocusListener;
 import java.awt.Cursor;
 
 /**
@@ -49,16 +48,18 @@
 abstract class AbstractAWTInput implements AWTCanvasInputImplementation {
 	private AWTGLCanvas canvas;
 
-	private volatile int current_height;
-	private volatile int current_width;
 	private KeyboardEventQueue keyboard_queue;
 	private MouseEventQueue mouse_queue;
 	private volatile boolean grab;
 
-	protected AbstractAWTInput(AWTGLCanvas canvas) throws LWJGLException {
+	protected AbstractAWTInput(AWTGLCanvas canvas) {
 		this.canvas = canvas;
 	}
 
+	protected synchronized MouseEventQueue getMouseEventQueue() {
+		return mouse_queue;
+	}
+
 	public synchronized void grabMouse(boolean grab) {
 		this.grab = grab;
 		if (mouse_queue != null)
@@ -83,18 +84,13 @@
 	}
 
 	public final int getWidth() {
-		return current_width;
+		return canvas.getWidth();
 	}
 
 	public final int getHeight() {
-		return current_height;
+		return canvas.getHeight();
 	}
 
-	public synchronized void processInput(PeerInfo peer_info) {
-		current_width = canvas.getWidth();
-		current_height = canvas.getHeight();
-	}
-
 	public boolean hasWheel() {
 		return AWTUtil.hasWheel();
 	}
@@ -104,10 +100,14 @@
 	}
 
 	public void createMouse() throws LWJGLException {
-		mouse_queue = new MouseEventQueue(canvas);
+		mouse_queue = createMouseQueue();
 		mouse_queue.register();
 	}
 
+	protected MouseEventQueue createMouseQueue() {
+		return new MouseEventQueue(getCanvas());
+	}
+
 	public void destroyMouse() {
 		mouse_queue.unregister();
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java	2006-10-26 21:15:50 UTC (rev 2612)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java	2006-10-26 21:39:37 UTC (rev 2613)
@@ -113,7 +113,6 @@
 	}
 
 	public synchronized void processInput(PeerInfo peer_info) {
-		super.processInput(peer_info);
 		LinuxDisplay.lockAWT();
 		try {
 			LinuxPeerInfo linux_peer_info = (LinuxPeerInfo)peer_info;

Added: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java	2006-10-26 21:39:37 UTC (rev 2613)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2002-2004 LWJGL 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 'LWJGL' 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.
+ */
+package org.lwjgl.opengl;
+
+import java.nio.IntBuffer;
+import java.nio.ByteBuffer;
+
+import org.lwjgl.LWJGLException;
+import org.lwjgl.LWJGLUtil;
+
+/**
+ *
+ * @author elias_naur <eli...@us...>
+ * @version $Revision: 2586 $
+ * $Id: LinuxAWTGLCanvasPeerInfo.java 2586 2006-10-20 11:51:34Z elias_naur $
+ */
+final class MacOSXAWTInput extends AbstractAWTInput {
+	private boolean had_focus;
+
+	MacOSXAWTInput(AWTGLCanvas canvas) {
+		super(canvas);
+	}
+	
+	protected MouseEventQueue createMouseQueue() {
+		return new MacOSXMouseEventQueue(getCanvas());
+	}
+
+	public synchronized void processInput(PeerInfo peer_info) {
+		boolean has_focus = getCanvas().isFocusOwner();
+		if (!had_focus && has_focus)
+			((MacOSXMouseEventQueue)getMouseEventQueue()).warpCursor();
+		had_focus = has_focus;
+	}
+
+	public void destroy() {
+	}
+
+	public void update() {
+	}
+}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasImplementation.java	2006-10-26 21:15:50 UTC (rev 2612)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasImplementation.java	2006-10-26 21:39:37 UTC (rev 2613)
@@ -64,6 +64,6 @@
 	}
 
 	public AWTCanvasInputImplementation createInput(AWTGLCanvas canvas) throws LWJGLException {
-		throw new UnsupportedOperationException();
+		return new MacOSXAWTInput(canvas);
 	}
 }


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




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	4	5	6	7
8 (1)	9	10	11 (3)	12	13	14
15	16	17	18	19	20 (6)	21
22	23 (8)	24 (6)	25	26 (10)	27 (3)	28 (1)
29	30 (2)	31 (1)

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.