Skip to content

N
nx-libs
Commit c804d99f authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

NXhsm.c: add missing code

This code was already existing in Xorg 6.6, but never in NX, for whatever reason.
parent ef0a3d63
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 6 deletions
nx-X11/programs/Xserver/hw/nxagent/NXshm.c
View file @ c804d99f
...@@ -349,12 +349,26 @@ ProcShmPutImage(client) ...@@ -349,12 +349,26 @@ ProcShmPutImage(client)
fprintf(stderr, "ProcShmPutImage: Calling (*shmFuncs[pDraw->pScreen->myNum]->PutImage)().\n"); fprintf(stderr, "ProcShmPutImage: Calling (*shmFuncs[pDraw->pScreen->myNum]->PutImage)().\n");
#endif #endif
(*shmFuncs[pDraw->pScreen->myNum]->PutImage)( if ((((stuff->format == ZPixmap) && (stuff->srcX == 0)) ||
pDraw, pGC, stuff->depth, stuff->format, ((stuff->format != ZPixmap) &&
stuff->totalWidth, stuff->totalHeight, (stuff->srcX < screenInfo.bitmapScanlinePad) &&
stuff->srcX, stuff->srcY, ((stuff->format == XYBitmap) ||
stuff->srcWidth, stuff->srcHeight, ((stuff->srcY == 0) &&
stuff->dstX, stuff->dstY, (stuff->srcHeight == stuff->totalHeight))))) &&
((stuff->srcX + stuff->srcWidth) == stuff->totalWidth))
(*pGC->ops->PutImage) (pDraw, pGC, stuff->depth,
stuff->dstX, stuff->dstY,
stuff->totalWidth, stuff->srcHeight,
stuff->srcX, stuff->format,
shmdesc->addr + stuff->offset +
(stuff->srcY * length));
else
(*shmFuncs[pDraw->pScreen->myNum]->PutImage)(
pDraw, pGC, stuff->depth, stuff->format,
stuff->totalWidth, stuff->totalHeight,
stuff->srcX, stuff->srcY,
stuff->srcWidth, stuff->srcHeight,
stuff->dstX, stuff->dstY,
shmdesc->addr + stuff->offset); shmdesc->addr + stuff->offset);
if (stuff->sendEvent) if (stuff->sendEvent)
......
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