Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : slideshow
Dir : e_modules/slideshow
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h slideshow.edc
Log Message:
Formatting via indent.
If timer is not enabled on startup, don't set the timer.
Make sure the bg list is destroyed.
I'd like to thank Ray 'kingrayray' Miller for providing the icon :)
===================================================================
RCS file: /cvs/e/e_modules/slideshow/e_mod_config.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_mod_config.c 30 May 2006 05:21:01 -0000 1.23
+++ e_mod_config.c 30 May 2006 07:45:24 -0000 1.24
@@ -20,7 +20,7 @@
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
E_Container *con;
-
+
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@@ -37,15 +37,15 @@
_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
{
char buf[PATH_MAX];
-
+
cfdata->poll_time = ci->poll_time;
cfdata->disable_timer = ci->disable_timer;
if (ci->dir)
- cfdata->dir = strdup(ci->dir);
- else
+ cfdata->dir = strdup(ci->dir);
+ else
{
- snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds", e_user_homedir_get());
- cfdata->dir = strdup(buf);
+ snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds",
e_user_homedir_get());
+ cfdata->dir = strdup(buf);
}
}
@@ -54,9 +54,10 @@
{
E_Config_Dialog_Data *cfdata;
Config_Item *ci;
-
+
ci = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
_fill_data(ci, cfdata);
return cfdata;
}
@@ -65,7 +66,7 @@
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
if (!slide_config)
- return;
+ return;
slide_config->config_dialog = NULL;
free(cfdata);
@@ -107,16 +108,16 @@
ci->disable_timer = cfdata->disable_timer;
if (ci->dir)
- evas_stringshare_del(ci->dir);
+ evas_stringshare_del(ci->dir);
if (cfdata->dir != NULL)
- ci->dir = evas_stringshare_add(cfdata->dir);
- else
+ ci->dir = evas_stringshare_add(cfdata->dir);
+ else
{
- snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds", e_user_homedir_get());
- ci->dir = evas_stringshare_add(buf);
+ snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds",
e_user_homedir_get());
+ ci->dir = evas_stringshare_add(buf);
}
-
+
e_config_save_queue();
_slide_config_updated(ci->id);
===================================================================
RCS file: /cvs/e/e_modules/slideshow/e_mod_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_mod_main.c 30 May 2006 05:21:01 -0000 1.20
+++ e_mod_main.c 30 May 2006 07:45:24 -0000 1.21
@@ -7,7 +7,7 @@
typedef struct _Instance Instance;
typedef struct _Slideshow Slideshow;
-struct _Instance
+struct _Instance
{
E_Gadcon_Client *gcc;
Evas_Object *slide_obj;
@@ -18,7 +18,7 @@
int index, bg_id, bg_count;
};
-struct _Slideshow
+struct _Slideshow
{
Instance *inst;
Evas_Object *slide_obj;
@@ -37,7 +37,7 @@
static void _slide_menu_cb_post(void *data, E_Menu *m);
static Config_Item *_slide_config_item_get(const char *id);
static Slideshow *_slide_new(Evas *evas);
-static void _slide_free(Slideshow *ss);
+static void _slide_free(Slideshow * ss);
static int _slide_cb_check(void *data);
static void _slide_get_display(Instance *inst);
static void _slide_get_bg_count(void *data);
@@ -49,14 +49,13 @@
Config *slide_config = NULL;
-static const E_Gadcon_Client_Class _gc_class =
-{
+static const E_Gadcon_Client_Class _gc_class = {
GADCON_CLIENT_CLASS_VERSION,
- "slideshow", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon}
+ "slideshow", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon}
};
static E_Gadcon_Client *
-_gc_init(E_Gadcon *gc, char *name, char *id, char *style)
+_gc_init(E_Gadcon *gc, char *name, char *id, char *style)
{
Evas_Object *o;
E_Gadcon_Client *gcc;
@@ -64,16 +63,17 @@
Config_Item *ci;
Slideshow *slide;
char buf[4096];
-
+
inst = E_NEW(Instance, 1);
+
ci = _slide_config_item_get(id);
if (!ci->id)
- ci->id = evas_stringshare_add(id);
+ ci->id = evas_stringshare_add(id);
slide = _slide_new(gc->evas);
slide->inst = inst;
inst->slide = slide;
-
+
o = slide->slide_obj;
gcc = e_gadcon_client_new(gc, name, id, style, o);
gcc->data = inst;
@@ -82,55 +82,54 @@
_slide_get_display(inst);
if (inst->display)
- e_lib_init(inst->display);
-
+ e_lib_init(inst->display);
+
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_slide_cb_mouse_down, inst);
slide_config->instances = evas_list_append(slide_config->instances, inst);
- if (ci->disable_timer)
- _slide_cb_check(inst);
- else
- inst->check_timer = ecore_timer_add(ci->poll_time, _slide_cb_check, inst);
+ if (!ci->disable_timer)
+ inst->check_timer = ecore_timer_add(ci->poll_time, _slide_cb_check,
inst);
+
return gcc;
}
static void
-_gc_shutdown(E_Gadcon_Client *gcc)
+_gc_shutdown(E_Gadcon_Client *gcc)
{
Instance *inst;
-
+
inst = gcc->data;
if (inst->bg_list)
- ecore_list_destroy(inst->bg_list);
+ ecore_list_destroy(inst->bg_list);
if (inst->display)
- evas_stringshare_del(inst->display);
+ evas_stringshare_del(inst->display);
if (inst->check_timer)
- ecore_timer_del(inst->check_timer);
-
+ ecore_timer_del(inst->check_timer);
+
slide_config->instances = evas_list_remove(slide_config->instances, inst);
_slide_free(inst->slide);
free(inst);
}
static void
-_gc_orient(E_Gadcon_Client *gcc)
+_gc_orient(E_Gadcon_Client *gcc)
{
- e_gadcon_client_aspect_set(gcc, 16, 16);
+ e_gadcon_client_aspect_set(gcc, 16, 16);
e_gadcon_client_min_size_set(gcc, 16, 16);
}
static char *
-_gc_label(void)
+_gc_label(void)
{
return D_("Slideshow");
}
static Evas_Object *
-_gc_icon(Evas *evas)
+_gc_icon(Evas *evas)
{
Evas_Object *o;
char buf[4096];
-
+
o = edje_object_add(evas);
snprintf(buf, sizeof(buf), "%s/module.eap",
e_module_dir_get(slide_config->module));
edje_object_file_set(o, buf, "icon");
@@ -138,172 +137,173 @@
}
static void
-_slide_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_slide_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Instance *inst;
Evas_Event_Mouse_Down *ev;
-
+
inst = data;
ev = event_info;
- if ((ev->button == 3) && (!slide_config->menu))
+ if ((ev->button == 3) && (!slide_config->menu))
{
- E_Menu *mn;
- E_Menu_Item *mi;
- int x, y, w, h;
-
- mn = e_menu_new();
- e_menu_post_deactivate_callback_set(mn, _slide_menu_cb_post, inst);
- slide_config->menu = mn;
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, D_("Configuration"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
- e_menu_item_callback_set(mi, _slide_menu_cb_configure, inst);
-
- mi = e_menu_item_new(mn);
- e_menu_item_separator_set(mi, 1);
-
- e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
- e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, &w, &h);
- e_menu_activate_mouse(mn,
e_util_zone_current_get(e_manager_current_get()),
- x + ev->output.x, y + ev->output.y, 1, 1,
- E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
- EVAS_BUTTON_NONE, ev->timestamp, NULL);
+ E_Menu *mn;
+ E_Menu_Item *mi;
+ int x, y, w, h;
+
+ mn = e_menu_new();
+ e_menu_post_deactivate_callback_set(mn, _slide_menu_cb_post, inst);
+ slide_config->menu = mn;
+
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, D_("Configuration"));
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+ e_menu_item_callback_set(mi, _slide_menu_cb_configure, inst);
+
+ mi = e_menu_item_new(mn);
+ e_menu_item_separator_set(mi, 1);
+
+ e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
+ e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, &w, &h);
+ e_menu_activate_mouse(mn,
e_util_zone_current_get(e_manager_current_get()),
+ x + ev->output.x, y + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+ evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
- else if (ev->button == 2)
+ else if (ev->button == 2)
{
- Config_Item *ci;
-
- ci = _slide_config_item_get(inst->gcc->id);
- if (ci->disable_timer)
- return;
- if (inst->check_timer)
- ecore_timer_del(inst->check_timer);
- else
- inst->check_timer = ecore_timer_add(ci->poll_time, _slide_cb_check,
inst);
+ Config_Item *ci;
+
+ ci = _slide_config_item_get(inst->gcc->id);
+ if (ci->disable_timer)
+ return;
+ if (inst->check_timer)
+ ecore_timer_del(inst->check_timer);
+ else
+ inst->check_timer = ecore_timer_add(ci->poll_time, _slide_cb_check,
inst);
}
- else if (ev->button == 1)
- _slide_cb_check(inst);
+ else if (ev->button == 1)
+ _slide_cb_check(inst);
}
static void
-_slide_menu_cb_post(void *data, E_Menu *m)
+_slide_menu_cb_post(void *data, E_Menu *m)
{
if (!slide_config->menu)
- return;
+ return;
e_object_del(E_OBJECT(slide_config->menu));
slide_config->menu = NULL;
}
static void
-_slide_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
+_slide_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Instance *inst;
Config_Item *ci;
-
+
inst = data;
ci = _slide_config_item_get(inst->gcc->id);
_config_slideshow_module(ci);
}
void
-_slide_config_updated(const char *id)
+_slide_config_updated(const char *id)
{
Evas_List *l;
Config_Item *ci;
-
+
if (!slide_config)
- return;
-
+ return;
+
ci = _slide_config_item_get(id);
- for (l = slide_config->instances; l; l = l->next)
+ for (l = slide_config->instances; l; l = l->next)
{
- Instance *inst;
-
- inst = l->data;
- if (!inst->gcc->id)
- continue;
- if (!strcmp(inst->gcc->id, ci->id))
- {
- if (inst->check_timer)
- ecore_timer_del(inst->check_timer);
-
- if ((ci->disable_timer) || (ci->poll_time == 0))
- break;
-
- inst->check_timer = ecore_timer_add(ci->poll_time,
_slide_cb_check, inst);
- break;
- }
+ Instance *inst;
+
+ inst = l->data;
+ if (!inst->gcc->id)
+ continue;
+ if (!strcmp(inst->gcc->id, ci->id))
+ {
+ if (inst->check_timer)
+ ecore_timer_del(inst->check_timer);
+
+ if ((ci->disable_timer) || (ci->poll_time == 0))
+ break;
+
+ inst->check_timer = ecore_timer_add(ci->poll_time,
_slide_cb_check, inst);
+ break;
+ }
}
}
static Config_Item *
-_slide_config_item_get(const char *id)
+_slide_config_item_get(const char *id)
{
Evas_List *l;
Config_Item *ci;
-
- for (l = slide_config->items; l; l = l->next)
+
+ for (l = slide_config->items; l; l = l->next)
{
- ci = l->data;
- if (!ci->id) continue;
- if (!strcmp(ci->id, id))
- return ci;
+ ci = l->data;
+ if (!ci->id)
+ continue;
+ if (!strcmp(ci->id, id))
+ return ci;
}
-
+
ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(id);
ci->poll_time = 60.0;
ci->disable_timer = 0;
-
+
slide_config->items = evas_list_append(slide_config->items, ci);
return ci;
}
-EAPI E_Module_Api e_modapi =
-{
+EAPI E_Module_Api e_modapi = {
E_MODULE_API_VERSION,
- "Slideshow"
+ "Slideshow"
};
EAPI void *
-e_modapi_init(E_Module *m)
+e_modapi_init(E_Module *m)
{
bindtextdomain(PACKAGE, LOCALEDIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
-
+
conf_item_edd = E_CONFIG_DD_NEW("Slideshow_Config_Item", Config_Item);
- #undef T
- #undef D
- #define T Config_Item
- #define D conf_item_edd
+
+#undef T
+#undef D
+#define T Config_Item
+#define D conf_item_edd
E_CONFIG_VAL(D, T, id, STR);
E_CONFIG_VAL(D, T, dir, STR);
E_CONFIG_VAL(D, T, poll_time, DOUBLE);
E_CONFIG_VAL(D, T, disable_timer, INT);
-
+
conf_edd = E_CONFIG_DD_NEW("Slideshow_Config", Config);
- #undef T
- #undef D
- #define T Config
- #define D conf_edd
+
+#undef T
+#undef D
+#define T Config
+#define D conf_edd
E_CONFIG_LIST(D, T, items, conf_item_edd);
-
+
slide_config = e_config_domain_load("module.slideshow", conf_edd);
- if (!slide_config)
+ if (!slide_config)
{
- Config_Item *ci;
- char buf[4096];
+ Config_Item *ci;
+ char buf[4096];
- snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds", e_user_homedir_get());
- slide_config = E_NEW(Config, 1);
- ci = E_NEW(Config_Item, 1);
- ci->id = evas_stringshare_add("0");
- ci->dir = evas_stringshare_add(buf);
- ci->poll_time = 60.0;
- ci->disable_timer = 0;
- slide_config->items = evas_list_append(slide_config->items, ci);
+ snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds",
e_user_homedir_get());
+ slide_config = E_NEW(Config, 1);
+ ci = E_NEW(Config_Item, 1);
+
+ ci->id = evas_stringshare_add("0");
+ ci->dir = evas_stringshare_add(buf);
+ ci->poll_time = 60.0;
+ ci->disable_timer = 0;
+ slide_config->items = evas_list_append(slide_config->items, ci);
}
slide_config->module = m;
e_gadcon_provider_register(&_gc_class);
@@ -311,30 +311,32 @@
}
EAPI int
-e_modapi_shutdown(E_Module *m)
+e_modapi_shutdown(E_Module *m)
{
+ e_lib_shutdown();
+
slide_config->module = NULL;
e_gadcon_provider_unregister(&_gc_class);
-
+
if (slide_config->config_dialog)
- e_object_del(E_OBJECT(slide_config->config_dialog));
- if (slide_config->menu)
- {
- e_menu_post_deactivate_callback_set(slide_config->menu, NULL, NULL);
- e_object_del(E_OBJECT(slide_config->menu));
- slide_config->menu = NULL;
- }
- while (slide_config->items)
+ e_object_del(E_OBJECT(slide_config->config_dialog));
+ if (slide_config->menu)
{
- Config_Item *ci;
-
- ci = slide_config->items->data;
- slide_config->items = evas_list_remove_list(slide_config->items,
slide_config->items);
- if (ci->id)
- evas_stringshare_del(ci->id);
- if (ci->dir)
- evas_stringshare_del(ci->dir);
- free(ci);
+ e_menu_post_deactivate_callback_set(slide_config->menu, NULL, NULL);
+ e_object_del(E_OBJECT(slide_config->menu));
+ slide_config->menu = NULL;
+ }
+ while (slide_config->items)
+ {
+ Config_Item *ci;
+
+ ci = slide_config->items->data;
+ slide_config->items = evas_list_remove_list(slide_config->items,
slide_config->items);
+ if (ci->id)
+ evas_stringshare_del(ci->id);
+ if (ci->dir)
+ evas_stringshare_del(ci->dir);
+ free(ci);
}
free(slide_config);
slide_config = NULL;
@@ -344,37 +346,37 @@
}
EAPI int
-e_modapi_info(E_Module *m)
+e_modapi_info(E_Module *m)
{
char buf[4096];
-
+
snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
m->icon_file = strdup(buf);
return 1;
}
EAPI int
-e_modapi_save(E_Module *m)
+e_modapi_save(E_Module *m)
{
Evas_List *l;
-
- for (l = slide_config->instances; l; l = l->next)
+
+ for (l = slide_config->instances; l; l = l->next)
{
- Instance *inst;
- Config_Item *ci;
-
- inst = l->data;
- ci = _slide_config_item_get(inst->gcc->id);
- if (ci->id)
- evas_stringshare_del(ci->id);
- ci->id = evas_stringshare_add(inst->gcc->id);
+ Instance *inst;
+ Config_Item *ci;
+
+ inst = l->data;
+ ci = _slide_config_item_get(inst->gcc->id);
+ if (ci->id)
+ evas_stringshare_del(ci->id);
+ ci->id = evas_stringshare_add(inst->gcc->id);
}
e_config_domain_save("module.slideshow", conf_edd, slide_config);
return 1;
}
EAPI int
-e_modapi_about(E_Module *m)
+e_modapi_about(E_Module *m)
{
e_module_dialog_show(D_("Enlightenment Slide Show Module"),
D_("This module is VERY simple and is used to cycle
desktop backgrounds"));
@@ -382,7 +384,7 @@
}
static Slideshow *
-_slide_new(Evas *evas)
+_slide_new(Evas *evas)
{
Slideshow *ss;
char buf[4096];
@@ -393,22 +395,19 @@
ss->img_obj = e_livethumb_add(evas);
e_livethumb_vsize_set(ss->img_obj, 16, 16);
-// edje_extern_object_min_size_set(ss->img_obj, 16, 16);
-// edje_extern_object_max_size_set(ss->img_obj, 16, 16);
evas_object_show(ss->img_obj);
-
- ss->slide_obj = edje_object_add(evas);
- if (!e_theme_edje_object_set(ss->slide_obj, "base/theme/modules/slideshow",
- "modules/slideshow/main"))
- edje_object_file_set(ss->slide_obj, buf, "modules/slideshow/main");
+
+ ss->slide_obj = edje_object_add(evas);
+ if (!e_theme_edje_object_set(ss->slide_obj, "base/theme/modules/slideshow",
"modules/slideshow/main"))
+ edje_object_file_set(ss->slide_obj, buf, "modules/slideshow/main");
evas_object_show(ss->slide_obj);
-
+
edje_object_part_swallow(ss->slide_obj, "item", ss->img_obj);
return ss;
}
static void
-_slide_free(Slideshow *ss)
+_slide_free(Slideshow * ss)
{
evas_object_del(ss->img_obj);
evas_object_del(ss->bg_obj);
@@ -416,103 +415,107 @@
free(ss);
}
-static int
-_slide_cb_check(void *data)
+static int
+_slide_cb_check(void *data)
{
Instance *inst;
Config_Item *ci;
char *bg;
-
+
inst = data;
ci = _slide_config_item_get(inst->gcc->id);
_slide_get_bg_count(inst);
if (inst->index > inst->bg_count)
- inst->index = 0;
+ inst->index = 0;
- if (inst->index <= inst->bg_count)
+ if (inst->index <= inst->bg_count)
{
- bg = ecore_list_goto_index(inst->bg_list, inst->index);
- if (bg == NULL)
- {
- inst->index = 0;
- bg = ecore_list_goto_index(inst->bg_list, inst->index);
- }
- if (bg != NULL)
- {
- _slide_set_bg(inst, bg);
- inst->index++;
- _slide_set_preview(inst);
- }
+ bg = ecore_list_goto_index(inst->bg_list, inst->index);
+ if (bg == NULL)
+ {
+ inst->index = 0;
+ bg = ecore_list_goto_index(inst->bg_list, inst->index);
+ }
+ if (bg != NULL)
+ {
+ _slide_set_bg(inst, bg);
+ inst->index++;
+ _slide_set_preview(inst);
+ }
}
return 1;
}
-static void
-_slide_get_display(Instance *inst)
+static void
+_slide_get_display(Instance *inst)
{
if (!inst)
- return;
-
+ return;
+
if (inst->display)
- evas_stringshare_del(inst->display);
-
+ evas_stringshare_del(inst->display);
+
char *tmp = getenv("DISPLAY");
+
if (tmp)
- inst->display = evas_stringshare_add(tmp);
-
- if (inst->display)
+ inst->display = evas_stringshare_add(tmp);
+
+ if (inst->display)
{
- char *p;
- char buf[1024];
-
- p = strrchr(inst->display, ':');
- if (!p)
- {
- snprintf(buf, sizeof(buf), "%s:0.0", inst->display);
- evas_stringshare_del(inst->display);
- inst->display = evas_stringshare_add(buf);
- }
- else
- {
- p = strrchr(p, '.');
- if (!p)
- {
- snprintf(buf, sizeof(buf), "%s.0", inst->display);
- evas_stringshare_del(inst->display);
- inst->display = evas_stringshare_add(buf);
- }
- }
+ char *p;
+ char buf[1024];
+
+ p = strrchr(inst->display, ':');
+ if (!p)
+ {
+ snprintf(buf, sizeof(buf), "%s:0.0", inst->display);
+ evas_stringshare_del(inst->display);
+ inst->display = evas_stringshare_add(buf);
+ }
+ else
+ {
+ p = strrchr(p, '.');
+ if (!p)
+ {
+ snprintf(buf, sizeof(buf), "%s.0", inst->display);
+ evas_stringshare_del(inst->display);
+ inst->display = evas_stringshare_add(buf);
+ }
+ }
}
- else
- inst->display = evas_stringshare_add(":0.0");
+ else
+ inst->display = evas_stringshare_add(":0.0");
}
-static void
-_slide_get_bg_count(void *data)
+static void
+_slide_get_bg_count(void *data)
{
Instance *inst;
Config_Item *ci;
char *item;
-
+
inst = data;
ci = _slide_config_item_get(inst->gcc->id);
-
+
inst->bg_count = 0;
+ if (inst->bg_list)
+ ecore_list_destroy(inst->bg_list);
+
inst->bg_list = ecore_file_ls(ci->dir);
ecore_list_goto_first(inst->bg_list);
while ((item = (char *)ecore_list_next(inst->bg_list)) != NULL)
- inst->bg_count++;
+ inst->bg_count++;
}
static void
-_slide_set_bg(void *data, const char *bg)
+_slide_set_bg(void *data, const char *bg)
{
Instance *inst;
Config_Item *ci;
char buf[4096];
-
+
inst = data;
ci = _slide_config_item_get(inst->gcc->id);
snprintf(buf, sizeof(buf), "%s/%s", ci->dir, bg);
@@ -520,625 +523,27 @@
}
static void
-_slide_set_preview(void *data)
+_slide_set_preview(void *data)
{
Instance *inst;
Config_Item *ci;
Slideshow *ss;
char buf[4096];
char *bg;
-
+
inst = data;
ci = _slide_config_item_get(inst->gcc->id);
ss = inst->slide;
-
+
bg = ecore_list_goto_index(inst->bg_list, inst->index);
snprintf(buf, sizeof(buf), "%s/%s", ci->dir, bg);
if (!e_util_edje_collection_exists(buf, "desktop/background"))
- return;
-
- if (ss->bg_obj) evas_object_del(ss->bg_obj);
+ return;
+
+ if (ss->bg_obj)
+ evas_object_del(ss->bg_obj);
ss->bg_obj = edje_object_add(e_livethumb_evas_get(ss->img_obj));
edje_object_file_set(ss->bg_obj, buf, "desktop/background");
e_livethumb_thumb_set(ss->img_obj, ss->bg_obj);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/*******************************************************
-int idx, bg_id, bg_count;
-static int slide_count;
-Ecore_List *list;
-
-static Slide *_slide_init(E_Module *m);
-static void _slide_config_menu_new(Slide *e);
-static void _slide_shutdown(Slide *e);
-
-static int _slide_face_init(Slide_Face *sf);
-static void _slide_face_free(Slide_Face *ef);
-static void _slide_face_menu_new(Slide_Face *face);
-static void _slide_face_enable(Slide_Face *face);
-static void _slide_face_disable(Slide_Face *face);
-static void _slide_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _slide_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item
*mi);
-
-static void _slide_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void _slide_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change);
-
-static int _slide_cb_check(void *data);
-
-static void get_bg_count();
-static void _set_bg(char *bg, Slide_Face *sf);
-
-EAPI E_Module_Api e_modapi = {
- E_MODULE_API_VERSION,
- "Slideshow"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
- Slide *e;
-
- bindtextdomain(PACKAGE, LOCALEDIR);
- bind_textdomain_codeset(PACKAGE, "UTF-8");
-
- e = _slide_init(m);
- m->config_menu = e->config_menu;
-
- if (!e->display)
- {
- char *tmp = getenv("DISPLAY");
-
- if (tmp)
- e->display = strdup(tmp);
- }
-
- if (e->display)
- {
- char *p;
- char buf[1024];
-
- p = strrchr(e->display, ':');
- if (!p)
- {
- snprintf(buf, sizeof(buf), "%s:0.0", e->display);
- free(e->display);
- e->display = strdup(buf);
- }
- else
- {
- p = strrchr(p, '.');
- if (!p)
- {
- snprintf(buf, sizeof(buf), "%s.0", e->display);
- free(e->display);
- e->display = strdup(buf);
- }
- }
- }
- else
- e->display = strdup(":0.0");
-
- if (e->display)
- e_lib_init(e->display);
- if (!e->display)
- e_lib_init(":0.0");
-
- return e;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m)
-{
- Slide *s;
-
- s = m->data;
- if (s)
- {
- if (m->config_menu)
- {
- e_menu_deactivate(m->config_menu);
- e_object_del(E_OBJECT(m->config_menu));
- m->config_menu = NULL;
- }
- if (s->config_dialog)
- {
- e_object_del(E_OBJECT(s->config_dialog));
- s->config_dialog = NULL;
- }
- _slide_shutdown(s);
- }
-
- e_lib_shutdown();
- return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m)
-{
- Slide *e;
-
- e = m->data;
- if (e)
- e_config_domain_save("module.slideshow", e->conf_edd, e->conf);
- return 1;
-}
-
-EAPI int
-e_modapi_info(E_Module *m)
-{
- m->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
- return 1;
-}
-
-EAPI int
-e_modapi_about(E_Module *m)
-{
- e_module_dialog_show(D_("Enlightenment Slide Show Module"),
- D_("This module is VERY simple and is used to cycle
desktop backgrounds"));
- return 1;
-}
-
-EAPI int
-e_modapi_config(E_Module *m)
-{
- Slide *s;
- E_Container *con;
-
- s = m->data;
- if (!s)
- return 0;
- if (!s->face)
- return 0;
-
- con = e_container_current_get(e_manager_current_get());
- if (s->face->con == con)
- _config_slideshow_module(con, s);
- return 1;
-}
-
-static Slide *
-_slide_init(E_Module *m)
-{
- Slide *e;
- E_Menu_Item *mi;
- Evas_List *managers, *l, *l2;
- char buf[1024];
-
- e = E_NEW(Slide, 1);
-
- if (!e)
- return NULL;
-
- e->conf_edd = E_CONFIG_DD_NEW("Slide_Config", Config);
-#undef T
-#undef D
-#define T Config
-#define D e->conf_edd
- E_CONFIG_VAL(D, T, dir, STR);
- E_CONFIG_VAL(D, T, disable_timer, INT);
- E_CONFIG_VAL(D, T, cycle_time, DOUBLE);
-
- e->conf = e_config_domain_load("module.slideshow", e->conf_edd);
- if (!e->conf)
- {
- e->conf = E_NEW(Config, 1);
-
- snprintf(buf, sizeof(buf), "%s/.e/e/backgrounds", e_user_homedir_get());
- e->conf->dir = (char *)evas_stringshare_add(buf);
- e->conf->disable_timer = 0;
- e->conf->cycle_time = 600;
- }
-
- E_CONFIG_LIMIT(e->conf->cycle_time, 5.0, 600.0);
-
- _slide_config_menu_new(e);
-
- managers = e_manager_list();
- for (l = managers; l; l = l->next)
- {
- E_Manager *man;
-
- man = l->data;
- for (l2 = man->containers; l2; l2 = l2->next)
- {
- E_Container *con;
- Slide_Face *ef;
-
- con = l2->data;
- ef = E_NEW(Slide_Face, 1);
-
- if (ef)
- {
- ef->conf_face_edd = E_CONFIG_DD_NEW("Slide_Config_Face",
Config_Face);
-#undef T
-#undef D
-#define T Config_Face
-#define D ef->conf_face_edd
- E_CONFIG_VAL(D, T, enabled, UCHAR);
-
- e->face = ef;
- ef->slide = e;
- ef->con = con;
- ef->evas = con->bg_evas;
-
- ef->conf = E_NEW(Config_Face, 1);
-
- ef->conf->enabled = 1;
-
- if (!_slide_face_init(ef))
- return NULL;
-
- _slide_face_menu_new(ef);
-
- mi = e_menu_item_new(e->config_menu);
- e_menu_item_label_set(mi, _("Configuration"));
- e_menu_item_callback_set(mi, _slide_face_cb_menu_configure,
ef);
-
- mi = e_menu_item_new(e->config_menu);
- e_menu_item_label_set(mi, con->name);
- e_menu_item_submenu_set(mi, ef->menu);
-
- if (!ef->conf->enabled)
- _slide_face_disable(ef);
- else
- _slide_face_enable(ef);
- }
- }
- }
- return e;
-}
-
-static void
-_slide_shutdown(Slide *e)
-{
- if (list) ecore_list_destroy(list);
-
- _slide_face_free(e->face);
-
- if (e->cycle_timer)
- {
- e->cycle_timer = ecore_timer_del(e->cycle_timer);
- e->cycle_timer = NULL;
- }
-
- if (e->display) free(e->display);
-
- free(e->conf);
- E_CONFIG_DD_FREE(e->conf_edd);
- free(e);
-}
-
-static void
-_slide_config_menu_new(Slide *e)
-{
- E_Menu *mn;
-
- mn = e_menu_new();
- e->config_menu = mn;
-}
-
-static int
-_slide_face_init(Slide_Face *sf)
-{
- Evas_Object *o;
- char buff[4096];
-
- evas_event_freeze(sf->evas);
- o = edje_object_add(sf->evas);
- sf->slide_object = o;
-
- snprintf(buff, sizeof(buff), PACKAGE_DATA_DIR "/slideshow.edj");
- if (!e_theme_edje_object_set(o, "base/theme/modules/slideshow",
"modules/slideshow/main"))
- edje_object_file_set(o, buff, "modules/slideshow/main");
- evas_object_show(o);
-
- o = evas_object_rectangle_add(sf->evas);
- sf->event_object = o;
- evas_object_layer_set(o, 2);
- evas_object_repeat_events_set(o, 1);
- evas_object_color_set(o, 0, 0, 0, 0);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_slide_face_cb_mouse_down, sf);
- evas_object_show(o);
-
- sf->gmc = e_gadman_client_new(sf->con->gadman);
- e_gadman_client_domain_set(sf->gmc, "module.slideshow", slide_count++);
- e_gadman_client_policy_set(sf->gmc,
- E_GADMAN_POLICY_ANYWHERE | E_GADMAN_POLICY_HMOVE
|
- E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_HSIZE |
E_GADMAN_POLICY_VSIZE);
- e_gadman_client_min_size_set(sf->gmc, 4, 4);
- e_gadman_client_max_size_set(sf->gmc, 128, 128);
- e_gadman_client_auto_size_set(sf->gmc, 40, 40);
- e_gadman_client_align_set(sf->gmc, 1.0, 1.0);
- e_gadman_client_resize(sf->gmc, 40, 40);
- e_gadman_client_change_func_set(sf->gmc, _slide_face_cb_gmc_change, sf);
- e_gadman_client_load(sf->gmc);
- evas_event_thaw(sf->evas);
-
- return 1;
-}
-
-static void
-_slide_face_free(Slide_Face *ef)
-{
- if (ef->menu)
- e_object_del(E_OBJECT(ef->menu));
- if (ef->event_object)
- evas_object_del(ef->event_object);
- if (ef->slide_object)
- evas_object_del(ef->slide_object);
- if (ef->gmc)
- e_gadman_client_save(ef->gmc);
- if (ef->gmc)
- e_object_del(E_OBJECT(ef->gmc));
-
- E_FREE(ef->conf);
- E_FREE(ef);
- slide_count--;
-}
-
-static void
-_slide_face_menu_new(Slide_Face *face)
-{
- E_Menu *mn;
- E_Menu_Item *mi;
-
- mn = e_menu_new();
- face->menu = mn;
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Configuration"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
- e_menu_item_callback_set(mi, _slide_face_cb_menu_configure, face);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Edit Mode"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets");
- e_menu_item_callback_set(mi, _slide_face_cb_menu_edit, face);
-}
-
-static void
-_slide_face_enable(Slide_Face *face)
-{
- face->conf->enabled = 1;
- e_config_save_queue();
- evas_object_show(face->slide_object);
- evas_object_show(face->event_object);
- if (!face->slide->conf->disable_timer)
- {
- if (face->slide->cycle_timer)
- {
- if (face->slide->conf->cycle_time != 0)
- {
- ecore_timer_interval_set(face->slide->cycle_timer,
face->slide->conf->cycle_time);
- }
- else
- {
- face->slide->cycle_timer =
ecore_timer_del(face->slide->cycle_timer);
- face->slide->cycle_timer = NULL;
- }
- }
- else
- {
- face->slide->cycle_timer =
ecore_timer_add(face->slide->conf->cycle_time, _slide_cb_check, face);
- }
- }
- else
- {
- if (face->slide->cycle_timer)
- {
- face->slide->cycle_timer =
ecore_timer_del(face->slide->cycle_timer);
- face->slide->cycle_timer = NULL;
- }
- }
-}
-
-static void
-_slide_face_disable(Slide_Face *face)
-{
- face->conf->enabled = 0;
- e_config_save_queue();
- evas_object_hide(face->slide_object);
- evas_object_hide(face->event_object);
- if (face->slide->cycle_timer)
- {
- face->slide->cycle_timer = ecore_timer_del(face->slide->cycle_timer);
- face->slide->cycle_timer = NULL;
- }
-}
-
-static void
-_slide_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change
change)
-{
- Slide_Face *ef;
- Evas_Coord x, y, w, h;
-
- ef = data;
- switch (change)
- {
- case E_GADMAN_CHANGE_MOVE_RESIZE:
- e_gadman_client_geometry_get(ef->gmc, &x, &y, &w, &h);
- evas_object_move(ef->slide_object, x, y);
- evas_object_move(ef->event_object, x, y);
- evas_object_resize(ef->slide_object, w, h);
- evas_object_resize(ef->event_object, w, h);
- break;
- case E_GADMAN_CHANGE_RAISE:
- evas_object_raise(ef->slide_object);
- evas_object_raise(ef->event_object);
- break;
- case E_GADMAN_CHANGE_ZONE:
- break;
- case E_GADMAN_CHANGE_EDGE:
- break;
- }
-}
-
-static void
-_slide_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
-{
- Evas_Event_Mouse_Down *ev;
- Slide_Face *ef;
- Slide *es;
-
- ev = event_info;
- ef = data;
- es = ef->slide;
-
- if (ev->button == 3)
- {
- E_Zone *zone;
-
- zone = e_zone_current_get(ef->con);
- e_menu_activate_mouse(ef->menu, zone, ev->output.x, ev->output.y, 1,
1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_container_fake_mouse_up_all_later(ef->con);
- }
- else if (ev->button == 2)
- {
- if (es->conf->disable_timer)
- return;
- if (es->cycle_timer)
- {
- es->cycle_timer = ecore_timer_del(es->cycle_timer);
- es->cycle_timer = NULL;
- }
- else
- {
- es->cycle_timer = ecore_timer_add(es->conf->cycle_time,
_slide_cb_check, ef);
- }
- }
- else if (ev->button == 1)
- {
- _slide_cb_check(ef);
- }
-}
-
-static int
-_slide_cb_check(void *data)
-{
- char *bg;
- Slide_Face *ef;
- Slide *e;
-
- ef = data;
- if (!ef) return 0;
- if (!ef->conf) return 0;
- if (!ef->con) return 0;
- if (ef->conf->enabled == 0) return 0;
-
- e = ef->slide;
- get_bg_count(e->conf->dir);
-
- if (idx > bg_count)
- idx = 0;
- if (idx <= bg_count)
- {
- bg = ecore_list_goto_index(list, idx);
- if (bg == NULL)
- {
- idx = 0;
- bg = ecore_list_goto_index(list, idx);
- }
- if (bg != NULL)
- {
- _set_bg(bg, ef);
- idx++;
- }
- }
- return 1;
-}
-
-static void
-_slide_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Slide_Face *face;
-
- face = data;
- e_gadman_mode_set(face->gmc->gadman, E_GADMAN_MODE_EDIT);
-}
-
-static void
-get_bg_count(char *name)
-{
- char *list_item;
-
- bg_count = 0;
- list = ecore_file_ls(name);
- ecore_list_goto_first(list);
- while ((list_item = (char *)ecore_list_next(list)) != NULL)
- bg_count++;
-}
-
-static void
-_set_bg(char *bg, Slide_Face *sf)
-{
- char buffer[4096];
- Slide *e;
-
- e = sf->slide;
- snprintf(buffer, sizeof(buffer), "%s/%s", e->conf->dir, bg);
- e_lib_background_set(buffer);
-}
-
-static void
-_slide_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Slide_Face *sf;
-
- sf = data;
- if (!sf)
- return;
- _config_slideshow_module(sf->con, sf->slide);
-}
-
-void
-_slide_cb_config_updated(void *data)
-{
- Slide *s;
-
- s = data;
- if (s->conf->disable_timer == 1)
- {
- if (s->cycle_timer)
- {
- s->cycle_timer = ecore_timer_del(s->cycle_timer);
- s->cycle_timer = NULL;
- }
- return;
- }
-
- if (s->conf->cycle_time == 0)
- {
- if (s->cycle_timer)
- {
- s->cycle_timer = ecore_timer_del(s->cycle_timer);
- s->cycle_timer = NULL;
- }
- }
- else
- {
- if (s->cycle_timer)
- {
- ecore_timer_interval_set(s->cycle_timer, s->conf->cycle_time);
- }
- else
- {
- s->cycle_timer = ecore_timer_add(s->conf->cycle_time,
_slide_cb_check, s->face);
- }
- }
-}
-
-*************************************************************/
===================================================================
RCS file: /cvs/e/e_modules/slideshow/e_mod_main.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_mod_main.h 30 May 2006 05:21:01 -0000 1.13
+++ e_mod_main.h 30 May 2006 07:45:24 -0000 1.14
@@ -18,7 +18,7 @@
struct _Config_Item
{
const char *id;
-
+
int disable_timer;
double poll_time;
const char *dir;
===================================================================
RCS file: /cvs/e/e_modules/slideshow/slideshow.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- slideshow.edc 30 May 2006 05:21:01 -0000 1.5
+++ slideshow.edc 30 May 2006 07:45:24 -0000 1.6
@@ -62,7 +62,6 @@
description
{
state: "default" 0.0;
- //aspect: 1.0 1.0;
rel1
{
relative: 0.0 0.0;
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
