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

Attributes GH PR #1007: #1007

Author: sunweaver

nx-X11/programs/Xserver/composite/compext.c

@@ -39,6 +39,7 @@ static DevPrivateKeyRec CompositeClientPrivateKeyRec;
 
 #define CompositeClientPrivateKey (&CompositeClientPrivateKeyRec)
 #else /* !defined(NXAGENT_SERVER) */
+#include "../hw/nxagent/Options.h"
 static int CompositeClientPrivIndex = -1;
 #endif /* !defined(NXAGENT_SERVER) */
 
@@ -623,6 +624,11 @@ CompositeExtensionInit (void)
     /* Assume initialization is going to fail */
     noCompositeExtension = TRUE;
 
+#ifdef NXAGENT_SERVER
+    if (!nxagentOption(Composite))
+      return;
+#endif
+
     fprintf(stderr, "COMPOSITE: trying to initialize extension.\n");
 
     for (s = 0; s < screenInfo.numScreens; s++) {

nx-X11/programs/Xserver/hw/nxagent/Args.c

@@ -197,10 +197,12 @@ int ddxProcessArgument(int argc, char *argv[], int i)
     nxagentProgName = strdup(basename(basec));
     SAFE_free(basec);
 
+#ifdef X2GO
     /*
      * Check if we are running as X2Go Agent
      */
     checkX2goAgent();
+#endif
   }
 
   #ifdef TEST
@@ -691,6 +693,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
     {
       SAFE_free(nxagentKeyboard);
 
+#ifdef X2GO
       if (nxagentX2go && strcmp(argv[i], "null/null") == 0)
       {
         #ifdef TEST
@@ -701,6 +704,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
         nxagentKeyboard = strdup("clone");
       }
       else
+#endif
       {
         nxagentKeyboard = strdup(argv[i]);
       }
@@ -733,6 +737,14 @@ int ddxProcessArgument(int argc, char *argv[], int i)
     return 1;
   }
 
