X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=ioncore%2Fmplex.h;h=bf9d61b4b26501f483b81d81525f68f48fa14cbd;hp=829c84124c5ac4a0521f516c2a044b082fc816bb;hb=e3aec18706513a87eaa7839dfdaf7e0fcd0d8d2a;hpb=803afbc1cd633f6c025bcd9537e9b7e9aedadd0d

diff --git a/ioncore/mplex.h b/ioncore/mplex.h
index 829c841..bf9d61b 100644
--- a/ioncore/mplex.h
+++ b/ioncore/mplex.h
@@ -1,12 +1,9 @@
 /*
  * ion/ioncore/mplex.h
  *
- * Copyright (c) Tuomo Valkonen 1999-2007. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 
  * 
- * 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_MPLEX_H
@@ -33,12 +30,13 @@
 #define MPLEX_ATTACH_SWITCHTO     0x0001 /* switch to region */
 #define MPLEX_ATTACH_UNNUMBERED   0x0002 /* do not put on mut.ex list */
 #define MPLEX_ATTACH_HIDDEN       0x0004 /* should be hidden */
-#define MPLEX_ATTACH_MODAL        0x0008 /* shortcut.. */
+#define MPLEX_ATTACH_PSEUDOMODAL  0x0008 /* pseudomodal (if modal) */
 #define MPLEX_ATTACH_LEVEL        0x0010 /* level field set */
 #define MPLEX_ATTACH_GEOM         0x0020 /* geometry field is set */
 #define MPLEX_ATTACH_SIZEPOLICY   0x0040 /* size policy field is set */
 #define MPLEX_ATTACH_INDEX        0x0080 /* index field is set */
 #define MPLEX_ATTACH_WHATEVER     0x0100 /* set REGION_FIT_WHATEVER */
+#define MPLEX_ATTACH_PASSIVE      0x0200 /* sets SKIP_FOCUS */
 
 
 enum{
@@ -96,7 +94,7 @@ DECLCLASS(WMPlex){
     int mx_count;
     WLListNode *mx_current;
     WLListNode *mx_list;
-    WMPlexPHolder *mx_phs;
+    WMPlexPHolder *misc_phs;
     
     Watch stdispwatch;
     WMPlexSTDispInfo stdispinfo;
@@ -140,12 +138,10 @@ extern WRegion *mplex_do_attach(WMPlex *mplex, WMPlexAttachParams *param,
 extern WRegion *mplex_do_attach_new(WMPlex *mplex, WMPlexAttachParams *param,
                                     WRegionCreateFn *fn, void *fn_param);
 
-extern void mplex_attach_tagged(WMPlex *mplex);
-
 extern void mplex_managed_remove(WMPlex *mplex, WRegion *reg);
 extern void mplex_child_removed(WMPlex *mplex, WRegion *sub);
 
-extern bool mplex_rescue_clientwins(WMPlex *mplex, WPHolder *ph);
+extern bool mplex_rescue_clientwins(WMPlex *mplex, WRescueInfo *info);
 
 extern WPHolder *mplex_prepare_manage(WMPlex *mplex, const WClientWin *cwin,
                                       const WManageParams *param, int redir);
@@ -176,7 +172,6 @@ extern bool mplex_managed_rqorder(WMPlex *mplex, WRegion *sub,
 /* Misc */
 
 extern WRegion *mplex_current(WMPlex *mplex);
-extern bool mplex_may_destroy(WMPlex *mplex);
 
 extern bool mplex_managed_i(WMPlex *mplex, ExtlFn iterfn);
 
@@ -188,10 +183,14 @@ extern WRegion *mplex_mx_current(WMPlex *mplex);
 extern void mplex_call_changed_hook(WMPlex *mplex, WHook *hook, 
                                     int mode, bool sw, WRegion *reg);
 
-extern WLListNode *mplex_find_node(WMPlex *mplex, WRegion *reg);
-
 extern void mplex_remanage_stdisp(WMPlex *mplex);
 
+/* Note: only the size policy field is changed; actual geometry is not
+ * yet changed.
+ */
+extern void mplex_set_szplcy(WMPlex *mplex, WRegion *sub, WSizePolicy szplcy);
+extern WSizePolicy mplex_get_szplcy(WMPlex *mplex, WRegion *sub);
+
 /* Dynfuns */
 
 DYNFUN void mplex_managed_geom(const WMPlex *mplex, WRectangle *geom);