Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maximize: randr: assign correct monitor to window #812

Merged
merged 1 commit into from
Jan 20, 2023
Merged

maximize: randr: assign correct monitor to window #812

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion fvwm/move_resize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5078,6 +5078,8 @@ static void maximize_fvwm_window(
* maximized window is moved more than the screen width/height. */
fw->g.max_offset.x = fw->g.normal.x - fw->g.max.x;
fw->g.max_offset.y = fw->g.normal.y - fw->g.max.y;

update_fvwm_monitor(fw);
#if 0
fprintf(stderr,"%d %d %d %d, g.max_offset.x = %d, g.max_offset.y = %d, %d %d %d %d\n", fw->g.max.x, fw->g.max.y, fw->g.max.width, fw->g.max.height, fw->g.max_offset.x, fw->g.max_offset.y, fw->g.normal.x, fw->g.normal.y, fw->g.normal.width, fw->g.normal.height);
#endif
Expand Down Expand Up @@ -5216,13 +5218,30 @@ void CMD_Maximize(F_CMD_ARGS)

if (!is_screen_given)
{
fscreen_scr_arg fscr;
fscreen_scr_arg fscr;
struct monitor *possibly_new_monitor = NULL;

fscr.xypos.x = fw->g.frame.x + fw->g.frame.width / 2 - page.x;
fscr.xypos.y = fw->g.frame.y + fw->g.frame.height / 2 - page.y;
FScreenGetScrRect(
&fscr, FSCREEN_XYPOS, &scr.x, &scr.y,
&scr.width, &scr.height);

/*
* Check if we need to assign fw to a new monitor. When
* selecting the monitor to maximize this window on, the above
* FScreenGetScrRect() call could choose a different monitor.
*
* However, the monitor information used when updating the EWMH
* work area intersection takes its information from the
* montior the window is currently assigned to.
*
* If they differ, assign the new monitor so the correct
* offets are used.
*/
possibly_new_monitor = FindScreenOfXY(scr.x, scr.y);
if (possibly_new_monitor != fw->m)
fw->m = possibly_new_monitor;
}

if (!ignore_working_area)
Expand Down