Add actual busycover code.

SVN revision: 43748

src/modules/illume-home/Makefile.am

@@ -20,6 +20,7 @@ pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH
 pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
+                         e_busycover.c \
                          e_busycover.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@

src/modules/illume-home/e_busycover.c

@@ -0,0 +1,155 @@
+#include "e.h"
+#include "e_busycover.h"
+
+/* local function prototypes */
+static void _e_busycover_add_object(E_Busycover *esw);
+static void _e_busycover_cb_free(E_Busycover *esw);
+static int _e_busycover_zone_cb_move_resize(void *data, int type, void *event);
+static Evas_Object *_theme_obj_new(Evas *evas, const char *custom_dir, const char *group);
+
+/* local variables */
+static Eina_List *busycovers = NULL;
+
+/* public functions */
+EAPI int 
+e_busycover_init(void) 
+{
+   return 1;
+}
+
+EAPI int 
+e_busycover_shutdown(void) 
+{
+   return 1;
+}
+
+EAPI E_Busycover *
+e_busycover_new(E_Zone *zone, const char *themedir) 
+{
+   E_Busycover *esw;
+
+   esw = E_OBJECT_ALLOC(E_Busycover, E_BUSYCOVER_TYPE, _e_busycover_cb_free);
+   if (!esw) return NULL;
+
+   esw->zone = zone;
+   if (themedir) esw->themedir = eina_stringshare_add(themedir);
+
+   busycovers = eina_list_append(busycovers, esw);
+
+   esw->handlers = 
+     eina_list_append(esw->handlers, 
+                      ecore_event_handler_add(E_EVENT_ZONE_MOVE_RESIZE, 
+                                              _e_busycover_zone_cb_move_resize, 
+                                              esw));
+   return esw;
+}
+
+EAPI E_Busycover_Handle *
+e_busycover_push(E_Busycover *esw, const char *msg, const char *icon) 
+{
+   E_Busycover_Handle *h;
+
+   E_OBJECT_CHECK(esw);
+   E_OBJECT_TYPE_CHECK_RETURN(esw, E_BUSYCOVER_TYPE, NULL);
+   if (!esw->o_base) _e_busycover_add_object(esw);
+   h = E_NEW(E_Busycover_Handle, 1);
+   h->busycover = esw;
+   if (msg) h->msg = eina_stringshare_add(msg);
+   if (icon) h->icon = eina_stringshare_add(icon);
+   esw->handles = eina_list_prepend(esw->handles, h);
+   edje_object_part_text_set(esw->o_base, "e.text.label", h->msg);
+   /* FIXME: handle icon */
+   evas_object_show(esw->o_base);
+   return h;
+}
+
+EAPI void 
+e_busycover_pop(E_Busycover *esw, E_Busycover_Handle *handle) 
+{
+   E_OBJECT_CHECK(esw);
+   E_OBJECT_TYPE_CHECK(esw, E_BUSYCOVER_TYPE);
+   if (!eina_list_data_find(esw->handles, handle)) return;
+   esw->handles = eina_list_remove(esw->handles, handle);
+   if (handle->msg) eina_stringshare_del(handle->msg);
+   if (handle->icon) eina_stringshare_del(handle->icon);
+   free(handle);
+   if (esw->handles) 
+     {
+        handle = esw->handles->data;
+        edje_object_part_text_set(esw->o_base, "e.text.label", handle->msg);
+     }
+   else 
+     {
+        evas_object_del(esw->o_base);
+        esw->o_base = NULL;
+     }
+}
+
+/* local functions */
+static void 
+_e_busycover_add_object(E_Busycover *esw) 
+{
+   Evas_Object *o;
+   int x, y, w, h;
+
+   esw->o_base = _theme_obj_new(esw->zone->container->bg_evas, esw->themedir, 
+                                "modules/illume-home/busycover/default");
+   edje_object_part_text_set(esw->o_base, "e.text.title", "LOADING");
+   e_zone_useful_geometry_get(esw->zone, &x, &y, &w, &h);
+   evas_object_move(esw->o_base, x, y);
+   evas_object_resize(esw->o_base, w, h);
+   evas_object_layer_set(esw->o_base, 100);
+}
+
+static void 
+_e_busycover_cb_free(E_Busycover *esw) 
+{
+   Ecore_Event_Handler *handle;
+
+   if (esw->o_base) evas_object_del(esw->o_base);
+   busycovers = eina_list_remove(busycovers, esw);
+   EINA_LIST_FREE(esw->handlers, handle)
+     ecore_event_handler_del(handle);
+   if (esw->themedir) eina_stringshare_del(esw->themedir);
+   E_FREE(esw);
+}
+
+static int 
+_e_busycover_zone_cb_move_resize(void *data, int type, void *event) 
+{
+   E_Event_Zone_Move_Resize *ev;
+   E_Busycover *esw;
+
+   ev = event;
+   esw = data;
+   if (esw->zone == ev->zone) 
+     {
+        int x, y, w, h;
+
+        e_zone_useful_geometry_get(esw->zone, &x, &y, &w, &h);
+        evas_object_move(esw->o_base, x, y);
+        evas_object_resize(esw->o_base, w, h);
+     }
+   return 1;
+}
+
+static Evas_Object *
+_theme_obj_new(Evas *evas, const char *custom_dir, const char *group) 
+{
+   Evas_Object *o;
+
+   o = edje_object_add(evas);
+   if (!e_theme_edje_object_set(o, "base/theme/modules/illume-home", group)) 
+     {
+        if (custom_dir) 
+          {
+             char buff[PATH_MAX];
+
+             snprintf(buff, sizeof(buff), "%s/e-module-illume-home.edj", custom_dir);
+             if (edje_object_file_set(o, buff, group)) 
+               printf("OK FALLBACK %s\n", buff);
+          }
+     }
+   return o;
+}
+

src/modules/illume-home/e_busycover.h

@@ -12,6 +12,7 @@ struct _E_Busycover
    E_Zone *zone;
    Evas_Object *o_base;
    Eina_List *handlers, *handles;
+   const char *themedir;
 };
 
 struct _E_Busycover_Handle 

src/modules/illume-home/e_mod_main.c

@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_mod_main.h"
+#include "e_busycover.h"
 
 /* local structures */
 typedef struct _Instance Instance;
@@ -35,7 +36,8 @@ static void _il_home_desktop_run(Efreet_Desktop *desktop);
 
 /* local variables */
 static Eina_List *instances = NULL;
-static E_Module *mod;
+static E_Module *mod = NULL;
+static E_Busycover *busycover = NULL;
 
 static const E_Gadcon_Client_Class _gc_class = 
 {
@@ -51,6 +53,13 @@ EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume Home" };
 EAPI void *
 e_modapi_init(E_Module *m) 
 {
+   E_Zone *zone;
+
+   zone = e_util_container_zone_number_get(0, 0);
+
+   e_busycover_init();
+   busycover = e_busycover_new(zone, m->dir);
+
    mod = m;
    e_gadcon_provider_register(&_gc_class);
    return m;
@@ -61,6 +70,12 @@ e_modapi_shutdown(E_Module *m)
 {
    e_gadcon_provider_unregister(&_gc_class);
    mod = NULL;
+   if (busycover) 
+     {
+        e_object_del(E_OBJECT(busycover));
+        busycover = NULL;
+     }
+   e_busycover_shutdown();
    return 1;
 }
 
@@ -367,8 +382,77 @@ _il_home_cb_selected(void *data, Evas_Object *obj, void *event)
              if (ici->real_link) 
                {
                   desktop = efreet_desktop_get(ici->real_link);
-//                  if (desktop) _il_home_desktop_run(desktop);
+                  if (desktop) _il_home_desktop_run(desktop);
                }
+             else printf("No Real Link: %s\n", ici->file);
           }
      }
 }
+
+static void 
+_il_home_desktop_run(Efreet_Desktop *desktop) 
+{
+   Eina_List *l;
+   E_Border *bd;
+   E_Exec_Instance *eins;
+   char *exe = NULL, *p;
+
+   if (!desktop) return;
+   if (!desktop->exec) return;
+   p = strchr(desktop->exec, ' ');
+   if (!p)
+     exe = strdup(desktop->exec);
+   else 
+     {
+        exe = malloc(p - desktop->exec + 1);
+        if (exe) ecore_strlcpy(exe, desktop->exec, p - desktop->exec + 1);
+     }
+   if (exe) 
+     {
+        p = strrchr(exe, '/');
+        if (p) strcpy(exe, p + 1);
+     }
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd) 
+     {
+        if (e_exec_startup_id_pid_find(bd->client.netwm.pid, 
+                                       bd->client.netwm.startup_id) == desktop) 
+          {
+             e_border_show(bd);
+             if (exe) free(exe);
+             return;
+          }
+        if (exe) 
+          {
+             if (bd->client.icccm.command.argv) 
+               {
+                  char *pp;
+
+                  pp = strrchr(bd->client.icccm.command.argv[0], '/');
+                  if (!pp) pp = bd->client.icccm.command.argv[0];
+                  if (!strcmp(exe, pp)) 
+                    {
+                       e_border_show(bd);
+                       if (exe) free(exe);
+                       return;
+                    }
+               }
+             if ((bd->client.icccm.name) && 
+                 (!strcasecmp(bd->client.icccm.name, exe))) 
+               {
+                  e_border_show(bd);
+                  if (exe) free(exe);
+                  return;
+               }
+          }
+     }
+   if (exe) free(exe);
+   eins = e_exec(e_util_container_zone_number_get(0, 0), 
+                 desktop, NULL, NULL, "illume-home");
+   if (eins) 
+     {
+        char buff[PATH_MAX];
+
+        snprintf(buff, sizeof(buff), "Starting %s", desktop->name);
+        e_busycover_push(busycover, buff, NULL);
+     }
+}