Merge branch 'handleUnplug' into output-management
This commit is contained in:
commit
806ebffe7d
12
dwl.c
12
dwl.c
@ -205,7 +205,7 @@ static void chvt(const Arg *arg);
|
||||
static void cleanup(void);
|
||||
static void cleanupkeyboard(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 commitnotify(struct wl_listener *listener, void *data);
|
||||
static void createkeyboard(struct wlr_input_device *device);
|
||||
@ -695,7 +695,7 @@ void
|
||||
cleanupmon(struct wl_listener *listener, void *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->frame.link);
|
||||
@ -703,19 +703,17 @@ cleanupmon(struct wl_listener *listener, void *data)
|
||||
wlr_output_layout_remove(output_layout, m->wlr_output);
|
||||
|
||||
updatemons();
|
||||
closemon(m);
|
||||
closemon(m, wl_container_of(mons.next, newmon, link));
|
||||
free(m);
|
||||
}
|
||||
|
||||
void
|
||||
closemon(Monitor *m)
|
||||
closemon(Monitor *m, Monitor *newmon)
|
||||
{
|
||||
// move all the clients on a closed monitor to another one
|
||||
Monitor *newmon;
|
||||
Client *c;
|
||||
|
||||
focusclient(selclient(), focustop(dirtomon(-1)), 1);
|
||||
wl_list_for_each(newmon, &mons, link) {
|
||||
wl_list_for_each(c, &clients, link) {
|
||||
if (c->isfloating && c->geom.x > m->m.width)
|
||||
resize(c, c->geom.x - m->w.width, c->geom.y,
|
||||
@ -723,8 +721,6 @@ closemon(Monitor *m)
|
||||
if (c->mon == m)
|
||||
setmon(c, newmon, c->tags);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
Loading…
Reference in New Issue
Block a user