X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=0af1c332835682c6781e6e4ef4ae5cebab3ca11d;hb=89563281384c34886fb12b169d1bdf8d293f0b48;hp=31c93b9bc8e1806595e16c5b8f320e1367e5756b;hpb=25cbe08cb6c46740b63f1259256433558bf38a5f;p=chaz%2Fopenbox

diff --git a/src/Workspace.cc b/src/Workspace.cc
index 31c93b9b..0af1c332 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -41,6 +41,7 @@
 #include "Toolbar.h"
 #include "Window.h"
 #include "Workspace.h"
+
 #include "Windowmenu.h"
 #include "Geometry.h"
 #include "Util.h"
@@ -53,16 +54,17 @@
 #  include <stdlib.h>
 #endif // HAVE_STDLIB_H
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
+#include <algorithm>
 #include <vector>
-typedef vector<Rect> rectList;
+typedef std::vector<Rect> rectList;
 
 Workspace::Workspace(BScreen &scrn, int i) : screen(scrn) {
 
-  cascade_x = cascade_y = 32;
+  cascade_x = cascade_y = 0;
 
   id = i;
 
@@ -91,7 +93,7 @@ Workspace::~Workspace(void) {
 const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
   if (! w) return -1;
 
-  if (place) placeWindow(w);
+  if (place) placeWindow(*w);
 
   w->setWorkspace(id);
   w->setWindowNumber(windowList->count());
@@ -119,7 +121,7 @@ const int Workspace::removeWindow(OpenboxWindow *w) {
     if (w->isTransient() && w->getTransientFor() &&
 	w->getTransientFor()->isVisible()) {
       w->getTransientFor()->setInputFocus();
-    } else if (screen.isSloppyFocus()) {
+    } else if (screen.sloppyFocus()) {
       screen.getOpenbox().setFocusedWindow((OpenboxWindow *) 0);
     } else {
       OpenboxWindow *top = stackingList->first();
@@ -320,6 +322,7 @@ void Workspace::setName(char *new_name) {
   
   clientmenu->setLabel(name);
   clientmenu->update();
+  screen.saveWorkspaceNames();
 }
 
 
@@ -330,37 +333,37 @@ void Workspace::shutdown(void) {
   }
 }
 
-static rectList calcSpace(const OpenboxWindow &win, const rectList &spaces) {
+static rectList calcSpace(const Rect &win, const rectList &spaces) {
   rectList result;
   rectList::const_iterator siter;
   for(siter=spaces.begin(); siter!=spaces.end(); ++siter) {
-    if(win.area().Intersect(*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
@@ -369,11 +372,59 @@ static rectList calcSpace(const OpenboxWindow &win, const rectList &spaces) {
   return result;
 }
 
+bool rowRLBT(const Rect &first, const Rect &second){
+  if (first.y()+first.h()==second.y()+second.h())
+     return first.x()+first.w()>second.x()+second.w();
+  return first.y()+first.h()>second.y()+second.h();
+}
+ 
+bool rowRLTB(const Rect &first, const Rect &second){
+  if (first.y()==second.y())
+     return first.x()+first.w()>second.x()+second.w();
+  return first.y()<second.y();
+}
+
+bool rowLRBT(const Rect &first, const Rect &second){
+  if (first.y()+first.h()==second.y()+second.h())
+     return first.x()<second.x();
+  return first.y()+first.h()>second.y()+second.h();
+}
+ 
+bool rowLRTB(const Rect &first, const Rect &second){
+  if (first.y()==second.y())
+     return first.x()<second.x();
+  return first.y()<second.y();
+}
+ 
+bool colLRTB(const Rect &first, const Rect &second){
+  if (first.x()==second.x())
+     return first.y()<second.y();
+  return first.x()<second.x();
+}
+ 
+bool colLRBT(const Rect &first, const Rect &second){
+  if (first.x()==second.x())
+     return first.y()+first.h()>second.y()+second.h();
+  return first.x()<second.x();
+}
+
+bool colRLTB(const Rect &first, const Rect &second){
+  if (first.x()+first.w()==second.x()+second.w())
+     return first.y()<second.y();
+  return first.x()+first.w()>second.x()+second.w();
+}
+ 
+bool colRLBT(const Rect &first, const Rect &second){
+  if (first.x()+first.w()==second.x()+second.w())
+     return first.y()+first.h()>second.y()+second.h();
+  return first.x()+first.w()>second.x()+second.w();
+}
+
+
 //BestFitPlacement finds the smallest free space that fits the window
 //to be placed. It currentl ignores whether placement is right to left or top
 //to bottom.
-Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space)
-{
+Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space) {
   const Rect *best;
   rectList spaces;
   LinkedListIterator<OpenboxWindow> it(windowList);
@@ -383,219 +434,189 @@ Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space)
   
   //Find Free Spaces
   for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
-     spaces = calcSpace(*cur, spaces);
+     spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
+                        spaces);
   
   //Find first space that fits the window
-  best = 0;
+  best = NULL;
   for (siter=spaces.begin(); siter!=spaces.end(); ++siter) {
-    if ((siter->w() >= win_size.w()) &&
-        (siter->h() >= win_size.h()))
-      best = siter;
+    if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
+      if (best==NULL)
+        best = &*siter;
+      else if(siter->w()*siter->h()<best->h()*best->w())
+        best = &*siter;
+    }
   }
+  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
+}
 
-  if (best != 0)
-    return new Point(best->origin());
-  else
-    return new Point(200, 0);
-}
-
-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;
-  int change_y =
-     ((screen.getColPlacementDirection() == BScreen::TopBottom) ? 1 : -1);
-  int change_x =
-     ((screen.getRowPlacementDirection() == BScreen::LeftRight) ? 1 : -1);
-  int delta_x = 8, delta_y = 8;
+Point *Workspace::underMousePlacement(const Size &win_size, const Rect &space) {
+  Point *pt;
+
+  int x, y, rx, ry;
+  Window c, r;
+  unsigned int m;
+  XQueryPointer(screen.getOpenbox().getXDisplay(), screen.getRootWindow(),
+                &r, &c, &rx, &ry, &x, &y, &m);
+  pt = new Point(rx - win_size.w() / 2, ry - win_size.h() / 2);
+
+  if (pt->x() < space.x())
+    pt->setX(space.x());
+  if (pt->y() < space.y())
+    pt->setY(space.y());
+  if (pt->x() + win_size.w() > space.x() + space.w())
+    pt->setX(space.x() + space.w() - win_size.w());
+  if (pt->y() + win_size.h() > space.y() + space.h())
+    pt->setY(space.y() + space.h() - win_size.h());
+  return pt;
+}
+
+Point *Workspace::rowSmartPlacement(const Size &win_size, const Rect &space) {
+  const Rect *best;
+  rectList spaces;
   LinkedListIterator<OpenboxWindow> it(windowList);
 
-  test_y = (screen.getColPlacementDirection() == BScreen::TopBottom) ?
-    start_pos : screen.size().h() - win_size.h() - start_pos;
-
-  while(!placed &&
-        ((screen.getColPlacementDirection() == BScreen::BottomTop) ?
-         test_y > 0 : test_y + win_size.h() < (signed) space.h())) {
-    test_x = (screen.getRowPlacementDirection() == BScreen::LeftRight) ?
-      start_pos : space.w() - win_size.w() - start_pos;
-    while (!placed &&
-           ((screen.getRowPlacementDirection() == BScreen::RightLeft) ?
-            test_x > 0 : test_x + win_size.w() < (signed) space.w())) {
-      placed = true;
-
-      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);
-
-        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) {
-          placed = false;
-        }
-      }
+  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 spaces by preference
+  if(screen.rowPlacementDirection() == BScreen::RightLeft)
+     if(screen.colPlacementDirection() == BScreen::TopBottom)
+        sort(spaces.begin(),spaces.end(),rowRLTB);
+     else
+        sort(spaces.begin(),spaces.end(),rowRLBT);
+  else
+     if(screen.colPlacementDirection() == BScreen::TopBottom)
+        sort(spaces.begin(),spaces.end(),rowLRTB);
+     else
+        sort(spaces.begin(),spaces.end(),rowLRBT);
+  best = NULL;
+  for (siter=spaces.begin(); siter!=spaces.end(); ++siter)
+    if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
+      best = siter;
+      break;
+    }
 
-      // Removed code for checking toolbar and slit
-      // The space passed in should not include either
+  if (best != NULL) {
+    Point *pt = new Point(best->origin());
+    if (screen.colPlacementDirection() != BScreen::TopBottom)
+      pt->setY(best->y() + best->h() - win_size.h());
+    if (screen.rowPlacementDirection() != BScreen::LeftRight)
+      pt->setX(best->x()+best->w()-win_size.w());
+    return pt;
+  } else
+    return NULL; //fall back to cascade
+}
 
-      if (placed) {
-        place_x = test_x;
-        place_y = test_y;
+Point *Workspace::colSmartPlacement(const Size &win_size, const Rect &space) {
+  const Rect *best;
+  rectList spaces;
+  LinkedListIterator<OpenboxWindow> it(windowList);
 
-        break;
-      }   
+  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 spaces by user preference
+  if(screen.colPlacementDirection() == BScreen::TopBottom)
+     if(screen.rowPlacementDirection() == BScreen::LeftRight)
+        sort(spaces.begin(),spaces.end(),colLRTB);
+     else
+        sort(spaces.begin(),spaces.end(),colRLTB);
+  else
+     if(screen.rowPlacementDirection() == BScreen::LeftRight)
+        sort(spaces.begin(),spaces.end(),colLRBT);
+     else
+        sort(spaces.begin(),spaces.end(),colRLBT);
 
-      test_x += (change_x * delta_x);
+  //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;
     }
 
-    test_y += (change_y * delta_y);
-  }
-  return new Point(place_x, place_y);
-}
-
-void Workspace::placeWindow(OpenboxWindow *win) {
-  ASSERT(win != NULL);
-
-  Bool placed = False;
-
-  const int win_w = win->size().w() + (screen.getBorderWidth() * 4),
-    win_h = win->size().h() + (screen.getBorderWidth() * 4),
-#ifdef    SLIT
-    slit_x = screen.getSlit()->area().x() - screen.getBorderWidth(),
-    slit_y = screen.getSlit()->area().y() - screen.getBorderWidth(),
-    slit_w = screen.getSlit()->area().w() +
-      (screen.getBorderWidth() * 4),
-    slit_h = screen.getSlit()->area().h() +
-      (screen.getBorderWidth() * 4),
-#endif // SLIT
-    toolbar_x = screen.getToolbar()->getX() - screen.getBorderWidth(),
-    toolbar_y = screen.getToolbar()->getY() - screen.getBorderWidth(),
-    toolbar_w = screen.getToolbar()->getWidth() +
-      (screen.getBorderWidth() * 4),
-    toolbar_h = screen.getToolbar()->getHeight() + 
-      (screen.getBorderWidth() * 4),
-    start_pos = 0,
-    change_y =
-      ((screen.getColPlacementDirection() == BScreen::TopBottom) ? 1 : -1),
-    change_x =
-      ((screen.getRowPlacementDirection() == BScreen::LeftRight) ? 1 : -1),
-    delta_x = 8, delta_y = 8;
-
-  int test_x, test_y, place_x = 0, place_y = 0;
-  LinkedListIterator<OpenboxWindow> it(windowList);
+  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
+}
 
