lstopo/draw: don't show the interactive usage again on refresh

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

utils/lstopo/lstopo-cairo.c

@@ -365,7 +365,8 @@ output_x11(struct lstopo_output *loutput, const char *dummy __hwloc_attribute_un
 
   XMapWindow(dpy, top);
 
-  lstopo_show_interactive_help();
+  if (!loutput->refreshing)
+    lstopo_show_interactive_help();
 
   /* ready */
   declare_colors(loutput);

utils/lstopo/lstopo-windows.c

@@ -440,6 +440,9 @@ output_windows (struct lstopo_output *loutput, const char *dummy __hwloc_attribu
     toplevel = CreateWindow("lstopo", loutput->title, WS_OVERLAPPEDWINDOW,
                             CW_USEDEFAULT, CW_USEDEFAULT,
                             10, 10, NULL, NULL, NULL, NULL);
+    assert(!loutput->refreshing);
+  } else {
+    assert(loutput->refreshing);
   }
 
   /* recurse once for preparing sizes and positions using a fake top level window */
@@ -491,7 +494,9 @@ output_windows (struct lstopo_output *loutput, const char *dummy __hwloc_attribu
   declare_colors(loutput);
   lstopo_prepare_custom_styles(loutput);
 
-  lstopo_show_interactive_help();
+  if (!loutput->refreshing)
+    lstopo_show_interactive_help();
+
   ShowWindow(toplevel, SW_SHOWDEFAULT);
   InvalidateRect(toplevel, NULL, 1); /* make sure UpdateWindow() will update something when refreshing the topology */
   UpdateWindow(toplevel);

utils/lstopo/lstopo.c

@@ -664,6 +664,8 @@ main (int argc, char *argv[])
 
   hwloc_utils_check_api_version(callname);
 
+  loutput.refreshing = 0;
+
   loutput.overwrite = 0;
 
   loutput.index_type = LSTOPO_INDEX_TYPE_DEFAULT;
@@ -1498,8 +1500,10 @@ main (int argc, char *argv[])
 
   hwloc_topology_destroy (topology);
 
-  if (loutput.needs_topology_refresh)
+  if (loutput.needs_topology_refresh) {
+    loutput.refreshing = 1;
     goto refresh;
+  }
 
   for(i=0; i<loutput.legend_append_nr; i++)
     free(loutput.legend_append[i]);

utils/lstopo/lstopo.h

@@ -44,6 +44,8 @@ struct lstopo_output {
 
   /* when an interactive backends want a refresh of the topology */
   int needs_topology_refresh;
+  /* when actually doing a refresh */
+  int refreshing;
 
   /* file config */
   FILE *file;