From 13474cf8d5766c4e3ac809ce0674b58533d86b1f Mon Sep 17 00:00:00 2001
From: Eddy De Greef <edg@users.sourceforge.net>
Date: Fri, 20 Jul 2007 16:09:19 +0000
Subject: [PATCH] Reinstated the 32-bit visual check to try to avoid running
 into ARGB visuals when NEdit displays remotely on an X.Org server and
 XLIB_SKIP_ARGB_VISUALS has no effect. I'm not sure that this will cover all
 possible cases, but it is probably the best we can do. (SF bug #1458006)

---
 ReleaseNotes |  4 ++--
 util/misc.c  | 25 +++++++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ReleaseNotes b/ReleaseNotes
index 572b2bb..14a1aad 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,7 +1,7 @@
           Release Notes for NEdit Version 5.5, October 2004
 
 
-$Id: ReleaseNotes,v 1.56 2007/03/04 23:17:26 yooden Exp $
+$Id: ReleaseNotes,v 1.57 2007/07/20 16:09:19 edg Exp $
 
 This file contains last minute notes to users about the release, which are not
 included in the documentation or README files included with the distribution
@@ -27,7 +27,7 @@ Bugs fixed in $NEXT_VERSION
     (SF bug #1578869).
 
   - Crashes and artefacts when using ARGB visuals (SF bugs #1579544, 
-    #1030467, and #1030192).
+    #1030467, #1030192, and #1458006).
 
   - The text insertion cursor does no longer blink while typing
     (SF bug #906878).
diff --git a/util/misc.c b/util/misc.c
index 1735856..bc0e0d6 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -1,4 +1,4 @@
-static const char CVSID[] = "$Id: misc.c,v 1.85 2007/01/04 00:02:42 yooden Exp $";
+static const char CVSID[] = "$Id: misc.c,v 1.86 2007/07/20 16:09:19 edg Exp $";
 /*******************************************************************************
 *									       *
 * misc.c -- Miscelaneous Motif convenience functions			       *
@@ -434,13 +434,7 @@ Boolean FindBestVisual(Display *display, const char *appName, const char *appCla
         
     /* Generate a list of visuals to consider.  (Note, vestigial code for
        user-requested visual depth is left in, just in case that function
-       might be needed again, but it does nothing).
-       Note that Xorg 6.8+ ARGB visuals (with alpha-channel) cause a lot
-       of problems, so we have to avoid them. This is done by setting
-       the environment variable XLIB_SKIP_ARGB_VISUALS before the display
-       is opened (in nedit.c). 
-       Users can achieve the same effect with older versions of NEdit by 
-       setting the environment variable themselves. */
+       might be needed again, but it does nothing). */
     if (reqID != -1) {
 	visTemplate.visualid = reqID;
 	visList = XGetVisualInfo(display, VisualScreenMask|VisualIDMask,
@@ -490,6 +484,21 @@ Boolean FindBestVisual(Display *display, const char *appName, const char *appCla
     bestClass = 0;
     bestVisual = 0;
     for (i=0; i < nVis; i++) {
+        /* X.Org 6.8+ 32-bit visuals (with alpha-channel) cause a lot of
+           problems, so we have to skip them. We already try this by setting
+           the environment variable XLIB_SKIP_ARGB_VISUALS at startup (in
+           nedit.c), but that doesn't cover the case where NEdit is running on
+           a host that doesn't use the X.Org X libraries but is displaying
+           remotely on an X.Org server. Therefore, this additional check is
+           added. 
+           Note that this check in itself is not sufficient. There have been
+           bug reports that seemed to indicate that non-32-bit visuals with an
+           alpha-channel exist. The combined approach (env. var. + 32-bit
+           check) should cover the vast majority of the cases, though. */
+	if (visList[i].depth >= 32 &&
+	    strstr(ServerVendor(display), "X.Org") != 0) {
+	    continue;
+	}
 	if (visList[i].depth > maxDepth) {
 	    maxDepth = visList[i].depth;
 	    bestClass = 0;
-- 
2.11.4.GIT