diff --git a/fvwm/update.c b/fvwm/update.c index 556e1c8ea..fbef3858d 100644 --- a/fvwm/update.c +++ b/fvwm/update.c @@ -679,6 +679,7 @@ Bool update_fvwm_monitor(FvwmWindow *fw) EWMH_SetCurrentDesktop(fw->m); desk_add_fw(fw); BroadcastConfig(M_CONFIGURE_WINDOW, fw); + BroadcastMonitorList(NULL); return True; } @@ -785,4 +786,4 @@ void CMD_UpdateStyles(F_CMD_ARGS) } return; -} +} \ No newline at end of file diff --git a/modules/FvwmPager/FvwmPager.c b/modules/FvwmPager/FvwmPager.c index 77b8376a5..2f24c9293 100644 --- a/modules/FvwmPager/FvwmPager.c +++ b/modules/FvwmPager/FvwmPager.c @@ -1555,21 +1555,16 @@ void list_config_info(unsigned long *body) DrawGrid(val, True, None, NULL); } else if (StrEquals(token, "Monitor")) { char *mname; - int updated = 0; tline = GetNextToken(tline, &mname); TAILQ_FOREACH(m2, &fp_monitor_q, entry) { - updated = 0; if (strcmp(m2->name, mname) == 0) { extract_monitor_config(m2,tline); - updated = 1; + return; } } - if (updated) - return; - m = fxcalloc(1, sizeof(*m)); m->name = fxstrdup(mname); @@ -1863,21 +1858,16 @@ ImagePath = NULL; } else if (StrEquals(token, "Monitor")) { char *mname; - int updated = 0; next = GetNextToken(next, &mname); TAILQ_FOREACH(m2, &fp_monitor_q, entry) { - updated = 0; if (strcmp(m2->name, mname) == 0) { extract_monitor_config(m2, next); - updated = 1; + return; } } - if (updated) - continue; - m = fxcalloc(1, sizeof(*m)); m->name = fxstrdup(mname); @@ -2463,4 +2453,4 @@ void ExitPager(void) } XUngrabKeyboard(dpy, CurrentTime); exit(0); -} +} \ No newline at end of file diff --git a/modules/FvwmPager/x_pager.c b/modules/FvwmPager/x_pager.c index 6a6101f58..f19d14a5f 100644 --- a/modules/FvwmPager/x_pager.c +++ b/modules/FvwmPager/x_pager.c @@ -1898,8 +1898,7 @@ void SwitchToDesk(int Desk) struct fpmonitor *m = fpmonitor_this(); snprintf(command, sizeof(command), - "GotoDesk %s 0 %d", monitor_to_track ? m->name : "", - Desk + desk1); + "GotoDesk %s 0 %d", m->name, Desk + desk1); SendText(fd,command,0); } @@ -3427,4 +3426,4 @@ void change_colorset(int colorset) } return; -} +} \ No newline at end of file