void BScreen::unmanageWindow(BlackboxWindow *w, bool remap) {
w->restore(remap);
+ // Remove the modality so that its parent won't try to re-focus the window
+ if (w->isModal()) w->setModal(False);
+
+ if (w->getWorkspaceNumber() != BSENTINEL &&
+ w->getWindowNumber() != BSENTINEL)
+ getWorkspace(w->getWorkspaceNumber())->removeWindow(w);
+ else if (w->isIconic())
+ removeIcon(w);
+
if (w->isNormal()) {
// we don't list non-normal windows as managed windows
windowList.remove(w);
assert(it != end); // the window wasnt a desktop window?
}
+ if (blackbox->getFocusedWindow() == w)
+ blackbox->setFocusedWindow((BlackboxWindow *) 0);
+
removeNetizen(w->getClientWindow());
/*
if (flags.moving)
endMove();
+ delete timer;
+
+ delete windowmenu;
+
if (client.window_group) {
BWindowGroup *group = blackbox->searchGroup(client.window_group);
if (group) group->removeWindow(this);
if (client.transient_for != (BlackboxWindow *) ~0ul) {
client.transient_for->client.transientList.remove(this);
}
- // we save our transient_for though because the workspace will use it
- // when determining the next window to get focus
+ client.transient_for = (BlackboxWindow*) 0;
}
- if (blackbox_attrib.workspace != BSENTINEL &&
- window_number != BSENTINEL)
- screen->getWorkspace(blackbox_attrib.workspace)->removeWindow(this);
- else if (flags.iconic)
- screen->removeIcon(this);
-
- client.transient_for = (BlackboxWindow*) 0;
-
if (client.transientList.size() > 0) {
// reset transient_for for all transients
BlackboxWindowList::iterator it, end = client.transientList.end();
}
}
- delete timer;
-
- delete windowmenu;
-
if (frame.title)
destroyTitlebar();