aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-05-25 17:29:17 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-06 00:18:44 +0100
commit7c1bd6f521ee910187f61bfd354801332e4fbe60 (patch)
tree56ee9f2d317f72cc288c84cc5f16b758b56856bf
parent66f0a85e96c0ba70572df6afa9e6732907b478d0 (diff)
downloadnx-libs-7c1bd6f521ee910187f61bfd354801332e4fbe60.tar.gz
nx-libs-7c1bd6f521ee910187f61bfd354801332e4fbe60.tar.bz2
nx-libs-7c1bd6f521ee910187f61bfd354801332e4fbe60.zip
NX{mitrap,picture}.c: mark NX changes
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXpicture.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
index 7ccc04bc8..159a7b55d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
@@ -215,7 +215,9 @@ AllocatePicture (ScreenPtr pScreen)
ppriv->ptr = (void *)NULL;
}
+#ifdef NXAGENT_SERVER
nxagentPicturePriv(pPicture) -> picture = 0;
+#endif
return pPicture;
}
@@ -245,13 +247,14 @@ CreatePicture (Picture pid,
pPicture->format = pFormat->format | (pDrawable->bitsPerPixel << 24);
if (pDrawable->type == DRAWABLE_PIXMAP)
{
+#ifdef NXAGENT_SERVER
/*
* Let picture always point to the virtual pixmap.
* For sure this is not the best way to deal with
* the virtual frame-buffer.
*/
pPicture->pDrawable = nxagentVirtualDrawable(pDrawable);
-
+#endif
++((PixmapPtr)pDrawable)->refcnt;
pPicture->pNext = 0;
}