Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : screenshot
Dir : e_modules/screenshot
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Indent for mej :)
===================================================================
RCS file: /cvs/e/e_modules/screenshot/e_mod_main.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_mod_main.c 21 May 2006 22:36:02 -0000 1.35
+++ e_mod_main.c 22 May 2006 02:10:15 -0000 1.36
@@ -15,7 +15,7 @@
typedef struct _Instance Instance;
typedef struct _Screenshot Screenshot;
-struct _Instance
+struct _Instance
{
E_Gadcon_Client *gcc;
Evas_Object *ss_obj;
@@ -58,17 +58,15 @@
Config *ss_config = NULL;
/* Define the gadcon class */
-static const E_Gadcon_Client_Class _gc_class =
-{
+static const E_Gadcon_Client_Class _gc_class = {
GADCON_CLIENT_CLASS_VERSION,
- "screenshot",
- {
- _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon
- }
+ "screenshot",
+ {
+ _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;
@@ -76,159 +74,159 @@
Config_Item *ci;
Screenshot *ss;
char buf[4096];
-
+
inst = E_NEW(Instance, 1);
-
+
ci = _ss_config_item_get(id);
- if (!ci->id) ci->id = evas_stringshare_add(id);
-
+ if (!ci->id)
+ ci->id = evas_stringshare_add(id);
+
ss = _ss_new(gc->evas);
ss->inst = inst;
inst->ss = ss;
-
- o = ss->ss_obj;
+
+ o = ss->ss_obj;
gcc = e_gadcon_client_new(gc, name, id, style, o);
gcc->data = inst;
inst->gcc = gcc;
inst->ss_obj = o;
-
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
- _ss_cb_mouse_down, inst);
-
+
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_ss_cb_mouse_down, inst);
+
ss_config->instances = evas_list_append(ss_config->instances, inst);
return gcc;
}
static void
-_gc_shutdown(E_Gadcon_Client *gcc)
+_gc_shutdown(E_Gadcon_Client *gcc)
{
Instance *inst;
-
+
inst = gcc->data;
- if (inst->filename) evas_stringshare_del(inst->filename);
+ if (inst->filename)
+ evas_stringshare_del(inst->filename);
ss_config->instances = evas_list_remove(ss_config->instances, inst);
_ss_free(inst->ss);
free(inst);
}
static void
-_gc_orient(E_Gadcon_Client *gcc)
+_gc_orient(E_Gadcon_Client *gcc)
{
Instance *inst;
-
+
inst = gcc->data;
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_("Screenshot");
}
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(ss_config->module));
+ snprintf(buf, sizeof(buf), "%s/module.eap",
e_module_dir_get(ss_config->module));
edje_object_file_set(o, buf, "icon");
return o;
}
-static void
-_ss_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
+static void
+_ss_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) && (!ss_config->menu))
+ if ((ev->button == 3) && (!ss_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, _ss_menu_cb_post, inst);
- ss_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, _ss_menu_cb_configure, inst);
-
- 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, _ss_menu_cb_post, inst);
+ ss_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, _ss_menu_cb_configure, inst);
+
+ 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 == 1) && (inst))
- _ss_handle_mouse_down(inst);
+ _ss_handle_mouse_down(inst);
}
static void
-_ss_menu_cb_post(void *data, E_Menu *m)
+_ss_menu_cb_post(void *data, E_Menu *m)
{
- if (!ss_config->menu) return;
+ if (!ss_config->menu)
+ return;
e_object_del(E_OBJECT(ss_config->menu));
ss_config->menu = NULL;
}
static void
-_ss_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
+_ss_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Instance *inst;
Config_Item *ci;
-
+
inst = data;
ci = _ss_config_item_get(inst->gcc->id);
_config_screenshot_module(ci);
}
static Config_Item *
-_ss_config_item_get(const char *id)
+_ss_config_item_get(const char *id)
{
Evas_List *l;
Config_Item *ci;
-
- for (l = ss_config->items; l; l = l->next)
+
+ for (l = ss_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->delay_time = 60.0;
- if (ecore_file_app_installed("import"))
+ if (ecore_file_app_installed("import"))
{
- if (ecore_file_app_installed("scrot"))
- {
- ci->use_import = 0;
- ci->use_scrot = 1;
- }
- else
- {
- ci->use_import = 1;
- ci->use_scrot = 0;
- }
+ if (ecore_file_app_installed("scrot"))
+ {
+ ci->use_import = 0;
+ ci->use_scrot = 1;
+ }
+ else
+ {
+ ci->use_import = 1;
+ ci->use_scrot = 0;
+ }
}
- else if (ecore_file_app_installed("scrot"))
+ else if (ecore_file_app_installed("scrot"))
{
- ci->use_import = 0;
- ci->use_scrot = 1;
+ ci->use_import = 0;
+ ci->use_scrot = 1;
}
ci->location = evas_stringshare_add(e_user_homedir_get());
ci->filename = evas_stringshare_add("screenshot");
@@ -243,28 +241,28 @@
ci->scrot.use_thumb = 0;
ci->use_app = 0;
ci->app = evas_stringshare_add("");
-
+
ss_config->items = evas_list_append(ss_config->items, ci);
return ci;
}
-EAPI E_Module_Api e_modapi =
-{
+EAPI E_Module_Api e_modapi = {
E_MODULE_API_VERSION,
- "Screenshot"
+ "Screenshot"
};
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("Screenshot_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, delay_time, DOUBLE);
E_CONFIG_VAL(D, T, use_import, UCHAR);
@@ -282,93 +280,98 @@
E_CONFIG_VAL(D, T, scrot.use_thumb, UCHAR);
E_CONFIG_VAL(D, T, use_app, INT);
E_CONFIG_VAL(D, T, app, STR);
-
+
conf_edd = E_CONFIG_DD_NEW("Screenshot_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);
-
+
ss_config = e_config_domain_load("module.screenshot", conf_edd);
- if (!ss_config)
+ if (!ss_config)
{
- Config_Item *ci;
-
- ss_config = E_NEW(Config, 1);
- ci = E_NEW(Config_Item, 1);
-
- ci->id = evas_stringshare_add("0");
- ci->delay_time = 60.0;
- if (ecore_file_app_installed("import"))
- {
- if (ecore_file_app_installed("scrot"))
- {
- ci->use_import = 0;
- ci->use_scrot = 1;
- }
- else
- {
- ci->use_import = 1;
- ci->use_scrot = 0;
- }
- }
- else if (ecore_file_app_installed("scrot"))
- {
- ci->use_import = 0;
- ci->use_scrot = 1;
- }
- ci->location = evas_stringshare_add(e_user_homedir_get());
- ci->filename = evas_stringshare_add("screenshot");
- ci->import.use_img_border = 1;
- ci->import.use_dither = 1;
- ci->import.use_frame = 1;
- ci->import.use_mono = 0;
- ci->import.use_window = 0;
- ci->import.use_silent = 1;
- ci->import.use_trim = 1;
- ci->scrot.use_img_border = 1;
- ci->scrot.use_thumb = 0;
- ci->use_app = 0;
- ci->app = evas_stringshare_add("");
-
- ss_config->items = evas_list_append(ss_config->items, ci);
+ Config_Item *ci;
+
+ ss_config = E_NEW(Config, 1);
+ ci = E_NEW(Config_Item, 1);
+
+ ci->id = evas_stringshare_add("0");
+ ci->delay_time = 60.0;
+ if (ecore_file_app_installed("import"))
+ {
+ if (ecore_file_app_installed("scrot"))
+ {
+ ci->use_import = 0;
+ ci->use_scrot = 1;
+ }
+ else
+ {
+ ci->use_import = 1;
+ ci->use_scrot = 0;
+ }
+ }
+ else if (ecore_file_app_installed("scrot"))
+ {
+ ci->use_import = 0;
+ ci->use_scrot = 1;
+ }
+ ci->location = evas_stringshare_add(e_user_homedir_get());
+ ci->filename = evas_stringshare_add("screenshot");
+ ci->import.use_img_border = 1;
+ ci->import.use_dither = 1;
+ ci->import.use_frame = 1;
+ ci->import.use_mono = 0;
+ ci->import.use_window = 0;
+ ci->import.use_silent = 1;
+ ci->import.use_trim = 1;
+ ci->scrot.use_img_border = 1;
+ ci->scrot.use_thumb = 0;
+ ci->use_app = 0;
+ ci->app = evas_stringshare_add("");
+
+ ss_config->items = evas_list_append(ss_config->items, ci);
}
-
+
ss_config->module = m;
e_gadcon_provider_register(&_gc_class);
return 1;
}
EAPI int
-e_modapi_shutdown(E_Module *m)
+e_modapi_shutdown(E_Module *m)
{
ss_config->module = NULL;
e_gadcon_provider_unregister(&_gc_class);
-
+
if (ss_config->config_dialog)
- e_object_del(E_OBJECT(ss_config->config_dialog));
+ e_object_del(E_OBJECT(ss_config->config_dialog));
if (ss_config->menu)
{
- e_menu_post_deactivate_callback_set(ss_config->menu, NULL, NULL);
- e_object_del(E_OBJECT(ss_config->menu));
- ss_config->menu = NULL;
+ e_menu_post_deactivate_callback_set(ss_config->menu, NULL, NULL);
+ e_object_del(E_OBJECT(ss_config->menu));
+ ss_config->menu = NULL;
}
if (ss_config->exe_exit_handler)
- ecore_event_handler_del(ss_config->exe_exit_handler);
-
- while (ss_config->items)
- {
- Config_Item *ci;
-
- ci = ss_config->items->data;
- if (ci->id) evas_stringshare_del(ci->id);
- if (ci->location) evas_stringshare_del(ci->location);
- if (ci->filename) evas_stringshare_del(ci->filename);
- if (ci->app) evas_stringshare_del(ci->app);
- ss_config->items = evas_list_remove_list(ss_config->items,
ss_config->items);
- free(ci);
+ ecore_event_handler_del(ss_config->exe_exit_handler);
+
+ while (ss_config->items)
+ {
+ Config_Item *ci;
+
+ ci = ss_config->items->data;
+ if (ci->id)
+ evas_stringshare_del(ci->id);
+ if (ci->location)
+ evas_stringshare_del(ci->location);
+ if (ci->filename)
+ evas_stringshare_del(ci->filename);
+ if (ci->app)
+ evas_stringshare_del(ci->app);
+ ss_config->items = evas_list_remove_list(ss_config->items,
ss_config->items);
+ free(ci);
}
free(ss_config);
ss_config = NULL;
@@ -378,69 +381,70 @@
}
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 = ss_config->instances; l; l = l->next)
+
+ for (l = ss_config->instances; l; l = l->next)
{
- Instance *inst;
- Config_Item *ci;
-
- inst = l->data;
- ci = _ss_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 = _ss_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.screenshot", conf_edd, ss_config);
return 1;
}
EAPI int
-e_modapi_about(E_Module *m)
+e_modapi_about(E_Module *m)
{
- e_module_dialog_show(D_("Enlightenment Screenshot Module"),
- D_("This module is used to take screenshots"));
+ e_module_dialog_show(D_("Enlightenment Screenshot Module"), D_("This module
is used to take screenshots"));
return 1;
}
static Screenshot *
-_ss_new(Evas *evas)
+_ss_new(Evas *evas)
{
Screenshot *ss;
Evas_Object *o;
char buf[4096];
-
+
ss = E_NEW(Screenshot, 1);
+
ss->ss_obj = edje_object_add(evas);
-
+
snprintf(buf, sizeof(buf), "%s/screenshot.edj",
e_module_dir_get(ss_config->module));
if (!e_theme_edje_object_set(ss->ss_obj, "base/theme/modules/screenshot",
"modules/screenshot/main"))
- edje_object_file_set(ss->ss_obj, buf, "modules/screenshot/main");
+ edje_object_file_set(ss->ss_obj, buf, "modules/screenshot/main");
evas_object_show(ss->ss_obj);
return ss;
}
-static void
-_ss_free(Screenshot *ss)
+static void
+_ss_free(Screenshot *ss)
{
evas_object_del(ss->ss_obj);
free(ss);
}
-static void
-_ss_handle_mouse_down(Instance *inst)
+static void
+_ss_handle_mouse_down(Instance *inst)
{
Edje_Message_Int_Set *msg;
char buf[1024];
@@ -448,107 +452,115 @@
Config_Item *ci;
if (inst->exe)
- return;
-
+ return;
+
ci = _ss_config_item_get(inst->gcc->id);
-
- if (ci->use_import == 1)
+
+ if (ci->use_import == 1)
{
- cmd = strdup("import");
- opt = _get_import_options(ci);
+ cmd = strdup("import");
+ opt = _get_import_options(ci);
}
- else if (ci->use_scrot == 1)
+ else if (ci->use_scrot == 1)
{
- cmd = strdup("scrot");
- opt = _get_scrot_options(ci);
+ cmd = strdup("scrot");
+ opt = _get_scrot_options(ci);
}
- else
+ else
{
- e_module_dialog_show(D_("Enlightenment Screenshot Module"),
- D_("Please install either ImageMagick or Scrot for
taking screenshots."));
- return;
+ e_module_dialog_show(D_("Enlightenment Screenshot Module"),
+ D_("Please install either ImageMagick or Scrot
for taking screenshots."));
+ return;
}
-
+
f = _get_filename(ci);
- if (!f)
- snprintf(buf, sizeof(buf), "%s %s", cmd, opt);
+ if (!f)
+ snprintf(buf, sizeof(buf), "%s %s", cmd, opt);
else
- snprintf(buf, sizeof(buf), "%s %s %s", cmd, opt, f);
+ snprintf(buf, sizeof(buf), "%s %s %s", cmd, opt, f);
inst->filename = evas_stringshare_add(f);
- ss_config->exe_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
- _ss_exe_cb_exit,
NULL);
+ ss_config->exe_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_ss_exe_cb_exit, NULL);
if (ci->delay_time > 0)
{
- msg = malloc(sizeof(Edje_Message_Int_Set) + 1 * sizeof(int));
- msg->count = 1;
- msg->val[0] = ci->delay_time - 1;
- edje_object_message_send(inst->ss->ss_obj, EDJE_MESSAGE_INT_SET, 1,
msg);
- free(msg);
+ msg = malloc(sizeof(Edje_Message_Int_Set) + 1 * sizeof(int));
+ msg->count = 1;
+ msg->val[0] = ci->delay_time - 1;
+ edje_object_message_send(inst->ss->ss_obj, EDJE_MESSAGE_INT_SET, 1,
msg);
+ free(msg);
}
inst->exe = ecore_exe_run(buf, inst);
}
char *
-_get_import_options(Config_Item *ci)
+_get_import_options(Config_Item *ci)
{
char *opt;
char buf[1024];
- char *opts[8] = {'\0','\0','\0','\0','\0','\0','\0','\0'};
+ char *opts[8] = { '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0' };
- if (ci->import.use_img_border) opts[0] = strdup("-border");
- if (ci->import.use_dither) opts[1] = strdup("-dither");
- if (ci->import.use_frame) opts[2] = strdup("-frame");
- if (ci->import.use_mono) opts[3] = strdup("-mono");
- if (ci->import.use_silent) opts[4] = strdup("-silent");
- if (ci->import.use_trim) opts[5] = strdup("-trim");
- if (!ci->import.use_window) opts[6] = strdup("-window root");
- if (ci->delay_time > 0)
+ if (ci->import.use_img_border)
+ opts[0] = strdup("-border");
+ if (ci->import.use_dither)
+ opts[1] = strdup("-dither");
+ if (ci->import.use_frame)
+ opts[2] = strdup("-frame");
+ if (ci->import.use_mono)
+ opts[3] = strdup("-mono");
+ if (ci->import.use_silent)
+ opts[4] = strdup("-silent");
+ if (ci->import.use_trim)
+ opts[5] = strdup("-trim");
+ if (!ci->import.use_window)
+ opts[6] = strdup("-window root");
+ if (ci->delay_time > 0)
{
- snprintf(buf, sizeof(buf), "-pause %.0f", ci->delay_time);
- opts[7] = strdup(buf);
+ snprintf(buf, sizeof(buf), "-pause %.0f", ci->delay_time);
+ opts[7] = strdup(buf);
}
opt = _parse_options(opts);
return strdup(opt);
}
char *
-_get_scrot_options(Config_Item *ci)
+_get_scrot_options(Config_Item *ci)
{
char *opt;
char buf[1024];
- char *opts[8] = {'\0','\0','\0','\0','\0','\0','\0','\0'};
+ char *opts[8] = { '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0' };
- if (ci->scrot.use_img_border) opts[0] = strdup("--border");
- if (ci->scrot.use_thumb) opts[1] = strdup("--thumb 25");
- if (ci->delay_time > 0)
+ if (ci->scrot.use_img_border)
+ opts[0] = strdup("--border");
+ if (ci->scrot.use_thumb)
+ opts[1] = strdup("--thumb 25");
+ if (ci->delay_time > 0)
{
- snprintf(buf, sizeof(buf), "--delay %.0f", ci->delay_time);
- opts[2] = strdup(buf);
+ snprintf(buf, sizeof(buf), "--delay %.0f", ci->delay_time);
+ opts[2] = strdup(buf);
}
opt = _parse_options(opts);
return strdup(opt);
}
char *
-_parse_options(char **opts)
+_parse_options(char **opts)
{
int i, j;
char buf[1024];
-
+
j = 0;
- for (i = 0; i <= 7; i++)
+ for (i = 0; i <= 7; i++)
{
- if (opts[i] != '\0')
- {
- if (j == 0)
- {
- snprintf(buf, sizeof(buf), "%s", opts[i]);
- j++;
- }
- else
- snprintf(buf, sizeof(buf), "%s %s", strdup(buf), opts[i]);
- }
+ if (opts[i] != '\0')
+ {
+ if (j == 0)
+ {
+ snprintf(buf, sizeof(buf), "%s", opts[i]);
+ j++;
+ }
+ else
+ snprintf(buf, sizeof(buf), "%s %s", strdup(buf), opts[i]);
+ }
}
return strdup(buf);
}
@@ -578,32 +590,32 @@
}
else
{
- if (ecore_file_is_dir(ci->location))
- {
- fl = ecore_file_ls(ci->location);
- ecore_list_goto_first(fl);
- while ((file = ecore_list_next(fl)) != NULL)
- {
- x = ecore_file_strip_ext(file);
- if (!x)
- {
- if (strstr(file, ci->filename))
- c++;
- }
- else
- {
- if (strstr(x, ci->filename))
- c++;
- }
- }
- if (fl)
- ecore_list_destroy(fl);
- if (c == 0)
- c = 1;
- else
- c++;
- snprintf(buff, sizeof(buff), "%s/%s%i.png", strdup(ci->location),
strdup(ci->filename), c);
- }
+ if (ecore_file_is_dir(ci->location))
+ {
+ fl = ecore_file_ls(ci->location);
+ ecore_list_goto_first(fl);
+ while ((file = ecore_list_next(fl)) != NULL)
+ {
+ x = ecore_file_strip_ext(file);
+ if (!x)
+ {
+ if (strstr(file, ci->filename))
+ c++;
+ }
+ else
+ {
+ if (strstr(x, ci->filename))
+ c++;
+ }
+ }
+ if (fl)
+ ecore_list_destroy(fl);
+ if (c == 0)
+ c = 1;
+ else
+ c++;
+ snprintf(buff, sizeof(buff), "%s/%s%i.png", strdup(ci->location),
strdup(ci->filename), c);
+ }
}
return strdup(buff);
}
@@ -616,26 +628,28 @@
Ecore_Exe *x;
Config_Item *ci;
char buf[4096];
-
+
ev = event;
- if (!ev->exe) return 1;
+ if (!ev->exe)
+ return 1;
x = ev->exe;
- if (!x) return 1;
+ if (!x)
+ return 1;
inst = ecore_exe_data_get(x);
x = NULL;
inst->exe = NULL;
- if (inst->filename)
- evas_stringshare_del(inst->filename);
+ if (inst->filename)
+ evas_stringshare_del(inst->filename);
if (ss_config->exe_exit_handler)
- ecore_event_handler_del(ss_config->exe_exit_handler);
-
+ ecore_event_handler_del(ss_config->exe_exit_handler);
+
ci = _ss_config_item_get(inst->gcc->id);
- if ((ci->use_app) && (ci->app != NULL))
+ if ((ci->use_app) && (ci->app != NULL))
{
- snprintf(buf, sizeof(buf), "%s %s", ci->app, inst->filename);
- x = ecore_exe_run(buf, NULL);
+ snprintf(buf, sizeof(buf), "%s %s", ci->app, inst->filename);
+ x = ecore_exe_run(buf, NULL);
}
-
+
return 0;
}
===================================================================
RCS file: /cvs/e/e_modules/screenshot/e_mod_main.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_mod_main.h 21 May 2006 15:07:31 -0000 1.13
+++ e_mod_main.h 22 May 2006 02:10:15 -0000 1.14
@@ -6,7 +6,7 @@
typedef struct _Config Config;
typedef struct _Config_Item Config_Item;
-struct _Config
+struct _Config
{
E_Module *module;
E_Config_Dialog *config_dialog;
@@ -19,7 +19,7 @@
struct _Config_Item
{
const char *id;
-
+
double delay_time;
unsigned char use_import;
unsigned char use_scrot;
@@ -28,21 +28,21 @@
int use_app;
const char *app;
struct
- {
- unsigned char use_img_border;
- unsigned char use_dither;
- unsigned char use_frame;
- unsigned char use_mono;
- unsigned char use_window;
- unsigned char use_silent;
- unsigned char use_trim;
- } import;
-
+ {
+ unsigned char use_img_border;
+ unsigned char use_dither;
+ unsigned char use_frame;
+ unsigned char use_mono;
+ unsigned char use_window;
+ unsigned char use_silent;
+ unsigned char use_trim;
+ } import;
+
struct
- {
- unsigned char use_img_border;
- unsigned char use_thumb;
- } scrot;
+ {
+ unsigned char use_img_border;
+ unsigned char use_thumb;
+ } scrot;
};
EAPI extern E_Module_Api e_modapi;
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
