X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreen.cc;h=db0cb862919c91860aeef2311a09fffef055cae3;hb=9e6b0d5a8d0226232802bdece77665b167f98dae;hp=aa272009534334542d33d0e89e43caf2835e6486;hpb=c00829334d83d30cbc1bfc9a9be23e9cadc3307b;p=chaz%2Fopenbox

diff --git a/src/screen.cc b/src/screen.cc
index aa272009..db0cb862 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -77,7 +77,7 @@ Screen::Screen(int screen)
   // 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()) {
@@ -103,18 +103,19 @@ Screen::Screen(int screen)
 
   // 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
@@ -210,7 +211,7 @@ void Screen::updateStrut()
 {
   _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);
@@ -263,7 +264,7 @@ void Screen::calcArea()
  
   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();
   }
@@ -370,8 +371,8 @@ void Screen::changeClientList()
     
     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
@@ -401,8 +402,8 @@ void Screen::changeStackingList()
     
     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
@@ -614,6 +615,9 @@ void Screen::unmanageWindow(Client *client)
   // influence
   updateStrut();
 
+  // unset modal before dropping our focus
+  client->setModal(false);
+  
   // unfocus the client (calls the focus callbacks)
   client->unfocus();
 
@@ -633,17 +637,31 @@ void Screen::lowerWindow(Client *client)
 
   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();
@@ -658,8 +676,8 @@ void Screen::raiseWindow(Client *client)
   // 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);
@@ -669,13 +687,18 @@ void Screen::raiseWindow(Client *client)
     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)
@@ -693,7 +716,7 @@ 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();
@@ -713,8 +736,24 @@ void Screen::changeNumDesktops(long num)
   
   if (!(num > 0)) return;
 
-  // XXX: move windows on desktops that will no longer exist!
-  
+  // move windows on desktops that will no longer exist!
+  ClientList::iterator it, end = clients.end();
+  for (it = clients.begin(); it != end; ++it) {
+    int d = (*it)->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;
+      ce.xclient.display = **otk::display;
+      ce.xclient.window = (*it)->window();
+      ce.xclient.format = 32;
+      ce.xclient.data.l[0] = num - 1;
+      XSendEvent(**otk::display, _info->rootWindow(), False,
+                 SubstructureNotifyMask | SubstructureRedirectMask, &ce);
+    }
+  }
+
   _num_desktops = num;
   otk::Property::set(_info->rootWindow(),
                      otk::Property::atoms.net_number_of_desktops,
@@ -731,6 +770,10 @@ void Screen::changeNumDesktops(long num)
 
   // update the work area hint
   changeWorkArea();
+
+  // change our desktop if we're on one that no longer exists!
+  if (_desktop >= num)
+    changeDesktop(num - 1);
 }
 
 
@@ -761,13 +804,23 @@ void Screen::setDesktopName(long i, const otk::ustring &name)
 }
 
 
+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);
 
   // compress changes to a single property into a single change
   XEvent ce;
-  while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
+  while (XCheckTypedWindowEvent(**otk::display, _info->rootWindow(),
+                                e.type, &ce)) {
     // XXX: it would be nice to compress ALL changes to a property, not just
     //      changes in a row without other props between.
     if (ce.xproperty.atom != e.atom) {
@@ -792,7 +845,6 @@ void Screen::clientMessageHandler(const XClientMessageEvent &e)
   } else if (e.message_type == otk::Property::atoms.net_number_of_desktops) {
     changeNumDesktops(e.data.l[0]);
   }
-  // XXX: so many client messages to handle here! ..or not.. they go to clients
 }