nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

restore with remap and some extra checking

Browse source
This commit is contained in:
fluxgen 2002-08-16 11:02:41 +00:00
parent 471785b9d8
commit 78a5efdae4
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Workspace.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Workspace.cc,v 1.23 2002/08/11 22:35:40 fluxgen Exp $ // $Id: Workspace.cc,v 1.24 2002/08/16 11:02:41 fluxgen Exp $
#include "Workspace.hh" #include "Workspace.hh"
@ -135,18 +135,20 @@ int Workspace::removeWindow(FluxboxWindow *w) {
stackingList.remove(w); stackingList.remove(w);
if (w->isFocused()) { if (w->isFocused()) {
if (screen->isSloppyFocus()) if (screen->isSloppyFocus()) {
Fluxbox::instance()->setFocusedWindow((FluxboxWindow *) 0); Fluxbox::instance()->setFocusedWindow(0); // set focused window to none
else if (w->isTransient() && w->getTransientFor() && } else if (w->isTransient() && w->getTransientFor() &&
w->getTransientFor()->isVisible()) w->getTransientFor()->isVisible()) {
if (w->getTransientFor() == w) // FATAL ERROR, this should not happend
abort();
w->getTransientFor()->setInputFocus(); w->getTransientFor()->setInputFocus();
else { } else {
FluxboxWindow *top = 0; FluxboxWindow *top = 0;
if (stackingList.size()!=0) if (stackingList.size()!=0)
top = stackingList.front(); top = stackingList.front();
if (!top || !top->setInputFocus()) { if (!top || !top->setInputFocus()) {
Fluxbox::instance()->setFocusedWindow((FluxboxWindow *) 0); Fluxbox::instance()->setFocusedWindow(0); // set focused window to none
XSetInputFocus(Fluxbox::instance()->getXDisplay(), XSetInputFocus(Fluxbox::instance()->getXDisplay(),
screen->getToolbar()->getWindowID(), screen->getToolbar()->getWindowID(),
RevertToParent, CurrentTime); RevertToParent, CurrentTime);
@ -155,7 +157,7 @@ int Workspace::removeWindow(FluxboxWindow *w) {
} }
if (lastfocus == w) if (lastfocus == w)
lastfocus = (FluxboxWindow *) 0; lastfocus = 0;
//could be faster? //could be faster?
Windows::iterator it = windowList.begin(); Windows::iterator it = windowList.begin();
@ -447,10 +449,10 @@ void Workspace::setName(const std::string &name) {
// on the workspace and then // on the workspace and then
// clears the windowList // clears the windowList
//------------------------------- //-------------------------------
void Workspace::shutdown(void) { void Workspace::shutdown() {
// note: when the window dies it'll remove it self from the list
while (!windowList.empty()) { while (!windowList.empty()) {
windowList.back()->restore(); windowList.back()->restore(true); // restore with remap
delete windowList.back(); //delete window (the window removes it self from windowList) delete windowList.back(); //delete window (the window removes it self from windowList)
} }
} }