CVS: rdesktop xwin.c,1.163,1.164

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10235

Modified Files:
	xwin.c 
Log Message:
only do stipple ops on backingstore when possible

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -d -r1.163 -r1.164
*** xwin.c	26 Apr 2004 23:00:25 -0000	1.163
--- xwin.c	26 Apr 2004 23:14:07 -0000	1.164
***************
*** 1800,1804 ****
  		case 0:	/* Solid */
  			SET_FOREGROUND(fgcolour);
! 			FILL_RECTANGLE(x, y, cx, cy);
  			break;
  
--- 1800,1804 ----
  		case 0:	/* Solid */
  			SET_FOREGROUND(fgcolour);
! 			FILL_RECTANGLE_BACKSTORE(x, y, cx, cy);
  			break;
  
***************
*** 1811,1815 ****
  			XSetStipple(g_display, g_gc, fill);
  			XSetTSOrigin(g_display, g_gc, brush->xorigin, brush->yorigin);
! 			FILL_RECTANGLE(x, y, cx, cy);
  			XSetFillStyle(g_display, g_gc, FillSolid);
  			XSetTSOrigin(g_display, g_gc, 0, 0);
--- 1811,1815 ----
  			XSetStipple(g_display, g_gc, fill);
  			XSetTSOrigin(g_display, g_gc, brush->xorigin, brush->yorigin);
! 			FILL_RECTANGLE_BACKSTORE(x, y, cx, cy);
  			XSetFillStyle(g_display, g_gc, FillSolid);
  			XSetTSOrigin(g_display, g_gc, 0, 0);
***************
*** 1821,1825 ****
  				ipattern[7 - i] = brush->pattern[i];
  			fill = (Pixmap) ui_create_glyph(8, 8, ipattern);
- 
  			SET_FOREGROUND(bgcolour);
  			SET_BACKGROUND(fgcolour);
--- 1821,1824 ----
***************
*** 1827,1833 ****
  			XSetStipple(g_display, g_gc, fill);
  			XSetTSOrigin(g_display, g_gc, brush->xorigin, brush->yorigin);
! 
! 			FILL_RECTANGLE(x, y, cx, cy);
! 
  			XSetFillStyle(g_display, g_gc, FillSolid);
  			XSetTSOrigin(g_display, g_gc, 0, 0);
--- 1826,1830 ----
  			XSetStipple(g_display, g_gc, fill);
  			XSetTSOrigin(g_display, g_gc, brush->xorigin, brush->yorigin);
! 			FILL_RECTANGLE_BACKSTORE(x, y, cx, cy);
  			XSetFillStyle(g_display, g_gc, FillSolid);
  			XSetTSOrigin(g_display, g_gc, 0, 0);
***************
*** 1840,1843 ****
--- 1837,1843 ----
  
  	RESET_FUNCTION(opcode);
+ 
+ 	if (g_ownbackstore)
+ 		XCopyArea(g_display, g_backstore, g_wnd, g_gc, x, y, cx, cy, x, y);
  }
  



-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297