From 5f86a9b86aaa12cbab645a869d3a6f4312dfaace Mon Sep 17 00:00:00 2001 From: Michael Gernoth Date: Tue, 11 Jul 2006 17:22:24 +0000 Subject: [PATCH] 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 --- xwin.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xwin.c b/xwin.c index 572aac9..c514d79 100644 --- a/xwin.c +++ b/xwin.c @@ -1314,7 +1314,7 @@ calculate_mask_weight(uint32 mask) } static BOOL -select_visual() +select_visual(int screen_num) { XPixmapFormatValues *pfm; int pixmap_formats_count, visuals_count; @@ -1340,7 +1340,8 @@ select_visual() /* Search for best TrueColor visual */ 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_no_translate_image = False; g_compatible_arch = False; @@ -1545,7 +1546,7 @@ ui_init(void) g_screen = ScreenOfDisplay(g_display, screen_num); g_depth = DefaultDepthOfScreen(g_screen); - if (!select_visual()) + if (!select_visual(screen_num)) return False; if (g_no_translate_image)