Refactor: bundle xinerama-info together, simpler code

Part of this massive looking but simple rather simple change is a the way we
check for active Xinerama: XineramaIsActive() was used before. The docs for
XineramaQueryScreens() state that

    XineramaQueryScreens() returns NULL and sets number to
    0 if Xinerama is not active.

Sold.

1 files changed, 17 insertions, 12 deletions

diff --git a/src/Screen.hh b/src/Screen.hh
index eb2a306..771899f 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -370,14 +370,14 @@ public:
     // Xinerama-related functions
 
     /// @return true if xinerama is available
-    bool hasXinerama() const { return m_xinerama_avail; }
+    bool hasXinerama() const { return m_xinerama.avail; }
     /// @return umber of xinerama heads
-    int numHeads() const { return m_xinerama_num_heads; }
+    int numHeads() const { return m_xinerama.heads.size(); }
 
     void initXinerama();
+    void clearXinerama();
     void clearHeads();
     /// clean up xinerama
-    void clearXinerama();
 
     /**
      * Determines head number for a position
@@ -475,7 +475,7 @@ private:
 
     FbTk::MultLayers m_layermanager;
 
-    bool root_colormap_installed, managed;
+    bool root_colormap_installed;
 
     std::auto_ptr<FbTk::ImageControl> m_image_control;
     std::auto_ptr<FbMenu> m_configmenu, m_rootmenu, m_workspacemenu, m_windowmenu;
@@ -525,21 +525,26 @@ private:
     const ClientPattern *m_cycle_opts;
 
     // Xinerama related private data
-    bool m_xinerama_avail;
-    int m_xinerama_num_heads;
-    int m_xinerama_center_x, m_xinerama_center_y;
-
-    std::vector<HeadArea *> m_head_areas;
-
     struct XineramaHeadInfo {
         int _x, _y, _width, _height;
         int x() const { return _x; }
         int y() const { return _y; }
         int width() const { return _width; }
         int height() const { return _height; }
-    } *m_xinerama_headinfo;
+    };
+    struct {
+        bool avail;
+        int center_x;
+        int center_y;
+        std::vector<XineramaHeadInfo> heads;
+    } m_xinerama;
+
+    std::vector<HeadArea*> m_head_areas;
+
 
-    bool m_restart, m_shutdown;
+    bool m_restart;
+    bool m_shutdown;
+    bool managed;
 };