add a bunch of documentation

[chaz/openbox] / src / workspace.cc

diff --git a/src/workspace.cc b/src/workspace.cc
index ec220a6a2f0cc70175f498ce156f62978a69fcdb..2bf9d29a599fd6d1caf9c33bafcc0fa8b75476f4 100644 (file)
--- a/src/workspace.cc
+++ b/src/workspace.cc
@@ -28,10 +28,9 @@ 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"
-#include "atom.hh"
 
 namespace ob {
 
@@ -424,12 +423,12 @@ void Workspace::setCurrent(void) {
 
 
 void Workspace::readName(void) {
-  OBAtom::StringVect namesList;
+  otk::OBProperty::StringVect namesList;
   unsigned long numnames = id + 1;
     
   // attempt to get from the _NET_WM_DESKTOP_NAMES property
-  if (xatom->getValue(screen->getRootWindow(), OBAtom::net_desktop_names,
-                      OBAtom::utf8, numnames, namesList) &&
+  if (xatom->get(screen->getRootWindow(), otk::OBProperty::net_desktop_names,
+                 otk::OBProperty::utf8, &numnames, &namesList) &&
       namesList.size() > id) {
     name = namesList[id];
   
@@ -451,17 +450,18 @@ void Workspace::readName(void) {
 
 void Workspace::setName(const string& new_name) {
   // set the _NET_WM_DESKTOP_NAMES property with the new name
-  OBAtom::StringVect namesList;
+  otk::OBProperty::StringVect namesList;
   unsigned long numnames = (unsigned) -1;
-  if (xatom->getValue(screen->getRootWindow(), OBAtom::net_desktop_names,
-                      OBAtom::utf8, numnames, namesList) &&
+  if (xatom->get(screen->getRootWindow(),
+                 otk::OBProperty::net_desktop_names,
+                 otk::OBProperty::utf8, &numnames, &namesList) &&
       namesList.size() > id)
     namesList[id] = new_name;
   else
     namesList.push_back(new_name);
 
-  xatom->setValue(screen->getRootWindow(), OBAtom::net_desktop_names,
-                  OBAtom::utf8, namesList);
+  xatom->set(screen->getRootWindow(), otk::OBProperty::net_desktop_names,
+             otk::OBProperty::utf8, namesList);
 }
 
 
@@ -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());