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

[ion3.git] / ioncore / framedpholder.h

diff --git a/ioncore/framedpholder.h b/ioncore/framedpholder.h
index 2bd7f1b631cf0acdce643e9c6b2ff630a3dbbbf2..dfbbe5044c8b4f1e9c43b88bed1bb9509658ffa8 100644 (file)
--- a/ioncore/framedpholder.h
+++ b/ioncore/framedpholder.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/framedpholder.h
  *
- * Copyright (c) Tuomo Valkonen 2005-2006. 
+ * Copyright (c) Tuomo Valkonen 2005-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
@@ -15,19 +15,19 @@
 #include "common.h"
 #include "pholder.h"
 #include "attach.h"
-
-INTRCLASS(WFramedPHolder);
-INTRSTRUCT(WFramedParam);
+#include "frame.h"
 
 
-#define FRAMEDPARAM_INIT {0, 0, {0, 0, 0, 0}, NULL}
+#define FRAMEDPARAM_INIT {0, 0, {0, 0, 0, 0}, FRAME_MODE_FLOATING /*, NULL*/}
 
+INTRSTRUCT(WFramedParam);
 
 DECLSTRUCT(WFramedParam){
     uint inner_geom_gravity_set:1;
     int gravity;
     WRectangle inner_geom;
-    WRegionSimpleCreateFn *mkframe;
+    WFrameMode mode;
+    /*WRegionSimpleCreateFn *mkframe;*/
 };
 
 
@@ -48,6 +48,8 @@ extern void framedpholder_deinit(WFramedPHolder *ph);
 
 extern bool framedpholder_do_goto(WFramedPHolder *ph);
 
+extern WPHolder *framedpholder_do_root(WFramedPHolder *ph);
+
 extern WRegion *framedpholder_do_target(WFramedPHolder *ph);
 
 extern WRegion *framedpholder_do_attach(WFramedPHolder *ph, int flags,
@@ -57,4 +59,7 @@ extern WRegion *region_attach_framed(WRegion *reg, WFramedParam *param,
                                      WRegionAttachFn *fn, void *fn_param,
                                      WRegionAttachData *data);
 
+extern void frame_adjust_to_initial(WFrame *frame, const WFitParams *fp, 
+                                    const WFramedParam *param, WRegion *reg);
+
 #endif /* ION_IONCORE_FRAMEDPHOLDER_H */