X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ioncore%2Fmplex.c;h=a9ea894f6eaa696d8677957866221509d98aa244;hb=78a74b3b5846eacaecea5045d1cd185e9c8e21d7;hp=71943a4595ca6829fe6da5ea8b267669eb3fe320;hpb=ae4260bb64817c11f9a7140324cd3e3ba113e297;p=ion3.git diff --git a/ioncore/mplex.c b/ioncore/mplex.c index 71943a4..a9ea894 100644 --- a/ioncore/mplex.c +++ b/ioncore/mplex.c @@ -231,8 +231,8 @@ WRegion *mplex_mx_current(WMPlex *mplex) /*EXTL_DOC - * Returns the \var{n}:th object managed by \var{mplex} on the - * \var{l}:th layer. + * Returns the \var{n}:th object on the mutually exclusive + * list of \var{mplex}. */ EXTL_SAFE EXTL_EXPORT_MEMBER @@ -505,6 +505,27 @@ static void mplex_managed_rqgeom(WMPlex *mplex, WRegion *sub, } +void mplex_set_szplcy(WMPlex *mplex, WRegion *sub, WSizePolicy szplcy) +{ + WStacking *node; + + node=mplex_find_stacking(mplex, sub); + + if(node!=NULL) + node->szplcy=szplcy; +} + + +WSizePolicy mplex_get_szplcy(WMPlex *mplex, WRegion *sub) +{ + WStacking *node; + + node=mplex_find_stacking(mplex, sub); + + return (node==NULL ? SIZEPOLICY_DEFAULT : node->szplcy); +} + + /*}}}*/ @@ -630,7 +651,7 @@ static WStacking *mplex_do_to_focus(WMPlex *mplex, WStacking *to_try, static WStacking *mplex_do_to_focus_on(WMPlex *mplex, WStacking *node, WStacking *to_try, - PtrList **hidelist) + PtrList **hidelist, bool *within) { WGroup *grp=OBJ_CAST(node->reg, WGroup); WStacking *st; @@ -638,26 +659,21 @@ static WStacking *mplex_do_to_focus_on(WMPlex *mplex, WStacking *node, if(grp!=NULL){ if(to_try==NULL) to_try=grp->current_managed; + /* Only will return stuff within 'node' */ st=mplex_find_to_focus(mplex, to_try, node, hidelist); - if(st!=NULL || to_try!=NULL) + if(st!=NULL){ + if(within!=NULL) + *within=TRUE; return st; - if(hidelist!=NULL) - ptrlist_clear(hidelist); - /* We don't know whether something is blocking focus here, - * or if there was nothing to focus (as node->reg itself - * isn't on the stacking list). - */ + } } st=mplex_do_to_focus(mplex, node, hidelist); - if(st==node) - return st; + if(st==node && within!=NULL) + *within=TRUE; - if(hidelist!=NULL) - ptrlist_clear(hidelist); - - return NULL; + return st; } @@ -816,22 +832,18 @@ static void mplex_do_node_display(WMPlex *mplex, WStacking *node, static bool mplex_refocus(WMPlex *mplex, WStacking *node, bool warp) { WStacking *foc=NULL; - bool ret=TRUE; + bool within=FALSE; - if(node!=NULL){ - foc=mplex_do_to_focus_on(mplex, node, NULL, NULL); - ret=(foc!=NULL); - } + if(node!=NULL) + foc=mplex_do_to_focus_on(mplex, node, NULL, NULL, &within); - if(foc==NULL){ - ret=FALSE; + if(foc==NULL || !within) foc=mplex_to_focus(mplex); - } if(foc!=NULL) region_maybewarp(foc->reg, warp); - return ret; + return within; } @@ -843,6 +855,7 @@ bool mplex_do_prepare_focus(WMPlex *mplex, WStacking *node, PtrList *hidelist=NULL; PtrList **hidelistp=(ew ? NULL : &hidelist); WStacking *foc; + bool within=FALSE; if(sub==NULL && node==NULL) return FALSE; @@ -854,10 +867,7 @@ bool mplex_do_prepare_focus(WMPlex *mplex, WStacking *node, if(!region_prepare_focus((WRegion*)mplex, flags, res)) return FALSE; - if(node!=NULL) - foc=mplex_do_to_focus_on(mplex, node, sub, hidelistp); - else - foc=mplex_do_to_focus(mplex, sub, hidelistp); + foc=mplex_do_to_focus_on(mplex, node, sub, hidelistp, &within); if(foc!=NULL){ while(hidelist!=NULL){ @@ -876,10 +886,7 @@ bool mplex_do_prepare_focus(WMPlex *mplex, WStacking *node, res->reg=foc->reg; res->flags=flags; - if(sub==NULL) - return (foc==node); - else - return (foc==sub); + return within; }else{ return FALSE; } @@ -1280,6 +1287,9 @@ bool mplex_do_attach_final(WMPlex *mplex, WRegion *reg, WMPlexPHolder *ph) region_set_manager(reg, (WRegion*)mplex); + if(param->flags&MPLEX_ATTACH_PASSIVE) + reg->flags|=REGION_SKIP_FOCUS; + if(!(param->flags&MPLEX_ATTACH_WHATEVER)){ WFitParams fp; @@ -1382,7 +1392,6 @@ WRegion *mplex_attach_simple(WMPlex *mplex, WRegion *reg, int flags) static void get_params(WMPlex *mplex, ExtlTab tab, int mask, WMPlexAttachParams *par) { - int layer=1; int tmp; char *tmpstr; int ok=~mask; @@ -1408,6 +1417,9 @@ static void get_params(WMPlex *mplex, ExtlTab tab, int mask, if(extl_table_is_bool_set(tab, "hidden")) par->flags|=MPLEX_ATTACH_HIDDEN&ok; + if(extl_table_is_bool_set(tab, "passive")) + par->flags|=MPLEX_ATTACH_PASSIVE&ok; + if(extl_table_is_bool_set(tab, "pseudomodal")) par->flags|=MPLEX_ATTACH_PSEUDOMODAL&ok; @@ -1489,6 +1501,7 @@ WRegion *mplex_attach_new_(WMPlex *mplex, WMPlexAttachParams *par, * \var{hidden} & (boolean) Attach hidden, if not prevented * by e.g. the mutually exclusive list being empty. * This option overrides \var{switchto}. \\ + * \var{passive} & (boolean) Skip in certain focusing operations. \\ * \var{pseudomodal} & (boolean) The attached region is ``pseudomodal'' * if the stacking level dictates it to be modal. * This means that the region may be hidden to display @@ -1772,11 +1785,12 @@ static bool do_attach_stdisp(WRegion *mplex, WRegion *reg, void *unused) * * \begin{tabularx}{\linewidth}{lX} * \tabhead{Field & Description} - * \var{pos} & The corner of the screen to place the status display - * in: one of \codestr{tl}, \codestr{tr}, \codestr{bl} + * \var{pos} & (string) The corner of the screen to place the status + * display in: one of \codestr{tl}, \codestr{tr}, \codestr{bl} * or \codestr{br}. \\ - * \var{action} & If this field is set to \codestr{keep}, \var{corner} - * and \var{orientation} are changed for the existing + * \var{fullsize} & (boolean) Waste all available space. \\ + * \var{action} & (string) If this field is set to \codestr{keep}, + * \var{pos} and \var{fullsize} are changed for the existing * status display. If this field is set to \codestr{remove}, * the existing status display is removed. If this * field is not set or is set to \codestr{replace}, a