Enlightenment

Log:
  gadman: use one gadcon per zone.
  
  Before gadman was using a single gadcon for all zones, that lead to
  problems like popup menus being incorrectly placed.
  
  The correct solution is to mimic shelves and have one gadcon per zone,
  including the top layer.
  
  By: manio
  
  
Author:       barbieri
Date:         2009-07-11 13:46:55 -0700 (Sat, 11 Jul 2009)
New Revision: 41312

Modified:
  trunk/e/src/bin/e_config.c trunk/e/src/bin/e_config.h trunk/e/src/modules/gadman/e_mod_config.c trunk/e/src/modules/gadman/e_mod_gadman.c trunk/e/src/modules/gadman/e_mod_gadman.h 

Modified: trunk/e/src/bin/e_config.c
===================================================================
--- trunk/e/src/bin/e_config.c	2009-07-11 18:40:58 UTC (rev 41311)
+++ trunk/e/src/bin/e_config.c	2009-07-11 20:46:55 UTC (rev 41312)
@@ -152,6 +152,7 @@
 #define D _e_config_gadcon_edd
    E_CONFIG_VAL(D, T, name, STR);
    E_CONFIG_VAL(D, T, id, INT);
+   E_CONFIG_VAL(D, T, zone, INT);
    E_CONFIG_LIST(D, T, clients, _e_config_gadcon_client_edd);
 
    _e_config_shelf_desk_edd = E_CONFIG_DD_NEW("E_Config_Shelf_Desk", E_Config_Shelf_Desk);

Modified: trunk/e/src/bin/e_config.h
===================================================================
--- trunk/e/src/bin/e_config.h	2009-07-11 18:40:58 UTC (rev 41311)
+++ trunk/e/src/bin/e_config.h	2009-07-11 20:46:55 UTC (rev 41312)
@@ -446,6 +446,7 @@
 {
    const char *name;
    int         id;
+   int         zone;
    Eina_List  *clients;
 };
 

Modified: trunk/e/src/modules/gadman/e_mod_config.c
===================================================================
--- trunk/e/src/modules/gadman/e_mod_config.c	2009-07-11 18:40:58 UTC (rev 41311)
+++ trunk/e/src/modules/gadman/e_mod_config.c	2009-07-11 20:46:55 UTC (rev 41312)
@@ -333,7 +333,7 @@
         cc = e_widget_ilist_nth_data_get(cfdata->o_avail, i);
         if (!cc) continue;
 
-        gcc = gadman_gadget_add(cc, 0);
+        gcc = gadman_gadget_add(cc, GADMAN_LAYER_BG);
         gadman_gadget_edit_start(gcc);
      }
 

Modified: trunk/e/src/modules/gadman/e_mod_gadman.c
===================================================================
--- trunk/e/src/modules/gadman/e_mod_gadman.c	2009-07-11 18:40:58 UTC (rev 41311)
+++ trunk/e/src/modules/gadman/e_mod_gadman.c	2009-07-11 20:46:55 UTC (rev 41312)
@@ -12,7 +12,7 @@
 
 static Evas_Object* _create_mover(E_Gadcon *gc);
 static Evas_Object* _get_mover(E_Gadcon_Client *gcc);
-static E_Gadcon* _gadman_gadcon_new(const char* name, int ontop);
+static E_Gadcon* _gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone);
 
 static void on_shape_change(void *data, E_Container_Shape *es, E_Container_Shape_Change ch);
 
@@ -45,6 +45,9 @@
 void
 gadman_init(E_Module *m)
 {
+   const Eina_List *l;
+   E_Zone *zone;
+
    /* Create Manager */
    Man = calloc(1, sizeof(Manager));
    if (!Man) return;
@@ -53,94 +56,105 @@
    Man->container = e_container_current_get(e_manager_current_get());
    Man->width = Man->container->w;
    Man->height = Man->container->h;
-   Man->gadgets = NULL;
-   Man->top_ee = NULL;
-   Man->visible = 0;
 
    /* Check if composite is enable */
    if (ecore_x_screen_is_composited(0) || e_config->use_composite)
      Man->use_composite = 1;
-   else
-     Man->use_composite = 0;
 
    /* with this we can trap screen resolution change (a better way?)*/
    e_container_shape_change_callback_add(Man->container, on_shape_change, NULL);
 
-   /* Create Gadcon for background and top */
-   Man->gc = _gadman_gadcon_new("gadman", 0);
-   Man->gc_top = _gadman_gadcon_new("gadman_top", 1);
+   /* iterating through zones - and making gadmans on each */
+   EINA_LIST_FOREACH(Man->container->zones, l, zone)
+     {
+	const char *layer_name[] = {"gadman", "gadman_top"};
+	unsigned int layer;
 
-   /* Create 2 mover objects */
-   Man->mover = _create_mover(Man->gc);
-   Man->mover_top = _create_mover(Man->gc_top);
+	for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++)
+	  {
+	     E_Gadcon *gc = _gadman_gadcon_new(layer_name[layer], layer, zone);
+	     Man->gadcons[layer] = eina_list_append(Man->gadcons[layer], gc);
+	  }
+     }
 }
 
 void
 gadman_shutdown(void)
 {
+   E_Gadcon *gc;
+   unsigned int layer;
+
    e_container_shape_change_callback_del(Man->container, on_shape_change, NULL);
 
-   e_gadcon_unpopulate(Man->gc);
-   e_gadcon_unpopulate(Man->gc_top);
+   for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++)
+     {
+	EINA_LIST_FREE(Man->gadcons[layer], gc)
+	  {
+	     e_gadcon_unpopulate(gc);
+	     e_gadcon_custom_del(gc);
 
-   e_gadcon_custom_del(Man->gc);
-   e_gadcon_custom_del(Man->gc_top);
+	     /* free gadcons */
+	     e_config->gadcons = eina_list_remove(e_config->gadcons, gc);
+	     eina_stringshare_del(gc->name);
 
-   /* free gadcons */
-   e_config->gadcons = eina_list_remove(e_config->gadcons, Man->gc);
-   e_config->gadcons = eina_list_remove(e_config->gadcons, Man->gc_top);
-   eina_stringshare_del(Man->gc->name);
-   eina_stringshare_del(Man->gc_top->name);
-   if (Man->gc->config_dialog) e_object_del(E_OBJECT(Man->gc->config_dialog));
+	     if (gc->config_dialog) e_object_del(E_OBJECT(gc->config_dialog));
+	  }
+
+	eina_list_free(Man->gadgets[layer]);
+	evas_object_del(Man->movers[layer]);
+     }
+
    if (Man->icon_name) eina_stringshare_del(Man->icon_name);
-   free(Man->gc);
-   free(Man->gc_top);
 
    /* free manager */
-   evas_object_del(Man->mover);
-   evas_object_del(Man->mover_top);
-   eina_list_free(Man->gadgets);
    if (Man->top_ee)
      {
         e_canvas_del(Man->top_ee);
         //ecore_evas_free(Man->top_ee);
      }
    free(Man);