+  /* the composite extension is disabled by default so we provide a
+     way to enable it */
+  if (!strcmp(argv[i], "-composite"))
+  {
+    nxagentChangeOption(Composite, True);
+    return 1;
+  }
+
   if (!strcmp(argv[i], "-nodamage"))
   {
     nxagentChangeOption(UseDamage, False);
@@ -1775,11 +1787,13 @@ N/A
 
     if (*nxagentWindowName == '\0')
     {
-      if(nxagentX2go)
+#ifdef X2GO
+      if (nxagentX2go)
       {
         snprintf(nxagentWindowName, NXAGENTWINDOWNAMELENGTH, "X2Go Agent");
       }
       else
+#endif
       {
         snprintf(nxagentWindowName, NXAGENTWINDOWNAMELENGTH, "NX Agent");
       }
@@ -1870,11 +1884,11 @@ N/A
         fprintf(stderr, "nxagentPostProcessArgs: WARNING! Using backward compatible alpha encoding.\n");
         #endif
 
-        nxagentAlphaCompat = 1;
+        nxagentAlphaCompat = True;
       }
       else
       {
-        nxagentAlphaCompat = 0;
+        nxagentAlphaCompat = False;
       }
 
       nxagentRemoteMajor = remoteMajor;
@@ -1984,16 +1998,16 @@ FIXME: In rootless mode the backing-store support is not functional yet.
 */
     if (nxagentOption(Rootless))
     {
-      enableBackingStore = 0;
+      enableBackingStore = FALSE;
     }
     else if (nxagentOption(BackingStore) == BackingStoreUndefined ||
                  nxagentOption(BackingStore) == BackingStoreForce)
     {
-      enableBackingStore = 1;
+      enableBackingStore = TRUE;
     }
     else if (nxagentOption(BackingStore) == BackingStoreNever)
     {
-      enableBackingStore = 0;
+      enableBackingStore = FALSE;
     }
 
     /*
@@ -2098,9 +2112,13 @@ void ddxUseMsg(void)
   ErrorF("-autodpi               detect real server's DPI and use that in the session\n");
   ErrorF("-display string        display name of the real server\n");
   ErrorF("-sync                  synchronize with the real server\n");
+  ErrorF("-nxrealwindowprop      set property NX_REAL_WINDOW for each X11 window inside nxagent\n");
+  ErrorF("-reportwids            report externally exposed X11 window IDs to the session log\n");
+  ErrorF("-reportprivatewids     report internal X11 window ID to the session log\n");
 #ifdef RENDER
   ErrorF("-norender              disable the use of the render extension\n");
-  ErrorF("-nocomposite           disable the use of the composite extension\n");
+  ErrorF("-nocomposite           disable the use of the composite extension (default)\n");
+  ErrorF("-composite             enable the use of the composite extension\n");
 #endif
   ErrorF("-nopersistent          disable disconnection/reconnection to the X display on SIGHUP\n");
   ErrorF("-noshmem               disable use of shared memory extension\n");
@@ -2114,6 +2132,7 @@ void ddxUseMsg(void)
   ErrorF("-irlimit               maximum image data rate to the encoder input in kB/s.\n");
   ErrorF("-tile WxH              maximum size of image tiles (minimum allowed: 32x32)\n");
   ErrorF("-keystrokefile file    file with keyboard shortcut definitions\n");
+  ErrorF("-options file|string   path to an options file or an option string (for testing/debugging)\n");
   ErrorF("-verbose               print more warning and error messages\n");
   ErrorF("-D                     enable desktop mode\n");
   ErrorF("-R                     enable rootless mode\n");

nx-X11/programs/Xserver/hw/nxagent/Atoms.c

@@ -89,9 +89,12 @@ static char *nxagentAtomNames[NXAGENT_NUMBER_OF_ATOMS + 1] =
   "WM_NX_READY",                 /*  3 */
       /* nxagent takes the ownership of the selection with this name
          to signal the nxclient (or any other watching program)
-         it is ready. */
+         it is ready. This is only used if NXAGENT_ONSTART is defined.
+         We cannot enclose it in #ifdef here because we use the numeric
+         indices to this structure at multiple places. */
   "MCOPGLOBALS",                 /*  4 */
-      /* used for artsd support. */
+      /* used for artsd support. Only used if compiled with
+         NXAGENT_ARTSD */
   "NX_CUT_BUFFER_SERVER",        /*  5 */
       /* this is the name of a property on nxagent's window on the
          real X server. This property is used for passing clipboard

nx-X11/programs/Xserver/hw/nxagent/Clipboard.c

@@ -2237,6 +2237,7 @@ Bool nxagentInitClipboard(WindowPtr pWin)
     nxagentXFixesInfo.Initialized = True;
   }
 
+#ifdef NXAGENT_ONSTART
   /*
      The first paste from CLIPBOARD did not work directly after
      session start. Removing this code makes it work. It is unsure why
@@ -2247,6 +2248,7 @@ Bool nxagentInitClipboard(WindowPtr pWin)
 
   if (nxagentSessionId[0])
   {
+    // nxagentAtoms[10] is the CLIPBOARD atom
     #ifdef TEST
     fprintf(stderr, "%s: setting the ownership of %s to %lx"
                 " and registering for PropertyChangeMask events\n", __func__,
@@ -2258,6 +2260,7 @@ Bool nxagentInitClipboard(WindowPtr pWin)
     nxagentChangeWindowAttributes(pWin, CWEventMask);
   }
   */
+#endif
 
   if (nxagentReconnectTrap)
   {

nx-X11/programs/Xserver/hw/nxagent/Composite.c

@@ -47,15 +47,15 @@
  * Set if the composite extension is supported by the remote display.
  */
 
-int nxagentCompositeEnable = UNDEFINED;
+Bool nxagentCompositeEnable = False;
 
 void nxagentCompositeExtensionInit(void)
 {
   /*
    * Set the flag only if the initialization completes.
    */
 
-  nxagentCompositeEnable = 0;
+  nxagentCompositeEnable = False;
 
   if (nxagentOption(Composite))
   {
@@ -96,7 +96,7 @@ void nxagentCompositeExtensionInit(void)
       fprintf(stderr, "nxagentCompositeExtensionInit: Enabling the use of the composite extension.\n");
       #endif
 
-      nxagentCompositeEnable = 1;
+      nxagentCompositeEnable = True;
     }
     #ifdef TEST
     else
@@ -115,8 +115,7 @@ void nxagentCompositeExtensionInit(void)
 
 void nxagentRedirectDefaultWindows(void)
 {
-  if (nxagentOption(Rootless) ||
-          nxagentCompositeEnable == 0)
+  if (nxagentOption(Rootless) || !nxagentCompositeEnable)
   {
     #ifdef TEST
     fprintf(stderr, "nxagentRedirectDefaultWindows: Not redirecting default "
@@ -140,10 +139,10 @@ void nxagentRedirectDefaultWindows(void)
 
     /*
      * When trying to redirect only the top level window, and not the
-     * subwindows, we incur in a strange be- haviour. The top level is
-     * unmapped, mapped, unmap- ped and then reparented. This at first
+     * subwindows, we incur in a strange behaviour. The top level is
+     * unmapped, mapped, unmapped and then reparented. This at first
      * makes the agent think that the window manager is gone, then the
-     * agent window disappears. To make thinks even more weird, this
+     * agent window disappears. To make things even more weird, this
      * happens only at reconnection.
      */
 
@@ -154,8 +153,7 @@ void nxagentRedirectDefaultWindows(void)
 
 void nxagentRedirectWindow(WindowPtr pWin)
 {
-  if (!nxagentOption(Rootless) ||
-          nxagentCompositeEnable == 0)
+  if (!nxagentOption(Rootless) || !nxagentCompositeEnable)
   {
     #ifdef TEST
     fprintf(stderr, "nxagentRedirectWindow: Not redirecting window id [%ld] "

nx-X11/programs/Xserver/hw/nxagent/Composite.h

@@ -31,7 +31,7 @@
  * its use is enabled.
  */
 
-extern int nxagentCompositeEnable;
+extern Bool nxagentCompositeEnable;
 
 /*
  * Query the composite extension on the

nx-X11/programs/Xserver/hw/nxagent/Display.c

@@ -92,7 +92,9 @@ is" without express or implied warranty.
 #include "compext/Compext.h"
 
 #include NXAGENT_ICON_NAME
+#ifdef X2GO
 #include X2GOAGENT_ICON_NAME
+#endif
 
 /*
  * Set here the required log level.
@@ -1849,6 +1851,7 @@ Bool nxagentMakeIcon(Display *disp, Pixmap *nxIcon, Pixmap *nxMask)
 {
   char** agentIconData;
 
+#ifdef X2GO
   /*
    * selecting x2go icon when running as X2Go agent
    */
@@ -1857,6 +1860,7 @@ Bool nxagentMakeIcon(Display *disp, Pixmap *nxIcon, Pixmap *nxMask)
     agentIconData = x2goagentIconData;
   }
   else
+#endif
   {
     agentIconData = nxagentIconData;
   }