[svn-upgrade] Integrating new upstream version, ion3 (20070506)

[ion3.git] / ioncore / detach.c

diff --git a/ioncore/detach.c b/ioncore/detach.c
index 8493b9afbca73dc82922b053aafef49d8d8ad9d6..72c74060e4d6d1278b4866147c5b7e2b36e55fa3 100644 (file)
--- a/ioncore/detach.c
+++ b/ioncore/detach.c
@@ -3,10 +3,7 @@
  *
  * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
- * 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>
@@ -41,7 +38,8 @@ static void get_relative_geom(WRectangle *g, WRegion *reg, WRegion *mgr)
 }
 
 
-bool ioncore_do_detach(WRegion *reg, WGroup *grp, WFrameMode framemode)
+static bool ioncore_do_detach(WRegion *reg, WGroup *grp, WFrameMode framemode,
+                              uint framelevel)
 {
     WGroupAttachParams ap=GROUPATTACHPARAMS_INIT;
     WRegionAttachData data;
@@ -71,6 +69,9 @@ bool ioncore_do_detach(WRegion *reg, WGroup *grp, WFrameMode framemode)
         
         ap.geom_weak_set=TRUE;
         ap.geom_weak=0;
+
+        ap.level_set=TRUE;
+        ap.level=framelevel+1;
         
         get_relative_geom(&fpa.inner_geom, reg, (WRegion*)grp);
 
@@ -84,8 +85,8 @@ bool ioncore_do_detach(WRegion *reg, WGroup *grp, WFrameMode framemode)
             ap.szplcy=st->szplcy;
             ap.szplcy_set=TRUE;
             
-            ap.level=maxof(st->level, STACKING_LEVEL_NORMAL);
             ap.level_set=TRUE;
+            ap.level=maxof(st->level, STACKING_LEVEL_NORMAL);
         }
         
         ap.geom_set=TRUE;
@@ -123,14 +124,19 @@ static WRegion *check_mplex(WRegion *reg, WFrameMode *mode)
 }
 
 
-static WGroup *find_group(WRegion *reg)
+static WGroup *find_group(WRegion *reg, uint *level)
 {
     WRegion *mgr=REGION_MANAGER(reg);
     
     while(mgr!=NULL){
+        reg=mgr;
         mgr=REGION_MANAGER(mgr);
-        if(OBJ_IS(mgr, WGroup))
+        if(OBJ_IS(mgr, WGroup)){
+            WStacking *st=ioncore_find_stacking((WRegion*)reg);
+            if(st!=NULL)
+                *level=st->level;
             break;
+        }
     }
     
     return (WGroup*)mgr;
@@ -143,10 +149,11 @@ bool ioncore_detach(WRegion *reg, int sp)
     WFrameMode mode;
     WGroup *grp;
     bool set, nset;
+    uint level=STACKING_LEVEL_NORMAL;
     
     reg=region_groupleader_of(reg);
     
-    grp=find_group(check_mplex(reg, &mode));
+    grp=find_group(check_mplex(reg, &mode), &level);
     
     /* reg is only considered detached if there's no higher-level group
      * to attach to, thus causing 'toggle' to cycle.
@@ -158,7 +165,7 @@ bool ioncore_detach(WRegion *reg, int sp)
         return set;
 
     if(!set){
-        return ioncore_do_detach(reg, grp, mode);
+        return ioncore_do_detach(reg, grp, mode, level);
     }else{
         WPHolder *ph=region_get_return(reg);
         
@@ -177,11 +184,12 @@ bool ioncore_detach(WRegion *reg, int sp)
 
 /*EXTL_DOC
  * Detach or reattach \var{reg}, depending on whether \var{how}
- * is 'set'/'unset'/'toggle'. (Detaching means making \var{reg} 
- * managed by its nearest ancestor \type{WGroup}, framed if \var{reg} is
- * not itself \type{WFrame}. Reattaching means making it managed where
- * it used to be managed, if a return-placeholder exists.)
- * If \var{reg} is the 'bottom' of some group, the whole group is
+ * is \codestr{set}, \codestr{unset} or \codestr{toggle}. (Detaching 
+ * means making \var{reg} managed by its nearest ancestor \type{WGroup},
+ * framed if \var{reg} is not itself \type{WFrame}. Reattaching means 
+ * making it managed where it used to be managed, if a return-placeholder
+ * exists.)
+ * If \var{reg} is the `bottom' of some group, the whole group is
  * detached. If \var{reg} is a \type{WWindow}, it is put into a 
  * frame.
  */
@@ -197,24 +205,27 @@ bool ioncore_detach_extl(WRegion *reg, const char *how)
 
 void do_unsqueeze(WRegion *reg)
 {
-    WSizeHints hints;
+    WSizeHints h;
+    WRegion *mgr=REGION_MANAGER(reg);
     
-    if(REGION_MANAGER_CHK(reg, WScreen)!=NULL)
+    if(OBJ_IS(reg, WScreen))
         return;
     
-    region_size_hints(reg, &hints);
+    region_size_hints(reg, &h);
 
-    if(!hints.min_set)
+    if(!h.min_set)
         return;
         
-    if(hints.min_width<=REGION_GEOM(reg).w &&
-       hints.min_height<=REGION_GEOM(reg).h){
+    if(h.min_width<=REGION_GEOM(reg).w && 
+       h.min_height<=REGION_GEOM(reg).h){
         return;
     }
     
-    if(!ioncore_detach(reg, SETPARAM_SET))
-        return;
+    ioncore_detach(reg, SETPARAM_SET);
         
+    if(REGION_MANAGER(reg)==mgr)
+        return;
+    
     do_unsqueeze(reg);
 }