X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ioncore%2Fregion.c;h=2a8e9feeadf7db31378f422a87ac63533993baf3;hb=69fc8b21b1d40335e5c4223bcc74c26d49202fb2;hp=ebec9e726ed00422c8de3ab98bb3cb46b6b118e1;hpb=ae4260bb64817c11f9a7140324cd3e3ba113e297;p=ion3.git diff --git a/ioncore/region.c b/ioncore/region.c index ebec9e7..2a8e9fe 100644 --- a/ioncore/region.c +++ b/ioncore/region.c @@ -283,7 +283,9 @@ bool region_prepare_focus(WRegion *reg, int flags, WPrepareFocusResult *res) { - if(!REGION_IS_ACTIVE(reg) || !REGION_IS_MAPPED(reg)){ + if(TRUE /* !REGION_IS_ACTIVE(reg) || + !REGION_IS_MAPPED(reg) || + ioncore_g.focus_next!=NULL*/){ WRegion *mgr=REGION_MANAGER(reg); WRegion *par=REGION_PARENT_REG(reg); @@ -494,7 +496,7 @@ bool region_dispose_(WRegion *reg, bool not_simple) WPHolder *ph=NULL; if(rescue){ - if(!region_rescue(reg, NULL)){ + if(!region_rescue(reg, NULL, 0)){ warn(TR("Failed to rescue some client windows - not closing.")); return FALSE; } @@ -596,6 +598,9 @@ void region_unset_manager(WRegion *reg, WRegion *mgr) reg->manager=NULL; + /* Reset status, as it is set by manager */ + reg->flags&=~REGION_SKIP_FOCUS; + if(region_is_activity_r(reg)) region_clear_mgd_activity(mgr);