NXdamage.x fix wrong backport

f0ba303d 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.

NXdamage.x fix wrong backport
ca7c1c86 · Ulrich Sibiller · Mike Gabriel · 753535e3 · ca7c1c86
Commit ca7c1c86 authored Oct 30, 2019 by Ulrich Sibiller Committed by Mike Gabriel Nov 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

NXdamage.c nx-X11/programs/Xserver/hw/nxagent/NXdamage.c +12 -4

No files found.
--- 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);
 }