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

[ion3.git] / ioncore / mplex.c

diff --git a/ioncore/mplex.c b/ioncore/mplex.c
index da1bd49b48218c0bd4cfd631cd097ed2fbf56646..239d46f7e2134f012e9de16a01cf11859abbcfc7 100644 (file)
--- a/ioncore/mplex.c
+++ b/ioncore/mplex.c
@@ -492,9 +492,10 @@ static void mplex_managed_rqgeom(WMPlex *mplex, WRegion *sub,
     node=mplex_find_stacking(mplex, sub);
     
     assert(node!=NULL);
-
+    
+    fp.mode=0;
     mplex_managed_geom(mplex, &fp.g);
-
+    
     sizepolicy(&node->szplcy, sub, &rq->geom, rq->flags, &fp);
     
     if(geomret!=NULL)
@@ -1297,6 +1298,7 @@ bool mplex_do_attach_final(WMPlex *mplex, WRegion *reg, WMPlexPHolder *ph)
     if(!(param->flags&MPLEX_ATTACH_WHATEVER)){
         WFitParams fp;
         
+        fp.mode=0;
         mplex_managed_geom(mplex, &(fp.g));
         
         sizepolicy(&node->szplcy, reg, 
@@ -1323,7 +1325,11 @@ bool mplex_do_attach_final(WMPlex *mplex, WRegion *reg, WMPlexPHolder *ph)
              * client windows still..)
              */
             mplex_refocus(mplex, NULL, FALSE);
+        }else if(!hidden){
+            region_pointer_focus_hack(reg);
         }
+    }else if(!hidden){
+        region_pointer_focus_hack(reg);
     }
     
     if(lnode!=NULL)