X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=b0cafdfb5c6036c7f95bb5d772f4315eb8d81da0;hb=3f6f897d88d820a7a7e8b388aff12c8d56f96fa4;hp=2bd4d75ad72825b5510a760c95a7df6d8e31223e;hpb=7eb8d6966ccf3d7e1068137ec64bfd2a366a9dac;p=chaz%2Fopenbox

diff --git a/src/Workspace.cc b/src/Workspace.cc
index 2bd4d75a..b0cafdfb 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -339,31 +339,31 @@ static rectList calcSpace(const Rect &win, const rectList &spaces) {
   for(siter=spaces.begin(); siter!=spaces.end(); ++siter) {
     if(win.Intersect(*siter)) {
       //Check for space to the left of the window
-      if(win.origin().x() > siter->x())
+      if(win.x() > siter->x())
         result.push_back(Rect(siter->x(), siter->y(),
-                              win.origin().x() - siter->x() - 1,
+                              win.x() - siter->x() - 1,
                               siter->h()));
       //Check for space above the window
-      if(win.origin().y() > siter->y())
+      if(win.y() > siter->y())
         result.push_back(Rect(siter->x(), siter->y(),
                               siter->w(),
-                              win.origin().y() - siter->y() - 1));
+                              win.y() - siter->y() - 1));
       //Check for space to the right of the window
-      if((win.origin().x()+win.size().w()) <
+      if((win.x()+win.w()) <
          (siter->x()+siter->w()))
-        result.push_back(Rect(win.origin().x() + win.size().w() + 1,
+        result.push_back(Rect(win.x() + win.w() + 1,
                               siter->y(),
                               siter->x() + siter->w() -
-                              win.origin().x() - win.size().w() - 1,
+                              win.x() - win.w() - 1,
                               siter->h()));
       //Check for space below the window
-      if((win.origin().y()+win.size().h()) <
+      if((win.y()+win.h()) <
          (siter->y()+siter->h()))
         result.push_back(Rect(siter->x(),
-                              win.origin().y() + win.size().h() + 1,
+                              win.y() + win.h() + 1,
                               siter->w(),
                               siter->y() + siter->h()-
-                              win.origin().y() - win.size().h() - 1));
+                              win.y() - win.h() - 1));
 
     }
     else
@@ -413,14 +413,23 @@ Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space) {
      spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
                         spaces);
   
+  //Sort the spaces by placement choice
+  if (screen.rowPlacementDirection() == BScreen::TopBottom)
+     sort(spaces.begin(), spaces.end(), decHeight);
+  else
+     sort(spaces.begin(), spaces.end(), incHeight);
+  if (screen.colPlacementDirection() == BScreen::TopBottom)
+     stable_sort(spaces.begin(), spaces.end(), incHeight);
+  else
+     stable_sort(spaces.begin(), spaces.end(), decHeight);
+
   //Find first space that fits the window
   best = NULL;
   for (siter=spaces.begin(); siter!=spaces.end(); ++siter) {
     if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
-      if (best == NULL)
+      if (best==NULL)
         best = siter;
-      else if (win_size.w() * win_size.h() - siter->w() * siter->h() <
-               best->w() + best->h())
+      else if(siter->w()*siter->h()<best->h()*best->w())
         best = siter;
     }
   }
