X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=ioncore%2Fmanage.c;h=9215804123b63c79444ee0fe394016b4b9b8db4f;hp=f1b04c60f5e82f29db0378738388eb337b6dd1c4;hb=e3aec18706513a87eaa7839dfdaf7e0fcd0d8d2a;hpb=f869221ce49f0fb7cca48eee28daff8684305963 diff --git a/ioncore/manage.c b/ioncore/manage.c index f1b04c6..9215804 100644 --- a/ioncore/manage.c +++ b/ioncore/manage.c @@ -1,7 +1,7 @@ /* * ion/ioncore/manage.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2009. * * See the included file LICENSE for details. */ @@ -72,6 +72,9 @@ static WPHolder *try_target(WClientWin *cwin, const WManageParams *param, if(r==NULL) return NULL; + if(!region_same_rootwin(r, (WRegion*)cwin)) + return NULL; + return region_prepare_manage(r, cwin, param, MANAGE_PRIORITY_NONE); } @@ -183,6 +186,7 @@ bool clientwin_do_manage_default(WClientWin *cwin, WPHolder *ph=NULL; int swf=(param->switchto ? PHOLDER_ATTACH_SWITCHTO : 0); bool ok, uq=FALSE; + WRegion *createroot=NULL; /* Find a suitable screen */ scr=clientwin_find_suitable_screen(cwin, param); @@ -223,15 +227,22 @@ bool clientwin_do_manage_default(WClientWin *cwin, return FALSE; /* Not in full-screen mode; use the placeholder to attach. */ - - ok=pholder_attach(ph, swf, (WRegion*)cwin); - + { + WRegionAttachData data; + data.type=REGION_ATTACH_REPARENT; + data.u.reg=(WRegion*)cwin; + + createroot=pholder_do_attach(ph, + swf|PHOLDER_ATTACH_RETURN_CREATEROOT, + &data); + } + destroy_obj((Obj*)ph); - if(uq && ok) - ioncore_unsqueeze((WRegion*)cwin, FALSE); + if(uq && createroot!=NULL) + ioncore_unsqueeze(createroot, FALSE); - return ok; + return (createroot!=NULL); }