}
-// XXX: put this into the OBScreen class!
+// XXX: put this into the OBScreen or OBClient class!
static void manageWindow(Window window)
{
+ OBClient *client = 0;
XWMHints *wmhint;
XSetWindowAttributes attrib_set;
CWEventMask|CWDontPropagate, &attrib_set);
// create the OBClient class, which gets all of the hints on the window
- Openbox::instance->addClient(window, new OBClient(window));
+ Openbox::instance->addClient(window, client = new OBClient(window));
+
+ // we dont want a border on the client
+ XSetWindowBorderWidth(otk::OBDisplay::display, window, 0);
+
+ // specify that if we exit, the window should not be destroyed and should be
+ // reparented back to root automatically
+ XChangeSaveSet(otk::OBDisplay::display, window, SetModeInsert);
+
+ if (!client->positionRequested()) {
+ // XXX: position the window intelligenty
+ }
+
+ // XXX: grab server, reparent client to the frame, ungrab server
+
+ // XXX: if shaped, shape the frame..
+
+ // XXX: if on the current desktop..
+ /// XMapSubwindows(otk::OBDisplay::display, FRAMEWINDOW);
+ XMapWindow(otk::OBDisplay::display, window);
+
+ // XXX: handle any requested states such as shaded/maximized
+}
+
+// XXX: move this to the OBScreen or OBClient class!
+static void unmanageWindow(OBClient *client)
+{
+ bool remap = false; // remap the window when we're done?
+
+ Window window = client->window();
+
+ // XXX: pass around focus if this window was focused
+
+ // remove the window from our save set
+ XChangeSaveSet(otk::OBDisplay::display, window, SetModeDelete);
+
+ // we dont want events no more
+ XSelectInput(otk::OBDisplay::display, window, NoEventMask);
+
+ // XXX: XUnmapWindow(otk::OBDisplay::display, FRAME);
+ XUnmapWindow(otk::OBDisplay::display, window);
+
+ // we dont want a border on the client
+ XSetWindowBorderWidth(otk::OBDisplay::display, window,client->borderWidth());
+
+ // remove the client class from the search list
+ Openbox::instance->removeClient(window);
+
+ // check if the app has already reparented its window to the root window
+ XEvent ev;
+ if (XCheckTypedWindowEvent(otk::OBDisplay::display, window, ReparentNotify,
+ &ev)) {
+ remap = true; // XXX: why do we remap the window if they already
+ // reparented to root?
+ } else {
+ // according to the ICCCM - if the client doesn't reparent to
+ // root, then we have to do it for them
+ XReparentWindow(otk::OBDisplay::display, window,
+ RootWindow(otk::OBDisplay::display,
+ DefaultScreen(otk::OBDisplay::display)),
+ // XXX: screen->getRootWindow(),
+ client->area().x(), client->area().y());
+ }
+
+ // if we want to remap the window, do so now
+ if (remap)
+ XMapWindow(otk::OBDisplay::display, window);
+
+ delete client;
}
void OBXEventHandler::mapRequest(const XMapRequestEvent &e)
OBClient *client = Openbox::instance->findClient(e.window);
if (!client) return;
- // XXX: unmanage the window, i.e. ungrab events n reparent n shit
- Openbox::instance->removeClient(e.window);
+ unmanageWindow(client);
}
OBClient *client = Openbox::instance->findClient(e.window);
if (!client) return;
- // XXX: unmanage the window, i.e. ungrab events n reparent n shit
- Openbox::instance->removeClient(e.window);
+ unmanageWindow(client);
}