diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
| commit | 24d7d0faa4b5c12c691599bf61bae5cfe1ef4120 (patch) | |
| tree | afec05c1ea5a1f9fcdc1a54f4d2b5050706e75c2 /nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | |
| parent | b61934be2e9b4a8d3112270b0e691d47f99ba39f (diff) | |
| parent | 586742b715a3e3451a4587439778c410a1970cdd (diff) | |
| download | nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.gz nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.bz2 nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.zip | |
Merge branch 'uli42-pr/revert' into 3.6.x
Attributes GH PR #773: https://github.com/ArcticaProject/nx-libs/pull/773
Fixes ArcticaProject/nx-libs#772.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Pixmap.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index 3deedda42..be154f9c2 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -217,7 +217,7 @@ PixmapPtr nxagentCreatePixmap(ScreenPtr pScreen, int width, int height, * id of the drawable in the checksum. */ - if (width != 0 && height != 0 && !nxagentGCTrap) + if (width != 0 && height != 0 && nxagentGCTrap == 0) { pPixmapPriv -> id = XCreatePixmap(nxagentDisplay, nxagentDefaultWindows[pScreen -> myNum], @@ -348,7 +348,7 @@ PixmapPtr nxagentCreatePixmap(ScreenPtr pScreen, int width, int height, fprintf(stderr, "Warning: Disabling render extension due to missing pixmap format.\n"); #endif - nxagentRenderTrap = True; + nxagentRenderTrap = 1; } nxagentDestroyPixmap(pPixmap); @@ -923,11 +923,11 @@ void nxagentReconnectPixmap(void *p0, XID x1, void *p2) return; } - nxagentSplitTrap = True; + nxagentSplitTrap = 1; *pBool = nxagentSynchronizeDrawableData((DrawablePtr) pPixmap, NEVER_BREAK, NULL); - nxagentSplitTrap = False; + nxagentSplitTrap = 0; if (!*pBool) { @@ -1256,11 +1256,11 @@ void nxagentSynchronizeShmPixmap(DrawablePtr pDrawable, int xPict, int yPict, saveTrap = nxagentGCTrap; - nxagentGCTrap = False; + nxagentGCTrap = 0; - nxagentSplitTrap = True; + nxagentSplitTrap = 1; - nxagentFBTrap = True; + nxagentFBTrap = 1; if ((data = malloc(length)) != NULL) { @@ -1281,9 +1281,9 @@ void nxagentSynchronizeShmPixmap(DrawablePtr pDrawable, int xPict, int yPict, nxagentGCTrap = saveTrap; - nxagentSplitTrap = False; + nxagentSplitTrap = 0; - nxagentFBTrap = False; + nxagentFBTrap = 0; nxagentFreeScratchGC(pGC); } |