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

[ion3.git] / ioncore / mplexpholder.h

diff --git a/ioncore/mplexpholder.h b/ioncore/mplexpholder.h
index a017641c3df4c9badefa9fe2ba0488bdc3e23419..aee4678af57af122524eb1dcd2c496f4f6904315 100644 (file)
--- a/ioncore/mplexpholder.h
+++ b/ioncore/mplexpholder.h
@@ -18,7 +18,7 @@
 
 DECLCLASS(WMPlexPHolder){
     WPHolder ph;
-    Watch mplex_watch;
+    WMPlex *mplex;
     WFramedPHolder *recreate_pholder; /* only on first of list */
     WLListNode *after;
     WMPlexPHolder *next, *prev;
@@ -43,7 +43,7 @@ extern WRegion *mplexpholder_do_attach(WMPlexPHolder *ph, int flags,
 
 extern bool mplexpholder_do_goto(WMPlexPHolder *ph);
 
-extern WPHolder *mplexpholder_do_root(WMPlexPHolder *ph);
+extern bool mplexpholder_stale(WMPlexPHolder *ph);
 
 extern WRegion *mplexpholder_do_target(WMPlexPHolder *ph);
 
@@ -57,6 +57,8 @@ extern void mplex_move_phs(WMPlex *mplex, WLListNode *node,
                            WMPlexPHolder *after,
                            WLListNode *or_after);
 extern void mplex_move_phs_before(WMPlex *mplex, WLListNode *node);
+extern void mplex_migrate_phs(WMPlex *src, WMPlex *dst);
+extern void mplex_flatten_phs(WMPlex *mplex);
 
 extern WMPlexPHolder *mplex_managed_get_pholder(WMPlex *mplex, 
                                                 WRegion *mgd);