aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-02-15 09:37:18 +0100
committerUlrich Sibiller <uli42@gmx.de>2019-02-15 09:43:02 +0100
commit586742b715a3e3451a4587439778c410a1970cdd (patch)
treeafec05c1ea5a1f9fcdc1a54f4d2b5050706e75c2 /nx-X11/programs/Xserver/hw/nxagent/NXshm.c
parentb61934be2e9b4a8d3112270b0e691d47f99ba39f (diff)
downloadnx-libs-586742b715a3e3451a4587439778c410a1970cdd.tar.gz
nx-libs-586742b715a3e3451a4587439778c410a1970cdd.tar.bz2
nx-libs-586742b715a3e3451a4587439778c410a1970cdd.zip
Revert "nxagent: rework Bool handling"
This reverts commit 16cd2bbe1c4425e3fa557f9ca0723aa94a50b071. It turned out that I had missed some of the Booleans being actually tristate variables. I think I can fix this (they do not need to be tristate) but I revert this for now to get back to a working state (there are reports about non-working fullscreen mode and reconnect problems). Refers to ArcticaProject/nx-libs#772
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXshm.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXshm.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
index 6ce2e48e8..246d39355 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
@@ -96,7 +96,7 @@ ShmExtensionInit(void)
#endif
#ifdef NXAGENT_SERVER
- if (!nxagentOption(SharedMemory))
+ if (nxagentOption(SharedMemory) == False)
{
return;
}
@@ -207,11 +207,11 @@ miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
{
/* Careful! This wrapper DEACTIVATES the trap! */
- nxagentShmTrap = False;
+ nxagentShmTrap = 0;
nxagent_miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data);
- nxagentShmTrap = True;
+ nxagentShmTrap = 1;
return;
}
@@ -476,11 +476,11 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr)
{
PixmapPtr result;
- nxagentShmPixmapTrap = True;
+ nxagentShmPixmapTrap = 1;
result = nxagent_fbShmCreatePixmap(pScreen, width, height, depth, addr);
- nxagentShmPixmapTrap = False;
+ nxagentShmPixmapTrap = 0;
return result;
}
@@ -553,11 +553,11 @@ ProcShmDispatch (register ClientPtr client)
{
int result;
- nxagentShmTrap = True;
+ nxagentShmTrap = 1;
result = nxagent_ProcShmDispatch(client);
- nxagentShmTrap = False;
+ nxagentShmTrap = 0;
return result;
}
@@ -591,13 +591,13 @@ SProcShmDispatch (client)
#endif
#ifdef NXAGENT_SERVER
- nxagentShmTrap = True;
+ nxagentShmTrap = 1;
#endif
result = SProcShmPutImage(client);
#ifdef NXAGENT_SERVER
- nxagentShmTrap = False;
+ nxagentShmTrap = 0;
#endif
#ifdef TEST