vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

formatting 

SVN revision: 72691
This commit is contained in:
Mike Blumenkrantz 2012-06-22 07:28:13 +00:00
parent f715dc41fe
commit 21d37fcbbc
2 changed files with 472 additions and 464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/modules/ibar/e_mod_config.c
View File

@ -3,29 +3,29 @@
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
const char *dir; const char *dir;
int show_label, eap_label; int show_label, eap_label;
Evas_Object *tlist; Evas_Object *tlist;
Evas_Object *radio_name; Evas_Object *radio_name;
Evas_Object *radio_comment; Evas_Object *radio_comment;
Evas_Object *radio_generic; Evas_Object *radio_generic;
E_Confirm_Dialog *dialog_delete; E_Confirm_Dialog *dialog_delete;
}; };
/* Protos */ /* Protos */
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static void _cb_add(void *data, void *data2); static void _cb_add(void *data, void *data2);
static void _cb_del(void *data, void *data2); static void _cb_del(void *data, void *data2);
static void _cb_config(void *data, void *data2); static void _cb_config(void *data, void *data2);
static void _cb_entry_ok(char *text, void *data); static void _cb_entry_ok(char *text, void *data);
static void _cb_confirm_dialog_yes(void *data); static void _cb_confirm_dialog_yes(void *data);
static void _cb_confirm_dialog_destroy(void *data); static void _cb_confirm_dialog_destroy(void *data);
static void _load_tlist(E_Config_Dialog_Data *cfdata); static void _load_tlist(E_Config_Dialog_Data *cfdata);
static void _show_label_cb_change(void *data, Evas_Object *obj); static void _show_label_cb_change(void *data, Evas_Object *obj);
void void
_config_ibar_module(Config_Item *ci) _config_ibar_module(Config_Item *ci)
@ -49,9 +49,9 @@ _config_ibar_module(Config_Item *ci)
/* Create The Dialog */ /* Create The Dialog */
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
_("IBar Settings"), _("IBar Settings"),
"E", "_e_mod_ibar_config_dialog", "E", "_e_mod_ibar_config_dialog",
buf, 0, v, ci); buf, 0, v, ci);
ibar_config->config_dialog = cfd; ibar_config->config_dialog = cfd;
} }
@ -162,8 +162,8 @@ _cb_add(void *data, void *data2 __UNUSED__)
cfdata = data; cfdata = data;
e_entry_dialog_show(_("Create new IBar source"), "enlightenment", e_entry_dialog_show(_("Create new IBar source"), "enlightenment",
_("Enter a name for this new source:"), "", NULL, NULL, _("Enter a name for this new source:"), "", NULL, NULL,
_cb_entry_ok, NULL, cfdata); _cb_entry_ok, NULL, cfdata);
} }
static void static void
@ -177,8 +177,8 @@ _cb_del(void *data, void *data2 __UNUSED__)
if (cfdata->dialog_delete) return; if (cfdata->dialog_delete) return;
snprintf(buf, sizeof(buf), _("You requested to delete \"%s\".<br><br>" snprintf(buf, sizeof(buf), _("You requested to delete \"%s\".<br><br>"
"Are you sure you want to delete this bar source?"), "Are you sure you want to delete this bar source?"),
cfdata->dir); cfdata->dir);
dialog = e_confirm_dialog_show(_("Are you sure you want to delete this bar source?"), dialog = e_confirm_dialog_show(_("Are you sure you want to delete this bar source?"),
"application-exit", buf, NULL, NULL, "application-exit", buf, NULL, NULL,
@ -197,8 +197,8 @@ _cb_config(void *data, void *data2 __UNUSED__)
e_user_dir_snprintf(path, sizeof(path), "applications/bar/%s/.order", e_user_dir_snprintf(path, sizeof(path), "applications/bar/%s/.order",
cfdata->dir); cfdata->dir);
e_configure_registry_call("internal/ibar_other", e_configure_registry_call("internal/ibar_other",
e_container_current_get(e_manager_current_get()), e_container_current_get(e_manager_current_get()),
path); path);
} }
static void static void
@ -213,20 +213,20 @@ _cb_entry_ok(char *text, void *data)
if (len + sizeof("/.order") >= sizeof(buf)) return; if (len + sizeof("/.order") >= sizeof(buf)) return;
if (!ecore_file_exists(buf)) if (!ecore_file_exists(buf))
{ {
ecore_file_mkdir(buf); ecore_file_mkdir(buf);
memcpy(buf + len, "/.order", sizeof("/.order")); memcpy(buf + len, "/.order", sizeof("/.order"));
f = fopen(buf, "w"); f = fopen(buf, "w");
if (f) if (f)
{ {
int ret = 0; int ret = 0;
/* Populate this .order file with some defaults */ /* Populate this .order file with some defaults */
snprintf(tmp, sizeof(tmp), "xterm.desktop\n" "sylpheed.desktop\n" snprintf(tmp, sizeof(tmp), "xterm.desktop\n" "sylpheed.desktop\n"
"firefox.desktop\n" "openoffice.desktop\n" "xchat.desktop\n" "firefox.desktop\n" "openoffice.desktop\n" "xchat.desktop\n"
"gimp.desktop\n" "xmms.desktop\n"); "gimp.desktop\n" "xmms.desktop\n");
ret = fwrite(tmp, sizeof(char), strlen(tmp), f); ret = fwrite(tmp, sizeof(char), strlen(tmp), f);
fclose(f); fclose(f);
} }
} }
_load_tlist(data); _load_tlist(data);
@ -276,18 +276,18 @@ _load_tlist(E_Config_Dialog_Data *cfdata)
EINA_LIST_FREE(dirs, file) EINA_LIST_FREE(dirs, file)
{ {
if (file[0] == '.') continue; if (file[0] == '.') continue;
if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len) if (eina_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
continue; continue;
if (ecore_file_is_dir(buf)) if (ecore_file_is_dir(buf))
{ {
e_widget_ilist_append(cfdata->tlist, NULL, file, NULL, NULL, file); e_widget_ilist_append(cfdata->tlist, NULL, file, NULL, NULL, file);
if ((cfdata->dir) && (!strcmp(cfdata->dir, file))) if ((cfdata->dir) && (!strcmp(cfdata->dir, file)))
selnum = i; selnum = i;
i++; i++;
} }
free(file); free(file);
} }
e_widget_ilist_go(cfdata->tlist); e_widget_ilist_go(cfdata->tlist);
@ -305,3 +305,4 @@ _show_label_cb_change(void *data, Evas_Object *obj __UNUSED__)
e_widget_disabled_set(cfdata->radio_comment, !cfdata->show_label); e_widget_disabled_set(cfdata->radio_comment, !cfdata->show_label);
e_widget_disabled_set(cfdata->radio_generic, !cfdata->show_label); e_widget_disabled_set(cfdata->radio_generic, !cfdata->show_label);
} }

