1 files changed, 69 insertions, 8 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index e3b08c6..36b1918 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -360,6 +360,12 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
     Display *disp = m_root_window.display();
     Fluxbox *fluxbox = Fluxbox::instance();
 
+    // TODO fluxgen: check if this is the right place (it was not -lis)
+    //
+    // Create the first one, initXinerama will expand this if needed.
+    m_head_areas.resize(1);
+    m_head_areas[0] = new HeadArea();
+
     initXinerama();
 
     // setup error handler to catch "screen already managed by other wm"
@@ -402,9 +408,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
         XFree(ret_prop);
     }
 
-    // TODO fluxgen: check if this is the right place
-    m_head_areas = new HeadArea[numHeads() ? numHeads() : 1];
-
 #ifdef HAVE_RANDR
     // setup RANDR for this screens root window
     // we need to determine if we should use old randr select input function or not
@@ -600,7 +603,8 @@ BScreen::~BScreen() {
     m_slit.reset(0);
 
     // TODO fluxgen: check if this is the right place
-    delete [] m_head_areas;
+    for (int i = 0; i < m_head_areas.size(); i++)
+        delete m_head_areas[i];
 
     delete m_focus_control;
     delete m_placement_strategy;
@@ -722,7 +726,12 @@ unsigned int BScreen::currentWorkspaceID() const {
 }
 
 const Strut* BScreen::availableWorkspaceArea(int head) const {
-    return m_head_areas[head ? head-1 : 0].availableWorkspaceArea();
+    if (head > numHeads()) {
+        /* May this ever happen? */
+        static Strut whole(-1 /* should never be used */, 0, width(), 0, height());
+        return &whole;
+    }
+    return m_head_areas[head ? head-1 : 0]->availableWorkspaceArea();
 }
 
 unsigned int BScreen::maxLeft(int head) const {
@@ -1412,7 +1421,7 @@ Strut *BScreen::requestStrut(int head, int left, int right, int top, int bottom)
 
     Strut* next = 0;
     for (int i = begin; i != end; i++) {
-        next = m_head_areas[i].requestStrut(i+1, left, right, top, bottom, next);
+        next = m_head_areas[i]->requestStrut(i+1, left, right, top, bottom, next);
     }
 
     return next;
@@ -1422,7 +1431,9 @@ void BScreen::clearStrut(Strut *str) {
     if (str->next())
         clearStrut(str->next());
     int head = str->head() ? str->head() - 1 : 0;
-    m_head_areas[head].clearStrut(str);
+    /* The number of heads may have changed, be careful. */
+    if (head < numHeads())
+        m_head_areas[head]->clearStrut(str);
     // str is invalid now
 }
 
@@ -1431,7 +1442,7 @@ void BScreen::updateAvailableWorkspaceArea() {
     bool updated = false;
 
     for (size_t i = 0; i < n; i++) {
-        updated = m_head_areas[i].updateAvailableWorkspaceArea() || updated;
+        updated = m_head_areas[i]->updateAvailableWorkspaceArea() || updated;
     }
 
     if (updated)
@@ -1886,6 +1897,9 @@ void BScreen::renderPosWindow() {
 }
 
 void BScreen::updateSize() {
+    // update xinerama layout
+    initXinerama();
+
     // force update geometry
     rootWindow().updateGeometry();
 
@@ -1895,6 +1909,9 @@ void BScreen::updateSize() {
     // send resize notify
     m_resize_sig.notify();
     m_workspace_area_sig.notify();
+
+    // move windows out of inactive heads
+    clearHeads();
 }
 
 
@@ -1941,10 +1958,13 @@ void BScreen::initXinerama() {
     Display *display = FbTk::App::instance()->display();
 
     if (!XineramaIsActive(display)) {
+notactive:
 #ifdef DEBUG
         cerr<<"BScreen::initXinerama(): dont have Xinerama"<<endl;
 #endif // DEBUG
         m_xinerama_avail = false;
+        if (m_xinerama_headinfo)
+            delete [] m_xinerama_headinfo;
         m_xinerama_headinfo = 0;
         m_xinerama_num_heads = 0;
         return;
@@ -1957,6 +1977,19 @@ void BScreen::initXinerama() {
     XineramaScreenInfo *screen_info;
     int number;
     screen_info = XineramaQueryScreens(display, &number);
+
+    /* The call may have actually failed. If this is the first time we init
+     * Xinerama, fall back to turning it off. If not, pretend nothing
+     * happened -- another event will tell us and it will work then. */
+    if (!screen_info) {
+        if (m_xinerama_headinfo)
+            return;
+        else
+            goto notactive;
+    }
+
+    if (m_xinerama_headinfo)
+        delete [] m_xinerama_headinfo;
     m_xinerama_headinfo = new XineramaHeadInfo[number];
     m_xinerama_num_heads = number;
     for (int i=0; i < number; i++) {
@@ -1970,6 +2003,18 @@ void BScreen::initXinerama() {
     cerr<<"BScreen::initXinerama(): number of heads ="<<number<<endl;
 #endif // DEBUG
 
+    /* Reallocate to the new number of heads. */
+    int ha_num = numHeads() ? numHeads() : 1, ha_oldnum = m_head_areas.size();
+    if (ha_num > ha_oldnum) {
+        m_head_areas.resize(ha_num);
+        for (int i = ha_oldnum; i < ha_num; i++)
+            m_head_areas[i] = new HeadArea();
+    } else if (ha_num < ha_oldnum) {
+        for (int i = ha_num; i < ha_oldnum; i++)
+            delete m_head_areas[i];
+        m_head_areas.resize(ha_num);
+    }
+
 #else // XINERAMA
     // no xinerama
     m_xinerama_avail = false;
@@ -1978,6 +2023,22 @@ void BScreen::initXinerama() {
 
 }
 
+/* Move windows out of inactive heads */
+void BScreen::clearHeads() {
+    if (!hasXinerama()) return;
+
+    for (Workspaces::iterator i = m_workspaces_list.begin();
+            i != m_workspaces_list.end(); i++) {
+        for (Workspace::Windows::iterator win = (*i)->windowList().begin();
+                win != (*i)->windowList().end(); win++) {
+            if (getHead((*win)->fbWindow()) == 0) {
+                // first head is a safe bet here
+                (*win)->placeWindow(1);
+            }
+        }
+    }
+}
+
 int BScreen::getHead(int x, int y) const {
     if (!hasXinerama()) return 0;
 #ifdef XINERAMA