Commit ca7c1c86 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

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.
parent 753535e3
...@@ -156,8 +156,10 @@ damagePolyText8(DrawablePtr pDrawable, ...@@ -156,8 +156,10 @@ damagePolyText8(DrawablePtr pDrawable,
if (checkGCDamage (pDrawable, pGC)) if (checkGCDamage (pDrawable, pGC))
x = damageText (pDrawable, pGC, x, y, (unsigned long) count, chars, x = damageText (pDrawable, pGC, x, y, (unsigned long) count, chars,
Linear8Bit, TT_POLY8); Linear8Bit, TT_POLY8);
#ifndef NXAGENT_SERVER
else 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); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
return x; return x;
...@@ -177,8 +179,10 @@ damagePolyText16(DrawablePtr pDrawable, ...@@ -177,8 +179,10 @@ damagePolyText16(DrawablePtr pDrawable,
x = damageText (pDrawable, pGC, x, y, (unsigned long) count, (char *) chars, x = damageText (pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit, FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit,
TT_POLY16); TT_POLY16);
#ifndef NXAGENT_SERVER
else 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); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
return x; return x;
...@@ -197,8 +201,10 @@ damageImageText8(DrawablePtr pDrawable, ...@@ -197,8 +201,10 @@ damageImageText8(DrawablePtr pDrawable,
if (checkGCDamage (pDrawable, pGC)) if (checkGCDamage (pDrawable, pGC))
damageText (pDrawable, pGC, x, y, (unsigned long) count, chars, damageText (pDrawable, pGC, x, y, (unsigned long) count, chars,
Linear8Bit, TT_IMAGE8); Linear8Bit, TT_IMAGE8);
#ifndef NXAGENT_SERVER
else 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); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
} }
...@@ -217,8 +223,10 @@ damageImageText16(DrawablePtr pDrawable, ...@@ -217,8 +223,10 @@ damageImageText16(DrawablePtr pDrawable,
damageText (pDrawable, pGC, x, y, (unsigned long) count, (char *) chars, damageText (pDrawable, pGC, x, y, (unsigned long) count, (char *) chars,
FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit, FONTLASTROW(pGC->font) == 0 ? Linear16Bit : TwoD16Bit,
TT_IMAGE16); TT_IMAGE16);
#ifndef NXAGENT_SERVER
else 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); DAMAGE_GC_OP_EPILOGUE(pGC, pDrawable);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment