rayandrew/dwl
rayandrew/dwl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add restoremonitor

Browse source
This commit is contained in:
Ray Andrew 2024-09-28 15:30:12 -05:00
parent 2943b066f4
commit ec5427a43d
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dwl.c
View file

@ -125,6 +125,7 @@ struct Client {
unsigned int type; /* XDGShell or X11* */ unsigned int type; /* XDGShell or X11* */
struct wlr_box geom; /* layout-relative, includes border */ struct wlr_box geom; /* layout-relative, includes border */
Monitor *mon; Monitor *mon;
char *output;
struct wlr_scene_tree *scene; struct wlr_scene_tree *scene;
struct wlr_scene_rect *border[4]; /* top, bottom, left, right */ struct wlr_scene_rect *border[4]; /* top, bottom, left, right */
struct wlr_scene_tree *scene_surface; struct wlr_scene_tree *scene_surface;
@ -1327,6 +1328,7 @@ createmon(struct wl_listener *listener, void *data)
size_t i; size_t i;
struct wlr_output_state state; struct wlr_output_state state;
Monitor *m; Monitor *m;
Client *c;
if (!wlr_output_init_render(wlr_output, alloc, drw)) if (!wlr_output_init_render(wlr_output, alloc, drw))
return; return;
@ -1415,6 +1417,13 @@ createmon(struct wl_listener *listener, void *data)
wlr_output_layout_add_auto(output_layout, wlr_output); wlr_output_layout_add_auto(output_layout, wlr_output);
else else
wlr_output_layout_add(output_layout, wlr_output, m->m.x, m->m.y); wlr_output_layout_add(output_layout, wlr_output, m->m.x, m->m.y);
wl_list_for_each(c, &clients, link) {
if (strcmp(wlr_output->name, c->output) == 0) {
c->mon = m;
}
}
updatemons(NULL, NULL);
} }
void void
@ -1650,6 +1659,7 @@ destroynotify(struct wl_listener *listener, void *data)
wl_list_remove(&c->map.link); wl_list_remove(&c->map.link);
wl_list_remove(&c->unmap.link); wl_list_remove(&c->unmap.link);
} }
free(c->output);
free(c); free(c);
} }
@ -2532,6 +2542,10 @@ mapnotify(struct wl_listener *listener, void *data)
} else { } else {
applyrules(c); applyrules(c);
} }
c->output = strdup(c->mon->wlr_output->name);
if (c->output == NULL) {
die("oom");
}
printstatus(); printstatus();
unset_fullscreen: unset_fullscreen:
@ -3587,8 +3601,14 @@ void
tagmon(const Arg *arg) tagmon(const Arg *arg)
{ {
Client *sel = focustop(selmon); Client *sel = focustop(selmon);
if (sel) if (!sel)
return;
setmon(sel, dirtomon(arg->i), 0); setmon(sel, dirtomon(arg->i), 0);
free(sel->output);
sel->output = strdup(sel->mon->wlr_output->name);
if (sel->output == NULL) {
die("oom");
}
} }
void void