desk_add: fix window counting

When counting windows on desks, use the window's desk assignment, rather than the screen's current desk. This should fix window counting with SkipMapping.
fvwmorg · Oct 9, 2022 · 3f71650 · 3f71650
1 parent 62b9eb7
commit 3f71650
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/fvwm/placement.c b/fvwm/placement.c
@@ -2436,6 +2436,8 @@ Bool setup_window_placement(
 		__explain_placement(fw, &reason);
 	}
 
+	desk_add_fw(fw);
+
 	return (rc == 0) ? False : True;
 }
 

diff --git a/fvwm/virtual.c b/fvwm/virtual.c
@@ -36,6 +36,7 @@
 #include "eventmask.h"
 #include "misc.h"
 #include "screen.h"
+#include "update.h"
 #include "virtual.h"
 #include "module_interface.h"
 #include "module_list.h"
@@ -2964,7 +2965,7 @@ desk_add_fw(FvwmWindow *fw)
 	if (fw == NULL)
 		return;
 
-	desk = fw->m->virtual_scr.CurrentDesk;
+	desk = fw->Desk;
 
 	if (TAILQ_EMPTY(&desktop_fvwm_q))
 		TAILQ_INIT(&desktop_fvwm_q);
-Original file line number
+Diff line change
@@ Expand Up / @@ -2436,6 +2436,8 @@ Bool setup_window_placement( @@
     		__explain_placement(fw, &reason);
     	}
+    	desk_add_fw(fw);
     	return (rc == 0) ? False : True;
     }
@@ Expand Down @@