fixed memory leak of application_name

[chaz/openbox] / src / Workspace.cc

diff --git a/src/Workspace.cc b/src/Workspace.cc
index bca324425924f1355654cab9facec556f47a6dae..06bd9d66c9a5ede34ee399dbb5a70341c9d40031 100644 (file)
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -542,7 +542,6 @@ void Workspace::placeWindow(OpenboxWindow *win) {
   // future (with the NETWM 'strut')
   Rect space(0, 0, screen.size().w(), screen.size().h());
 
-  cout << "space: x: " << space.x() << " y: " << space.y() << " w: " << space.w() << " h: " << space.h() << endl;
 #ifdef    SLIT
   Slit *slit = screen.getSlit();
   int remove;   // 0 - top/2 - right/2 - bottom/3 - left
@@ -550,41 +549,30 @@ void Workspace::placeWindow(OpenboxWindow *win) {
        (slit->placement() == Slit::TopLeft ||
         slit->placement() == Slit::TopRight)) ||
       slit->placement() == Slit::TopCenter)
-    remove = 0;
+    // exclude top
+    space.setY(slit->area().h() + screen.getBorderWidth() * 2);
   else if ((slit->direction() == Slit::Vertical &&
             (slit->placement() == Slit::TopRight ||
              slit->placement() == Slit::BottomRight)) ||
            slit->placement() == Slit::CenterRight)
-    remove = 1;
+    // exclude right
+    space.setW(screen.size().w() -
+               (slit->area().w() + screen.getBorderWidth() * 2));
   else if ((slit->direction() == Slit::Horizontal &&
             (slit->placement() == Slit::BottomLeft ||
              slit->placement() == Slit::BottomRight)) ||
            slit->placement() == Slit::TopCenter)
-    remove = 2;
+    // exclude bottom
+    space.setH(screen.size().h() -
+               (slit->area().h() + screen.getBorderWidth() * 2));
   else// if ((slit->direction() == Slit::Vertical &&
       //      (slit->placement() == Slit::TopLeft ||
       //       slit->placement() == Slit::BottomLeft)) ||
       //     slit->placement() == Slit::CenterLeft)
-    remove = 3;
-  switch (remove) {
-  case 0: // top
-    space.setY(slit->area().h() + screen.getBorderWidth() * 2);
-    break;
-  case 1: // right
-    space.setW(screen.size().w() -
-               (slit->area().w() + screen.getBorderWidth() * 2));
-    break;
-  case 2: // bottom
-    space.setH(screen.size().h() -
-               (slit->area().h() + screen.getBorderWidth() * 2));
-    break;
-  case 3: // left
+    // exclude left
     space.setX(slit->area().w() + screen.getBorderWidth() * 2);
-    break;
-  }
 #endif
 
-  cout << "space: x: " << space.x() << " y: " << space.y() << " w: " << space.w() << " h: " << space.h() << endl;
   Toolbar *toolbar = screen.getToolbar();
   int tbarh = screen.hideToolbar() ? 0 :
     toolbar->getExposedHeight() + screen.getBorderWidth() * 2;
@@ -604,7 +592,6 @@ void Workspace::placeWindow(OpenboxWindow *win) {
   default:
     ASSERT(false);      // unhandled placement
   }
-  cout << "space: x: " << space.x() << " y: " << space.y() << " w: " << space.w() << " h: " << space.h() << endl;
 
   const int win_w = win->size().w() + (screen.getBorderWidth() * 4),
     win_h = win->size().h() + (screen.getBorderWidth() * 4),