[Jake2-commits] jake2/src/jake2/render JoglBase.java,1.1,1.2

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv716/src/jake2/render

Modified Files:
	JoglBase.java 
Log Message:
fullscreen modes work again

Index: JoglBase.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JoglBase.java	15 Jul 2004 14:37:34 -0000	1.1
--- JoglBase.java	15 Jul 2004 16:16:23 -0000	1.2
***************
*** 172,175 ****
--- 172,185 ----
  
  		ri.Con_Printf(Defines.PRINT_ALL, "...setting mode " + mode + ":");
+ 		
+ 		/*
+ 		 * fullscreen handling
+ 		 */
+ 		GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
+ 		device = env.getDefaultScreenDevice();
+        
+ 		if (oldDisplayMode == null) {
+ 			oldDisplayMode = device.getDisplayMode();
+ 		}
  
  		if (!ri.Vid_GetModeInfo(newDim, mode)) {
***************
*** 193,199 ****
  		canvas.addGLEventListener(this);
  
! 		//window.getContentPane().add(canvas);	
  		
! 		//canvas.setSize(newDim.width, newDim.height);
  
  		// register event listener
--- 203,209 ----
  		canvas.addGLEventListener(this);
  
! 		window.getContentPane().add(canvas);	
  		
! 		canvas.setSize(newDim.width, newDim.height);
  
  		// register event listener
***************
*** 209,223 ****
  		canvas.addMouseListener(KBD.listener);
  		canvas.addMouseMotionListener(KBD.listener);
! 		
! 		/*
! 		 * fullscreen handling
! 		 */
! 		GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
! 		device = env.getDefaultScreenDevice();
!        
! 		if (oldDisplayMode == null) {
! 			oldDisplayMode = device.getDisplayMode();
! 		}
! 		        
  		if (fullscreen) {
  			
--- 219,223 ----
  		canvas.addMouseListener(KBD.listener);
  		canvas.addMouseMotionListener(KBD.listener);
! 				        
  		if (fullscreen) {
  			
***************
*** 227,247 ****
  			newDim.height = displayMode.getHeight();
  			window.setUndecorated(true);
- 			window.setSize(displayMode.getWidth(), displayMode.getHeight());
  			window.setResizable(false);
- 			window.getContentPane().add(canvas);
  			
  			device.setFullScreenWindow(window);
  			
! 			if (!displayMode.equals(oldDisplayMode))
  				device.setDisplayMode(displayMode);
  			
  			window.setLocation(0, 0);
  			ri.Con_Printf(Defines.PRINT_ALL, "...setting fullscreen " + getModeString(displayMode) + '\n');
  
  		} else {
  			window.setLocation(window_xpos, window_ypos);
! 			window.setSize(newDim.width, newDim.height);
  			window.setResizable(false);
- 			window.getContentPane().add(canvas);
  			window.setVisible(true);
  		}
--- 227,247 ----
  			newDim.height = displayMode.getHeight();
  			window.setUndecorated(true);
  			window.setResizable(false);
  			
  			device.setFullScreenWindow(window);
  			
! 			if (device.isFullScreenSupported())
  				device.setDisplayMode(displayMode);
  			
  			window.setLocation(0, 0);
+ 			window.setSize(displayMode.getWidth(), displayMode.getHeight());
+ 			canvas.setSize(displayMode.getWidth(), displayMode.getHeight());
+ 
  			ri.Con_Printf(Defines.PRINT_ALL, "...setting fullscreen " + getModeString(displayMode) + '\n');
  
  		} else {
  			window.setLocation(window_xpos, window_ypos);
! 			window.pack();
  			window.setResizable(false);
  			window.setVisible(true);
  		}
***************
*** 268,272 ****
  		if (oldDisplayMode != null && device.getFullScreenWindow() != null) {
  			try {
! 				if (!device.getDisplayMode().equals(oldDisplayMode))
  					device.setDisplayMode(oldDisplayMode);
  				device.setFullScreenWindow(null);
--- 268,272 ----
  		if (oldDisplayMode != null && device.getFullScreenWindow() != null) {
  			try {
! 				if (device.isFullScreenSupported())
  					device.setDisplayMode(oldDisplayMode);
  				device.setFullScreenWindow(null);