731
src/modules/ibar/e_mod_main.c
View File

@ -11,106 +11,106 @@
/* gadcon requirements */ /* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc); static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static const char *_gc_label(E_Gadcon_Client_Class *client_class); static const char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new(E_Gadcon_Client_Class *client_class); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
static void _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id); static void _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id);
/* and actually define the gadcon class that this module provides (just 1) */ /* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class = static const E_Gadcon_Client_Class _gadcon_class =
{ {
GADCON_CLIENT_CLASS_VERSION, GADCON_CLIENT_CLASS_VERSION,
"ibar", "ibar",
{ {
_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, _gc_id_del, _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, _gc_id_del,
e_gadcon_site_is_not_toolbar e_gadcon_site_is_not_toolbar
}, },
E_GADCON_CLIENT_STYLE_INSET E_GADCON_CLIENT_STYLE_INSET
}; };
/* actual module specifics */ /* actual module specifics */
typedef struct _Instance Instance; typedef struct _Instance Instance;
typedef struct _IBar IBar; typedef struct _IBar IBar;
typedef struct _IBar_Icon IBar_Icon; typedef struct _IBar_Icon IBar_Icon;
struct _Instance struct _Instance
{ {
E_Gadcon_Client *gcc; E_Gadcon_Client *gcc;
Evas_Object *o_ibar; Evas_Object *o_ibar;
IBar *ibar; IBar *ibar;
E_Drop_Handler *drop_handler; E_Drop_Handler *drop_handler;
Config_Item *ci; Config_Item *ci;
E_Gadcon_Orient orient; E_Gadcon_Orient orient;
}; };
struct _IBar struct _IBar
{ {
Instance *inst; Instance *inst;
Evas_Object *o_box, *o_drop; Evas_Object *o_box, *o_drop;
Evas_Object *o_drop_over, *o_empty; Evas_Object *o_drop_over, *o_empty;
IBar_Icon *ic_drop_before; IBar_Icon *ic_drop_before;
int drop_before; int drop_before;
E_Order *apps; E_Order *apps;
Eina_List *icons; Eina_List *icons;
Evas_Coord dnd_x, dnd_y; Evas_Coord dnd_x, dnd_y;
}; };
struct _IBar_Icon struct _IBar_Icon
{ {
IBar *ibar; IBar *ibar;
Evas_Object *o_holder, *o_icon; Evas_Object *o_holder, *o_icon;
Evas_Object *o_holder2, *o_icon2; Evas_Object *o_holder2, *o_icon2;
Efreet_Desktop *app; Efreet_Desktop *app;
int mouse_down; int mouse_down;
struct struct
{ {
unsigned char start : 1; unsigned char start : 1;
unsigned char dnd : 1; unsigned char dnd : 1;
int x, y; int x, y;
} drag; } drag;
}; };
static IBar *_ibar_new(Evas *evas, Instance *inst); static IBar *_ibar_new(Evas *evas, Instance *inst);
static void _ibar_free(IBar *b); static void _ibar_free(IBar *b);
static void _ibar_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _ibar_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _ibar_empty_handle(IBar *b); static void _ibar_empty_handle(IBar *b);
static void _ibar_fill(IBar *b); static void _ibar_fill(IBar *b);
static void _ibar_empty(IBar *b); static void _ibar_empty(IBar *b);
static void _ibar_orient_set(IBar *b, int horizontal); static void _ibar_orient_set(IBar *b, int horizontal);
static void _ibar_resize_handle(IBar *b); static void _ibar_resize_handle(IBar *b);
static void _ibar_instance_drop_zone_recalc(Instance *inst); static void _ibar_instance_drop_zone_recalc(Instance *inst);
static Config_Item *_ibar_config_item_get(const char *id); static Config_Item *_ibar_config_item_get(const char *id);
static IBar_Icon *_ibar_icon_at_coord(IBar *b, Evas_Coord x, Evas_Coord y); static IBar_Icon *_ibar_icon_at_coord(IBar *b, Evas_Coord x, Evas_Coord y);
static IBar_Icon *_ibar_icon_new(IBar *b, Efreet_Desktop *desktop); static IBar_Icon *_ibar_icon_new(IBar *b, Efreet_Desktop *desktop);
static void _ibar_icon_free(IBar_Icon *ic); static void _ibar_icon_free(IBar_Icon *ic);
static void _ibar_icon_fill(IBar_Icon *ic); static void _ibar_icon_fill(IBar_Icon *ic);
static void _ibar_icon_empty(IBar_Icon *ic); static void _ibar_icon_empty(IBar_Icon *ic);
static void _ibar_icon_signal_emit(IBar_Icon *ic, char *sig, char *src); static void _ibar_icon_signal_emit(IBar_Icon *ic, char *sig, char *src);
static void _ibar_cb_app_change(void *data, E_Order *eo); static void _ibar_cb_app_change(void *data, E_Order *eo);
static void _ibar_cb_obj_moveresize(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _ibar_cb_obj_moveresize(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _ibar_cb_menu_icon_new(void *data, E_Menu *m, E_Menu_Item *mi); static void _ibar_cb_menu_icon_new(void *data, E_Menu *m, E_Menu_Item *mi);
static void _ibar_cb_menu_icon_add(void *data, E_Menu *m, E_Menu_Item *mi); static void _ibar_cb_menu_icon_add(void *data, E_Menu *m, E_Menu_Item *mi);
static void _ibar_cb_menu_icon_properties(void *data, E_Menu *m, E_Menu_Item *mi); static void _ibar_cb_menu_icon_properties(void *data, E_Menu *m, E_Menu_Item *mi);
static void _ibar_cb_menu_icon_remove(void *data, E_Menu *m, E_Menu_Item *mi); static void _ibar_cb_menu_icon_remove(void *data, E_Menu *m, E_Menu_Item *mi);
static void _ibar_cb_menu_configuration(void *data, E_Menu *m, E_Menu_Item *mi); static void _ibar_cb_menu_configuration(void *data, E_Menu *m, E_Menu_Item *mi);
static void _ibar_cb_menu_post(void *data, E_Menu *m); static void _ibar_cb_menu_post(void *data, E_Menu *m);
static void _ibar_cb_icon_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _ibar_cb_icon_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _ibar_cb_icon_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _ibar_cb_icon_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _ibar_cb_icon_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _ibar_cb_icon_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _ibar_cb_icon_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _ibar_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _ibar_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _ibar_cb_icon_move(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _ibar_cb_icon_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _ibar_cb_icon_resize(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _ibar_cb_icon_resize(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _ibar_inst_cb_enter(void *data, const char *type, void *event_info); static void _ibar_inst_cb_enter(void *data, const char *type, void *event_info);
static void _ibar_inst_cb_move(void *data, const char *type, void *event_info); static void _ibar_inst_cb_move(void *data, const char *type, void *event_info);
static void _ibar_inst_cb_leave(void *data, const char *type, void *event_info); static void _ibar_inst_cb_leave(void *data, const char *type, void *event_info);
static void _ibar_inst_cb_drop(void *data, const char *type, void *event_info); static void _ibar_inst_cb_drop(void *data, const char *type, void *event_info);
static void _ibar_cb_drag_finished(E_Drag *data, int dropped); static void _ibar_cb_drag_finished(E_Drag *data, int dropped);
static void _ibar_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y); static void _ibar_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y);
static void _ibar_inst_cb_scroll(void *data); static void _ibar_inst_cb_scroll(void *data);
static Eina_Bool _ibar_cb_config_icons(void *data, int ev_type, void *ev); static Eina_Bool _ibar_cb_config_icons(void *data, int ev_type, void *ev);
static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_edd = NULL;
static E_Config_DD *conf_item_edd = NULL; static E_Config_DD *conf_item_edd = NULL;
@ -145,13 +145,13 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
evas_object_geometry_get(o, &x, &y, &w, &h); evas_object_geometry_get(o, &x, &y, &w, &h);
inst->drop_handler = inst->drop_handler =
e_drop_handler_add(E_OBJECT(inst->gcc), inst, e_drop_handler_add(E_OBJECT(inst->gcc), inst,
_ibar_inst_cb_enter, _ibar_inst_cb_move, _ibar_inst_cb_enter, _ibar_inst_cb_move,
_ibar_inst_cb_leave, _ibar_inst_cb_drop, _ibar_inst_cb_leave, _ibar_inst_cb_drop,
drop, 3, x, y, w, h); drop, 3, x, y, w, h);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOVE, evas_object_event_callback_add(o, EVAS_CALLBACK_MOVE,
_ibar_cb_obj_moveresize, inst); _ibar_cb_obj_moveresize, inst);
evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE,
_ibar_cb_obj_moveresize, inst); _ibar_cb_obj_moveresize, inst);
ibar_config->instances = eina_list_append(ibar_config->instances, inst); ibar_config->instances = eina_list_append(ibar_config->instances, inst);
return gcc; return gcc;
} }
@ -186,9 +186,10 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
case E_GADCON_ORIENT_CORNER_TR: case E_GADCON_ORIENT_CORNER_TR:
case E_GADCON_ORIENT_CORNER_BL: case E_GADCON_ORIENT_CORNER_BL:
case E_GADCON_ORIENT_CORNER_BR: case E_GADCON_ORIENT_CORNER_BR:
_ibar_orient_set(inst->ibar, 1); _ibar_orient_set(inst->ibar, 1);
e_gadcon_client_aspect_set(gcc, eina_list_count(inst->ibar->icons) * 16, 16); e_gadcon_client_aspect_set(gcc, eina_list_count(inst->ibar->icons) * 16, 16);
break; break;
case E_GADCON_ORIENT_VERT: case E_GADCON_ORIENT_VERT:
case E_GADCON_ORIENT_LEFT: case E_GADCON_ORIENT_LEFT:
case E_GADCON_ORIENT_RIGHT: case E_GADCON_ORIENT_RIGHT:
@ -196,11 +197,12 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
case E_GADCON_ORIENT_CORNER_RT: case E_GADCON_ORIENT_CORNER_RT:
case E_GADCON_ORIENT_CORNER_LB: case E_GADCON_ORIENT_CORNER_LB:
case E_GADCON_ORIENT_CORNER_RB: case E_GADCON_ORIENT_CORNER_RB:
_ibar_orient_set(inst->ibar, 0); _ibar_orient_set(inst->ibar, 0);
e_gadcon_client_aspect_set(gcc, 16, eina_list_count(inst->ibar->icons) * 16); e_gadcon_client_aspect_set(gcc, 16, eina_list_count(inst->ibar->icons) * 16);
break; break;
default: default:
break; break;
} }
e_gadcon_client_min_size_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16);
} }
@ -219,7 +221,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
o = edje_object_add(evas); o = edje_object_add(evas);
snprintf(buf, sizeof(buf), "%s/e-module-ibar.edj", snprintf(buf, sizeof(buf), "%s/e-module-ibar.edj",
e_module_dir_get(ibar_config->module)); e_module_dir_get(ibar_config->module));
edje_object_file_set(o, buf, "icon"); edje_object_file_set(o, buf, "icon");
return o; return o;
} }
@ -245,8 +247,8 @@ _gc_id_del(E_Gadcon_Client_Class *client_class __UNUSED__, const char *id __UNUS
ci = _ibar_config_item_get(id); ci = _ibar_config_item_get(id);
if (ci) if (ci)
{ {
if (ci->id) eina_stringshare_del(ci->id); if (ci->id) eina_stringshare_del(ci->id);
ibar_config->items = eina_list_remove(ibar_config->items, ci); ibar_config->items = eina_list_remove(ibar_config->items, ci);
} }
*/ */
} }
@ -298,26 +300,26 @@ _ibar_cb_empty_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
b = data; b = data;
if (!ibar_config->menu) if (!ibar_config->menu)
{ {
E_Menu *m; E_Menu *m;
E_Menu_Item *mi; E_Menu_Item *mi;
int cx, cy, cw, ch; int cx, cy, cw, ch;
m = e_menu_new(); m = e_menu_new();
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Settings")); e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_theme_icon_set(mi, "configure"); e_util_menu_item_theme_icon_set(mi, "configure");
e_menu_item_callback_set(mi, _ibar_cb_menu_configuration, b); e_menu_item_callback_set(mi, _ibar_cb_menu_configuration, b);
m = e_gadcon_client_util_menu_items_append(b->inst->gcc, m, 0); m = e_gadcon_client_util_menu_items_append(b->inst->gcc, m, 0);
e_menu_post_deactivate_callback_set(m, _ibar_cb_menu_post, NULL); e_menu_post_deactivate_callback_set(m, _ibar_cb_menu_post, NULL);
ibar_config->menu = m; ibar_config->menu = m;
e_gadcon_canvas_zone_geometry_get(b->inst->gcc->gadcon, e_gadcon_canvas_zone_geometry_get(b->inst->gcc->gadcon,
&cx, &cy, &cw, &ch); &cx, &cy, &cw, &ch);
e_menu_activate_mouse(m, e_menu_activate_mouse(m,
e_util_zone_current_get(e_manager_current_get()), e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1, cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp); E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
} }
} }
@ -326,35 +328,35 @@ _ibar_empty_handle(IBar *b)
{ {
if (!b->icons) if (!b->icons)
{ {
if (!b->o_empty) if (!b->o_empty)
{ {
Evas_Coord w, h; Evas_Coord w, h;
b->o_empty = evas_object_rectangle_add(evas_object_evas_get(b->o_box)); b->o_empty = evas_object_rectangle_add(evas_object_evas_get(b->o_box));
evas_object_event_callback_add(b->o_empty, evas_object_event_callback_add(b->o_empty,
EVAS_CALLBACK_MOUSE_DOWN, EVAS_CALLBACK_MOUSE_DOWN,
_ibar_cb_empty_mouse_down, b); _ibar_cb_empty_mouse_down, b);
evas_object_color_set(b->o_empty, 0, 0, 0, 0); evas_object_color_set(b->o_empty, 0, 0, 0, 0);
evas_object_show(b->o_empty); evas_object_show(b->o_empty);
e_box_pack_end(b->o_box, b->o_empty); e_box_pack_end(b->o_box, b->o_empty);
evas_object_geometry_get(b->o_box, NULL, NULL, &w, &h); evas_object_geometry_get(b->o_box, NULL, NULL, &w, &h);
if (e_box_orientation_get(b->o_box)) if (e_box_orientation_get(b->o_box))
w = h; w = h;
else else
h = w; h = w;
e_box_pack_options_set(b->o_empty, e_box_pack_options_set(b->o_empty,
1, 1, /* fill */ 1, 1, /* fill */
1, 1, /* expand */ 1, 1, /* expand */
0.5, 0.5, /* align */ 0.5, 0.5, /* align */
w, h, /* min */ w, h, /* min */
9999, 9999 /* max */ 9999, 9999 /* max */
); );
} }
} }
else if (b->o_empty) else if (b->o_empty)
{ {
evas_object_del(b->o_empty); evas_object_del(b->o_empty);
b->o_empty = NULL; b->o_empty = NULL;
} }
} }
@ -363,15 +365,15 @@ _ibar_fill(IBar *b)
{ {
if (b->apps) if (b->apps)
{ {
Efreet_Desktop *desktop; Efreet_Desktop *desktop;
const Eina_List *l; const Eina_List *l;
EINA_LIST_FOREACH(b->apps->desktops, l, desktop) EINA_LIST_FOREACH(b->apps->desktops, l, desktop)
{ {
IBar_Icon *ic = _ibar_icon_new(b, desktop); IBar_Icon *ic = _ibar_icon_new(b, desktop);
b->icons = eina_list_append(b->icons, ic); b->icons = eina_list_append(b->icons, ic);
e_box_pack_end(b->o_box, ic->o_holder); e_box_pack_end(b->o_box, ic->o_holder);
} }
} }
_ibar_empty_handle(b); _ibar_empty_handle(b);
_ibar_resize_handle(b); _ibar_resize_handle(b);
@ -410,13 +412,13 @@ _ibar_resize_handle(IBar *b)
e_box_freeze(b->o_box); e_box_freeze(b->o_box);
EINA_LIST_FOREACH(b->icons, l, ic) EINA_LIST_FOREACH(b->icons, l, ic)
{ {
e_box_pack_options_set(ic->o_holder, e_box_pack_options_set(ic->o_holder,
1, 1, /* fill */ 1, 1, /* fill */
0, 0, /* expand */ 0, 0, /* expand */
0.5, 0.5, /* align */ 0.5, 0.5, /* align */
w, h, /* min */ w, h, /* min */
w, h /* max */ w, h /* max */
); );
} }
e_box_thaw(b->o_box); e_box_thaw(b->o_box);
} }
@ -454,43 +456,45 @@ _ibar_config_update(Config_Item *ci)
EINA_LIST_FOREACH(ibar_config->instances, l, inst) EINA_LIST_FOREACH(ibar_config->instances, l, inst)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
const Eina_List *i; const Eina_List *i;
IBar_Icon *ic; IBar_Icon *ic;
if (inst->ci != ci) continue; if (inst->ci != ci) continue;
_ibar_empty(inst->ibar); _ibar_empty(inst->ibar);
if (inst->ibar->apps) if (inst->ibar->apps)
e_object_del(E_OBJECT(inst->ibar->apps)); e_object_del(E_OBJECT(inst->ibar->apps));
if (inst->ci->dir[0] != '/') if (inst->ci->dir[0] != '/')
e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order", e_user_dir_snprintf(buf, sizeof(buf), "applications/bar/%s/.order",
inst->ci->dir); inst->ci->dir);
else else
eina_strlcpy(buf, inst->ci->dir, sizeof(buf)); eina_strlcpy(buf, inst->ci->dir, sizeof(buf));
inst->ibar->apps = e_order_new(buf); inst->ibar->apps = e_order_new(buf);
_ibar_fill(inst->ibar); _ibar_fill(inst->ibar);
_ibar_resize_handle(inst->ibar); _ibar_resize_handle(inst->ibar);
_gc_orient(inst->gcc, -1); _gc_orient(inst->gcc, -1);
EINA_LIST_FOREACH(inst->ibar->icons, i, ic) EINA_LIST_FOREACH(inst->ibar->icons, i, ic)
{ {
switch (ci->eap_label) switch (ci->eap_label)
{ {
case 0: case 0:
edje_object_part_text_set(ic->o_holder2, "e.text.label", edje_object_part_text_set(ic->o_holder2, "e.text.label",
ic->app->name); ic->app->name);
break; break;
case 1:
edje_object_part_text_set(ic->o_holder2, "e.text.label", case 1:
edje_object_part_text_set(ic->o_holder2, "e.text.label",
ic->app->comment); ic->app->comment);
break; break;
case 2:
edje_object_part_text_set(ic->o_holder2, "e.text.label", case 2:
edje_object_part_text_set(ic->o_holder2, "e.text.label",
ic->app->generic_name); ic->app->generic_name);
break; break;
} }
} }
} }
} }
@ -505,7 +509,7 @@ _ibar_icon_at_coord(IBar *b, Evas_Coord x, Evas_Coord y)
Evas_Coord dx, dy, dw, dh; Evas_Coord dx, dy, dw, dh;
evas_object_geometry_get(ic->o_holder, &dx, &dy, &dw, &dh); evas_object_geometry_get(ic->o_holder, &dx, &dy, &dw, &dh);
if (E_INSIDE(x, y, dx, dy, dw, dh)) return ic; if (E_INSIDE(x, y, dx, dy, dw, dh)) return ic;
} }
return NULL; return NULL;
} }
@ -520,9 +524,9 @@ _ibar_icon_new(IBar *b, Efreet_Desktop *desktop)
ic->app = desktop; ic->app = desktop;
ic->o_holder = edje_object_add(evas_object_evas_get(b->o_box)); ic->o_holder = edje_object_add(evas_object_evas_get(b->o_box));
e_theme_edje_object_set(ic->o_holder, "base/theme/modules/ibar", e_theme_edje_object_set(ic->o_holder, "base/theme/modules/ibar",
"e/modules/ibar/icon"); "e/modules/ibar/icon");
evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_IN, evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_IN,
_ibar_cb_icon_mouse_in, ic); _ibar_cb_icon_mouse_in, ic);
evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_OUT, evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_OUT,
_ibar_cb_icon_mouse_out, ic); _ibar_cb_icon_mouse_out, ic);
evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_DOWN, evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_DOWN,
@ -539,7 +543,7 @@ _ibar_icon_new(IBar *b, Efreet_Desktop *desktop)
ic->o_holder2 = edje_object_add(evas_object_evas_get(b->o_box)); ic->o_holder2 = edje_object_add(evas_object_evas_get(b->o_box));
e_theme_edje_object_set(ic->o_holder2, "base/theme/modules/ibar", e_theme_edje_object_set(ic->o_holder2, "base/theme/modules/ibar",
"e/modules/ibar/icon_overlay"); "e/modules/ibar/icon_overlay");
evas_object_layer_set(ic->o_holder2, 9999); evas_object_layer_set(ic->o_holder2, 9999);
evas_object_pass_events_set(ic->o_holder2, 1); evas_object_pass_events_set(ic->o_holder2, 1);
evas_object_show(ic->o_holder2); evas_object_show(ic->o_holder2);
@ -553,9 +557,9 @@ _ibar_icon_free(IBar_Icon *ic)
{ {
if (ibar_config->menu) if (ibar_config->menu)
{ {
e_menu_post_deactivate_callback_set(ibar_config->menu, NULL, NULL); e_menu_post_deactivate_callback_set(ibar_config->menu, NULL, NULL);
e_object_del(E_OBJECT(ibar_config->menu)); e_object_del(E_OBJECT(ibar_config->menu));
ibar_config->menu = NULL; ibar_config->menu = NULL;
} }
if (ic->ibar->ic_drop_before == ic) if (ic->ibar->ic_drop_before == ic)
ic->ibar->ic_drop_before = NULL; ic->ibar->ic_drop_before = NULL;
@ -584,14 +588,16 @@ _ibar_icon_fill(IBar_Icon *ic)
switch (ic->ibar->inst->ci->eap_label) switch (ic->ibar->inst->ci->eap_label)
{ {
case 0: /* Eap Name */ case 0: /* Eap Name */
edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->name); edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->name);
break; break;
case 1: /* Eap Comment */ case 1: /* Eap Comment */
edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->comment); edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->comment);
break; break;
case 2: /* Eap Generic */ case 2: /* Eap Generic */
edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->generic_name); edje_object_part_text_set(ic->o_holder2, "e.text.label", ic->app->generic_name);
break; break;
} }
} }
@ -694,17 +700,17 @@ _ibar_cb_menu_configuration(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __
} }
/* /*
static void static void
_ibar_cb_menu_add(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) _ibar_cb_menu_add(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
{ {
IBar *b; IBar *b;
b = data; b = data;
e_configure_registry_call("internal/ibar_other", e_configure_registry_call("internal/ibar_other",
b->inst->gcc->gadcon->zone->container, b->inst->gcc->gadcon->zone->container,
b->apps->path); b->apps->path);
} }
*/ */
static void static void
_ibar_cb_menu_post(void *data __UNUSED__, E_Menu *m __UNUSED__) _ibar_cb_menu_post(void *data __UNUSED__, E_Menu *m __UNUSED__)
@ -746,61 +752,61 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
ic = data; ic = data;
if (ev->button == 1) if (ev->button == 1)
{ {
ic->drag.x = ev->output.x; ic->drag.x = ev->output.x;
ic->drag.y = ev->output.y; ic->drag.y = ev->output.y;
ic->drag.start = 1; ic->drag.start = 1;
ic->drag.dnd = 0; ic->drag.dnd = 0;
ic->mouse_down = 1; ic->mouse_down = 1;
} }
else if ((ev->button == 3) && (!ibar_config->menu)) else if ((ev->button == 3) && (!ibar_config->menu))
{ {
E_Menu *m, *mo; E_Menu *m, *mo;
E_Menu_Item *mi; E_Menu_Item *mi;
char buf[256]; char buf[256];
int cx, cy; int cx, cy;
m = e_menu_new(); m = e_menu_new();
/* FIXME: other icon options go here too */ /* FIXME: other icon options go here too */
mo = e_menu_new(); mo = e_menu_new();
if (e_configure_registry_exists("applications/new_application")) if (e_configure_registry_exists("applications/new_application"))
{ {
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Create new Icon")); e_menu_item_label_set(mi, _("Create new Icon"));
e_util_menu_item_theme_icon_set(mi, "document-new"); e_util_menu_item_theme_icon_set(mi, "document-new");
e_menu_item_callback_set(mi, _ibar_cb_menu_icon_new, NULL); e_menu_item_callback_set(mi, _ibar_cb_menu_icon_new, NULL);
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1); e_menu_item_separator_set(mi, 1);
} }
if (e_configure_registry_exists("applications/ibar_applications")) if (e_configure_registry_exists("applications/ibar_applications"))
{ {
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Contents")); e_menu_item_label_set(mi, _("Contents"));
e_util_menu_item_theme_icon_set(mi, "list-add"); e_util_menu_item_theme_icon_set(mi, "list-add");
e_menu_item_callback_set(mi, _ibar_cb_menu_icon_add, NULL); e_menu_item_callback_set(mi, _ibar_cb_menu_icon_add, NULL);
} }
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Settings")); e_menu_item_label_set(mi, _("Settings"));
e_util_menu_item_theme_icon_set(mi, "configure"); e_util_menu_item_theme_icon_set(mi, "configure");
e_menu_item_callback_set(mi, _ibar_cb_menu_configuration, ic->ibar); e_menu_item_callback_set(mi, _ibar_cb_menu_configuration, ic->ibar);
m = e_gadcon_client_util_menu_items_append(ic->ibar->inst->gcc, m, 0); m = e_gadcon_client_util_menu_items_append(ic->ibar->inst->gcc, m, 0);
e_menu_post_deactivate_callback_set(m, _ibar_cb_menu_post, NULL); e_menu_post_deactivate_callback_set(m, _ibar_cb_menu_post, NULL);
ibar_config->menu = m; ibar_config->menu = m;
mi = e_menu_item_new(mo); mi = e_menu_item_new(mo);
e_menu_item_label_set(mi, _("Properties")); e_menu_item_label_set(mi, _("Properties"));
e_util_menu_item_theme_icon_set(mi, "configure"); e_util_menu_item_theme_icon_set(mi, "configure");
e_menu_item_callback_set(mi, _ibar_cb_menu_icon_properties, ic); e_menu_item_callback_set(mi, _ibar_cb_menu_icon_properties, ic);
mi = e_menu_item_new(mo); mi = e_menu_item_new(mo);
e_menu_item_label_set(mi, _("Remove")); e_menu_item_label_set(mi, _("Remove"));
e_util_menu_item_theme_icon_set(mi, "list-remove"); e_util_menu_item_theme_icon_set(mi, "list-remove");
e_menu_item_callback_set(mi, _ibar_cb_menu_icon_remove, ic); e_menu_item_callback_set(mi, _ibar_cb_menu_icon_remove, ic);
mi = e_menu_item_new_relative(m, NULL); mi = e_menu_item_new_relative(m, NULL);
snprintf(buf, sizeof(buf), "Icon %s", ic->app->name); snprintf(buf, sizeof(buf), "Icon %s", ic->app->name);
@ -810,12 +816,12 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
mi); mi);
e_menu_item_submenu_set(mi, mo); e_menu_item_submenu_set(mi, mo);
e_gadcon_canvas_zone_geometry_get(ic->ibar->inst->gcc->gadcon, e_gadcon_canvas_zone_geometry_get(ic->ibar->inst->gcc->gadcon,
&cx, &cy, NULL, NULL); &cx, &cy, NULL, NULL);
e_menu_activate_mouse(m, e_menu_activate_mouse(m,
e_util_zone_current_get(e_manager_current_get()), e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1, cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp); E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
} }
} }
@ -829,26 +835,26 @@ _ibar_cb_icon_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *e
ic = data; ic = data;
if ((ev->button == 1) && (!ic->drag.dnd) && (ic->mouse_down == 1)) if ((ev->button == 1) && (!ic->drag.dnd) && (ic->mouse_down == 1))
{ {
if (ic->app->type == EFREET_DESKTOP_TYPE_APPLICATION) if (ic->app->type == EFREET_DESKTOP_TYPE_APPLICATION)
e_exec(ic->ibar->inst->gcc->gadcon->zone, ic->app, NULL, NULL, "ibar"); e_exec(ic->ibar->inst->gcc->gadcon->zone, ic->app, NULL, NULL, "ibar");
else if (ic->app->type == EFREET_DESKTOP_TYPE_LINK) else if (ic->app->type == EFREET_DESKTOP_TYPE_LINK)
{ {
if (!strncasecmp(ic->app->url, "file:", 5)) if (!strncasecmp(ic->app->url, "file:", 5))
{ {
E_Action *act; E_Action *act;
act = e_action_find("fileman"); act = e_action_find("fileman");
if (act) act->func.go(E_OBJECT(obj), ic->app->url + 5); if (act) act->func.go(E_OBJECT(obj), ic->app->url + 5);
} }
} }
ic->drag.start = 0; ic->drag.start = 0;
ic->drag.dnd = 0; ic->drag.dnd = 0;
ic->mouse_down = 0; ic->mouse_down = 0;
/* TODO: bring back "e,action,start|stop" for the startup_notify apps /* TODO: bring back "e,action,start|stop" for the startup_notify apps
* when startup_notify is used again * when startup_notify is used again
*/ */
_ibar_icon_signal_emit(ic, "e,action,exec", "e"); _ibar_icon_signal_emit(ic, "e,action,exec", "e");
} }
} }
@ -862,41 +868,41 @@ _ibar_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
ic = data; ic = data;
if (ic->drag.start) if (ic->drag.start)
{ {
int dx, dy; int dx, dy;
dx = ev->cur.output.x - ic->drag.x; dx = ev->cur.output.x - ic->drag.x;
dy = ev->cur.output.y - ic->drag.y; dy = ev->cur.output.y - ic->drag.y;
if (((dx * dx) + (dy * dy)) > if (((dx * dx) + (dy * dy)) >
(e_config->drag_resist * e_config->drag_resist)) (e_config->drag_resist * e_config->drag_resist))
{ {
E_Drag *d; E_Drag *d;
Evas_Object *o; Evas_Object *o;
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
unsigned int size; unsigned int size;
const char *drag_types[] = { "enlightenment/desktop" }; const char *drag_types[] = { "enlightenment/desktop" };
E_Gadcon_Client *gc; E_Gadcon_Client *gc;
ic->drag.dnd = 1; ic->drag.dnd = 1;
ic->drag.start = 0; ic->drag.start = 0;
evas_object_geometry_get(ic->o_icon, &x, &y, &w, &h); evas_object_geometry_get(ic->o_icon, &x, &y, &w, &h);
d = e_drag_new(ic->ibar->inst->gcc->gadcon->zone->container, d = e_drag_new(ic->ibar->inst->gcc->gadcon->zone->container,
x, y, drag_types, 1, x, y, drag_types, 1,
ic->app, -1, NULL, _ibar_cb_drag_finished); ic->app, -1, NULL, _ibar_cb_drag_finished);
efreet_desktop_ref(ic->app); efreet_desktop_ref(ic->app);
size = MAX(w, h); size = MAX(w, h);
o = e_util_desktop_icon_add(ic->app, size, e_drag_evas_get(d)); o = e_util_desktop_icon_add(ic->app, size, e_drag_evas_get(d));
e_drag_object_set(d, o); e_drag_object_set(d, o);
e_drag_resize(d, w, h); e_drag_resize(d, w, h);
e_drag_start(d, ic->drag.x, ic->drag.y); e_drag_start(d, ic->drag.x, ic->drag.y);
ic->ibar->icons = eina_list_remove(ic->ibar->icons, ic); ic->ibar->icons = eina_list_remove(ic->ibar->icons, ic);
_ibar_resize_handle(ic->ibar); _ibar_resize_handle(ic->ibar);
gc = ic->ibar->inst->gcc; gc = ic->ibar->inst->gcc;
_gc_orient(gc, -1); _gc_orient(gc, -1);
e_order_remove(ic->ibar->apps, ic->app); e_order_remove(ic->ibar->apps, ic->app);
_ibar_icon_free(ic); _ibar_icon_free(ic);
} }
} }
} }
@ -977,32 +983,32 @@ _ibar_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y)
inst->ibar->ic_drop_before = ic; inst->ibar->ic_drop_before = ic;
if (ic) if (ic)
{ {
Evas_Coord ix, iy, iw, ih; Evas_Coord ix, iy, iw, ih;
int before = 0; int before = 0;
evas_object_geometry_get(ic->o_holder, &ix, &iy, &iw, &ih); evas_object_geometry_get(ic->o_holder, &ix, &iy, &iw, &ih);
if (e_box_orientation_get(inst->ibar->o_box)) if (e_box_orientation_get(inst->ibar->o_box))
{ {
if (x < (ix + (iw / 2))) before = 1; if (x < (ix + (iw / 2))) before = 1;
} }
else else
{ {
if (y < (iy + (ih / 2))) before = 1; if (y < (iy + (ih / 2))) before = 1;
} }
if (before) if (before)
e_box_pack_before(inst->ibar->o_box, inst->ibar->o_drop, ic->o_holder); e_box_pack_before(inst->ibar->o_box, inst->ibar->o_drop, ic->o_holder);
else else
e_box_pack_after(inst->ibar->o_box, inst->ibar->o_drop, ic->o_holder); e_box_pack_after(inst->ibar->o_box, inst->ibar->o_drop, ic->o_holder);
inst->ibar->drop_before = before; inst->ibar->drop_before = before;
} }
else e_box_pack_end(inst->ibar->o_box, inst->ibar->o_drop); else e_box_pack_end(inst->ibar->o_box, inst->ibar->o_drop);
e_box_pack_options_set(inst->ibar->o_drop, e_box_pack_options_set(inst->ibar->o_drop,
1, 1, /* fill */ 1, 1, /* fill */
1, 1, /* expand */ 1, 1, /* expand */
0.5, 0.5, /* align */ 0.5, 0.5, /* align */
1, 1, /* min */ 1, 1, /* min */
-1, -1 /* max */ -1, -1 /* max */
); );
_ibar_resize_handle(inst->ibar); _ibar_resize_handle(inst->ibar);
_gc_orient(inst->gcc, -1); _gc_orient(inst->gcc, -1);
} }
@ -1025,9 +1031,9 @@ _ibar_inst_cb_enter(void *data, const char *type __UNUSED__, void *event_info)
evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE,
_ibar_cb_drop_resize, inst->ibar); _ibar_cb_drop_resize, inst->ibar);
e_theme_edje_object_set(o, "base/theme/modules/ibar", e_theme_edje_object_set(o, "base/theme/modules/ibar",
"e/modules/ibar/drop"); "e/modules/ibar/drop");
e_theme_edje_object_set(o2, "base/theme/modules/ibar", e_theme_edje_object_set(o2, "base/theme/modules/ibar",
"e/modules/ibar/drop_overlay"); "e/modules/ibar/drop_overlay");
evas_object_layer_set(o2, 19999); evas_object_layer_set(o2, 19999);
evas_object_show(o); evas_object_show(o);
evas_object_show(o2); evas_object_show(o2);
@ -1081,17 +1087,17 @@ _ibar_inst_cb_drop(void *data, const char *type, void *event_info)
app = ev->data; app = ev->data;
else if (!strcmp(type, "enlightenment/border")) else if (!strcmp(type, "enlightenment/border"))
{ {
E_Border *bd; E_Border *bd;
bd = ev->data; bd = ev->data;
app = bd->desktop; app = bd->desktop;
if (!app) if (!app)
{ {
app = e_desktop_border_create(bd); app = e_desktop_border_create(bd);
efreet_desktop_save(app); efreet_desktop_save(app);
e_desktop_edit(e_container_current_get(e_manager_current_get()), e_desktop_edit(e_container_current_get(e_manager_current_get()),
app); app);
} }
} }
else if (!strcmp(type, "text/uri-list")) else if (!strcmp(type, "text/uri-list"))
fl = ev->data; fl = ev->data;
@ -1099,40 +1105,40 @@ _ibar_inst_cb_drop(void *data, const char *type, void *event_info)
ic = inst->ibar->ic_drop_before; ic = inst->ibar->ic_drop_before;
if (ic) if (ic)
{ {
/* Add new eapp before this icon */ /* Add new eapp before this icon */
if (!inst->ibar->drop_before) if (!inst->ibar->drop_before)
{ {
const Eina_List *l; const Eina_List *l;
IBar_Icon *ic2; IBar_Icon *ic2;
EINA_LIST_FOREACH(inst->ibar->icons, l, ic2) EINA_LIST_FOREACH(inst->ibar->icons, l, ic2)
{ {
if (ic2 == ic) if (ic2 == ic)
{ {
if (l->next) if (l->next)
ic = l->next->data; ic = l->next->data;
else else
ic = NULL; ic = NULL;
break; break;
} }
} }
} }
if (!ic) goto atend; if (!ic) goto atend;
if (app) if (app)
e_order_prepend_relative(ic->ibar->apps, app, ic->app); e_order_prepend_relative(ic->ibar->apps, app, ic->app);
else if (fl) else if (fl)
e_order_files_prepend_relative(ic->ibar->apps, fl, ic->app); e_order_files_prepend_relative(ic->ibar->apps, fl, ic->app);
} }
else else
{ {
atend: atend:
if (inst->ibar->apps) if (inst->ibar->apps)
{ {
if (app) if (app)
e_order_append(inst->ibar->apps, app); e_order_append(inst->ibar->apps, app);
else if (fl) else if (fl)
e_order_files_append(inst->ibar->apps, fl); e_order_files_append(inst->ibar->apps, fl);
} }
} }
evas_object_del(inst->ibar->o_drop); evas_object_del(inst->ibar->o_drop);
inst->ibar->o_drop = NULL; inst->ibar->o_drop = NULL;
@ -1174,16 +1180,16 @@ e_modapi_init(E_Module *m)
if (!ibar_config) if (!ibar_config)
{ {
Config_Item *ci; Config_Item *ci;
ibar_config = E_NEW(Config, 1); ibar_config = E_NEW(Config, 1);
ci = E_NEW(Config_Item, 1); ci = E_NEW(Config_Item, 1);
ci->id = eina_stringshare_add("ibar.1"); ci->id = eina_stringshare_add("ibar.1");
ci->dir = eina_stringshare_add("default"); ci->dir = eina_stringshare_add("default");
ci->show_label = 1; ci->show_label = 1;
ci->eap_label = 0; ci->eap_label = 0;
ibar_config->items = eina_list_append(ibar_config->items, ci); ibar_config->items = eina_list_append(ibar_config->items, ci);
} }
ibar_config->module = m; ibar_config->module = m;
@ -1217,16 +1223,16 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
if (ibar_config->menu) if (ibar_config->menu)
{ {
e_menu_post_deactivate_callback_set(ibar_config->menu, NULL, NULL); e_menu_post_deactivate_callback_set(ibar_config->menu, NULL, NULL);
e_object_del(E_OBJECT(ibar_config->menu)); e_object_del(E_OBJECT(ibar_config->menu));
ibar_config->menu = NULL; ibar_config->menu = NULL;
} }
EINA_LIST_FREE(ibar_config->items, ci) EINA_LIST_FREE(ibar_config->items, ci)
{ {
if (ci->id) eina_stringshare_del(ci->id); if (ci->id) eina_stringshare_del(ci->id);
if (ci->dir) eina_stringshare_del(ci->dir); if (ci->dir) eina_stringshare_del(ci->dir);
E_FREE(ci); E_FREE(ci);
} }
E_FREE(ibar_config); E_FREE(ibar_config);
ibar_config = NULL; ibar_config = NULL;
@ -1250,11 +1256,12 @@ _ibar_cb_config_icons(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__
EINA_LIST_FOREACH(ibar_config->instances, l, inst) EINA_LIST_FOREACH(ibar_config->instances, l, inst)
{ {
const Eina_List *l2; const Eina_List *l2;
IBar_Icon *icon; IBar_Icon *icon;
EINA_LIST_FOREACH(inst->ibar->icons, l2, icon) EINA_LIST_FOREACH(inst->ibar->icons, l2, icon)
_ibar_icon_fill(icon); _ibar_icon_fill(icon);
} }
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
} }