fvwmorg · ThomasAdam · Apr 6, 2024 · Apr 6, 2024 · Apr 5, 2024 · Apr 5, 2024
diff --git a/doc/fvwm3_manpage_source.adoc b/doc/fvwm3_manpage_source.adoc
@@ -3905,7 +3905,7 @@ Move shuffle Up Left
 *Move* can be used to moved a window to a specified position:
 +
 
-> *Move* [screen _S_] \[w | m | v]_x_[p | w] \[w | m | v]_y_[p | w] [Warp] [ewmhiwa]
+> *Move* [screen _S_] [desk _N_] \[w | m | v]_x_[p | w] \[w | m | v]_y_[p | w] [Warp] [ewmhiwa]
 
 +
 This will move the window to the _x_ and _y_ position (see below).
@@ -3920,6 +3920,13 @@ screen. The width and height of the screen are used for the
 calculations instead of the display dimensions. The _screen_ is
 interpreted as in the *MoveToScreen* command.
 +
+If the literal option _desk_ followed by a desk number _N_ is specified,
+place the window on the specified desk after it has been moved. This can
+serve two purposes, first you can move a window's position and desk in a
+single command. Second when a window is moved between monitors, its desk
+is updated to be the same as the new monitor. This option can override
+that behavior by specifying which desk the window should end up on.
++
 The positional arguments _x_ and _y_ can specify an absolute or relative
 position from either the left/top or right/bottom of the screen. By default,
 the numeric value given is interpreted as a percentage of the screen

diff --git a/fvwm/add_ 8000 window.c b/fvwm/add_ 8000 window.c
@@ -2435,6 +2435,7 @@ FvwmWindow *AddWindow(
 	setup_key_and_button_grabs(fw);
 
 	/****** inform modules of new window ******/
+	fw->UpdateDesk = -1; /* Initialize to ensure desk update. */
 	update_fvwm_monitor(fw);
 	BroadcastConfig(M_ADD_WINDOW,fw);
 	BroadcastWindowIconNames(fw, True, False);

diff --git a/fvwm/fvwm.h b/fvwm/fvwm.h
@@ -831,6 +831,8 @@ typedef struct FvwmWindow
 	int FocusDesk;
 	/* Desk to deiconify to, for StubbornIcons */
 	int DeIconifyDesk;
+	/* If not negative, this is the desk update_fvwm_monitor will use. */
+	int UpdateDesk;
 
 	char *mini_pixmap_file;
 	FvwmPicture *mini_icon;

diff --git a/fvwm/move_resize.c b/fvwm/move_resize.c
@@ -750,6 +750,16 @@ int GetMoveArguments(FvwmWindow *fw,
 			&scr_w, &scr_h);
 		action = GetNextToken(action, &s1);
 	}
+	if (s1 && StrEquals(s1, "desk"))
+	{
+		int desk;
+
+		free(s1);
+		token = PeekToken(action, &action);
+		if (sscanf(token, "%d", &desk) && desk >= 0)
+			fw->UpdateDesk = desk;
+		action = GetNextToken(action, &s1);
+	}
 	action = GetNextToken(action, &s2);
 	while (!global_flag_parsed)
 	{

diff --git a/fvwm/update.c b/fvwm/update.c
@@ -671,11 +671,43 @@ Bool update_fvwm_monitor(FvwmWindow *fw)
 	mnew = FindScreenOfXY(g.x, g.y);
 
 	/* Avoid unnecessary updates. */
-	if (mnew == fw->m)
+	if (mnew == fw->m && fw->UpdateDesk < 0)
 		return False;
-	fw->m_prev = fw->m;
-	fw->m = mnew;
-	fw->Desk = mnew->virtual_scr.CurrentDesk;
+
+	if (fw->UpdateDesk < 0) {
+		fw->Desk = mnew->virtual_scr.CurrentDesk;
+		goto out;
+	}
+
+	int old_desk, new_desk;
+	old_desk = new_desk = mnew->virtual_scr.CurrentDesk;
+	if (fw->m != mnew && fw->m != NULL)
+		old_desk = fw->m->virtual_scr.CurrentDesk;
+
+	/* Map/Unmap windows based on initial and final desk. */
+	if (fw->Desk == old_desk && fw->UpdateDesk != new_desk)
+	{
+		unmap_window(fw);
+		SET_FULLY_VISIBLE(fw, 0);
+		SET_PARTIALLY_VISIBLE(fw, 0);
+	}
+	else if (fw->Desk != old_desk && fw->UpdateDesk == new_desk)
+	{
+		/* If its an icon, auto-place it */
+		if (IS_ICONIFIED(fw))
+		{
+		AutoPlaceIcon(fw, NULL, True);
+		}
+		map_window(fw);
+	}
+	fw->Desk = fw->UpdateDesk;
+	fw->UpdateDesk = -1;
+
+out:
+	if (fw->m != mnew) {
+		fw->m_prev = fw->m;
+		fw->m = mnew;
+	}
 	EWMH_SetCurrentDesktop(fw->m);
 	desk_add_fw(fw);
 	BroadcastConfig(M_CONFIGURE_WINDOW, fw);

diff --git a/fvwm/virtual.c b/fvwm/virtual.c
@@ -397,7 +397,7 @@ static int GetDeskNumber(struct monitor *mon, char *action, int current_desk)
  * Unmaps a window on transition to a new desktop
  *
  */
-static void unmap_window(FvwmWindow *t)
+void unmap_window(FvwmWindow *t)
 {
 	XWindowAttributes winattrs;
 	unsigned long eventMask = 0;
@@ -453,7 +453,7 @@ static void unmap_window(FvwmWindow *t)
  * Maps a window on transition to a new desktop
  *
  */
-static void map_window(FvwmWindow *t)
+void map_window(FvwmWindow *t)
 {
 	XWindowAttributes winattrs;
 	unsigned long eventMask = 0;

diff --git a/fvwm/virtual.h b/fvwm/virtual.h
@@ -16,6 +16,8 @@ Bool is_pan_frame(Window w);
 void MoveViewport(struct monitor *, int newx, int newy,Bool);
 void goto_desk(int desk, struct monitor *);
 void do_move_window_to_desk(FvwmWindow *fw, int desk);
+void unmap_window(FvwmWindow *t);
+void map_window(FvwmWindow *t);
 Bool get_page_arguments(FvwmWindow *, char *action, int *page_x, int *page_y,
     struct monitor **);
 char *GetDesktopName(struct monitor *, int desk);