X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=0e7edcab0aa506087b2e3f48f3708adc1cb5644a;hb=3dcebcf56c6dd3a3707291e757af485bb55df7a6;hp=fa1f7990f06770ea7765121321d501e15c8cab1a;hpb=dfc5f034581f5a26cba5c4811500438f89f0634a;p=chaz%2Fopenbox

diff --git a/src/Workspace.cc b/src/Workspace.cc
index fa1f7990..0e7edcab 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -1,4 +1,5 @@
 // Workspace.cc for Openbox
+// Copyright (c) 2002 - 2002 Ben Jansens (ben@orodu.net)
 // Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -41,18 +42,25 @@
 #include "Window.h"
 #include "Workspace.h"
 #include "Windowmenu.h"
+#include "Geometry.h"
+#include "Util.h"
 
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
+#ifdef    HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
 #ifdef    STDC_HEADERS
 #  include <string.h>
 #endif // STDC_HEADERS
 
+#include <vector>
+typedef vector<Rect> rectList;
 
-Workspace::Workspace(BScreen *scrn, int i) {
-  screen = scrn;
+Workspace::Workspace(BScreen &scrn, int i) : screen(scrn) {
 
   cascade_x = cascade_y = 32;
 
@@ -60,12 +68,12 @@ Workspace::Workspace(BScreen *scrn, int i) {
 
   stackingList = new LinkedList<OpenboxWindow>;
   windowList = new LinkedList<OpenboxWindow>;
-  clientmenu = new Clientmenu(this);
+  clientmenu = new Clientmenu(*this);
 
   lastfocus = (OpenboxWindow *) 0;
 
   name = (char *) 0;
-  char *tmp = screen->getNameOfWorkspace(id);
+  char *tmp = screen.getNameOfWorkspace(id);
   setName(tmp);
 }
 
@@ -94,7 +102,7 @@ const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
   clientmenu->insert((const char **) w->getTitle());
   clientmenu->update();
 
-  screen->updateNetizenWindowAdd(w->getClientWindow(), id);
+  screen.updateNetizenWindowAdd(w->getClientWindow(), id);
 
   raiseWindow(w);
 
@@ -111,14 +119,14 @@ const int Workspace::removeWindow(OpenboxWindow *w) {
     if (w->isTransient() && w->getTransientFor() &&
 	w->getTransientFor()->isVisible()) {
       w->getTransientFor()->setInputFocus();
-    } else if (screen->isSloppyFocus()) {
-      screen->getOpenbox()->setFocusedWindow((OpenboxWindow *) 0);
+    } else if (screen.isSloppyFocus()) {
+      screen.getOpenbox().setFocusedWindow((OpenboxWindow *) 0);
     } else {
       OpenboxWindow *top = stackingList->first();
       if (! top || ! top->setInputFocus()) {
-	screen->getOpenbox()->setFocusedWindow((OpenboxWindow *) 0);
-	XSetInputFocus(screen->getOpenbox()->getXDisplay(),
-		       screen->getToolbar()->getWindowID(),
+	screen.getOpenbox().setFocusedWindow((OpenboxWindow *) 0);
+	XSetInputFocus(screen.getOpenbox().getXDisplay(),
+		       screen.getToolbar()->getWindowID(),
 		       RevertToParent, CurrentTime);
       }
     }
@@ -131,7 +139,7 @@ const int Workspace::removeWindow(OpenboxWindow *w) {
   clientmenu->remove(w->getWindowNumber());
   clientmenu->update();
 
-  screen->updateNetizenWindowDel(w->getClientWindow());
+  screen.updateNetizenWindowDel(w->getClientWindow());
 
   LinkedListIterator<OpenboxWindow> it(windowList);
   OpenboxWindow *bw = it.current();
@@ -190,10 +198,10 @@ void Workspace::raiseWindow(OpenboxWindow *w) {
   win = bottom;
   while (True) {
     *(curr++) = win->getFrameWindow();
-    screen->updateNetizenWindowRaise(win->getClientWindow());
+    screen.updateNetizenWindowRaise(win->getClientWindow());
 
     if (! win->isIconic()) {
-      wkspc = screen->getWorkspace(win->getWorkspaceNumber());
+      wkspc = screen.getWorkspace(win->getWorkspaceNumber());
       wkspc->stackingList->remove(win);
       wkspc->stackingList->insert(win, 0);
     }
@@ -204,7 +212,7 @@ void Workspace::raiseWindow(OpenboxWindow *w) {
     win = win->getTransient();
   }
 
-  screen->raiseWindows(nstack, i);
+  screen.raiseWindows(nstack, i);
 
   delete [] nstack;
 }
@@ -229,10 +237,10 @@ void Workspace::lowerWindow(OpenboxWindow *w) {
 
   while (True) {
     *(curr++) = win->getFrameWindow();
-    screen->updateNetizenWindowLower(win->getClientWindow());
+    screen.updateNetizenWindowLower(win->getClientWindow());
 
     if (! win->isIconic()) {
-      wkspc = screen->getWorkspace(win->getWorkspaceNumber());
+      wkspc = screen.getWorkspace(win->getWorkspaceNumber());
       wkspc->stackingList->remove(win);
       wkspc->stackingList->insert(win);
     }
@@ -243,12 +251,12 @@ void Workspace::lowerWindow(OpenboxWindow *w) {
     win = win->getTransientFor();
   }
 
-  screen->getOpenbox()->grab();
+  screen.getOpenbox().grab();
 
-  XLowerWindow(screen->getBaseDisplay()->getXDisplay(), *nstack);
-  XRestackWindows(screen->getBaseDisplay()->getXDisplay(), nstack, i);
+  XLowerWindow(screen.getBaseDisplay().getXDisplay(), *nstack);
+  XRestackWindows(screen.getBaseDisplay().getXDisplay(), nstack, i);
 
-  screen->getOpenbox()->ungrab();
+  screen.getOpenbox().ungrab();
 
   delete [] nstack;
 }
@@ -280,12 +288,12 @@ const int Workspace::getCount(void) {
 
 void Workspace::update(void) {
   clientmenu->update();
-  screen->getToolbar()->redrawWindowLabel(True);
+  screen.getToolbar()->redrawWindowLabel(True);
 }
 
 
 Bool Workspace::isCurrent(void) {
-  return (id == screen->getCurrentWorkspaceID());
+  return (id == screen.getCurrentWorkspaceID());
 }
 
 
@@ -294,7 +302,7 @@ Bool Workspace::isLastWindow(OpenboxWindow *w) {
 }
 
 void Workspace::setCurrent(void) {
-  screen->changeWorkspaceID(id);
+  screen.changeWorkspaceID(id);
 }
 
 
@@ -322,113 +330,206 @@ void Workspace::shutdown(void) {
   }
 }
 
-void Workspace::placeWindow(OpenboxWindow *win) {
-  Bool placed = False;
+static rectList calcSpace(const OpenboxWindow &win, const rectList &spaces) {
+  rectList result;
+  rectList::const_iterator siter;
+  for(siter=spaces.begin(); siter!=spaces.end(); ++siter) {
+    if(win.getArea().Intersect(*siter)) {
+      //Check for space to the left of the window
+      if(win.getXFrame() > siter->x())
+        result.push_back(Rect(siter->x(), siter->y(),
+                              win.getXFrame() - siter->x() - 1,
+                              siter->h()));
+      //Check for space above the window
+      if(win.getYFrame() > siter->y())
+        result.push_back(Rect(siter->x(), siter->y(),
+                              siter->w(),
+                              win.getYFrame() - siter->y() - 1));
+      //Check for space to the right of the window
+      if((win.getXFrame()+win.getWidth()) <
+         (siter->x()+siter->w()))
+        result.push_back(Rect(win.getXFrame() + win.getWidth() + 1,
+                              siter->y(),
+                              siter->x() + siter->w() -
+                              win.getXFrame() - win.getWidth() - 1,
+                              siter->h()));
+      //Check for space below the window
+      if((win.getYFrame()+win.getHeight()) <
+         (siter->y()+siter->h()))
+        result.push_back(Rect(siter->x(),
+                              win.getYFrame() + win.getHeight() + 1,
+                              siter->w(),
+                              siter->y() + siter->h()-
+                              win.getYFrame() - win.getHeight() - 1));
 
-  const int win_w = win->getWidth() + (screen->getBorderWidth() * 4),
-    win_h = win->getHeight() + (screen->getBorderWidth() * 4),
-#ifdef    SLIT
-    slit_x = screen->getSlit()->getX() - screen->getBorderWidth(),
-    slit_y = screen->getSlit()->getY() - screen->getBorderWidth(),
-    slit_w = screen->getSlit()->getWidth() +
-      (screen->getBorderWidth() * 4),
-    slit_h = screen->getSlit()->getHeight() +
-      (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;
+    }
+    else
+      result.push_back(*siter);
+  }
+  return result;
+}
 
-  int test_x, test_y, place_x = 0, place_y = 0;
+//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)
+{
+  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, spaces);
+  
+  //Find first space that fits the window
+  best = 0;
+  for (siter=spaces.begin(); siter!=spaces.end(); ++siter) {
+    if ((siter->w() >= win_size.w()) &&
+        (siter->h() >= win_size.h()))
+      best = siter;
+  }
 
-  switch (screen->getPlacementPolicy()) {
-  case BScreen::RowSmartPlacement: {
-    test_y = (screen->getColPlacementDirection() == BScreen::TopBottom) ?
-      start_pos : screen->getHeight() - win_h - start_pos;
-
-    while (!placed &&
-	   ((screen->getColPlacementDirection() == BScreen::BottomTop) ?
-	    test_y > 0 : test_y + win_h < (signed) screen->getHeight())) {
-      test_x = (screen->getRowPlacementDirection() == BScreen::LeftRight) ?
-	start_pos : screen->getWidth() - win_w - start_pos;
+  if (best != 0)
+    return new Point(best->origin());
+  else
+    return new Point(200, 0);
+}
 
-      while (!placed &&
-	     ((screen->getRowPlacementDirection() == BScreen::RightLeft) ?
-	      test_x > 0 : test_x + win_w < (signed) screen->getWidth())) {
-        placed = True;
+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;
+  LinkedListIterator<OpenboxWindow> it(windowList);
 
+  test_y = (screen.getColPlacementDirection() == BScreen::TopBottom) ?
+    start_pos : screen.getHeight() - 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()) {
-          if (curr->isMaximizedFull()) // fully maximized, ignore it
-            continue;
-          int curr_w = curr->getWidth() + (screen->getBorderWidth() * 4);
-          int curr_h =
-	    ((curr->isShaded()) ? curr->getTitleHeight() : curr->getHeight()) +
-            (screen->getBorderWidth() * 4);
-	  
-          if (curr->getXFrame() < test_x + win_w &&
-              curr->getXFrame() + curr_w > test_x &&
-              curr->getYFrame() < test_y + win_h &&
-              curr->getYFrame() + curr_h > test_y) {
-            placed = False;
-	  }
+             it++, curr = it.current()) {
+           int curr_w = curr->getWidth() + (screen.getBorderWidth() * 4);
+           int curr_h =
+             ((curr->isShaded()) ? curr->getTitleHeight() : curr->getHeight()) +
+             (screen.getBorderWidth() * 4);
+   
+           if (curr->getXFrame() < test_x + win_size.w() &&
+               curr->getXFrame() + curr_w > test_x &&
+               curr->getYFrame() < test_y + win_size.h() &&
+               curr->getYFrame() + curr_h > test_y) {
+              placed = false;
+           }
         }
+ 
+        // Removed code for checking toolbar and slit
+        // The space passed in should not include either
+        
+        if (placed) {
+           place_x = test_x;
+           place_y = test_y;
+ 
+           break;
+        }   
+        
+        test_x += (change_x * delta_x);
+     }
+
+     test_y += (change_y * delta_y);
+  }
+  return new Point(place_x, place_y);
+}
 
-        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;
+void Workspace::placeWindow(OpenboxWindow *win) {
+  ASSERT(win != NULL);
 
-        if (placed) {
-          place_x = test_x;
-          place_y = test_y;
+  Bool placed = False;
 
-          break;
-        }
+  const int win_w = win->getWidth() + (screen.getBorderWidth() * 4),
+    win_h = win->getHeight() + (screen.getBorderWidth() * 4),
+#ifdef    SLIT
+    slit_x = screen.getSlit()->getX() - screen.getBorderWidth(),
+    slit_y = screen.getSlit()->getY() - screen.getBorderWidth(),
+    slit_w = screen.getSlit()->getWidth() +
+      (screen.getBorderWidth() * 4),
+    slit_h = screen.getSlit()->getHeight() +
+      (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;
 
-	test_x += (change_x * delta_x);
-      }
+  int test_x, test_y, place_x = 0, place_y = 0;
+  LinkedListIterator<OpenboxWindow> it(windowList);
 
-      test_y += (change_y * delta_y);
+  Rect space(0, 0,
+             screen.getWidth(),
+             screen.getHeight()
+            );
+  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;
   }
 
   case BScreen::ColSmartPlacement: {
-    test_x = (screen->getRowPlacementDirection() == BScreen::LeftRight) ?
-      start_pos : screen->getWidth() - win_w - start_pos;
+    test_x = (screen.getRowPlacementDirection() == BScreen::LeftRight) ?
+      start_pos : screen.getWidth() - win_w - start_pos;
 
     while (!placed &&
-	   ((screen->getRowPlacementDirection() == BScreen::RightLeft) ?
-	    test_x > 0 : test_x + win_w < (signed) screen->getWidth())) {
-      test_y = (screen->getColPlacementDirection() == BScreen::TopBottom) ?
-	start_pos : screen->getHeight() - win_h - start_pos;
+	   ((screen.getRowPlacementDirection() == BScreen::RightLeft) ?
+	    test_x > 0 : test_x + win_w < (signed) screen.getWidth())) {
+      test_y = (screen.getColPlacementDirection() == BScreen::TopBottom) ?
+	start_pos : screen.getHeight() - win_h - start_pos;
       
       while (!placed &&
-	     ((screen->getColPlacementDirection() == BScreen::BottomTop) ?
-	      test_y > 0 : test_y + win_h < (signed) screen->getHeight())) {
+	     ((screen.getColPlacementDirection() == BScreen::BottomTop) ?
+	      test_y > 0 : test_y + win_h < (signed) screen.getHeight())) {
         placed = True;
 
         it.reset();
@@ -436,10 +537,10 @@ void Workspace::placeWindow(OpenboxWindow *win) {
 	     it++, curr = it.current()) {
           if (curr->isMaximizedFull()) // fully maximized, ignore it
             continue;
-          int curr_w = curr->getWidth() + (screen->getBorderWidth() * 4);
+          int curr_w = curr->getWidth() + (screen.getBorderWidth() * 4);
           int curr_h =
             ((curr->isShaded()) ? curr->getTitleHeight() : curr->getHeight()) +
-            (screen->getBorderWidth() * 4);
+            (screen.getBorderWidth() * 4);
 
           if (curr->getXFrame() < test_x + win_w &&
               curr->getXFrame() + curr_w > test_x &&
@@ -482,8 +583,8 @@ void Workspace::placeWindow(OpenboxWindow *win) {
   } // switch
 
   if (! placed) {
-    if (((unsigned) cascade_x > (screen->getWidth() / 2)) ||
-	((unsigned) cascade_y > (screen->getHeight() / 2)))
+    if (((unsigned) cascade_x > (screen.getWidth() / 2)) ||
+	((unsigned) cascade_y > (screen.getHeight() / 2)))
       cascade_x = cascade_y = 32;
 
     place_x = cascade_x;
@@ -493,10 +594,10 @@ void Workspace::placeWindow(OpenboxWindow *win) {
     cascade_y += win->getTitleHeight();
   }
   
-  if (place_x + win_w > (signed) screen->getWidth())
-    place_x = (((signed) screen->getWidth()) - win_w) / 2;
-  if (place_y + win_h > (signed) screen->getHeight())
-    place_y = (((signed) screen->getHeight()) - win_h) / 2;
+  if (place_x + win_w > (signed) screen.getWidth())
+    place_x = (((signed) screen.getWidth()) - win_w) / 2;
+  if (place_y + win_h > (signed) screen.getHeight())
+    place_y = (((signed) screen.getHeight()) - win_h) / 2;
 
   win->configure(place_x, place_y, win->getWidth(), win->getHeight());
 }