From 533d3366be223ddd3083e91f9d9833260440db0f Mon Sep 17 00:00:00 2001 From: Thomas Adam Date: Mon, 25 Mar 2024 18:15:35 +0000 Subject: [PATCH] shared mode: fix internal commands Since `DesktopConfiguration shared` uses internal fvwm commands, these need updating to make use of changed syntax. --- fvwm/move_resize.c | 2 +- fvwm/virtual.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fvwm/move_resize.c b/fvwm/move_resize.c index 73dfb67ee..e4621fe48 100644 --- a/fvwm/move_resize.c +++ b/fvwm/move_resize.c @@ -2093,7 +2093,7 @@ static void _move_window(F_CMD_ARGS, Bool do_animate, int mode) } /* It's possible that we've received a command such as: * - * MoveToPage HDMI2 0 1 + * MoveToPage screen HDMI2 0 1 * * In which case, move the window to the selected monitor, * first. diff --git a/fvwm/virtual.c b/fvwm/virtual.c index 51e3493c7..5f2bca73b 100644 --- a/fvwm/virtual.c +++ b/fvwm/virtual.c @@ -78,7 +78,7 @@ char *cmd; \ xasprintf(&cmd, \ "All (!Screen %s, Desk %d, CurrentPage, !CirculateHit) "\ - "MoveToPage %s $[w.pagex] $[w.pagey]", \ + "MoveToPage screen %s $[w.pagex] $[w.pagey]", \ (m)->si->name, (d), (m)->si->name); \ execute_function_override_window( \ NULL, NULL, cmd, NULL, 0, NULL); \ @@ -626,7 +626,7 @@ static void MapDesk(struct monitor *m, int desk, Bool grab) m->virtual_scr.CurrentDesk); xasprintf(&cmd, - "MoveToPage %s $[w.pagex] $[w.pagey]", + "MoveToPage screen %s $[w.pagex] $[w.pagey]", m->si->name); /* execute_function_override_window() @@ -2764,7 +2764,7 @@ void CMD_MoveToDesk(F_CMD_ARGS) RB_FOREACH(m, monitors, &monitor_q) { if (m->virtual_scr.CurrentDesk == desk) { xasprintf(&cmd, - "MoveToPage %s $[w.pagex] $[w.pagey]", + "MoveToPage screen %s $[w.pagex] $[w.pagey]", m->si->name); execute_function_override_window( NULL, NULL, cmd, NULL, 0, fw);