hiro/bspwm
1
0
Fork 0
mirror of https://github.com/vale981/bspwm synced 2025-03-06 10:11:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidate transfer_desktop

Browse source
This commit is contained in:
Bastien Dejean 2013-06-07 11:17:41 +02:00
parent f19cf121d7
commit 9cac7cd459
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
messages.c
View file

@ -451,16 +451,11 @@ void process_message(char *msg, char *rsp)
if (!parse_send_option(opt, &o)) if (!parse_send_option(opt, &o))
return; return;
desktop_t *d = mon->desk; desktop_t *d = mon->desk;
desktop_hide(d);
transfer_desktop(mon, m, d); transfer_desktop(mon, m, d);
desktop_show(mon->desk); if (o == SEND_OPTION_FOLLOW)
arrange(m, d);
if (o == SEND_OPTION_FOLLOW) {
focus_node(m, d, d->focus); focus_node(m, d, d->focus);
} else if (o == SEND_OPTION_DONT_FOLLOW) { else if (o == SEND_OPTION_DONT_FOLLOW)
update_current(); update_current();
put_status();
}
} }
} }
return; return;

16
types.c
View file

@ -93,8 +93,24 @@ void remove_monitor(monitor_t *m)
void transfer_desktop(monitor_t *ms, monitor_t *md, desktop_t *d) void transfer_desktop(monitor_t *ms, monitor_t *md, desktop_t *d)
{ {
desktop_t *dd = ms->desk;
unlink_desktop(ms, d); unlink_desktop(ms, d);
insert_desktop(md, d); insert_desktop(md, d);
if (d == dd) {
desktop_show(ms->desk);
if (md->desk != d)
desktop_hide(d);
}
for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n, d->root))
fit_monitor(md, n->client);
if (d->focus != NULL && d->focus->client->fullscreen)
window_move_resize(d->focus->client->window, md->rectangle.x, md->rectangle.y, md->rectangle.width, md->rectangle.height);
arrange(md, d);
if (d != dd && md->desk == d) {
desktop_show(d);
}
put_status();
ewmh_update_desktop_names();
} }
void merge_monitors(monitor_t *ms, monitor_t *md) void merge_monitors(monitor_t *ms, monitor_t *md)