Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_container.c edje_container.h edje_embryo.c
Log Message:
1. more container work
2. debugging output for atmos's edje embryo script op issue
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_container.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- edje_container.c 16 Aug 2004 05:09:58 -0000 1.5
+++ edje_container.c 24 Aug 2004 01:48:19 -0000 1.6
@@ -2,6 +2,172 @@
#include "edje_private.h"
#include "edje_container.h"
+static void
+_edje_container_relayout(Smart_Data *sd)
+{
+ Evas_List *l;
+ Evas_Coord x, y, w, h, sw, sh;
+
+ if (sd->freeze > 0) return;
+ if (!sd->need_layout) return;
+
+ if (sd->w < sd->min_w) sw = sd->min_w;
+ else if (sd->w > sd->max_w) sw = sd->max_w;
+ else sw = sd->w;
+
+ y = 0;
+ x = 0;
+ w = 0;
+ h = 0;
+
+ for (l = sd->children; l; l = l->next)
+ {
+ Edje_Item *ei;
+
+ ei = l->data;
+ if (sd->homogenous) h = sd->min_row_h;
+
+ ei->y = y;
+ ei->h = h;
+// ei->w = w;
+// ei->h = h;
+ }
+
+ sd->need_layout = 0;
+}
+
+static void
+_edje_container_recalc(Smart_Data *sd)
+{
+ Evas_List *l;
+ int any_max_h = 0, any_max_w = 0;
+ int i;
+
+ if (sd->freeze > 0) return;
+ if (!sd->changed) return;
+
+ sd->min_h = 0;
+ sd->max_h = -1;
+ sd->min_w = 0;
+ sd->max_w = -1;
+ sd->min_row_h = 0;
+ sd->max_row_h = -1;
+ sd->contents_h = 0;
+ sd->contents_w = 0;
+
+ for (i = 0; i < sd->cols; i++)
+ {
+ sd->min_w += sd->colinfo[i].minw;
+ if (sd->colinfo[i].maxw >= 0)
+ {
+ if (sd->max_w >= 0)
+ sd->max_w += sd->colinfo[i].maxw;
+ else
+ sd->max_w = sd->colinfo[i].maxw;
+ }
+ else
+ any_max_w = 1;
+ }
+ if (any_max_w) sd->max_w = -1;
+
+ if (sd->w < sd->min_w)
+ sd->contents_w = sd->min_w;
+ else if ((sd->max_w >= 0) && (sd->w < sd->max_w))
+ sd->w = sd->max_w;
+
+ for (l = sd->children; l; l = l->next)
+ {
+ Edje_Item *ei;
+
+ ei = l->data;
+ if (ei->minh > sd->min_row_h)
+ sd->min_row_h = ei->minh;
+ if (sd->max_row_h >= 0)
+ {
+ if (ei->maxh >= 0)
+ {
+ if (sd->max_row_h > ei->maxh)
+ sd->max_row_h = ei->maxh;
+ }
+ else
+ any_max_h = 1;
+ }
+ sd->min_h += ei->minh;
+ if (ei->maxh >= 0)
+ {
+ if (sd->max_h >= 0)
+ sd->max_h += ei->maxh;
+ else
+ sd->max_h = ei->maxh;
+ }
+ else
+ any_max_h = 1;
+ }
+ if (any_max_h)
+ {
+ sd->max_h = -1;
+ sd->max_row_h = -1;
+ }
+ if (sd->homogenous)
+ {
+ sd->min_h = evas_list_count(sd->children) * sd->min_row_h;
+ }
+
+ sd->changed = 0;
+ sd->change_child = 0;
+ sd->change_child_list = 0;
+ sd->change_cols = 0;
+
+ sd->need_layout = 1;
+ _edje_container_relayout(sd);
+}
+
+static void
+_edje_item_recalc(Edje_Item *ei)
+{
+ int i;
+
+ if (ei->freeze > 0) return;
+ if (!ei->recalc) return;
+ if (!ei->sd) return;
+
+ ei->minh = 0;
+ ei->maxh = -1;
+ for (i = 0; i < ((Smart_Data *)(ei->sd))->cols; i++)
+ {
+ if (ei->cells[i].minh > ei->minh) ei->minh = ei->cells[i].minh;
+ if (ei->cells[i].maxh >= 0)
+ {
+ if (ei->maxh >= 0)
+ {
+ if (ei->cells[i].maxh < ei->maxh)
+ ei->maxh = ei->cells[i].maxh;
+ }
+ else
+ ei->maxh = ei->cells[i].maxh;
+ }
+ if (((Smart_Data *)(ei->sd))->colinfo[i].minw < ei->cells[i].minw)
+ ((Smart_Data *)(ei->sd))->colinfo[i].minw = ei->cells[i].minw;
+ if (((Smart_Data *)(ei->sd))->colinfo[i].maxw >= 0)
+ {
+ if (ei->cells[i].maxw >= 0)
+ {
+ if (((Smart_Data *)(ei->sd))->colinfo[i].maxw > ei->cells[i].maxw)
+ ((Smart_Data *)(ei->sd))->colinfo[i].maxw = ei->cells[i].maxw;
+ }
+ }
+ else
+ ((Smart_Data *)(ei->sd))->colinfo[i].maxw = ei->cells[i].maxw;
+ }
+
+ ei->recalc = 0;
+
+ _edje_container_recalc(ei->sd);
+}
+
+
+/*****************************/
+
Edje_Item *
edje_item_add(Edje_Item_Class *cl, void *data)
{
@@ -18,9 +184,23 @@
void
edje_item_del(Edje_Item *ei)
{
+ Smart_Data *sd;
+
+ sd = ei->sd;
if (ei->object) evas_object_del(ei->object);
if (ei->overlay_object) evas_object_del(ei->overlay_object);
free(ei);
+ if (!sd) return;
+ sd->changed = 1;
+ sd->change_child_list = 1;
+ _edje_container_recalc(sd);
+}
+
+Evas_Object *
+edje_item_container_get(Edje_Item *ei)
+{
+ if (!ei->sd) return NULL;
+ return ((Smart_Data *)(ei->sd))->smart_obj;
}
/* an arbitary data pointer to use to track other data */
@@ -127,10 +307,7 @@
ei->freeze--;
if (ei->freeze > 0) return ei->freeze;
if (!ei->sd) return ei->freeze;
- if (ei->recalc)
- {
- /* FIXME: recalc item */
- }
+ if (ei->recalc) _edje_item_recalc(ei);
return ei->freeze;
}
@@ -148,13 +325,17 @@
(ei->cells[col].minh == minh) &&
(ei->cells[col].maxw == maxw) &&
(ei->cells[col].maxh == maxh)) return;
- ei->cells[col].minw = minw;
ei->cells[col].minh = minh;
- ei->cells[col].maxw = maxw;
ei->cells[col].maxh = maxh;
+ ei->cells[col].minw = minw;
+ ei->cells[col].maxw = maxw;
ei->recalc = 1;
- if (ei->freeze > 0) return;
- /* FIXME: recalc item */
+ if (ei->sd)
+ {
+ ((Smart_Data *)(ei->sd))->changed = 1;
+ ((Smart_Data *)(ei->sd))->change_child = 1;
+ }
+ _edje_item_recalc(ei);
}
void
@@ -178,78 +359,86 @@
edje_item_select(Edje_Item *ei)
{
ei->selected = 1;
+ /* FIXME: trigger item to change visually */
}
void
edje_item_unselect(Edje_Item *ei)
{
ei->selected = 0;
+ /* FIXME: trigger item to change visually */
}
/* focus stuff - only 1 can be focuesd */
void
edje_item_focus(Edje_Item *ei)
{
- ei->focused = 1;
+// ei->focused = 1;
}
void
edje_item_unfocus(Edje_Item *ei)
{
- ei->focused = 0;
+// ei->focused = 0;
}
/* disable/enable stuff - stops focus and selection working on these items */
void
edje_item_enable(Edje_Item *ei)
{
- ei->disabled = 0;
+// ei->disabled = 0;
}
void
edje_item_disable(Edje_Item *ei)
{
- ei->disabled = 1;
+// ei->disabled = 1;
}
/* item utils */
-Edje_Item *
-edje_item_next_get(Edje_Item *ei)
-{
-}
-
-Edje_Item *
-edje_item_prev_get(Edje_Item *ei)
-{
-}
-
int
edje_item_selected_get(Edje_Item *ei)
{
+ return ei->selected;
}
int
edje_item_focused_get(Edje_Item *ei)
{
+ return ei->focused;
}
int
edje_item_disabled_get(Edje_Item *ei)
{
+ return ei->disabled;
}
-double
-edje_item_position_get(Edje_Item *ei)
+/***** container calls *****/
+
+int
+edje_container_freeze(Evas_Object *obj)
{
+ Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return 0;
+ sd->freeze++;
+ return sd->freeze;
}
-void
-edje_item_offset_set(Edje_Item *ei, Evas_Coord x, Evas_Coord y, Evas_Coord w,
Evas_Coord h)
+int
+edje_container_thaw(Evas_Object *obj)
{
+ Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return 0;
+ sd->freeze--;
+ if (sd->freeze <= 0) _edje_container_recalc(sd);
+ return sd->freeze;
}
-/***** container calls *****/
-
void
edje_container_item_append(Evas_Object *obj, Edje_Item *ei)
{
@@ -257,6 +446,11 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ sd->children = evas_list_append(sd->children, ei);
+ sd->changed = 1;
+ sd->change_child_list = 1;
+ sd->rows = evas_list_count(sd->children);
+ _edje_container_recalc(sd);
}
void
@@ -266,6 +460,11 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ sd->children = evas_list_prepend(sd->children, ei);
+ sd->changed = 1;
+ sd->change_child_list = 1;
+ sd->rows = evas_list_count(sd->children);
+ _edje_container_recalc(sd);
}
void
@@ -275,6 +474,11 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ sd->children = evas_list_append_relative(sd->children, ei, rel);
+ sd->changed = 1;
+ sd->change_child_list = 1;
+ sd->rows = evas_list_count(sd->children);
+ _edje_container_recalc(sd);
}
void
@@ -284,15 +488,30 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ sd->children = evas_list_prepend_relative(sd->children, ei, rel);
+ sd->changed = 1;
+ sd->change_child_list = 1;
+ sd->rows = evas_list_count(sd->children);
+ _edje_container_recalc(sd);
}
void
edje_container_item_insert(Evas_Object *obj, Edje_Item *ei, int n)
{
Smart_Data *sd;
+ void *rel;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ rel = evas_list_nth(sd->children, n);
+ if (!rel)
+ sd->children = evas_list_append(sd->children, ei);
+ else
+ sd->children = evas_list_append_relative(sd->children, ei, rel);
+ sd->changed = 1;
+ sd->change_child_list = 1;
+ sd->rows = evas_list_count(sd->children);
+ _edje_container_recalc(sd);
}
void
@@ -302,6 +521,11 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ sd->children = evas_list_remove(sd->children, ei);
+ sd->changed = 1;
+ sd->change_child_list = 1;
+ sd->rows = evas_list_count(sd->children);
+ _edje_container_recalc(sd);
}
void
@@ -311,6 +535,22 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if (sd->cols == cols) return;
+ sd->colinfo = realloc(sd->colinfo, cols * sizeof(Smart_Data_Colinfo));
+ if (cols > sd->cols)
+ {
+ int i;
+
+ for (i = sd->cols; i < cols; i++)
+ {
+ sd->colinfo[i].minw = 0;
+ sd->colinfo[i].maxw = -1;
+ }
+ }
+ sd->cols = cols;
+ sd->changed = 1;
+ sd->change_cols = 1;
+ _edje_container_recalc(sd);
}
int
@@ -319,7 +559,8 @@
Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
- if (!sd) return;
+ if (!sd) return 0;
+ return sd->cols;
}
void
@@ -329,15 +570,37 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if (sd->changed)
+ {
+ int freeze;
+
+ freeze = sd->freeze;
+ sd->freeze = 0;
+ _edje_container_recalc(sd);
+ sd->freeze = freeze;
+ }
+ if (minw) *minw = sd->min_w;
+ if (minh) *minh = sd->min_h;
}
void
-edje_container_max_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
+edje_container_max_size_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
{
Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if (sd->changed)
+ {
+ int freeze;
+
+ freeze = sd->freeze;
+ sd->freeze = 0;
+ _edje_container_recalc(sd);
+ sd->freeze = freeze;
+ }
+ if (maxw) *maxw = sd->max_w;
+ if (maxh) *maxh = sd->max_h;
}
void
@@ -347,6 +610,11 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if ((sd->align_x == halign) && (sd->align_y == valign)) return;
+ sd->align_x = halign;
+ sd->align_y = valign;
+ sd->need_layout = 1;
+ _edje_container_relayout(sd);
}
void
@@ -356,6 +624,8 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if (halign) *halign = sd->align_x;
+ if (valign) *valign = sd->align_y;
}
int
@@ -364,7 +634,8 @@
Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
- if (!sd) return;
+ if (!sd) return 0;
+ return evas_list_count(sd->children);
}
Edje_Item *
@@ -373,7 +644,9 @@
Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
- if (!sd) return;
+ if (!sd) return NULL;
+ if (!sd->children) return NULL;
+ return sd->children->data;
}
Edje_Item *
@@ -382,7 +655,9 @@
Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
- if (!sd) return;
+ if (!sd) return NULL;
+ if (!sd->children) return NULL;
+ return evas_list_last(sd->children)->data;
}
Edje_Item *
@@ -391,7 +666,8 @@
Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
- if (!sd) return;
+ if (!sd) return NULL;
+ return evas_list_nth(sd->children, n);
}
void
@@ -401,6 +677,12 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if (((homog) && (sd->homogenous)) ||
+ ((!homog) && (!sd->homogenous))) return;
+ sd->homogenous = homog;
+ sd->changed = 1;
+ sd->change_child = 1;
+ _edje_container_recalc(sd);
}
int
@@ -409,25 +691,8 @@
Smart_Data *sd;
sd = evas_object_smart_data_get(obj);
- if (!sd) return;
-}
-
-void
-edje_container_orientation_set(Evas_Object *obj, int orient)
-{
- Smart_Data *sd;
-
- sd = evas_object_smart_data_get(obj);
- if (!sd) return;
-}
-
-int
-edje_container_orientation_get(Evas_Object *obj)
-{
- Smart_Data *sd;
-
- sd = evas_object_smart_data_get(obj);
- if (!sd) return;
+ if (!sd) return 0;
+ return sd->homogenous;
}
void
@@ -437,6 +702,11 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if ((sd->scroll_y == pos) && (sd->scroll_x == shift)) return;
+ sd->scroll_y = pos;
+ sd->scroll_x = shift;
+ sd->need_layout = 1;
+ _edje_container_relayout(sd);
}
void
@@ -446,6 +716,8 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if (pos) *pos = sd->scroll_y;
+ if (shift) *shift = sd->scroll_x;
}
static void _smart_init(void);
@@ -517,6 +789,7 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
+ if (sd->colinfo) free(sd->colinfo);
// evas_object_del(sd->obj);
free(sd);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_container.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_container.h 16 Aug 2004 05:09:58 -0000 1.1
+++ edje_container.h 24 Aug 2004 01:48:19 -0000 1.2
@@ -28,59 +28,42 @@
#define E_OBJ_NAME "edje_container_object"
-typedef struct _Smart_Data Smart_Data;
+typedef struct _Smart_Data Smart_Data;
+typedef struct _Smart_Data_Colinfo Smart_Data_Colinfo;
struct _Smart_Data
{
Evas_Coord x, y, w, h;
Evas_List *children;
- struct {
- Evas_Coord w, h;
- } min, max;
Evas_Object *smart_obj;
int cols, rows;
-};
-
-#define EDJE_LAYOUT_NONE 0
-
-/* the following are "linear" layout systems */
-
-/* H & V LIST pack all items at their minimum size - no expanding in the lists
- * direction (lets say height), BUT all items are expanded to fill the "width"
- * of the list. if an item is too small to fit the width, the list object will
- * call a "min_size_change" callback indicating to the parent/swallower that
- * the parent should revise its use/view of this object. this is intended for
- * large lists of items - like a list of files, or titles etc. this allows
- * for each item to have multiple columns. each column may be any size, with
- * the minimu size being the sum of all minimum column widths. as more items
- * are added column widths may be adjusted and all items told of this
- * adjustment
- */
-#define EDJE_LAYOUT_VLIST 1
-#define EDJE_LAYOUT_HLIST 2
-/* H & V BOX pack items and may or may not expand an item in any direction and
- * may align an item smaller than its allocated space in a certain way. they
- * dont know about columns etc. like lists.
- */
-#define EDJE_LAYOUT_VBOX 3
-#define EDJE_LAYOUT_HBOX 4
-/* H & V flow are like "file manager" views you see in explorer etc. wehere
- * items "line wrap" as they go along horizontally (or vertizally) as needed
- */
-#define EDJE_LAYOUT_VFLOW 5
-#define EDJE_LAYOUT_HFLOW 6
-/* the following are "2 dimensional" layout systems */
+ Evas_Coord contents_w, contents_h;
+ Evas_Coord min_row_h, max_row_h;
+ Evas_Coord min_w, max_w, min_h, max_h;
+
+ Smart_Data_Colinfo *colinfo;
+
+ int freeze;
+
+ double scroll_x, scroll_y;
+ double align_x, align_y;
+
+ unsigned char changed : 1;
+ unsigned char change_child : 1;
+ unsigned char change_child_list : 1;
+ unsigned char change_cols : 1;
+ unsigned char change_scroll : 1;
+
+ unsigned char need_layout : 1;
-/* tables are full 2-dimensional layouts which dont really have append and
- * prepend semantics... this will need working on later for 2d layouts. dont
- * worry about these yet - but keep this as a marker for things to do later
- */
-#define EDJE_LAYOUT_TABLE 7
-/* count
- */
-#define EDJE_LAYOUT_COUNT 8
+ unsigned char homogenous : 1;
+};
+struct _Smart_Data_Colinfo
+{
+ Evas_Coord minw, maxw;
+};
/* All items are virtual constructs that provide Evas_Objects at some point.
* Edje may move, resize, show, hide, clip, unclip, raise, lower etc. this
@@ -119,11 +102,14 @@
Evas_Object *overlay_object;
int freeze;
Evas_Coord y, h;
+
+ Evas_Coord minh, maxh;
int cells_num;
Edje_Item_Cell *cells;
unsigned char accessible : 1;
+
unsigned char recalc : 1;
unsigned char selected : 1;
unsigned char disabled : 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_embryo.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- edje_embryo.c 22 Aug 2004 04:02:44 -0000 1.23
+++ edje_embryo.c 24 Aug 2004 01:48:19 -0000 1.24
@@ -1239,13 +1239,23 @@
if (fn != EMBRYO_FUNCTION_NONE)
{
void *pdata;
+ int err;
printf("EDJE DEBUG: About to run script from program.\n");
embryo_parameter_string_push(ed->collection->script, sig);
embryo_parameter_string_push(ed->collection->script, src);
pdata = embryo_program_data_get(ed->collection->script);
embryo_program_data_set(ed->collection->script, ed);
- embryo_program_run(ed->collection->script, fn);
+ err = embryo_program_run(ed->collection->script, fn);
+
+ if (err != EMBRYO_ERROR_NONE)
+ {
+ printf("EDJE: ERROR with embryo script.\n"
+ "FUNCTION: %s\n"
+ "ERROR: %s\n",
+ fname,
+ embryo_error_string_get(err));
+ }
embryo_program_data_set(ed->collection->script, pdata);
printf("EDJE DEBUG: Done.\n");
}
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
