Imported Upstream version 20090110

[ion3.git] / mod_tiling / ops.c

diff --git a/mod_tiling/ops.c b/mod_tiling/ops.c
index 48365528a2c2c16efc17ce8d35daf0135f8fef1b..f09d5029287606c85736c02055518abb4408223e 100644 (file)
--- a/mod_tiling/ops.c
+++ b/mod_tiling/ops.c
@@ -1,14 +1,12 @@
 /*
  * ion/mod_tiling/ops.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2007. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 
  *
- * Ion is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * See the included file LICENSE for details.
  */
 
+#include <libtu/objp.h>
 #include <ioncore/common.h>
 #include <ioncore/mplex.h>
 #include <ioncore/focus.h>
@@ -17,39 +15,42 @@
 #include "tiling.h"
 
 
+/*{{{ mkbottom */
+
+
 static WRegion *mkbottom_fn(WWindow *parent, const WFitParams *fp, 
                             void *param)
 {
-    WRegion *reg=(WRegion*)param;
+    WRegion *reg=(WRegion*)param, *res;
+    WRegionAttachData data;
     WTiling *tiling;
-    WSplitRegion *node=NULL;
+    WFitParams fp2;
     
-    if(!region_fitrep(reg, parent, fp))
-        return NULL;
+    fp2.mode=REGION_FIT_EXACT;
+    fp2.g=fp->g;
     
-    tiling=create_tiling(parent, fp, NULL, FALSE);
+    tiling=create_tiling(parent, &fp2, NULL, FALSE);
     
     if(tiling==NULL)
         return NULL;
-    
-    node=create_splitregion(&REGION_GEOM(tiling), reg);
-    if(node!=NULL){
-        tiling->split_tree=(WSplit*)node;
-        tiling->split_tree->ws_if_root=tiling;
-        
-        region_detach_manager(reg);
         
-        if(tiling_managed_add(tiling, reg))
-            return (WRegion*)tiling;
-        
-        #warning "TODO: reattach?"
-        
-        destroy_obj((Obj*)tiling->split_tree);
-        tiling->split_tree=NULL;
-    }
+    data.type=REGION_ATTACH_REPARENT;
+    data.u.reg=reg;
     
-    destroy_obj((Obj*)tiling);
-    return NULL;
+    /* Warning! Potentially dangerous call to remove a `reg` from the same
+     * group we're being attached to, and from the attach routine of which
+     * this function is called from!
+     */
+    res=region_attach_helper((WRegion*)tiling, parent, &fp2,
+                             (WRegionDoAttachFn*)tiling_do_attach_initial, 
+                             NULL, &data);
+    
+    if(res==NULL){
+        destroy_obj((Obj*)tiling);
+        return NULL;
+    }
+        
+    return (WRegion*)tiling;
 }
 
 
@@ -63,14 +64,13 @@ bool mod_tiling_mkbottom(WRegion *reg)
     WGroup *grp=REGION_MANAGER_CHK(reg, WGroup);
     WGroupAttachParams ap=GROUPATTACHPARAMS_INIT;
     WRegionAttachData data;
-    WRegion *tiling;
     
     if(grp==NULL){
         warn(TR("Not member of a group"));
         return FALSE;
     }
     
-    if(grp->bottom!=NULL){
+    if(group_bottom(grp)!=NULL){
         warn(TR("Manager group already has bottom"));
         return FALSE;
     }
@@ -90,6 +90,74 @@ bool mod_tiling_mkbottom(WRegion *reg)
     data.u.n.fn=mkbottom_fn;
     data.u.n.param=reg;
     
-    /* kele... poisto samalla kuin attach */
+    /* See the "Warning!" above. */
     return (group_do_attach(grp, &ap, &data)!=NULL);
 }
+
+
+/*}}}*/
+
+
+/*{{{ untile */
+
+
+/*EXTL_DOC
+ * If \var{tiling} is managed by some group, float the frames in
+ * the tiling in that group, and dispose of \var{tiling}.
+ */
+EXTL_EXPORT
+bool mod_tiling_untile(WTiling *tiling)
+{
+    WGroup *grp=REGION_MANAGER_CHK(tiling, WGroup);
+    WGroupAttachParams param=GROUPATTACHPARAMS_INIT;
+    WTilingIterTmp tmp;
+    WRegion *reg, *reg2;
+    
+    if(grp==NULL){
+        warn(TR("Not member of a group"));
+        return FALSE;
+    }
+    
+    if(group_bottom(grp)==(WRegion*)tiling)
+        group_set_bottom(grp, NULL);
+    
+    /* Setting `batchop` will stop `tiling_managed_remove` from 
+     * resizing remaining frames into freed space. It will also 
+     * stop the tiling from being destroyed by actions of
+     * `tiling_managed_disposeroot`.
+     */
+    tiling->batchop=TRUE;
+    
+    FOR_ALL_MANAGED_BY_TILING(reg, tiling, tmp){
+        WRegionAttachData data;
+        
+        /* Don't bother with the status display */
+        if(reg==TILING_STDISP_OF(tiling))
+            continue;
+        
+        /* Don't bother with regions containing no client windows. */
+        if(!region_rescue_needed(reg))
+            continue;
+        
+        data.type=REGION_ATTACH_REPARENT;
+        data.u.reg=reg;
+        
+        param.geom_set=TRUE;
+        param.geom=REGION_GEOM(reg);
+        
+        reg2=group_do_attach(grp, &param, &data);
+        
+        if(reg2==NULL)
+            warn(TR("Unable to move a region from tiling to group."));
+    }
+    
+    tiling->batchop=FALSE;
+    
+    region_dispose((WRegion*)tiling);
+    
+    return TRUE;
+}
+
+
+/*}}}*/
+