// XXX: initialize the screen's style
/*
otk::ustring stylepath;
- python_get_string("theme", &stylepath);
+ python_get_string("THEME", &stylepath);
otk::Configuration sconfig(false);
sconfig.setFile(otk::expandTilde(stylepath.c_str()));
if (!sconfig.load()) {
// Set the net_desktop_names property
std::vector<otk::ustring> names;
- python_get_stringlist("desktop_names", &names);
+ python_get_stringlist("DESKTOP_NAMES", &names);
otk::Property::set(_info->rootWindow(),
otk::Property::atoms.net_desktop_names,
otk::Property::utf8, names);
// the above set() will cause the updateDesktopNames to fire right away so
// we have a list of desktop names
- if (!python_get_long("number_of_desktops", &_num_desktops))
+ _desktop = 0;
+
+ if (!python_get_long("NUMBER_OF_DESKTOPS", &_num_desktops))
_num_desktops = 1;
changeNumDesktops(_num_desktops); // set the hint
- _desktop = 0;
changeDesktop(0); // set the hint
// create the window which gets focus when no clients get it
{
_strut.left = _strut.right = _strut.top = _strut.bottom = 0;
- Client::List::iterator it, end = clients.end();
+ ClientList::iterator it, end = clients.end();
for (it = clients.begin(); it != end; ++it) {
const otk::Strut &s = (*it)->strut();
_strut.left = std::max(_strut.left, s.left);
if (old_area != _area) {
// the area has changed, adjust all the maximized windows
- Client::List::iterator it, end = clients.end();
+ ClientList::iterator it, end = clients.end();
for (it = clients.begin(); it != end; ++it)
(*it)->remaximize();
}
windows = new Window[size];
win_it = windows;
- Client::List::const_iterator it = clients.begin();
- const Client::List::const_iterator end = clients.end();
+ ClientList::const_iterator it = clients.begin();
+ const ClientList::const_iterator end = clients.end();
for (; it != end; ++it, ++win_it)
*win_it = (*it)->window();
} else
windows = new Window[size];
win_it = windows;
- Client::List::const_reverse_iterator it = _stacking.rbegin();
- const Client::List::const_reverse_iterator end = _stacking.rend();
+ ClientList::const_reverse_iterator it = _stacking.rbegin();
+ const ClientList::const_reverse_iterator end = _stacking.rend();
for (; it != end; ++it, ++win_it)
*win_it = (*it)->window();
} else
// influence
updateStrut();
+ // unset modal before dropping our focus
+ client->setModal(false);
+
// unfocus the client (calls the focus callbacks)
client->unfocus();
assert(!_stacking.empty()); // this would be bad
- Client::List::iterator it = --_stacking.end();
- const Client::List::iterator end = _stacking.begin();
+ ClientList::iterator it = --_stacking.end();
+ const ClientList::iterator end = _stacking.begin();
- for (; it != end && (*it)->layer() < client->layer(); --it);
- if (*it == client) return; // already the bottom, return
+ if (client->modal() && client->transientFor()) {
+ // don't let a modal window lower below its transient_for
+ it = std::find(_stacking.begin(), _stacking.end(), client->transientFor());
+ assert(it != _stacking.end());
- wins[0] = (*it)->frame->window();
- wins[1] = client->frame->window();
+ wins[0] = (it == _stacking.begin() ? _focuswindow :
+ ((*(--ClientList::const_iterator(it)))->frame->window()));
+ wins[1] = client->frame->window();
+ if (wins[0] == wins[1]) return; // already right above the window
- _stacking.remove(client);
- _stacking.insert(++it, client);
+ _stacking.remove(client);
+ _stacking.insert(it, client);
+ } else {
+ for (; it != end && (*it)->layer() < client->layer(); --it);
+ if (*it == client) return; // already the bottom, return
+
+ wins[0] = (*it)->frame->window();
+ wins[1] = client->frame->window();
+
+ _stacking.remove(client);
+ _stacking.insert(++it, client);
+ }
XRestackWindows(**otk::display, wins, 2);
changeStackingList();
// remove the client before looking so we can't run into ourselves
_stacking.remove(client);
- Client::List::iterator it = _stacking.begin();
- const Client::List::iterator end = _stacking.end();
+ ClientList::iterator it = _stacking.begin();
+ const ClientList::iterator end = _stacking.end();
// the stacking list is from highest to lowest
for (; it != end && (*it)->layer() > client->layer(); ++it);
otherwise, we want to stack under the previous window in the stack.
*/
wins[0] = (it == _stacking.begin() ? _focuswindow :
- ((*(--Client::List::const_iterator(it)))->frame->window()));
+ ((*(--ClientList::const_iterator(it)))->frame->window()));
wins[1] = client->frame->window();
_stacking.insert(it, client);
XRestackWindows(**otk::display, wins, 2);
- changeStackingList();
+
+ // if the window has a modal child, then raise it after us to put it on top
+ if (client->modalChild())
+ raiseWindow(client->modalChild());
+ else
+ changeStackingList(); // no need to do this twice!
}
void Screen::changeDesktop(long desktop)
if (old == _desktop) return;
- Client::List::iterator it, end = clients.end();
+ ClientList::iterator it, end = clients.end();
for (it = clients.begin(); it != end; ++it) {
if ((*it)->desktop() == old) {
(*it)->frame->hide();
if (!(num > 0)) return;
// move windows on desktops that will no longer exist!
- Client::List::iterator it, end = clients.end();
+ ClientList::iterator it, end = clients.end();
for (it = clients.begin(); it != end; ++it) {
int d = (*it)->desktop();
- if (d >= num && !(d == 0xffffffff || d == Client::ICONIC_DESKTOP)) {
+ if (d >= num && !(d == (signed) 0xffffffff ||
+ d == Client::ICONIC_DESKTOP)) {
XEvent ce;
ce.xclient.type = ClientMessage;
ce.xclient.message_type = otk::Property::atoms.net_wm_desktop;
}
+void Screen::installColormap(bool install) const
+{
+ if (install)
+ XInstallColormap(**otk::display, _info->colormap());
+ else
+ XUninstallColormap(**otk::display, _info->colormap());
+}
+
+
void Screen::propertyHandler(const XPropertyEvent &e)
{
otk::EventHandler::propertyHandler(e);