// reparented back to root automatically
XChangeSaveSet(otk::OBDisplay::display, window, SetModeInsert);
- if (!client->positionRequested()) {
- // XXX: position the window intelligenty
+ if (!(Openbox::instance->state() == Openbox::State_Starting ||
+ client->positionRequested())) {
+ // position the window intelligenty .. hopefully :)
+ // call the python PLACEWINDOW binding
+ EventData *data = new_event_data(_number, window, EventPlaceWindow, 0);
+ Openbox::instance->bindings()->fireEvent(data);
+ Py_DECREF((PyObject*)data);
}
// create the decoration frame for the client window
Openbox::instance->bindings()->grabButtons(false, client);
- // remove from the stacking order
- _stacking.remove(client);
-
- // unfocus the client
- client->unfocus();
-
// remove from the wm's map
Openbox::instance->removeClient(client->window());
Openbox::instance->removeClient(frame->window());
delete client->frame;
client->frame = 0;
+ // remove from the stacking order
+ _stacking.remove(client);
+
// remove from the screen's list
clients.remove(client);
+
+ // unfocus the client (calls the focus callbacks)
+ client->unfocus();
+
delete client;
// update the root properties
}
// force the callbacks to fire
- Openbox::instance->setFocusedClient(0);
+ if (!Openbox::instance->focusedClient())
+ Openbox::instance->setFocusedClient(0);
}
void OBScreen::changeNumDesktops(long num)