-  Rect space(0, 0,
-             screen.size().w(),
-             screen.size().h()
-            );
-  Size window_size(win_w, win_h);
-
-  switch (screen.getPlacementPolicy()) {
-  case BScreen::BestFitPlacement: {
-    Point *spot = bestFitPlacement(window_size, space);
-    if (spot != NULL) {
-      place_x=spot->x();
-      place_y=spot->y();
-      delete spot;
-      placed=true;
-    }
-    break;
-  }
-  case BScreen::RowSmartPlacement: {
-    Point *spot=rowSmartPlacement(window_size, space);
-    if (spot != NULL) {
-      place_x=spot->x();
-      place_y=spot->y();
-      delete spot;
-      placed=true;
-    }
-    break;
+
+Point *const Workspace::cascadePlacement(const OpenboxWindow &win,
+                                         const Rect &space) {
+  if ((cascade_x + win.area().w() + screen.getBorderWidth() * 2 >
+       (space.x() + space.w())) ||
+      (cascade_y + win.area().h() + screen.getBorderWidth() * 2 >
+       (space.y() + space.h())))
+    cascade_x = cascade_y = 0;
+  if (cascade_x < space.x() || cascade_y < space.y()) {
+    cascade_x = space.x();
+    cascade_y = space.y();
   }
 
-  case BScreen::ColSmartPlacement: {
-    test_x = (screen.getRowPlacementDirection() == BScreen::LeftRight) ?
-      start_pos : screen.size().w() - win_w - start_pos;
-
-    while (!placed &&
-	   ((screen.getRowPlacementDirection() == BScreen::RightLeft) ?
-	    test_x > 0 : test_x + win_w < (signed) screen.size().w())) {
-      test_y = (screen.getColPlacementDirection() == BScreen::TopBottom) ?
-	start_pos : screen.size().h() - win_h - start_pos;
-      
-      while (!placed &&
-	     ((screen.getColPlacementDirection() == BScreen::BottomTop) ?
-	      test_y > 0 : test_y + win_h < (signed) screen.size().h())) {
-        placed = True;
-
-        it.reset();
-        for (OpenboxWindow *curr = it.current(); placed && curr;
-	     it++, curr = it.current()) {
-          if (curr->isMaximizedFull()) // fully maximized, ignore it
-            continue;
-          int curr_w = curr->size().w() + (screen.getBorderWidth() * 4);
-          int curr_h =
-            ((curr->isShaded()) ? curr->getTitleHeight() : curr->size().h()) +
-            (screen.getBorderWidth() * 4);
-
-          if (curr->origin().x() < test_x + win_w &&
-              curr->origin().x() + curr_w > test_x &&
-              curr->origin().y() < test_y + win_h &&
-              curr->origin().y() + curr_h > test_y) {
-            placed = False;
-	  }
-        }
-
-        if (placed &&
-	    (toolbar_x < test_x + win_w &&
-	     toolbar_x + toolbar_w > test_x &&
-	     toolbar_y < test_y + win_h &&
-	     toolbar_y + toolbar_h > test_y)
-#ifdef    SLIT
-	    ||
-	    (slit_x < test_x + win_w &&
-	     slit_x + slit_w > test_x &&
-	     slit_y < test_y + win_h &&
-	     slit_y + slit_h > test_y)
-#endif // SLIT
-	    )
-	  placed = False;
-
-	if (placed) {
-	  place_x = test_x;
-	  place_y = test_y;
-
-	  break;
-	}
-
-	test_y += (change_y * delta_y);
-      }
+  Point *p = new Point(cascade_x, cascade_y);
+  cascade_x += win.getTitleHeight();
+  cascade_y += win.getTitleHeight();
+  return p;
+}
 
-      test_x += (change_x * delta_x);
-    }
 
+void Workspace::placeWindow(OpenboxWindow &win) {
+  Rect space = screen.availableArea();
+  const Size window_size(win.area().w()+screen.getBorderWidth() * 2,
+                         win.area().h()+screen.getBorderWidth() * 2);
+  Point *place = NULL;
+  LinkedListIterator<OpenboxWindow> it(windowList);
+
+  switch (screen.placementPolicy()) {
+  case BScreen::BestFitPlacement:
+    place = bestFitPlacement(window_size, space);
+    break;
+  case BScreen::RowSmartPlacement:
+    place = rowSmartPlacement(window_size, space);
+    break;
+  case BScreen::ColSmartPlacement:
+    place = colSmartPlacement(window_size, space);
+    break;
+  case BScreen::UnderMousePlacement:
+  case BScreen::ClickMousePlacement:
+    place = underMousePlacement(window_size, space);
     break;
-  }
   } // switch
 
-  if (! placed) {
-    if (((unsigned) cascade_x > (screen.size().w() / 2)) ||
-	((unsigned) cascade_y > (screen.size().h() / 2)))
-      cascade_x = cascade_y = 32;
-
-    place_x = cascade_x;
-    place_y = cascade_y;
-
-    cascade_x += win->getTitleHeight();
-    cascade_y += win->getTitleHeight();
-  }
-  
-  if (place_x + win_w > (signed) screen.size().w())
-    place_x = (((signed) screen.size().w()) - win_w) / 2;
-  if (place_y + win_h > (signed) screen.size().h())
-    place_y = (((signed) screen.size().h()) - win_h) / 2;
-
-  win->configure(place_x, place_y, win->size().w(), win->size().h());
+  if (place == NULL)
+    place = cascadePlacement(win, space);
+ 
+  ASSERT(place != NULL);  
+  if (place->x() + window_size.w() > (signed) space.x() + space.w())
+    place->setX(((signed) space.x() + space.w() - window_size.w()) / 2);
+  if (place->y() + window_size.h() > (signed) space.y() + space.h())
+    place->setY(((signed) space.y() + space.h() - window_size.h()) / 2);
+
+  win.configure(place->x(), place->y(), win.area().w(), win.area().h());
+  delete place;
 }