layout smart object - shoudl work like the table one... but i haven't tested

src/bin/Makefile.am

@@ -42,7 +42,8 @@ e_hints.h \
 e_gadman.h \
 e_signals.h \
 e_xinerama.h \
-e_table.h
+e_table.h \
+e_layout.h
 
 
 enlightenment_SOURCES = \
@@ -79,6 +80,7 @@ e_gadman.c \
 e_signals.c \
 e_xinerama.c \
 e_table.c \
+e_layout.c \
 $(ENLIGHTENMENTHEADERS)
 
 enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@

src/bin/e_box.c

@@ -337,6 +337,7 @@ _e_box_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
    evas_object_data_set(obj, "e_box_data", bi);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
 				  _e_box_smart_item_del_hook, NULL);
+   evas_object_stack_below(obj, sd->obj);
    if (!evas_object_visible_get(sd->clip))
      evas_object_show(sd->clip);
    return bi;

src/bin/e_includes.h

@@ -33,3 +33,4 @@
 #include "e_signals.h"
 #include "e_xinerama.h"
 #include "e_table.h"
+#include "e_layout.h"

src/bin/e_layout.c

@@ -0,0 +1,546 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+
+typedef struct _E_Smart_Data E_Smart_Data;
+typedef struct _E_Layout_Item E_Layout_Item;
+
+struct _E_Smart_Data
+{ 
+   Evas_Coord       x, y, w, h;
+   Evas_Coord       vw, vh;
+   Evas_Object     *obj;
+   Evas_Object     *clip;
+   int              frozen;
+   unsigned char    changed : 1;
+   Evas_List       *items;
+}; 
+
+struct _E_Layout_Item
+{
+   E_Smart_Data    *sd;
+   Evas_Coord       x, y, w, h;
+   Evas_Object     *obj;
+};
+
+/* local subsystem functions */
+static E_Layout_Item *_e_layout_smart_adopt(E_Smart_Data *sd, Evas_Object *obj);
+static void        _e_layout_smart_disown(Evas_Object *obj);
+static void        _e_layout_smart_item_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void        _e_layout_smart_reconfigure(E_Smart_Data *sd);
+static void        _e_layout_smart_move_resize_item(E_Layout_Item *li);
+
+static void _e_layout_smart_init(void);
+static void _e_layout_smart_add(Evas_Object *obj);
+static void _e_layout_smart_del(Evas_Object *obj);
+static void _e_layout_smart_layer_set(Evas_Object *obj, int layer);
+static void _e_layout_smart_raise(Evas_Object *obj);
+static void _e_layout_smart_lower(Evas_Object *obj);
+static void _e_layout_smart_stack_above(Evas_Object *obj, Evas_Object * above);
+static void _e_layout_smart_stack_below(Evas_Object *obj, Evas_Object * below);
+static void _e_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+static void _e_layout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+static void _e_layout_smart_show(Evas_Object *obj);
+static void _e_layout_smart_hide(Evas_Object *obj);
+static void _e_layout_smart_color_set(Evas_Object *obj, int r, int g, int b, int a);
+static void _e_layout_smart_clip_set(Evas_Object *obj, Evas_Object *clip);
+static void _e_layout_smart_clip_unset(Evas_Object *obj);
+
+/* local subsystem globals */
+static Evas_Smart *_e_smart = NULL;
+
+/* externally accessible functions */
+Evas_Object *
+e_layout_add(Evas *evas)
+{
+   _e_layout_smart_init();
+   return evas_object_smart_add(evas, _e_smart);
+}
+
+int
+e_layout_freeze(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   sd->frozen++;
+   return sd->frozen;
+}
+
+int
+e_layout_thaw(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   sd->frozen--;
+   if (sd->frozen <= 0) _e_layout_smart_reconfigure(sd);
+   return sd->frozen;
+}
+
+void
+e_layout_virtual_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (w < 1) w = 1;
+   if (h < 1) h = 1;
+   if ((sd->vw == w) && (sd->vh == h)) return;
+   sd->vw = w;
+   sd->vh = h;
+   sd->changed = 1;
+   if (sd->frozen <= 0) _e_layout_smart_reconfigure(sd);
+}
+
+void
+e_layout_virtual_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (w) *w = sd->vw;
+   if (h) *h = sd->vh;
+}
+
+void
+e_layout_pack(Evas_Object *obj, Evas_Object *child)
+{
+   E_Smart_Data *sd;
+   E_Layout_Item *li;
+   
+   sd = evas_object_smart_data_get(obj);
+   _e_layout_smart_adopt(sd, child);
+   sd->items = evas_list_append(sd->items, child);
+   li = evas_object_data_get(obj, "e_layout_data");
+   _e_layout_smart_move_resize_item(li);
+}
+
+void
+e_layout_child_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+{
+   E_Layout_Item *li;
+   
+   li = evas_object_data_get(obj, "e_layout_data");
+   if (!li) return;
+   if ((li->x == x) && (li->y == y)) return;
+   li->x = x;
+   li->y = y;
+   _e_layout_smart_move_resize_item(li);
+}
+
+void
+e_layout_child_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+{
+   E_Layout_Item *li;
+   
+   li = evas_object_data_get(obj, "e_layout_data");
+   if (!li) return;
+   if (w < 0) w = 0;
+   if (h < 0) h = 0;
+   if ((li->w == w) && (li->h == h)) return;
+   li->w = w;
+   li->h = h;
+   _e_layout_smart_move_resize_item(li);
+}
+
+void
+e_layout_child_raise(Evas_Object *obj)
+{
+   E_Layout_Item *li;
+   
+   li = evas_object_data_get(obj, "e_layout_data");
+   if (!li) return;
+   li->sd->items = evas_list_remove(li->sd->items, obj);
+   if (li->sd->items)
+     evas_object_stack_above(obj, evas_list_data(evas_list_last(li->sd->items)));
+   li->sd->items = evas_list_append(li->sd->items, obj);
+}
+
+void
+e_layout_child_lower(Evas_Object *obj)
+{
+   E_Layout_Item *li;
+   
+   li = evas_object_data_get(obj, "e_layout_data");
+   if (!li) return;
+   li->sd->items = evas_list_remove(li->sd->items, obj);
+   if (li->sd->items)
+     evas_object_stack_below(obj, evas_list_data(li->sd->items));
+   li->sd->items = evas_list_prepend(li->sd->items, obj);
+}
+
+void
+e_layout_child_raise_above(Evas_Object *obj, Evas_Object *above)
+{
+   E_Layout_Item *li;
+   
+   li = evas_object_data_get(obj, "e_layout_data");
+   if (!li) return;
+   li->sd->items = evas_list_remove(li->sd->items, obj);
+   if (li->sd->items)
+     evas_object_stack_above(obj, above);
+   li->sd->items = evas_list_append_relative(li->sd->items, obj, above);
+}
+
+void
+e_layout_child_raise_below(Evas_Object *obj, Evas_Object *below)
+{
+   E_Layout_Item *li;
+   
+   li = evas_object_data_get(obj, "e_layout_data");
+   if (!li) return;
+   li->sd->items = evas_list_remove(li->sd->items, obj);
+   if (li->sd->items)
+     evas_object_stack_below(obj, below);
+   li->sd->items = evas_list_prepend_relative(li->sd->items, obj, below);
+}
+
+void
+e_layout_unpack(Evas_Object *obj)
+{
+   E_Layout_Item *li;
+   E_Smart_Data *sd;
+   
+   li = evas_object_data_get(obj, "e_layout_data");
+   if (!li) return;
+   sd = li->sd;
+   sd->items = evas_list_remove(sd->items, obj);
+   _e_layout_smart_disown(obj);
+}
+
+/* local subsystem functions */
+static E_Layout_Item *
+_e_layout_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
+{
+   E_Layout_Item *li;
+   
+   li = calloc(1, sizeof(E_Layout_Item));
+   if (!li) return NULL;
+   li->sd = sd;
+   li->obj = obj;
+   /* defaults */
+   li->x = 0;
+   li->y = 0;
+   li->w = 0;
+   li->h = 0;
+   evas_object_clip_set(obj, sd->clip);
+   evas_object_stack_above(obj, sd->obj);
+   evas_object_smart_member_add(li->sd->obj, obj);
+   evas_object_data_set(obj, "e_layout_data", li);
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
+				  _e_layout_smart_item_del_hook, NULL);
+   if (li->sd->items)
+     evas_object_stack_above(obj, evas_list_data(evas_list_last(li->sd->items)));
+   else
+     evas_object_stack_above(obj, sd->obj);
+   if (!evas_object_visible_get(sd->clip))
+     evas_object_show(sd->clip);
+   return li;
+}
+
+static void
+_e_layout_smart_disown(Evas_Object *obj)
+{
+   E_Layout_Item *li;
+   
+   li = evas_object_data_get(obj, "e_layout_data");
+   if (!li) return;
+   if (!li->sd->items)
+     {
+	if (evas_object_visible_get(li->sd->clip))
+	  evas_object_hide(li->sd->clip);
+     }
+   evas_object_event_callback_del(obj,
+				  EVAS_CALLBACK_FREE,
+				  _e_layout_smart_item_del_hook);
+   evas_object_smart_member_del(li->sd->obj);
+   evas_object_data_del(obj, "e_layout_data");
+   free(li);
+}
+
+static void
+_e_layout_smart_item_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   e_layout_unpack(obj);
+}
+
+static void
+_e_layout_smart_reconfigure(E_Smart_Data *sd)
+{
+   Evas_Coord x, y, w, h;
+   Evas_List *l;
+
+   if (!sd->changed) return;
+   
+   x = sd->x;
+   y = sd->y;
+   w = sd->w;
+   h = sd->h;
+
+   for (l = sd->items; l; l = l->next)
+     {
+	E_Layout_Item *li;
+	Evas_Object *obj;
+	
+	obj = l->data;
+	li = evas_object_data_get(obj, "e_layout_data");
+	_e_layout_smart_move_resize_item(li);
+     }
+   sd->changed = 0;
+}
+
+static void
+_e_layout_smart_move_resize_item(E_Layout_Item *li)
+{
+   evas_object_move(li->obj,
+		    li->sd->x + ((li->x * li->sd->w) / li->sd->vw),
+		    li->sd->y + ((li->y * li->sd->h) / li->sd->vh));
+   evas_object_resize(li->obj,
+		      (li->w * li->sd->w) / li->sd->vw,
+		      (li->h * li->sd->h) / li->sd->vh);
+}
+
+static void
+_e_layout_smart_init(void)
+{
+   if (_e_smart) return;
+   _e_smart = evas_smart_new("e_layout",
+			     _e_layout_smart_add,
+			     _e_layout_smart_del,
+			     _e_layout_smart_layer_set,
+			     _e_layout_smart_raise,
+			     _e_layout_smart_lower,
+			     _e_layout_smart_stack_above,
+			     _e_layout_smart_stack_below,
+			     _e_layout_smart_move,
+			     _e_layout_smart_resize,
+			     _e_layout_smart_show,
+			     _e_layout_smart_hide,
+			     _e_layout_smart_color_set,
+			     _e_layout_smart_clip_set,
+			     _e_layout_smart_clip_unset,
+			     NULL);
+}
+
+static void
+_e_layout_smart_add(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   
+   sd = calloc(1, sizeof(E_Smart_Data));
+   if (!sd) return;
+   sd->obj = obj;
+   sd->x = 0;
+   sd->y = 0;
+   sd->w = 0;
+   sd->h = 0;
+   sd->vw = 1;
+   sd->vh = 1;
+   sd->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
+   evas_object_smart_member_add(obj, sd->clip);
+   evas_object_move(sd->clip, -100000, -100000);
+   evas_object_resize(sd->clip, 200000, 200000);
+   evas_object_color_set(sd->clip, 255, 255, 255, 255);
+   evas_object_smart_data_set(obj, sd);
+}
+   
+static void
+_e_layout_smart_del(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   while (sd->items)
+     {
+	Evas_Object *child;
+	
+	child = sd->items->data;
+	e_layout_unpack(child);
+     }
+   evas_object_del(sd->clip);
+   free(sd);
+}
+   
+static void
+_e_layout_smart_layer_set(Evas_Object *obj, int layer)
+{
+   E_Smart_Data *sd;
+      
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   
+     {
+	Evas_List *l;
+	
+	for (l = sd->items; l; l = l->next)
+	  {
+	     evas_object_layer_set(l->data, layer);
+	  }
+     }
+}
+
+static void
+_e_layout_smart_raise(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+
+     {
+	Evas_List *l;
+	
+	for (l = evas_list_last(sd->items); l; l = l->prev)
+	  {
+	     evas_object_raise(l->data);
+	  }
+     }
+}
+
+static void
+_e_layout_smart_lower(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return; 
+   
+     {
+	Evas_List *l;
+	
+	for (l = sd->items; l; l = l->next)
+	  {
+	     evas_object_lower(l->data);
+	  }
+     }
+}
+                                                             
+static void
+_e_layout_smart_stack_above(Evas_Object *obj, Evas_Object *above)
+{
+   E_Smart_Data *sd;
+
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+
+     {
+	Evas_List *l;
+	
+	for (l = evas_list_last(sd->items); l; l = l->prev)
+	  {
+	     evas_object_stack_above(l->data, above);
+	  }
+     }
+}
+   
+static void
+_e_layout_smart_stack_below(Evas_Object *obj, Evas_Object *below)
+{
+   E_Smart_Data *sd;
+      
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+
+     {
+	Evas_List *l;
+	
+	for (l = sd->items; l; l = l->next)
+	  {
+	     evas_object_stack_below(l->data, below);
+	  }
+     }
+}
+
+static void
+_e_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   if ((x == sd->x) && (y == sd->y)) return;
+   if ((x == sd->x) && (y == sd->y)) return;
+     {
+	Evas_List *l;
+	Evas_Coord dx, dy;
+	
+	dx = x - sd->x;
+	dy = y - sd->y;
+	for (l = sd->items; l; l = l->next)
+	  {
+	     Evas_Coord ox, oy;
+	     
+	     evas_object_geometry_get(l->data, &ox, &oy, NULL, NULL);
+	     evas_object_move(l->data, ox + dx, oy + dy);
+	  }
+     }
+   sd->x = x;
+   sd->y = y;
+}
+
+static void
+_e_layout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   if ((w == sd->w) && (h == sd->h)) return;
+   sd->w = w;
+   sd->h = h;
+   sd->changed = 1;
+   _e_layout_smart_reconfigure(sd);
+}
+
+static void
+_e_layout_smart_show(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   if (sd->items) evas_object_show(sd->clip);
+}
+
+static void
+_e_layout_smart_hide(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   evas_object_hide(sd->clip);
+}
+
+static void
+_e_layout_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;   
+   evas_object_color_set(sd->clip, r, g, b, a);
+}
+
+static void
+_e_layout_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   evas_object_clip_set(sd->clip, clip);
+}
+
+static void
+_e_layout_smart_clip_unset(Evas_Object *obj)
+{
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   evas_object_clip_unset(sd->clip);
+}  

