[Arianne-commits] stendhal/src/games/stendhal/client GameScreen.java, 1.149, 1.149.2.1

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22069/src/games/stendhal/client

Modified Files:
      Tag: VERSION_00_RELEASE_81
	GameScreen.java 
Log Message:
backport of netbook grey screen fix


Index: GameScreen.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/GameScreen.java,v
retrieving revision 1.149
retrieving revision 1.149.2.1
diff -C2 -d -r1.149 -r1.149.2.1
*** GameScreen.java	11 Feb 2010 10:09:56 -0000	1.149
--- GameScreen.java	13 Feb 2010 20:00:15 -0000	1.149.2.1
***************
*** 82,86 ****
  	private Canvas canvas;
  	private BufferStrategy buffer;
- 	private Graphics g2d;
  	/**
  	 * Static game layers.
--- 82,85 ----
***************
*** 188,193 ****
  				sw = Math.min(canvas.getWidth(), stendhal.screenSize.width);
  				sh = Math.min(canvas.getHeight(), stendhal.screenSize.height);
! 				// Set the user clip to avoid drawing artefacts on some setups
! 				g2d.setClip(0, 0, sw, sh);
  				calculateView();
  				center();
--- 187,191 ----
  				sw = Math.min(canvas.getWidth(), stendhal.screenSize.width);
  				sh = Math.min(canvas.getHeight(), stendhal.screenSize.height);
! 				// Reset the view so that the player is in the center
  				calculateView();
  				center();
***************
*** 483,486 ****
--- 481,485 ----
  
  			buffer.show();
+ 			g.dispose();
  		}
  	}
***************
*** 490,509 ****
  		 *  swing does not want to give a valid GraphicsConfiguration until the
  		 *  window has been drawn, so this can not be done in the constructor.
! 		 */ 
  		if (buffer == null) {
  			canvas.createBufferStrategy(2);
! 			buffer = canvas.getBufferStrategy();
! 			g2d = buffer.getDrawGraphics(); 
! 		} else if (buffer.contentsLost() || buffer.contentsRestored()) {
! 			/*
! 			 * On some systems (windows) the draw buffer can get lost in
! 			 * certain conditions. Recreate it if that has happened.
! 			 */
! 			final Graphics old = g2d;
! 			g2d = buffer.getDrawGraphics();
! 			old.dispose();
  		}
  		
! 		return g2d;
  	}
  	
--- 489,499 ----
  		 *  swing does not want to give a valid GraphicsConfiguration until the
  		 *  window has been drawn, so this can not be done in the constructor.
! 		 */
  		if (buffer == null) {
  			canvas.createBufferStrategy(2);
! 			buffer = canvas.getBufferStrategy(); 
  		}
  		
! 		return buffer.getDrawGraphics();
  	}