Remove a tiling when its last frame is removed

Instead of incorrectly 'recovering', which lead to a tiling that
no longer worked and eventually caused crashes.

Author: raboof

ioncore/frame.c

@@ -64,7 +64,6 @@ bool frame_init(WFrame *frame, WWindow *parent, const WFitParams *fp,
                 WFrameMode mode, char *name)
 {
     WRectangle mg;
-    fprintf(stderr, "creating frame at %x\n", frame);
 
     frame->flags=0;
     frame->saved_geom.w=0;

libtu/obj.c

@@ -29,8 +29,6 @@ void destroy_obj(Obj *obj)
 {
     ClassDescr *d;
 
-    fprintf(stderr, "Destroying object of type %s at %x\n", OBJ_TYPESTR(obj), obj);
-
     if(OBJ_IS_BEING_DESTROYED(obj))
         return;
 
@@ -149,7 +147,6 @@ DynFun *lookup_dynfun(const Obj *obj, DynFun *func,
 
     descr=obj->obj_type;
 
-    //fprintf(stderr, "lookup_dynfun for obj %s at %x, obj_type at %x\n", OBJ_TYPESTR(obj), obj, obj->obj_type);
     for(; descr!=&Obj_classdescr; descr=descr->ancestor){
         if(descr->funtab==NULL)
             continue;

mod_tiling/split.c

@@ -191,7 +191,6 @@ bool splitinner_init(WSplitInner *split, const WRectangle *geom)
 
 bool splitsplit_init(WSplitSplit *split, const WRectangle *geom, int dir)
 {
-    fprintf(stderr, "creating wsplitsplit at %x\n", split);
     splitinner_init(&(split->isplit), geom);
     split->dir=dir;
     split->tl=NULL;
@@ -275,7 +274,6 @@ void splitsplit_deinit(WSplitSplit *split)
 void splitregion_deinit(WSplitRegion *split)
 {
     if(split->reg!=NULL){
-        fprintf(stderr, "deinitting splitregion at %x with reg %s %x\n", split, OBJ_TYPESTR(split->reg), split->reg);
         set_node_of_reg(split->reg, NULL);
         split->reg=NULL;
     }
@@ -1865,7 +1863,6 @@ void splitinner_mark_current(WSplitInner *split, WSplit *child)
 
 static void splitsplit_forall(WSplitSplit *node, WSplitFn *fn)
 {
-    fprintf(stderr, "executing fn for both children of the WSplitSplit at %x: %s %x -> %s %x & %s %x\n", node, OBJ_TYPESTR(node->isplit.split.parent), node->isplit.split.parent, OBJ_TYPESTR(node->tl), node->tl, OBJ_TYPESTR(node->br), node->br);
     fn(node->tl);
     fn(node->br);
 }
@@ -1996,10 +1993,8 @@ void split_map(WSplit *split)
 
 static void splitregion_unmap(WSplitRegion *split)
 {
-    if(split->reg!=NULL) {
-        fprintf(stderr, "unmapping splitregion at %x with reg %s %x\n", split, OBJ_TYPESTR(split->reg), split->reg);
+    if(split->reg!=NULL)
         region_unmap(split->reg);
-    }
 }
 
 static void splitinner_unmap(WSplitInner *split)

mod_tiling/tiling.c

@@ -515,7 +515,6 @@ bool tiling_managed_add(WTiling *ws, WRegion *reg)
 bool tiling_do_attach_initial(WTiling *ws, WRegion *reg)
 {
     assert(ws->split_tree==NULL);
-    fprintf(stderr, "tiling_do_attach_initial\n");
 
     ws->split_tree=(WSplit*)create_splitregion(&REGION_GEOM(reg), reg);
     if(ws->split_tree==NULL)
@@ -543,7 +542,6 @@ bool tiling_init(WTiling *ws, WWindow *parent, const WFitParams *fp,
                 WRegionSimpleCreateFn *create_frame_fn, bool ci)
 {
     const char *p[1];
-    fprintf(stderr, "tiling_init\n");
 
     ws->split_tree=NULL;
     ws->create_frame_fn=(create_frame_fn
@@ -594,7 +592,6 @@ bool tiling_init(WTiling *ws, WWindow *parent, const WFitParams *fp,
 
     region_register(&(ws->reg));
     region_add_bindmap((WRegion*)ws, mod_tiling_tiling_bindmap);
-    fprintf(stderr, "tiling_initted\n");
 
     return TRUE;
 }
@@ -702,34 +699,12 @@ void tiling_managed_remove(WTiling *ws, WRegion *reg)
     if(node==(WSplitRegion*)(ws->stdispnode))
         ws->stdispnode=NULL;
 
-    if(node!=NULL){
-        bool reused=FALSE;
+    if(node!=NULL)
+        splittree_remove((WSplit*)node, (!norestore && other!=NULL));
 
-        if(other==NULL && !norestore){
-            WWindow *par=REGION_PARENT(ws);
-            WFitParams fp;
-
-            assert(par!=NULL);
-
-            fp.g=node->split.geom;
-            fp.mode=REGION_FIT_EXACT;
-
-            other=(ws->create_frame_fn)(par, &fp);
-
-            if(other!=NULL){
-                node->reg=other;
-                tiling_managed_add(ws, other);
-                reused=TRUE;
-            }else{
-                warn(TR("Tiling in useless state."));
-            }
-        }
-
-        if(!reused)
-            splittree_remove((WSplit*)node, (!norestore && other!=NULL));
-    }
-
-    if(!norestore && other!=NULL && act && mcf)
+    if(other==NULL)
+        destroy_obj((Obj*)ws);
+    else if(!norestore && act && mcf)
         region_warp(other);
 }
 
@@ -1082,20 +1057,13 @@ void do_unsplit(WRegion *reg)
     if(ws==NULL)
         return;
 
-    fprintf(stderr, "unsplitting %s at %x\n", OBJ_TYPESTR(reg), reg);
-
     ph=region_get_rescue_pholder_for((WRegion*)ws, reg);
 
     if(ph==NULL){
-        fprintf(stderr, "no rescue needed?\n");
         res=!region_rescue_needed(reg);
-        fprintf(stderr, "res %d\n", res);
     }else{
-        fprintf(stderr, "rescueing\n");
         res=region_rescue(reg, ph);
-        fprintf(stderr, "rescued, destroying ph\n");
         destroy_obj((Obj*)ph);
-        fprintf(stderr, "destroyed ph\n");
     }
 
     if(!res){
@@ -1104,9 +1072,7 @@ void do_unsplit(WRegion *reg)
         return;
     }
 
-    fprintf(stderr, "destroying %x\n", reg);
     destroy_obj((Obj*)reg);
-    fprintf(stderr, "end do_unsplit\n");
 }
 
 
@@ -1679,7 +1645,6 @@ WRegion *tiling_load(WWindow *par, const WFitParams *fp, ExtlTab tab)
         ws->split_tree=tiling_load_node(ws, &REGION_GEOM(ws), treetab);
         extl_unref_table(treetab);
     }
-    fprintf(stderr, "loaded node\n");
 
     if(ws->split_tree==NULL){
         warn(TR("The workspace is empty."));
@@ -1690,7 +1655,6 @@ WRegion *tiling_load(WWindow *par, const WFitParams *fp, ExtlTab tab)
     ws->split_tree->ws_if_root=ws;
     split_restack(ws->split_tree, ws->dummywin, Above);
 
-    fprintf(stderr, "restacked\n");
     return (WRegion*)ws;
 }