aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Workspace.cc29
1 files changed, 1 insertions, 28 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 1e3c8d0..a99b433 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Workspace.cc,v 1.47 2003/02/16 16:40:19 fluxgen Exp $ 25// $Id: Workspace.cc,v 1.48 2003/02/17 02:40:00 fluxgen Exp $
26 26
27#include "Workspace.hh" 27#include "Workspace.hh"
28 28
@@ -31,7 +31,6 @@
31#include "Screen.hh" 31#include "Screen.hh"
32#include "Window.hh" 32#include "Window.hh"
33#include "StringUtil.hh" 33#include "StringUtil.hh"
34#include "Slit.hh"
35#include "SimpleCommand.hh" 34#include "SimpleCommand.hh"
36 35
37// use GNU extensions 36// use GNU extensions
@@ -460,12 +459,6 @@ void Workspace::shutdown() {
460void Workspace::placeWindow(FluxboxWindow *win) { 459void Workspace::placeWindow(FluxboxWindow *win) {
461 Bool placed = False; 460 Bool placed = False;
462 int borderWidth4x = screen.getBorderWidth2x() * 2, 461 int borderWidth4x = screen.getBorderWidth2x() * 2,
463#ifdef SLIT
464 slit_x = screen.getSlit()->x() - screen.getBorderWidth(),
465 slit_y = screen.getSlit()->y() - screen.getBorderWidth(),
466 slit_w = screen.getSlit()->width() + borderWidth4x,
467 slit_h = screen.getSlit()->height() + borderWidth4x,
468#endif // SLIT
469 462
470 place_x = 0, place_y = 0, change_x = 1, change_y = 1; 463 place_x = 0, place_y = 0, change_x = 1, change_y = 1;
471 464
@@ -601,16 +594,6 @@ void Workspace::placeWindow(FluxboxWindow *win) {
601 } 594 }
602 } 595 }
603 596
604 if (1
605#ifdef SLIT
606 &&
607 (slit_x < test_x + win_w &&
608 slit_x + slit_w > test_x &&
609 slit_y < test_y + win_h &&
610 slit_y + slit_h > test_y)
611#endif // SLIT
612 )
613 placed = False;
614 597
615 if (placed) { 598 if (placed) {
616 place_x = test_x; 599 place_x = test_x;
@@ -720,16 +703,6 @@ void Workspace::placeWindow(FluxboxWindow *win) {
720 } 703 }
721 } 704 }
722 705
723 if (1
724#ifdef SLIT
725 &&
726 (slit_x < test_x + win_w &&
727 slit_x + slit_w > test_x &&
728 slit_y < test_y + win_h &&
729 slit_y + slit_h > test_y)
730#endif // SLIT
731 )
732 placed = False;
733 706
734 if (placed) { 707 if (placed) {
735 place_x = test_x; 708 place_x = test_x;