set screen-number in XGetVisualInfo (patch 1417414 by Jeremy Smith)

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1245 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Michael Gernoth 2006-07-11 17:22:24 +00:00
parent 98a51ac1ab
commit 5f86a9b86a

7
xwin.c
View File

@ -1314,7 +1314,7 @@ calculate_mask_weight(uint32 mask)
} }
static BOOL static BOOL
select_visual() select_visual(int screen_num)
{ {
XPixmapFormatValues *pfm; XPixmapFormatValues *pfm;
int pixmap_formats_count, visuals_count; int pixmap_formats_count, visuals_count;
@ -1340,7 +1340,8 @@ select_visual()
/* Search for best TrueColor visual */ /* Search for best TrueColor visual */
template.class = TrueColor; template.class = TrueColor;
vmatches = XGetVisualInfo(g_display, VisualClassMask, &template, &visuals_count); template.screen = screen_num;
vmatches = XGetVisualInfo(g_display, VisualClassMask | VisualScreenMask, &template, &visuals_count);
g_visual = NULL; g_visual = NULL;
g_no_translate_image = False; g_no_translate_image = False;
g_compatible_arch = False; g_compatible_arch = False;
@ -1545,7 +1546,7 @@ ui_init(void)
g_screen = ScreenOfDisplay(g_display, screen_num); g_screen = ScreenOfDisplay(g_display, screen_num);
g_depth = DefaultDepthOfScreen(g_screen); g_depth = DefaultDepthOfScreen(g_screen);
if (!select_visual()) if (!select_visual(screen_num))
return False; return False;
if (g_no_translate_image) if (g_no_translate_image)