src/bin/e_layout.h

@@ -0,0 +1,24 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+#else
+#ifndef E_LAYOUT_H
+#define E_LAYOUT_H
+
+EAPI Evas_Object *e_layout_add               (Evas *evas);
+EAPI int          e_layout_freeze            (Evas_Object *obj);
+EAPI int          e_layout_thaw              (Evas_Object *obj);
+EAPI void         e_layout_virtual_size_set  (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+EAPI void         e_layout_virtual_size_get  (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+EAPI void         e_layout_pack              (Evas_Object *obj, Evas_Object *child);
+EAPI void         e_layout_child_move        (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+EAPI void         e_layout_child_resize      (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+EAPI void         e_layout_child_raise       (Evas_Object *obj);
+EAPI void         e_layout_child_lower       (Evas_Object *obj);
+EAPI void         e_layout_child_raise_above (Evas_Object *obj, Evas_Object *above);
+EAPI void         e_layout_child_raise_below (Evas_Object *obj, Evas_Object *below);
+EAPI void         e_layout_unpack            (Evas_Object *obj);
+
+#endif
+#endif

src/bin/e_table.c

@@ -4,7 +4,7 @@
 #include "e.h"
 
 typedef struct _E_Smart_Data E_Smart_Data;
-typedef struct _E_Table_Item   E_Table_Item;
+typedef struct _E_Table_Item E_Table_Item;
 
 struct _E_Smart_Data
 { 
@@ -110,7 +110,7 @@ e_table_homogenous_set(Evas_Object *obj, int homogenous)
    if (sd->frozen <= 0) _e_table_smart_reconfigure(sd);
 }
 
-int
+void
 e_table_pack(Evas_Object *obj, Evas_Object *child, int col, int row, int colspan, int rowspan)
 {
    E_Smart_Data *sd;
@@ -131,7 +131,6 @@ e_table_pack(Evas_Object *obj, Evas_Object *child, int col, int row, int colspan
      }
    sd->changed = 1;
    if (sd->frozen <= 0) _e_table_smart_reconfigure(sd);
-   return 0;
 }
 
 void
@@ -257,6 +256,7 @@ _e_table_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
    evas_object_data_set(obj, "e_table_data", ti);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
 				  _e_table_smart_item_del_hook, NULL);
+   evas_object_stack_below(obj, sd->obj);
    if (!evas_object_visible_get(sd->clip))
      evas_object_show(sd->clip);
    return ti;
@@ -420,7 +420,7 @@ static void
 _e_table_smart_init(void)
 {
    if (_e_smart) return;
-   _e_smart = evas_smart_new("e_box",
+   _e_smart = evas_smart_new("e_table",
 			     _e_table_smart_add,
 			     _e_table_smart_del,
 			     _e_table_smart_layer_set,

src/bin/e_table.h

@@ -10,7 +10,7 @@ EAPI Evas_Object *e_table_add               (Evas *evas);
 EAPI int          e_table_freeze            (Evas_Object *obj);
 EAPI int          e_table_thaw              (Evas_Object *obj);
 EAPI void         e_table_homogenous_set    (Evas_Object *obj, int homogenous);
-EAPI int          e_table_pack              (Evas_Object *obj, Evas_Object *child, int col, int row, int colspan, int rowspan);
+EAPI void         e_table_pack              (Evas_Object *obj, Evas_Object *child, int col, int row, int colspan, int rowspan);
 EAPI void         e_table_pack_options_set  (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h);
 EAPI void         e_table_unpack            (Evas_Object *obj);
 EAPI void         e_table_col_row_size_get  (Evas_Object *obj, int *cols, int *rows);