From c0ba2f7af7270f2e6edf1bc2386c97ed3f0783cb Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 3 Oct 2016 15:12:34 -0700 Subject: Don't try to make XOR 'look good'. Best to make it visible. Attempts to pick 'good' pixel values to make XOR rendering look decent instead make it invisible on modern TrueColor visuals. Just use the defined fg/bg pixel values, which at least make it appear. Adapt to this change by drawing the lines for the blt tests in copy mode so they appear on the screen. Signed-off-by: Keith Packard Part-of: --- do_blt.c | 2 ++ x11perf.c | 25 ++++++++----------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/do_blt.c b/do_blt.c index ba0c7c7..95ad602 100644 --- a/do_blt.c +++ b/do_blt.c @@ -66,7 +66,9 @@ int InitScroll(XParms xp, Parms p, int64_t reps) { InitBltLines(); + XSetFunction(xp->d, xp->fggc, GXcopy); XDrawLines(xp->d, xp->w, xp->fggc, points, NUMPOINTS, CoordModeOrigin); + XSetFunction(xp->d, xp->fggc, xp->func); return reps; } diff --git a/x11perf.c b/x11perf.c index a77316d..3939f02 100644 --- a/x11perf.c +++ b/x11perf.c @@ -739,23 +739,14 @@ CreatePerfGCs(XParms xp, int func, unsigned long pm) gcvddfg.function = func; gcvddbg.function = func; - if (func == GXxor) { - /* Make test look good visually if possible */ - gcvbg.foreground = gcvfg.foreground = bg ^ fg; - gcvbg.background = gcvfg.background = bg; - /* Double Dash GCs (This doesn't make a huge amount of sense) */ - gcvddbg.foreground = gcvddfg.foreground = bg ^ fg; - gcvddbg.background = gcvddfg.foreground = bg ^ ddbg; - } else { - gcvfg.foreground = fg; - gcvfg.background = bg; - gcvbg.foreground = bg; - gcvbg.background = fg; - gcvddfg.foreground = fg; - gcvddfg.background = ddbg; - gcvddbg.foreground = ddbg; - gcvddbg.background = fg; - } + gcvfg.foreground = fg; + gcvfg.background = bg; + gcvbg.foreground = bg; + gcvbg.background = fg; + gcvddfg.foreground = fg; + gcvddfg.background = ddbg; + gcvddbg.foreground = ddbg; + gcvddbg.background = fg; xp->fggc = XCreateGC(xp->d, xp->w, GCForeground | GCBackground | GCGraphicsExposures | GCFunction | GCPlaneMask, &gcvfg); -- cgit v1.2.3