-   Man = NULL;
 }
 
 void
 gadman_populate_class(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
 {
-   Eina_List *l;
+   Gadman_Layer_Type layer = (Gadman_Layer_Type)(long)data;
+   const Eina_List *l;
+   E_Config_Gadcon_Client *cf_gcc;
 
-   for (l = gc->cf->clients; l; l = l->next)
+   EINA_LIST_FOREACH(gc->cf->clients, l, cf_gcc)
      {
-        E_Config_Gadcon_Client *cf_gcc;
-
-        if (!(cf_gcc = l->data)) continue;
-        if (cf_gcc->name && cc->name && !strcmp(cf_gcc->name, cc->name))
-         gadman_gadget_place(cf_gcc, (int)data);
+        if (cf_gcc->name && cc->name && !strcmp(cf_gcc->name, cc->name) && (gc->cf->zone == gc->zone->id))
+          gadman_gadget_place(cf_gcc, layer, gc->zone);
      }
 }
 
+E_Gadcon *
+gadman_gadcon_get(const E_Zone *zone, Gadman_Layer_Type layer)
+{
+   const Eina_List *l;
+   E_Gadcon *gc;
+
+   EINA_LIST_FOREACH(Man->gadcons[layer], l, gc)
+     if (gc->zone == zone) return gc;
+   return NULL;
+}
+
 E_Gadcon_Client *
-gadman_gadget_place(E_Config_Gadcon_Client *cf, int ontop)
+gadman_gadget_place(E_Config_Gadcon_Client *cf, Gadman_Layer_Type layer, E_Zone *zone)
 {
+   const Eina_List *l;
    E_Gadcon *gc;
    E_Gadcon_Client *gcc;
    E_Gadcon_Client_Class *cc = NULL;
-   Eina_List *l = NULL;
 
    if (!cf->name) return NULL;
 
-   if (ontop) gc = Man->gc_top;
-   else gc = Man->gc;
+   gc = gadman_gadcon_get(zone, layer);
 
    /* Find provider */
-   for (l = e_gadcon_provider_list(); l; l = l->next) 
+   EINA_LIST_FOREACH(e_gadcon_provider_list(), l, cc)
      {
-        cc = l->data;
         if (!strcmp(cc->name, cf->name))
           break;
         else
@@ -154,7 +168,7 @@
    gcc->cf = cf;
    gcc->client_class = cc;
 
-   Man->gadgets = eina_list_append(Man->gadgets, gcc);
+   Man->gadgets[layer] = eina_list_append(Man->gadgets[layer], gcc);
 
    //printf("Place Gadget %s (style: %s id: %s) (gadcon: %s)\n", gcc->name, cf->style, cf->id, gc->name);
 
@@ -180,7 +194,7 @@
 
    _apply_widget_position(gcc);
 
-   if (gcc->gadcon == Man->gc_top)
+   if (gcc->gadcon->id == ID_GADMAN_LAYER_TOP)
      edje_object_signal_emit(gcc->o_frame, "e,state,visibility,hide", "e");
 
    evas_object_show(gcc->o_frame);
@@ -189,17 +203,15 @@
 }
 
 E_Gadcon_Client *
-gadman_gadget_add(E_Gadcon_Client_Class *cc, int ontop)
+gadman_gadget_add(E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer)
 {
    E_Config_Gadcon_Client *cf = NULL;
    E_Gadcon_Client *gcc;
    E_Gadcon *gc;
    int w, h;
 
-   if (ontop)
-     gc = Man->gc_top;
-   else
-     gc = Man->gc;
+   gc = gadman_gadcon_get
+     (e_util_zone_current_get(e_manager_current_get()), layer);
 
    /* Create Config_Gadcon_Client */
    cf = e_gadcon_client_config_new(gc, cc->name);
@@ -210,7 +222,7 @@
    cf->geom.size_h = DEFAULT_SIZE_H;
 
    /* Place the new gadget */
-   gcc = gadman_gadget_place(cf, ontop);
+   gcc = gadman_gadget_place(cf, layer, gc->zone);
 
    /* Respect Aspect */
    evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h);
@@ -229,9 +241,9 @@
 }
 
 void
-gadman_gadget_remove(E_Gadcon_Client *gcc)
+gadman_gadget_remove(E_Gadcon_Client *gcc, Gadman_Layer_Type layer)
 {
-   Man->gadgets = eina_list_remove(Man->gadgets, gcc);
+   Man->gadgets[layer] = eina_list_remove(Man->gadgets[layer], gcc);
 
    edje_object_part_unswallow(gcc->o_frame, gcc->o_base);
    evas_object_del(gcc->o_frame);
@@ -245,7 +257,8 @@
 void
 gadman_gadget_del(E_Gadcon_Client *gcc)
 {
-   Man->gadgets = eina_list_remove(Man->gadgets, gcc);
+   Gadman_Layer_Type layer = gcc->gadcon->id - ID_GADMAN_LAYER_BASE;
+   Man->gadgets[layer] = eina_list_remove(Man->gadgets[layer], gcc);
 
    edje_object_part_unswallow(gcc->o_frame, gcc->o_base);
    evas_object_del(gcc->o_frame);
@@ -282,19 +295,27 @@
 void
 gadman_gadget_edit_end(void)
 {
-   evas_object_hide(Man->mover);
-   evas_object_hide(Man->mover_top);
+   unsigned int layer;
 
-   Man->gc->editing = 0;
-   Man->gc_top->editing = 0;
+   for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++)
+     {
+	const Eina_List *l;
+	E_Gadcon *gc;
 
+	evas_object_hide(Man->movers[layer]);
+
+	EINA_LIST_FOREACH(Man->gadcons[layer], l, gc)
+	  gc->editing = 0;
+     }
+
    if (current) _save_widget_position(current);
 }
 
 void
 gadman_gadgets_show(void)
 {
-   Eina_List *l = NULL;
+   const Eina_List *l;
+   E_Gadcon_Client *gcc;
 
    Man->visible = 1;
    ecore_evas_show(Man->top_ee);
@@ -317,12 +338,9 @@
 	                        "e,state,visibility,show,custom,now", "e");
      }
 
-   for (l = Man->gadgets; l; l = l->next)
+   /* Showing top gadgets */
+   EINA_LIST_FOREACH(Man->gadgets[GADMAN_LAYER_TOP], l, gcc)
      {
-	E_Gadcon_Client *gcc;
-
-	if (!(gcc = l->data)) continue;
-	if (gcc->gadcon != Man->gc_top) continue;
 	if (Man->conf->anim_gad)
 	  edje_object_signal_emit(gcc->o_frame,
 	                          "e,state,visibility,show", "e");
@@ -335,7 +353,8 @@
 void
 gadman_gadgets_hide(void)
 {
-   Eina_List *l = NULL;
+   const Eina_List *l;
+   E_Gadcon_Client *gcc;
 
    Man->visible = 0;
 
@@ -354,12 +373,9 @@
 	                       "e,state,visibility,hide,custom,now", "e");
      }
 
-   for (l = Man->gadgets; l; l = l->next)
+   /* Hiding top gadgets */
+   EINA_LIST_FOREACH(Man->gadgets[GADMAN_LAYER_TOP], l, gcc)
      {
-        E_Gadcon_Client *gcc;
-
-	if (!(gcc = l->data)) continue;
-	if (gcc->gadcon != Man->gc_top) continue;
 	if (Man->conf->anim_gad)
 	  edje_object_signal_emit(gcc->o_frame,
 	                          "e,state,visibility,hide", "e");
@@ -428,10 +444,11 @@
 
 /* Internals */
 static E_Gadcon*
-_gadman_gadcon_new(const char* name, int ontop)
+_gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone)
 {
+   const Eina_List *l;
    E_Gadcon *gc;
-   Eina_List *l = NULL;
+   E_Config_Gadcon *cg;
 
    /* Create Gadcon */
    gc = E_OBJECT_ALLOC(E_Gadcon, E_GADCON_TYPE, NULL);
@@ -442,11 +459,14 @@
    gc->orient = E_GADCON_ORIENT_FLOAT;
 
    /* Create ecore fullscreen window */
-   if (ontop)
+   if (layer > GADMAN_LAYER_BG)
      {
-        Man->top_ee = e_canvas_new(e_config->evas_engine_popups,
-                                   Man->container->win, 0, 0, 0, 0, 1, 1,
-                                   &(Man->top_win));
+        if (!Man->top_ee)
+        {
+          Man->top_ee = e_canvas_new(e_config->evas_engine_popups,
+                                     Man->container->win, 0, 0, 0, 0, 1, 1,
+                                     &(Man->top_win));
+        }
 
         if (Man->use_composite)
           {
@@ -490,11 +510,11 @@
         e_drop_xdnd_register_set(Man->container->bg_win, 1);
      }
 
-   e_gadcon_zone_set(gc, e_zone_current_get(Man->container));
+   e_gadcon_zone_set(gc, zone);
    e_gadcon_util_menu_attach_func_set(gc, _attach_menu, NULL);
-   e_gadcon_populate_callback_set(gc, gadman_populate_class, (void*)ontop);
+   e_gadcon_populate_callback_set(gc, gadman_populate_class, (void*)layer);
 
-   gc->id = 114 + ontop; // TODO what's this ??????? 114 is a random number
+   gc->id = ID_GADMAN_LAYER_BASE + layer;
    gc->edje.o_parent = NULL;
    gc->edje.swallow_name = NULL;
    gc->shelf = NULL;
@@ -507,12 +527,9 @@
 
    /* Search for existing gadcon config */
    gc->cf = NULL;
-   for (l = e_config->gadcons; l; l=l->next)
+   EINA_LIST_FOREACH(e_config->gadcons, l, cg)
      {
-        E_Config_Gadcon *cg;
-
-        if (!(cg = l->data)) continue;
-        if (!strcmp(cg->name, name))
+        if (!strcmp(cg->name, name) && (cg->zone == zone->id))
           {
              gc->cf = cg;
              break;
@@ -525,6 +542,7 @@
         gc->cf = E_NEW(E_Config_Gadcon, 1);
         gc->cf->name = eina_stringshare_add(name);
         gc->cf->id = gc->id;
+        gc->cf->zone = zone->id;
         gc->cf->clients = NULL;
         e_config->gadcons = eina_list_append(e_config->gadcons, gc->cf);
         e_config_save_queue();
@@ -532,6 +550,13 @@
 
    e_gadcon_custom_new(gc);
 
+   if (!Man->movers[layer])
+     Man->movers[layer] = _create_mover(gc);
+
+   /* Assigning top gadcon - needed in gadman_update_bg() */
+   if ((layer > GADMAN_LAYER_BG) && !Man->gc_top)
+     Man->gc_top = gc;
+
    return gc;
 }
 
@@ -588,10 +613,7 @@
 static Evas_Object *
 _get_mover(E_Gadcon_Client *gcc)
 {
-   if (gcc->gadcon == Man->gc_top)
-     return Man->mover_top;
-   else
-     return Man->mover;
+   return Man->movers[gcc->gadcon->id - ID_GADMAN_LAYER_BASE];
 }
 
 static void
@@ -612,26 +634,30 @@
 _apply_widget_position(E_Gadcon_Client *gcc)
 {
    int x, y, w, h;
+   E_Zone *zone;
 
    x = gcc->cf->geom.pos_x * Man->width;
    y = gcc->cf->geom.pos_y * Man->height;
    w = gcc->cf->geom.size_w * Man->width;
    h = gcc->cf->geom.size_h * Man->height;
 
+   /* Obtain zone from parent gadcon */
+   zone = gcc->gadcon->zone;
+
    /* Respect min sizes */
    if (h < gcc->min.h) h = gcc->min.h;
    if (w < gcc->min.w) w = gcc->min.w;
    if (h < 1) h = 100;
    if (w < 1) w = 100;
 
-   /* Respect screen margin */
-   if (x < 0) x = 0;
-   if (y < 0) y = 0;
-   if (x > Man->width) x = 0;
-   if (y > Man->height) y = 0;
+   /* Respect zone marigin */
+   if (x < zone->x) x = zone->x;
+   if (y < zone->y) y = zone->y;
+   if (x > (zone->x + zone->w)) x = zone->x;
+   if (y > (zone->y + zone->h)) y = zone->y;
 
-   if ((y + h) > Man->height) h = (Man->height - y);
-   if ((x + w) > Man->width) w = (Man->width - x);
+   if ((y + h) > (zone->y + zone->h + MIN_VISIBLE_MARIGIN)) h = ((zone->y + zone->h + MIN_VISIBLE_MARIGIN) - y);
+   if ((x + w) > (zone->x + zone->w + MIN_VISIBLE_MARIGIN)) w = ((zone->x + zone->w + MIN_VISIBLE_MARIGIN) - x);
 
    evas_object_move(gcc->o_frame, x, y);
    evas_object_resize(gcc->o_frame, w, h);
@@ -709,7 +735,7 @@
    e_menu_item_label_set(mi, _("Always on desktop"));
    e_menu_item_radio_set(mi, 1);
    e_menu_item_radio_group_set(mi, 2);
-   if (gcc->gadcon == Man->gc)
+   if (gcc->gadcon->id == ID_GADMAN_LAYER_BG)
      e_menu_item_toggle_set(mi, 1);
    e_menu_item_callback_set(mi, on_menu_layer_bg, gcc);
 
@@ -721,7 +747,7 @@
    e_menu_item_label_set(mi, buf);
    e_menu_item_radio_set(mi, 1);
    e_menu_item_radio_group_set(mi, 2);
-   if (gcc->gadcon == Man->gc_top)
+   if (gcc->gadcon->id == ID_GADMAN_LAYER_TOP)
      e_menu_item_toggle_set(mi, 1);
    e_menu_item_callback_set(mi, on_menu_layer_top, gcc);
 
@@ -799,8 +825,11 @@
 static void
 on_shape_change(void *data, E_Container_Shape *es, E_Container_Shape_Change ch)
 {
-   Eina_List *l = NULL;
+   const Eina_List *l, *g;
+   E_Gadcon *gc;
+   E_Config_Gadcon_Client *cf_gcc;
    E_Container  *con;
+   unsigned int layer;
 
    con = e_container_shape_container_get(es);
    if ((con->w == Man->width) && (con->h == Man->height)) return;
@@ -810,22 +839,15 @@
    Man->height = con->h;
 
    /* ReStart gadgets */
-   e_gadcon_unpopulate(Man->gc);
-   e_gadcon_unpopulate(Man->gc_top);
-   for (l = Man->gc->cf->clients; l; l = l->next)
-     {
-        E_Config_Gadcon_Client *cf_gcc;
 
-        if (!(cf_gcc = l->data)) continue;
-        gadman_gadget_place(cf_gcc, 0);
-     }
-
-   for (l = Man->gc_top->cf->clients; l; l = l->next)
+   for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++)
      {
-        E_Config_Gadcon_Client *cf_gcc;
-
-        if (!(cf_gcc = l->data)) continue;
-        gadman_gadget_place(cf_gcc, 1);
+	EINA_LIST_FOREACH(Man->gadcons[layer], g, gc)
+	  {
+	     e_gadcon_unpopulate(gc);
+	     EINA_LIST_FOREACH(gc->cf->clients, l, cf_gcc)
+	       gadman_gadget_place(cf_gcc, layer, gc->zone);
+	  }
      }
 }
 
@@ -926,16 +948,30 @@
 static void
 on_menu_layer_bg(void *data, E_Menu *m, E_Menu_Item *mi)
 {
+   const Eina_List *l;
    E_Config_Gadcon_Client *cf;
+   E_Gadcon_Client *gcc;
+   E_Gadcon *gc;
+   unsigned int layer;
 
    if (!current) return;
    cf = current->cf;
+   gcc = data;
 
-   gadman_gadget_remove(current);
-   current = gadman_gadget_place(cf, 0);
+   gadman_gadget_remove(current, GADMAN_LAYER_TOP);
+   current = gadman_gadget_place(cf, GADMAN_LAYER_BG, gcc->gadcon->zone);
 
-   Man->gc_top->cf->clients = eina_list_remove(Man->gc_top->cf->clients, cf);
-   Man->gc->cf->clients = eina_list_append(Man->gc->cf->clients, cf);
+   for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++)
+     {
+	EINA_LIST_FOREACH(Man->gadcons[layer], l, gc)
+	  {
+	     if (gc->zone != current->gadcon->zone) continue;
+	     if (layer == GADMAN_LAYER_BG)
+	       gc->cf->clients = eina_list_append(gc->cf->clients, cf);
+	     else if (layer == GADMAN_LAYER_TOP)
+	       gc->cf->clients = eina_list_remove(gc->cf->clients, cf);
+	  }
+     }
 
    e_config_save_queue();
 }
@@ -943,16 +979,30 @@
 static void
 on_menu_layer_top(void *data, E_Menu *m, E_Menu_Item *mi)
 {
+   const Eina_List *l;
    E_Config_Gadcon_Client *cf;
+   E_Gadcon_Client *gcc;
+   E_Gadcon *gc;
+   unsigned int layer;
 
    if (!current) return;
    cf = current->cf;
+   gcc = data;
 
-   gadman_gadget_remove(current);
-   current = gadman_gadget_place(cf, 1);
+   gadman_gadget_remove(current, GADMAN_LAYER_BG);
+   current = gadman_gadget_place(cf, GADMAN_LAYER_TOP, gcc->gadcon->zone);
 
-   Man->gc->cf->clients = eina_list_remove(Man->gc->cf->clients, cf);
-   Man->gc_top->cf->clients = eina_list_append(Man->gc_top->cf->clients, cf);
+   for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++)
+     {
+	EINA_LIST_FOREACH(Man->gadcons[layer], l, gc)
+	  {
+	     if (gc->zone != current->gadcon->zone) continue;
+	     if (layer == GADMAN_LAYER_BG)
+	       gc->cf->clients = eina_list_remove(gc->cf->clients, cf);
+	     else if (layer == GADMAN_LAYER_TOP)
+	       gc->cf->clients = eina_list_append(gc->cf->clients, cf);
+	  }
+     }
 
    e_config_save_queue();
 
@@ -988,9 +1038,10 @@
 
    ev = event_info;
 
-   if (Man->gc->editing) gadman_gadget_edit_end();
+   gcc = data;
 
-   gcc = data;
+   if (gcc->gadcon->editing) gadman_gadget_edit_end();
+
    current = gcc;
 
    if (ev->button == 5)
@@ -1225,9 +1276,32 @@
    /* DRAG_STOP */
    if (action == DRAG_STOP)
      {
-	current->moving = 0;
+        E_Config_Gadcon_Client *cf;
+        E_Zone *dst_zone = NULL;
+        E_Gadcon *dst_gadcon;
+        int gx, gy;
+
+        current->moving = 0;
         dx = dy = 0;
-        _save_widget_position(current);
+
+        /* checking if zone was changed for dragged gadget */
+        evas_object_geometry_get(current->o_frame, &gx, &gy, NULL, NULL);
+        dst_zone = e_container_zone_at_point_get(e_container_current_get(e_manager_current_get()), gx, gy);
+        if (dst_zone && (current->gadcon->zone != dst_zone))
+          {
+	     unsigned int layer = current->gadcon->id - ID_GADMAN_LAYER_BASE;
+             cf = current->cf;
+
+             current->gadcon->cf->clients = eina_list_remove(current->gadcon->cf->clients, cf);
+             dst_gadcon = gadman_gadcon_get(dst_zone, layer);
+             if (dst_gadcon)
+               {
+                  dst_gadcon->cf->clients = eina_list_append(dst_gadcon->cf->clients, cf);
+                  e_config_save_queue();
+               }
+          }
+        else
+          _save_widget_position(current);
         return;
      }
 

Modified: trunk/e/src/modules/gadman/e_mod_gadman.h
===================================================================
--- trunk/e/src/modules/gadman/e_mod_gadman.h	2009-07-11 18:40:58 UTC (rev 41311)
+++ trunk/e/src/modules/gadman/e_mod_gadman.h	2009-07-11 20:46:55 UTC (rev 41312)
@@ -15,6 +15,8 @@
 #define BG_CUSTOM 2
 #define BG_TRANS  3
 
+#define MIN_VISIBLE_MARIGIN 20
+
 typedef struct _Manager Manager;
 typedef struct _Config Config;
 
@@ -30,13 +32,23 @@
    int anim_gad;
 };
 
+typedef enum
+{
+  GADMAN_LAYER_BG = 0, /* layer is considered unsigned int */
+  GADMAN_LAYER_TOP,
+  GADMAN_LAYER_COUNT
+} Gadman_Layer_Type;
+
+#define ID_GADMAN_LAYER_BASE 114
+#define ID_GADMAN_LAYER_BG (ID_GADMAN_LAYER_BASE + GADMAN_LAYER_BG)
+#define ID_GADMAN_LAYER_TOP (ID_GADMAN_LAYER_BASE + GADMAN_LAYER_TOP)
+
 struct _Manager
 {
-   E_Gadcon    *gc;
+   Eina_List   *gadcons[GADMAN_LAYER_COUNT];
    E_Gadcon    *gc_top;
-   Eina_List   *gadgets;
-   Evas_Object *mover;
-   Evas_Object *mover_top;
+   Eina_List   *gadgets[GADMAN_LAYER_COUNT];
+   Evas_Object *movers[GADMAN_LAYER_COUNT];
    Evas_Object *full_bg;
    const char  *icon_name;
    
@@ -61,12 +73,13 @@
 
 void             gadman_init(E_Module *m);
 void             gadman_shutdown(void);
-E_Gadcon_Client *gadman_gadget_add(E_Gadcon_Client_Class *cc, int ontop);
+E_Gadcon_Client *gadman_gadget_add(E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer);
 void             gadman_gadget_del(E_Gadcon_Client *gcc);
-E_Gadcon_Client *gadman_gadget_place(E_Config_Gadcon_Client *cf, int ontop);
+E_Gadcon_Client *gadman_gadget_place(E_Config_Gadcon_Client *cf, Gadman_Layer_Type layer, E_Zone *zone);
 void             gadman_gadget_edit_start(E_Gadcon_Client *gcc);
 void             gadman_gadget_edit_end(void);
 void             gadman_gadgets_toggle(void);
 void             gadman_update_bg(void);
+E_Gadcon        *gadman_gadcon_get(const E_Zone *zone, Gadman_Layer_Type layer);
 
 #endif

Log:
  fixed a typo
Author:       maxerba
Date:         2009-07-11 11:40:58 -0700 (Sat, 11 Jul 2009)
New Revision: 41311

Modified:
  trunk/e/src/modules/fileman_opinfo/module.desktop.in 

Modified: trunk/e/src/modules/fileman_opinfo/module.desktop.in
===================================================================
--- trunk/e/src/modules/fileman_opinfo/module.desktop.in	2009-07-11 18:05:06 UTC (rev 41310)
+++ trunk/e/src/modules/fileman_opinfo/module.desktop.in	2009-07-11 18:40:58 UTC (rev 41311)
@@ -10,5 +10,5 @@
 Comment[it]=<title>Gadget che mostra le operazioni in corso di EFM</title><br>Può essere messo sul desktop o su una mensola.
 Comment[eo]=<title>Tiu akcesoraĵo vidigas la aktualaj operacioj en EFM</title><br>Enmetebla sur la labortablon aŭ en breton.
 Comment[fr]=<title>Gadget montrant les opérations en cours dans EFM</title><br>Peut être placé sur le bureau ou dans un rack.
-Comment[fr]=<title>Mevcut EFM işlem bilgisini gösteren alet</title><br>Masaüstüne ya da rafa yerleşebilir.
+Comment[tr]=<title>Mevcut EFM işlem bilgisini gösteren alet</title><br>Masaüstüne ya da rafa yerleşebilir.
 X-Enlightenment-ModuleType=fileman

Log:
  updating french and italian translations
Author:       maxerba
Date:         2009-07-11 11:05:06 -0700 (Sat, 11 Jul 2009)
New Revision: 41310

Added:
  trunk/empower/po/fr.po trunk/empower/po/it.po 
Modified:
  trunk/e/src/modules/start/module.desktop.in trunk/empower/po/LINGUAS 

Modified: trunk/e/src/modules/start/module.desktop.in
===================================================================
--- trunk/e/src/modules/start/module.desktop.in	2009-07-11 16:27:37 UTC (rev 41309)
+++ trunk/e/src/modules/start/module.desktop.in	2009-07-11 18:05:06 UTC (rev 41310)
@@ -12,9 +12,9 @@
 Comment[de]=
 Comment[eo]=<title>Akcesoraĵo de starto-butono</title><br>Ekvivalenta "starto"-butono por E17.
 Comment[es]=<title>Dispositivo botón de inicio</title><br>El equivalente al botón "Inicio" en E17.
-Comment[fr]=<title>Gadget Menu E</title><br>L'équivalent du bouton "Démarrer" pour E17.
+Comment[fr]=<title>Gadget Menu E</title><br>L'équivalent du bouton « Démarrer » pour E17.
 Comment[hu]=<title>Start menü gomb mudul</title><br>E17 Start menü gombja.
-Comment[it]=<title>Modulo Start</title><br>L'equivalente del pulsante "Avvio" in E17.
+Comment[it]=<title>Modulo Start</title><br>L'equivalente del bottone "Avvio" in E17.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=

Modified: trunk/empower/po/LINGUAS
===================================================================
--- trunk/empower/po/LINGUAS	2009-07-11 16:27:37 UTC (rev 41309)
+++ trunk/empower/po/LINGUAS	2009-07-11 18:05:06 UTC (rev 41310)
@@ -1 +1 @@
-cs
+cs fr it

Added: trunk/empower/po/fr.po

Added: trunk/empower/po/it.po

Log:
  make it easy to run e under valgrind and debug crashes.
  
  this should help us in near future:
  
    * -valgrind[=MODE], to run under valgrind and toggle interesting
       options as we often request users to give us valgrind logs but
       they're often running valgrind on wrong binaries and with wrong
       parameters. See enlightenment_start -help for more, but in sort:
       -valgrind=all should give us enough information.
  
    * -valgrind-log-file=path, so the log will not mix with lots of
       output we do.
  
    * debug: on crashes, always list traceback (execinfo/glibc
      functions) and check if gdb exists, if so ask it to print out
      traceback of all threads to stdout. gdb will be detached as soon
      as messages were printed and everything should work without gdb as
      well.
  
  
Author:       barbieri
Date:         2009-07-11 09:27:37 -0700 (Sat, 11 Jul 2009)
New Revision: 41309

Modified:
  trunk/e/src/bin/e_signals.c trunk/e/src/bin/e_start_main.c 

Modified: trunk/e/src/bin/e_signals.c
===================================================================
--- trunk/e/src/bin/e_signals.c	2009-07-11 14:47:59 UTC (rev 41308)
+++ trunk/e/src/bin/e_signals.c	2009-07-11 16:27:37 UTC (rev 41309)
@@ -25,6 +25,73 @@
    _e_x_composite_shutdown_try = 0;
 }
 
+#define _e_write_safe(fd, buf) _e_write_safe_int(fd, buf, sizeof(buf))
+static void
+_e_write_safe_int(int fd, const char *buf, size_t size)
+{
+   while (size > 0)
+     {
+	ssize_t done = write(fd, buf, size);
+	if (done >= 0)
+	  {
+	     buf += done;
+	     size -= done;
+	  }
+	else
+	  {
+	     if ((errno == EAGAIN) || (errno == EINTR))
+	       continue;
+	     else
+	       {
+		  perror("write");
+		  return;
+	       }
+	  }
+     }
+}
+
+static void
+_e_gdb_print_backtrace(int fd)
+{
+   char cmd[1024];
+   size_t size;
+
+   size = snprintf(cmd, sizeof(cmd),
+		   "gdb --pid=%d "
+		   "-ex 'thread apply all bt' "
+		   "-ex detach -ex quit", getpid());
+
+   if (size >= sizeof(cmd))
+     return;
+
+   _e_write_safe(fd, "EXECUTING GDB AS: ");
+   _e_write_safe_int(fd, cmd, size);
+   _e_write_safe(fd, "\n");
+   system(cmd); // TODO: use popen() or fork()+pipe()+exec() and save to 'fd'
+}
+
+#define _e_backtrace(msg) _e_backtrace_int(2, msg, sizeof(msg))
+static void
+_e_backtrace_int(int fd, const char *msg, size_t msg_len)
+{
+   char attachmsg[1024];
+   void *array[255];
+   size_t size;
+
+   _e_write_safe_int(fd, msg, msg_len);
+   _e_write_safe(fd, "\nBEGIN TRACEBACK\n");
+   size = backtrace(array, 255);
+   backtrace_symbols_fd(array, size, fd);
+   _e_write_safe(fd, "END TRACEBACK\n");
+
+   size = snprintf(attachmsg, sizeof(attachmsg),
+		   "debug with: gdb --pid=%d\n", getpid());
+   if (size < sizeof(attachmsg))
+     _e_write_safe_int(fd, attachmsg, size);
+
+   _e_gdb_print_backtrace(fd);
+}
+
 #ifdef OBJECT_PARANOIA_CHECK   
 
 /* a tricky little devil, requires e and it's libs to be built
@@ -33,13 +100,7 @@
 EAPI void
 e_sigseg_act(int x, siginfo_t *info, void *data)
 {
-   void *array[255];
-   size_t size;
-   
-   write(2, "**** SEGMENTATION FAULT ****\n", 29);
-   write(2, "**** Printing Backtrace... *****\n\n", 34);
-   size = backtrace(array, 255);
-   backtrace_symbols_fd(array, size, 2);
+   _e_backtrace("**** SEGMENTATION FAULT ****");
    _e_x_composite_shutdown();
    ecore_x_pointer_ungrab();
    ecore_x_keyboard_ungrab();
@@ -60,7 +121,7 @@
 EAPI void
 e_sigseg_act(int x, siginfo_t *info, void *data)
 {
-   write(2, "**** SEGMENTATION FAULT ****\n", 29);
+   _e_backtrace("**** SEGMENTATION FAULT ****");
    _e_x_composite_shutdown();
    ecore_x_pointer_ungrab();
    ecore_x_keyboard_ungrab();
@@ -82,7 +143,7 @@
 EAPI void
 e_sigill_act(int x, siginfo_t *info, void *data)
 {
-   write(2, "**** ILLEGAL INSTRUCTION ****\n", 30);
+   _e_backtrace("**** ILLEGAL INSTRUCTION ****");
    _e_x_composite_shutdown();
    ecore_x_pointer_ungrab();
    ecore_x_keyboard_ungrab();
@@ -103,7 +164,7 @@
 EAPI void
 e_sigfpe_act(int x, siginfo_t *info, void *data)
 {
-   write(2, "**** FLOATING POINT EXCEPTION ****\n", 35);
+   _e_backtrace("**** FLOATING POINT EXCEPTION ****");
    _e_x_composite_shutdown();
    ecore_x_pointer_ungrab();
    ecore_x_keyboard_ungrab();
@@ -124,7 +185,7 @@
 EAPI void
 e_sigbus_act(int x, siginfo_t *info, void *data)
 {
-   write(2, "**** BUS ERROR ****\n", 21);
+   _e_backtrace("**** BUS ERROR ****");
    _e_x_composite_shutdown();
    ecore_x_pointer_ungrab();
    ecore_x_keyboard_ungrab();
@@ -145,7 +206,7 @@
 EAPI void
 e_sigabrt_act(int x, siginfo_t *info, void *data)
 {
-   write(2, "**** ABORT ****\n", 21);
+   _e_backtrace("**** ABORT ****");
    _e_x_composite_shutdown();
    ecore_x_pointer_ungrab();
    ecore_x_keyboard_ungrab();

Modified: trunk/e/src/bin/e_start_main.c
===================================================================
--- trunk/e/src/bin/e_start_main.c	2009-07-11 14:47:59 UTC (rev 41308)
+++ trunk/e/src/bin/e_start_main.c	2009-07-11 16:27:37 UTC (rev 41309)
@@ -8,6 +8,7 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/utsname.h>
+#include <limits.h>
 #include <fcntl.h>
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
@@ -316,13 +317,96 @@
 	children--;
      }
    exit(0);
-} 
+}
 
+static int
+find_valgrind(char *path, size_t path_len)
+{
+   char *env = getenv("PATH");
+
+   while (env)
+     {
+	const char *p = strchr(env, ':');
+	ssize_t p_len;
+
+	if (p)
+	  p_len = p - env;
+	else
+	  p_len = strlen(env);
+
+	if (p_len <= 0)
+	  goto next;
+	else if (p_len + sizeof("/valgrind") >= path_len)
+	  goto next;
+
+	memcpy(path, env, p_len);
+	memcpy(path + p_len, "/valgrind", sizeof("/valgrind"));
+	if (access(path, X_OK | R_OK) == 0)
+	  return 1;
+
+     next:
+	if (p)
+	  env = p + 1;
+	else
+	  break;
+     }
+   path[0] = '\0';
+   return 0;
+}
+
+
+/* maximum number of arguments added above */
+#define VALGRIND_MAX_ARGS 9
+/* bitmask with all supported bits set */
+#define VALGRIND_MODE_ALL 15
+
+static int
+valgrind_append(char **dst, int valgrind_mode, const char *valgrind_path, const char *valgrind_log)
+{
+   int i = 0;
+
+   if (!valgrind_mode)
+     return 0;
+   dst[i++] = valgrind_path;
+   dst[i++] = "--track-origins=yes";
+   dst[i++] = "--malloc-fill=0xabc79"; /* invalid pointer, make it crash */
+
+   if (valgrind_log)
+     {
+	static char logparam[PATH_MAX + sizeof("--log-file=")];
+	snprintf(logparam, sizeof(logparam), "--log-file=%s", valgrind_log);
+	dst[i++] = logparam;
+     }
+
+   if (valgrind_mode & 2)
+     dst[i++] = "--trace-children=yes";
+
+   if (valgrind_mode & 4)
+     {
+	dst[i++] = "--leak-check=full";
+	dst[i++] = "--leak-resolution=high";
+	dst[i++] = "--track-fds=yes";
+     }
+
+   if (valgrind_mode & 8)
+     dst[i++] = "--show-reachable=yes";
+
+   return i;
+}
+
+static void
+copy_args(char **dst, const char **src, size_t count)
+{
+   for (; count > 0; count--, dst++, src++)
+     *dst = *src;
+}
+
 int
 main(int argc, char **argv)
 {
-   int i, do_precache = 0;
+   int i, do_precache = 0, valgrind_mode = 0;
    char buf[16384], **args, *p;
+   char valgrind_path[PATH_MAX] = "", *valgrind_log = NULL;
 
    prefix_determine(argv[0]);
 
@@ -341,6 +425,32 @@
    for (i = 1; i < argc; i++)
      {
 	if (!strcmp(argv[i], "-no-precache")) do_precache = 0;
+	else if (!strncmp(argv[i], "-valgrind", sizeof("-valgrind") - 1))
+	  {
+	     const char *val = argv[i] + sizeof("-valgrind") - 1;
+	     if (*val == '\0')
+	       valgrind_mode = 1;
+	     else if (*val == '-')
+	       {
+		  val++;
+		  if (!strncmp(val, "log-file=", sizeof("log-file=") - 1))
+		    {
+		       valgrind_log = val + sizeof("log-file=") - 1;
+		       if (*valgrind_log == '\0')
+			 valgrind_log = NULL;
+		    }
+	       }
+	     else if (*val == '=')
+	       {
+		  val++;
+		  if (!strcmp(val, "all"))
+		    valgrind_mode = VALGRIND_MODE_ALL;
+		  else
+		    valgrind_mode = atoi(val);
+	       }
+	     else
+	       printf("Unknown valgrind option: %s\n", argv[i]);
+	  }
         else if ((!strcmp(argv[i], "-h")) ||
 		 (!strcmp(argv[i], "-help")) ||
 		 (!strcmp(argv[i], "--help")))
@@ -349,6 +459,15 @@
 	       ("Options:\n"
 		"\t-no-precache\n"
 		"\t\tDisable pre-caching of files\n"
+		"\t-valgrind[=MODE]\n"
+		"\t\tRun enlightenment from inside valgrind, mode is OR of:\n"
+		"\t\t   1 = plain valgrind to catch crashes (default)\n"
+		"\t\t   2 = trace children (thumbnailer, efm slaves, ...)\n"
+		"\t\t   4 = check leak\n"
+		"\t\t   8 = show reachable after processes finish.\n"
+		"\t\t all = all of above\n"
+		"\t-valgrind-log-file=<FILENAME>\n"
+		"\t\tSave valgrind log to file, see valgrind's --log-file for details.\n"
 		"\n"
 		"Please run:\n"
 		"\tenlightenment %s\n"
@@ -358,7 +477,25 @@
 	     exit(0);
 	  }
      }
-   printf("E - PID=%i, do_precache=%i\n", getpid(), do_precache);
+
+   if (valgrind_mode)
+     {
+	if (!find_valgrind(valgrind_path, sizeof(valgrind_path)))
+	  {
+	     printf("E - valgrind required but no binary found! Ignoring request.\n");
+	     valgrind_mode = 0;
+	  }
+     }
+
+   printf("E - PID=%i, do_precache=%i, valgrind=%d", getpid(), do_precache, valgrind_mode);
+   if (valgrind_mode)
+     {
+	printf(" valgrind-command='%s'", valgrind_path);
+	if (valgrind_log)
+	  printf(" valgrind-log-file='%s'", valgrind_log);
+     }
+   putchar('\n');
+
    if (do_precache)
      {
 	void *lib, *func;
@@ -392,22 +529,25 @@
    /* try dbus-launch */
    snprintf(buf, sizeof(buf), "%s/bin/enlightenment", _prefix_path);
    
-   args = alloca((argc + 3) * sizeof(char *));
+   args = alloca((argc + 2 + VALGRIND_MAX_ARGS) * sizeof(char *));
    if (!getenv("DBUS_SESSION_BUS_ADDRESS"))
      {
 	args[0] = "dbus-launch";
 	args[1] = "--exit-with-session";
-	args[2] = buf;
-	for (i = 1; i < argc; i++) args[2 + i] = argv[i];
-	args[2 + i] = NULL;
+
+	i = 2 + valgrind_append(args + 2, valgrind_mode, valgrind_path, valgrind_log);
+	args[i++] = buf;
+	copy_args(args + i, argv + 1, argc - 1);
+	args[i + argc - 1] = NULL;
 	execvp("dbus-launch", args);
      }
    
    /* dbus-launch failed - run e direct */
-   args[0] = "enlightenment";
-   for (i = 1; i < argc; i++) args[i] = argv[i];
-   args[i] = NULL;
-   execv(buf, args);
+   i = valgrind_append(args, valgrind_mode, valgrind_path, valgrind_log);
+   args[i++] = buf;
+   copy_args(args + i, argv + 1, argc - 1);
+   args[i + argc - 1] = NULL;
+   execv(args[0], args);
 
    printf("FAILED TO RUN:\n");
    printf("  %s\n", buf);

Log:
  systray: fix bad icon placement.
  
  Some icons will change their geometry and this should be reflected on
  layout.
  
  This should fix some icons being incorrectly placed (Google Desktop,
  VideoLan, Claws-Mail, ...)
  
  By: Vincent Francois
  
Author:       barbieri
Date:         2009-07-11 07:47:59 -0700 (Sat, 11 Jul 2009)
New Revision: 41308

Modified:
  trunk/e/src/modules/systray/e_mod_main.c 

Modified: trunk/e/src/modules/systray/e_mod_main.c
===================================================================
--- trunk/e/src/modules/systray/e_mod_main.c	2009-07-11 14:34:54 UTC (rev 41307)
+++ trunk/e/src/modules/systray/e_mod_main.c	2009-07-11 14:47:59 UTC (rev 41308)
@@ -79,6 +79,7 @@
       Ecore_Event_Handler *show;
       Ecore_Event_Handler *reparent;
       Ecore_Event_Handler *sel_clear;
+      Ecore_Event_Handler *configure;
    } handler;
    struct
    {
@@ -744,6 +745,24 @@
 }
 
 static int
+_systray_cb_window_configure(void *data, int type __UNUSED__, void *event)
+{
+   Ecore_X_Event_Window_Configure *ev = event;
+   Instance *inst = data;
+   Icon *icon;
+   const Eina_List *l;
+
+   EINA_LIST_FOREACH(inst->icons, l, icon)
+     if (icon->win == ev->win)
+       {
+	  _systray_icon_geometry_apply(icon);
+	  break;
+       }
+
+   return 1;
+}
+
+static int
 _systray_cb_reparent_notify(void *data, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Window_Reparent *ev = event;
@@ -932,6 +951,8 @@
      (ECORE_X_EVENT_WINDOW_REPARENT, _systray_cb_reparent_notify, inst);
    inst->handler.sel_clear = ecore_event_handler_add
      (ECORE_X_EVENT_SELECTION_CLEAR, _systray_cb_selection_clear, inst);
+   inst->handler.configure = ecore_event_handler_add
+     (ECORE_X_EVENT_WINDOW_CONFIGURE, _systray_cb_window_configure, inst);
 
    instance = inst;
    return inst->gcc;
@@ -967,6 +988,8 @@
      ecore_event_handler_del(inst->handler.reparent);
    if (inst->handler.sel_clear)
      ecore_event_handler_del(inst->handler.sel_clear);
+   if (inst->handler.configure)
+     ecore_event_handler_del(inst->handler.configure);
    if (inst->timer.retry)
      ecore_timer_del(inst->timer.retry);
    if (inst->idler.size_apply)

Log:
  Improve docs in Eet.h
  
  By: Hanspeter Portner
  
Author:       barbieri
Date:         2009-07-11 07:34:54 -0700 (Sat, 11 Jul 2009)
New Revision: 41307

Modified:
  trunk/eet/ChangeLog trunk/eet/src/lib/Eet.h 

Modified: trunk/eet/ChangeLog
===================================================================
--- trunk/eet/ChangeLog	2009-07-11 14:30:47 UTC (rev 41306)
+++ trunk/eet/ChangeLog	2009-07-11 14:34:54 UTC (rev 41307)
@@ -190,3 +190,6 @@
 
 	* Reorder gcry init to be used during gnutls init.
 
+2009-07-11  Hanspeter Portner
+
+	* Improve docs/examples in Eet.h

Modified: trunk/eet/src/lib/Eet.h
===================================================================
--- trunk/eet/src/lib/Eet.h	2009-07-11 14:30:47 UTC (rev 41306)
+++ trunk/eet/src/lib/Eet.h	2009-07-11 14:34:54 UTC (rev 41307)
@@ -187,6 +187,7 @@
     * @code
     * #include <Eet.h>
     * #include <stdio.h>
+    * #include <string.h>
     *
     * int
     * main(int argc, char **argv)
@@ -195,6 +196,8 @@
     *   char buf[1024], *ret, **list;
     *   int size, num, i;
     *
+    *   eet_init();
+    *
     *   strcpy(buf, "Here is a string of data to save!");
     *
     *   ef = eet_open("/tmp/my_file.eet", EET_FILE_MODE_WRITE);
@@ -220,6 +223,8 @@
     *     }
     *   eet_close(ef);
     *
+    *   eet_shutdown();
+    *
     *   return 0;
     * }
     * @endcode
@@ -874,6 +879,8 @@
     *    FILE *f;
     *    Blah *blah_in;
     *
+    *    eet_init();
+    *
     *    edd3 = eet_data_descriptor_new("blah3", sizeof(Blah3),
     *                                   eina_list_next,
     *                                   eina_list_append,
@@ -960,6 +967,8 @@
     *    eet_data_descriptor_free(edd2);
     *    eet_data_descriptor_free(edd3);
     *
+    *    eet_shutdown();
+    *
     *   return 0;
     * }
     *

Log:
  merge the trunk with the new_state_system branch.
  
  For themers:
  Sorry this change will break all ewl themes. I'm going to write a little
  article to describe the changes from the view of a programmer, but I haven't
  written it so far.
  
  For devs:
  The changes only affect internal stuff, as long as you don't use
  ewl_widget_state_set(). If you are using it please replace it by
  ewl_widget_custom_state_set(). To get more information about the new state 
  system, take a look at my blog article:
  http://pfritz.wordpress.com/2009/07/01/the-new-state-system-of-ewl/
  
  
Author:       pfritz
Date:         2009-07-11 07:30:47 -0700 (Sat, 11 Jul 2009)
New Revision: 41306

Modified:
  trunk/ewl/data/themes/e17/e17.edc trunk/ewl/data/themes/e17/groups/border.edc trunk/ewl/data/themes/e17/groups/button.edc trunk/ewl/data/themes/e17/groups/combo.edc trunk/ewl/data/themes/e17/groups/image.edc trunk/ewl/data/themes/e17/groups/inc/button-parts-helper.edc trunk/ewl/data/themes/e17/groups/inc/button-programs-helper.edc trunk/ewl/data/themes/e17/groups/inc/focus-programs.edc trunk/ewl/data/themes/e17/groups/inc/menu-programs.edc trunk/ewl/data/themes/e17/groups/label.edc trunk/ewl/data/themes/e17/groups/notebook.edc trunk/ewl/data/themes/e17/groups/progress.edc trunk/ewl/data/themes/e17/groups/scroll.edc trunk/ewl/data/themes/e17/groups/spinner.edc trunk/ewl/data/themes/e17/groups/text.edc trunk/ewl/data/themes/e17/groups/toolbar.edc trunk/ewl/data/themes/e17/groups/tree.edc trunk/ewl/src/bin/ewl_simple_test.c trunk/ewl/src/bin/tests/config/ewl_config_unit_test.c trunk/ewl/src/engines/evas/ewl_engine_evas.c trunk/ewl/src/lib/ewl_box.c trunk/ewl/src/lib/ewl_button.c trunk/ewl/src/lib/ewl_cell.c trunk/ewl/src/lib/ewl_cell.h trunk/ewl/src/lib/ewl_check.c trunk/ewl/src/lib/ewl_combo.c trunk/ewl/src/lib/ewl_config.c trunk/ewl/src/lib/ewl_config.h trunk/ewl/src/lib/ewl_container.c trunk/ewl/src/lib/ewl_container.h trunk/ewl/src/lib/ewl_embed.c trunk/ewl/src/lib/ewl_engines.c trunk/ewl/src/lib/ewl_engines.h trunk/ewl/src/lib/ewl_entry.c trunk/ewl/src/lib/ewl_enums.h trunk/ewl/src/lib/ewl_events.h trunk/ewl/src/lib/ewl_expansion.c trunk/ewl/src/lib/ewl_filelist_view.c trunk/ewl/src/lib/ewl_freebox_mvc.c trunk/ewl/src/lib/ewl_list.c trunk/ewl/src/lib/ewl_misc.c trunk/ewl/src/lib/ewl_mvc.c trunk/ewl/src/lib/ewl_notebook.c trunk/ewl/src/lib/ewl_paned.c trunk/ewl/src/lib/ewl_progressbar.c trunk/ewl/src/lib/ewl_row.c trunk/ewl/src/lib/ewl_scrollpane.c trunk/ewl/src/lib/ewl_seeker.c trunk/ewl/src/lib/ewl_spinner.c trunk/ewl/src/lib/ewl_togglebutton.c trunk/ewl/src/lib/ewl_tree.c trunk/ewl/src/lib/ewl_widget.c trunk/ewl/src/lib/ewl_widget.h trunk/ewl/tools/ewl_config/ewl_config.c 

Modified: trunk/ewl/data/themes/e17/e17.edc
===================================================================
--- trunk/ewl/data/themes/e17/e17.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/e17.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -176,6 +176,7 @@
 
 	item: "/row/group" "ewl/row";
 	item: "/expansion/group" "ewl/tree/expansion";
+	item: "/nonexpandable/expansion/group" "ewl/tree/nonexpansion";
 
 	/* window related groups */
 	item: "/tooltip/group" "ewl/window";

Modified: trunk/ewl/data/themes/e17/groups/border.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/border.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/border.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -167,20 +167,29 @@
 	{
 		program
 		{
-			name: "disble";
+			name: "disbled";
 			signal: "disabled";
-			source: "*";
+			source: "ewl/both";
 			action: STATE_SET "disabled" 0.0;
 			transition: LINEAR 0.0;
 			target: "ewl/label/text";
 		}
 		program
 		{
+			name: "disble";
+			signal: "disable";
+			source: "ewl/both";
+			action: STATE_SET "disabled" 0.0;
+			transition: LINEAR 0.3;
+			target: "ewl/label/text";
+		}
+		program
+		{
 			name: "enable";
-			signal: "enabled";
-			source: "*";
+			signal: "enable";
+			source: "ewl/both";
 			action: STATE_SET "default" 0.0;
-			transition: LINEAR 0.0;
+			transition: LINEAR 0.3;
 			target: "ewl/label/text";
 		}
 	}

Modified: trunk/ewl/data/themes/e17/groups/button.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/button.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/button.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -104,8 +104,8 @@
 		program
 		{
 			name: "button,checked";
-			signal: "checked";
-			source: "EWL";
+			signal: "state,on";
+			source: "ewl/this";
 			action: STATE_SET "clicked" 0.0;
 			target: "button_image";
 		}
@@ -113,8 +113,8 @@
 		program
 		{
 			name: "button,unchecked";
-			signal: "default";
-			source: "EWL";
+			signal: "state,off";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "button_image";
 		}
@@ -123,7 +123,7 @@
 		{
 			name: "button,click";
 			signal: "mouse,down,1";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "clicked" 0.0;
 			target: "button_image";
 		}
@@ -132,7 +132,7 @@
 		{
 			name: "button,unclick";
 			signal: "mouse,up,1";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "button_image";
 		}
@@ -140,19 +140,28 @@
 		program
 		{
 			name: "disable";
+			signal: "disable";
+			source: "ewl/*";
+			action: STATE_SET "disabled" 0.0;
+			target: "button_image";
+			target: "button_image2";
+			target: "focus";
+		}
+		program
+		{
+			name: "disabled";
 			signal: "disabled";
-			source: "EWL";
+			source: "ewl/*";
 			action: STATE_SET "disabled" 0.0;
 			target: "button_image";
 			target: "button_image2";
 			target: "focus";
 		}
-
 		program
 		{
 			name: "enable";
-			signal: "enabled";
-			source: "EWL";
+			signal: "enable";
+			source: "ewl/*";
 			action: STATE_SET "default" 0.0;
 			target: "button_image";
 			target: "button_image2";
@@ -162,7 +171,7 @@
 		{
 			name: "button,in";
 			signal: "mouse,in";
-			source: "EWL";
+			source: "ewl/this";
 			script
 			{
 				run_program(PROGRAM:"go_active");
@@ -337,6 +346,13 @@
 				color: 0 0 0 255;
 				color3: 255 255 255 32;
 			}
+			description
+			{
+				state: "disabled" 0.0;
+				inherit: "default" 0.0;
+				color: 72 72 72 255;
+			}
+
 		}
 		part
 		{
@@ -371,5 +387,32 @@
 			}
 		}
 	}
+	programs
+	{
+		program
+		{
+			name: "disabled";
+			signal: "disabled";
+			source: "ewl/both";
+			action: STATE_SET "disabled" 0.0;
+			target: "ewl/label/text";
+		}
+		program
+		{
+			name: "disable";
+			signal: "disable";
+			source: "ewl/both";
+			action: STATE_SET "disabled" 0.0;
+			target: "ewl/label/text";
+		}
+		program
+		{
+			name: "enable";
+			signal: "enable";
+			source: "ewl/both";
+			action: STATE_SET "default" 0.0;
+			target: "ewl/label/text";
+		}
+	}
 }
 

Modified: trunk/ewl/data/themes/e17/groups/combo.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/combo.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/combo.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -168,7 +168,7 @@
 		{
 			name: "button,click";
 			signal: "mouse,down,1";
-			source: "button_image";
+			source: "ewl/this";
 			action: STATE_SET "clicked" 0.0;
 			target: "button_image";
 		}
@@ -177,7 +177,7 @@
 		{
 			name: "button,unclick";
 			signal: "mouse,up,1";
-			source: "button_image";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "button_image";
 		}
@@ -185,8 +185,17 @@
 		program
 		{
 			name: "disable";
+			signal: "disable";
+			source: "ewl/both";
+			action: STATE_SET "disabled" 0.0;
+			target: "button_image";
+		}
+		
+		program
+		{
+			name: "disabled";
 			signal: "disabled";
-			source: "EWL";
+			source: "ewl/both";
 			action: STATE_SET "disabled" 0.0;
 			target: "button_image";
 		}
@@ -194,8 +203,8 @@
 		program
 		{
 			name: "enable";
-			signal: "enabled";
-			source: "EWL";
+			signal: "enable";
+			source: "ewl/both";
 			action: STATE_SET "default" 0.0;
 			target: "button_image";
 		}
@@ -203,8 +212,8 @@
 		program
 		{
 			name: "expand";
-			signal: "expanded";
-			source: "EWL";
+			signal: "state,on";
+			source: "ewl/both";
 			action: STATE_SET "expanded" 0.0;
 			target: "arrow";
 		}
@@ -212,11 +221,20 @@
 		program
 		{
 			name: "collapse";
-			signal: "collapsed";
-			source: "EWL";
+			signal: "state,off";
+			source: "ewl/both";
 			action: STATE_SET "default" 0.0;
 			target: "arrow";
 		}
+		
+		program
+		{
+			name: "expanded";
+			signal: "on";
+			source: "ewl/both";
+			action: STATE_SET "default" 0.0;
+			target: "arrow";
+		}
 	}
 }
 
@@ -235,14 +253,6 @@
 			{
 				state: "default" 0.0;
 				visible: 0;
-				rel1 
-				{
-					offset: -4 -4;
-				}
-				rel2
-				{
-					offset: 3 3;
-				}
 				color: 245 205 109 102;
 			}
 			description
@@ -260,7 +270,7 @@
 		{
 			name: "highlight";
 			signal: "mouse,in";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "highlighted" 0.0;
 			target: "highlight";
 		}
@@ -268,7 +278,7 @@
 		{
 			name: "un-highlight";
 			signal: "mouse,out";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "highlight";
 		}
@@ -294,14 +304,6 @@
 			{
 				state: "default" 0.0;
 				visible: 0;
-				rel1 
-				{
-					offset: -4 -4;
-				}
-				rel2
-				{
-					offset: 3 3;
-				}
 				color: 245 205 109 102;
 			}
 			description
@@ -334,7 +336,7 @@
 		{
 			name: "highlight";
 			signal: "mouse,in";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "highlighted" 0.0;
 			target: "highlight";
 		}
@@ -342,7 +344,7 @@
 		{
 			name: "un-highlight";
 			signal: "mouse,out";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "highlight";
 		}

