aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-12-31 00:46:18 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-01-15 16:26:31 +0100
commitc035ddeadee15fff5cd697beafce4b0c5707ef95 (patch)
tree04d38efcb7957a3eae41dff37499348107dab082
parent5d7b6db0c734dfe61895f46bfccbfae4719acb69 (diff)
downloadnx-libs-c035ddeadee15fff5cd697beafce4b0c5707ef95.tar.gz
nx-libs-c035ddeadee15fff5cd697beafce4b0c5707ef95.tar.bz2
nx-libs-c035ddeadee15fff5cd697beafce4b0c5707ef95.zip
nxagent: make nxagentForceSynchronization a Boolean
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Drawable.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Drawable.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Handlers.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keystroke.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index ad896dd55..b1df83d3b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -99,7 +99,7 @@ int nxagentCorruptedPixmaps = 0;
int nxagentCorruptedWindows = 0;
int nxagentCorruptedBackgrounds = 0;
-int nxagentForceSynchronization = 0;
+Bool nxagentForceSynchronization = False;
_nxagentSynchronizationRec nxagentSynchronization = { (DrawablePtr) NULL, 0, 0, 0, 0, 0 };
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.h b/nx-X11/programs/Xserver/hw/nxagent/Drawable.h
index 22ffabf7a..e4d3ec96e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.h
@@ -157,7 +157,7 @@ extern int nxagentCorruptedPixmaps;
extern int nxagentCorruptedWindows;
extern int nxagentCorruptedBackgrounds;
-extern int nxagentForceSynchronization;
+extern Bool nxagentForceSynchronization;
extern RegionPtr nxagentCreateRegion(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
int width, int height);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 256c7c241..c5bdee63b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -660,7 +660,7 @@ static void nxagentSwitchDeferMode(void)
{
nxagentLaunchDialog(DIALOG_DISABLE_DEFER_MODE);
- nxagentForceSynchronization = 1;
+ nxagentForceSynchronization = True;
}
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index cdba83264..e6a368b9a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -310,7 +310,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
* operation.
*/
- if (nxagentForceSynchronization == 1)
+ if (nxagentForceSynchronization)
{
#ifdef TEST
fprintf(stderr, "nxagentBlockHandler: Going to force a synchronization at %s.\n",
@@ -319,7 +319,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
nxagentSynchronizationLoop(NEVER_BREAK);
- nxagentForceSynchronization = 0;
+ nxagentForceSynchronization = False;
}
else if (nxagentUserInput(NULL) == 0 &&
!nxagentBlocking &&
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index d6c659fec..9a7c1cd65 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -624,7 +624,7 @@ Bool nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result)
return True;
break;
case KEYSTROKE_FORCE_SYNCHRONIZATION:
- nxagentForceSynchronization = 1;
+ nxagentForceSynchronization = True;
break;
#ifdef DUMP
case KEYSTROKE_REGIONS_ON_SCREEN: