asolkar/dwl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Closemon(), newmon as parameter

Browse Source 
This allows to fix output-management: move clients to the monitor on the
left of the disabled one, instead of the leftmost (which might happen to
be the disabled one)

Also using wl_list_foreach() and then brake after the first iteration is
ugly and inefficient
This commit is contained in:
Stivvo 2020-10-30 23:22:55 +01:00
parent ef7043e4d1
commit d4178b9d2a
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dwl.c
View File

@ -204,7 +204,7 @@ static void chvt(const Arg *arg);
static void cleanup(void); static void cleanup(void);
static void cleanupkeyboard(struct wl_listener *listener, void *data); static void cleanupkeyboard(struct wl_listener *listener, void *data);
static void cleanupmon(struct wl_listener *listener, void *data); static void cleanupmon(struct wl_listener *listener, void *data);
static void closemon(Monitor *m); static void closemon(Monitor *m, Monitor *newmon);
static void commitlayersurfacenotify(struct wl_listener *listener, void *data); static void commitlayersurfacenotify(struct wl_listener *listener, void *data);
static void commitnotify(struct wl_listener *listener, void *data); static void commitnotify(struct wl_listener *listener, void *data);
static void createkeyboard(struct wlr_input_device *device); static void createkeyboard(struct wlr_input_device *device);
@ -688,7 +688,7 @@ void
cleanupmon(struct wl_listener *listener, void *data) cleanupmon(struct wl_listener *listener, void *data)
{ {
struct wlr_output *wlr_output = data; struct wlr_output *wlr_output = data;
Monitor *m = wlr_output->data; Monitor *m = wlr_output->data, *newmon;
wl_list_remove(&m->destroy.link); wl_list_remove(&m->destroy.link);
wl_list_remove(&m->frame.link); wl_list_remove(&m->frame.link);
@ -696,27 +696,22 @@ cleanupmon(struct wl_listener *listener, void *data)
wlr_output_layout_remove(output_layout, m->wlr_output); wlr_output_layout_remove(output_layout, m->wlr_output);
updatemons(); updatemons();
closemon(m); closemon(m, wl_container_of(mons.next, newmon, link));
free(m); free(m);
} }
void void
closemon(Monitor *m) closemon(Monitor *m, Monitor *newmon)
{ {
// move all the clients on a closed monitor to another one // move all the clients on a closed monitor to another one
Monitor *newmon;
Client *c; Client *c;
wl_list_for_each(newmon, &mons, link) { wl_list_for_each(c, &clients, link) {
wl_list_for_each(c, &clients, link) { if (c->isfloating && c->geom.x > m->m.width)
if (c->isfloating && c->geom.x > m->m.width) { resize(c, c->geom.x - m->w.width, c->geom.y,
resize(c, c->geom.x - m->w.width, c->geom.y, c->geom.width, c->geom.height, 0);
c->geom.width, c->geom.height, 0); if (c->mon == m)
} setmon(c, newmon, c->tags);
if (c->mon == m)
setmon(c, newmon, c->tags);
}
break;
} }
} }