From ca7c1c86155a26ee7779a78cfc09900942eab4ff Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 30 Oct 2019 17:50:44 +0100 Subject: NXdamage.x fix wrong backport f0ba303d48439e0ebb572d56db972995388ac865 errornously added the "else" which had been explicitly removed in NX 3.0.0-28 with this comment: - Changed damage's GCOps functions drawing text. This was needed be- cause the original functions didn't call agent GCOps if the drawable was registered for damage events. --- nx-X11/programs/Xserver/hw/nxagent/NXdamage.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c index ef50edbee..3be717f9e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c @@ -156,8 +156,10 @@ damagePolyText8(DrawablePtr pDrawable, if (checkGCDamage (pDrawable, pGC)) x = damageText (pDrawable, pGC, x, y, (unsigned long) count, chars, Linear8Bit, TT_POLY8); +#ifndef NXAGENT_SERVER else - x = (*pGC->ops->PolyText8)(pDrawable, pGC, x, y, count, chars); +#endif + x = (*pGC->ops->PolyText8)(pDrawable, pGC, x, y, count, chars); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); return x; @@ -177,8 +179,10 @@ damagePolyText16(DrawablePtr pDrawable, x = damageText (pDrawable, pGC, x, y, (unsigned long) count, (char *) chars, FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit, TT_POLY16); +#ifndef NXAGENT_SERVER else - x = (*pGC->ops->PolyText16)(pDrawable, pGC, x, y, count, chars); +#endif + x = (*pGC->ops->PolyText16)(pDrawable, pGC, x, y, count, chars); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); return x; @@ -197,8 +201,10 @@ damageImageText8(DrawablePtr pDrawable, if (checkGCDamage (pDrawable, pGC)) damageText (pDrawable, pGC, x, y, (unsigned long) count, chars, Linear8Bit, TT_IMAGE8); +#ifndef NXAGENT_SERVER else - (*pGC->ops->ImageText8)(pDrawable, pGC, x, y, count, chars); +#endif + (*pGC->ops->ImageText8)(pDrawable, pGC, x, y, count, chars); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } @@ -217,8 +223,10 @@ damageImageText16(DrawablePtr pDrawable, damageText (pDrawable, pGC, x, y, (unsigned long) count, (char *) chars, FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit, TT_IMAGE16); +#ifndef NXAGENT_SERVER else - (*pGC->ops->ImageText16)(pDrawable, pGC, x, y, count, chars); +#endif + (*pGC->ops->ImageText16)(pDrawable, pGC, x, y, count, chars); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable); } -- cgit v1.2.3