diff options
author | mathias <mathias> | 2004-11-22 19:40:34 (GMT) |
---|---|---|
committer | mathias <mathias> | 2004-11-22 19:40:34 (GMT) |
commit | b47f050367409a26f70e57f130aedde3005589ea (patch) | |
tree | dcfb4f8cdabf99af4e90c3ca394f3d1835f5a8c7 /src | |
parent | 5525d29b9b1d517035fa440f759fa33cb8432c03 (diff) | |
download | fluxbox_lack-b47f050367409a26f70e57f130aedde3005589ea.zip fluxbox_lack-b47f050367409a26f70e57f130aedde3005589ea.tar.bz2 |
cosmetic (tabs -> spaces)
fix possible memleak with XineramaQueryScreens:
"Returned array should be free with XFree()" (from Xinerama.h)
Diffstat (limited to 'src')
-rw-r--r-- | src/Screen.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 9bb0e2d..ebf2b40 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -453,7 +453,7 @@ void BScreen::initWindows() { | |||
453 | 453 | ||
454 | // preen the window list of all icon windows... for better dockapp support | 454 | // preen the window list of all icon windows... for better dockapp support |
455 | for (unsigned int i = 0; i < nchild; i++) { | 455 | for (unsigned int i = 0; i < nchild; i++) { |
456 | 456 | ||
457 | if (children[i] == None) | 457 | if (children[i] == None) |
458 | continue; | 458 | continue; |
459 | 459 | ||
@@ -480,7 +480,7 @@ void BScreen::initWindows() { | |||
480 | // manage shown windows | 480 | // manage shown windows |
481 | // complexity: O(n^2) if we have lots of transients to transient_for | 481 | // complexity: O(n^2) if we have lots of transients to transient_for |
482 | // but usually O(n) | 482 | // but usually O(n) |
483 | Window transient_for = 0; | 483 | Window transient_for = 0; |
484 | for (unsigned int i = 0; i < nchild; ++i) { | 484 | for (unsigned int i = 0; i < nchild; ++i) { |
485 | if (children[i] == None) | 485 | if (children[i] == None) |
486 | continue; | 486 | continue; |
@@ -494,7 +494,7 @@ void BScreen::initWindows() { | |||
494 | 494 | ||
495 | // if we have a transient_for window and it isn't created yet... | 495 | // if we have a transient_for window and it isn't created yet... |
496 | // postpone creation of this window and find transient_for window | 496 | // postpone creation of this window and find transient_for window |
497 | // in the list and swap place with it so we can create transient_for window | 497 | // in the list and swap place with it so we can create transient_for window |
498 | // first | 498 | // first |
499 | if (XGetTransientForHint(disp, children[i], &transient_for) && | 499 | if (XGetTransientForHint(disp, children[i], &transient_for) && |
500 | fluxbox->searchWindow(transient_for) == 0) { | 500 | fluxbox->searchWindow(transient_for) == 0) { |
@@ -502,7 +502,7 @@ void BScreen::initWindows() { | |||
502 | // and swap place with it so it gets created first | 502 | // and swap place with it so it gets created first |
503 | unsigned int j = i + 1; | 503 | unsigned int j = i + 1; |
504 | for (; j < nchild; ++j) { | 504 | for (; j < nchild; ++j) { |
505 | if (children[j] == transient_for) { | 505 | if (children[j] == transient_for) { |
506 | swap(children[i], children[j]); | 506 | swap(children[i], children[j]); |
507 | break; | 507 | break; |
508 | } | 508 | } |
@@ -510,11 +510,11 @@ void BScreen::initWindows() { | |||
510 | // reevaluate window | 510 | // reevaluate window |
511 | if (!fluxbox->validateWindow(children[i])) | 511 | if (!fluxbox->validateWindow(children[i])) |
512 | continue; | 512 | continue; |
513 | 513 | ||
514 | #ifdef DEBUG | 514 | #ifdef DEBUG |
515 | cerr<<"BScreen::initWindows(): j = "<<j<<" i = "<<i<<" nchild = "<<nchild<<endl; | 515 | cerr<<"BScreen::initWindows(): j = "<<j<<" i = "<<i<<" nchild = "<<nchild<<endl; |
516 | #endif // DEBUG | 516 | #endif // DEBUG |
517 | 517 | ||
518 | #ifdef DEBUG | 518 | #ifdef DEBUG |
519 | if (j < nchild) | 519 | if (j < nchild) |
520 | cerr<<"BScreen::initWindows(): postpone creation of 0x"<<hex<<children[j]<<dec<<endl; | 520 | cerr<<"BScreen::initWindows(): postpone creation of 0x"<<hex<<children[j]<<dec<<endl; |
@@ -524,7 +524,7 @@ void BScreen::initWindows() { | |||
524 | #endif // DEBUG | 524 | #endif // DEBUG |
525 | } | 525 | } |
526 | 526 | ||
527 | 527 | ||
528 | XWindowAttributes attrib; | 528 | XWindowAttributes attrib; |
529 | if (XGetWindowAttributes(disp, children[i], | 529 | if (XGetWindowAttributes(disp, children[i], |
530 | &attrib)) { | 530 | &attrib)) { |
@@ -580,7 +580,7 @@ unsigned int BScreen::maxRight(int head) const { | |||
580 | 580 | ||
581 | unsigned int BScreen::maxTop(int head) const { | 581 | unsigned int BScreen::maxTop(int head) const { |
582 | // we ignore strut if we're doing full maximization | 582 | // we ignore strut if we're doing full maximization |
583 | 583 | ||
584 | if (hasXinerama()) | 584 | if (hasXinerama()) |
585 | return doFullMax() ? getHeadY(head) : getHeadY(head) + availableWorkspaceArea(head)->top(); | 585 | return doFullMax() ? getHeadY(head) : getHeadY(head) + availableWorkspaceArea(head)->top(); |
586 | else | 586 | else |
@@ -2252,6 +2252,7 @@ void BScreen::initXinerama() { | |||
2252 | m_xinerama_headinfo[i].width = screen_info[i].width; | 2252 | m_xinerama_headinfo[i].width = screen_info[i].width; |
2253 | m_xinerama_headinfo[i].height = screen_info[i].height; | 2253 | m_xinerama_headinfo[i].height = screen_info[i].height; |
2254 | } | 2254 | } |
2255 | XFree(screen_info); | ||
2255 | #ifdef DEBUG | 2256 | #ifdef DEBUG |
2256 | cerr<<"BScreen::initXinerama(): number of heads ="<<number<<endl; | 2257 | cerr<<"BScreen::initXinerama(): number of heads ="<<number<<endl; |
2257 | #endif // DEBUG | 2258 | #endif // DEBUG |