From 0bca321fb1bc76188a86f1d719cb510f5350c175 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 31 Dec 2020 01:10:33 +0100
Subject: nxagent: make nxagentXkbState.Initialized a Boolean

---
 nx-X11/programs/Xserver/hw/nxagent/Events.c    | 6 +++---
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c  | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.h  | 3 +--
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 1758f649c..a9a79cebd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -1143,7 +1143,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
           nxagentKeyDown = 0;
         }
 
-        if (nxagentXkbState.Initialized == 0)
+        if (!nxagentXkbState.Initialized)
         {
           if (X.xkey.keycode == nxagentCapsLockKeycode)
           {
@@ -2263,7 +2263,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
 
 int nxagentHandleKeyPress(XEvent *X, enum HandleEventResult *result)
 {
-  if (nxagentXkbState.Initialized == 0)
+  if (!nxagentXkbState.Initialized)
   {
     if (X -> xkey.keycode == nxagentCapsLockKeycode)
     {
@@ -2741,7 +2741,7 @@ int nxagentHandleXkbKeyboardStateEvent(XEvent *X)
                 nxagentXkbState.Locked);
     #endif
 
-    nxagentXkbState.Initialized = 1;
+    nxagentXkbState.Initialized = True;
 
     if (nxagentXkbState.Caps == 0 &&
             (nxagentXkbState.Locked & CAPSFLAG_IN_EVENT))
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index c9c9bb33b..38955f669 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -161,7 +161,7 @@ XkbAgentInfoRec nxagentXkbInfo = { -1, -1, -1, -1, -1 };
  * Keyboard status, updated through XKB events.
  */
 
-XkbAgentStateRec nxagentXkbState = { 0, 0, 0, 0, 0 };
+XkbAgentStateRec nxagentXkbState = { 0, 0, 0, 0, False };
 
 /*
  * Info for disabling/enabling Xkb extension.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h
index dbfb47733..504c99869 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.h
@@ -68,8 +68,7 @@ typedef struct _XkbAgentState
   int Caps;
   int Num;
   int Focus;
-  int Initialized;
-
+  Bool Initialized;
 } XkbAgentStateRec;
 
 extern XkbAgentStateRec nxagentXkbState;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
index 101796748..d0f83e7bd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c
@@ -616,7 +616,7 @@ Bool nxagentReconnectSession(void)
     }
   }
 
-  nxagentXkbState.Initialized = 0;
+  nxagentXkbState.Initialized = False;
 
   SAFE_free(nxagentOldKeyboard);
 
-- 
cgit v1.2.3