From 60a47420a8887d7fcda37efe4b6baf730d9cc936 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Sun, 7 Oct 2012 09:48:47 -0400 Subject: devdraw: prefer 24-bit over 15-bit or 16-bit. Fixes remote X11 use via XQuartz 2.7.4. R=rsc http://codereview.appspot.com/6624058 --- src/cmd/devdraw/x11-init.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/cmd/devdraw/x11-init.c b/src/cmd/devdraw/x11-init.c index 0fd27d72..04b13a03 100644 --- a/src/cmd/devdraw/x11-init.c +++ b/src/cmd/devdraw/x11-init.c @@ -98,6 +98,12 @@ _xattach(char *label, char *winsize) /* * Figure out underlying screen format. */ + if(XMatchVisualInfo(_x.display, xrootid, 24, TrueColor, &xvi) + || XMatchVisualInfo(_x.display, xrootid, 24, DirectColor, &xvi)){ + _x.vis = xvi.visual; + _x.depth = 24; + } + else if(XMatchVisualInfo(_x.display, xrootid, 16, TrueColor, &xvi) || XMatchVisualInfo(_x.display, xrootid, 16, DirectColor, &xvi)){ _x.vis = xvi.visual; @@ -110,12 +116,6 @@ _xattach(char *label, char *winsize) _x.depth = 15; } else - if(XMatchVisualInfo(_x.display, xrootid, 24, TrueColor, &xvi) - || XMatchVisualInfo(_x.display, xrootid, 24, DirectColor, &xvi)){ - _x.vis = xvi.visual; - _x.depth = 24; - } - else if(XMatchVisualInfo(_x.display, xrootid, 8, PseudoColor, &xvi) || XMatchVisualInfo(_x.display, xrootid, 8, StaticColor, &xvi)){ if(_x.depth > 8){ -- cgit v1.2.3