watch for windows on desktops being removed, and change desktops if on one being removed
This commit is contained in:
parent
c00829334d
commit
2472004b8c
1 changed files with 21 additions and 2 deletions
|
@ -713,8 +713,23 @@ void Screen::changeNumDesktops(long num)
|
||||||
|
|
||||||
if (!(num > 0)) return;
|
if (!(num > 0)) return;
|
||||||
|
|
||||||
// XXX: move windows on desktops that will no longer exist!
|
// move windows on desktops that will no longer exist!
|
||||||
|
Client::List::iterator it, end = clients.end();
|
||||||
|
for (it = clients.begin(); it != end; ++it) {
|
||||||
|
int d = (*it)->desktop();
|
||||||
|
if (d >= num && !(d == 0xffffffff || d == Client::ICONIC_DESKTOP)) {
|
||||||
|
XEvent ce;
|
||||||
|
ce.xclient.type = ClientMessage;
|
||||||
|
ce.xclient.message_type = otk::Property::atoms.net_wm_desktop;
|
||||||
|
ce.xclient.display = **otk::display;
|
||||||
|
ce.xclient.window = (*it)->window();
|
||||||
|
ce.xclient.format = 32;
|
||||||
|
ce.xclient.data.l[0] = num - 1;
|
||||||
|
XSendEvent(**otk::display, _info->rootWindow(), False,
|
||||||
|
SubstructureNotifyMask | SubstructureRedirectMask, &ce);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
_num_desktops = num;
|
_num_desktops = num;
|
||||||
otk::Property::set(_info->rootWindow(),
|
otk::Property::set(_info->rootWindow(),
|
||||||
otk::Property::atoms.net_number_of_desktops,
|
otk::Property::atoms.net_number_of_desktops,
|
||||||
|
@ -731,6 +746,10 @@ void Screen::changeNumDesktops(long num)
|
||||||
|
|
||||||
// update the work area hint
|
// update the work area hint
|
||||||
changeWorkArea();
|
changeWorkArea();
|
||||||
|
|
||||||
|
// change our desktop if we're on one that no longer exists!
|
||||||
|
if (_desktop >= num)
|
||||||
|
changeDesktop(num - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue