Allow gadgets to either be 1 per container (default) or 1 per zone (like the pager).

SVN revision: 19120

src/bin/e_gadget.c

@@ -3,6 +3,7 @@
  */
 #include "e.h"
 
+E_Gadget_Face *_e_gadget_face_new(E_Gadget *gad, E_Container *con, E_Zone *zone);
 static void _e_gadget_menu_init(E_Gadget *gad);
 static void _e_gadget_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_gadget_free(E_Gadget *gad);
@@ -39,9 +40,7 @@ E_Gadget *
 e_gadget_new(E_Gadget_Api *api)
 {
    E_Gadget *gad;
-   Evas_List *managers, *l = NULL, *l2 = NULL;
-   char buf[1024];
-   int gadget_count = 0;
+   Evas_List *managers, *l = NULL, *l2 = NULL, *l3 = NULL;
 
    if (!api || !api->module || !api->name) return NULL;
 
@@ -72,16 +71,45 @@ e_gadget_new(E_Gadget_Api *api)
 	for(l2 = man->containers; l2; l2 = l2->next)
 	  {
 	     E_Container *con;
+
+	     con = l2->data;
+	
+	     if (api->per_zone) 
+	       {
+		  for(l3 = con->zones; l3; l3 = l3->next)
+		    {
+		       E_Zone *zone;
+
+		       zone = l3->data;
+		       _e_gadget_face_new(gad, con, zone);
+		    }
+	       } 
+	     else 
+	       {
+		  _e_gadget_face_new(gad, con, NULL);
+	       }
+	  }
+     }
+   _e_gadget_menu_init(gad);
+
+   return gad;
+}
+
+E_Gadget_Face *
+_e_gadget_face_new(E_Gadget *gad, E_Container *con, E_Zone *zone)
+{
    E_Gadget_Face *face;
    E_Gadget_Change *change;
    Evas_Object *o;
+   char buf[1024];
 
-	     con = l2->data;
    face = E_NEW(E_Gadget_Face, 1);
-	     if (!face) continue;
+   if (!face) return NULL; 
 
    face->gad = gad;
    face->con = con;
+   if (zone) face->zone = zone;
+   else face->zone = (E_Zone *)evas_list_data(con->zones);
    e_object_ref(E_OBJECT(con));
    face->evas = con->bg_evas;
 
@@ -100,7 +128,8 @@ e_gadget_new(E_Gadget_Api *api)
    /* create a gadman client */
    snprintf(buf, sizeof(buf), "module.%s", gad->name);
    face->gmc = e_gadman_client_new(con->gadman);
-	     e_gadman_client_domain_set(face->gmc, buf, gadget_count++);
+   e_gadman_client_zone_set(face->gmc, face->zone);
+   e_gadman_client_domain_set(face->gmc, buf, evas_list_count(gad->faces));
 
    /* call the user init */
    if (gad->funcs.face_init) (gad->funcs.face_init)(gad->data, face);
@@ -132,11 +161,8 @@ e_gadget_new(E_Gadget_Api *api)
    evas_event_thaw(face->evas);
 
    gad->faces = evas_list_append(gad->faces, face);
-	  }
-     }
-   _e_gadget_menu_init(gad);
 
-   return gad;
+   return face;
 }
 
 void

src/bin/e_gadget.h

@@ -15,6 +15,7 @@ struct _E_Gadget_Api
 {
   E_Module *module;
   const char *name;
+  int per_zone; /* 1 - one face per zone, 0 - one per container */
   void (*func_face_init) (void *data, E_Gadget_Face *gadget_face);
   void (*func_face_free) (void *data, E_Gadget_Face *gadget_face);
   void (*func_change) (void *data, E_Gadget_Face *gadget_face, E_Gadman_Client *gmc, E_Gadman_Change change);
@@ -29,7 +30,7 @@ struct _E_Gadget
   Evas_List *faces;
 
   E_Module *module;
-  char *name;
+  const char *name;
   E_Menu *menu;
 
   struct {
@@ -47,6 +48,7 @@ struct _E_Gadget_Face
 {
   E_Gadget *gad;
   E_Container *con;
+  E_Zone *zone;
   Evas *evas;
 
   E_Menu *menu;

src/modules/gadget_test/e_mod_main.c

@@ -35,6 +35,7 @@ e_modapi_init(E_Module *m)
    
    api->module = m;
    api->name = "test_gadget";
+   api->per_zone = 1;
    api->func_face_init = _test_face_init;
    api->func_face_free = _test_face_free;
    api->func_change = _test_face_change;
@@ -88,9 +89,11 @@ _test_face_init(void *data, E_Gadget_Face *face)
 static void
 _test_face_free(void *data, E_Gadget_Face *face)
 {
+   /* really, this should be done in a gadget_free callback, but that doesn't exist yet... */ 
    Test *t;
    t = data;
    if (t) free(t);
+   face->gad->data = NULL;
 }
 
 static void