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

ConfigWinPacket: no longer send monitor_name #1074

Merged
merged 1 commit into from
Oct 17, 2024
Merged

ConfigWinPacket: no longer send monitor_name #1074

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: 0 additions & 2 deletions fvwm/module_interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,6 @@ action_flags *_get_allowed_actions(const FvwmWindow *fw)
(unsigned long)(0), \
&(*(_fw))->m->si->rr_output, \
(unsigned long)(sizeof(unsigned long)),\
(*(_fw))->m->si->name, \
(unsigned long)(0), \
&(*(_fw))->layer, \
(unsigned long)(0), \
&(*(_fw))->hints.base_width, \
Expand Down
1 change: 0 additions & 1 deletion libs/vpacket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ typedef struct ConfigWinPacket
unsigned long frame_height;
unsigned long desk;
unsigned long monitor_id;
unsigned long monitor_name;
unsigned long layer;
unsigned long hints_base_width;
unsigned long hints_base_height;
Expand Down
11 changes: 10 additions & 1 deletion modules/FvwmIconMan/fvwm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,16 @@ WinData *id_to_win(Ulong id)

static void set_win_configuration(WinData *win, FvwmPacketBody *body)
{
copy_string(&win->monitor, (char *)&(body->add_config_data.monitor_name));
struct monitor *m = monitor_by_output(body->add_config_data.monitor_id);

if (m == NULL) {
fprintf(stderr,
"FvwmIconMan: %s: couldn't find mon with id: %ld\n",
__func__, body->add_config_data.monitor_id);
copy_string(&win->monitor, "Unknown");
} else
copy_string(&win->monitor, m->si->name);

win->desknum = body->add_config_data.desk;
win->x = body->add_config_data.frame_x;
win->y = body->add_config_data.frame_y;
Expand Down
Loading