Modified: trunk/ewl/data/themes/e17/groups/image.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/image.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/image.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -35,17 +35,25 @@
 	{
 		program
 		{
-			name: "disable";
+			name: "disabled";
 			signal: "disabled";
-			source: "EWL";
+			source: "ewl/both";
 			action: STATE_SET "disabled" 0.0;
 			target: "clip";
 		}
 		program
 		{
+			name: "disable";
+			signal: "disable";
+			source: "ewl/both";
+			action: STATE_SET "disabled" 0.0;
+			target: "clip";
+		}
+		program
+		{
 			name: "enable";
-			signal: "enabled";
-			source: "EWL";
+			signal: "enable";
+			source: "ewl/both";
 			action: STATE_SET "default" 0.0;
 			target: "clip";
 		}

Modified: trunk/ewl/data/themes/e17/groups/inc/button-parts-helper.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/inc/button-parts-helper.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/inc/button-parts-helper.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -41,7 +41,38 @@
 
 part
 {
+	name: "clip";
+	type: RECT;
+	description
+	{
+		state: "default" 0.0;
+		color: 255 255 255 255;
+
+		rel1
+		{
+			to: "outline";
+			relative: 0.0 0.0;
+			offset: 1 1;
+		}
+		rel2
+		{
+			to: "outline";
+			relative: 1.0 1.0;
+			offset: -2 -2;
+		}
+	}
+	description
+	{
+		state: "disabled" 0.0;
+		inherit: "default" 0.0;
+		color: 255 255 255 76;
+	}
+}
+
+part
+{
 	name: "item1";
+	clip_to: "clip";
 	mouse_events: 0;
 	description
 	{

Modified: trunk/ewl/data/themes/e17/groups/inc/button-programs-helper.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/inc/button-programs-helper.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/inc/button-programs-helper.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -1,36 +1,57 @@
 program
 {
 	name: "turn,on";
-	signal: "checked";
-	source: "EWL";
+	signal: "state,on";
+	source: "ewl/this";
 	action: STATE_SET "active" 0.0;
 	target: "item1";
 }
 
 program
 {
+	name: "on";
+	signal: "on";
+	source: "ewl/this";
+	action: STATE_SET "active" 0.0;
+	target: "item1";
+}
+
+program
+{
 	name: "turn,off";
-	signal: "default";
-	source: "EWL";
+	signal: "state,off";
+	source: "ewl/this";
 	action: STATE_SET "default" 0.0;
 	target: "item1";
 }
 
 program
 {
-	name: "disable";
+	name: "disabled";
 	signal: "disabled";
-	source: "EWL";
+	source: "ewl/both";
 	action: STATE_SET "disabled" 0.0;
 	target: "outline";
+	target: "clip";
 }
 
 program
 {
+	name: "disable";
+	signal: "disable";
+	source: "ewl/both";
+	action: STATE_SET "disabled" 0.0;
+	target: "outline";
+	target: "clip";
+}
+
+program
+{
 	name: "enable";
-	signal: "enabled";
-	source: "EWL";
+	signal: "enable";
+	source: "ewl/both";
 	action: STATE_SET "default" 0.0;
 	target: "outline";
+	target: "clip";
 }
 

Modified: trunk/ewl/data/themes/e17/groups/inc/focus-programs.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/inc/focus-programs.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/inc/focus-programs.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -2,17 +2,26 @@
 {
 	name: "focus,in";
 	signal: "focus,in";
-	source: "EWL";
+	source: "ewl/this";
 	action: STATE_SET "focused" 0.0;
 	transition: DECELERATE 0.2;
 	target: "focus";
 }
+
+program
+{
+	name: "focused";
+	signal: "focused";
+	source: "ewl/this";
+	action: STATE_SET "focused" 0.0;
+	target: "focus";
+}
 	
 program
 {
 	name: "focus,out";
 	signal: "focus,out";
-	source: "EWL";
+	source: "ewl/this";
 	action: STATE_SET "default" 0.0;
 	transition: ACCELERATE 0.5;
 	target: "focus";

Modified: trunk/ewl/data/themes/e17/groups/inc/menu-programs.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/inc/menu-programs.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/inc/menu-programs.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -1,8 +1,17 @@
 program
 {
+	name: "focused";
+	signal: "focused";
+	source: "ewl/both";
+	after: "go_active_pre";
+	after: "focus,in";
+}
+
+program
+{
 	name: "go_active_pre";
 	signal: "focus,in";
-	source: "*";
+	source: "ewl/both";
 	action: STATE_SET "default" 0.0;
 	target: "title_outline";
 	target: "title_bar";
@@ -42,7 +51,7 @@
 {
 	name: "go_passive_pre";
 	signal: "focus,out";
-	source: "*";
+	source: "ewl/both";
 	action: STATE_SET "active" 0.0;
 	target: "title_outline";
 	target: "title_bar";
@@ -82,7 +91,7 @@
 {
 	name: "focus,in";
 	action: STATE_SET "focused" 0.0;
-	source: "EWL";
+	source: "ewl/both";
 	signal: "focus,in";
 	target: "focus";
 	transition: LINEAR 0.1;
@@ -92,7 +101,7 @@
 {
 	name: "focus,out";
 	action: STATE_SET "default" 0.0;
-	source: "EWL";
+	source: "ewl/both";
 	signal: "focus,out";
 	target: "focus";
 	transition: LINEAR 0.1;

Modified: trunk/ewl/data/themes/e17/groups/label.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/label.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/label.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -37,6 +37,12 @@
 				color: 0 0 0 255;
 				color3: 255 255 255 32;
 			}
+			description
+			{
+				state: "disabled" 0.0;
+				inherit: "default" 0.0;
+				color: 72 72 72 255;
+			}
 		}
 		part
 		{
@@ -71,5 +77,32 @@
 			}
 		}
 	}
+	programs
+	{
+		program
+		{
+			name: "disabled";
+			signal: "disabled";
+			source: "ewl/both";
+			action: STATE_SET "disabled" 0.0;
+			target: "ewl/label/text";
+		}
+		program
+		{
+			name: "disable";
+			signal: "disable";
+			source: "ewl/both";
+			action: STATE_SET "disabled" 0.0;
+			target: "ewl/label/text";
+		}
+		program
+		{
+			name: "enable";
+			signal: "enable";
+			source: "ewl/both";
+			action: STATE_SET "default" 0.0;
+			target: "ewl/label/text";
+		}
+	}
 }
 

Modified: trunk/ewl/data/themes/e17/groups/notebook.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/notebook.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/notebook.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -69,7 +69,7 @@
 		{
 			name: "visible";
 			signal: "tabs";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "outline";
 		}
@@ -77,7 +77,7 @@
 		{
 			name: "hidden";
 			signal: "notabs";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "hidden" 0.0;
 			target: "outline";
 		}
@@ -152,15 +152,23 @@
 			{
 				name: "selected";
 				signal: "selected";
-				source: "EWL";
+				source: "ewl/this";
 				action: STATE_SET "selected" 0.0;
 				target: "outline";
 			}
 			program
 			{
+				name: "select";
+				signal: "selection,on";
+				source: "ewl/this";
+				action: STATE_SET "selected" 0.0;
+				target: "outline";
+			}
+			program
+			{
 				name: "de-select";
-				signal: "default";
-				source: "EWL";
+				signal: "selection,off";
+				source: "ewl/this";
 				action: STATE_SET "default" 0.0;
 				target: "outline";
 			}
@@ -224,15 +232,23 @@
 			{
 				name: "selected";
 				signal: "selected";
-				source: "EWL";
+				source: "ewl/this";
 				action: STATE_SET "selected" 0.0;
 				target: "outline";
 			}
 			program
 			{
+				name: "select";
+				signal: "selection,on";
+				source: "ewl/this";
+				action: STATE_SET "selected" 0.0;
+				target: "outline";
+			}
+			program
+			{
 				name: "de-select";
-				signal: "default";
-				source: "EWL";
+				signal: "selection,off";
+				source: "ewl/this";
 				action: STATE_SET "default" 0.0;
 				target: "outline";
 			}
@@ -309,15 +325,23 @@
 			{
 				name: "selected";
 				signal: "selected";
-				source: "EWL";
+				source: "ewl/this";
 				action: STATE_SET "selected" 0.0;
 				target: "outline";
 			}
 			program
 			{
+				name: "select";
+				signal: "selection,on";
+				source: "ewl/this";
+				action: STATE_SET "selected" 0.0;
+				target: "outline";
+			}
+			program
+			{
 				name: "de-select";
-				signal: "default";
-				source: "EWL";
+				signal: "selection,off";
+				source: "ewl/this";
 				action: STATE_SET "default" 0.0;
 				target: "outline";
 			}
@@ -382,15 +406,23 @@
 			{
 				name: "selected";
 				signal: "selected";
-				source: "EWL";
+				source: "ewl/this";
 				action: STATE_SET "selected" 0.0;
 				target: "outline";
 			}
 			program
 			{
+				name: "select";
+				signal: "selection,on";
+				source: "ewl/this";
+				action: STATE_SET "selected" 0.0;
+				target: "outline";
+			}
+			program
+			{
 				name: "de-select";
-				signal: "default";
-				source: "EWL";
+				signal: "selection,off";
+				source: "ewl/this";
 				action: STATE_SET "default" 0.0;
 				target: "outline";
 			}

Modified: trunk/ewl/data/themes/e17/groups/progress.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/progress.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/progress.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -110,7 +110,7 @@
                 {
                         name: "unknown-start";
                         signal: "range-unknown";
-                        source: "*";
+                        source: "ewl/this";
                         action: STATE_SET "unknown-range" 1.0;
 			transition: LINEAR 3.0;
 			after: "unknown-end";

Modified: trunk/ewl/data/themes/e17/groups/scroll.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/scroll.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/scroll.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -202,7 +202,7 @@
                 {
                         name: "drag_down";
                         signal: "mouse,down,*";
-                        source: "EWL";
+                        source: "ewl/this";
                         action: STATE_SET "down" 0.0;
                         target: "drag";
                 	target: "drag_thumb";
@@ -211,7 +211,7 @@
                 {
                         name: "drag_up";
                         signal: "mouse,up,*";
-                        source: "EWL";
+                        source: "ewl/this";
                         action: STATE_SET "default" 0.0;
                         target: "drag";
 			target: "drag_thumb";
@@ -289,7 +289,7 @@
 		{
 			name: "drag_down";
 			signal: "mouse,down,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "down" 0.0;
 			target: "drag";
 		}
@@ -297,7 +297,7 @@
 		{
 			name: "drag_up";
 			signal: "mouse,up,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "drag";
 		}
@@ -383,7 +383,7 @@
                 {
                         name: "drag_down";
                         signal: "mouse,down,*";
-                        source: "EWL";
+                        source: "ewl/this";
                         action: STATE_SET "down" 0.0;
                         target: "drag";
 			target: "drag_thumb";
@@ -392,7 +392,7 @@
                 {
                         name: "drag_up";
                         signal: "mouse,up,*";
-                        source: "EWL";
+                        source: "ewl/this";
                         action: STATE_SET "default" 0.0;
                         target: "drag";
 			target: "drag_thumb";
@@ -470,7 +470,7 @@
 		{
 			name: "drag_down";
 			signal: "mouse,down,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "down" 0.0;
 			target: "drag";
 		}
@@ -478,7 +478,7 @@
 		{
 			name: "drag_up";
 			signal: "mouse,up,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "drag";
 		}
@@ -535,7 +535,7 @@
 		{
 			name: "mouse,down";
 			signal: "mouse,down,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "clicked" 0.0;
 			target: "button";
 		}
@@ -543,7 +543,7 @@
 		{
 			name: "mouse,up";
 			signal: "mouse,up,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "button";
 		}
@@ -600,7 +600,7 @@
 		{
 			name: "mouse,down";
 			signal: "mouse,down,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "clicked" 0.0;
 			target: "button";
 		}
@@ -608,7 +608,7 @@
 		{
 			name: "mouse,up";
 			signal: "mouse,up,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "button";
 		}
@@ -665,7 +665,7 @@
 		{
 			name: "mouse,down";
 			signal: "mouse,down,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "clicked" 0.0;
 			target: "button";
 		}
@@ -673,7 +673,7 @@
 		{
 			name: "mouse,up";
 			signal: "mouse,up,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "button";
 		}
@@ -730,7 +730,7 @@
 		{
 			name: "mouse,down";
 			signal: "mouse,down,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "clicked" 0.0;
 			target: "button";
 		}
@@ -738,7 +738,7 @@
 		{
 			name: "mouse,up";
 			signal: "mouse,up,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "button";
 		}

Modified: trunk/ewl/data/themes/e17/groups/spinner.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/spinner.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/spinner.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -56,7 +56,7 @@
 		{
 			name: "mouse,down";
 			signal: "mouse,down,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "clicked" 0.0;
 			target: "button";
 		}
@@ -64,7 +64,7 @@
 		{
 			name: "mouse,up";
 			signal: "mouse,up,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "button";
 		}
@@ -121,7 +121,7 @@
 		{
 			name: "mouse,down";
 			signal: "mouse,down,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "clicked" 0.0;
 			target: "button";
 		}
@@ -129,7 +129,7 @@
 		{
 			name: "mouse,up";
 			signal: "mouse,up,*";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "button";
 		}

Modified: trunk/ewl/data/themes/e17/groups/text.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/text.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/text.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -89,28 +89,45 @@
 	{
 		program
 		{
-			name: "disable";
+			name: "disabled";
 			signal: "disabled";
-			source: "*";
+			source: "ewl/both";
 			action: STATE_SET "disabled" 0.0;
-			transition: DECELERATE 0.2;
 			target: "entry_disabled";
 			target: "entry_focus";
 		}
 		program
 		{
+			name: "disable";
+			signal: "disable";
+			source: "ewl/both";
+			action: STATE_SET "disabled" 0.0;
+			transition: DECELERATE 0.5;
+			target: "entry_disabled";
+			target: "entry_focus";
+		}
+		program
+		{
 			name: "enable";
-			signal: "enabled";
-			source: "*";
+			signal: "enable";
+			source: "ewl/both";
 			action: STATE_SET "default" 0.0;
 			transition: ACCELERATE 0.5;
 			target: "entry_disabled";
 		}
 		program
 		{
+			name: "focused";
+			signal: "focused";
+			source: "ewl/this";
+			action: STATE_SET "focus" 0.0;
+			target: "entry_focus";
+		}
+		program
+		{
 			name: "focus,in";
 			signal: "focus,in";
-			source: "*";
+			source: "ewl/this";
 			action: STATE_SET "focus" 0.0;
 			transition: DECELERATE 0.2;
 			target: "entry_focus";
@@ -119,7 +136,7 @@
 		{
 			name: "focus,out";
 			signal: "focus,out";
-			source: "*";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			transition: ACCELERATE 0.5;
 			target: "entry_focus";
@@ -194,7 +211,7 @@
 		{
 			name: "no-blink";
 			signal: "noblink";
-			source, "EWL";
+			source, "ewl/this";
 			action: ACTION_STOP;
 			target: "blink-hold-on";
 			target: "blink-hold-off";

Modified: trunk/ewl/data/themes/e17/groups/toolbar.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/toolbar.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/toolbar.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -66,7 +66,7 @@
 		{
 			name: "highlight";
 			signal: "mouse,in";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "highlighted" 0.0;
 			target: "button_image";
 			transition: DECELERATE 1.0;
@@ -75,7 +75,7 @@
 		{
 			name: "un-highlight";
 			signal: "mouse,out";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "button_image";
 			transition: LINEAR 0.01;
@@ -83,8 +83,8 @@
 		program
 		{
 			name: "clicked";
-			signal: "mouse,down,*";
-			source: "EWL";
+			signal: "mouse,down,1";
+			source: "ewl/this";
 			action: STATE_SET "pressed" 0.0;
 			target: "button_image";
 			transition: LINEAR 0.0;
@@ -92,8 +92,8 @@
 		program
 		{
 			name: "release";
-			signal: "mouse,up,*";
-			source: "EWL";
+			signal: "mouse,up,1";
+			source: "ewl/this";
 			action: STATE_SET "highlighted" 0.0;
 			target: "button_image";
 			transition: LINEAR 0.01;

Modified: trunk/ewl/data/themes/e17/groups/tree.edc
===================================================================
--- trunk/ewl/data/themes/e17/groups/tree.edc	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/data/themes/e17/groups/tree.edc	2009-07-11 14:30:47 UTC (rev 41306)
@@ -79,26 +79,8 @@
 	{
 		part
 		{
-			name: "clip";
-			type: RECT;
-			mouse_events: 1;
-			
-			description
-			{
-				state: "default" 0.0;
-				visible: 1;
-			}
-			description
-			{
-				state: "hidden" 0.0;
-				visible: 0;
-			}
-		}
-		part
-		{
 			name: "expansion";
 			mouse_events: 1;
-			clip_to: "clip";
 			description
 			{
 				state: "default" 0.0;
@@ -124,26 +106,9 @@
 	{
 		program
 		{
-			name: "expandable";
-			signal: "expandable";
-			source: "*";
-			action: STATE_SET "default" 0.0;
-			target: "clip";
-
-		}
-		program
-		{
-			name: "nonexpandable";
-			signal: "nonexpandable";
-			source: "*";
-			action: STATE_SET "hidden" 0.0;
-			target: "clip";
-		}
-		program
-		{
 			name: "collapsed";
-			signal: "default";
-			source: "*";
+			signal: "state,off";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			transition: LINEAR 0.0;
 			target: "expansion";
@@ -151,8 +116,8 @@
 		program
 		{
 			name: "expand";
-			signal: "checked";
-			source: "*";
+			signal: "state,on";
+			source: "ewl/this";
 			action: STATE_SET "open" 0.0;
 			transition: LINEAR 0.0;
 			target: "expansion";
@@ -162,6 +127,12 @@
 
 group
 {
+	name: "ewl/tree/nonexpansion";
+	min: 16 16;
+}
+
+group
+{
 	name: "ewl/tree/header";
 	data
 	{
@@ -249,7 +220,7 @@
 		{
 			name: "ascending";
 			signal: "ascending";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "ascending" 0.0;
 			target: "arrow";
 			transition: LINEAR 0.0;
@@ -258,7 +229,7 @@
 		{
 			name: "descending";
 			signal: "descending";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "descending" 0.0;
 			target: "arrow";
 			transition: LINEAR 0.0;
@@ -267,7 +238,7 @@
 		{
 			name: "default";
 			signal: "default";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "arrow";
 			transition: LINEAR 0.0;
@@ -301,7 +272,7 @@
 			}
 			description
 			{
-				state: "even" 0.0;
+				state: "odd" 0.0;
 				inherit: "default" 0.0;
 				color: 221 221 221 100;
 			}
@@ -362,26 +333,35 @@
 	{
 		program
 		{
-			name: "odd";
+			name: "odded";
 			signal: "odd";
-			source: "*";
-			action: STATE_SET "default" 0.0;
+			source: "ewl/*";
+			action: STATE_SET "odd" 0.0;
 			transition: LINEAR 0.0;
 			target: "bg";
 		}
 		program
 		{
+			name: "odd";
+			signal: "odd,on";
+			source: "ewl/*";
+			action: STATE_SET "odd" 0.0;
+			transition: LINEAR 0.0;
+			target: "bg";
+		}
+		program
+		{
 			name: "even";
-			signal: "even";
-			source: "*";
-			action: STATE_SET "even" 0.0;
+			signal: "odd,off";
+			source: "ewl/*";
+			action: STATE_SET "default" 0.0;
 			transition: LINEAR 0.0;
 			target: "bg";
 		}
 		program
 		{
 			name: "select";
-			signal: "selected";
+			signal: "selection,on";
 			source: "*";
 			action: STATE_SET "selected" 0.0;
 			transition: DECELERATE 0.25;
@@ -389,8 +369,16 @@
 		}
 		program
 		{
+			name: "selected";
+			signal: "selected";
+			source: "*";
+			action: STATE_SET "selected" 0.0;
+			target: "selected";
+		}
+		program
+		{
 			name: "un-select";
-			signal: "deselect";
+			signal: "selection,off";
 			source: "*";
 			action: STATE_SET "default" 0.0;
 			transition: ACCELERATE 0.01;
@@ -400,7 +388,7 @@
 		{
 			name: "highlight";
 			signal: "highlight,on";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "highlighted" 0.0;
 			transition: LINEAR 0.0;
 			target: "highlight";
@@ -409,7 +397,7 @@
 		{
 			name: "un-highlight";
 			signal: "highlight,off";
-			source: "EWL";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			transition: LINEAR 0.0;
 			target: "highlight";
@@ -431,14 +419,6 @@
 			description
 			{
 				state: "default" 0.0;
-				rel1 
-				{
-					offset: -4 -4;
-				}
-				rel2
-				{
-					offset: 3 3;
-				}
 				color: 245 205 109 0;
 			}
 			description
@@ -453,17 +433,26 @@
 	{
 		program
 		{
-			name: "select";
+			name: "selected";
 			signal: "selected";
-			source: "*";
+			source: "ewl/this";
 			action: STATE_SET "selected" 0.0;
 			target: "selected";
 		}
 		program
 		{
+			name: "select";
+			signal: "selection,on";
+			source: "ewl/this";
+			action: STATE_SET "selected" 0.0;
+			transition: DECELERATE 0.5;
+			target: "selected";
+		}
+		program
+		{
 			name: "un-select";
-			signal: "deselect";
-			source: "*";
+			signal: "selection,off";
+			source: "ewl/this";
 			action: STATE_SET "default" 0.0;
 			target: "selected";
 		}

Modified: trunk/ewl/src/bin/ewl_simple_test.c
===================================================================
--- trunk/ewl/src/bin/ewl_simple_test.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/bin/ewl_simple_test.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -91,7 +91,7 @@
                                 void *user_data)
 {
         Ewl_Widget *logo = user_data;
-        ewl_widget_state_set(logo, "start_tour", EWL_STATE_PERSISTENT);
+        ewl_widget_custom_state_set(logo, "start_tour", EWL_PERSISTENT);
 
         ewl_widget_disable(w);
 }

Modified: trunk/ewl/src/bin/tests/config/ewl_config_unit_test.c
===================================================================
--- trunk/ewl/src/bin/tests/config/ewl_config_unit_test.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/bin/tests/config/ewl_config_unit_test.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -55,7 +55,7 @@
 
         conf = ewl_config_new("unit test");
 
-        ewl_config_string_set(conf, "weather", string, EWL_STATE_TRANSIENT);
+        ewl_config_string_set(conf, "weather", string, EWL_TRANSIENT);
 
         /* first try to get a string that cannot exist */
         value = ewl_config_string_get(conf, "climate");
@@ -106,7 +106,7 @@
 
         conf = ewl_config_new("unit test");
 
-        ewl_config_int_set(conf, "number", number, EWL_STATE_TRANSIENT);
+        ewl_config_int_set(conf, "number", number, EWL_TRANSIENT);
 
         /* first try to get a value that cannot exist */
         value = ewl_config_int_get(conf, "letter");
@@ -147,7 +147,7 @@
 
         conf = ewl_config_new("unit test");
 
-        ewl_config_float_set(conf, "velocity", number, EWL_STATE_TRANSIENT);
+        ewl_config_float_set(conf, "velocity", number, EWL_TRANSIENT);
 
         /* first try to get a value that cannot exist */
         value = ewl_config_float_get(conf, "speed");
@@ -188,7 +188,7 @@
         conf = ewl_config_new("unit test");
 
         ewl_config_color_set(conf, "bg_color", 0, 100, 200, 255,
-                                                        EWL_STATE_TRANSIENT);
+                                                        EWL_TRANSIENT);
 
         /* first try to get a value that cannot exist */
         ewl_config_color_get(conf, "fg_color", &r, &g, &b, &a);
@@ -239,7 +239,7 @@
                 const char *value;
 
                 ewl_config_string_set(conf, "test key", *string,
-                                                EWL_STATE_TRANSIENT);
+                                                EWL_TRANSIENT);
                 value = ewl_config_string_get(conf, "test key");
 
                 if (strcmp(value, *string)) {
@@ -272,7 +272,7 @@
                 int v = RAND_RANGE(-1000, 1000);
                 int v_r;
 
-                ewl_config_int_set(conf, "test key", v, EWL_STATE_TRANSIENT);
+                ewl_config_int_set(conf, "test key", v, EWL_TRANSIENT);
                 v_r = ewl_config_int_get(conf, "test key");
 
                 if (v_r != v) {
@@ -304,7 +304,7 @@
                 float v = rand();
                 float v_r;
 
-                ewl_config_float_set(conf, "test key", v, EWL_STATE_TRANSIENT);
+                ewl_config_float_set(conf, "test key", v, EWL_TRANSIENT);
                 v_r = ewl_config_float_get(conf, "test key");
 
                 if (v_r != v) {
@@ -340,7 +340,7 @@
                 int r_r, g_r, b_r, a_r;
 
                 ewl_config_color_set(conf, "test key", r, g, b, a,
-                                                        EWL_STATE_TRANSIENT);
+                                                        EWL_TRANSIENT);
                 ewl_config_color_get(conf, "test key", &r_r, &g_r, &b_r, &a_r);
 
                 if (r_r != r || g_r != g || b_r != b || a_r != a) {

Modified: trunk/ewl/src/engines/evas/ewl_engine_evas.c
===================================================================
--- trunk/ewl/src/engines/evas/ewl_engine_evas.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/engines/evas/ewl_engine_evas.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -35,15 +35,20 @@
 static Evas_Object *ee_theme_layer_neighbor_find_below(Ewl_Widget *w, Evas_Object *clip);
 static Evas_Object *ee_theme_layer_neighbor_find_above(Ewl_Widget *w, Evas_Object *clip);
 static unsigned int ee_theme_element_swallow(Evas_Object *obj1, Evas_Object *obj2);
-static void ee_theme_element_state_set(Evas_Object *obj, const char *signal);
+static void ee_theme_element_state_add(Evas_Object *obj, Ewl_State state, unsigned int inherited);
+static void ee_theme_element_state_remove(Evas_Object *obj, Ewl_State state, unsigned int inherited);
+static void ee_theme_element_states_apply(Evas_Object *obj, unsigned int states,
+                unsigned int inherited);
 
+static void ee_theme_element_custom_state_set(Evas_Object *obj, const char *signal);
+
 static void *ee_theme_image_add(Ewl_Embed *embed);
 static void  ee_theme_image_data_set(void *i, void *data, int w, int h, 
                 Ewl_Colorspace cs);
 static void *ee_theme_image_data_get(void *i, int *w, int *h,
                 Ewl_Image_Data_Mode access);
 
-static void *canvas_funcs[EWL_ENGINE_CANVAS_MAX] =
+static void *canvas_funcs[] =
         {
                 NULL,
                 ee_canvas_output_set,
@@ -53,15 +58,17 @@
                 ee_canvas_damage_add
         };
 
-static void *theme_funcs[EWL_ENGINE_THEME_MAX] =
+DSTATIC_ASSERT(EWL_ENGINE_CANVAS_MAX == ARRAY_COUNT(canvas_funcs));
+
+static void *theme_funcs[] =
         {
                 /* the general functions */
                 /* FIXME: disable these calls for now. They stop ejde reloading
                  *  the theme object correctly after it was obscured, in some
                  *  cases. If these problems are solved, please activate them
                  *  again. For more information see bug #3, #116 and #456*/
-                NULL, //edje_freeze,
-                NULL, //edje_thaw,
+                edje_freeze,
+                edje_thaw,
                 ee_theme_layer_stack_add,
                 ee_theme_layer_stack_del,
                 ee_theme_layer_update,
@@ -78,7 +85,10 @@
                 ee_theme_element_add,
                 edje_object_file_set,
                 edje_object_load_error_get,
-                ee_theme_element_state_set,
+                ee_theme_element_state_add,
+                ee_theme_element_state_remove,
+                ee_theme_element_states_apply,
+                ee_theme_element_custom_state_set,
                 edje_object_part_text_set,
                 edje_object_size_min_get,
                 edje_object_size_min_calc,
@@ -95,6 +105,8 @@
                 evas_object_image_data_update_add,
         };
 
+DSTATIC_ASSERT(EWL_ENGINE_THEME_MAX == ARRAY_COUNT(theme_funcs));
+
 Ecore_DList *
 ewl_engine_dependancies(void)
 {
@@ -288,16 +300,146 @@
 }
 
 static void
-ee_theme_element_state_set(Evas_Object *obj, const char *signal)
+ee_theme_element_state_add(Evas_Object *obj, Ewl_State state,
+                Ewl_Engine_State_Source so)
 {
+        const char *signal;
+        const char *source[] = { "ewl/this", "ewl/parent", "ewl/both" };
+
         DENTER_FUNCTION(DLEVEL_STABLE);
 
-        edje_object_signal_emit(obj, signal, "EWL");
+        switch (state)
+        {
+                case EWL_STATE_MOUSE_IN:
+                        signal = "mouse,in";
+                        break;
+                case EWL_STATE_MOUSE_DOWN:
+                        signal = "mouse,down";
+                        break;
+                case EWL_STATE_FOCUSED:
+                        signal = "focus,in";
+                        break;
+                case EWL_STATE_DISABLED:
+                        signal = "disable";
+                        break;
+                case EWL_STATE_HIGHLIGHTED:
+                        signal = "highlight,on";
+                        break;
+                case EWL_STATE_SELECTED:
+                        signal = "selection,on";
+                        break;
+                case EWL_STATE_ON:
+                        signal = "state,on";
+                        break;
+                case EWL_STATE_ODD:
+                        signal = "odd,on";
+                        break;
+                case EWL_STATE_DND:
+                        signal = "dnd,in";
+                        break;
+                default:
+                        DRETURN(DLEVEL_STABLE);
+                        break;
+        }
 
+        if (ewl_config_cache.print_signals)
+                printf("\tsignal: %s source: %s\n", signal, source[so]);
+
+        edje_object_signal_emit(obj, signal, source[so]);
+
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
 static void
+ee_theme_element_state_remove(Evas_Object *obj, Ewl_State state,
+                Ewl_Engine_State_Source so)
+{
+        const char *signal;
+        const char *source[] = { "ewl/this", "ewl/parent", "ewl/both" };
+
+        DENTER_FUNCTION(DLEVEL_STABLE);
+
+        switch (state)
+        {
+                case EWL_STATE_MOUSE_IN:
+                        signal = "mouse,out";
+                        break;
+                case EWL_STATE_MOUSE_DOWN:
+                        signal = "mouse,up";
+                        break;
+                case EWL_STATE_FOCUSED:
+                        signal = "focus,out";
+                        break;
+                case EWL_STATE_DISABLED:
+                        signal = "enable";
+                        break;
+                case EWL_STATE_HIGHLIGHTED:
+                        signal = "highlight,off";
+                        break;
+                case EWL_STATE_SELECTED:
+                        signal = "selection,off";
+                        break;
+                case EWL_STATE_ON:
+                        signal = "state,off";
+                        break;
+                case EWL_STATE_ODD:
+                        signal = "odd,off";
+                        break;
+                case EWL_STATE_DND:
+                        signal = "dnd,out";
+                        break;
+                default:
+                        DRETURN(DLEVEL_STABLE);
+                        break;
+        }
+
+        if (ewl_config_cache.print_signals)
+                printf("\tsignal: %s source: %s\n", signal, source[so]);
+
+        edje_object_signal_emit(obj, signal, source[so]);
+
+        DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+static void
+ee_theme_element_states_apply(Evas_Object *obj, unsigned int states,
+                Ewl_Engine_State_Source so)
+{
+        const char *source[] = { "ewl/this", "ewl/parent", "ewl/both" };
+        const char *signal[] = { "hovered", "pressed", "focused", "disabled",
+                "highlighted", "selected", "on", "odd", "dnd" };
+        unsigned int i;
+
+        DENTER_FUNCTION(DLEVEL_STABLE);
+
+        for (i = 0; i < ARRAY_COUNT(signal); i++)
+        {
+                if (states & (1 << i))
+                {
+                        if (ewl_config_cache.print_signals)
+                                printf("\tsignal: %s source: %s\n", signal[i],
+                                                        source[so]);
+                        edje_object_signal_emit(obj, signal[i], source[so]);
+                }
+        }
+
+        DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+static void
+ee_theme_element_custom_state_set(Evas_Object *obj, const char *signal)
+{
+        DENTER_FUNCTION(DLEVEL_STABLE);
+
+        if (ewl_config_cache.print_signals)
+                printf("signal: %s source: %s\n", signal, "ewl/this");
+
+        edje_object_signal_emit(obj, signal, "ewl/this");
+
+        DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+static void
 ee_theme_layer_stack_add(Ewl_Widget *w)
 {
         Evas_Object *smart_parent;

Modified: trunk/ewl/src/lib/ewl_box.c
===================================================================
--- trunk/ewl/src/lib/ewl_box.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_box.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -166,9 +166,6 @@
          */
         ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
                                 ewl_box_cb_configure, NULL);
-        ewl_callback_del(w, EWL_CALLBACK_FOCUS_OUT, ewl_widget_cb_focus_out);
-        ewl_callback_append(w, EWL_CALLBACK_FOCUS_OUT,
-                                ewl_container_cb_container_focus_out, NULL);
 
         /*
          * Check if the info structs have been created yet, if not create

Modified: trunk/ewl/src/lib/ewl_button.c
===================================================================
--- trunk/ewl/src/lib/ewl_button.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_button.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -78,10 +78,6 @@
 
         ewl_callback_append(w, EWL_CALLBACK_KEY_DOWN,
                                 ewl_button_cb_key_down, NULL);
-        ewl_callback_append(w, EWL_CALLBACK_FOCUS_IN,
-                                ewl_container_cb_widget_focus_in, NULL);
-        ewl_callback_append(w, EWL_CALLBACK_FOCUS_OUT,
-                                ewl_container_cb_widget_focus_out, NULL);
 
         DRETURN_INT(TRUE, DLEVEL_STABLE);
 }

Modified: trunk/ewl/src/lib/ewl_cell.c
===================================================================
--- trunk/ewl/src/lib/ewl_cell.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_cell.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -5,8 +5,6 @@
 #include "ewl_private.h"
 #include "ewl_debug.h"
 
-static void ewl_cell_cb_state_changed(Ewl_Widget *w, void *ev, void *data);
-
 /**
  * @return Returns a newly allocated cell on success, NULL on failure.
  * @brief Allocate and initialize a new cell
@@ -157,79 +155,3 @@
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
-/**
- * @internal
- * @param cell: The cell to work with
- * @return: Returns no value
- * @brief Adds the callback to send state changes on to the cell's children
- */
-void
-ewl_cell_state_change_cb_add(Ewl_Cell *cell)
-{
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(cell);
-        DCHECK_TYPE(cell, EWL_CELL_TYPE);
-
-        ewl_callback_append(EWL_WIDGET(cell), EWL_CALLBACK_STATE_CHANGED,
-                        ewl_cell_cb_state_changed, NULL);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @param cell: The cell to work with
- * @return: Returns no value
- * @brief Removes the callback to send state changes on to the cell's children
- */
-void
-ewl_cell_state_change_cb_del(Ewl_Cell *cell)
-{
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(cell);
-        DCHECK_TYPE(cell, EWL_CELL_TYPE);
-
-        ewl_callback_del(EWL_WIDGET(cell), EWL_CALLBACK_STATE_CHANGED,
-                        ewl_cell_cb_state_changed);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: The widget to work with
- * @ev: The Ewl_Event_State_Change struct
- * @data: UNUSED
- * @return Returns no value
- * @brief Sends the state on to the cell's children
- */
-void
-ewl_cell_cb_state_changed(Ewl_Widget *w, void *ev, void *data __UNUSED__)
-{
-        Ewl_Widget *o;
-        Ewl_Event_State_Change *e;
-        const char *send_state;
-
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(w);
-        DCHECK_PARAM_PTR(ev);
-        DCHECK_TYPE(w, EWL_CELL_TYPE);
-
-        e = EWL_EVENT_STATE_CHANGE(ev);
-
-        /* Only want this for selected signals */
-        if (!strcmp(e->state, "selected"))
-                send_state = "parent,selected";
-        else if (!strcmp(e->state, "deselect"))
-                send_state = "parent,deselect";
-        else if ((!strcmp(e->state, "parent,selected")) ||
-                        (!strcmp(e->state, "parent,deselect")))
-                send_state = e->state;
-        else
-                DRETURN(DLEVEL_STABLE);
-
-        ewl_container_child_iterate_begin(EWL_CONTAINER(w));
-        while ((o = ewl_container_child_next(EWL_CONTAINER(w))))
-                ewl_widget_state_set(o, send_state, e->flag);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}

Modified: trunk/ewl/src/lib/ewl_cell.h
===================================================================
--- trunk/ewl/src/lib/ewl_cell.h	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_cell.h	2009-07-11 14:30:47 UTC (rev 41306)
@@ -52,8 +52,6 @@
 
 Ewl_Widget       *ewl_cell_new(void);
 int               ewl_cell_init(Ewl_Cell *cell);
-void              ewl_cell_state_change_cb_add(Ewl_Cell *cell);
-void              ewl_cell_state_change_cb_del(Ewl_Cell *cell);
 
 /*
  * Internally used callbacks, override at your own risk.

Modified: trunk/ewl/src/lib/ewl_check.c
===================================================================
--- trunk/ewl/src/lib/ewl_check.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_check.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -149,9 +149,9 @@
 
         cb = EWL_CHECK(w);
         if (cb->checked)
-                ewl_widget_state_set(w, "checked", EWL_STATE_PERSISTENT);
+                ewl_widget_state_add(w, EWL_STATE_ON);
         else
-                ewl_widget_state_set(w, "default", EWL_STATE_PERSISTENT);
+                ewl_widget_state_remove(w, EWL_STATE_ON);
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }

Modified: trunk/ewl/src/lib/ewl_combo.c
===================================================================
--- trunk/ewl/src/lib/ewl_combo.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_combo.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -258,10 +258,7 @@
         ewl_window_raise(EWL_WINDOW(combo->popup));
         ewl_widget_focus_send(EWL_WIDGET(combo->popup));
 
-        ewl_widget_state_set(combo->button, "expanded",
-                                        EWL_STATE_PERSISTENT);
-        ewl_widget_state_set(EWL_WIDGET(combo), "expanded",
-                                        EWL_STATE_PERSISTENT);
+        ewl_widget_state_add(EWL_WIDGET(combo), EWL_STATE_ON);
 
         if (!ewl_mvc_dirty_get(EWL_MVC(combo)))
                 DRETURN(DLEVEL_STABLE);
@@ -294,9 +291,7 @@
         DCHECK_TYPE(data, EWL_COMBO_TYPE);
 
         combo = EWL_COMBO(data);
-        ewl_widget_state_set(combo->button, "collapsed", EWL_STATE_PERSISTENT);
-        ewl_widget_state_set(EWL_WIDGET(combo), "collapsed",
-                                        EWL_STATE_PERSISTENT);
+        ewl_widget_state_remove(EWL_WIDGET(combo), EWL_STATE_ON);
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }

Modified: trunk/ewl/src/lib/ewl_config.c
===================================================================
--- trunk/ewl/src/lib/ewl_config.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_config.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -51,7 +51,7 @@
 static void ewl_config_create_user_hash(Ewl_Config *cfg);
 
 static Ecore_Hash *ewl_config_set_hash_get(Ewl_Config *cfg,
-                                        Ewl_State_Type state);
+                                        Ewl_Durability state);
 static const char *ewl_config_get(Ewl_Config *cfg, const char *key);
 static const char *ewl_config_env_get(Ewl_Config *cfg, const char *key);
 static char *ewl_config_trim(char *v);
@@ -186,7 +186,7 @@
  */
 void
 ewl_config_string_set(Ewl_Config *cfg, const char *k, const char *v,
-                                                Ewl_State_Type state)
+                                                Ewl_Durability state)
 {
         DENTER_FUNCTION(DLEVEL_STABLE);
         DCHECK_PARAM_PTR(k);
@@ -225,7 +225,7 @@
  */
 void
 ewl_config_int_set(Ewl_Config *cfg, const char *k, int v,
-                                        Ewl_State_Type state)
+                                        Ewl_Durability state)
 {
         char buf[128];
 
@@ -273,7 +273,7 @@
  */
 void
 ewl_config_float_set(Ewl_Config *cfg, const char *k, float v,
-                                        Ewl_State_Type state)
+                                        Ewl_Durability state)
 {
         char buf[128];
 
@@ -325,7 +325,7 @@
 void
 ewl_config_color_set(Ewl_Config *cfg, const char *k, int r, int g,
                                         int b, int a,
-                                        Ewl_State_Type state)
+                                        Ewl_Durability state)
 {
         char buf[128];
 
@@ -1051,14 +1051,14 @@
 }
 
 static Ecore_Hash *
-ewl_config_set_hash_get(Ewl_Config *cfg, Ewl_State_Type state)
+ewl_config_set_hash_get(Ewl_Config *cfg, Ewl_Durability state)
 {
         Ecore_Hash *hash = NULL;
 
         DENTER_FUNCTION(DLEVEL_STABLE);
         DCHECK_PARAM_PTR_RET(cfg, NULL);
 
-        if (state == EWL_STATE_TRANSIENT)
+        if (state == EWL_TRANSIENT)
         {
                 ewl_config_create_instance_hash(cfg);
                 hash = cfg->data.instance;

Modified: trunk/ewl/src/lib/ewl_config.h
===================================================================
--- trunk/ewl/src/lib/ewl_config.h	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_config.h	2009-07-11 14:30:47 UTC (rev 41306)
@@ -37,21 +37,21 @@
 
 void             ewl_config_string_set(Ewl_Config *cfg, const char *k,
                                                 const char *v,
-                                                Ewl_State_Type state);
+                                                Ewl_Durability state);
 const char      *ewl_config_string_get(Ewl_Config *cfg, const char *k);
 
 void             ewl_config_int_set(Ewl_Config *cfg, const char *k, int v,
-                                                Ewl_State_Type state);
+                                                Ewl_Durability state);
 int              ewl_config_int_get(Ewl_Config *cfg, const char *k);
 
 void             ewl_config_float_set(Ewl_Config *cfg, const char *k,
                                                 float v,
-                                                Ewl_State_Type state);
+                                                Ewl_Durability state);
 float            ewl_config_float_get(Ewl_Config *cfg, const char *k);
 
 void             ewl_config_color_set(Ewl_Config *cfg, const char *k,
                                                 int r, int g, int b, int a,
-                                                Ewl_State_Type state);
+                                                Ewl_Durability state);
 void             ewl_config_color_get(Ewl_Config *cfg, const char *k,
                                                 int *r, int *g,
                                                 int *b, int *a);

Modified: trunk/ewl/src/lib/ewl_container.c
===================================================================
--- trunk/ewl/src/lib/ewl_container.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_container.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -84,10 +84,8 @@
                             ewl_container_cb_unrealize, NULL);
         ewl_callback_append(w, EWL_CALLBACK_REPARENT,
                             ewl_container_cb_reparent, NULL);
-        ewl_callback_append(w, EWL_CALLBACK_WIDGET_ENABLE,
-                            ewl_container_cb_enable, NULL);
-        ewl_callback_append(w, EWL_CALLBACK_WIDGET_DISABLE,
-                            ewl_container_cb_disable, NULL);
+        ewl_callback_append(w, EWL_CALLBACK_STATE_CHANGED,
+                            ewl_container_cb_state_change, NULL);
 
         DRETURN_INT(TRUE, DLEVEL_STABLE);
 }
@@ -1373,60 +1371,65 @@
  * @param ev_data: UNUSED
  * @param user_data: UNUSED
  * @return Returns no value
- * @brief When enabling a container, pass the signal to the children.
+ * @brief When changing the state of a container pass it to the (internal) children
  */
 void
-ewl_container_cb_enable(Ewl_Widget *w, void *ev_data __UNUSED__,
+ewl_container_cb_state_change(Ewl_Widget *w, void *ev_data,
                                                 void *user_data __UNUSED__)
 {
         Ewl_Widget *child;
+        Ewl_Event_State_Change *ev;
 
         DENTER_FUNCTION(DLEVEL_STABLE);
         DCHECK_PARAM_PTR(w);
+        DCHECK_PARAM_PTR(ev_data);
         DCHECK_TYPE(w, EWL_CONTAINER_TYPE);
 
+        ev = ev_data;
+
         if (!EWL_CONTAINER(w)->children)
                 DRETURN(DLEVEL_STABLE);
 
-        /*
-         * Enable all of the containers children
-         */
-        ecore_dlist_first_goto(EWL_CONTAINER(w)->children);
-        while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children)) != NULL) {
-                ewl_widget_enable(child);
-        }
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: The widget to work with
- * @param ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief When enabling a container, pass the signal to the children.
- */
-void
-ewl_container_cb_disable(Ewl_Widget *w, void *ev_data __UNUSED__,
-                                                void *user_data __UNUSED__)
-{
-        Ewl_Widget *child;
-
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(w);
-        DCHECK_TYPE(w, EWL_CONTAINER_TYPE);
-
-        if (!EWL_CONTAINER(w)->children)
+        if (ev->custom_state)
                 DRETURN(DLEVEL_STABLE);
 
         /*
-         * Disable all of the containers children
+         * we treat the disable states special here because they are also
+         * propagated to non internal children
          */
         ecore_dlist_first_goto(EWL_CONTAINER(w)->children);
-        while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children)) != NULL) {
-                ewl_widget_disable(child);
+        if (ev->normal.state_add == EWL_STATE_DISABLED)
+        {
+                while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children))) 
+                        ewl_widget_inherited_state_add(child, 
+                                                        EWL_STATE_DISABLED);
         }
+        else if (ev->normal.state_remove == EWL_STATE_DISABLED)
+        {
+                while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children))) 
+                        ewl_widget_inherited_state_remove(child,
+                                                        EWL_STATE_DISABLED);
+        }
+        else if (!ev->normal.state_remove)
+        {
+                while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children))) 
+                {
+                        if (!ewl_widget_internal_is(child))
+                                continue;
+                        ewl_widget_inherited_state_add(child,
+                                                        ev->normal.state_add);
+                }
+        }
+        else
+        {
+                while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children))) 
+                {
+                        if (!ewl_widget_internal_is(child))
+                                continue;
+                        ewl_widget_inherited_state_remove(child,
+                                                ev->normal.state_remove);
+                }
+        }
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
@@ -1592,74 +1595,15 @@
         /* If its a child or is disabled then don't send a signal */
         if ((focus_in) && (!ewl_widget_parent_of(w, focus_in)) &&
                                 (!DISABLED(w)) && (focus_in != w))
-                ewl_widget_state_set(w, "focus,out", EWL_STATE_TRANSIENT);
+        {
+                /* XXX is this correct? */
+                ewl_widget_state_remove(w, EWL_STATE_FOCUSED);
+        }
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
 /**
- * @internal
- * @param w: The widget to work with
- * @param: ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief A callback to be used with end widgets such as buttons, etc
- */
-void
-ewl_container_cb_widget_focus_out(Ewl_Widget *w, void *ev_data __UNUSED__, 
-                                        void *user_data __UNUSED__)
-{
-        Ewl_Container *c;
-
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(w);
-
-        if (DISABLED(w))
-                DRETURN(DLEVEL_STABLE);
-
-        c = EWL_CONTAINER(w);
-        while (c->redirect)
-                c = c->redirect;
-
-        ecore_dlist_first_goto(c->children);
-        while ((w = ecore_dlist_next(c->children)))
-                ewl_widget_state_set(w, "focus,out", EWL_STATE_TRANSIENT);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: The widget to work with
- * @param ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief A callback to be used with end widgets
- */
-void
-ewl_container_cb_widget_focus_in(Ewl_Widget *w, void *ev_data __UNUSED__, 
-                                 void *user_data __UNUSED__)
-{
-        Ewl_Container *c;
-
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(w);
-
-        if (DISABLED(w))
-                DRETURN(DLEVEL_STABLE);
-
-        c = EWL_CONTAINER(w);
-        while (c->redirect)
-                c = c->redirect;
-
-        ecore_dlist_first_goto(c->children);
-        while ((w = ecore_dlist_next(c->children)))
-                ewl_widget_state_set(w, "focus,in", EWL_STATE_TRANSIENT);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
  * @param c: The container to work with
  * @return Returns no value
  * @brief A convenience function to recursively show the children of a container

Modified: trunk/ewl/src/lib/ewl_container.h
===================================================================
--- trunk/ewl/src/lib/ewl_container.h	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_container.h	2009-07-11 14:30:47 UTC (rev 41306)
@@ -184,11 +184,8 @@
 void ewl_container_cb_configure(Ewl_Widget *w, void *ev_data, void *user_data);
 void ewl_container_cb_reparent(Ewl_Widget *w, void *ev_data, void *user_data);
 void ewl_container_cb_unrealize(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_container_cb_enable(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_container_cb_disable(Ewl_Widget *w, void *ev_data, void *user_data);
+void ewl_container_cb_state_change(Ewl_Widget *w, void *ev_data, void *user_data);
 void ewl_container_cb_container_focus_out(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_container_cb_widget_focus_out(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_container_cb_widget_focus_in(Ewl_Widget *w, void *ev_data, void *user_data);
 
 /**
  * @}

Modified: trunk/ewl/src/lib/ewl_embed.c
===================================================================
--- trunk/ewl/src/lib/ewl_embed.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_embed.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -339,10 +339,8 @@
         {
                 Ewl_Widget *temp;
 
-                ewl_widget_state_remove(e->last.clicked,
-                                                EWL_FLAG_STATE_FOCUSED);
-                ewl_widget_state_remove(e->last.clicked,
-                                                EWL_FLAG_STATE_PRESSED);
+                ewl_widget_state_remove(e->last.clicked, EWL_STATE_FOCUSED);
+                ewl_widget_state_remove(e->last.clicked, EWL_STATE_MOUSE_DOWN);
 
                 ewl_callback_call(e->last.clicked, EWL_CALLBACK_FOCUS_OUT);
 
@@ -351,7 +349,7 @@
                 while (temp) {
                         if (!DISABLED(temp))
                                 ewl_widget_state_remove(temp,
-                                                        EWL_FLAG_STATE_PRESSED);
+                                                        EWL_STATE_MOUSE_DOWN);
                         temp = temp->parent;
                 }
 
@@ -595,7 +593,7 @@
         temp = widget;
         while (temp) {
                 if (!DISABLED(temp)) {
-                        ewl_widget_state_add(temp, EWL_FLAG_STATE_PRESSED);
+                        ewl_widget_state_add(temp, EWL_STATE_MOUSE_DOWN);
 
                         ewl_callback_call_with_event_data(temp,
                                         EWL_CALLBACK_MOUSE_DOWN, &ev);
@@ -622,15 +620,13 @@
                  */
                 if (deselect && !DESTROYED(deselect) &&
                                 !ewl_widget_parent_of(deselect, widget)) {
-                        ewl_widget_state_remove(deselect,
-                                        EWL_FLAG_STATE_FOCUSED);
+                        ewl_widget_state_remove(deselect, EWL_STATE_FOCUSED);
                         ewl_callback_call_with_event_data(deselect,
                                         EWL_CALLBACK_FOCUS_OUT, widget);
                 }
 
                 if (widget && !DISABLED(widget) && !DESTROYED(widget)) {
-                        ewl_widget_state_add(widget,
-                                        EWL_FLAG_STATE_FOCUSED);
+                        ewl_widget_state_add(widget, EWL_STATE_FOCUSED);
                         ewl_callback_call_with_event_data(widget,
                                         EWL_CALLBACK_FOCUS_IN, deselect);
                 }
@@ -681,8 +677,7 @@
         temp = embed->last.clicked;
         while (temp) {
                 if (!DISABLED(temp)) {
-                        ewl_widget_state_remove(temp,
-                                        EWL_FLAG_STATE_PRESSED);
+                        ewl_widget_state_remove(temp, EWL_STATE_MOUSE_DOWN);
                         ewl_callback_call_with_event_data(temp,
                                         EWL_CALLBACK_MOUSE_UP, &ev);
 
@@ -730,7 +725,7 @@
          * focused widget.
          */
         check = embed->last.mouse_in;
-        if (!check || !ewl_widget_state_has(check, EWL_FLAG_STATE_PRESSED)) {
+        if (!check || !ewl_widget_state_has(check, EWL_STATE_MOUSE_DOWN)) {
 
                 widget = ewl_container_child_at_recursive_get(EWL_CONTAINER(embed), x, y);
                 if (!widget) widget = EWL_WIDGET(embed);
@@ -770,7 +765,7 @@
         while (check && (widget != check)
                         && !ewl_widget_parent_of(check, widget)) {
 
-                ewl_widget_state_remove(check, EWL_FLAG_STATE_MOUSE_IN);
+                ewl_widget_state_remove(check, EWL_STATE_MOUSE_IN);
                 ewl_callback_call(check, EWL_CALLBACK_MOUSE_OUT);
                 check = check->parent;
         }
@@ -787,8 +782,8 @@
                         /*
                          * First mouse move event in a widget marks it focused.
                          */
-                        if (!(ewl_widget_state_has(check,
-                                                EWL_FLAG_STATE_MOUSE_IN))) {
+                        if (!(ewl_widget_state_has(check, EWL_STATE_MOUSE_IN)))
+                        {
 
                                 /* Only set the cursor different if it is non-default */
                                 if (ewl_attach_get(check,
@@ -798,7 +793,7 @@
                                         ewl_embed_mouse_cursor_set(check);
 
                                 ewl_widget_state_add(check,
-                                                EWL_FLAG_STATE_MOUSE_IN);
+                                                EWL_STATE_MOUSE_IN);
                                 ewl_callback_call_with_event_data(check,
                                                 EWL_CALLBACK_MOUSE_IN, &ev);
                         }
@@ -820,12 +815,12 @@
          * events.
          */
         check = embed->last.drag_widget;
-        if (check && ewl_widget_state_has(check, EWL_FLAG_STATE_DND))
+        if (check && ewl_widget_state_has(check, EWL_STATE_DND))
                 ewl_callback_call_with_event_data(check,
                                                   EWL_CALLBACK_MOUSE_MOVE, &ev);
 
         check = embed->last.clicked;
-        if (check && ewl_widget_state_has(check, EWL_FLAG_STATE_PRESSED))
+        if (check && ewl_widget_state_has(check, EWL_STATE_MOUSE_DOWN))
                 ewl_callback_call_with_event_data(check,
                                                   EWL_CALLBACK_MOUSE_MOVE, &ev);
 
@@ -1014,14 +1009,14 @@
 
         while (embed->last.mouse_in) {
                 ewl_widget_state_remove(embed->last.mouse_in,
-                                        EWL_FLAG_STATE_MOUSE_IN);
+                                        EWL_STATE_MOUSE_IN);
                 ewl_callback_call_with_event_data(embed->last.mouse_in,
                                                   EWL_CALLBACK_MOUSE_OUT, &ev);
                 embed->last.mouse_in = embed->last.mouse_in->parent;
         }
 
         if ((embed->last.drag_widget) && (ewl_widget_state_has
-                                (embed->last.drag_widget, EWL_FLAG_STATE_DND)))
+                                (embed->last.drag_widget, EWL_STATE_DND)))
                 ewl_dnd_external_drag_start(embed->last.drag_widget);
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -1614,13 +1609,19 @@
         DCHECK_TYPE(w, EWL_WIDGET_TYPE);
 
         if (embed->last.focused && (embed->last.focused != w))
+        {
+                ewl_widget_state_remove(embed->last.focused, EWL_STATE_FOCUSED);
                 ewl_callback_call_with_event_data(embed->last.focused,
                                 EWL_CALLBACK_FOCUS_OUT, w);
+        }
 
         embed->last.focused = w;
 
         if (embed->last.focused)
+        {
+                ewl_widget_state_add(embed->last.focused, EWL_STATE_FOCUSED);
                 ewl_callback_call(embed->last.focused, EWL_CALLBACK_FOCUS_IN);
+        }
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
@@ -1677,7 +1678,7 @@
         DCHECK_TYPE(e, EWL_EMBED_TYPE);
         DCHECK_TYPE(w, EWL_WIDGET_TYPE);
 
-        ewl_widget_state_remove(w, EWL_FLAG_STATE_PRESSED);
+        ewl_widget_state_remove(w, EWL_STATE_MOUSE_DOWN);
 
         if ((w == e->last.focused)
                         || (RECURSIVE(w)
@@ -2058,7 +2059,7 @@
 
         /* since we lose focus here, it cannot be a double or triple click,
          * hence feed one */
-        if (ewl_widget_state_has(emb->last.focused, EWL_FLAG_STATE_PRESSED))
+        if (ewl_widget_state_has(emb->last.focused, EWL_STATE_MOUSE_DOWN))
                 ewl_embed_mouse_up_feed(emb, 1, 1, 0, 0, ewl_ev_modifiers_get());
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);

Modified: trunk/ewl/src/lib/ewl_engines.c
===================================================================
--- trunk/ewl/src/lib/ewl_engines.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_engines.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -1519,10 +1519,78 @@
  * @brief
  */
 void
-ewl_engine_theme_element_state_set(Ewl_Embed *embed, void *obj,
+ewl_engine_theme_element_state_add(Ewl_Embed *embed, void *obj, Ewl_State state,
+                Ewl_Engine_State_Source source)
+{
+        Ewl_Engine_Cb_Theme_Element_State_Add state_add;
+
+        DENTER_FUNCTION(DLEVEL_STABLE);
+        DCHECK_PARAM_PTR(embed);
+        DCHECK_TYPE(embed, EWL_EMBED_TYPE);
+
+        state_add = ewl_engine_hook_get(embed,
+                                        EWL_ENGINE_HOOK_TYPE_THEME,
+                                        EWL_ENGINE_THEME_ELEMENT_STATE_ADD);
+        if (state_add)
+                state_add(obj, state, source);
+
+        DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @brief
+ */
+void
+ewl_engine_theme_element_state_remove(Ewl_Embed *embed, void *obj,
+                                        Ewl_State state,
+                                        Ewl_Engine_State_Source source)
+{
+        Ewl_Engine_Cb_Theme_Element_State_Remove state_remove;
+
+        DENTER_FUNCTION(DLEVEL_STABLE);
+        DCHECK_PARAM_PTR(embed);
+        DCHECK_TYPE(embed, EWL_EMBED_TYPE);
+
+        state_remove = ewl_engine_hook_get(embed,
+                                        EWL_ENGINE_HOOK_TYPE_THEME,
+                                        EWL_ENGINE_THEME_ELEMENT_STATE_REMOVE);
+        if (state_remove)
+                state_remove(obj, state, source);
+
+        DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @brief
+ */
+void
+ewl_engine_theme_element_states_apply(Ewl_Embed *embed, void *obj,
+                                        unsigned int states,
+                                        unsigned int source)
+{
+        Ewl_Engine_Cb_Theme_Element_States_Apply states_apply;
+
+        DENTER_FUNCTION(DLEVEL_STABLE);
+        DCHECK_PARAM_PTR(embed);
+        DCHECK_TYPE(embed, EWL_EMBED_TYPE);
+
+        states_apply = ewl_engine_hook_get(embed,
+                                        EWL_ENGINE_HOOK_TYPE_THEME,
+                                        EWL_ENGINE_THEME_ELEMENT_STATES_APPLY);
+        if (states_apply)
+                states_apply(obj, states, source);
+
+        DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @brief
+ */
+void
+ewl_engine_theme_element_custom_state_set(Ewl_Embed *embed, void *obj,
                 const char *state)
 {
-        Ewl_Engine_Cb_Theme_Element_State_Set state_set;
+        Ewl_Engine_Cb_Theme_Element_Custom_State_Set state_set;
 
         DENTER_FUNCTION(DLEVEL_STABLE);
         DCHECK_PARAM_PTR(embed);
@@ -1530,7 +1598,7 @@
 
         state_set = ewl_engine_hook_get(embed,
                                         EWL_ENGINE_HOOK_TYPE_THEME,
-                                        EWL_ENGINE_THEME_ELEMENT_STATE_SET);
+                                        EWL_ENGINE_THEME_ELEMENT_CUSTOM_STATE_SET);
         if (state_set)
                 state_set(obj, state);
 

Modified: trunk/ewl/src/lib/ewl_engines.h
===================================================================
--- trunk/ewl/src/lib/ewl_engines.h	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_engines.h	2009-07-11 14:30:47 UTC (rev 41306)
@@ -80,7 +80,10 @@
         EWL_ENGINE_THEME_ELEMENT_ADD,
         EWL_ENGINE_THEME_ELEMENT_FILE_SET,
         EWL_ENGINE_THEME_ELEMENT_LOAD_ERROR_GET,
-        EWL_ENGINE_THEME_ELEMENT_STATE_SET,
+        EWL_ENGINE_THEME_ELEMENT_STATE_ADD,
+        EWL_ENGINE_THEME_ELEMENT_STATE_REMOVE,
+        EWL_ENGINE_THEME_ELEMENT_STATES_APPLY,
+        EWL_ENGINE_THEME_ELEMENT_CUSTOM_STATE_SET,
         EWL_ENGINE_THEME_ELEMENT_TEXT_SET,
         EWL_ENGINE_THEME_ELEMENT_MINIMUM_SIZE_GET,
         EWL_ENGINE_THEME_ELEMENT_MINIMUM_SIZE_CALC,
@@ -108,10 +111,18 @@
         EWL_ENGINE_POINTER_MAX
 };
 
+enum Ewl_Engine_State_Source
+{
+        EWL_ENGINE_STATE_SOURCE_THIS,
+        EWL_ENGINE_STATE_SOURCE_PARENT,
+        EWL_ENGINE_STATE_SOURCE_BOTH
+};
+
 typedef enum Ewl_Engine_Window_Hooks Ewl_Engine_Window_Hooks;
 typedef enum Ewl_Engine_Theme_Hooks Ewl_Engine_Theme_Hooks;
 typedef enum Ewl_Engine_Canvas_Hooks Ewl_Engine_Canvas_Hooks;
 typedef enum Ewl_Engine_Pointer_Hooks Ewl_Engine_Pointer_Hooks;
+typedef enum Ewl_Engine_State_Source Ewl_Engine_State_Source;
 
 #define EWL_ENGINE(engine) ((Ewl_Engine *)engine)
 
@@ -247,8 +258,17 @@
                                                 const char *group);
 unsigned int     ewl_engine_theme_element_load_error_get(Ewl_Embed *emb,
                                                 void *obj);
-void             ewl_engine_theme_element_state_set(Ewl_Embed *emb, void *obj,
-                                                const char *state);
+void             ewl_engine_theme_element_states_apply(Ewl_Embed *emb,
+                                                void *obj, unsigned int states,
+                                                Ewl_Engine_State_Source source);
+void             ewl_engine_theme_element_state_add(Ewl_Embed *emb,
+                                                void *obj, Ewl_State state,
+                                                Ewl_Engine_State_Source source);
+void             ewl_engine_theme_element_state_remove(Ewl_Embed *emb,
+                                                void *obj, Ewl_State state,
+                                                Ewl_Engine_State_Source source);
+void             ewl_engine_theme_element_custom_state_set(Ewl_Embed *emb,
+                                                void *obj, const char *state);
 void             ewl_engine_theme_element_text_set(Ewl_Embed *emb, void *obj,
                                                 const char *part,
                                                 const char *text);
@@ -363,7 +383,16 @@
                                                 const char *path,
                                                 const char *group);
 typedef unsigned int (*Ewl_Engine_Cb_Theme_Element_Load_Error_Get)(void *obj);
-typedef void  (*Ewl_Engine_Cb_Theme_Element_State_Set)(void *obj,
+typedef void  (*Ewl_Engine_Cb_Theme_Element_State_Add)(void *obj,
+                                                Ewl_State state,
+                                                Ewl_Engine_State_Source source);
+typedef void  (*Ewl_Engine_Cb_Theme_Element_State_Remove)(void *obj,
+                                                Ewl_State state,
+                                                Ewl_Engine_State_Source source);
+typedef void  (*Ewl_Engine_Cb_Theme_Element_States_Apply)(void *obj,
+                                                unsigned int states,
+                                                Ewl_Engine_State_Source source);
+typedef void  (*Ewl_Engine_Cb_Theme_Element_Custom_State_Set)(void *obj,
                                                 const char *state);
 typedef void  (*Ewl_Engine_Cb_Theme_Element_Text_Set)(void *obj,
                                                 const char *part,

Modified: trunk/ewl/src/lib/ewl_entry.c
===================================================================
--- trunk/ewl/src/lib/ewl_entry.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_entry.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -185,22 +185,20 @@
                 ewl_callback_append(EWL_WIDGET(e), EWL_CALLBACK_KEY_DOWN,
                                                 ewl_entry_cb_key_down, NULL);
 
-                if (ewl_widget_state_has(EWL_WIDGET(e), EWL_FLAG_STATE_FOCUSED))
+                if (ewl_widget_state_has(EWL_WIDGET(e), EWL_STATE_FOCUSED))
                         ewl_widget_show(e->cursor);
 
-                ewl_widget_state_set(EWL_WIDGET(e), "enabled",
-                                        EWL_STATE_PERSISTENT);
+                ewl_widget_state_add(EWL_WIDGET(e), EWL_STATE_ON);
         }
         else
         {
                 ewl_callback_del(EWL_WIDGET(e), EWL_CALLBACK_KEY_DOWN,
                                                 ewl_entry_cb_key_down);
 
-                if (ewl_widget_state_has(EWL_WIDGET(e), EWL_FLAG_STATE_FOCUSED))
+                if (ewl_widget_state_has(EWL_WIDGET(e), EWL_STATE_FOCUSED))
                         ewl_widget_hide(e->cursor);
 
-                ewl_widget_state_set(EWL_WIDGET(e), "disabled",
-                                        EWL_STATE_PERSISTENT);
+                ewl_widget_state_remove(EWL_WIDGET(e), EWL_STATE_ON);
         }
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -381,8 +379,8 @@
         sel = EWL_TEXT_TRIGGER(EWL_TEXT(w)->selection);
 
         /* reset the cursor blink */
-        ewl_widget_state_set(EWL_WIDGET(e->cursor), "noblink",
-                                EWL_STATE_PERSISTENT);
+        ewl_widget_custom_state_set(EWL_WIDGET(e->cursor), "noblink",
+                                        EWL_TRANSIENT);
 
         if ((!event->keyname) || (!event->keyname[0]))
                 DRETURN(DLEVEL_STABLE);

Modified: trunk/ewl/src/lib/ewl_enums.h
===================================================================
--- trunk/ewl/src/lib/ewl_enums.h	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_enums.h	2009-07-11 14:30:47 UTC (rev 41306)
@@ -224,17 +224,6 @@
         EWL_FLAG_QUEUED_PROCESS_CONFIGURE   = 0x40000, /**< Configure in progress */
         EWL_FLAG_QUEUED_PROCESS_REVEAL      = 0x80000, /**< Reveal in progress */
         EWL_FLAG_QUEUED_PROCESS_DESTROY     = 0x100000,/**< Delete in progress */
-
-        /*
-         * The state enum specifies the current state of a widget, ie. has it
-         * been clicked, does it have the keyboard focus, etc.
-         */
-        EWL_FLAG_STATE_NORMAL   = 0,         /**< Widget state normal */
-        EWL_FLAG_STATE_MOUSE_IN = 0x200000,  /**< Mouse is in the widget */
-        EWL_FLAG_STATE_PRESSED  = 0x400000,  /**< Widget is pressed */
-        EWL_FLAG_STATE_FOCUSED  = 0x800000,  /**< Widget has focus */
-        EWL_FLAG_STATE_DISABLED = 0x1000000, /**< Widget is disabled */
-        EWL_FLAG_STATE_DND      = 0x2000000  /**< Widget is engaged in DND */
 };
 
 
@@ -431,19 +420,41 @@
 typedef enum Ewl_Key_Modifiers Ewl_Key_Modifiers;
 
 /**
- * @enum Ewl_State_Type
+ * @enum Ewl_Durability
+ * The durability type
+ */
+enum Ewl_Durability
+{
+        EWL_TRANSIENT,
+        EWL_PERSISTENT
+};
+
+/**
+ * The Ewl_Durability type
+ */
+typedef enum Ewl_Durability Ewl_Durability;
+
+/**
+ * @enum Ewl_State
  * The state type
  */
-enum Ewl_State_Type
+enum Ewl_State
 {
-        EWL_STATE_TRANSIENT,
-        EWL_STATE_PERSISTENT
+        EWL_STATE_MOUSE_IN = 0x1,
+        EWL_STATE_MOUSE_DOWN = 0x2,
+        EWL_STATE_FOCUSED = 0x4,
+        EWL_STATE_DISABLED = 0x8,
+        EWL_STATE_HIGHLIGHTED = 0x10,
+        EWL_STATE_SELECTED = 0x20,
+        EWL_STATE_ON = 0x40,
+        EWL_STATE_ODD = 0x80,
+        EWL_STATE_DND = 0x100
 };
 
 /**
- * The Ewl_State_Type type
+ * The Ewl_State type
  */
-typedef enum Ewl_State_Type Ewl_State_Type;
+typedef enum Ewl_State Ewl_State;
 
 /**
  * @enum Ewl_Stock_Type

Modified: trunk/ewl/src/lib/ewl_events.h
===================================================================
--- trunk/ewl/src/lib/ewl_events.h	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_events.h	2009-07-11 14:30:47 UTC (rev 41306)
@@ -369,8 +369,21 @@
  */
 struct Ewl_Event_State_Change
 {
-        const char *state;
-        Ewl_State_Type flag;
+        union
+        {
+                struct
+                {
+                        const char *state;
+                        Ewl_Durability durability;
+                } custom;
+                struct
+                {
+                        Ewl_State state_add;
+                        Ewl_State state_remove;
+                        unsigned char inherited:1;
+                } normal;
+        } /* anonymous */;
+        unsigned char custom_state:1;
 };
 
 #include <ewl_model.h>

Modified: trunk/ewl/src/lib/ewl_expansion.c
===================================================================
--- trunk/ewl/src/lib/ewl_expansion.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_expansion.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -112,13 +112,12 @@
         DENTER_FUNCTION(DLEVEL_STABLE);
         DCHECK_PARAM_PTR(ex);
         DCHECK_TYPE(ex, EWL_EXPANSION_TYPE);
-
+        
         if (ex->expandable)
-                ewl_widget_state_set(EWL_WIDGET(ex), "expandable", 
-                                                        EWL_STATE_TRANSIENT);
+                ewl_widget_appearance_set(EWL_WIDGET(ex), EWL_EXPANSION_TYPE);
         else
-                ewl_widget_state_set(EWL_WIDGET(ex), "nonexpandable", 
-                                                        EWL_STATE_TRANSIENT);
+                ewl_widget_appearance_set(EWL_WIDGET(ex), "nonexpandable/" 
+                                                        EWL_EXPANSION_TYPE);
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }

Modified: trunk/ewl/src/lib/ewl_filelist_view.c
===================================================================
--- trunk/ewl/src/lib/ewl_filelist_view.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_filelist_view.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -41,7 +41,7 @@
         }
 
         /* Watch for changes here */
-        if ((icon->theme_state) && (!strcmp(icon->theme_state, "parent,selected")))
+        if (ewl_widget_applied_state_has(icon, EWL_STATE_SELECTED))
         {
                 /* Our icon is selected, so we can just grab a list
                  * of the selected files from mvc

Modified: trunk/ewl/src/lib/ewl_freebox_mvc.c
===================================================================
--- trunk/ewl/src/lib/ewl_freebox_mvc.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_freebox_mvc.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -171,7 +171,6 @@
                 Ewl_Widget *o, *cell;
 
                 cell = ewl_cell_new();
-                ewl_cell_state_change_cb_add(EWL_CELL(cell));
                 ewl_container_child_append(EWL_CONTAINER(fb_mvc), cell);
                 ewl_callback_append(cell, EWL_CALLBACK_CLICKED, 
                                     ewl_freebox_mvc_cb_item_clicked, fb_mvc);

Modified: trunk/ewl/src/lib/ewl_list.c
===================================================================
--- trunk/ewl/src/lib/ewl_list.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_list.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -104,7 +104,6 @@
                 Ewl_Widget *o, *cell;
 
                 cell = ewl_cell_new();
-                ewl_cell_state_change_cb_add(EWL_CELL(cell));
                 ewl_container_child_append(EWL_CONTAINER(list), cell);
                 ewl_callback_append(cell, EWL_CALLBACK_CLICKED,
                                 ewl_list_cb_item_clicked, list);

Modified: trunk/ewl/src/lib/ewl_misc.c
===================================================================
--- trunk/ewl/src/lib/ewl_misc.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_misc.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -607,13 +607,13 @@
         while (i < *argc) {
                 if (!strcmp(argv[i], "--ewl-segv")) {
                         ewl_config_int_set(ewl_config, EWL_CONFIG_DEBUG_SEGV,
-                                                1, EWL_STATE_TRANSIENT);
+                                                1, EWL_TRANSIENT);
                         matched++;
                 }
                 else if (!strcmp(argv[i], "--ewl-backtrace")) {
                         ewl_config_int_set(ewl_config,
                                         EWL_CONFIG_DEBUG_BACKTRACE, 1,
-                                        EWL_STATE_TRANSIENT);
+                                        EWL_TRANSIENT);
                         matched++;
                 }
                 else if (!strcmp(argv[i], "--ewl-theme")) {
@@ -621,7 +621,7 @@
                                 ewl_config_string_set(ewl_config,
                                                         EWL_CONFIG_THEME_NAME,
                                                         argv[i + 1],
-                                                        EWL_STATE_TRANSIENT);
+                                                        EWL_TRANSIENT);
                                 matched++;
                         }
                         matched++;
@@ -629,41 +629,41 @@
                 else if (!strcmp(argv[i], "--ewl-print-theme-keys")) {
                         ewl_config_int_set(ewl_config,
                                         EWL_CONFIG_THEME_PRINT_KEYS, 1,
-                                        EWL_STATE_TRANSIENT);
+                                        EWL_TRANSIENT);
                         matched++;
                 }
                 else if (!strcmp(argv[i], "--ewl-print-theme-signals")) {
                         ewl_config_int_set(ewl_config,
                                         EWL_CONFIG_THEME_PRINT_SIGNALS, 1,
-                                        EWL_STATE_TRANSIENT);
+                                        EWL_TRANSIENT);
                         matched++;
                 }
                 else if (!strcmp(argv[i], "--ewl-print-gc-reap")) {
                         ewl_config_int_set(ewl_config,
                                         EWL_CONFIG_DEBUG_GC_REAP, 1,
-                                        EWL_STATE_TRANSIENT);
+                                        EWL_TRANSIENT);
                         matched++;
                 }
                 else if (!strcmp(argv[i], "--ewl-debug")) {
                         if ((i + 1) < *argc) {
                                 ewl_config_int_set(ewl_config,
                                         EWL_CONFIG_DEBUG_LEVEL, atoi(argv[i + 1]),
-                                        EWL_STATE_TRANSIENT);
+                                        EWL_TRANSIENT);
                                 matched++;
                         } else {
                                 ewl_config_int_set(ewl_config,
                                         EWL_CONFIG_DEBUG_LEVEL, 1,
-                                        EWL_STATE_TRANSIENT);
+                                        EWL_TRANSIENT);
                         }
                         ewl_config_int_set(ewl_config,
                                         EWL_CONFIG_DEBUG_ENABLE, 1,
-                                        EWL_STATE_TRANSIENT);
+                                        EWL_TRANSIENT);
                         matched ++;
                 }
                 else if (!strcmp(argv[i], "--ewl-debug-paint")) {
                         ewl_config_int_set(ewl_config,
                                         EWL_CONFIG_DEBUG_EVAS_RENDER, 1,
-                                        EWL_STATE_TRANSIENT);
+                                        EWL_TRANSIENT);
                         matched ++;
                 }
                 else if (!strcmp(argv[i], "--ewl-help")) {
@@ -696,7 +696,7 @@
                                         {
                                                 ewl_config_string_set(ewl_config,
                                                         EWL_CONFIG_ENGINE_NAME, name,
-                                                        EWL_STATE_TRANSIENT);
+                                                        EWL_TRANSIENT);
                                                 matched ++;
 
                                                 break;

Modified: trunk/ewl/src/lib/ewl_mvc.c
===================================================================
--- trunk/ewl/src/lib/ewl_mvc.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_mvc.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -415,8 +415,8 @@
                         {
                                 if (w != h)
                                 {
-                                        ewl_widget_state_set(w, "deselect",
-                                                        EWL_STATE_PERSISTENT);
+                                        ewl_widget_state_remove(w,
+                                                        EWL_STATE_SELECTED);
                                 }
                         }
                         ewl_mvc_selection_free(sel, FALSE);
@@ -1174,7 +1174,7 @@
                         range->start.column + 1) +
                         (column - range->start.column);
         w = ecore_list_index_goto(EWL_SELECTION(range)->highlight, idx);
-        ewl_widget_state_set(w, "deselect", EWL_STATE_PERSISTENT);
+        ewl_widget_state_add(w, EWL_STATE_SELECTED);
 
         /* we have something above, case 1 */
         if (range->start.row < row)
@@ -1295,7 +1295,7 @@
         DCHECK_TYPE(c, EWL_CONTAINER_TYPE);
         DCHECK_TYPE(w, EWL_WIDGET_TYPE);
 
-        ewl_widget_state_set(w, "selected", EWL_STATE_PERSISTENT);
+        ewl_widget_state_add(w, EWL_STATE_SELECTED);
         ewl_callback_prepend(w, EWL_CALLBACK_DESTROY,
                         ewl_mvc_cb_highlight_destroy, sel);
 
@@ -1533,8 +1533,8 @@
                                         ewl_mvc_cb_highlight_destroy);
 
                         if (set_state)
-                                ewl_widget_state_set(sel->highlight,
-                                        "deselect",EWL_STATE_PERSISTENT);
+                                ewl_widget_state_remove(sel->highlight,
+                                        EWL_STATE_SELECTED);
                 }
                 else
                 {
@@ -1546,8 +1546,8 @@
                                                 ewl_mvc_cb_highlight_destroy);
                                 
                                 if (set_state)
-                                        ewl_widget_state_set(w, "deselect",
-                                                EWL_STATE_PERSISTENT);
+                                        ewl_widget_state_remove(w, 
+                                                        EWL_STATE_SELECTED);
                         }
 
                         IF_FREE_LIST(sel->highlight);

Modified: trunk/ewl/src/lib/ewl_notebook.c
===================================================================
--- trunk/ewl/src/lib/ewl_notebook.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_notebook.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -236,14 +236,14 @@
 
         if (visible)
         {
-                ewl_widget_state_set(EWL_WIDGET(n->body.pages), "tabs",
-                                                    EWL_STATE_PERSISTENT);
+                ewl_widget_custom_state_set(EWL_WIDGET(n->body.pages), "tabs",
+                                                    EWL_PERSISTENT);
                 ewl_widget_show(n->body.tabbar);
         }
         else
         {
-                ewl_widget_state_set(EWL_WIDGET(n->body.pages), "notabs",
-                                                    EWL_STATE_PERSISTENT);
+                ewl_widget_custom_state_set(EWL_WIDGET(n->body.pages), "notabs",
+                                                    EWL_PERSISTENT);
                 ewl_widget_hide(n->body.tabbar);
         }
 
@@ -291,7 +291,8 @@
                 Ewl_Widget *w;
 
                 t = ewl_attach_widget_association_get(n->cur_page);
-                if (t) ewl_widget_state_set(t, "default", EWL_STATE_PERSISTENT);
+                if (t)
+                        ewl_widget_state_remove(t, EWL_STATE_SELECTED);
 
                 /* make sure we set n->cur_page null first or the hide
                  * callback won't let us hide */
@@ -305,7 +306,7 @@
 
         t = ewl_attach_widget_association_get(n->cur_page);
         if (t)
-                ewl_widget_state_set(t, "selected", EWL_STATE_PERSISTENT);
+                ewl_widget_state_add(t, EWL_STATE_SELECTED);
 
         ewl_callback_call(EWL_WIDGET(n), EWL_CALLBACK_VALUE_CHANGED);
 
@@ -429,7 +430,7 @@
 
         /* if this is the current page set it's tab to selected */
         if (n->cur_page == page)
-                ewl_widget_state_set(t, "selected", EWL_STATE_PERSISTENT);
+                ewl_widget_state_add(t, EWL_STATE_SELECTED);
 
         ewl_container_child_append(EWL_CONTAINER(t), tab);
 

Modified: trunk/ewl/src/lib/ewl_paned.c
===================================================================
--- trunk/ewl/src/lib/ewl_paned.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_paned.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -1197,7 +1197,7 @@
         ewl_callback_append(w, EWL_CALLBACK_MOUSE_MOVE,
                                 ewl_paned_grabber_cb_mouse_move,
                                 INT_TO_INTPTR(ds));
-        ewl_widget_state_set(w, "selected", EWL_STATE_PERSISTENT);
+        ewl_widget_state_add(w, EWL_STATE_SELECTED);
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
@@ -1212,7 +1212,7 @@
 
         ewl_callback_del(w, EWL_CALLBACK_MOUSE_MOVE,
                                 ewl_paned_grabber_cb_mouse_move);
-        ewl_widget_state_set(w, "default", EWL_STATE_PERSISTENT);
+        ewl_widget_state_remove(w, EWL_STATE_SELECTED);
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }

Modified: trunk/ewl/src/lib/ewl_progressbar.c
===================================================================
--- trunk/ewl/src/lib/ewl_progressbar.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_progressbar.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -267,8 +267,8 @@
 
         /* FIXME this is not the right place to send this event*/
         if (ewl_range_unknown_get(r))
-                ewl_widget_state_set(EWL_WIDGET(c), "range-unknown",
-                                                        EWL_STATE_PERSISTENT);
+                ewl_widget_custom_state_set(EWL_WIDGET(c), "range-unknown",
+                                                        EWL_PERSISTENT);
 
         ewl_object_preferred_inner_w_set (EWL_OBJECT(c),
                         ewl_object_preferred_w_get(

Modified: trunk/ewl/src/lib/ewl_row.c
===================================================================
--- trunk/ewl/src/lib/ewl_row.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_row.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -5,8 +5,6 @@
 #include "ewl_private.h"
 #include "ewl_debug.h"
 
-static void ewl_row_cb_state_changed(Ewl_Widget *w, void *ev, void *data);
-
 /**
  * @return Returns a newly allocated row on success, NULL on failure.
  * @brief Allocate and initialize a new row
@@ -58,8 +56,6 @@
 
         ewl_callback_append(EWL_WIDGET(row), EWL_CALLBACK_CONFIGURE,
                                 ewl_row_cb_configure, NULL);
-        ewl_callback_append(EWL_WIDGET(row), EWL_CALLBACK_STATE_CHANGED,
-                                ewl_row_cb_state_changed, NULL);
 
         ewl_widget_focusable_set(EWL_WIDGET(row), FALSE);
 
@@ -370,40 +366,3 @@
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
-/**
- * @internal
- * @param w: The widget to work with
- * @ev: The Ewl_Event_State_Change struct
- * @data: UNUSED
- * @return Returns no value
- * @brief Sends the state on to the row's children
- */
-static void
-ewl_row_cb_state_changed(Ewl_Widget *w, void *ev, void *data __UNUSED__)
-{
-        Ewl_Widget *o;
-        Ewl_Event_State_Change *e;
-        const char *send_state;
-
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(w);
-        DCHECK_PARAM_PTR(ev);
-        DCHECK_TYPE(w, EWL_ROW_TYPE);
-
-        e = EWL_EVENT_STATE_CHANGE(ev);
-
-        /* Only want this for selected signals */
-        if (!strcmp(e->state, "selected"))
-                send_state = "parent,selected";
-        else if (!strcmp(e->state, "deselect"))
-                send_state = "parent,deselect";
-        else
-                DRETURN(DLEVEL_STABLE);
-
-        ewl_container_child_iterate_begin(EWL_CONTAINER(w));
-        while ((o = ewl_container_child_next(EWL_CONTAINER(w))))
-                ewl_widget_state_set(o, send_state, e->flag);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-

Modified: trunk/ewl/src/lib/ewl_scrollpane.c
===================================================================
--- trunk/ewl/src/lib/ewl_scrollpane.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_scrollpane.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -60,12 +60,6 @@
         ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
                                         ewl_scrollpane_cb_configure, NULL);
 
-
-        /* Remove the default focus out callback and replace with our own */
-        ewl_callback_del(w, EWL_CALLBACK_FOCUS_OUT, ewl_widget_cb_focus_out);
-        ewl_callback_append(w, EWL_CALLBACK_FOCUS_OUT,
-                                ewl_container_cb_container_focus_out, NULL);
-
         /*
          * Create the container to hold the contents and it's configure
          * callback to position it's child.

Modified: trunk/ewl/src/lib/ewl_seeker.c
===================================================================
--- trunk/ewl/src/lib/ewl_seeker.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_seeker.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -133,10 +133,6 @@
                             ewl_seeker_cb_mouse_move, NULL);
         ewl_callback_append(w, EWL_CALLBACK_KEY_DOWN,
                             ewl_seeker_cb_key_down, NULL);
-        ewl_callback_append(w, EWL_CALLBACK_FOCUS_IN,
-                            ewl_container_cb_widget_focus_in, NULL);
-        ewl_callback_append(w, EWL_CALLBACK_FOCUS_OUT,
-                            ewl_container_cb_widget_focus_out, NULL);
 
         /*
          * Append a callback for catching mouse movements on the button and
@@ -423,24 +419,22 @@
         /*
          * If the button is pressed, then continue to calculate it's value.
          */
-        if (!ewl_widget_state_has(s->button, EWL_FLAG_STATE_PRESSED)) {
+        if (!ewl_widget_state_has(s->button, EWL_STATE_MOUSE_DOWN)) {
 
                 if (s->orientation == EWL_ORIENTATION_HORIZONTAL) {
-                        if (ewl_widget_state_has(s, EWL_FLAG_STATE_PRESSED))
+                        if (ewl_widget_state_has(w, EWL_STATE_MOUSE_DOWN))
                                 s->dragstart = ev->x;
                 }
                 else {
-                        if (ewl_widget_state_has(s, EWL_FLAG_STATE_PRESSED))
+                        if (ewl_widget_state_has(w, EWL_STATE_MOUSE_DOWN))
                                 s->dragstart = ev->y;
                 }
                 DRETURN(DLEVEL_STABLE);
         }
 
         scale = ewl_seeker_mouse_value_map(s, ev->x, ev->y);
-
         ewl_range_value_set(r, scale);
 
-
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
@@ -471,7 +465,7 @@
         s = EWL_SEEKER(w);
         r = EWL_RANGE(w);
 
-        if (ewl_widget_state_has(s->button, EWL_FLAG_STATE_PRESSED))
+        if (ewl_widget_state_has(s->button, EWL_STATE_MOUSE_DOWN))
                 DRETURN(DLEVEL_STABLE);
 
         ewl_object_current_geometry_get(EWL_OBJECT(s->button),

Modified: trunk/ewl/src/lib/ewl_spinner.c
===================================================================
--- trunk/ewl/src/lib/ewl_spinner.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_spinner.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -80,10 +80,6 @@
                                 ewl_spinner_cb_value_changed, NULL);
         ewl_callback_prepend(w, EWL_CALLBACK_DESTROY,
                                 ewl_spinner_cb_destroy, NULL);
-        ewl_callback_append(w, EWL_CALLBACK_FOCUS_IN,
-                                ewl_container_cb_widget_focus_in, NULL);
-        ewl_callback_append(w, EWL_CALLBACK_FOCUS_OUT,
-                                ewl_container_cb_widget_focus_out, NULL);
         ewl_container_show_notify_set(EWL_CONTAINER(w),
                                 ewl_spinner_cb_child_show);
         ewl_container_resize_notify_set(EWL_CONTAINER(w),

Modified: trunk/ewl/src/lib/ewl_togglebutton.c
===================================================================
--- trunk/ewl/src/lib/ewl_togglebutton.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_togglebutton.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -77,11 +77,9 @@
         cb->checked = !!c;
 
         if (cb->checked)
-                ewl_widget_state_set(EWL_WIDGET(cb), "checked",
-                                EWL_STATE_PERSISTENT);
+                ewl_widget_state_add(EWL_WIDGET(cb), EWL_STATE_ON);
         else
-                ewl_widget_state_set(EWL_WIDGET(cb), "default",
-                                EWL_STATE_PERSISTENT);
+                ewl_widget_state_remove(EWL_WIDGET(cb), EWL_STATE_ON);
 
         ewl_callback_call(EWL_WIDGET(cb), EWL_CALLBACK_VALUE_CHANGED);
 

Modified: trunk/ewl/src/lib/ewl_tree.c
===================================================================
--- trunk/ewl/src/lib/ewl_tree.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_tree.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -865,7 +865,7 @@
                 else
                         state_str = "default";
 
-                ewl_widget_state_set(c, state_str, EWL_STATE_PERSISTENT);
+                ewl_widget_custom_state_set(c, state_str, EWL_PERSISTENT);
                 ewl_object_fill_policy_set(EWL_OBJECT(c), EWL_FLAG_FILL_SHRINKABLE);
                 ewl_object_alignment_set(EWL_OBJECT(c), EWL_FLAG_ALIGN_RIGHT);
                 ewl_widget_show(c);
@@ -891,7 +891,6 @@
         DCHECK_TYPE(row, EWL_ROW_TYPE);
 
         cell = ewl_cell_new();
-        ewl_cell_state_change_cb_add(EWL_CELL(cell));
         ewl_object_fill_policy_set(EWL_OBJECT(cell), EWL_FLAG_FILL_ALL);
         ewl_container_child_append(EWL_CONTAINER(row), cell);
         ewl_callback_append(cell, EWL_CALLBACK_CLICKED,
@@ -1023,11 +1022,9 @@
                 if (tree->row_color_alternate)
                 {
                         if (colour)
-                                ewl_widget_state_set(row, "odd",
-                                                        EWL_STATE_PERSISTENT);
+                                ewl_widget_state_add(row, EWL_STATE_ODD);
                         else
-                                ewl_widget_state_set(row, "even",
-                                                        EWL_STATE_PERSISTENT);
+                                ewl_widget_state_remove(row, EWL_STATE_ODD);
                 }
 
                 colour = (colour + 1) % 2;
@@ -1127,7 +1124,7 @@
         DCHECK_PARAM_PTR(w);
         DCHECK_TYPE(w, EWL_ROW_TYPE);
 
-        ewl_widget_state_set(w, "highlight,on", EWL_STATE_TRANSIENT);
+        ewl_widget_state_add(w, EWL_STATE_HIGHLIGHTED);
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
@@ -1139,7 +1136,7 @@
         DCHECK_PARAM_PTR(w);
         DCHECK_TYPE(w, EWL_ROW_TYPE);
 
-        ewl_widget_state_set(w, "highlight,off", EWL_STATE_TRANSIENT);
+        ewl_widget_state_remove(w, EWL_STATE_HIGHLIGHTED);
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }

Modified: trunk/ewl/src/lib/ewl_widget.c
===================================================================
--- trunk/ewl/src/lib/ewl_widget.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_widget.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -76,8 +76,6 @@
         if (!ewl_theme_widget_init(w))
                 DRETURN_INT(FALSE, DLEVEL_STABLE);
 
-        ewl_widget_state_remove(w, EWL_FLAGS_STATE_MASK);
-
         /*
          * Add the common callbacks that all widgets must perform
          */
@@ -94,18 +92,6 @@
                                 NULL);
         ewl_callback_append(w, EWL_CALLBACK_REPARENT, ewl_widget_cb_reparent,
                                 NULL);
-        ewl_callback_append(w, EWL_CALLBACK_WIDGET_ENABLE, ewl_widget_cb_enable,
-                                NULL);
-        ewl_callback_append(w, EWL_CALLBACK_WIDGET_DISABLE,
-                                ewl_widget_cb_disable, NULL);
-        ewl_callback_append(w, EWL_CALLBACK_FOCUS_IN, ewl_widget_cb_focus_in,
-                                NULL);
-        ewl_callback_append(w, EWL_CALLBACK_FOCUS_OUT, ewl_widget_cb_focus_out,
-                                NULL);
-        ewl_callback_append(w, EWL_CALLBACK_MOUSE_IN, ewl_widget_cb_mouse_in,
-                                NULL);
-        ewl_callback_append(w, EWL_CALLBACK_MOUSE_OUT, ewl_widget_cb_mouse_out,
-                                NULL);
         ewl_callback_append(w, EWL_CALLBACK_MOUSE_DOWN,
                                 ewl_widget_cb_mouse_down, NULL);
         ewl_callback_append(w, EWL_CALLBACK_MOUSE_UP, ewl_widget_cb_mouse_up,
@@ -813,10 +799,171 @@
         DRETURN_PTR(ret, DLEVEL_STABLE);
 }
 
+void
+ewl_widget_state_add(Ewl_Widget *w, Ewl_State state)
+{
+        Ewl_Embed *emb;
+        Ewl_Event_State_Change ev;
+
+        if (w->states & state)
+                DRETURN(DLEVEL_STABLE);
+
+        w->states |= state;
+
+        emb = ewl_embed_widget_find(w);
+        if (emb && w->theme_object)
+        {
+                /* we print here only the start, the actual signal name
+                 * must be printed in the engine */
+                if (ewl_config_cache.print_signals)
+                        printf("%p (%s) add:\n", w, w->appearance);
+
+                ewl_engine_theme_element_state_add(emb, w->theme_object, state,
+                                                EWL_ENGINE_STATE_SOURCE_THIS);
+                /* if this state isn't inherited, send also both */
+                if (!(state & w->inherited_states))
+                        ewl_engine_theme_element_state_add(emb, w->theme_object,
+                                        state, EWL_ENGINE_STATE_SOURCE_BOTH);
+        }
+
+        ev.custom_state = FALSE;
+        ev.normal.state_add = state;
+        ev.normal.state_remove = 0;
+        ev.normal.inherited = FALSE;
+
+        ewl_callback_call_with_event_data(w, EWL_CALLBACK_STATE_CHANGED, &ev);
+}
+
+void
+ewl_widget_state_remove(Ewl_Widget *w, Ewl_State state)
+{
+        Ewl_Embed *emb;
+        Ewl_Event_State_Change ev;
+
+        if (!(w->states & state))
+                DRETURN(DLEVEL_STABLE);
+
+        w->states &= ~state;
+
+        emb = ewl_embed_widget_find(w);
+        if (emb && w->theme_object)
+        {
+                /* we print here only the start, the actual signal name
+                 * must be printed in the engine */
+                if (ewl_config_cache.print_signals)
+                        printf("%p (%s) remove:\n", w, w->appearance);
+
+                ewl_engine_theme_element_state_remove(emb, w->theme_object,
+                                        state, EWL_ENGINE_STATE_SOURCE_THIS);
+
+                if (!(state & w->inherited_states))
+                        ewl_engine_theme_element_state_remove(emb,
+                                        w->theme_object, state,
+                                        EWL_ENGINE_STATE_SOURCE_BOTH);
+        }
+
+        ev.custom_state = FALSE;
+        ev.normal.state_add = 0;
+        ev.normal.state_remove = state;
+        ev.normal.inherited = FALSE;
+
+        ewl_callback_call_with_event_data(w, EWL_CALLBACK_STATE_CHANGED, &ev);
+}
+
+unsigned int
+ewl_widget_state_has(Ewl_Widget *w, Ewl_State state)
+{
+        DRETURN_INT(!!(w->states & state), DLEVEL_STABLE);
+}
+
+void
+ewl_widget_inherited_state_add(Ewl_Widget *w, Ewl_State state)
+{
+        Ewl_Embed *emb;
+        Ewl_Event_State_Change ev;
+
+        if (w->inherited_states & state)
+                DRETURN(DLEVEL_STABLE);
+
+        w->inherited_states |= state;
+        emb = ewl_embed_widget_find(w);
+
+        if (emb && w->theme_object)
+        {
+                /* we print here only the start, the actual signal name
+                 * must be printed in the engine */
+                if (ewl_config_cache.print_signals)
+                        printf("%p (%s) add:\n", w, w->appearance);
+
+                ewl_engine_theme_element_state_add(emb, w->theme_object, state,
+                                                EWL_ENGINE_STATE_SOURCE_PARENT);
+                
+                if (!(state & w->states))
+                        ewl_engine_theme_element_state_add(emb, w->theme_object,
+                                        state, EWL_ENGINE_STATE_SOURCE_BOTH);
+        }
+
+        ev.custom_state = FALSE;
+        ev.normal.state_add = state;
+        ev.normal.state_remove = 0;
+        ev.normal.inherited = TRUE;
+
+        ewl_callback_call_with_event_data(w, EWL_CALLBACK_STATE_CHANGED, &ev);
+}
+
+void
+ewl_widget_inherited_state_remove(Ewl_Widget *w, Ewl_State state)
+{
+        Ewl_Embed *emb;
+        Ewl_Event_State_Change ev;
+
+        if (!(w->inherited_states & state))
+                DRETURN(DLEVEL_STABLE);
+
+        w->inherited_states &= ~state;
+
+        emb = ewl_embed_widget_find(w);
+        if (emb && w->theme_object)
+        {
+                /* we print here only the start, the actual signal name
+                 * must be printed in the engine */
+                if (ewl_config_cache.print_signals)
+                        printf("%p (%s) remove:\n", w, w->appearance);
+
+                ewl_engine_theme_element_state_remove(emb, w->theme_object,
+                                                state,
+                                                EWL_ENGINE_STATE_SOURCE_PARENT);
+                if (!(state & w->states))
+                        ewl_engine_theme_element_state_remove(emb,
+                                        w->theme_object, state,
+                                        EWL_ENGINE_STATE_SOURCE_BOTH);
+        }
+
+        ev.custom_state = FALSE;
+        ev.normal.state_add = 0;
+        ev.normal.state_remove = state;
+        ev.normal.inherited = TRUE;
+
+        ewl_callback_call_with_event_data(w, EWL_CALLBACK_STATE_CHANGED, &ev);
+}
+
+unsigned int
+ewl_widget_inherited_state_has(Ewl_Widget *w, Ewl_State state)
+{
+        DRETURN_INT(!!(w->inherited_states & state), DLEVEL_STABLE);
+}
+
+unsigned int
+ewl_widget_applied_state_has(Ewl_Widget *w, Ewl_State state)
+{
+        DRETURN_INT(!!((w->inherited_states | w->states) & state), 
+                        DLEVEL_STABLE);
+}
+
 /**
  * @param w: the widget to update the appearance
  * @param state: the new state of the widget
- * @param flag: the flag for the state e.g. EWL_STATE_TRANSIENT
+ * @param flag: the flag for the state e.g. EWL_TRANSIENT
  * @return Returns no value.
  * @brief Update the appearance of the widget to a state
  *
@@ -824,7 +971,7 @@
  * the state parameter.
  */
 void
-ewl_widget_state_set(Ewl_Widget *w, const char *state, Ewl_State_Type flag)
+ewl_widget_custom_state_set(Ewl_Widget *w, const char *state, Ewl_Durability flag)
 {
         Ewl_Event_State_Change ev;
 
@@ -837,8 +984,8 @@
          * Intentionally lose a reference to the ecore string to keep a
          * reference cached for later re-use.
          */
-        if (flag == EWL_STATE_PERSISTENT)
-                w->theme_state = ecore_string_instance((char *)state);
+        if (flag == EWL_PERSISTENT)
+                w->custom_state = ecore_string_instance(state);
 
         if (w->theme_object)
         {
@@ -846,14 +993,15 @@
 
                 emb = ewl_embed_widget_find(w);
                 if (ewl_config_cache.print_signals)
-                        printf("Emitting: %s to %p (%s)\n", state, w,
-                                                        w->appearance);
+                        printf("%p (%s) ", w, w->appearance);
 
-                ewl_engine_theme_element_state_set(emb, w->theme_object, state);
+                ewl_engine_theme_element_custom_state_set(emb, w->theme_object,
+                                                                state);
         }
 
-        ev.state = state;
-        ev.flag = flag;
+        ev.custom_state = TRUE;
+        ev.custom.state = state;
+        ev.custom.durability = flag;
 
         ewl_callback_call_with_event_data(w, EWL_CALLBACK_STATE_CHANGED, &ev);
 
@@ -1199,8 +1347,7 @@
         DCHECK_TYPE(w, EWL_WIDGET_TYPE);
 
         if (DISABLED(w)) {
-                ewl_widget_state_remove(w, EWL_FLAGS_STATE_MASK);
-                ewl_widget_state_add(w, EWL_FLAG_STATE_NORMAL);
+                ewl_widget_state_remove(w, EWL_STATE_DISABLED);
                 ewl_callback_call(w, EWL_CALLBACK_WIDGET_ENABLE);
         }
 
@@ -1231,8 +1378,10 @@
                 /* and now remove us self from the info widget list */
                 ewl_embed_info_widgets_cleanup(emb, w);
                 /* finally remove the state flags and set us to disabled*/
-                ewl_widget_state_remove(w, EWL_FLAGS_STATE_MASK);
-                ewl_widget_state_add(w, EWL_FLAG_STATE_DISABLED);
+                ewl_widget_state_remove(w, EWL_STATE_MOUSE_IN);
+                ewl_widget_state_remove(w, EWL_STATE_MOUSE_DOWN);
+                ewl_widget_state_remove(w, EWL_STATE_FOCUSED);
+                ewl_widget_state_add(w, EWL_STATE_DISABLED);
         }
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -1712,6 +1861,13 @@
         DCHECK_PARAM_PTR(w);
         DCHECK_TYPE(w, EWL_WIDGET_TYPE);
 
+        if (REALIZED(w))
+        {
+                DWARNING("It is not possible to set a widget internal"
+                                " if it is already realized");
+                DRETURN(DLEVEL_STABLE);
+        }
+
         if (val)
                 ewl_widget_flags_add(w, EWL_FLAG_PROPERTY_INTERNAL,
                                 EWL_FLAGS_PROPERTY_MASK);
@@ -2230,7 +2386,7 @@
 
         IF_RELEASE(w->appearance);
         IF_RELEASE(w->inheritance);
-        IF_RELEASE(w->theme_state);
+        IF_RELEASE(w->custom_state);
 
         if (w->theme_text.list) {
                 if (w->theme_text.direct) {
@@ -2354,6 +2510,17 @@
                 DRETURN(DLEVEL_STABLE);
 
         /*
+         * get the inherited states
+         */
+        if (w->parent && ewl_widget_internal_is(w))
+                w->inherited_states = w->parent->states |
+                        w->parent->inherited_states;
+        else if (w->parent)
+                /* the disable state is always inherit */
+                w->inherited_states = (w->parent->states |
+                        w->parent->inherited_states) & EWL_STATE_DISABLED;
+
+        /*
          * Increment the dnd awareness counter on the embed.
          */
         if (ewl_widget_flags_has(w, EWL_FLAG_PROPERTY_DND_TARGET,
@@ -2407,14 +2574,10 @@
                 /*
                  * Set the state of the theme object
                  */
-                if (w->theme_state)
-                        ewl_widget_state_set(w, (char *)w->theme_state,
-                                                EWL_STATE_TRANSIENT);
+                if (w->custom_state)
+                        ewl_widget_custom_state_set(w, w->custom_state,
+                                                EWL_TRANSIENT);
 
-                if (DISABLED(w))
-                        ewl_widget_state_set(w, "disabled",
-                                                EWL_STATE_TRANSIENT);
-
                 /*
                  * Apply any text overrides
                  */
@@ -2469,6 +2632,25 @@
                         ewl_engine_theme_object_show(emb, w->smart_object);
         }
 
+        /*
+         * Apply the inherited and the direct theme states
+         */
+        if (w->theme_object)
+        {
+                if (ewl_config_cache.print_signals && 
+                                (w->states | w->inherited_states))
+                        printf("%p (%s) apply:\n", w, w->appearance);
+
+                ewl_engine_theme_element_states_apply(emb, w->theme_object,
+                                w->states, EWL_ENGINE_STATE_SOURCE_THIS);
+                ewl_engine_theme_element_states_apply(emb, w->theme_object,
+                                w->inherited_states,
+                                EWL_ENGINE_STATE_SOURCE_PARENT);
+                ewl_engine_theme_element_states_apply(emb, w->theme_object,
+                                w->states | w->inherited_states,
+                                EWL_ENGINE_STATE_SOURCE_BOTH);
+        }
+
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
@@ -2742,148 +2924,9 @@
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
-
 /**
  * @internal
  * @param w: The widget to work with
- * @param ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief The enable callback
- */
-void
-ewl_widget_cb_enable(Ewl_Widget *w, void *ev_data __UNUSED__,
-                                        void *user_data __UNUSED__)
-{
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(w);
-        DCHECK_TYPE(w, EWL_WIDGET_TYPE);
-
-        ewl_widget_state_set(w, "enabled", EWL_STATE_PERSISTENT);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: The widget to work with
- * @param ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief The disable callback
- */
-void
-ewl_widget_cb_disable(Ewl_Widget *w, void *ev_data __UNUSED__,
-                                        void *user_data __UNUSED__)
-{
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(w);
-        DCHECK_TYPE(w, EWL_WIDGET_TYPE);
-
-        ewl_widget_state_set(w, "disabled", EWL_STATE_PERSISTENT);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: The widget to work with
- * @param ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief The focus in callback
- */
-void
-ewl_widget_cb_focus_in(Ewl_Widget *w, void *ev_data __UNUSED__,
-                                void *user_data __UNUSED__)
-{
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(w);
-        DCHECK_TYPE(w, EWL_WIDGET_TYPE);
-
-        if (DISABLED(w))
-                DRETURN(DLEVEL_STABLE);
-
-        ewl_widget_state_set(w, "focus,in", EWL_STATE_TRANSIENT);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: The widget to work with
- * @param ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief The focus out callback
- */
-void
-ewl_widget_cb_focus_out(Ewl_Widget *w, void *ev_data __UNUSED__,
-                                void *user_data __UNUSED__)
-{
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(w);
-        DCHECK_TYPE(w, EWL_WIDGET_TYPE);
-
-        if (DISABLED(w))
-                DRETURN(DLEVEL_STABLE);
-
-        ewl_widget_state_set(w, "focus,out", EWL_STATE_TRANSIENT);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: The widget to work with
- * @param ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief The mouse in callback
- */
-void
-ewl_widget_cb_mouse_in(Ewl_Widget *w, void *ev_data __UNUSED__,
-                                void *user_data __UNUSED__)
-{
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(w);
-        DCHECK_TYPE(w, EWL_WIDGET_TYPE);
-
-        if (DISABLED(w))
-                DRETURN(DLEVEL_STABLE);
-
-        ewl_widget_state_set(w, "mouse,in", EWL_STATE_TRANSIENT);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: The widget to work with
- * @param ev_data: UNUSED
- * @param user_data: UNUSED
- * @return Returns no value
- * @brief The mouse out callback
- */
-void
-ewl_widget_cb_mouse_out(Ewl_Widget *w, void *ev_data __UNUSED__,
-                                void *user_data __UNUSED__)
-{
-        DENTER_FUNCTION(DLEVEL_STABLE);
-        DCHECK_PARAM_PTR(w);
-        DCHECK_TYPE(w, EWL_WIDGET_TYPE);
-
-        if (DISABLED(w))
-                DRETURN(DLEVEL_STABLE);
-
-        ewl_widget_state_set(w, "mouse,out", EWL_STATE_TRANSIENT);
-
-        DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @internal
- * @param w: The widget to work with
  * @param ev_data: The Ewl_Event_Mouse_Down data
  * @param user_data: UNUSED
  * @return Returns no value
@@ -2904,7 +2947,7 @@
                 DRETURN(DLEVEL_STABLE);
 
         snprintf(state, sizeof(state), "mouse,down,%i", e->button);
-        ewl_widget_state_set(w, state, EWL_STATE_TRANSIENT);
+        ewl_widget_custom_state_set(w, state, EWL_TRANSIENT);
 
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
@@ -2931,18 +2974,17 @@
         if (DISABLED(w))
                 DRETURN(DLEVEL_STABLE);
 
-        if (ewl_widget_state_has(w, EWL_FLAG_STATE_DND)) {
-                ewl_widget_state_remove(w, EWL_FLAG_STATE_DND);
+        if (ewl_widget_state_has(w, EWL_STATE_DND)) {
+                ewl_widget_state_remove(w, EWL_STATE_DND);
                 ewl_dnd_drag_drop(w);
         }
 
         snprintf(state, sizeof(state), "mouse,up,%i", e->button);
-        ewl_widget_state_set(w, state, EWL_STATE_TRANSIENT);
+        ewl_widget_custom_state_set(w, state, EWL_TRANSIENT);
 
-        if (ewl_widget_state_has(w, EWL_FLAG_STATE_MOUSE_IN)) {
+        if (ewl_widget_state_has(w, EWL_STATE_MOUSE_IN)) {
                 int x, y;
 
-                ewl_widget_state_set(w, "mouse,in", EWL_STATE_TRANSIENT);
                 x = e->base.x - (CURRENT_X(w) - INSET_LEFT(w));
                 y = e->base.y - (CURRENT_Y(w) - INSET_TOP(w));
                 if ((x > 0) && (x < CURRENT_W(w) + INSET_HORIZONTAL(w)) &&
@@ -2960,9 +3002,7 @@
                 else
                         ewl_embed_mouse_move_feed(ewl_embed_widget_find(w),
                                         e->base.x, e->base.y, e->base.modifiers);
-        } else
-                ewl_widget_state_set(w, "mouse,out", EWL_STATE_TRANSIENT);
-
+        }
         DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
@@ -2985,14 +3025,14 @@
         DCHECK_PARAM_PTR(w);
         DCHECK_TYPE(w, EWL_WIDGET_TYPE);
 
-        ewl_widget_state_set(w, "mouse,move", EWL_STATE_TRANSIENT);
-        if (ewl_widget_state_has(w, EWL_FLAG_STATE_PRESSED) &&
+        /* FIXME this should go into the embed code */
+        if (ewl_widget_state_has(w, EWL_STATE_MOUSE_DOWN) &&
                         ewl_widget_flags_has(w, EWL_FLAG_PROPERTY_DND_SOURCE,
                                 EWL_FLAGS_PROPERTY_MASK)) {
 
                 embed = ewl_embed_widget_find(w);
-                if (!ewl_widget_state_has(w, EWL_FLAG_STATE_DND)) {
-                        ewl_widget_state_add(w, EWL_FLAG_STATE_DND);
+                if (!ewl_widget_state_has(w, EWL_STATE_DND)) {
+                        ewl_widget_state_add(w, EWL_STATE_DND);
                         embed->last.drag_widget = w;
                         ewl_dnd_internal_drag_start(w);
                 }

Modified: trunk/ewl/src/lib/ewl_widget.h
===================================================================
--- trunk/ewl/src/lib/ewl_widget.h	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/src/lib/ewl_widget.h	2009-07-11 14:30:47 UTC (rev 41306)
@@ -148,14 +148,17 @@
 
         const char *theme_path;     /**< Path to the file for loading */
         const char *theme_group;    /**< Group in theme to use */
-        const char *theme_state;    /**< State of the appearance */
-        const char *appearance;   /**< Key to lookup appearance in theme */
+        const char *appearance;     /**< Key to lookup appearance in theme */
         const char *inheritance;  /**< Inheritance of path widget */
+        const char *custom_state; /**< custom state */
         int layer;                /**< the layer relative to the parent */
 
         Ecore_Hash *theme;          /**< Overriding theme settings */
         Ewl_Pair_List theme_text;   /**< Overriding text in theme */
         unsigned int flags;         /**< the widget flags */
+        unsigned short states;        /**< Direct widget states */
+        unsigned short inherited_states;  /**< States that are applied to 
+                                                the theme */
         unsigned char swallowed:1;
 };
 
@@ -182,8 +185,15 @@
 void            *ewl_widget_data_del(Ewl_Widget *w, void *k);
 void            *ewl_widget_data_get(Ewl_Widget *w, void *k);
 
-void             ewl_widget_state_set(Ewl_Widget *w, const char *state,
-                                                Ewl_State_Type flag);
+void             ewl_widget_state_add(Ewl_Widget *w, Ewl_State state);
+void             ewl_widget_state_remove(Ewl_Widget *w, Ewl_State state);
+unsigned int     ewl_widget_state_has(Ewl_Widget *w, Ewl_State state);
+void             ewl_widget_inherited_state_add(Ewl_Widget *w, Ewl_State state);
+void             ewl_widget_inherited_state_remove(Ewl_Widget *w, Ewl_State state);
+unsigned int     ewl_widget_inherited_state_has(Ewl_Widget *w, Ewl_State state);
+unsigned int     ewl_widget_applied_state_has(Ewl_Widget *w, Ewl_State state);
+void             ewl_widget_custom_state_set(Ewl_Widget *w, const char *cst,
+                                                Ewl_Durability dur);
 
 void             ewl_widget_theme_path_set(Ewl_Widget *w, const char *path);
 void             ewl_widget_appearance_set(Ewl_Widget *w, const char *appearance);
@@ -328,42 +338,6 @@
         (ewl_widget_flags_get(o, EWL_FLAG_PROPERTY_TOPLEVEL))
 
 /**
- * @def ewl_widget_state_add(o, state)
- * @param o: The widget to work with
- * @param state: The state to set into the widget
- * Adds the given state @a state to the widget @a o
- */
-#define ewl_widget_state_add(o, state) \
-        ewl_widget_flags_add(o, state, EWL_FLAGS_STATE_MASK)
-
-/**
- * @def ewl_widget_state_remove(o, state)
- * @param o: The widget to work with
- * @param state: The state to remove
- * Removes the given state from the given @a o widget
- */
-#define ewl_widget_state_remove(o, state) \
-        ewl_widget_flags_remove(o, state, EWL_FLAGS_STATE_MASK)
-
-/**
- * @def ewl_widget_state_has(o, state)
- * @param o: The widget to check
- * @param state: The state to check
- * Checks if the given state @a state is set on the given widget @a o
- */
-#define ewl_widget_state_has(o, state) \
-        ewl_widget_flags_has(o, state, EWL_FLAGS_STATE_MASK)
-
-/**
- * @def ewl_widget_state_get(o, state)
- * @param o: The widget to work with
- * @param state: The state to get
- * Retrives the given state @a state from the widget @a o
- */
-#define ewl_widget_state_get(o, state) \
-        ewl_widget_flags_get(o, state, EWL_FLAGS_STATE_MASK)
-
-/**
  * @def ewl_widget_queued_add(o, queued)
  * @param o: The widget to work with
  * @param queued: Add the given queue flag to the widget
@@ -473,7 +447,7 @@
  * @def DISABLED(o)
  * Used to determine if a widget is disabled
  */
-#define DISABLED(o) (ewl_widget_state_has(EWL_WIDGET(o), EWL_FLAG_STATE_DISABLED))
+#define DISABLED(o) (ewl_widget_applied_state_has(EWL_WIDGET(o), EWL_STATE_DISABLED))
 
 /**
  * @def ewl_widget_in_tab_list_get(o)
@@ -513,12 +487,6 @@
 void ewl_widget_cb_unrealize(Ewl_Widget *w, void *ev_data, void *user_data);
 void ewl_widget_cb_configure(Ewl_Widget *w, void *ev_data, void *user_data);
 void ewl_widget_cb_reparent(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_widget_cb_enable(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_widget_cb_disable(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_widget_cb_focus_in(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_widget_cb_focus_out(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_widget_cb_mouse_in(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_widget_cb_mouse_out(Ewl_Widget *w, void *ev_data, void *user_data);
 void ewl_widget_cb_mouse_down(Ewl_Widget *w, void *ev_data, void *user_data);
 void ewl_widget_cb_mouse_up(Ewl_Widget *w, void *ev_data, void *user_data);
 void ewl_widget_cb_mouse_move(Ewl_Widget *w, void *ev_data, void *user_data);

Modified: trunk/ewl/tools/ewl_config/ewl_config.c
===================================================================
--- trunk/ewl/tools/ewl_config/ewl_config.c	2009-07-11 14:26:53 UTC (rev 41305)
+++ trunk/ewl/tools/ewl_config/ewl_config.c	2009-07-11 14:30:47 UTC (rev 41306)
@@ -84,7 +84,7 @@
                                 val++;
 
                                 ewl_config_string_set(ewl_config, key, val,
-                                                        EWL_STATE_PERSISTENT);
+                                                        EWL_PERSISTENT);
                                 free(t);
 
                                 did_something = 1;
@@ -716,7 +716,7 @@
                                 ewl_config_int_get(ewl_config, checks[i].key))
                         ewl_config_int_set(ewl_config, checks[i].key,
                                         ewl_togglebutton_checked_get(EWL_TOGGLEBUTTON(o)),
-                                        EWL_STATE_PERSISTENT);
+                                        EWL_PERSISTENT);
         }
 
         for (i = 0; strings[i].name != NULL; i++)
@@ -730,7 +730,7 @@
                 {
                         ewl_config_string_set(ewl_config,
                                         strings[i].key, new,
-                                        EWL_STATE_PERSISTENT);
+                                        EWL_PERSISTENT);
                 }
         }
 
@@ -740,7 +740,7 @@
         {
                 ewl_config_int_set(ewl_config, EWL_CONFIG_DEBUG_LEVEL,
                                         ewl_range_value_get(EWL_RANGE(o)),
-                                        EWL_STATE_PERSISTENT);
+                                        EWL_PERSISTENT);
         }
 
         o = ewl_widget_name_find(EC_ICON_SIZE);
@@ -749,7 +749,7 @@
         {
                 ewl_config_int_set(ewl_config,
                                 EWL_CONFIG_THEME_ICON_SIZE, val,
-                                EWL_STATE_PERSISTENT);
+                                EWL_PERSISTENT);
         }
 
         o = ewl_widget_name_find(EC_EWL_THEME);
@@ -765,7 +765,7 @@
                 {
                         ewl_config_string_set(ewl_config,
                                         EWL_CONFIG_THEME_NAME, v,
-                                        EWL_STATE_PERSISTENT);
+                                        EWL_PERSISTENT);
                 }
         }

Log:
  Efreet_Mime: fix subrules with non-zero depth.
  
  Hello,
  
  I've fixed a bug in parsing magic file in Efreet_Mime: if some magic
  rule has a subrule with non-zero depth, then the 0 depth is used instead
  for subrule. This led to nonsense like all .xml documents matched as
  application/docbook+xml.
  
  By: Mikhail Gusarov
  
Author:       barbieri
Date:         2009-07-11 07:23:36 -0700 (Sat, 11 Jul 2009)
New Revision: 41304

Modified:
  trunk/efreet/src/lib/efreet_mime.c 

Modified: trunk/efreet/src/lib/efreet_mime.c
===================================================================
--- trunk/efreet/src/lib/efreet_mime.c	2009-07-11 13:25:34 UTC (rev 41303)
+++ trunk/efreet/src/lib/efreet_mime.c	2009-07-11 14:23:36 UTC (rev 41304)
@@ -1049,6 +1049,7 @@
             ptr = ++val;
 
             while (*ptr != '\n') ptr++;
+            ptr++;
         }
         else
         {
@@ -1070,7 +1071,6 @@
                 entry->range_len = 1;
                 entry->mask = NULL;
                 entry->value = NULL;
-                ptr++;
 
                 mime->entries = eina_list_append(mime->entries, entry);
            }

Log:
  - rename "moused" to "hovered"
  - output improvements of --ewl-print-theme-signals
  - send plain "mouse,down" and "mouse,up"
  
Author:       pfritz
Date:         2009-07-11 06:25:34 -0700 (Sat, 11 Jul 2009)
New Revision: 41303

Modified:
  branches/ewl/new_state_system/src/engines/evas/ewl_engine_evas.c branches/ewl/new_state_system/src/lib/ewl_widget.c 

Modified: branches/ewl/new_state_system/src/engines/evas/ewl_engine_evas.c
===================================================================
--- branches/ewl/new_state_system/src/engines/evas/ewl_engine_evas.c	2009-07-11 09:09:10 UTC (rev 41302)
+++ branches/ewl/new_state_system/src/engines/evas/ewl_engine_evas.c	2009-07-11 13:25:34 UTC (rev 41303)
@@ -67,8 +67,8 @@
                  *  the theme object correctly after it was obscured, in some
                  *  cases. If these problems are solved, please activate them
                  *  again. For more information see bug #3, #116 and #456*/
-                NULL, //edje_freeze,
-                NULL, //edje_thaw,
+                edje_freeze,
+                edje_thaw,
                 ee_theme_layer_stack_add,
                 ee_theme_layer_stack_del,
                 ee_theme_layer_update,
@@ -313,6 +313,9 @@
                 case EWL_STATE_MOUSE_IN:
                         signal = "mouse,in";
                         break;
+                case EWL_STATE_MOUSE_DOWN:
+                        signal = "mouse,down";
+                        break;
                 case EWL_STATE_FOCUSED:
                         signal = "focus,in";
                         break;
@@ -334,15 +337,13 @@
                 case EWL_STATE_DND:
                         signal = "dnd,in";
                         break;
-
-                case EWL_STATE_MOUSE_DOWN:
                 default:
                         DRETURN(DLEVEL_STABLE);
                         break;
         }
 
         if (ewl_config_cache.print_signals)
-                printf("signal: %s source: %s\n", signal, source[so]);
+                printf("\tsignal: %s source: %s\n", signal, source[so]);
 
         edje_object_signal_emit(obj, signal, source[so]);
 
@@ -363,6 +364,9 @@
                 case EWL_STATE_MOUSE_IN:
                         signal = "mouse,out";
                         break;
+                case EWL_STATE_MOUSE_DOWN:
+                        signal = "mouse,up";
+                        break;
                 case EWL_STATE_FOCUSED:
                         signal = "focus,out";
                         break;
@@ -384,15 +388,13 @@
                 case EWL_STATE_DND:
                         signal = "dnd,out";
                         break;
-
-                case EWL_STATE_MOUSE_DOWN:
                 default:
                         DRETURN(DLEVEL_STABLE);
                         break;
         }
 
         if (ewl_config_cache.print_signals)
-                printf("signal: %s source: %s\n", signal, source[so]);
+                printf("\tsignal: %s source: %s\n", signal, source[so]);
 
         edje_object_signal_emit(obj, signal, source[so]);
 
@@ -404,7 +406,7 @@
                 Ewl_Engine_State_Source so)
 {
         const char *source[] = { "ewl/this", "ewl/parent", "ewl/both" };
-        const char *signal[] = { "moused", "pressed", "focused", "disabled",
+        const char *signal[] = { "hovered", "pressed", "focused", "disabled",
                 "highlighted", "selected", "on", "odd", "dnd" };
         unsigned int i;
 

Modified: branches/ewl/new_state_system/src/lib/ewl_widget.c
===================================================================
--- branches/ewl/new_state_system/src/lib/ewl_widget.c	2009-07-11 09:09:10 UTC (rev 41302)
+++ branches/ewl/new_state_system/src/lib/ewl_widget.c	2009-07-11 13:25:34 UTC (rev 41303)
@@ -893,7 +893,7 @@
                 /* we print here only the start, the actual signal name
                  * must be printed in the engine */
                 if (ewl_config_cache.print_signals)
-                        printf("%p (%s) add:", w, w->appearance);
+                        printf("%p (%s) add:\n", w, w->appearance);
 
                 ewl_engine_theme_element_state_add(emb, w->theme_object, state,
                                                 EWL_ENGINE_STATE_SOURCE_PARENT);

Log:
  Add accidentally removed macros to configure.ac in empower again
Author:       quaker
Date:         2009-07-11 02:09:10 -0700 (Sat, 11 Jul 2009)
New Revision: 41302

Modified:
  trunk/empower/configure.ac 

Modified: trunk/empower/configure.ac
===================================================================
--- trunk/empower/configure.ac	2009-07-11 09:01:57 UTC (rev 41301)
+++ trunk/empower/configure.ac	2009-07-11 09:09:10 UTC (rev 41302)
@@ -20,6 +20,8 @@
 AM_ENABLE_SHARED
 AM_PROG_LIBTOOL
 
+AM_WITH_DMALLOC
+AC_PROG_LN_S
 define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
 define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])
 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])

Log:
  Empower: Add gettext support.
Author:       quaker
Date:         2009-07-11 02:01:57 -0700 (Sat, 11 Jul 2009)
New Revision: 41301

Added:
  trunk/empower/po/ trunk/empower/po/LINGUAS trunk/empower/po/Makefile.in.in trunk/empower/po/Makevars trunk/empower/po/POTFILES.in trunk/empower/po/cs.po trunk/empower/po/empower.pot 
Modified:
  trunk/empower/Makefile.am trunk/empower/autogen.sh trunk/empower/configure.ac 

Modified: trunk/empower/Makefile.am
===================================================================
--- trunk/empower/Makefile.am	2009-07-11 09:01:25 UTC (rev 41300)
+++ trunk/empower/Makefile.am	2009-07-11 09:01:57 UTC (rev 41301)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src data
+SUBDIRS = src data po
 
 EXTRA_DIST = README AUTHORS COPYING empower.spec
 																	       

Modified: trunk/empower/autogen.sh
===================================================================
--- trunk/empower/autogen.sh	2009-07-11 09:01:25 UTC (rev 41300)
+++ trunk/empower/autogen.sh	2009-07-11 09:01:57 UTC (rev 41301)
@@ -4,10 +4,12 @@
 rm -f aclocal.m4 ltmain.sh
 
 touch README
+touch ABOUT-NLS
 
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
+echo "Running autopoint..." ; autopoint -f || :
+echo "Running aclocal..." ; aclocal -I m4 $ACLOCAL_FLAGS || exit 1
+echo "Running autoconf..." ; autoconf || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
-echo "Running autoconf..." ; autoconf || exit 1
 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
 echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
 

Modified: trunk/empower/configure.ac
===================================================================
--- trunk/empower/configure.ac	2009-07-11 09:01:25 UTC (rev 41300)
+++ trunk/empower/configure.ac	2009-07-11 09:01:57 UTC (rev 41301)
@@ -3,31 +3,33 @@
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT(configure.ac)
-AM_INIT_AUTOMAKE(empower, 2.0.0)
-AM_CONFIG_HEADER(src/bin/config.h)
-
+AC_INIT([empower], [2.0.0], [mekius@...])
+AC_PREREQ([2.52])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_MACRO_DIR([m4])
 AC_ISC_POSIX
+
+AM_INIT_AUTOMAKE(1.6 dist-bzip2)
+AM_CONFIG_HEADER(config.h)
+
 AC_PROG_CC
 AM_PROG_CC_STDC
+AM_PROG_CC_C_O
 AC_HEADER_STDC
 AC_C_CONST
 AM_ENABLE_SHARED
 AM_PROG_LIBTOOL
 
-AM_WITH_DMALLOC
-AC_PROG_LN_S
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
+define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
+AC_PROG_LIBTOOL
 
-AM_PROG_CC_C_O
-
-dnl Add the languages which your application supports here.
-ALL_LINGUAS=""
-
 dnl Set PACKAGE_LOCALE_DIR in config.h.
 if test "x${prefix}" = "xNONE"; then
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Locale-specific data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/share/locale", [Locale-specific data directory])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale", [Locale-specific data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/share/locale", [Locale-specific data directory])
 fi
 
 dnl Set PACKAGE_DATA_DIR in config.h.
@@ -48,21 +50,13 @@
   AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation directory for user executables])
 fi
 
-dnl Set PACKAGE_LIB_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/lib'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [Installation directory for libraries])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation directory for libraries])
-  fi
-else
-  AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation directory for libraries])
-fi
-
 dnl Set PACKAGE_SOURCE_DIR in config.h.
 packagesrcdir=`cd $srcdir && pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
 
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.12.1])
+
 PKG_CHECK_MODULES([EVAS], evas,
    [],
    [
@@ -135,6 +129,7 @@
 src/bin/ewl/Makefile
 src/bin/elm/Makefile
 data/Makefile
+po/Makefile.in
 ])
 
 echo

Added: trunk/empower/po/LINGUAS

Added: trunk/empower/po/Makefile.in.in

Added: trunk/empower/po/Makevars

Added: trunk/empower/po/POTFILES.in

Added: trunk/empower/po/cs.po

Added: trunk/empower/po/empower.pot

Log:
  Empower: Add gettext support.
Author:       quaker
Date:         2009-07-11 02:01:25 -0700 (Sat, 11 Jul 2009)
New Revision: 41300

Modified:
  trunk/empower/src/bin/elm/Empower.h trunk/empower/src/bin/elm/empower.c trunk/empower/src/bin/elm/empower_cb_elm.c trunk/empower/src/bin/elm/empower_gui_elm.c trunk/empower/src/bin/ewl/Empower.h trunk/empower/src/bin/ewl/empower.c trunk/empower/src/bin/ewl/empower_gui_ewl.c 

Modified: trunk/empower/src/bin/elm/Empower.h
===================================================================
--- trunk/empower/src/bin/elm/Empower.h	2009-07-11 06:07:11 UTC (rev 41299)
+++ trunk/empower/src/bin/elm/Empower.h	2009-07-11 09:01:25 UTC (rev 41300)
@@ -11,6 +11,9 @@
 #include <pwd.h>
 #include "Ecore_X.h"
 #include "Elementary.h"
+#include "locale.h"
+#include "../../../config.h"
+#define _(x) gettext(x)
 
 #define WIDTH 0
 #define HEIGHT 85

Modified: trunk/empower/src/bin/elm/empower.c
===================================================================
--- trunk/empower/src/bin/elm/empower.c	2009-07-11 06:07:11 UTC (rev 41299)
+++ trunk/empower/src/bin/elm/empower.c	2009-07-11 09:01:25 UTC (rev 41300)
@@ -6,7 +6,7 @@
   
   if(regcomp(&regexp, "empower-askpass", 0))
   {
-    printf("Failed to create regular expression\n");
+    printf(_("Failed to create regular expression\n"));
     return;
   }
 
@@ -53,10 +53,15 @@
 {
   int i;
   sudo = NULL;
+
+  // initialize gettext
+  setlocale(LC_ALL, "");
+  bindtextdomain(PACKAGE, PACKAGE_LOCALE_DIR);
+  textdomain(PACKAGE);
   
   if(!ecore_init())
   {
-    printf("Unable to init ecore\n");
+    printf(_("Unable to init ecore\n"));
     return 1;
   }
 
@@ -64,9 +69,9 @@
   
   if(mode == HELP)
   {
-    printf("-=Usage=-\n");
-    printf("    Sudo:  empower [SUDO OPTIONS] [PROGRAM] [PROGRAM OPTIONS] [ELEMENTARY OPTIONS]\n");
-    printf("    AskPass:  empower-askpass [ELEMENTARY OPTIONS] or empower -p [ELEMENTARY OPTIONS]\n");
+    printf(_("-=Usage=-\n"));
+    printf(_("    Sudo:  empower [SUDO OPTIONS] [PROGRAM] [PROGRAM OPTIONS] [ELEMENTARY OPTIONS]\n"));
+    printf(_("    AskPass:  empower-askpass [ELEMENTARY OPTIONS] or empower -p [ELEMENTARY OPTIONS]\n"));
     return 0;	
   }
 

Modified: trunk/empower/src/bin/elm/empower_cb_elm.c
===================================================================
--- trunk/empower/src/bin/elm/empower_cb_elm.c	2009-07-11 06:07:11 UTC (rev 41299)
+++ trunk/empower/src/bin/elm/empower_cb_elm.c	2009-07-11 09:01:25 UTC (rev 41300)
@@ -16,7 +16,7 @@
   // the program since we can't grab the keyboard
   if(failures++ > 20)
   {
-    printf("Unable to grab keyboard, exiting...\n");
+    printf(_("Unable to grab keyboard, exiting...\n"));
     elm_exit();
     elm_shutdown();
     exit(1);

Modified: trunk/empower/src/bin/elm/empower_gui_elm.c
===================================================================
--- trunk/empower/src/bin/elm/empower_gui_elm.c	2009-07-11 06:07:11 UTC (rev 41299)
+++ trunk/empower/src/bin/elm/empower_gui_elm.c	2009-07-11 09:01:25 UTC (rev 41300)
@@ -91,7 +91,7 @@
     evas_object_size_hint_weight_set(exec_frame2, 1.0, 0.0);
     evas_object_size_hint_align_set(exec_frame2, -1.0, 0.0);
     elm_frame_content_set(exec_frame2, scrollerframe);
-    elm_frame_label_set(exec_frame2, "Execute");
+    elm_frame_label_set(exec_frame2, _("Execute"));
 
     exec_frame = elm_frame_add(win);
     evas_object_size_hint_weight_set(exec_frame, 1.0, 0.0);
@@ -141,7 +141,7 @@
     evas_object_size_hint_weight_set(pass_frame2, 1.0, 0.0);
     evas_object_size_hint_align_set(pass_frame2, -1.0, 0.0);
     elm_frame_content_set(pass_frame2, scrollerframe);
-    elm_frame_label_set(pass_frame2, "Password");
+    elm_frame_label_set(pass_frame2, _("Password"));
 
     pass_frame = elm_frame_add(win);
     evas_object_size_hint_weight_set(pass_frame, 1.0, 0.0);

Modified: trunk/empower/src/bin/ewl/Empower.h
===================================================================
--- trunk/empower/src/bin/ewl/Empower.h	2009-07-11 06:07:11 UTC (rev 41299)
+++ trunk/empower/src/bin/ewl/Empower.h	2009-07-11 09:01:25 UTC (rev 41300)
@@ -11,6 +11,9 @@
 #include <pwd.h>
 #include "Ecore_X.h"
 #include "Ewl.h"
+#include "locale.h"
+#include "../../../config.h"
+#define _(x) gettext(x)
 
 #define WIDTH 0
 #define HEIGHT 85

Modified: trunk/empower/src/bin/ewl/empower.c
===================================================================
--- trunk/empower/src/bin/ewl/empower.c	2009-07-11 06:07:11 UTC (rev 41299)
+++ trunk/empower/src/bin/ewl/empower.c	2009-07-11 09:01:25 UTC (rev 41300)
@@ -6,7 +6,7 @@
   
   if(regcomp(&regexp, "empower-askpass", 0))
   {
-    printf("Failed to create regular expression\n");
+    printf(_("Failed to create regular expression\n"));
     return;
   }
   
@@ -52,16 +52,21 @@
 {
   int i;
   sudo = NULL;
+
+  // initialize gettext
+  setlocale(LC_ALL, "");
+  bindtextdomain(PACKAGE, PACKAGE_LOCALE_DIR);
+  textdomain(PACKAGE);
   
   if(!ecore_init())
   {
-    printf("Unable to init ecore\n");
+    printf(_("Unable to init ecore\n"));
     return 1;
   }
   
   if(!ewl_init(&argc, argv))
   {
-    printf("Unable to init ewl\n");
+    printf(_("Unable to init ewl\n"));
     return;
   }
   
@@ -69,9 +74,9 @@
   
   if(mode == HELP)
   {
-    printf("-=Usage=-\n");
-    printf("    Sudo:  empower [SUDO OPTIONS] [PROGRAM] [PROGRAM OPTIONS] [EWL OPTIONS]\n");
-    printf("    AskPass:  empower-askpass [EWL OPTIONS] or empower -p [EWL OPTIONS]\n");
+    printf(_("-=Usage=-\n"));
+    printf(_("    Sudo:  empower [SUDO OPTIONS] [PROGRAM] [PROGRAM OPTIONS] [EWL OPTIONS]\n"));
+    printf(_("    AskPass:  empower-askpass [EWL OPTIONS] or empower -p [EWL OPTIONS]\n"));
     return 0;	
   }
 

Modified: trunk/empower/src/bin/ewl/empower_gui_ewl.c
===================================================================
--- trunk/empower/src/bin/ewl/empower_gui_ewl.c	2009-07-11 06:07:11 UTC (rev 41299)
+++ trunk/empower/src/bin/ewl/empower_gui_ewl.c	2009-07-11 09:01:25 UTC (rev 41300)
@@ -50,13 +50,13 @@
     ewl_callback_append(exec, EWL_CALLBACK_VALUE_CHANGED, check_pass_cb, 
               entry);
     ewl_callback_append(exec, EWL_CALLBACK_FOCUS_IN, focus_cb,
-            "Execute");
+            _("Execute"));
     ewl_callback_append(exec, EWL_CALLBACK_FOCUS_OUT, unfocus_cb,
-            "Execute");
+            _("Execute"));
     ewl_text_align_set(EWL_TEXT(exec),EWL_FLAG_ALIGN_LEFT);
-    ewl_text_text_set(EWL_TEXT(exec),"Execute");
+    ewl_text_text_set(EWL_TEXT(exec),_("Execute"));
     ewl_text_cursor_position_set(EWL_TEXT(exec),0);
-    ewl_text_color_apply(EWL_TEXT(exec),100,100,100,200,strlen("Execute"));
+    ewl_text_color_apply(EWL_TEXT(exec),100,100,100,200,strlen(_("Execute")));
     ewl_object_minimum_h_set(EWL_OBJECT(exec), 20);
     ewl_widget_show(exec);
   }	
@@ -67,13 +67,13 @@
   ewl_callback_append(entry, EWL_CALLBACK_VALUE_CHANGED, check_pass_cb, 
               entry);
   ewl_callback_append(entry, EWL_CALLBACK_FOCUS_IN, focus_cb,
-          "Password");
+          _("Password"));
   ewl_callback_append(entry, EWL_CALLBACK_FOCUS_OUT, unfocus_cb,
-          "Password");
+          _("Password"));
   ewl_text_align_set(EWL_TEXT(entry),EWL_FLAG_ALIGN_LEFT);
-  ewl_text_text_set(EWL_TEXT(entry),"Password");
+  ewl_text_text_set(EWL_TEXT(entry),_("Password"));
   ewl_text_cursor_position_set(EWL_TEXT(entry),0);
-  ewl_text_color_apply(EWL_TEXT(entry),100,100,100,200,strlen("Password"));
+  ewl_text_color_apply(EWL_TEXT(entry),100,100,100,200,strlen(_("Password")));
   ewl_object_minimum_h_set(EWL_OBJECT(entry), 20);
   
   if(!auth_passed)

Log:
  typo
  
Author:       caro
Date:         2009-07-10 23:07:11 -0700 (Fri, 10 Jul 2009)
New Revision: 41299

Modified:
  trunk/edje/src/lib/edje_calc.c 

Modified: trunk/edje/src/lib/edje_calc.c
===================================================================
--- trunk/edje/src/lib/edje_calc.c	2009-07-11 03:32:33 UTC (rev 41298)
+++ trunk/edje/src/lib/edje_calc.c	2009-07-11 06:07:11 UTC (rev 41299)
@@ -1244,7 +1244,7 @@
    evas_object_size_hint_min_get(ep->object, &min_w, &min_h);
    if (chosen_desc->box.min.h && (p3->w < min_w))
      p3->w = min_w;
-   if (chosen_desc->box.min.v && (p3->h < min_w))
+   if (chosen_desc->box.min.v && (p3->h < min_h))
      p3->h = min_h;
 }

Log:
  Update to version 2.0.0 and update the Changlog and such.  Quaker should be committing some fixes for the EWL version and adding localization support.
Author:       mekius
Date:         2009-07-10 20:32:33 -0700 (Fri, 10 Jul 2009)
New Revision: 41298

Modified:
  trunk/empower/ChangeLog trunk/empower/INSTALL trunk/empower/NEWS trunk/empower/README trunk/empower/configure.ac trunk/empower/data/Makefile.am trunk/empower/src/bin/elm/empower.c 

Modified: trunk/empower/ChangeLog
===================================================================
--- trunk/empower/ChangeLog	2009-07-10 23:13:09 UTC (rev 41297)
+++ trunk/empower/ChangeLog	2009-07-11 03:32:33 UTC (rev 41298)
@@ -1,3 +1,6 @@
+7-10-09 -- Version 2.0.0
+  - Remove ETK version
+  - Add Elementary version
 4-05-08 -- Version 1.5.2
 	- Update for ewl_password removal.
 3-31-08 -- Version 1.5.1

Modified: trunk/empower/INSTALL
===================================================================
--- trunk/empower/INSTALL	2009-07-10 23:13:09 UTC (rev 41297)
+++ trunk/empower/INSTALL	2009-07-11 03:32:33 UTC (rev 41298)
@@ -1,18 +1,10 @@
-There are two versions now.  The ewl version will install as 'empower_ewl'.
-The etk version will install as 'empower_etk'.  If you only build one version,
-it will be just called empower.  See below for how to control the building of
-each version.
-
-To install empower:
+To build and install empower, do the following:
 	./autogen.sh
 	make
 	make install (as root)
-	
-To enable/disable ewl/etk:
-By default, this will be determined based on which toolkits are installed.
-To override pass one or more of the following to ./autogen.sh:
-	--enable-etk/--disable-etk     Enable/Disable ETK
-	--enable-ewl/--disable-ewl     Enable/Disable EWL
-	
-Note:
-Recently the etk version has been disabled by default due to compilation errors.
\ No newline at end of file
+
+By default the Elementary version will be built unless it's not installed
+or the EWL version is explicitly enabled by passing --enable-ewl to autogen.sh.
+The program will build and install as 'empower' in either case.  Both versions
+cannot be installed at the same time without renaming the resulting binary
+manually.

Modified: trunk/empower/NEWS
===================================================================
--- trunk/empower/NEWS	2009-07-10 23:13:09 UTC (rev 41297)
+++ trunk/empower/NEWS	2009-07-11 03:32:33 UTC (rev 41298)
@@ -1,3 +1,9 @@
+7-10-09:
+	Version 2.0.0 released
+	  - An Elementary based version of empower now exists and is the
+			default version that gets built.  The EWL version is still
+			around for those who love it, but will need to be explicitly
+			enabled.
 5-31-07:
 	Version 1.5 released
 		- This version should hopefully appease alot of the people who have
@@ -9,4 +15,4 @@
 5-29-07:
 	Version 1.0 released
 3-31-06:
-	Initial release <version 0.1>
\ No newline at end of file
+	Initial release <version 0.1>

Modified: trunk/empower/README
===================================================================
--- trunk/empower/README	2009-07-10 23:13:09 UTC (rev 41297)
+++ trunk/empower/README	2009-07-11 03:32:33 UTC (rev 41298)
@@ -1,9 +1,11 @@
 Empower - A graphical sudo tool based on the Enlightenment Foundation Libraries
-Version 1.5
+Version 2.0.0
 
-Usage: 
+Usage:
     Sudo: empower [SUDO OPTIONS] [program] [PROGRAM OPTIONS] [EWL OPTIONS]
     AskPass: empower-askpass [EWL OPTIONS] or empower -p [EWL OPTIONS]
+    
+    Note: EWL options are only valid on the EWL version.
 
 Usage Note:
     If no options are passed to empower, you will be prompted to provide an 
@@ -11,10 +13,10 @@
     specify sudo options as well as program args by following this format in
     the execute entry:
         
-        [SUDO OPTIONS] <program> [PROGRAM OPTIONS]
+        empower [SUDO OPTIONS] <program> [PROGRAM OPTIONS]
         
 
 See INSTALL for installation instructions
 See COPYING and COPYING-PLAIN for license information
 
-Created by and Copyright 2005-2007 Nicholas "Mekius_" Hughart
\ No newline at end of file
+Created by and Copyright 2005-2009 Nicholas "Mekius_" Hughart

Modified: trunk/empower/configure.ac
===================================================================
--- trunk/empower/configure.ac	2009-07-10 23:13:09 UTC (rev 41297)
+++ trunk/empower/configure.ac	2009-07-11 03:32:33 UTC (rev 41298)
@@ -4,7 +4,7 @@
 rm -f config.cache
 
 AC_INIT(configure.ac)
-AM_INIT_AUTOMAKE(empower, 1.5.2)
+AM_INIT_AUTOMAKE(empower, 2.0.0)
 AM_CONFIG_HEADER(src/bin/config.h)
 
 AC_ISC_POSIX

Modified: trunk/empower/data/Makefile.am
===================================================================
--- trunk/empower/data/Makefile.am	2009-07-10 23:13:09 UTC (rev 41297)
+++ trunk/empower/data/Makefile.am	2009-07-11 03:32:33 UTC (rev 41298)
@@ -1,7 +1,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
+if ENABLE_ELEMENTARY
 EXTRA_DIST = \
 trans.png
 
 filesdir = $(datadir)/empower/data
-files_DATA = trans.png
\ No newline at end of file
+files_DATA = trans.png
+endif

Modified: trunk/empower/src/bin/elm/empower.c
===================================================================
--- trunk/empower/src/bin/elm/empower.c	2009-07-10 23:13:09 UTC (rev 41297)
+++ trunk/empower/src/bin/elm/empower.c	2009-07-11 03:32:33 UTC (rev 41298)
@@ -9,7 +9,7 @@
     printf("Failed to create regular expression\n");
     return;
   }
-  
+
   /*Do initial mode guessing based on executable name and number of args*/
   if(!regexec (&regexp, *argv, 0, NULL, 0))
     mode = PASS;
@@ -17,7 +17,7 @@
     mode = SUDO;
   else
     mode = SUDOPROG;
-  
+
   --argc; ++argv; //move to the next argument
   
   if(mode == SUDO || mode == SUDOPROG)