only focus new 'normal' windows

[chaz/openbox] / src / screen.cc

diff --git a/src/screen.cc b/src/screen.cc
index 18105f2a847a05faf1bec34bcfa6d649b6c45e7d..8ea1b49ea8a0432f48bf86ed50278a9434cbb880 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -27,6 +27,7 @@ extern "C" {
 #include "otk/display.hh"
 
 #include <vector>
+#include <algorithm>
 
 static bool running;
 static int anotherWMRunning(Display *display, XErrorEvent *) {
@@ -93,7 +94,7 @@ OBScreen::OBScreen(int screen)
   // set up notification of netwm support
   setSupportedAtoms();
 
-  // Set the netwm atoms for geomtery and viewport
+  // Set the netwm properties for geometry and viewport
   unsigned long geometry[] = { _info->width(),
                                _info->height() };
   Openbox::instance->property()->set(_info->rootWindow(),
@@ -106,6 +107,11 @@ OBScreen::OBScreen(int screen)
                                      otk::OBProperty::Atom_Cardinal,
                                      viewport, 2);
 
+  // Set the net_desktop_names property
+  std::vector<std::string> names;
+  python_get_stringlist("desktop_names", &names);
+  _root.setDesktopNames(names);
+  
   // create the window which gets focus when no clients get it
   XSetWindowAttributes attr;
   attr.override_redirect = true;
@@ -186,17 +192,19 @@ void OBScreen::manageExisting()
 }
 
 
-//! Adds a window's strut to the screen's list of reserved spaces
-void OBScreen::addStrut(otk::Strut *strut)
-{
-  _struts.push_back(strut);
-}
-
-
-//! Removes a window's strut from the screen's list of reserved spaces
-void OBScreen::removeStrut(otk::Strut *strut)
+void OBScreen::updateStrut()
 {
-  _struts.remove(strut);
+  _strut.left = _strut.right = _strut.top = _strut.bottom = 0;
+
+  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);
+    _strut.right = std::max(_strut.right, s.right);
+    _strut.top = std::max(_strut.top, s.top);
+    _strut.bottom = std::max(_strut.bottom, s.bottom);
+  }
+  calcArea();
 }
 
 
@@ -212,31 +220,9 @@ void OBScreen::calcArea()
 #endif // XINERAMA
 */
   
-  /* these values represent offsets from the screen edge
-   * we look for the biggest offset on each edge and then apply them
-   * all at once
-   * do not be confused by the similarity to the names of Rect's members
-   */
-  unsigned int current_left = 0, current_right = 0, current_top = 0,
-    current_bottom = 0;
-
-  StrutList::const_iterator it = _struts.begin(), end = _struts.end();
-
-  for(; it != end; ++it) {
-    otk::Strut *strut = *it;
-    if (strut->left > current_left)
-      current_left = strut->left;
-    if (strut->top > current_top)
-      current_top = strut->top;
-    if (strut->right > current_right)
-      current_right = strut->right;
-    if (strut->bottom > current_bottom)
-      current_bottom = strut->bottom;
-  }
-
-  _area.setRect(current_left, current_top,
-                _info->width() - (current_left + current_right),
-                _info->height() - (current_top + current_bottom));
+  _area.setRect(_strut.left, _strut.top,
+                _info->width() - (_strut.left + _strut.right),
+                _info->height() - (_strut.top + _strut.bottom));
 
 /*
 #ifdef    XINERAMA
@@ -304,9 +290,7 @@ void OBScreen::setSupportedAtoms()
       otk::OBProperty::net_workarea,
       otk::OBProperty::net_client_list,
       otk::OBProperty::net_client_list_stacking,
-/*
       otk::OBProperty::net_desktop_names,
-*/
       otk::OBProperty::net_close_window,
       otk::OBProperty::net_wm_name,
       otk::OBProperty::net_wm_visible_name,
@@ -315,9 +299,7 @@ void OBScreen::setSupportedAtoms()
 /*
       otk::OBProperty::net_wm_desktop,
 */
-/*
       otk::OBProperty::net_wm_strut,
-*/
       otk::OBProperty::net_wm_window_type,
       otk::OBProperty::net_wm_window_type_desktop,
       otk::OBProperty::net_wm_window_type_dock,
@@ -361,7 +343,8 @@ void OBScreen::setSupportedAtoms()
 
   // convert to the atom values
   for (int i = 0; i < num_supported; ++i)
-    supported[i] = Openbox::instance->property()->atom(supported[i]);
+    supported[i] =
+      Openbox::instance->property()->atom((otk::OBProperty::Atoms)supported[i]);
   
   Openbox::instance->property()->set(_info->rootWindow(),
                                      otk::OBProperty::net_supported,
@@ -522,7 +505,7 @@ void OBScreen::manageWindow(Window window)
   // XXX: if on the current desktop..
   client->frame->show();
  
-  // XXX: handle any requested states such as shaded/maximized
+  // XXX: handle any requested states such as maximized
 
   otk::OBDisplay::ungrab();
 
@@ -535,6 +518,15 @@ void OBScreen::manageWindow(Window window)
   setClientList();
 
   Openbox::instance->bindings()->grabButtons(true, client);
+
+  // XXX: make this optional or more intelligent
+  if (client->normal())
+    client->focus();
+
+  // call the python NEWWINDOW binding
+  EventData *data = new_event_data(window, EventNewWindow, 0);
+  Openbox::instance->bindings()->fireEvent(data);
+  Py_DECREF((PyObject*)data);
 }
 
 
@@ -542,6 +534,11 @@ void OBScreen::unmanageWindow(OBClient *client)
 {
   OBFrame *frame = client->frame;
 
+  // call the python CLOSEWINDOW binding 
+  EventData *data = new_event_data(client->window(), EventCloseWindow, 0);
+  Openbox::instance->bindings()->fireEvent(data);
+  Py_DECREF((PyObject*)data);
+
   Openbox::instance->bindings()->grabButtons(false, client);
 
   // remove from the stacking order
@@ -550,9 +547,13 @@ void OBScreen::unmanageWindow(OBClient *client)
   // pass around focus if this window was focused XXX do this better!
   if (Openbox::instance->focusedClient() == client) {
     OBClient *newfocus = 0;
-    if (!_stacking.empty())
-      newfocus = _stacking.front();
-    if (! (newfocus && newfocus->focus()))
+    ClientList::iterator it, end = _stacking.end();
+    for (it = _stacking.begin(); it != end; ++it)
+      if ((*it)->normal() && (*it)->focus()) {
+        newfocus = *it;
+        break;
+      }
+    if (!newfocus)
       client->unfocus();
   }