Screen.c: improve output of nxagentPrintAgentGeometry

2 files changed, 15 insertions, 11 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 4db4785df..18e5410a0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -780,32 +780,36 @@ void nxagentPrintAgentGeometry(char *hdrMessage, char *prefix)
 
   if (hdrMessage)
   {
-    fprintf(stderr, "--------------- %s -----------------.\n", hdrMessage);
+    fprintf(stderr, "%s /--------------- %s -----------------.\n", prefix, hdrMessage);
   }
 
-  fprintf(stderr, "%s Root window at offset (%d,%d) size (%d,%d).\n", prefix,
+  fprintf(stderr, "%s | Root window at offset (%d,%d) size (%d,%d).\n", prefix,
               nxagentOption(RootX), nxagentOption(RootY),
                   nxagentOption(RootWidth), nxagentOption(RootHeight));
 
-  fprintf(stderr, "%s Default window at offset (%d,%d) size (%d,%d) border size %d.\n", prefix,
+  fprintf(stderr, "%s | Default window at offset (%d,%d) size (%d,%d) border size %d.\n", prefix,
               nxagentOption(X), nxagentOption(Y), nxagentOption(Width), nxagentOption(Height),
                   nxagentOption(BorderWidth));
 
-  fprintf(stderr, "%s Span between root window and default window is (%d,%d).\n", prefix,
+  fprintf(stderr, "%s | Span between root window and default window is (%d,%d).\n", prefix,
               nxagentOption(ViewportXSpan), nxagentOption(ViewportYSpan));
 
-  fprintf(stderr, "%s Default window in window mode has offset (%d,%d) and size (%d,%d).\n", prefix,
+  fprintf(stderr, "%s | Default window in window mode has offset (%d,%d) and size (%d,%d).\n", prefix,
               nxagentOption(SavedX), nxagentOption(SavedY), nxagentOption(SavedWidth), nxagentOption(SavedHeight));
 
-  fprintf(stderr, "%s Fullscreen is %s.\n", prefix,
+  fprintf(stderr, "%s | Fullscreen is %s.\n", prefix,
               nxagentOption(Fullscreen) ? "ON" : "OFF");
 
-  fprintf(stderr, "%s Desktop resize mode is %s.\n", prefix,
+  fprintf(stderr, "%s | Desktop resize mode is %s.\n", prefix,
               nxagentOption(DesktopResize) ? "ON" : "OFF");
 
-  fprintf(stderr, "%s Resize desktop at startup is %s.\n", prefix,
+  fprintf(stderr, "%s | Resize desktop at startup is %s.\n", prefix,
               nxagentResizeDesktopAtStartup ? "ON" : "OFF");
 
+  if (hdrMessage)
+  {
+    fprintf(stderr, "%s \\--------------- %s -----------------.\n", prefix, hdrMessage);
+  }
   #endif
 }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 97c4700e4..f528696d8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -417,7 +417,7 @@ Bool nxagentCreateWindow(WindowPtr pWin)
   #endif
 
   #ifdef TEST
-  fprintf(stderr, "nxagentCreateWindow: Created new window with id [0x%x].\n",
+  fprintf(stderr, "%s: Created new window with id [0x%x].\n", __func__,
               nxagentWindowPriv(pWin)->window);
   #endif
 
@@ -817,7 +817,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn)
     for (i = 0; i < 100 && nxagentWMIsRunning; i++)
     {
       #ifdef TEST
-      fprintf(stderr, "nxagentSwitchAllScreens: WARNING! Going to wait for the ReparentNotify event.\n");
+      fprintf(stderr, "%s: WARNING! Going to wait for the ReparentNotify event.\n", __func__);
       #endif
 
       if (XCheckTypedWindowEvent(nxagentDisplay, w, ReparentNotify, &e))
@@ -920,7 +920,7 @@ void nxagentSwitchAllScreens(ScreenPtr pScreen, Bool switchOn)
        */
 
       #ifdef WARNING
-      fprintf(stderr, "nxagentSwitchAllScreens: WARNING! Expected ReparentNotify event missing.\n");
+      fprintf(stderr, "%s: WARNING! Expected ReparentNotify event missing.\n", __func__);
       #endif
 
       nxagentWMIsRunning = False;