@@ -437,46 +446,6 @@ Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space) {
 
 
 Point *Workspace::rowSmartPlacement(const Size &win_size, const Rect &space) {
-  const Rect *best;
-  rectList spaces;
-  LinkedListIterator<OpenboxWindow> it(windowList);
-  rectList::const_iterator siter;
-  spaces.push_back(space); //initially the entire screen is free
-  it.reset();
-  
-  //Find Free Spaces
-  for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
-     spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
-                        spaces);
-  
-  //Sort the spaces by placement choice
-  if (screen.rowPlacementDirection() == BScreen::TopBottom)
-     sort(spaces.begin(),spaces.end(),incHeight);
-  else
-     sort(spaces.begin(),spaces.end(),decHeight);
-
-  //Find first space that fits the window
-  best = NULL;
-  for (siter=spaces.begin(); siter!=spaces.end(); ++siter)
-    if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
-      best = siter;
-      break;
-    }
-
-  if (best != NULL) {
-    Point *pt = new Point(best->origin());
-    if (screen.colPlacementDirection() != BScreen::TopBottom)
-      pt->setY(pt->y() + (best->h() - win_size.h()));
-    if (screen.rowPlacementDirection() != BScreen::LeftRight)
-      pt->setX(pt->x() + (best->w() - win_size.w()));
-    return pt;
-  } else
-    return NULL; //fall back to cascade
-}
-
-/*
-inline Point *Workspace::rowSmartPlacement(const Size &win_size,
-                                           const Rect &space){
   bool placed=false;
   int test_x, test_y, place_x = 0, place_y = 0;
   int start_pos = 0;
@@ -503,13 +472,13 @@ inline Point *Workspace::rowSmartPlacement(const Size &win_size,
       it.reset();
       for (OpenboxWindow *curr = it.current(); placed && curr;
            it++, curr = it.current()) {
-        int curr_w = curr->size().w() + (screen.getBorderWidth() * 4);
-        int curr_h = curr->size().h() + (screen.getBorderWidth() * 4);
+        int curr_w = curr->area().w() + (screen.getBorderWidth() * 4);
+        int curr_h = curr->area().h() + (screen.getBorderWidth() * 4);
 
-        if (curr->origin().x() < test_x + win_size.w() &&
-            curr->origin().x() + curr_w > test_x &&
-            curr->origin().y() < test_y + win_size.h() &&
-            curr->origin().y() + curr_h > test_y) {
+        if (curr->area().x() < test_x + win_size.w() &&
+            curr->area().x() + curr_w > test_x &&
+            curr->area().y() < test_y + win_size.h() &&
+            curr->area().y() + curr_h > test_y) {
           placed = false;
         }
       }
@@ -534,49 +503,8 @@ inline Point *Workspace::rowSmartPlacement(const Size &win_size,
   else
     return NULL; // fall back to cascade
 }
-*/
 
 Point *Workspace::colSmartPlacement(const Size &win_size, const Rect &space) {
-  const Rect *best;
-  rectList spaces;
-  LinkedListIterator<OpenboxWindow> it(windowList);
-  rectList::const_iterator siter;
-  spaces.push_back(space); //initially the entire screen is free
-  it.reset();
-  
-  //Find Free Spaces
-  for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
-     spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
-                        spaces);
-  
-  //Sort the spaces by placement choice
-  if (screen.rowPlacementDirection() == BScreen::LeftRight)
-     sort(spaces.begin(),spaces.end(),incWidth);
-  else
-     sort(spaces.begin(),spaces.end(),decWidth);
-
-  //Find first space that fits the window
-  best = NULL;
-  for (siter=spaces.begin(); siter!=spaces.end(); ++siter)
-    if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
-      best = siter;
-      break;
-    }
-
-  if (best != NULL) {
-    Point *pt = new Point(best->origin());
-    if (screen.colPlacementDirection() != BScreen::TopBottom)
-      pt->setY(pt->y() + (best->h() - win_size.h()));
-    if (screen.rowPlacementDirection() != BScreen::LeftRight)
-      pt->setX(pt->x() + (best->w() - win_size.w()));
-    return pt;
-  } else
-    return NULL; //fall back to cascade
-}
-
-/*
-inline Point * Workspace::colSmartPlacement(const Size &win_size,
-                                            const Rect &space){
   Point *pt;
   bool placed=false;
   int test_x, test_y;
@@ -606,13 +534,13 @@ inline Point * Workspace::colSmartPlacement(const Size &win_size,
       it.reset();
       for (OpenboxWindow *curr = it.current(); placed && curr;
            it++, curr = it.current()) {
-        int curr_w = curr->size().w() + (screen.getBorderWidth() * 4);
-        int curr_h = curr->size().h() + (screen.getBorderWidth() * 4);
+        int curr_w = curr->area().w() + (screen.getBorderWidth() * 4);
+        int curr_h = curr->area().h() + (screen.getBorderWidth() * 4);
 
-        if (curr->origin().x() < test_x + win_size.w() &&
-            curr->origin().x() + curr_w > test_x &&
-            curr->origin().y() < test_y + win_size.h() &&
-            curr->origin().y() + curr_h > test_y) {
+        if (curr->area().x() < test_x + win_size.w() &&
+            curr->area().x() + curr_w > test_x &&
+            curr->area().y() < test_y + win_size.h() &&
+            curr->area().y() + curr_h > test_y) {
           placed = False;
         }
       }
@@ -636,7 +564,7 @@ inline Point * Workspace::colSmartPlacement(const Size &win_size,
   else
     return NULL;
 }
-*/
+
 
 Point *const Workspace::cascadePlacement(const OpenboxWindow *const win){
   if (((unsigned) cascade_x > (screen.size().w() / 2)) ||
@@ -658,63 +586,79 @@ void Workspace::placeWindow(OpenboxWindow *win) {
   Rect space(0, 0, screen.size().w(), screen.size().h());
 
 #ifdef    SLIT
-  Slit *slit = screen.getSlit();
-  Toolbar *toolbar = screen.getToolbar();
-  int tbarh = screen.hideToolbar() ? 0 :
-    toolbar->getExposedHeight() + screen.getBorderWidth() * 2;
-  bool tbartop;
-  switch (toolbar->placement()) {
-  case Toolbar::TopLeft:
-  case Toolbar::TopCenter:
-  case Toolbar::TopRight:
-    tbartop = true;
-    break;
-  case Toolbar::BottomLeft:
-  case Toolbar::BottomCenter:
-  case Toolbar::BottomRight:
-    tbartop = false;
-    break;
-  default:
-    ASSERT(false);      // unhandled placement
-  }
-  if ((slit->direction() == Slit::Horizontal &&
-       (slit->placement() == Slit::TopLeft ||
-        slit->placement() == Slit::TopRight)) ||
-      slit->placement() == Slit::TopCenter) {
-    // exclude top
-    if (tbartop) {
-      space.setY(slit->area().y());
-      space.setH(space.h() - space.y());
-    } else
-      space.setH(space.h() - tbarh);
-    space.setY(space.y() + slit->area().h() + screen.getBorderWidth() * 2);
-    space.setH(space.h() - (slit->area().h() + screen.getBorderWidth() * 2));
-  } else if ((slit->direction() == Slit::Vertical &&
+    Slit *slit = screen.getSlit();
+    int slit_x = slit->autoHide() ? slit->hiddenOrigin().x() : slit->area().x(),
+        slit_y = slit->autoHide() ? slit->hiddenOrigin().y() : slit->area().y();
+    Toolbar *toolbar = screen.getToolbar();
+    int tbarh = screen.hideToolbar() ? 0 :
+      toolbar->getExposedHeight() + screen.getBorderWidth() * 2;
+    bool tbartop;
+    switch (toolbar->placement()) {
+    case Toolbar::TopLeft:
+    case Toolbar::TopCenter:
+    case Toolbar::TopRight:
+      tbartop = true;
+      break;
+    case Toolbar::BottomLeft:
+    case Toolbar::BottomCenter:
+    case Toolbar::BottomRight:
+      tbartop = false;
+      break;
+    default:
+      ASSERT(false);      // unhandled placement
+    }
+    if ((slit->direction() == Slit::Horizontal &&
+         (slit->placement() == Slit::TopLeft ||
+          slit->placement() == Slit::TopRight)) ||
+        slit->placement() == Slit::TopCenter) {
+      // exclude top
+      if (tbartop && slit_y + slit->area().h() < tbarh) {
+        space.setY(space.y() + tbarh);
+        space.setH(space.h() - tbarh);
+      } else {
+        space.setY(space.y() + (slit_y + slit->area().h() +
+                                screen.getBorderWidth() * 2));
+        space.setH(space.h() - (slit_y + slit->area().h() +
+                                screen.getBorderWidth() * 2));
+        if (!tbartop)
+          space.setH(space.h() - tbarh);
+      }
+    } else if ((slit->direction() == Slit::Vertical &&
               (slit->placement() == Slit::TopRight ||
                slit->placement() == Slit::BottomRight)) ||
              slit->placement() == Slit::CenterRight) {
-    // exclude right
-    space.setW(space.w() - (slit->area().w() + screen.getBorderWidth() * 2));
-    if (tbartop)
-      space.setY(space.y() + tbarh);
-    space.setH(space.h() - tbarh);
-  } else if ((slit->direction() == Slit::Horizontal &&
+      // exclude right
+      space.setW(space.w() - (screen.size().w() - slit_x));
+      if (tbartop)
+        space.setY(space.y() + tbarh);
+      space.setH(space.h() - tbarh);
+    } else if ((slit->direction() == Slit::Horizontal &&
               (slit->placement() == Slit::BottomLeft ||
                slit->placement() == Slit::BottomRight)) ||
              slit->placement() == Slit::BottomCenter) {
-    // exclude bottom
-    space.setH(space.h() - (screen.size().h() - slit->area().y()));
-  } else {// if ((slit->direction() == Slit::Vertical &&
-    //      (slit->placement() == Slit::TopLeft ||
-    //       slit->placement() == Slit::BottomLeft)) ||
-    //     slit->placement() == Slit::CenterLeft)
-    // exclude left
-    space.setX(slit->area().w() + screen.getBorderWidth() * 2);
-    space.setW(space.w() - (slit->area().w() + screen.getBorderWidth() * 2));
-    if (tbartop)
-      space.setY(space.y() + tbarh);
-    space.setH(space.h() - tbarh);
-  }
+      // exclude bottom
+      if (!tbartop && (screen.size().h() - slit_y) < tbarh) {
+        space.setH(space.h() - tbarh);
+      } else {
+        space.setH(space.h() - (screen.size().h() - slit_y));
+        if (tbartop) {
+          space.setY(space.y() + tbarh);
+          space.setH(space.h() - tbarh);
+        }
+      }
+    } else {// if ((slit->direction() == Slit::Vertical &&
+      //      (slit->placement() == Slit::TopLeft ||
+      //       slit->placement() == Slit::BottomLeft)) ||
+      //     slit->placement() == Slit::CenterLeft)
+      // exclude left
+      space.setX(slit_x + slit->area().w() +
+                 screen.getBorderWidth() * 2);
+      space.setW(space.w() - (slit_x + slit->area().w() +
+                              screen.getBorderWidth() * 2));
+      if (tbartop)
+        space.setY(space.y() + tbarh);
+      space.setH(space.h() - tbarh);
+    }
 #else // !SLIT
   Toolbar *toolbar = screen.getToolbar();
   int tbarh = screen.hideToolbar() ? 0 :
@@ -736,20 +680,10 @@ void Workspace::placeWindow(OpenboxWindow *win) {
   }
 #endif // SLIT
 
-  const int win_w = win->size().w() + (screen.getBorderWidth() * 4),
-  win_h = win->size().h() + (screen.getBorderWidth() * 4),
-  start_pos = 0,
-  change_y =
-    ((screen.colPlacementDirection() == BScreen::TopBottom) ? 1 : -1),
-  change_x =
-    ((screen.rowPlacementDirection() == BScreen::LeftRight) ? 1 : -1),
-    delta_x = 8, delta_y = 8;
-
-  LinkedListIterator<OpenboxWindow> it(windowList);
-
-  Size window_size(win->size().w()+screen.getBorderWidth() * 4,
-                   win->size().h()+screen.getBorderWidth() * 4);
+  const Size window_size(win->area().w()+screen.getBorderWidth() * 4,
+                         win->area().h()+screen.getBorderWidth() * 4);
   Point *place = NULL;
+  LinkedListIterator<OpenboxWindow> it(windowList);
 
   switch (screen.placementPolicy()) {
   case BScreen::BestFitPlacement:
@@ -767,11 +701,11 @@ void Workspace::placeWindow(OpenboxWindow *win) {
     place = cascadePlacement(win);
  
   ASSERT(place != NULL);  
-  if (place->x() + win_w > (signed) screen.size().w())
-    place->setX(((signed) screen.size().w() - win_w) / 2);
-  if (place->y() + win_h > (signed) screen.size().h())
-    place->setY(((signed) screen.size().h() - win_h) / 2);
+  if (place->x() + window_size.w() > (signed) screen.size().w())
+    place->setX(((signed) screen.size().w() - window_size.w()) / 2);
+  if (place->y() + window_size.h() > (signed) screen.size().h())
+    place->setY(((signed) screen.size().h() - window_size.h()) / 2);
 
-  win->configure(place->x(), place->y(), win->size().w(), win->size().h());
+  win->configure(place->x(), place->y(), win->area().w(), win->area().h());
   delete place;
 }