- fix nedit when used with xcomposite enabled

from Laurence Tratt <tratt at dcs.kcl.ac.uk>

ok mbalmer@
This commit is contained in:
jasper 2008-01-02 17:39:13 +00:00
parent 60e6c8b6b4
commit 37b7049074
2 changed files with 21 additions and 2 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.42 2007/11/13 14:06:22 steven Exp $ # $OpenBSD: Makefile,v 1.43 2008/01/02 17:39:13 jasper Exp $
# $FreeBSD: Makefile,v 1.10 1998/03/28 14:36:34 steve Exp $ # $FreeBSD: Makefile,v 1.10 1998/03/28 14:36:34 steve Exp $
COMMENT= X11/Motif GUI text editor COMMENT= X11/Motif GUI text editor
DISTNAME= nedit-5.5 DISTNAME= nedit-5.5
PKGNAME= ${DISTNAME}p4 PKGNAME= ${DISTNAME}p5
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}
PATCHFILES= wrapmark.diff:0 PATCHFILES= wrapmark.diff:0
CATEGORIES= editors x11 CATEGORIES= editors x11

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-util_misc_c,v 1.1 2008/01/02 17:39:13 jasper Exp $
--- util/misc.c.orig Mon Aug 9 23:19:38 2004
+++ util/misc.c Sat Dec 29 14:39:46 2007
@@ -475,6 +475,15 @@ Boolean FindBestVisual(Display *display, const char *a
bestClass = 0;
bestVisual = 0;
for (i=0; i < nVis; i++) {
+ if (visList[i].depth >= 32 &&
+ strstr(ServerVendor(display), "X.Org") != 0) {
+ /* Xorg 6.8.* 32-bit visuals (with alpha-channel) cause a lot
+ of problems, so we have to skip them.
+ Users can achieve the same effect with older versions of
+ NEdit by setting the environment variable
+ XLIB_SKIP_ARGB_VISUALS. */
+ continue;
+ }
if (visList[i].depth > maxDepth) {
maxDepth = visList[i].depth;
bestClass = 0;