Screen.c: Rename NX_USE_MODE_PREFIX to NXAGENT_RANDR_MODE_PREFIX, fix unclosed comment.

nx-X11/programs/Xserver/hw/nxagent/Imakefile

@@ -179,6 +179,7 @@ INCLUDES = -I. -I$(XBUILDINCDIR) \
 # NXAGENT_CLIPBOARD                Enables clipboard cut and paste function between X servers.
 # NXAGENT_FONTEXCLUDE              Exclude some specific font names (only "-ult1mo" at this moment).
 # NXAGENT FULLSCREEN               Fullscreen mode
+# NXAGENT_RANDR_MODE_PREFIX        Use prefixed (i.e., nx_<x>x<y>) RandR modes
 #
 
 #if nxVersion
@@ -203,6 +204,7 @@ DEFINES = -g $(OS_DEFINES) $(EXT_DEFINES) $(NX_DEFINES) \
           -DNXAGENT_ONSTART \
           -DNXAGENT_SPLASH \
           -DNXAGENT_ARTSD \
+          -DNXAGENT_RANDR_MODE_PREFIX \
           -UNX_DEBUG_INPUT \
 	  -DRANDR_10_INTERFACE \
 	  -DRANDR_12_INTERFACE \

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

@@ -3926,13 +3926,12 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
 
         memset(&modeInfo, '\0', sizeof(modeInfo));
 
-#ifdef NX_USE_MODE_PREFIX
+#ifdef NXAGENT_RANDR_MODE_PREFIX
         /* avoid collisions with pre-existing default modes by using a
            separate namespace. If we'd simply use XxY we could not
            distinguish between pre-existing modes which should stay
            and our own modes that should be removed after use. */
-        sprintf(name, "nx_%dx%d", new_w, new_h);*/
-        /*sprintf(name, "nx%d", i+1);*/
+        sprintf(name, "nx_%dx%d", new_w, new_h);
 #else
         sprintf(name, "%dx%d", new_w, new_h);
 #endif