CVS: rdesktop xwin.c,1.210,1.211

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

Modified Files:
	xwin.c 
Log Message:
set screen-number in XGetVisualInfo (patch 1417414 by Jeremy Smith)


Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -C2 -d -r1.210 -r1.211
*** xwin.c	28 Apr 2006 07:55:36 -0000	1.210
--- xwin.c	11 Jul 2006 17:22:24 -0000	1.211
***************
*** 1315,1319 ****
  
  static BOOL
! select_visual()
  {
  	XPixmapFormatValues *pfm;
--- 1315,1319 ----
  
  static BOOL
! select_visual(int screen_num)
  {
  	XPixmapFormatValues *pfm;
***************
*** 1341,1345 ****
  	/* Search for best TrueColor visual */
  	template.class = TrueColor;
! 	vmatches = XGetVisualInfo(g_display, VisualClassMask, &template, &visuals_count);
  	g_visual = NULL;
  	g_no_translate_image = False;
--- 1341,1346 ----
  	/* Search for best TrueColor visual */
  	template.class = TrueColor;
! 	template.screen = screen_num;
! 	vmatches = XGetVisualInfo(g_display, VisualClassMask | VisualScreenMask, &template, &visuals_count);
  	g_visual = NULL;
  	g_no_translate_image = False;
***************
*** 1546,1550 ****
  	g_depth = DefaultDepthOfScreen(g_screen);
  
! 	if (!select_visual())
  		return False;
  
--- 1547,1551 ----
  	g_depth = DefaultDepthOfScreen(g_screen);
  
! 	if (!select_visual(screen_num))
  		return False;
  



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642