/*
* ion/mod_tiling/tiling.c
*
- * Copyright (c) Tuomo Valkonen 1999-2007.
+ * Copyright (c) Tuomo Valkonen 1999-2009.
*
* See the included file LICENSE for details.
*/
tiling_unmanage_stdisp(ws, TRUE, TRUE);
return;
}
+
+ stdisp->flags|=REGION_SKIP_FOCUS;
dg=((WSplit*)(ws->stdispnode))->geom;
frame=OBJ_CAST(reg, WFrame);
if(frame!=NULL){
- WFrameMode mode=frame_mode(frame);
- if(mode!=FRAME_MODE_TILED && mode!=FRAME_MODE_TILED_ALT)
+ if(framemode_unalt(frame_mode(frame))!=FRAME_MODE_TILED)
frame_set_mode(frame, FRAME_MODE_TILED);
}
}
region_unset_manager(reg, (WRegion*)ws);
+ splittree_set_node_of(reg, NULL);
}
if(other!=NULL){
node->reg=other;
+ splittree_set_node_of(other, node);
tiling_managed_add(ws, other);
reused=TRUE;
}else{
destroy_obj((Obj*)newframe);
return NULL;
}
-
- /* Restack */
- if(ws->split_tree!=NULL)
- split_restack(ws->split_tree, ws->dummywin, Above);
return newframe;
}
}
-void do_unsplit(WRegion *reg)
+/*EXTL_DOC
+ * Try to relocate regions managed by \var{reg} to another frame
+ * and, if possible, destroy it.
+ */
+EXTL_EXPORT_MEMBER
+void tiling_unsplit_at(WTiling *ws, WRegion *reg)
{
- WTiling *ws=REGION_MANAGER_CHK(reg, WTiling);
WPHolder *ph;
- bool res;
- if(ws==NULL)
+ if(reg==NULL || REGION_MANAGER(reg)!=(WRegion*)ws)
return;
ph=region_get_rescue_pholder_for((WRegion*)ws, reg);
- if(ph==NULL){
- res=!region_rescue_needed(reg);
- }else{
- res=region_rescue(reg, ph);
+ if(ph!=NULL){
+ region_rescue(reg, ph, REGION_RESCUE_NODEEP|REGION_RESCUE_PHFLAGS_OK);
destroy_obj((Obj*)ph);
}
- if(!res){
- warn(TR("Unable to unsplit: Could not move client windows "
- "elsewhere within the tiling."));
- return;
- }
-
- destroy_obj((Obj*)reg);
-}
-
-
-/*EXTL_DOC
- * Try to relocate regions managed by \var{reg} to another frame
- * and, if possible, destroy it.
- */
-EXTL_EXPORT_MEMBER
-void tiling_unsplit_at(WTiling *ws, WRegion *reg)
-{
- if(reg==NULL || REGION_MANAGER(reg)!=(WRegion*)ws)
- return;
-
- mainloop_defer_action((Obj*)reg, (WDeferredAction*)do_unsplit);
+ region_defer_rqdispose(reg);
}
/*EXTL_DOC
* Iterate over managed regions of \var{ws} until \var{iterfn} returns
* \code{false}.
- * The function itself returns \code{true} if it reaches the end of list
+ * The function is called in protected mode.
+ * This routine returns \code{true} if it reaches the end of list
* without this happening.
*/
EXTL_SAFE