Merge branch 'uli42-pr/rework_booleans_v2' into 3.6.x

Attributes GH PR #980: https://github.com/ArcticaProject/nx-libs/pull/980

1 files changed, 26 insertions, 24 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c
index 0da504f06..afc6899e3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c
@@ -59,10 +59,12 @@ void nxagentInitOptions(void)
 {
   nxagentOptions.LinkType = UNDEFINED;
 
-  nxagentOptions.Desktop    = UNDEFINED;
-  nxagentOptions.Persistent = 1;
-  nxagentOptions.Rootless   = UNDEFINED;
-  nxagentOptions.Fullscreen = UNDEFINED;
+  nxagentOptions.Desktop    = True;
+  nxagentOptions.Persistent = True;
+  nxagentOptions.Rootless   = False;
+  nxagentOptions.Shadow     = False;
+  nxagentOptions.Fullscreen = False;
+  nxagentOptions.AllScreens = False;
   nxagentOptions.NoRootlessExit = False;
 
   nxagentOptions.X           = 0;
@@ -81,23 +83,23 @@ void nxagentInitOptions(void)
 
   nxagentOptions.Timeout = 0;
 
-  nxagentOptions.Nested = 0;
+  nxagentOptions.Nested = False;
 
   nxagentOptions.BackingStore = BackingStoreUndefined;
 
   nxagentOptions.Clipboard = ClipboardBoth;
 
-  nxagentOptions.SharedMemory = 1;
+  nxagentOptions.SharedMemory = True;
 
-  nxagentOptions.SharedPixmaps = 1;
+  nxagentOptions.SharedPixmaps = True;
 
-  nxagentOptions.DeviceControl = 0;
+  nxagentOptions.DeviceControl = False;
 
-  nxagentOptions.DeviceControlUserDefined = 0;
+  nxagentOptions.DeviceControlUserDefined = False;
 
-  nxagentOptions.ResetKeyboardAtResume = 1;
+  nxagentOptions.ResetKeyboardAtResume = True;
 
-  nxagentOptions.Reset = 0;
+  nxagentOptions.Reset = False;
 
   nxagentOptions.RootX = 0;
   nxagentOptions.RootY = 0;
@@ -107,7 +109,7 @@ void nxagentInitOptions(void)
   nxagentOptions.ViewportXSpan = 0;
   nxagentOptions.ViewportYSpan = 0;
 
-  nxagentOptions.DesktopResize = 1;
+  nxagentOptions.DesktopResize = True;
 
   nxagentOptions.Ratio  = DONT_SCALE;
   nxagentOptions.XRatio = DONT_SCALE;
@@ -117,25 +119,25 @@ void nxagentInitOptions(void)
   nxagentOptions.FloatXRatio = 1.0;
   nxagentOptions.FloatYRatio = 1.0;
 
-  nxagentOptions.UseDamage = 1;
+  nxagentOptions.UseDamage = True;
 
-  nxagentOptions.Binder = UNDEFINED;
+  nxagentOptions.Binder = False;
   nxagentOptions.BinderOptions = NULL;
 
-  nxagentOptions.Xdmcp = 0;
+  nxagentOptions.Xdmcp = False;
 
   nxagentOptions.DisplayBuffer  = UNDEFINED;
   nxagentOptions.DisplayCoalescence = 0;
 
-  nxagentOptions.Composite = 1;
+  nxagentOptions.Composite = True;
 
-  nxagentOptions.IgnoreVisibility = 0;
+  nxagentOptions.IgnoreVisibility = False;
 
-  nxagentOptions.ViewOnly = 0;
+  nxagentOptions.ViewOnly = False;
 
-  nxagentOptions.Adaptive = 0;
+  nxagentOptions.Adaptive = False;
 
-  nxagentOptions.Streaming = 0;
+  nxagentOptions.Streaming = False;
 
   nxagentOptions.DeferLevel   = UNDEFINED;
   nxagentOptions.DeferTimeout = 200;
@@ -143,19 +145,19 @@ void nxagentInitOptions(void)
   nxagentOptions.TileWidth  = UNDEFINED;
   nxagentOptions.TileHeight = UNDEFINED;
 
-  nxagentOptions.Menu = 1;
+  nxagentOptions.Menu = True;
 
-  nxagentOptions.MagicPixel = 1;
+  nxagentOptions.MagicPixel = True;
 
   nxagentOptions.ClientOs = UNDEFINED;
 
-  nxagentOptions.InhibitXkb = 1;
+  nxagentOptions.InhibitXkb = True;
 
   nxagentOptions.CopyBufferSize = COPY_UNLIMITED;
 
   nxagentOptions.ImageRateLimit = 0;
 
-  nxagentOptions.Xinerama = 1;
+  nxagentOptions.Xinerama = True;
 
   nxagentOptions.SleepTimeMillis = DEFAULT_SLEEP_TIME_MILLIS;