'Set as background' mime handler moved to core, refactored.
* Remove 'Set as background' from conf_wallpaper and add it to e_bg together with the other code that already was handling '*.edj'. This makes more sense and will enable the action in presence of both versions of wallpaper dialog; * e_utils got pieces required by e_bg that could be used elsewhere, one is the dialog to query for options to import, the other is what really generates the conversion (import) of image->edj. * conf_wallpaper: import thing is way too messy, needs cleaning or removal. I don't care much about it as I plan to improve wallpaper2 instead. SVN revision: 44556
This commit is contained in:
Gustavo Sverzut Barbieri
parent
b1734750c9
commit
0900c11347
165
src/bin/e_bg.c
165
src/bin/e_bg.c
|
|
@ -8,6 +8,10 @@ static void _e_bg_signal(void *data, Evas_Object *obj, const char *emission, con
|
|||
static void _e_bg_event_bg_update_free(void *data, void *event);
|
||||
static int _e_bg_slide_animator(void *data);
|
||||
|
||||
static void _e_bg_image_import_dialog_done(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode);
|
||||
static void _e_bg_image_import_done(void *data, Eina_Bool ok, const char *image_path, const char *edje_path);
|
||||
static void _e_bg_handler_image_imported(void *data, const char *image_path);
|
||||
|
||||
/* local subsystem globals */
|
||||
EAPI int E_EVENT_BG_UPDATE = 0;
|
||||
static E_Fm2_Mime_Handler *bg_hdl = NULL;
|
||||
|
|
@ -27,14 +31,15 @@ struct _E_Bg_Anim_Params
|
|||
} freedom;
|
||||
};
|
||||
|
||||
struct _E_Bg_Image_Import
|
||||
struct _E_Bg_Image_Import_Handle
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
struct {
|
||||
void (*func)(void *data, const char *edje_file);
|
||||
void *data;
|
||||
} cb;
|
||||
// TODO: win and widget meat
|
||||
E_Dialog *dia;
|
||||
E_Util_Image_Import_Handle *importer;
|
||||
Eina_Bool canceled:1;
|
||||
};
|
||||
|
||||
/* externally accessible functions */
|
||||
|
|
@ -52,9 +57,8 @@ e_bg_init(void)
|
|||
if (bg_hdl)
|
||||
{
|
||||
e_fm2_mime_handler_glob_add(bg_hdl, "*.edj");
|
||||
// TODO:
|
||||
//e_fm2_mime_handler_mime_add(bg_hdl, "image/png");
|
||||
//e_fm2_mime_handler_mime_add(bg_hdl, "image/jpeg");
|
||||
e_fm2_mime_handler_mime_add(bg_hdl, "image/png");
|
||||
e_fm2_mime_handler_mime_add(bg_hdl, "image/jpeg");
|
||||
}
|
||||
|
||||
/* Register files in use */
|
||||
|
|
@ -551,31 +555,79 @@ _e_bg_file_edje_check(const char *path)
|
|||
* User can cancel operation at any time, and in this case callback is
|
||||
* called with @c NULL as second parameter.
|
||||
*
|
||||
* The operation can be cancelled by application/module as well using
|
||||
* e_object_del(). Even in this case the callback is called so user
|
||||
* The operation can be canceled by application/module as well using
|
||||
* e_bg_image_import_cancel(). Even in this case the callback is called so user
|
||||
* can free possibly allocated data.
|
||||
*
|
||||
* @param image_file source file to use, must be supported by Evas.
|
||||
* @param cb callback to call when import process is done. The first
|
||||
* argument is the given data, while the second is the path to
|
||||
* the imported background file (edje) that can be used with
|
||||
* e_bg_add() or e_bg_default_set(). Note that if this argument
|
||||
* is @c NULL, then the import process was cancelled!
|
||||
* e_bg_add() or e_bg_default_set(). Note that if @a edje_file
|
||||
* is @c NULL, then the import process was canceled!
|
||||
* This function is @b always called and after it returns
|
||||
* E_Bg_Image_Import is deleted.
|
||||
* E_Bg_Image_Import_Handle is deleted.
|
||||
* @param data pointer to data to be given to callback.
|
||||
*
|
||||
* @return E_Object that handles the import process. It will die
|
||||
* automatically when user cancels the process or when code
|
||||
* automatically calls e_object_del(). Before dying, callback
|
||||
* @return handle to the import process. It will die automatically
|
||||
* when user cancels the process or when code automatically
|
||||
* calls e_bg_image_import_cancel(). Before dying, callback
|
||||
* will always be called.
|
||||
*/
|
||||
EAPI E_Bg_Image_Import *
|
||||
e_bg_image_import_new(const char *image_file, void (*cb)(void *data, const char *edje_file), const void *data)
|
||||
EAPI E_Bg_Image_Import_Handle *
|
||||
e_bg_image_import(const char *image_file, void (*cb)(void *data, const char *edje_file), const void *data)
|
||||
{
|
||||
// TODO: create win and process similar to e_int_config_wallpaper_import()
|
||||
// TODO: and remove e_int_config_wallpaper_import.[ch]
|
||||
return NULL;
|
||||
E_Bg_Image_Import_Handle *handle;
|
||||
|
||||
if (!image_file) return NULL;
|
||||
if (!cb) return NULL;
|
||||
|
||||
handle = E_NEW(E_Bg_Image_Import_Handle, 1);
|
||||
if (!handle) return NULL;
|
||||
handle->cb.func = cb;
|
||||
handle->cb.data = (void *)data;
|
||||
|
||||
handle->dia = e_util_image_import_settings_new
|
||||
(image_file, _e_bg_image_import_dialog_done, handle);
|
||||
if (!handle->dia)
|
||||
{
|
||||
free(handle);
|
||||
return NULL;
|
||||
}
|
||||
e_dialog_show(handle->dia);
|
||||
|
||||
return handle;
|
||||
}
|
||||
|
||||
/**
|
||||
* Cancels previously started import process.
|
||||
*
|
||||
* Note that his handle will be deleted when process import, so don't
|
||||
* call it after your callback is called!
|
||||
*/
|
||||
EAPI void
|
||||
e_bg_image_import_cancel(E_Bg_Image_Import_Handle *handle)
|
||||
{
|
||||
if (!handle) return;
|
||||
|
||||
handle->canceled = EINA_TRUE;
|
||||
|
||||
if (handle->cb.func)
|
||||
{
|
||||
handle->cb.func(handle->cb.data, NULL);
|
||||
handle->cb.func = NULL;
|
||||
}
|
||||
if (handle->dia)
|
||||
{
|
||||
e_object_del(E_OBJECT(handle->dia));
|
||||
handle->dia = NULL;
|
||||
}
|
||||
else if (handle->importer)
|
||||
{
|
||||
e_util_image_import_cancel(handle->importer);
|
||||
handle->importer = NULL;
|
||||
}
|
||||
E_FREE(handle);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -595,9 +647,10 @@ e_bg_handler_set(Evas_Object *obj __UNUSED__, const char *path, void *data __UNU
|
|||
e_bg_add(con->num, zone->num, desk->x, desk->y, path);
|
||||
e_bg_update();
|
||||
e_config_save_queue();
|
||||
return;
|
||||
}
|
||||
|
||||
e_bg_image_import_new(path, NULL, NULL);
|
||||
e_bg_image_import(path, _e_bg_handler_image_imported, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -727,3 +780,75 @@ _e_bg_slide_animator(void *data)
|
|||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void
|
||||
_e_bg_image_import_dialog_done(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode)
|
||||
{
|
||||
E_Bg_Image_Import_Handle *handle = data;
|
||||
const char *file;
|
||||
char *name;
|
||||
char buf[PATH_MAX];
|
||||
size_t used, off;
|
||||
unsigned num;
|
||||
|
||||
if (!ok) goto aborted;
|
||||
|
||||
file = ecore_file_file_get(path);
|
||||
if (!file) goto aborted;
|
||||
name = ecore_file_strip_ext(file);
|
||||
if (!name) goto aborted;
|
||||
|
||||
used = e_user_dir_snprintf(buf, sizeof(buf), "backgrounds/%s.edj", name);
|
||||
free(name);
|
||||
if (used >= sizeof(buf)) goto aborted;
|
||||
|
||||
off = used - (sizeof(".edj") - 1);
|
||||
|
||||
for (num = 0; ecore_file_exists(buf); num++)
|
||||
snprintf(buf + off, sizeof(buf) - off, "-%u.edj", num);
|
||||
|
||||
handle->importer = e_util_image_import
|
||||
(path, buf, "e/desktop/background", external, quality, mode,
|
||||
_e_bg_image_import_done, handle);
|
||||
if (!handle->importer) goto aborted;
|
||||
|
||||
return;
|
||||
|
||||
aborted:
|
||||
if (handle->cb.func)
|
||||
{
|
||||
handle->cb.func(handle->cb.data, NULL);
|
||||
handle->cb.func = NULL;
|
||||
}
|
||||
if (!handle->canceled) E_FREE(handle);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_bg_image_import_done(void *data, Eina_Bool ok, const char *image_path __UNUSED__, const char *edje_path)
|
||||
{
|
||||
E_Bg_Image_Import_Handle *handle = data;
|
||||
|
||||
if (!ok) edje_path = NULL;
|
||||
|
||||
if (handle->cb.func)
|
||||
{
|
||||
handle->cb.func(handle->cb.data, edje_path);
|
||||
handle->cb.func = NULL;
|
||||
}
|
||||
|
||||
if (!handle->canceled) E_FREE(handle);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_bg_handler_image_imported(void *data __UNUSED__, const char *image_path)
|
||||
{
|
||||
E_Container *con = e_container_current_get(e_manager_current_get());
|
||||
E_Zone *zone = e_zone_current_get(con);
|
||||
E_Desk *desk = e_desk_current_get(zone);
|
||||
|
||||
if (!image_path) return;
|
||||
|
||||
e_bg_add(con->num, zone->num, desk->x, desk->y, image_path);
|
||||
e_bg_update();
|
||||
e_config_save_queue();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ typedef enum {
|
|||
|
||||
typedef struct _E_Event_Bg_Update E_Event_Bg_Update;
|
||||
|
||||
typedef struct _E_Bg_Image_Import E_Bg_Image_Import;
|
||||
typedef struct _E_Bg_Image_Import_Handle E_Bg_Image_Import_Handle;
|
||||
|
||||
#else
|
||||
#ifndef E_BG_H
|
||||
|
|
@ -42,7 +42,8 @@ EAPI void e_bg_update(void);
|
|||
EAPI void e_bg_handler_set(Evas_Object *obj, const char *path, void *data);
|
||||
EAPI int e_bg_handler_test(Evas_Object *obj, const char *path, void *data);
|
||||
|
||||
EAPI E_Bg_Image_Import *e_bg_image_import_new(const char *image_file, void (*cb)(void *data, const char *edje_file), const void *data);
|
||||
EAPI E_Bg_Image_Import_Handle *e_bg_image_import_new(const char *image_file, void (*cb)(void *data, const char *edje_file), const void *data);
|
||||
EAPI void e_bg_image_import_cancel(E_Bg_Image_Import_Handle *handle);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ EAPI int evil = 0;
|
|||
EAPI int starting = 1;
|
||||
EAPI int stopping = 0;
|
||||
|
||||
typedef struct _E_Util_Fake_Mouse_Up_Info E_Util_Fake_Mouse_Up_Info;
|
||||
typedef struct _E_Util_Fake_Mouse_Up_Info E_Util_Fake_Mouse_Up_Info;
|
||||
typedef struct _E_Util_Image_Import_Settings E_Util_Image_Import_Settings;
|
||||
|
||||
struct _E_Util_Fake_Mouse_Up_Info
|
||||
{
|
||||
|
|
@ -25,10 +26,43 @@ struct _E_Util_Fake_Mouse_Up_Info
|
|||
int button;
|
||||
};
|
||||
|
||||
struct _E_Util_Image_Import_Settings
|
||||
{
|
||||
E_Dialog *dia;
|
||||
struct {
|
||||
void (*func)(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode);
|
||||
void *data;
|
||||
} cb;
|
||||
const char *path;
|
||||
int quality;
|
||||
int external;
|
||||
int mode;
|
||||
Eina_Bool ok;
|
||||
};
|
||||
|
||||
struct _E_Util_Image_Import_Handle
|
||||
{
|
||||
Ecore_Exe *exe;
|
||||
Ecore_Event_Handler *handler;
|
||||
struct {
|
||||
void (*func)(void *data, Eina_Bool ok, const char *image_path, const char *edje_path);
|
||||
void *data;
|
||||
} cb;
|
||||
struct {
|
||||
const char *image, *edje, *temp;
|
||||
} path;
|
||||
};
|
||||
|
||||
/* local subsystem functions */
|
||||
static int _e_util_cb_delayed_del(void *data);
|
||||
static int _e_util_wakeup_cb(void *data);
|
||||
|
||||
static void _e_util_image_import_settings_do(void *data, E_Dialog *dia);
|
||||
static void _e_util_image_import_settings_del(void *obj);
|
||||
|
||||
static int _e_util_image_import_exit(void *data, int type __UNUSED__, void *event);
|
||||
static void _e_util_image_import_handle_free(E_Util_Image_Import_Handle *handle);
|
||||
|
||||
/* local subsystem globals */
|
||||
static Ecore_Timer *_e_util_dummy_timer = NULL;
|
||||
|
||||
|
|
@ -737,18 +771,18 @@ e_util_shell_env_path_eval(char *path)
|
|||
s = alloca(v2 - v1);
|
||||
strncpy(s, v1 + 1, v2 - v1 - 1);
|
||||
s[v2 - v1 - 1] = 0;
|
||||
if (strncmp(s, "XDG", 3))
|
||||
if (strncmp(s, "XDG", 3))
|
||||
v = getenv(s);
|
||||
else
|
||||
else
|
||||
{
|
||||
if (!strcmp(s, "XDG_CONFIG_HOME"))
|
||||
if (!strcmp(s, "XDG_CONFIG_HOME"))
|
||||
v = (char *)efreet_config_home_get();
|
||||
else if (!strcmp(s, "XDG_CACHE_HOME"))
|
||||
else if (!strcmp(s, "XDG_CACHE_HOME"))
|
||||
v = (char *)efreet_cache_home_get();
|
||||
else if (!strcmp(s, "XDG_DATA_HOME"))
|
||||
else if (!strcmp(s, "XDG_DATA_HOME"))
|
||||
v = (char *)efreet_data_home_get();
|
||||
}
|
||||
|
||||
|
||||
if (v)
|
||||
{
|
||||
vp = v;
|
||||
|
|
@ -1020,7 +1054,7 @@ e_util_winid_str_get(Ecore_X_Window win)
|
|||
const char *vals = "qWeRtYuIoP5-$&<~";
|
||||
static char id[9];
|
||||
unsigned int val;
|
||||
|
||||
|
||||
val = (unsigned int)win;
|
||||
id[0] = vals[(val >> 28) & 0xf];
|
||||
id[1] = vals[(val >> 24) & 0xf];
|
||||
|
|
@ -1052,12 +1086,12 @@ EAPI void
|
|||
e_util_win_auto_resize_fill(E_Win *win)
|
||||
{
|
||||
E_Zone *zone = NULL;
|
||||
|
||||
|
||||
if (win->border)
|
||||
zone = win->border->zone;
|
||||
if ((!zone) && (win->container))
|
||||
zone = e_util_zone_current_get(win->container->manager);
|
||||
|
||||
|
||||
if (zone)
|
||||
{
|
||||
int w, h;
|
||||
|
|
@ -1073,7 +1107,7 @@ e_util_win_auto_resize_fill(E_Win *win)
|
|||
EAPI void
|
||||
e_util_zone_edge_toggle(E_Zone_Edge edge, Eina_Bool show)
|
||||
{
|
||||
|
||||
|
||||
Eina_List *l, *ll, *lll;
|
||||
E_Manager *man;
|
||||
E_Container *con;
|
||||
|
|
@ -1166,6 +1200,288 @@ e_util_zone_edge_toggle(E_Zone_Edge edge, Eina_Bool show)
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new dialog to query image import settings, report results.
|
||||
*
|
||||
* @param path may be used to display live preview (not used so far).
|
||||
* @param cb function to call before exit. Last parameter is mode of
|
||||
* image filling.
|
||||
* @param data extra data to give to @a cb as first argument.
|
||||
*
|
||||
* @return newly allocated window on success, @c NULL on failure. If
|
||||
* @c NULL is returned, then callback is never called!
|
||||
*/
|
||||
EAPI E_Dialog *
|
||||
e_util_image_import_settings_new(const char *path, void (*cb)(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode), const void *data)
|
||||
{
|
||||
Evas *evas;
|
||||
E_Util_Image_Import_Settings *ctxt;
|
||||
Evas_Object *vlist, *frame, *radio, *check, *slider;
|
||||
E_Radio_Group *rg;
|
||||
Evas_Coord w, h;
|
||||
|
||||
if (!path) return NULL;
|
||||
if (!cb) return NULL;
|
||||
|
||||
ctxt = E_NEW(E_Util_Image_Import_Settings, 1);
|
||||
if (!ctxt) return NULL;
|
||||
|
||||
ctxt->dia = e_dialog_new(NULL, "E", "_image_import_settings");
|
||||
if (!ctxt->dia)
|
||||
{
|
||||
E_FREE(ctxt);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ctxt->dia->data = ctxt;
|
||||
|
||||
e_object_del_attach_func_set
|
||||
(E_OBJECT(ctxt->dia), _e_util_image_import_settings_del);
|
||||
e_dialog_title_set(ctxt->dia, _("Image Import Settings"));
|
||||
e_dialog_border_icon_set(ctxt->dia, "dialog-ask");
|
||||
|
||||
e_dialog_button_add
|
||||
(ctxt->dia, _("Import"), NULL, _e_util_image_import_settings_do, ctxt);
|
||||
e_dialog_button_add
|
||||
(ctxt->dia, _("Cancel"), NULL, NULL, ctxt);
|
||||
e_dialog_button_focus_num(ctxt->dia, 0);
|
||||
|
||||
ctxt->cb.func = cb;
|
||||
ctxt->cb.data = (void *)data;
|
||||
ctxt->path = eina_stringshare_add(path);
|
||||
ctxt->quality = 90;
|
||||
ctxt->ok = EINA_FALSE;
|
||||
ctxt->external = EINA_FALSE;
|
||||
ctxt->mode = E_IMAGE_IMPORT_STRETCH;
|
||||
|
||||
evas = e_win_evas_get(ctxt->dia->win);
|
||||
|
||||
vlist = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
frame = e_widget_frametable_add(evas, _("Fill and Stretch Options"), 1);
|
||||
rg = e_widget_radio_group_new(&ctxt->mode);
|
||||
|
||||
#define RD(lbl, icon, val, col, row) \
|
||||
radio = e_widget_radio_icon_add \
|
||||
(evas, lbl, "enlightenment/wallpaper_"icon, 24, 24, val, rg); \
|
||||
e_widget_frametable_object_append(frame, radio, col, row, 1, 1, 1, 1, 0, 0)
|
||||
|
||||
RD(_("Stretch"), "stretch", E_IMAGE_IMPORT_STRETCH, 0, 0);
|
||||
RD(_("Center"), "center", E_IMAGE_IMPORT_CENTER, 1, 0);
|
||||
RD(_("Title"), "tile", E_IMAGE_IMPORT_TILE, 2, 0);
|
||||
RD(_("Within"), "scale_aspect_in", E_IMAGE_IMPORT_SCALE_ASPECT_IN, 3, 0);
|
||||
RD(_("Fill"), "scale_aspect_out", E_IMAGE_IMPORT_SCALE_ASPECT_OUT, 4, 0);
|
||||
#undef RD
|
||||
|
||||
e_widget_list_object_append(vlist, frame, 1, 1, 0.5);
|
||||
|
||||
frame = e_widget_frametable_add(evas, _("File Quality"), 0);
|
||||
|
||||
check = e_widget_check_add(evas, _("Use original file"), &ctxt->external);
|
||||
e_widget_frametable_object_append(frame, check, 0, 0, 1, 1, 1, 0, 1, 0);
|
||||
|
||||
slider = e_widget_slider_add
|
||||
(evas, 1, 0, _("%3.0f%%"), 0.0, 100.0, 1.0, 0, NULL, &ctxt->quality, 150);
|
||||
e_widget_frametable_object_append(frame, slider, 0, 1, 1, 1, 1, 0, 1, 0);
|
||||
|
||||
e_widget_list_object_append(vlist, frame, 1, 1, 0.5);
|
||||
|
||||
e_widget_size_min_get(vlist, &w, &h);
|
||||
w += 50;
|
||||
e_dialog_content_set(ctxt->dia, vlist, w, h);
|
||||
|
||||
e_win_centered_set(ctxt->dia->win, 1);
|
||||
|
||||
return ctxt->dia;
|
||||
}
|
||||
|
||||
/**
|
||||
* Request given image to be imported as an edje file.
|
||||
*
|
||||
* This is useful to convert images to icons and background.
|
||||
*
|
||||
* @param image_path path to source image to use.
|
||||
* @param edje_path path to destination edje to generate.
|
||||
* @param external if @c EINA_TRUE, then it will not embed image into edje,
|
||||
* but reference the original @a image_path.
|
||||
* @param quality quality value from 0-100.
|
||||
* @param mode how to resize image with edje.
|
||||
* @param cb function to callback when process finishes.
|
||||
* @param data extra context to give to callback.
|
||||
*
|
||||
* @return handle so one can cancel the operation. This handle will be
|
||||
* invalid after @a cb is called!
|
||||
*/
|
||||
EAPI E_Util_Image_Import_Handle *
|
||||
e_util_image_import(const char *image_path, const char *edje_path, const char *edje_group, Eina_Bool external, int quality, E_Image_Import_Mode mode, void (*cb)(void *data, Eina_Bool ok, const char *image_path, const char *edje_path), const void *data)
|
||||
{
|
||||
static const char *tmpdir = NULL;
|
||||
E_Util_Image_Import_Handle *handle;
|
||||
Evas_Imaging_Image *img;
|
||||
int fd, w, h;
|
||||
const char *escaped_file;
|
||||
char cmd[PATH_MAX * 2], tmpn[PATH_MAX];
|
||||
FILE *f;
|
||||
|
||||
if (!image_path) return NULL;
|
||||
if (!edje_path) return NULL;
|
||||
if (!edje_group) return NULL;
|
||||
if (!cb) return NULL;
|
||||
|
||||
img = evas_imaging_image_load(image_path, NULL);
|
||||
if (!img)
|
||||
{
|
||||
printf("Error loading image '%s'\n", image_path);
|
||||
return NULL;
|
||||
}
|
||||
evas_imaging_image_size_get(img, &w, &h);
|
||||
evas_imaging_image_free(img);
|
||||
|
||||
if (!tmpdir)
|
||||
{
|
||||
tmpdir = getenv("TMPDIR");
|
||||
if (!tmpdir) tmpdir = "/tmp";
|
||||
}
|
||||
snprintf(tmpn, sizeof(tmpn), "%s/e_util_image_import-XXXXXX", tmpdir);
|
||||
fd = mkstemp(tmpn);
|
||||
if (fd < 0)
|
||||
{
|
||||
printf("Error Creating tmp file: %s\n", strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
f = fdopen(fd, "wb");
|
||||
if (!f)
|
||||
{
|
||||
printf("Cannot open %s for writing\n", tmpn);
|
||||
close(fd);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
escaped_file = e_util_filename_escape(image_path); // watch out ret buffer!
|
||||
|
||||
fprintf(f, "images.image: \"%s\" ", escaped_file);
|
||||
if (external)
|
||||
fputs("USER", f);
|
||||
else if (quality >= 100)
|
||||
fputs("COMP", f);
|
||||
else
|
||||
fprintf(f, "LOSSY %d", (quality > 1) ? quality : 90);
|
||||
|
||||
fprintf(f,
|
||||
";\n"
|
||||
"collections {\n"
|
||||
" group {\n"
|
||||
" name: \"%s\";\n"
|
||||
" data.item: \"style\" \"%d\";\n"
|
||||
" max: %d %d;\n"
|
||||
" parts {\n",
|
||||
edje_group, mode, w, h);
|
||||
|
||||
if ((mode == E_IMAGE_IMPORT_CENTER) ||
|
||||
(mode == E_IMAGE_IMPORT_SCALE_ASPECT_IN))
|
||||
{
|
||||
fputs(" part {\n"
|
||||
" type: RECT;\n"
|
||||
" name: \"col\";\n"
|
||||
" mouse_events: 0;\n"
|
||||
" description {\n"
|
||||
" state: \"default\" 0.0;\n"
|
||||
" color: 255 255 255 255;\n"
|
||||
" }\n"
|
||||
" }\n",
|
||||
f);
|
||||
}
|
||||
|
||||
fprintf(f,
|
||||
" part {\n"
|
||||
" type: IMAGE;\n"
|
||||
" name: \"image\";\n"
|
||||
" mouse_events: 0;\n"
|
||||
" description {\n"
|
||||
" state: \"default\" 0.0;\n"
|
||||
" image {\n"
|
||||
" normal: \"%s\";\n"
|
||||
" scale_hint: STATIC;\n"
|
||||
" }\n",
|
||||
escaped_file);
|
||||
|
||||
if (mode == E_IMAGE_IMPORT_TILE)
|
||||
{
|
||||
fprintf(f,
|
||||
" fill {\n"
|
||||
" size {\n"
|
||||
" relative: 0.0 0.0;\n"
|
||||
" offset: %d %d;\n"
|
||||
" }\n"
|
||||
" }\n",
|
||||
w, h);
|
||||
}
|
||||
else if (mode == E_IMAGE_IMPORT_CENTER)
|
||||
{
|
||||
fprintf(f,
|
||||
" min: %d %d;\n"
|
||||
" max: %d %d;\n",
|
||||
w, h, w, h);
|
||||
|
||||
}
|
||||
else if ((mode == E_IMAGE_IMPORT_SCALE_ASPECT_IN) ||
|
||||
(mode == E_IMAGE_IMPORT_SCALE_ASPECT_OUT))
|
||||
{
|
||||
const char *locale = e_intl_language_get();
|
||||
double aspect = (double)w / (double)h;
|
||||
setlocale(LC_NUMERIC, "C");
|
||||
fprintf(f,
|
||||
" aspect: %1.9f %1.9f;\n"
|
||||
" aspect_preference: %s;\n",
|
||||
aspect, aspect,
|
||||
(mode == E_IMAGE_IMPORT_SCALE_ASPECT_IN) ? "BOTH" : "NONE");
|
||||
setlocale(LC_NUMERIC, locale);
|
||||
}
|
||||
|
||||
fputs(" }\n" // description
|
||||
" }\n" // part
|
||||
" }\n" // parts
|
||||
" }\n" // group
|
||||
"}\n", // collections
|
||||
f);
|
||||
|
||||
fclose(f); // fd gets closed here
|
||||
|
||||
snprintf(cmd, sizeof(cmd), "edje_cc %s %s",
|
||||
tmpn, e_util_filename_escape(edje_path));
|
||||
|
||||
handle = E_NEW(E_Util_Image_Import_Handle, 1);
|
||||
if (!handle)
|
||||
{
|
||||
unlink(tmpn);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
handle->cb.func = cb;
|
||||
handle->cb.data = (void *)data;
|
||||
handle->path.image = eina_stringshare_add(image_path);
|
||||
handle->path.edje = eina_stringshare_add(edje_path);
|
||||
handle->path.temp = eina_stringshare_add(tmpn);
|
||||
handle->handler = ecore_event_handler_add
|
||||
(ECORE_EXE_EVENT_DEL, _e_util_image_import_exit, handle);
|
||||
handle->exe = ecore_exe_run(cmd, NULL);
|
||||
if (!handle->exe)
|
||||
{
|
||||
_e_util_image_import_handle_free(handle);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return handle;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_util_image_import_cancel(E_Util_Image_Import_Handle *handle)
|
||||
{
|
||||
if (!handle) return;
|
||||
ecore_exe_kill(handle->exe);
|
||||
}
|
||||
|
||||
/* local subsystem functions */
|
||||
static int
|
||||
_e_util_cb_delayed_del(void *data)
|
||||
|
|
@ -1181,4 +1497,55 @@ _e_util_wakeup_cb(void *data)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
_e_util_image_import_settings_do(void *data, E_Dialog *dia)
|
||||
{
|
||||
E_Util_Image_Import_Settings *ctxt = data;
|
||||
ctxt->ok = EINA_TRUE;
|
||||
e_util_defer_object_del(E_OBJECT(dia));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_util_image_import_settings_del(void *obj)
|
||||
{
|
||||
E_Dialog *dia = obj;
|
||||
E_Util_Image_Import_Settings *ctxt = dia->data;
|
||||
|
||||
ctxt->cb.func
|
||||
(ctxt->cb.data, ctxt->path,
|
||||
ctxt->ok, ctxt->external, ctxt->quality, ctxt->mode);
|
||||
|
||||
eina_stringshare_del(ctxt->path);
|
||||
E_FREE(ctxt);
|
||||
}
|
||||
|
||||
static int
|
||||
_e_util_image_import_exit(void *data, int type __UNUSED__, void *event)
|
||||
{
|
||||
E_Util_Image_Import_Handle *handle = data;
|
||||
Ecore_Exe_Event_Del *ev = event;
|
||||
Eina_Bool ok;
|
||||
|
||||
if (ev->exe != handle->exe) return 1;
|
||||
|
||||
ok = (ev->exit_code == 0);
|
||||
|
||||
if (!ok) unlink(handle->path.edje);
|
||||
handle->cb.func(handle->cb.data, ok, handle->path.image, handle->path.edje);
|
||||
|
||||
_e_util_image_import_handle_free(handle);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
_e_util_image_import_handle_free(E_Util_Image_Import_Handle *handle)
|
||||
{
|
||||
unlink(handle->path.temp);
|
||||
eina_stringshare_del(handle->path.image);
|
||||
eina_stringshare_del(handle->path.edje);
|
||||
eina_stringshare_del(handle->path.temp);
|
||||
ecore_event_handler_del(handle->handler);
|
||||
E_FREE(handle);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,26 @@
|
|||
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
||||
*/
|
||||
#ifdef E_TYPEDEFS
|
||||
|
||||
typedef struct _E_Util_Image_Import_Handle E_Util_Image_Import_Handle;
|
||||
|
||||
typedef enum _E_Image_Import_Mode E_Image_Import_Mode;
|
||||
enum _E_Image_Import_Mode
|
||||
{
|
||||
E_IMAGE_IMPORT_STRETCH = 0,
|
||||
E_IMAGE_IMPORT_TILE = 1,
|
||||
E_IMAGE_IMPORT_CENTER = 2,
|
||||
E_IMAGE_IMPORT_SCALE_ASPECT_IN = 3,
|
||||
E_IMAGE_IMPORT_SCALE_ASPECT_OUT = 4
|
||||
};
|
||||
|
||||
|
||||
#else
|
||||
#ifndef E_UTILS_H
|
||||
#define E_UTILS_H
|
||||
|
||||
#define E_UTIL_IMAGE_IMPORT_SETTINGS 0xE0b0104f
|
||||
|
||||
#define e_util_dialog_show(title, args...) \
|
||||
{ \
|
||||
char __tmpbuf[4096]; \
|
||||
|
|
@ -57,6 +73,12 @@ EAPI void e_util_defer_object_del(E_Object *obj);
|
|||
EAPI const char *e_util_winid_str_get(Ecore_X_Window win);
|
||||
EAPI void e_util_win_auto_resize_fill(E_Win *win);
|
||||
EAPI void e_util_zone_edge_toggle(E_Zone_Edge edge, Eina_Bool show);
|
||||
|
||||
|
||||
|
||||
EAPI E_Dialog *e_util_image_import_settings_new(const char *path, void (*cb)(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode), const void *data);
|
||||
EAPI E_Util_Image_Import_Handle *e_util_image_import(const char *image_path, const char *edje_path, const char *edje_group, Eina_Bool external, int quality, E_Image_Import_Mode mode, void (*cb)(void *data, Eina_Bool ok, const char *image_path, const char *edje_path), const void *data);
|
||||
EAPI void e_util_image_import_cancel(E_Util_Image_Import_Handle *handle);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -164,32 +164,6 @@ e_int_config_wallpaper_web_done(E_Config_Dialog *dia)
|
|||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void *data)
|
||||
{
|
||||
const char *dev, *fpath;
|
||||
Eina_Bool r1, r2;
|
||||
|
||||
if (!path) return;
|
||||
e_fm2_path_get(obj, &dev, &fpath);
|
||||
|
||||
r1 = eina_stringshare_replace(&e_config->wallpaper_import_last_dev, dev);
|
||||
r2 = eina_stringshare_replace(&e_config->wallpaper_import_last_path, fpath);
|
||||
|
||||
if ((!r1) && (!r2)) return;
|
||||
|
||||
e_config_save_queue();
|
||||
|
||||
e_int_config_wallpaper_import(NULL, path);
|
||||
}
|
||||
|
||||
int
|
||||
e_int_config_wallpaper_handler_test(Evas_Object *obj, const char *path, void *data)
|
||||
{
|
||||
if (!path) return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void
|
||||
_cb_button_up(void *data1, void *data2)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,8 +15,5 @@ void e_int_config_wallpaper_import_done(E_Config_Dialog *dia);
|
|||
void e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia);
|
||||
void e_int_config_wallpaper_web_done(E_Config_Dialog *dia);
|
||||
|
||||
void e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void *data);
|
||||
int e_int_config_wallpaper_handler_test(Evas_Object *obj, const char *path, void *data);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ static void _e_mod_menu_add(void *data, E_Menu *m);
|
|||
|
||||
static E_Module *conf_module = NULL;
|
||||
static E_Int_Menu_Augmentation *maug = NULL;
|
||||
static E_Fm2_Mime_Handler *import_hdl = NULL;
|
||||
|
||||
/* module setup */
|
||||
EAPI E_Module_Api e_modapi =
|
||||
|
|
@ -34,17 +33,6 @@ e_modapi_init(E_Module *m)
|
|||
e_int_menus_menu_augmentation_add_sorted("config/1", _("Wallpaper"),
|
||||
_e_mod_menu_add, NULL, NULL, NULL);
|
||||
|
||||
import_hdl =
|
||||
e_fm2_mime_handler_new(_("Set As Background"),
|
||||
"preferences-desktop-wallpaper",
|
||||
e_int_config_wallpaper_handler_set, NULL,
|
||||
e_int_config_wallpaper_handler_test, NULL);
|
||||
if (import_hdl)
|
||||
{
|
||||
e_fm2_mime_handler_mime_add(import_hdl, "image/png");
|
||||
e_fm2_mime_handler_mime_add(import_hdl, "image/jpeg");
|
||||
}
|
||||
|
||||
conf_module = m;
|
||||
e_module_delayed_set(m, 1);
|
||||
return m;
|
||||
|
|
@ -67,15 +55,7 @@ e_modapi_shutdown(E_Module *m)
|
|||
e_configure_registry_category_del("internal");
|
||||
e_configure_registry_item_del("appearance/wallpaper");
|
||||
e_configure_registry_category_del("appearance");
|
||||
|
||||
if (import_hdl)
|
||||
{
|
||||
e_fm2_mime_handler_mime_del(import_hdl, "image/png");
|
||||
e_fm2_mime_handler_mime_del(import_hdl, "image/jpeg");
|
||||
e_fm2_mime_handler_free(import_hdl);
|
||||
import_hdl = NULL;
|
||||
}
|
||||
|
||||
|
||||
conf_module = NULL;
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue