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

[ion3.git] / ioncore / group.h

diff --git a/ioncore/group.h b/ioncore/group.h
index 0de372a84f35f790604c334829dda0e8b2ff2dde..d4f2d26abf0924d45a4d14bc6a2ef18ec34a0f40 100644 (file)
--- a/ioncore/group.h
+++ b/ioncore/group.h
@@ -1,12 +1,9 @@
 /*
  * ion/ioncore/group.h
  *
- * 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.
  */
 
 #ifndef ION_IONCORE_GROUP_H
@@ -36,7 +33,6 @@ DECLSTRUCT(WGroupAttachParams){
     uint switchto_set:1;
     
     uint switchto:1;
-    uint modal:1;
     uint bottom:1;
     
     int geom_weak;
@@ -48,7 +44,7 @@ DECLSTRUCT(WGroupAttachParams){
 };
 
 #define GROUPATTACHPARAMS_INIT \
-    {0, 0, 0, 0, 0,  0, 0, 0,  0, {0, 0, 0, 0},  0, 0, NULL}
+    {0, 0, 0, 0, 0,  0, 0,   0, {0, 0, 0, 0},  0, 0, NULL}
 
 
 DECLCLASS(WGroup){
@@ -58,7 +54,6 @@ DECLCLASS(WGroup){
     WStacking *current_managed;
     WStacking *bottom;
     Window dummywin;
-    uint bottom_last_close:1;
 };
 
 
@@ -92,9 +87,12 @@ extern void group_manage_stdisp(WGroup *ws, WRegion *stdisp,
 
 extern void group_managed_remove(WGroup *ws, WRegion *reg);
 
+extern void group_managed_notify(WGroup *ws, WRegion *reg, WRegionNotify how);
+
 extern WRegion *group_bottom(WGroup *ws);
+extern bool group_set_bottom(WGroup *ws, WRegion *reg);
 
-extern bool group_rescue_clientwins(WGroup *ws, WPHolder *ph);
+extern bool group_rescue_clientwins(WGroup *ws, WRescueInfo *info);
 
 extern bool group_rqclose(WGroup *ws);
 extern bool group_rqclose_relocate(WGroup *ws);
@@ -105,6 +103,10 @@ extern bool group_managed_rqorder(WGroup *grp, WRegion *sub,
 extern WStacking *group_find_stacking(WGroup *ws, WRegion *r);
 extern WStacking *group_find_to_focus(WGroup *ws, WStacking *to_try);
 
+extern WRegion *region_groupleader_of(WRegion *reg);
+/*extern WRegion *region_group_of(WRegion *reg);*/
+
+
 typedef WStackingFilter WGroupIterFilter;
 typedef WStackingIterTmp WGroupIterTmp;