CVS: rdesktop xwin.c,1.205.2.35,1.205.2.36

Peter Åstrand <[email protected]> Wed, 22 Mar 2006 02:02:13 -0800
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11975

Modified Files:
      Tag: seamlessrdp-branch
	xwin.c 
Log Message:
Do not warn upon no seamless info at ConfigureNotify or Expose: The window might already be destroyed.

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.205.2.35
retrieving revision 1.205.2.36
diff -C2 -d -r1.205.2.35 -r1.205.2.36
*** xwin.c	22 Mar 2006 09:49:21 -0000	1.205.2.35
--- xwin.c	22 Mar 2006 10:02:11 -0000	1.205.2.36
***************
*** 2134,2150 ****
  				{
  					sw = sw_get_window_by_wnd(xevent.xexpose.window);
! 					if (sw)
! 						XCopyArea(g_display, g_backstore,
! 							  xevent.xexpose.window, g_gc,
! 							  xevent.xexpose.x + sw->xoffset,
! 							  xevent.xexpose.y + sw->yoffset,
! 							  xevent.xexpose.width,
! 							  xevent.xexpose.height, xevent.xexpose.x,
! 							  xevent.xexpose.y);
! 					else
! 					{
! 						error("Expose for unknown window 0x%lx\n",
! 						      xevent.xexpose.window);
! 					}
  				}
  
--- 2134,2146 ----
  				{
  					sw = sw_get_window_by_wnd(xevent.xexpose.window);
! 					if (!sw)
! 						break;
! 					XCopyArea(g_display, g_backstore,
! 						  xevent.xexpose.window, g_gc,
! 						  xevent.xexpose.x + sw->xoffset,
! 						  xevent.xexpose.y + sw->yoffset,
! 						  xevent.xexpose.width,
! 						  xevent.xexpose.height, xevent.xexpose.x,
! 						  xevent.xexpose.y);
  				}
  
***************
*** 2216,2223 ****
  				sw = sw_get_window_by_wnd(xevent.xconfigure.window);
  				if (!sw)
! 				{
! 					error("ConfigureNotify for unknown window 0x%lx\n",
! 					      xevent.xconfigure.window);
! 				}
  
  				gettimeofday(sw->position_timer, NULL);
--- 2212,2216 ----
  				sw = sw_get_window_by_wnd(xevent.xconfigure.window);
  				if (!sw)
! 					break;
  
  				gettimeofday(sw->position_timer, NULL);



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642