#include "rootwindow.hh"
#include "openbox.hh"
+#include "screen.hh"
#include "otk/display.hh"
namespace ob {
OBRootWindow::OBRootWindow(int screen)
- : _info(otk::OBDisplay::screenInfo(screen))
+ : OBWidget(OBWidget::Type_Root),
+ _info(otk::OBDisplay::screenInfo(screen))
{
updateDesktopNames();
- Openbox::instance->registerHandler(_info->getRootWindow(), this);
+ Openbox::instance->registerHandler(_info->rootWindow(), this);
}
unsigned long num = (unsigned) -1;
- if (!property->get(_info->getRootWindow(),
+ if (!property->get(_info->rootWindow(),
otk::OBProperty::net_desktop_names,
otk::OBProperty::utf8, &num, &_names))
_names.clear();
const otk::OBProperty *property = Openbox::instance->property();
- if (e.atom == property->atom(otk::OBProperty::net_desktop_names))
+ // compress changes to a single property into a single change
+ XEvent ce;
+ while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) {
+ // XXX: it would be nice to compress ALL changes to a property, not just
+ // changes in a row without other props between.
+ if (ce.xproperty.atom != e.atom) {
+ XPutBackEvent(otk::OBDisplay::display, &ce);
+ break;
+ }
+ }
+
+ if (e.atom == property->atom(otk::OBProperty::net_desktop_names))
updateDesktopNames();
}
otk::OBProperty::StringVect newnames = _names;
newnames[i] = name;
- property->set(_info->getRootWindow(), otk::OBProperty::net_desktop_names,
+ property->set(_info->rootWindow(), otk::OBProperty::net_desktop_names,
otk::OBProperty::utf8, newnames);
}
+void OBRootWindow::mapRequestHandler(const XMapRequestEvent &e)
+{
+#ifdef DEBUG
+ printf("MapRequest for 0x%lx\n", e.window);
+#endif // DEBUG
+
+ OBClient *client = Openbox::instance->findClient(e.window);
+
+ if (client) {
+ // XXX: uniconify and/or unshade the window
+ } else {
+ Openbox::instance->screen(_info->screen())->manageWindow(e.window);
+ }
+}
+
}