OBScreen::OBScreen(int screen, const otk::Configuration &config)
- : _number(screen)
+ : _number(screen),
+ _root(screen)
{
assert(screen >= 0); assert(screen < ScreenCount(otk::OBDisplay::display));
_info = otk::OBDisplay::screenInfo(screen);
// Set the netwm atoms for geomtery and viewport
- unsigned long geometry[] = { _size.x(),
- _size.y() };
+ unsigned long geometry[] = { _info->getWidth(),
+ _info->getHeight() };
Openbox::instance->property()->set(_info->getRootWindow(),
otk::OBProperty::net_desktop_geometry,
otk::OBProperty::Atom_Cardinal,
// choose the events we want to receive on the CLIENT window
attrib_set.event_mask = OBClient::event_mask;
- attrib_set.do_not_propagate_mask = ButtonPressMask | ButtonReleaseMask |
- ButtonMotionMask;
+ attrib_set.do_not_propagate_mask = OBClient::no_propagate_mask;
XChangeWindowAttributes(otk::OBDisplay::display, window,
CWEventMask|CWDontPropagate, &attrib_set);
// create the OBClient class, which gets all of the hints on the window
- Openbox::instance->addClient(window, client = new OBClient(_number, window));
+ client = new OBClient(_number, window);
+ // register for events
+ Openbox::instance->registerHandler(window, client);
+ // add to the wm's map
+ Openbox::instance->addClient(window, client);
// we dont want a border on the client
- XSetWindowBorderWidth(otk::OBDisplay::display, window, 0);
+ client->toggleClientBorder(false);
// specify that if we exit, the window should not be destroyed and should be
// reparented back to root automatically
// create the decoration frame for the client window
client->frame = new OBFrame(client, &_style);
+ // add to the wm's map
+ Openbox::instance->addClient(client->frame->getWindow(), client);
+ Openbox::instance->addClient(client->frame->plate(), client);
+ Openbox::instance->addClient(client->frame->titlebar(), client);
+ Openbox::instance->addClient(client->frame->label(), client);
+ Openbox::instance->addClient(client->frame->button_max(), client);
+ Openbox::instance->addClient(client->frame->button_iconify(), client);
+ Openbox::instance->addClient(client->frame->button_stick(), client);
+ Openbox::instance->addClient(client->frame->button_close(), client);
+ Openbox::instance->addClient(client->frame->handle(), client);
+ Openbox::instance->addClient(client->frame->grip_left(), client);
+ Openbox::instance->addClient(client->frame->grip_right(), client);
+
// XXX: if on the current desktop..
- XMapWindow(otk::OBDisplay::display, client->frame->window());
+ client->frame->show();
// XXX: handle any requested states such as shaded/maximized
otk::OBDisplay::ungrab();
- // add all the client's windows as event handlers for the client
- Openbox::instance->addClient(window, client);
- Openbox::instance->addClient(client->frame->window(), client);
- Openbox::instance->addClient(client->frame->titlebar(), client);
- Openbox::instance->addClient(client->frame->buttonIconify(), client);
- Openbox::instance->addClient(client->frame->buttonMax(), client);
- Openbox::instance->addClient(client->frame->buttonStick(), client);
- Openbox::instance->addClient(client->frame->buttonClose(), client);
- Openbox::instance->addClient(client->frame->label(), client);
- Openbox::instance->addClient(client->frame->handle(), client);
- Openbox::instance->addClient(client->frame->gripLeft(), client);
- Openbox::instance->addClient(client->frame->gripRight(), client);
-
// add to the screen's list
_clients.push_back(client);
// update the root properties
OBFrame *frame = client->frame;
// XXX: pass around focus if this window was focused
+
+ // remove from the wm's map
+ Openbox::instance->removeClient(client->window());
+ Openbox::instance->removeClient(frame->getWindow());
+ Openbox::instance->removeClient(frame->plate());
+ Openbox::instance->removeClient(frame->titlebar());
+ Openbox::instance->removeClient(frame->label());
+ Openbox::instance->removeClient(frame->button_max());
+ Openbox::instance->removeClient(frame->button_iconify());
+ Openbox::instance->removeClient(frame->button_stick());
+ Openbox::instance->removeClient(frame->button_close());
+ Openbox::instance->removeClient(frame->handle());
+ Openbox::instance->removeClient(frame->grip_left());
+ Openbox::instance->removeClient(frame->grip_right());
+ // unregister for handling events
+ Openbox::instance->clearHandler(client->window());
// remove the window from our save set
XChangeSaveSet(otk::OBDisplay::display, client->window(), SetModeDelete);
// we dont want events no more
XSelectInput(otk::OBDisplay::display, client->window(), NoEventMask);
- XUnmapWindow(otk::OBDisplay::display, frame->window());
-
- // we dont want a border on the client
- XSetWindowBorderWidth(otk::OBDisplay::display, client->window(),
- client->borderWidth());
+ frame->hide();
- // remove the client class from the search list
- Openbox::instance->removeClient(client->window());
- // remove the frame's decor elements as event handlers for the client
- Openbox::instance->removeClient(frame->window());
- Openbox::instance->removeClient(frame->titlebar());
- Openbox::instance->removeClient(frame->buttonIconify());
- Openbox::instance->removeClient(frame->buttonMax());
- Openbox::instance->removeClient(frame->buttonStick());
- Openbox::instance->removeClient(frame->buttonClose());
- Openbox::instance->removeClient(frame->label());
- Openbox::instance->removeClient(frame->handle());
- Openbox::instance->removeClient(frame->gripLeft());
- Openbox::instance->removeClient(frame->gripRight());
+ // give the client its border back
+ client->toggleClientBorder(true);
delete client->frame;
client->frame = 0;