aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-02-09 03:41:22 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-09 03:41:22 +0100
commit7af47b583ba8b2ab78aeec6b67c862d5eef6e9f1 (patch)
tree827e4f2cba3a6a649537e83a9eeef1669ab1f00d /nx-X11
parentf76d4b54118627adb13dd896537c01033d989158 (diff)
downloadnx-libs-7af47b583ba8b2ab78aeec6b67c862d5eef6e9f1.tar.gz
nx-libs-7af47b583ba8b2ab78aeec6b67c862d5eef6e9f1.tar.bz2
nx-libs-7af47b583ba8b2ab78aeec6b67c862d5eef6e9f1.zip
Revert "NXhsm.c: add missing code"
This reverts commit c804d99f2c4ea21e37cc8f6c3168b7b79d0d721a. 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
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXshm.c26
1 files changed, 6 insertions, 20 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
index fd74fadc3..5e8e8ed6b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
@@ -349,26 +349,12 @@ 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,
- stuff->srcX, stuff->srcY,
- stuff->srcWidth, stuff->srcHeight,
- stuff->dstX, stuff->dstY,
+ (*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);
if (stuff->sendEvent)