#include "rootwindow.hh"
#include "openbox.hh"
#include "screen.hh"
+#include "client.hh"
#include "otk/display.hh"
namespace ob {
{
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();
- for (int i = 0; i < numWorkspaces; ++i)
- if (i <= static_cast<int>(_names.size()))
- _names.push_back("Unnamed workspace");
+ while ((signed)_names.size() < numWorkspaces)
+ _names.push_back("Unnamed");
}
//const otk::OBProperty *property = Openbox::instance->property();
- // XXX: so many client messages to handle here!
+ // XXX: so many client messages to handle here! ..or not.. they go to clients
}
+void OBRootWindow::setDesktopNames(const otk::OBProperty::StringVect &names)
+{
+ _names = names;
+ const otk::OBProperty *property = Openbox::instance->property();
+ property->set(_info->rootWindow(), otk::OBProperty::net_desktop_names,
+ otk::OBProperty::utf8, names);
+}
+
void OBRootWindow::setDesktopName(int i, const std::string &name)
{
const int numWorkspaces = 1; // XXX: change this to the number of workspaces!
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)
{
+ otk::OtkEventHandler::mapRequestHandler(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->getScreenNumber())->
- manageWindow(e.window);
- }
+ /*
+ MapRequest events come here even after the window exists instead of going
+ right to the client window, because of how they are sent and their struct
+ layout.
+ */
+ OBClient *c = Openbox::instance->findClient(e.window);
+
+ if (c) {
+ if (c->shaded())
+ c->shade(false);
+ // XXX: uniconify the window
+ c->focus();
+ } else
+ Openbox::instance->screen(_info->screen())->manageWindow(e.window);
}
}