Revert "NXhsm.c: add missing code"

This reverts commit c804d99f. It seems like the missing code was missing for a good reason. Including it leads to very strange issues when coupled with libXcomp and using connection speed settings lower than LAN (and even on LAN some icons are not showing up correctly, e.g., when using MATE). Further investigation on why this happens pending and might happen at a later time. Fixes: ArcticaProject/nx-libs#656

Revert "NXhsm.c: add missing code"
7af47b58 · Mihai Moldovan · f76d4b54 · 7af47b58
Commit 7af47b58 authored Feb 09, 2018 by Mihai Moldovan
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 14 deletions

NXshm.c nx-X11/programs/Xserver/hw/nxagent/NXshm.c +0 -14

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
@@ -349,20 +349,6 @@ ProcShmPutImage(client)
    fprintf(stderr, "ProcShmPutImage: Calling (*shmFuncs[pDraw->pScreen->myNum]->PutImage)().\n");
    #endif

-    if ((((stuff->format == ZPixmap) && (stuff->srcX == 0)) ||
-	 ((stuff->format != ZPixmap) &&
-	  (stuff->srcX < screenInfo.bitmapScanlinePad) &&
-	  ((stuff->format == XYBitmap) ||
-	   ((stuff->srcY == 0) &&
-	    (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,