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

get_page_arguments: remove fw field #1120

Merged
merged 1 commit into from
Nov 26, 2024
Merged

get_page_arguments: remove fw field #1120

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion fvwm/move_resize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2157,7 +2157,7 @@ static void _move_window(F_CMD_ARGS, Bool do_animate, int mode)
get_absolute_geometry(fw, &t, &r);
get_page_offset_rectangle(fw, &page.x, &page.y, &t);

if (!get_page_arguments(fw, action, &page.x, &page.y, &m))
if (!get_page_arguments(action, &page.x, &page.y, &m))
{
m = fw->m;
page.x = m->virtual_scr.Vx;
Expand Down
7 changes: 3 additions & 4 deletions fvwm/virtual.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1768,9 +1768,8 @@ void do_move_window_to_desk(FvwmWindow *fw, int desk)
return;
}

Bool get_page_arguments(
FvwmWindow *fw, char *action, int *page_x, int *page_y,
struct monitor **mret)
Bool get_page_arguments(char *action, int *page_x, int *page_y,
struct monitor **mret)
{
int val[2];
int suffix[2];
Expand Down Expand Up @@ -2672,7 +2671,7 @@ void CMD_GotoPage(F_CMD_ARGS)

x = m->virtual_scr.Vx;
y = m->virtual_scr.Vy;
if (!get_page_arguments(fw, action, &x, &y, &mpa))
if (!get_page_arguments(action, &x, &y, &mpa))
{
fvwm_debug(__func__,
"GotoPage: invalid arguments: %s", action);
Expand Down
2 changes: 1 addition & 1 deletion fvwm/virtual.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ 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,
Bool get_page_arguments(char *action, int *page_x, int *page_y,
struct monitor **);
char *GetDesktopName(struct monitor *, int desk);

Expand Down