#include "blackbox.hh"
#include "otk/font.hh"
#include "otk/display.hh"
-#include "screen.hh"
-#include "util.hh"
-#include "window.hh"
+#include "bbscreen.hh"
+#include "otk/util.hh"
+#include "bbwindow.hh"
#include "workspace.hh"
-#include "xatom.hh"
namespace ob {
}
-bool Workspace::isLastWindow(const BlackboxWindow* const w) const {
+bool Workspace::isLastWindow(const BlackboxWindow *w) const {
return (w == windowList.back());
}
void Workspace::readName(void) {
- XAtom::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(), XAtom::net_desktop_names,
- XAtom::utf8, numnames, namesList) &&
+ if (xatom->get(screen->getRootWindow(), otk::OBProperty::net_desktop_names,
+ otk::OBProperty::utf8, &numnames, &namesList) &&
namesList.size() > id) {
name = namesList[id];
void Workspace::setName(const string& new_name) {
// set the _NET_WM_DESKTOP_NAMES property with the new name
- XAtom::StringVect namesList;
+ otk::OBProperty::StringVect namesList;
unsigned long numnames = (unsigned) -1;
- if (xatom->getValue(screen->getRootWindow(), XAtom::net_desktop_names,
- XAtom::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(), XAtom::net_desktop_names,
- XAtom::utf8, namesList);
+ xatom->set(screen->getRootWindow(), otk::OBProperty::net_desktop_names,
+ otk::OBProperty::utf8, namesList);
}
}
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);
}
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());