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

added infinite loop check in transient

Browse source
This commit is contained in:
fluxgen 2002-02-26 22:34:49 +00:00
parent 8d911dcbdd
commit 6f1a0490c4
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
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.11 2002/02/16 11:28:16 fluxgen Exp $ // $Id: Workspace.cc,v 1.12 2002/02/26 22:34:49 fluxgen Exp $
// use GNU extensions // use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -188,12 +188,14 @@ void Workspace::removeAll(void) {
void Workspace::raiseWindow(FluxboxWindow *w) { void Workspace::raiseWindow(FluxboxWindow *w) {
FluxboxWindow *win = (FluxboxWindow *) 0, *bottom = w; FluxboxWindow *win = (FluxboxWindow *) 0, *bottom = w;
while (bottom->isTransient() && bottom->getTransientFor()) while (bottom->isTransient() && bottom->getTransientFor() &&
bottom->getTransientFor() != bottom) //prevent infinite loop
bottom = bottom->getTransientFor(); bottom = bottom->getTransientFor();
int i = 1; int i = 1;
win = bottom; win = bottom;
while (win->hasTransient() && win->getTransient()) { while (win->hasTransient() && win->getTransient() &&
win->getTransient() != win) {//prevent infinite loop
win = win->getTransient(); win = win->getTransient();
i++; i++;
@ -213,7 +215,8 @@ void Workspace::raiseWindow(FluxboxWindow *w) {
wkspc->stackingList.push_front(win); wkspc->stackingList.push_front(win);
} }
if (! win->hasTransient() || ! win->getTransient()) if (! win->hasTransient() || ! win->getTransient() ||
win->getTransient() == win) //prevent infinite loop
break; break;
win = win->getTransient(); win = win->getTransient();
@ -224,16 +227,17 @@ void Workspace::raiseWindow(FluxboxWindow *w) {
delete [] nstack; delete [] nstack;
} }
void Workspace::lowerWindow(FluxboxWindow *w) { void Workspace::lowerWindow(FluxboxWindow *w) {
FluxboxWindow *win = (FluxboxWindow *) 0, *bottom = w; FluxboxWindow *win = (FluxboxWindow *) 0, *bottom = w;
while (bottom->isTransient() && bottom->getTransientFor()) while (bottom->isTransient() && bottom->getTransientFor()
&& bottom->getTransientFor() != bottom) //prevent infinite loop
bottom = bottom->getTransientFor(); bottom = bottom->getTransientFor();
int i = 1; int i = 1;
win = bottom; win = bottom;
while (win->hasTransient() && win->getTransient()) { while (win->hasTransient() && win->getTransient() &&
win->getTransient() != win) { //prevent infinite loop
win = win->getTransient(); win = win->getTransient();
i++; i++;
@ -252,7 +256,8 @@ void Workspace::lowerWindow(FluxboxWindow *w) {
wkspc->stackingList.push_back(win); wkspc->stackingList.push_back(win);
} }
if (! win->getTransientFor()) if (! win->getTransientFor() ||
win->getTransientFor() == win)//prevent infinite loop
break; break;
win = win->getTransientFor(); win = win->getTransientFor();