Integration of new Layering code, plus updates to the layering code itself

 - new KeyActions: Raise/LowerLayer, AlwaysOnTop/Bottom, Top/BottomLayer
Added a "Quit" KeyAction

1 files changed, 87 insertions, 12 deletions

diff --git a/src/FbTk/MultLayers.cc b/src/FbTk/MultLayers.cc
index fbe8bfe..7f8f584 100644
--- a/src/FbTk/MultLayers.cc
+++ b/src/FbTk/MultLayers.cc
@@ -20,11 +20,12 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MultLayers.cc,v 1.2 2003/01/29 21:42:52 rathnor Exp $
+// $Id: MultLayers.cc,v 1.3 2003/02/02 16:32:41 rathnor Exp $
 
 #include "MultLayers.hh"
 #include "XLayer.hh"
 #include "XLayerItem.hh"
+#include "App.hh"
 
 using namespace FbTk;
 
@@ -51,10 +52,44 @@ XLayerItem *MultLayers::getLowestItemAboveLayer(int layernum) {
 
 }    
 
+XLayerItem *MultLayers::getItemBelow(XLayerItem &item) {
+    XLayer *curr_layer = item.getLayer();
+    cerr<<"getItemBelow xlayer = "<<hex<<curr_layer<<endl;
+    // assume that the LayerItem does exist in a layer.
+    XLayerItem *ret = curr_layer->getItemBelow(item);
+
+    if (!ret) {
+        int num = curr_layer->getLayerNum()-1;
+        while (num >= 0 && !ret) {
+            ret = m_layers[num]->getItemBelow(item);
+            num--;
+        }
+    }
+
+    return ret;
+}    
+
+XLayerItem *MultLayers::getItemAbove(XLayerItem &item) {
+    XLayer *curr_layer = item.getLayer();
+    
+    // assume that the LayerItem does exist in a layer.
+    XLayerItem *ret = curr_layer->getItemAbove(item);
+
+    if (!ret) {
+        ret = getLowestItemAboveLayer(curr_layer->getLayerNum());
+    }
+
+    return ret;
+}    
 
 void MultLayers::addToTop(XLayerItem &item, int layernum) {
-    if (layernum < 0 || layernum >= m_numlayers) return;
+    if (layernum < 0) 
+        layernum = 0; 
+    else if (layernum >= m_numlayers) 
+        layernum = m_numlayers-1;
+
     m_layers[layernum]->insert(item);
+    restack();
 }
 
 void MultLayers::remove(XLayerItem &item) {
@@ -70,24 +105,64 @@ void MultLayers::remove(XLayerItem &item) {
 void MultLayers::raise(XLayerItem &item) {
     // get the layer it is in
     XLayer *curr_layer = item.getLayer();
-    if (!curr_layer || curr_layer->getLayerNum() == 0 || m_numlayers == 1) {
-        // do nothing
-        return;
-    }
-    
-    curr_layer->remove(item);
-    m_layers[curr_layer->getLayerNum()-1]->insert(item);
+    moveToLayer(item, curr_layer->getLayerNum()-1);
 }
 
 /* lower the item one level */
 void MultLayers::lower(XLayerItem &item) {
     // get the layer it is in
     XLayer *curr_layer = item.getLayer();
-    if (!curr_layer || curr_layer->getLayerNum() >= (m_numlayers-1) || m_numlayers == 1) {
-        // do nothing
+    moveToLayer(item, curr_layer->getLayerNum()+1);
+}
+
+void MultLayers::moveToLayer(XLayerItem &item, int layernum) {
+    // get the layer it is in
+    XLayer *curr_layer = item.getLayer();
+    if (!curr_layer) {
+        addToTop(item, layernum);
         return;
     }
+    if (curr_layer->getLayerNum() == layernum )
+        // do nothing
+        return;
+    
+    if (layernum < 0) 
+        layernum = 0; 
+    else if (layernum >= m_numlayers) 
+        layernum = m_numlayers-1;
     
     curr_layer->remove(item);
-    m_layers[curr_layer->getLayerNum()+1]->insert(item);
+    m_layers[layernum]->insert(item);
+}
+
+void MultLayers::restack() {
+    int i=0, j=0, size=0;
+    for (; i < m_numlayers; i++) {
+        size += m_layers[i]->countWindows();
+    }
+
+    Window *winlist = new Window[size];
+    for (i=0; i < m_numlayers; i++) {
+
+        XLayer::ItemList::iterator it = m_layers[i]->getItemList().begin();
+        XLayer::ItemList::iterator it_end = m_layers[i]->getItemList().end();
+
+        for (; it != it_end; ++it) {
+            XLayerItem::Windows::const_iterator wit = (*it)->getWindows().begin();
+            XLayerItem::Windows::const_iterator wit_end = (*it)->getWindows().end();
+            for (; wit != wit_end; ++wit, j++) {
+                winlist[j] = (*wit);
+            }
+        }
+    }
+
+    XRestackWindows(FbTk::App::instance()->display(), winlist, size);
+}
+
+int MultLayers::size() {
+    int i = 0, num = 0;
+    for (; i < m_numlayers; i++) {
+        num += m_layers[i]->countWindows();
+    }
+    return num;
 }