omg, fat commit

pulled the style crap out of screen, i think the reconfigure case needs to be handled still.
moved util and config into otk, changed everything else accordingly.
code compiles and runs

1 files changed, 4 insertions, 4 deletions

diff --git a/src/workspace.cc b/src/workspace.cc
index 42edf0a6..2bf9d29a 100644
--- a/src/workspace.cc
+++ b/src/workspace.cc
@@ -28,7 +28,7 @@ using std::string;
 #include "otk/font.hh"
 #include "otk/display.hh"
 #include "screen.hh"
-#include "util.hh"
+#include "otk/util.hh"
 #include "bbwindow.hh"
 #include "workspace.hh"
 
@@ -605,8 +605,8 @@ bool Workspace::smartPlacement(otk::Rect& win) {
     }
 
     tmp.setRect(curr->frameRect().x(), curr->frameRect().y(),
-                curr->frameRect().width() + screen->getBorderWidth(),
-                curr->frameRect().height() + screen->getBorderWidth());
+                curr->frameRect().width() + screen->getWindowStyle()->getBorderWidth(),
+                curr->frameRect().height() + screen->getWindowStyle()->getBorderWidth());
 
     spaces = calcSpace(tmp, spaces);
   }
@@ -765,7 +765,7 @@ void Workspace::placeWindow(BlackboxWindow *win) {
 
   if (placed == False)
     cascadePlacement(new_win, (win->getTitleHeight() +
-                               screen->getBorderWidth() * 2));
+                               screen->getWindowStyle()->getBorderWidth() * 2));
 
   if (new_win.right() > screen->availableArea().right())
     new_win.setX(screen->availableArea().left());