java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 41)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2977
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2977&view=rev
Author:   elias_naur
Date:     2008-04-07 06:34:20 -0700 (Mon, 07 Apr 2008)

Log Message:
-----------
Mac OS X: Split canvas listener from MacOSXGLCanvas

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXFrame.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java

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

Added: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasListener.java
===================================================================

--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasListener.java	                        (rev 0)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasListener.java	2008-04-07 13:34:20 UTC (rev 2977)
@@ -0,0 +1,116 @@
+/*
+ * 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;
+
+/**
+ * The AWT compatible Canvas for Mac OS X.
+ * @author elias_naur
+ */
+
+import java.awt.Canvas;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
+
+final class MacOSXCanvasListener implements ComponentListener, HierarchyListener {
+	private final Canvas canvas;
+	private int width;
+	private int height;
+	private boolean context_update;
+
+	public MacOSXCanvasListener(Canvas canvas) {
+		this.canvas = canvas;
+//		((MacOSXDisplay)Display.getImplementation()).setView(this);
+	}
+
+	public void enableListeners() {
+		canvas.addComponentListener(this);
+		canvas.addHierarchyListener(this);
+		setUpdate();
+	}
+
+	public void disableListeners() {
+		canvas.removeComponentListener(this);
+		canvas.removeHierarchyListener(this);
+	}
+
+	public boolean syncShouldUpdateContext() {
+		boolean should_update;
+		synchronized ( this ) {
+			should_update = context_update;
+			context_update = false;
+		}
+		return should_update;
+	}
+
+	private synchronized void setUpdate() {
+		synchronized ( this ) {
+			width = canvas.getWidth();
+			height = canvas.getHeight();
+			context_update = true;
+		}
+	}
+
+	public int syncGetWidth() {
+		synchronized ( this ) {
+			return width;
+		}
+	}
+
+	public int syncGetHeight() {
+		synchronized ( this ) {
+			return height;
+		}
+	}
+
+	public void componentShown(ComponentEvent e) {
+	}
+
+	public void componentHidden(ComponentEvent e) {
+	}
+
+	public void componentResized(ComponentEvent e) {
+		setUpdate();
+	}
+
+	public void componentMoved(ComponentEvent e) {
+		setUpdate();
+	}
+
+	public void hierarchyChanged(HierarchyEvent e) {
+		setUpdate();
+	}
+}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2008-04-07 13:01:52 UTC (rev 2976)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2008-04-07 13:34:20 UTC (rev 2977)
@@ -61,6 +61,7 @@
 	private static final int PBUFFER_HANDLE_SIZE = 24;
 	private static final int GAMMA_LENGTH = 256;
 
+	private MacOSXCanvasListener canvas_listener;
 	private MacOSXFrame frame;
 	private Robot robot;
 	private MacOSXMouseEventQueue mouse_queue;
@@ -79,6 +80,8 @@
 		close_requested = false;
 		try {
 			frame = new MacOSXFrame(mode, requested_mode, fullscreen, x, y);
+			canvas_listener = new MacOSXCanvasListener(frame.getCanvas());
+			canvas_listener.enableListeners();
 			robot = AWTUtil.createRobot(frame);
 		} catch (LWJGLException e) {
 			destroyWindow();
@@ -93,6 +96,10 @@
 	}
 
 	public void destroyWindow() {
+		if (canvas_listener != null) {
+			canvas_listener.disableListeners();
+			canvas_listener = null;
+		}
 		if (frame != null) {
 			AccessController.doPrivileged(new PrivilegedAction() {
 				public Object run() {
@@ -216,7 +223,7 @@
 
 	private final static IntBuffer current_viewport = BufferUtils.createIntBuffer(16);
 	public void update() {
-		boolean should_update = frame.getCanvas().syncShouldUpdateContext();
+		boolean should_update = canvas_listener.syncShouldUpdateContext();
 		/*
 		 * Workaround for the "white screen in fullscreen mode" problem
 		 *

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXFrame.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXFrame.java	2008-04-07 13:01:52 UTC (rev 2976)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXFrame.java	2008-04-07 13:34:20 UTC (rev 2977)
@@ -101,7 +101,6 @@
 		setVisible(true);
 		requestFocus();
 		canvas.requestFocus();
-		canvas.initializeCanvas();
 		updateBounds();
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java	2008-04-07 13:01:52 UTC (rev 2976)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java	2008-04-07 13:34:20 UTC (rev 2977)
@@ -45,13 +45,10 @@
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
 
-final class MacOSXGLCanvas extends Canvas implements ComponentListener, HierarchyListener {
+final class MacOSXGLCanvas extends Canvas {
 
 	private static final long serialVersionUID = 6916664741667434870L;
 	
-	private int width;
-	private int height;
-	private boolean context_update;
 	private boolean canvas_painted;
 	private boolean dirty;
 
@@ -71,12 +68,6 @@
 	  */
 	public void initializeCanvas() {
 		setFocusTraversalKeysEnabled(false);
-		/* Input methods are not enabled in fullscreen anyway, so disable always */
-		enableInputMethods(false);
-		addComponentListener(this);
-		addHierarchyListener(this);
-//		((MacOSXDisplay)Display.getImplementation()).setView(this);
-		setUpdate();
 	}
 
 	public boolean syncCanvasPainted() {
@@ -96,76 +87,4 @@
 		}
 		return result;
 	}
-
-	public boolean syncShouldUpdateContext() {
-		boolean should_update;
-		synchronized ( this ) {
-			should_update = context_update;
-			context_update = false;
-		}
-		return should_update;
-	}
-
-	private synchronized void setUpdate() {
-		synchronized ( this ) {
-			width = getWidth();
-			height = getHeight();
-			context_update = true;
-		}
-	}
-
-	public int syncGetWidth() {
-		synchronized ( this ) {
-			return width;
-		}
-	}
-
-	public int syncGetHeight() {
-		synchronized ( this ) {
-			return height;
-		}
-	}
-
-	public void componentShown(ComponentEvent e) {
-	}
-
-	public void componentHidden(ComponentEvent e) {
-	}
-
-	public void componentResized(ComponentEvent e) {
-		setUpdate();
-	}
-
-	public void componentMoved(ComponentEvent e) {
-		setUpdate();
-	}
-
-	public void setLocation(int x, int y) {
-		super.setLocation(x, y);
-		setUpdate();
-	}
-
-	public void setLocation(Point p) {
-		super.setLocation(p);
-		setUpdate();
-	}
-
-	public void setSize(Dimension d) {
-		super.setSize(d);
-		setUpdate();
-	}
-
-	public void setSize(int width, int height) {
-		super.setSize(width, height);
-		setUpdate();
-	}
-
-	public void setBounds(int x, int y, int width, int height) {
-		super.setBounds(x, y, width, height);
-		setUpdate();
-	}
-
-	public void hierarchyChanged(HierarchyEvent e) {
-		setUpdate();
-	}
 }


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

java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 41)

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