lstopo/windows: no need for a faketoplevel

Use the same window for computing the size and actually displaying the output.
We resize it before actually showing it.

By the way, it prevents from having to avoid the WM_DESTROY
of the fake window kill the program.

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

Author: bgoglin

utils/lstopo/lstopo-windows.c

@@ -301,9 +301,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)
       }
       break;
     case WM_DESTROY:
-      /* only kill the program if closing the actual toplevel, not the fake one */
-      if (hwnd == the_output.toplevel)
-	PostQuitMessage(0);
+      PostQuitMessage(0);
       return 0;
     case WM_SIZE: {
       win_width = LOWORD(lparam);
@@ -414,7 +412,7 @@ int
 output_windows (struct lstopo_output *loutput, const char *dummy __hwloc_attribute_unused)
 {
   WNDCLASS wndclass;
-  HWND toplevel, faketoplevel;
+  HWND toplevel;
   unsigned width, height;
   HFONT font;
   MSG msg;
@@ -425,9 +423,6 @@ output_windows (struct lstopo_output *loutput, const char *dummy __hwloc_attribu
   loutput->methods = &windows_draw_methods;
   loutput->backend_data = &the_output;
 
-  /* make sure WM_DESTROY on the faketoplevel won't kill the program */
-  the_output.toplevel = NULL;
-
   /* create the toplevel window, with random size for now */
   memset(&wndclass, 0, sizeof(wndclass));
   wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
@@ -440,16 +435,15 @@ output_windows (struct lstopo_output *loutput, const char *dummy __hwloc_attribu
 
   /* recurse once for preparing sizes and positions using a fake top level window */
   loutput->drawing = LSTOPO_DRAWING_PREPARE;
-  faketoplevel = CreateWindow("lstopo", loutput->title, WS_OVERLAPPEDWINDOW,
+  toplevel = CreateWindow("lstopo", loutput->title, WS_OVERLAPPEDWINDOW,
 			      CW_USEDEFAULT, CW_USEDEFAULT,
 			      10, 10, NULL, NULL, NULL, NULL);
-  BeginPaint(faketoplevel, &the_output.ps);
+  BeginPaint(toplevel, &the_output.ps);
   font = CreateFont(loutput->fontsize, 0, 0, 0, 0, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, NULL);
   SelectObject(the_output.ps.hdc, (HGDIOBJ) font);
   output_draw(loutput);
   DeleteObject(font);
-  EndPaint(faketoplevel, &the_output.ps);
-  DestroyWindow(faketoplevel);
+  EndPaint(toplevel, &the_output.ps);
   loutput->drawing = LSTOPO_DRAWING_DRAW;
 
   /* now create the actual toplevel with the sizes */
@@ -471,10 +465,9 @@ output_windows (struct lstopo_output *loutput, const char *dummy __hwloc_attribu
   if (win_height > GetSystemMetrics(SM_CYFULLSCREEN))
     win_height = GetSystemMetrics(SM_CYFULLSCREEN);
 
-  toplevel = CreateWindow("lstopo", loutput->title, WS_OVERLAPPEDWINDOW,
-		  CW_USEDEFAULT, CW_USEDEFAULT,
-		  win_width, win_height, NULL, NULL, NULL, NULL);
-  the_output.toplevel = toplevel;
+  ignore_wm_size = 1;
+  SetWindowPos(toplevel, HWND_TOP, 0, 0, win_width, win_height, SWP_NOCOPYBITS|SWP_NOMOVE|SWP_NOOWNERZORDER|SWP_NOZORDER);
+  ignore_wm_size = 0;
 
   the_width = width;
   the_height = height;
@@ -488,16 +481,15 @@ output_windows (struct lstopo_output *loutput, const char *dummy __hwloc_attribu
   needs_resize = 0;
   ignore_wm_size = 0;
 
-  /* and display the window */
-  ShowWindow(toplevel, SW_SHOWDEFAULT);
-
-  lstopo_show_interactive_help();
-
   /* ready */
   declare_colors(loutput);
   lstopo_prepare_custom_styles(loutput);
 
-  UpdateWindow(the_output.toplevel);
+  lstopo_show_interactive_help();
+  the_output.toplevel = toplevel;
+  ShowWindow(toplevel, SW_SHOWDEFAULT);
+  UpdateWindow(toplevel);
+
   while (!finish && GetMessage(&msg, NULL, 0, 0)) {
     TranslateMessage(&msg);
     DispatchMessage(&msg);