add a focused() member

[chaz/openbox] / src / screen.cc

diff --git a/src/screen.cc b/src/screen.cc
index 72a33b41fd4f8a571647794115145bdd28172937..c181434107bd3cf08d0ad2e93fd0b076962f704e 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -110,11 +110,12 @@ Screen::Screen(int screen)
   // the above set() will cause the updateDesktopNames to fire right away so
   // we have a list of desktop names
 
+  _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
@@ -134,7 +135,7 @@ Screen::Screen(int screen)
   openbox->registerHandler(_info->rootWindow(), this);
 
   // call the python Startup callbacks
-  EventData data(_number, 0, EventAction::Shutdown, 0);
+  EventData data(_number, 0, EventAction::Startup, 0);
   openbox->bindings()->fireEvent(&data);
 }
 
@@ -224,7 +225,7 @@ void Screen::updateStrut()
 
 void Screen::calcArea()
 {
-//  otk::Rect old_area = _area;
+  otk::Rect old_area = _area;
 
 /*
 #ifdef    XINERAMA
@@ -260,9 +261,13 @@ void Screen::calcArea()
   }
 #endif // XINERAMA
 */
-  
-  //if (old_area != _area)
-    // XXX: re-maximize windows
+ 
+  if (old_area != _area) {
+    // the area has changed, adjust all the maximized windows
+    Client::List::iterator it, end = clients.end();
+    for (it = clients.begin(); it != end; ++it)
+      (*it)->remaximize();
+  }
 
   changeWorkArea();
 }
@@ -416,7 +421,6 @@ void Screen::changeStackingList()
 void Screen::changeWorkArea() {
   unsigned long *dims = new unsigned long[4 * _num_desktops];
   for (long i = 0; i < _num_desktops; ++i) {
-    // XXX: this could be different for each workspace
     dims[(i * 4) + 0] = _area.x();
     dims[(i * 4) + 1] = _area.y();
     dims[(i * 4) + 2] = _area.width();
@@ -512,8 +516,7 @@ void Screen::manageWindow(Window window)
   // reparent the client to the frame
   client->frame->grabClient();
 
-  if (!(openbox->state() == Openbox::State_Starting ||
-        client->positionRequested())) {
+  if (openbox->state() != Openbox::State_Starting) {
     // position the window intelligenty .. hopefully :)
     // call the python PLACEWINDOW binding
     EventData data(_number, client, EventAction::PlaceWindow, 0);
@@ -634,14 +637,28 @@ void Screen::lowerWindow(Client *client)
   Client::List::iterator it = --_stacking.end();
   const Client::List::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 :
+               ((*(--Client::List::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();
@@ -673,7 +690,12 @@ void Screen::raiseWindow(Client *client)
   _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)
@@ -711,8 +733,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!
+  Client::List::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,
@@ -729,6 +767,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);
 }
 
 
@@ -765,7 +807,8 @@ void Screen::propertyHandler(const XPropertyEvent &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) {
@@ -790,7 +833,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
 }