Changed /etc/X11/$(PACKAGE) to /etc/X11/ion3 since the path should be the same in...

[ion3.git] / ioncore / group-cw.c

diff --git a/ioncore/group-cw.c b/ioncore/group-cw.c
index dc5cc69e6b43aca6dadc2e8cbc9e05a73aae8e47..5a2a32d3ceda3377fe3a19f95a057363f612335a 100644 (file)
--- a/ioncore/group-cw.c
+++ b/ioncore/group-cw.c
@@ -1,12 +1,9 @@
 /*
  * ion/ioncore/group-cw.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * 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 <string.h>
@@ -33,13 +30,6 @@
 /*{{{ Add/remove managed */
 
 
-WRegion *create_transient_frame(WWindow *par, 
-                                const WFitParams *fp)
-{
-    return (WRegion*)create_frame(par, fp, FRAME_MODE_TRANSIENT);
-}
-
-
 static WPHolder *groupcw_transient_pholder(WGroupCW *cwg, 
                                            const WClientWin *cwin,
                                            const WManageParams *mp)
@@ -69,7 +59,7 @@ static WPHolder *groupcw_transient_pholder(WGroupCW *cwg,
         fp.inner_geom_gravity_set=1;
         fp.inner_geom=mp->geom;
         fp.gravity=ForgetGravity;
-        fp.mkframe=create_transient_frame;
+        fp.mode=FRAME_MODE_TRANSIENT;
         
         ph=(WPHolder*)create_grouppholder(&cwg->grp, NULL, &param);
         
@@ -79,9 +69,9 @@ static WPHolder *groupcw_transient_pholder(WGroupCW *cwg,
 
 
 WPHolder *groupcw_prepare_manage(WGroupCW *cwg, const WClientWin *cwin,
-                                 const WManageParams *param, int redir)
+                                 const WManageParams *param, int priority)
 {
-    if(redir==MANAGE_REDIR_STRICT_YES)
+    if(!MANAGE_PRIORITY_OK(priority, MANAGE_PRIORITY_GROUP))
         return NULL;
     
     /* Only catch windows with transient mode set to current here. */
@@ -126,6 +116,23 @@ WPHolder *groupcw_prepare_manage_transient(WGroupCW *cwg,
 }
 
 
+static WRegion *groupcw_managed_disposeroot(WGroupCW *ws, WRegion *reg)
+{
+    WGroupIterTmp tmp;
+    WStacking *st;
+    WRegion *tmpr;
+    
+    FOR_ALL_NODES_IN_GROUP(&ws->grp, st, tmp){
+        if(st!=ws->grp.managed_stdisp && st->reg!=reg){
+            return reg;
+        }
+    }
+    
+    tmpr=region_disposeroot((WRegion*)ws);
+    return (tmpr!=NULL ? tmpr : reg);
+}
+
+
 /*}}}*/
 
 
@@ -181,13 +188,20 @@ const char *groupcw_displayname(WGroupCW *cwg)
 }
 
 
-void groupcw_managed_notify(WGroupCW *cwg, WRegion *reg, const char *how)
+void groupcw_managed_notify(WGroupCW *cwg, WRegion *reg, WRegionNotify how)
 {
-    if(group_bottom(&cwg->grp)==reg 
-       && strcmp(how, "name")==0){
+    if(group_bottom(&cwg->grp)==reg && how==ioncore_g.notifies.name){
         /* Title has changed */
         region_notify_change((WRegion*)cwg, how);
     }
+    
+    group_managed_notify(&cwg->grp, reg, how);
+}
+
+
+void groupcw_bottom_set(WGroupCW *cwg)
+{
+    region_notify_change((WRegion*)cwg, ioncore_g.notifies.name);
 }
 
 
@@ -200,13 +214,10 @@ void groupcw_managed_notify(WGroupCW *cwg, WRegion *reg, const char *how)
 bool groupcw_init(WGroupCW *cwg, WWindow *parent, const WFitParams *fp)
 {
     cwg->transient_szplcy=DFLT_SZPLCY;
-    /*cwg->fs_pholder=NULL;*/
     
     if(!group_init(&(cwg->grp), parent, fp))
         return FALSE;
     
-    cwg->grp.bottom_last_close=TRUE;
-
     region_add_bindmap((WRegion*)cwg, ioncore_groupcw_bindmap);
     
     return TRUE;
@@ -283,12 +294,18 @@ static DynFunTab groupcw_dynfuntab[]={
 
     {(DynFun*)region_prepare_manage_transient,
      (DynFun*)groupcw_prepare_manage_transient},
+     
+    {(DynFun*)region_managed_disposeroot,
+     (DynFun*)groupcw_managed_disposeroot},
     
     {(DynFun*)region_displayname,
      (DynFun*)groupcw_displayname},
     
     {region_managed_notify,
      groupcw_managed_notify},
+     
+    {group_bottom_set,
+     groupcw_bottom_set},
     
     END_DYNFUNTAB
 };