remove E_Win+e_canvas, convert all internal wins to use elm_win

known issues:

* keybindings for efm windows (eg. ctrl+w) are broken until the rest of the conversion is completed
devs/bu5hm4n/econfigure2
Mike Blumenkrantz 8 years ago
parent caf521875c
commit 99589eb5af
  1. 1
      po/POTFILES.in
  2. 2
      src/bin/Makefile.mk
  3. 5
      src/bin/e.h
  4. 78
      src/bin/e_actions.c
  5. 197
      src/bin/e_canvas.c
  6. 17
      src/bin/e_canvas.h
  7. 20
      src/bin/e_client.c
  8. 2
      src/bin/e_client.h
  9. 8
      src/bin/e_color_dialog.c
  10. 22
      src/bin/e_comp.c
  11. 4
      src/bin/e_comp.h
  12. 34
      src/bin/e_comp_object.c
  13. 6
      src/bin/e_comp_wl.c
  14. 47
      src/bin/e_comp_x.c
  15. 4
      src/bin/e_config.c
  16. 34
      src/bin/e_config_dialog.c
  17. 4
      src/bin/e_config_dialog.h
  18. 25
      src/bin/e_configure.c
  19. 12
      src/bin/e_configure.h
  20. 11
      src/bin/e_confirm_dialog.c
  21. 4
      src/bin/e_desklock.c
  22. 24
      src/bin/e_desktop_editor.c
  23. 111
      src/bin/e_dialog.c
  24. 7
      src/bin/e_dialog.h
  25. 36
      src/bin/e_dnd.c
  26. 20
      src/bin/e_entry.c
  27. 25
      src/bin/e_entry_dialog.c
  28. 2
      src/bin/e_exec.c
  29. 16
      src/bin/e_fm.c
  30. 10
      src/bin/e_fm_prop.c
  31. 6
      src/bin/e_gadcon.c
  32. 36
      src/bin/e_grab_dialog.c
  33. 2
      src/bin/e_grab_dialog.h
  34. 19
      src/bin/e_import_config_dialog.c
  35. 2
      src/bin/e_import_config_dialog.h
  36. 18
      src/bin/e_import_dialog.c
  37. 2
      src/bin/e_import_dialog.h
  38. 1
      src/bin/e_includes.h
  39. 2
      src/bin/e_int_client_locks.c
  40. 32
      src/bin/e_int_client_menu.c
  41. 14
      src/bin/e_int_client_prop.c
  42. 20
      src/bin/e_int_client_remember.c
  43. 9
      src/bin/e_int_config_comp.c
  44. 11
      src/bin/e_int_config_comp_match.c
  45. 8
      src/bin/e_int_config_modules.c
  46. 2
      src/bin/e_int_config_modules.h
  47. 9
      src/bin/e_int_gadcon_config.c
  48. 14
      src/bin/e_int_menus.c
  49. 4
      src/bin/e_int_shelf_config.c
  50. 2
      src/bin/e_int_toolbar_config.c
  51. 2
      src/bin/e_livethumb.c
  52. 8
      src/bin/e_main.c
  53. 15
      src/bin/e_module.c
  54. 55
      src/bin/e_obj_dialog.c
  55. 2
      src/bin/e_obj_dialog.h
  56. 2
      src/bin/e_screensaver.c
  57. 6
      src/bin/e_startup.c
  58. 6
      src/bin/e_sys.c
  59. 40
      src/bin/e_test.c
  60. 6
      src/bin/e_theme_about.c
  61. 8
      src/bin/e_toolbar.c
  62. 8
      src/bin/e_toolbar.h
  63. 2
      src/bin/e_update.c
  64. 23
      src/bin/e_utils.c
  65. 2
      src/bin/e_utils.h
  66. 4
      src/bin/e_widget.c
  67. 2
      src/bin/e_widget_bgpreview.c
  68. 743
      src/bin/e_win.c
  69. 102
      src/bin/e_win.h
  70. 20
      src/bin/e_zone.c
  71. 6
      src/modules/backlight/e_mod_main.c
  72. 4
      src/modules/battery/e_mod_config.c
  73. 8
      src/modules/battery/e_mod_main.c
  74. 2
      src/modules/battery/e_mod_main.h
  75. 17
      src/modules/bluez4/agent.c
  76. 24
      src/modules/bluez4/e_mod_main.c
  77. 4
      src/modules/clock/e_mod_config.c
  78. 2
      src/modules/clock/e_mod_main.c
  79. 2
      src/modules/clock/e_mod_main.h
  80. 90
      src/modules/conf/e_conf.c
  81. 4
      src/modules/conf/e_mod_config.c
  82. 6
      src/modules/conf/e_mod_main.c
  83. 2
      src/modules/conf/e_mod_main.h
  84. 38
      src/modules/conf_applications/e_int_config_apps.c
  85. 6
      src/modules/conf_applications/e_int_config_apps_personal.c
  86. 6
      src/modules/conf_applications/e_int_config_defapps.c
  87. 4
      src/modules/conf_applications/e_int_config_deskenv.c
  88. 22
      src/modules/conf_applications/e_mod_main.h
  89. 14
      src/modules/conf_bindings/e_int_config_acpibindings.c
  90. 11
      src/modules/conf_bindings/e_int_config_edgebindings.c
  91. 4
      src/modules/conf_bindings/e_int_config_keybindings.c
  92. 4
      src/modules/conf_bindings/e_int_config_mousebindings.c
  93. 11
      src/modules/conf_bindings/e_int_config_signalbindings.c
  94. 10
      src/modules/conf_bindings/e_mod_main.h
  95. 4
      src/modules/conf_dialogs/e_int_config_dialogs.c
  96. 6
      src/modules/conf_dialogs/e_int_config_profiles.c
  97. 4
      src/modules/conf_dialogs/e_mod_main.h
  98. 9
      src/modules/conf_display/e_int_config_desk.c
  99. 6
      src/modules/conf_display/e_int_config_desklock.c
  100. 6
      src/modules/conf_display/e_int_config_desklock_fsel.c
  101. Some files were not shown because too many files have changed in this diff Show More

@ -5,7 +5,6 @@ src/bin/e_atoms.c
src/bin/e_bg.c
src/bin/e_bindings.c
src/bin/e_box.c
src/bin/e_canvas.c
src/bin/e_client.c
src/bin/e_color.c
src/bin/e_color_class.c

@ -48,7 +48,6 @@ src/bin/e_backlight.h \
src/bin/e_bg.h \
src/bin/e_bindings.h \
src/bin/e_box.h \
src/bin/e_canvas.h \
src/bin/e_client.h \
src/bin/e_client.x \
src/bin/e_color_class.h \
@ -222,7 +221,6 @@ src/bin/e_backlight.c \
src/bin/e_bg.c \
src/bin/e_bindings.c \
src/bin/e_box.c \
src/bin/e_canvas.c \
src/bin/e_client.c \
src/bin/e_color.c \
src/bin/e_color_class.c \

@ -267,6 +267,11 @@ typedef struct _E_Rect E_Rect;
} \
}
#define WEIGHT evas_object_size_hint_weight_set
#define ALIGN evas_object_size_hint_align_set
#define EXPAND(X) WEIGHT((X), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND)
#define FILL(X) ALIGN((X), EVAS_HINT_FILL, EVAS_HINT_FILL)
# define E_REMOTE_OPTIONS 1
# define E_REMOTE_OUT 2
# define E_WM_IN 3

@ -327,12 +327,9 @@ _e_actions_cb_kill_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__
}
static void
_e_actions_cb_kill_dialog_delete(E_Win *win)
_e_actions_cb_kill_dialog_delete(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Dialog *dia;
dia = win->data;
_e_actions_cb_kill_dialog_cancel(NULL, dia);
_e_actions_cb_kill_dialog_cancel(NULL, data);
}
ACT_FN_GO(window_kill, __UNUSED__)
@ -364,8 +361,8 @@ ACT_FN_GO(window_kill, __UNUSED__)
kill_dialog = e_dialog_new(NULL,
"E", "_kill_dialog");
if (!kill_dialog) return;
e_win_delete_callback_set(kill_dialog->win,
_e_actions_cb_kill_dialog_delete);
evas_object_event_callback_add(kill_dialog->win, EVAS_CALLBACK_DEL,
_e_actions_cb_kill_dialog_delete, kill_dialog);
e_dialog_title_set(kill_dialog,
_("Are you sure you want to kill this window?"));
e_dialog_text_set(kill_dialog, _(dialog_text));
@ -375,7 +372,7 @@ ACT_FN_GO(window_kill, __UNUSED__)
e_dialog_button_add(kill_dialog, _("No"), NULL,
_e_actions_cb_kill_dialog_cancel, NULL);
e_dialog_button_focus_num(kill_dialog, 1);
e_win_centered_set(kill_dialog->win, 1);
elm_win_center(kill_dialog->win, 1, 1);
e_dialog_show(kill_dialog);
}
@ -1364,8 +1361,8 @@ _e_actions_zone_get(E_Object *obj)
return ((E_Client *)obj)->zone;
else if (obj->type == (int)E_SHELF_TYPE)
return ((E_Shelf *)obj)->zone;
else if (obj->type == (int)E_WIN_TYPE)
return ((E_Win *)obj)->client->zone;
else if (e_obj_is_win(obj))
return e_win_client_get((void*)obj)->zone;
}
return e_util_zone_current_get(e_manager_current_get());
}
@ -2050,12 +2047,9 @@ _e_actions_cb_exit_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__
}
static void
_e_actions_cb_exit_dialog_delete(E_Win *win)
_e_actions_cb_exit_dialog_delete(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Dialog *dia;
dia = win->data;
_e_actions_cb_exit_dialog_cancel(NULL, dia);
_e_actions_cb_exit_dialog_cancel(NULL, data);
}
ACT_FN_GO(exit, )
@ -2075,7 +2069,7 @@ ACT_FN_GO(exit, )
exit_dialog = e_dialog_new(NULL, "E", "_exit_dialog");
if (!exit_dialog) return;
e_win_delete_callback_set(exit_dialog->win, _e_actions_cb_exit_dialog_delete);
evas_object_event_callback_add(exit_dialog->win, EVAS_CALLBACK_DEL, _e_actions_cb_exit_dialog_delete, exit_dialog);
e_dialog_title_set(exit_dialog, _("Exit"));
e_dialog_text_set(exit_dialog, _("Are you sure you want to exit Enlightenment?"));
e_dialog_icon_set(exit_dialog, "application-exit", 64);
@ -2084,7 +2078,7 @@ ACT_FN_GO(exit, )
e_dialog_button_add(exit_dialog, _("No"), NULL,
_e_actions_cb_exit_dialog_cancel, NULL);
e_dialog_button_focus_num(exit_dialog, 1);
e_win_centered_set(exit_dialog->win, 1);
elm_win_center(exit_dialog->win, 1, 1);
e_dialog_show(exit_dialog);
}
@ -2144,12 +2138,9 @@ _e_actions_cb_logout_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED
}
static void
_e_actions_cb_logout_dialog_delete(E_Win *win)
_e_actions_cb_logout_dialog_delete(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Dialog *dia;
dia = win->data;
_e_actions_cb_logout_dialog_cancel(NULL, dia);
_e_actions_cb_logout_dialog_cancel(NULL, data);
}
ACT_FN_GO(logout, )
@ -2169,7 +2160,7 @@ ACT_FN_GO(logout, )
logout_dialog = e_dialog_new(NULL, "E", "_logout_dialog");
if (!logout_dialog) return;
e_win_delete_callback_set(logout_dialog->win, _e_actions_cb_logout_dialog_delete);
evas_object_event_callback_add(logout_dialog->win, EVAS_CALLBACK_DEL, _e_actions_cb_logout_dialog_delete, logout_dialog);
e_dialog_title_set(logout_dialog, _("Logout"));
e_dialog_text_set(logout_dialog, _("Are you sure you want to logout?"));
e_dialog_icon_set(logout_dialog, "system-log-out", 64);
@ -2178,7 +2169,7 @@ ACT_FN_GO(logout, )
e_dialog_button_add(logout_dialog, _("No"), NULL,
_e_actions_cb_logout_dialog_cancel, NULL);
e_dialog_button_focus_num(logout_dialog, 1);
e_win_centered_set(logout_dialog->win, 1);
elm_win_center(logout_dialog->win, 1, 1);
e_dialog_show(logout_dialog);
}
@ -2204,7 +2195,7 @@ _e_actions_cb_halt_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED__
}
static void
_e_actions_cb_halt_dialog_delete(E_Win *win __UNUSED__)
_e_actions_cb_halt_dialog_delete(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
if (!halt_dialog) return;
e_object_del(E_OBJECT(halt_dialog));
@ -2228,7 +2219,7 @@ ACT_FN_GO(halt, )
halt_dialog = e_dialog_new(NULL, "E", "_halt_dialog");
if (!halt_dialog) return;
e_win_delete_callback_set(halt_dialog->win, _e_actions_cb_halt_dialog_delete);
evas_object_event_callback_add(halt_dialog->win, EVAS_CALLBACK_DEL, _e_actions_cb_halt_dialog_delete, halt_dialog);
e_dialog_title_set(halt_dialog, _("Power off"));
e_dialog_text_set(halt_dialog,
_("Are you sure you want to power off your computer?"));
@ -2238,7 +2229,7 @@ ACT_FN_GO(halt, )
e_dialog_button_add(halt_dialog, _("No"), NULL,
_e_actions_cb_halt_dialog_cancel, NULL);
e_dialog_button_focus_num(halt_dialog, 1);
e_win_centered_set(halt_dialog->win, 1);
elm_win_center(halt_dialog->win, 1, 1);
e_dialog_show(halt_dialog);
}
@ -2264,12 +2255,9 @@ _e_actions_cb_reboot_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSED
}
static void
_e_actions_cb_reboot_dialog_delete(E_Win *win)
_e_actions_cb_reboot_dialog_delete(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Dialog *dia;
dia = win->data;
_e_actions_cb_reboot_dialog_cancel(NULL, dia);
_e_actions_cb_reboot_dialog_cancel(NULL, data);
}
ACT_FN_GO(reboot, )
@ -2289,7 +2277,7 @@ ACT_FN_GO(reboot, )
reboot_dialog = e_dialog_new(NULL, "E", "_reboot_dialog");
if (!reboot_dialog) return;
e_win_delete_callback_set(reboot_dialog->win, _e_actions_cb_reboot_dialog_delete);
evas_object_event_callback_add(reboot_dialog->win, EVAS_CALLBACK_DEL, _e_actions_cb_reboot_dialog_delete, reboot_dialog);
e_dialog_title_set(reboot_dialog, _("Reboot"));
e_dialog_text_set(reboot_dialog, _("Are you sure you want to reboot your computer?"));
e_dialog_icon_set(reboot_dialog, "system-restart", 64);
@ -2298,7 +2286,7 @@ ACT_FN_GO(reboot, )
e_dialog_button_add(reboot_dialog, _("No"), NULL,
_e_actions_cb_reboot_dialog_cancel, NULL);
e_dialog_button_focus_num(reboot_dialog, 1);
e_win_centered_set(reboot_dialog->win, 1);
elm_win_center(reboot_dialog->win, 1, 1);
e_dialog_show(reboot_dialog);
}
@ -2324,12 +2312,9 @@ _e_actions_cb_suspend_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNUSE
}
static void
_e_actions_cb_suspend_dialog_delete(E_Win *win)
_e_actions_cb_suspend_dialog_delete(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Dialog *dia;
dia = win->data;
_e_actions_cb_suspend_dialog_cancel(NULL, dia);
_e_actions_cb_suspend_dialog_cancel(NULL, data);
}
ACT_FN_GO(suspend_now, __UNUSED__)
@ -2354,7 +2339,7 @@ ACT_FN_GO(suspend, )
suspend_dialog = e_dialog_new(NULL, "E", "_suspend_dialog");
if (!suspend_dialog) return;
e_win_delete_callback_set(suspend_dialog->win, _e_actions_cb_suspend_dialog_delete);
evas_object_event_callback_add(suspend_dialog->win, EVAS_CALLBACK_DEL, _e_actions_cb_suspend_dialog_delete, suspend_dialog);
e_dialog_title_set(suspend_dialog, _("Suspend"));
e_dialog_text_set(suspend_dialog, _("Are you sure you want to suspend your computer?"));
e_dialog_icon_set(suspend_dialog, "system-suspend", 64);
@ -2363,7 +2348,7 @@ ACT_FN_GO(suspend, )
e_dialog_button_add(suspend_dialog, _("No"), NULL,
_e_actions_cb_suspend_dialog_cancel, NULL);
e_dialog_button_focus_num(suspend_dialog, 1);
e_win_centered_set(suspend_dialog->win, 1);
elm_win_center(suspend_dialog->win, 1, 1);
e_dialog_show(suspend_dialog);
}
@ -2389,12 +2374,9 @@ _e_actions_cb_hibernate_dialog_cancel(void *data __UNUSED__, E_Dialog *dia __UNU
}
static void
_e_actions_cb_hibernate_dialog_delete(E_Win *win)
_e_actions_cb_hibernate_dialog_delete(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Dialog *dia;
dia = win->data;
_e_actions_cb_hibernate_dialog_cancel(NULL, dia);
_e_actions_cb_hibernate_dialog_cancel(NULL, data);
}
ACT_FN_GO(hibernate_now, __UNUSED__)
@ -2419,7 +2401,7 @@ ACT_FN_GO(hibernate, )
hibernate_dialog = e_dialog_new(NULL, "E", "_hibernate_dialog");
if (!hibernate_dialog) return;
e_win_delete_callback_set(hibernate_dialog->win, _e_actions_cb_hibernate_dialog_delete);
evas_object_event_callback_add(hibernate_dialog->win, EVAS_CALLBACK_DEL, _e_actions_cb_hibernate_dialog_delete, hibernate_dialog);
e_dialog_title_set(hibernate_dialog, _("Hibernate"));
e_dialog_text_set(hibernate_dialog, _("Are you sure you want to hibernate your computer?"));
e_dialog_icon_set(hibernate_dialog, "system-suspend-hibernate", 64);
@ -2428,7 +2410,7 @@ ACT_FN_GO(hibernate, )
e_dialog_button_add(hibernate_dialog, _("No"), NULL,
_e_actions_cb_hibernate_dialog_cancel, NULL);
e_dialog_button_focus_num(hibernate_dialog, 1);
e_win_centered_set(hibernate_dialog->win, 1);
elm_win_center(hibernate_dialog->win, 1, 1);
e_dialog_show(hibernate_dialog);
}

@ -1,197 +0,0 @@
#include "e.h"
/* local subsystem functions */
static Eina_Bool _e_canvas_cb_flush(void *data);
/* local subsystem globals */
static Eina_List *_e_canvases = NULL;
static Ecore_Poller *_e_canvas_cache_flush_poller = NULL;
/* externally accessible functions */
EAPI void
e_canvas_add(Ecore_Evas *ee)
{
Evas *e;
_e_canvases = eina_list_prepend(_e_canvases, ee);
e = ecore_evas_get(ee);
evas_image_cache_set(e, e_config->image_cache * 1024);
evas_font_cache_set(e, e_config->font_cache * 1024);
e_path_evas_append(path_fonts, e);
if (e_config->font_hinting == 0)
{
if (evas_font_hinting_can_hint(e, EVAS_FONT_HINTING_BYTECODE))
evas_font_hinting_set(e, EVAS_FONT_HINTING_BYTECODE);
else if (evas_font_hinting_can_hint(e, EVAS_FONT_HINTING_AUTO))
evas_font_hinting_set(e, EVAS_FONT_HINTING_AUTO);
else
evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
}
else if (e_config->font_hinting == 1)
{
if (evas_font_hinting_can_hint(e, EVAS_FONT_HINTING_AUTO))
evas_font_hinting_set(e, EVAS_FONT_HINTING_AUTO);
else
evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
}
else if (e_config->font_hinting == 2)
evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
}
EAPI void
e_canvas_del(Ecore_Evas *ee)
{
_e_canvases = eina_list_remove(_e_canvases, ee);
}
EAPI void
e_canvas_recache(void)
{
Eina_List *l;
Ecore_Evas *ee;
EINA_LIST_FOREACH(_e_canvases, l, ee)
{
Evas *e;
e = ecore_evas_get(ee);
evas_image_cache_set(e, e_config->image_cache * 1024);
evas_font_cache_set(e, e_config->font_cache * 1024);
}
edje_file_cache_set(e_config->edje_cache);
edje_collection_cache_set(e_config->edje_collection_cache);
if (_e_canvas_cache_flush_poller)
{
ecore_poller_del(_e_canvas_cache_flush_poller);
_e_canvas_cache_flush_poller = NULL;
}
if (e_config->cache_flush_poll_interval > 0)
{
_e_canvas_cache_flush_poller =
ecore_poller_add(ECORE_POLLER_CORE,
e_config->cache_flush_poll_interval,
_e_canvas_cb_flush, NULL);
}
}
EAPI void
e_canvas_cache_flush(void)
{
Eina_List *l;
Ecore_Evas *ee;
EINA_LIST_FOREACH(_e_canvases, l, ee)
{
Evas *e;
e = ecore_evas_get(ee);
evas_image_cache_flush(e);
evas_font_cache_flush(e);
}
edje_file_cache_flush();
edje_collection_cache_flush();
}
EAPI void
e_canvas_cache_reload(void)
{
Eina_List *l;
Ecore_Evas *ee;
EINA_LIST_FOREACH(_e_canvases, l, ee)
{
Evas *e;
e = ecore_evas_get(ee);
evas_image_cache_reload(e);
}
}
EAPI void
e_canvas_idle_flush(void)
{
Eina_List *l;
Ecore_Evas *ee;
EINA_LIST_FOREACH(_e_canvases, l, ee)
{
Evas *e;
e = ecore_evas_get(ee);
evas_render_idle_flush(e);
}
}
EAPI void
e_canvas_rehint(void)
{
Eina_List *l;
Ecore_Evas *ee;
EINA_LIST_FOREACH(_e_canvases, l, ee)
{
Evas *e;
e = ecore_evas_get(ee);
if (e_config->font_hinting == 0)
evas_font_hinting_set(e, EVAS_FONT_HINTING_BYTECODE);
else if (e_config->font_hinting == 1)
evas_font_hinting_set(e, EVAS_FONT_HINTING_AUTO);
else if (e_config->font_hinting == 2)
evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
}
}
EAPI Ecore_Evas *
e_canvas_new(Ecore_Window win, int x, int y, int w, int h,
int direct_resize, int override, Ecore_Window *win_ret)
{
Ecore_Evas *ee = NULL;
switch (e_comp_get(NULL)->comp_type)
{
case E_PIXMAP_TYPE_X:
ee = ecore_evas_software_x11_new(NULL, win, x, y, w, h);
if (ee)
{
ecore_evas_override_set(ee, override);
if (direct_resize) ecore_evas_software_x11_direct_resize_set(ee, 1);
if (win_ret) *win_ret = ecore_evas_software_x11_window_get(ee);
}
break;
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
case E_PIXMAP_TYPE_WL:
/* FIXME: This should be based on if we are rendering with gl or not */
ee = ecore_evas_wayland_shm_new(NULL, win, x, y, w, h, 0);
if (ee)
{
ecore_evas_override_set(ee, override);
if (win_ret)
{
*win_ret =
ecore_wl_window_id_get(ecore_evas_wayland_window_get(ee));
}
}
break;
#endif
default: break;
}
if (!ee)
EINA_LOG_ERR("Impossible to build any Ecore_Evas window !!");
return ee;
}
EAPI const Eina_List *
e_canvas_list(void)
{
return _e_canvases;
}
/* local subsystem functions */
static Eina_Bool
_e_canvas_cb_flush(void *data __UNUSED__)
{
e_canvas_cache_flush();
return ECORE_CALLBACK_RENEW;
}

@ -1,17 +0,0 @@
#ifdef E_TYPEDEFS
#else
#ifndef E_CANVAS_H
#define E_CANVAS_H
EAPI void e_canvas_add(Ecore_Evas *ee);
EAPI void e_canvas_del(Ecore_Evas *ee);
EAPI void e_canvas_recache(void);
EAPI void e_canvas_cache_flush(void);
EAPI void e_canvas_cache_reload(void);
EAPI void e_canvas_idle_flush(void);
EAPI void e_canvas_rehint(void);
EAPI Ecore_Evas *e_canvas_new(Ecore_Window win, int x, int y, int w, int h, int direct_resize, int override, Ecore_Window *win_ret);
EAPI const Eina_List *e_canvas_list(void);
#endif
#endif

@ -483,11 +483,7 @@ _e_client_free(E_Client *ec)
EINA_LIST_FREE(ec->e.state.video_child, tmp)
tmp->e.state.video_parent_client = NULL;
}
if (ec->internal_ecore_evas)
{
e_canvas_del(ec->internal_ecore_evas);
E_FREE_FUNC(ec->internal_ecore_evas, ecore_evas_free);
}
E_FREE_FUNC(ec->internal_elm_win, evas_object_del);
E_FREE_FUNC(ec->desktop, efreet_desktop_free);
E_FREE_FUNC(ec->post_job, ecore_idle_enterer_del);
@ -596,8 +592,8 @@ _e_client_del(E_Client *ec)
e_int_client_menu_del(ec);
E_FREE_FUNC(ec->raise_timer, ecore_timer_del);
if (ec->internal_ecore_evas)
ecore_evas_hide(ec->internal_ecore_evas);
if (ec->internal_elm_win)
evas_object_hide(ec->internal_elm_win);
if (ec->focused)
_e_client_revert_focus(ec);
@ -1383,7 +1379,7 @@ _e_client_cb_evas_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN
Evas_Coord x, y;
ec->pre_res_change.valid = 0;
if (ec->internal_ecore_evas)
if (ec->internal_elm_win)
{
EC_CHANGED(ec);
ec->changes.pos = 1;
@ -1418,7 +1414,7 @@ _e_client_cb_evas_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
Evas_Coord x, y, w, h;
ec->pre_res_change.valid = 0;
if (ec->internal_ecore_evas || (!ec->netwm.sync.request))
if (ec->internal_elm_win || (!ec->netwm.sync.request))
{
EC_CHANGED(ec);
ec->changes.size = 1;
@ -1966,11 +1962,7 @@ _e_client_eval(E_Client *ec)
{
ec->changes.size = 0;
if ((!ec->shaded) && (!ec->shading))
{
evas_object_resize(ec->frame, ec->w, ec->h);
if (ec->internal_ecore_evas && (!ec->override))
ecore_evas_move_resize(ec->internal_ecore_evas, 0, 0, ec->client.w, ec->client.h);
}
evas_object_resize(ec->frame, ec->w, ec->h);
rem_change = 1;
prop |= E_CLIENT_PROPERTY_SIZE;

@ -637,7 +637,7 @@ struct E_Client
unsigned int internal_no_reopen : 1;
Eina_Bool theme_shadow : 1;
Ecore_Evas *internal_ecore_evas;
Evas_Object *internal_elm_win;
double ping;

@ -14,7 +14,7 @@ static void _e_color_dialog_cb_csel_change(void *data, Evas_Object *obj);
* @param alpha_enabled if set, uses alpha and let user edit it.
*/
E_Color_Dialog *
e_color_dialog_new(E_Comp *c, const E_Color *color, Eina_Bool alpha_enabled)
e_color_dialog_new(E_Comp *c EINA_UNUSED, const E_Color *color, Eina_Bool alpha_enabled)
{
E_Color_Dialog *dia;
Evas_Object *o;
@ -22,7 +22,7 @@ e_color_dialog_new(E_Comp *c, const E_Color *color, Eina_Bool alpha_enabled)
dia = E_OBJECT_ALLOC(E_Color_Dialog, E_COLOR_DIALOG_TYPE, _e_color_dialog_free);
if (!dia) return NULL;
dia->dia = e_dialog_new(c, "E", "_color_dialog");
dia->dia = e_dialog_new(NULL, "E", "_color_dialog");
e_dialog_title_set(dia->dia, _("Color Selector"));
dia->color = calloc(1, sizeof(E_Color));
@ -36,7 +36,7 @@ e_color_dialog_new(E_Comp *c, const E_Color *color, Eina_Bool alpha_enabled)
e_color_copy(dia->color, dia->initial);
o = e_widget_csel_add(dia->dia->win->evas, dia->color, alpha_enabled);
o = e_widget_csel_add(evas_object_evas_get(dia->dia->win), dia->color, alpha_enabled);
evas_object_show(o);
e_widget_size_min_get(o, &mw, &mh);
e_dialog_content_set(dia->dia, o, mw, mh);
@ -45,7 +45,7 @@ e_color_dialog_new(E_Comp *c, const E_Color *color, Eina_Bool alpha_enabled)
/* buttons at the bottom */
e_dialog_button_add(dia->dia, _("Select"), NULL, _e_color_dialog_button1_click, dia);
e_dialog_button_add(dia->dia, _("Cancel"), NULL, _e_color_dialog_button2_click, dia);
e_win_centered_set(dia->dia->win, 1);
elm_win_center(dia->dia->win, 1, 1);
dia->dia->data = dia;
e_object_del_attach_func_set(E_OBJECT(dia->dia), _e_color_dialog_dia_del);

@ -916,9 +916,6 @@ _e_comp_act_opacity_obj_finder(E_Object *obj)
switch (obj->type)
{
case E_WIN_TYPE:
ec = ((E_Win*)obj)->client;
return ec ? ec->frame : NULL;
case E_CLIENT_TYPE:
return ((E_Client*)obj)->frame;
default:
@ -928,6 +925,8 @@ _e_comp_act_opacity_obj_finder(E_Object *obj)
ec = e_client_focused_get();
return ec ? ec->frame : NULL;
}
if (e_obj_is_win(obj))
return e_win_client_get((void*)obj)->frame;
return NULL;
}
@ -1419,7 +1418,6 @@ e_comp_get(const void *o)
E_Gadcon *gc;
E_Gadcon_Client *gcc;
E_Drag *drag;
E_Win *ewin;
if (!o)
{
@ -1430,9 +1428,6 @@ e_comp_get(const void *o)
/* try to get to zone type first */
switch (obj->type)
{
case E_WIN_TYPE:
ewin = (E_Win*)obj;
return ewin->comp;
case E_DESK_TYPE:
desk = (E_Desk*)obj;
obj = (void*)desk->zone;
@ -1486,6 +1481,11 @@ e_comp_get(const void *o)
if (!man) man = (E_Manager*)obj;
return man->comp;
}
if (e_obj_is_win(obj))
{
ec = e_win_client_get((void*)obj);
return e_comp_get(ec);
}
CRI("UNIMPLEMENTED TYPE PASSED! FIXME!");
return NULL;
}
@ -1649,6 +1649,7 @@ e_comp_e_object_layer_get(const E_Object *obj)
E_Gadcon *gc = NULL;
if (!obj) return 0;
switch (obj->type)
{
case E_GADCON_CLIENT_TYPE:
@ -1659,10 +1660,7 @@ e_comp_e_object_layer_get(const E_Object *obj)
if (!gc) gc = (E_Gadcon *)obj;
if (gc->shelf) return gc->shelf->layer;
if (!gc->toolbar) return E_LAYER_DESKTOP;
return gc->toolbar->fwin->client->layer;
case E_WIN_TYPE:
return ((E_Win *)(obj))->client->layer;
return e_win_client_get(gc->toolbar->fwin)->layer;
case E_ZONE_TYPE:
return E_LAYER_DESKTOP;
@ -1674,6 +1672,8 @@ e_comp_e_object_layer_get(const E_Object *obj)
default:
break;
}
if (e_obj_is_win(obj))
return e_win_client_get((void*)obj)->layer;
return 0;
}

@ -188,8 +188,8 @@ EAPI void e_comp_client_redirect_toggle(E_Client *ec);
EAPI Eina_Bool e_comp_util_object_is_above_nocomp(Evas_Object *obj);
EINTERN Evas_Object *e_comp_style_selector_create(Evas *evas, const char **source);
EAPI E_Config_Dialog *e_int_config_comp(E_Comp *comp, const char *params);
EAPI E_Config_Dialog *e_int_config_comp_match(E_Comp *comp, const char *params);
EAPI E_Config_Dialog *e_int_config_comp(Evas_Object *parent, const char *params);
EAPI E_Config_Dialog *e_int_config_comp_match(Evas_Object *parent, const char *params);
static inline E_Comp *
e_comp_util_evas_object_comp_get(Evas_Object *obj)

@ -1931,6 +1931,8 @@ _e_comp_smart_hide(Evas_Object *obj)
evas_object_hide(cw->clip);
if (cw->input_obj) evas_object_hide(cw->input_obj);
evas_object_hide(cw->effect_obj);
if (cw->ec->internal_elm_win)
evas_object_hide(cw->ec->internal_elm_win);
if (stopping) return;
/* ensure focus-out */
if (cw->ec->focused)
@ -1959,6 +1961,8 @@ _e_comp_smart_show(Evas_Object *obj)
evas_object_show(cw->clip);
if (cw->input_obj) evas_object_show(cw->input_obj);
evas_object_show(cw->effect_obj);
if (cw->ec->internal_elm_win)
evas_object_show(cw->ec->internal_elm_win);
e_comp_render_queue(cw->comp);
e_comp_shape_queue(cw->comp);
if (cw->ec->input_only) return;
@ -2560,6 +2564,8 @@ e_comp_object_util_zone_get(Evas_Object *obj)
int x, y;
E_Comp *c;
if (e_win_client_get(obj))
return e_win_client_get(obj)->zone;
c = e_comp_util_evas_object_comp_get(obj);
if (c)
{
@ -2568,32 +2574,8 @@ e_comp_object_util_zone_get(Evas_Object *obj)
}
else
{
Ecore_Evas *ee;
ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
if (ee)
{
E_Win *win;
win = ecore_evas_data_get(ee, "E_Win");
if (win)
{
if (win->client)
zone = win->client->zone;
else
zone = e_comp_zone_xy_get(NULL, win->x, win->y);
}
else
{
ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
zone = e_comp_zone_xy_get(NULL, x, y);
}
}
else
{
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
zone = e_comp_zone_xy_get(NULL, x, y);
}
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
zone = e_comp_zone_xy_get(NULL, x, y);
}
}
return zone;

@ -2002,7 +2002,7 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec)
ec->comp_data->first_damage = ((ec->internal) || (ec->override));
if ((!e_client_util_ignored_get(ec)) &&
(!ec->internal) && (!ec->internal_ecore_evas))
(!ec->internal))
{
ec->comp_data->need_reparent = EINA_TRUE;
ec->take_focus = !starting;
@ -2127,7 +2127,7 @@ _e_comp_wl_client_cb_pre_frame(void *data EINA_UNUSED, E_Client *ec)
if (ec->visible)
{
if ((ec->comp_data->set_win_type) && (ec->internal_ecore_evas))
if ((ec->comp_data->set_win_type) && (ec->internal_elm_win))
{
int type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
@ -2155,7 +2155,7 @@ _e_comp_wl_client_cb_pre_frame(void *data EINA_UNUSED, E_Client *ec)
break;
}
ecore_evas_wayland_type_set(ec->internal_ecore_evas, type);
ecore_evas_wayland_type_set(e_win_ee_get(ec->internal_elm_win), type);
ec->comp_data->set_win_type = EINA_FALSE;
}
}

@ -192,7 +192,7 @@ _e_comp_x_client_new_helper(E_Client *ec)
e_object_del(E_OBJECT(ec));
return EINA_FALSE;
}
if ((!e_client_util_ignored_get(ec)) && (!ec->internal) && (!ec->internal_ecore_evas))
if ((!e_client_util_ignored_get(ec)) && (!ec->internal) && (!ec->internal_elm_win))
{
ec->comp_data->need_reparent = 1;
EC_CHANGED(ec);
@ -459,8 +459,8 @@ _e_comp_x_client_find_by_alarm(Ecore_X_Sync_Alarm al)
static void
_e_comp_x_client_move_resize_send(E_Client *ec)
{
if (ec->internal_ecore_evas)
ecore_evas_managed_move(ec->internal_ecore_evas, ec->client.x - ec->x, ec->client.y - ec->y);
if (ec->internal_elm_win)
ecore_evas_managed_move(e_win_ee_get(ec->internal_elm_win), ec->client.x - ec->x, ec->client.y - ec->y);
ecore_x_icccm_move_resize_send(e_client_util_win_get(ec), ec->client.x, ec->client.y, ec->client.w, ec->client.h);
}
@ -1166,7 +1166,7 @@ _e_comp_x_show_helper(E_Client *ec)
/* this is most likely an internal window */
ec->comp_data->need_reparent = 1;
ec->visible = 1;
if (ec->internal_ecore_evas)
if (ec->internal_elm_win)
ec->take_focus = 1;
EC_CHANGED(ec);
}
@ -1191,7 +1191,7 @@ _e_comp_x_show_helper(E_Client *ec)
else
evas_object_show(ec->frame);
ec->comp_data->first_map = 1;
if (ec->internal_ecore_evas)
if (ec->internal_elm_win)
{
_e_comp_x_post_client_idler_add(ec);
ec->post_move = 1;
@ -2252,8 +2252,8 @@ _e_comp_x_sync_alarm(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event
if (resize)
{
evas_object_resize(ec->frame, ec->w, ec->h);
if (ec->internal_ecore_evas)
ecore_evas_move_resize(ec->internal_ecore_evas, 0, 0, ec->client.w, ec->client.h);
if (ec->internal_elm_win)
evas_object_resize(ec->internal_elm_win, ec->client.w, ec->client.h);
}
ecore_x_pointer_xy_get(ec->comp->man->root,
@ -2637,29 +2637,19 @@ _e_comp_x_hook_client_post_new_client(void *d EINA_UNUSED, E_Client *ec)
{
Ecore_X_Atom state[1];
int num = 0;
E_Win *win = ecore_evas_data_get(ec->internal_ecore_evas, "E_Win");
if (win->state.centered)
if (e_win_centered_get(ec->internal_elm_win))
state[num++] = E_ATOM_WINDOW_STATE_CENTERED;
if (num)
ecore_x_window_prop_card32_set(win->evas_win, E_ATOM_WINDOW_STATE, state, num);
ecore_x_window_prop_card32_set(elm_win_window_id_get(ec->internal_elm_win), E_ATOM_WINDOW_STATE, state, num);
else
ecore_x_window_prop_property_del(win->evas_win, E_ATOM_WINDOW_STATE);
ecore_x_window_prop_property_del(elm_win_window_id_get(ec->internal_elm_win), E_ATOM_WINDOW_STATE);
ec->changes.internal_state = 0;
}
if (ec->changes.internal_props)
{
E_Win *win = ecore_evas_data_get(ec->internal_ecore_evas, "E_Win");
ecore_x_icccm_size_pos_hints_set(win->evas_win,
win->placed, ECORE_X_GRAVITY_NW,
win->min_w, win->min_h,
win->max_w, win->max_h,
win->base_w, win->base_h,
win->step_x, win->step_y,
win->min_aspect, win->max_aspect);
ec->changes.internal_props = 0;
ec->comp_data->internal_props_set++;
}
@ -2739,7 +2729,7 @@ _e_comp_x_hook_client_pre_frame_assign(void *d EINA_UNUSED, E_Client *ec)
ecore_x_window_shape_input_rectangles_set(pwin, (Ecore_X_Rectangle*)ec->shape_input_rects, ec->shape_input_rects_num);
ec->changes.shape = 1;
ec->changes.shape_input = 1;
if (ec->internal_ecore_evas)
if (ec->internal_elm_win)
{
ecore_x_window_gravity_set(win, ECORE_X_GRAVITY_NW);
ec->changes.reset_gravity = 1;
@ -2750,17 +2740,12 @@ _e_comp_x_hook_client_pre_frame_assign(void *d EINA_UNUSED, E_Client *ec)
if (ec->visible)
{
if (ec->comp_data->set_win_type && ec->internal_ecore_evas)
if (ec->comp_data->set_win_type && ec->internal_elm_win)
{
E_Win *ewin = ecore_evas_data_get(ec->internal_ecore_evas, "E_Win");
if (ewin)
{
if (ec->dialog)
ecore_x_netwm_window_type_set(win, ECORE_X_WINDOW_TYPE_DIALOG);
else
ecore_x_netwm_window_type_set(win, ECORE_X_WINDOW_TYPE_NORMAL);
}
if (ec->dialog)
ecore_x_netwm_window_type_set(win, ECORE_X_WINDOW_TYPE_DIALOG);
else
ecore_x_netwm_window_type_set(win, ECORE_X_WINDOW_TYPE_NORMAL);
ec->comp_data->set_win_type = 0;
}
}

@ -1764,7 +1764,7 @@ _e_config_mv_error(const char *from, const char *to)
e_dialog_text_set(dia, buf);
e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
e_dialog_button_focus_num(dia, 0);
e_win_centered_set(dia->win, 1);
elm_win_center(dia->win, 1, 1);
e_object_del_attach_func_set(E_OBJECT(dia),
_e_config_error_dialog_cb_delete);
e_dialog_show(dia);
@ -2408,7 +2408,7 @@ _e_config_eet_close_handle(Eet_File *ef, char *file)
e_dialog_text_set(dia, buf);
e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
e_dialog_button_focus_num(dia, 0);
e_win_centered_set(dia->win, 1);
elm_win_center(dia->win, 1, 1);
e_object_del_attach_func_set(E_OBJECT(dia),
_e_config_error_dialog_cb_delete);
e_dialog_show(dia);

@ -21,7 +21,7 @@ static Eina_List *_e_config_dialog_list = NULL;
/**
* Creates a new dialog
*
* @param c the compositor the dialog will be added to
* @param parent the parent dialog
* @param title to display for the dialog
* @param name the name used to register the window in e
* @param class the call used to register the window in e
@ -32,14 +32,14 @@ static Eina_List *_e_config_dialog_list = NULL;
* @return returns the created dialog. Null on failure
*/
EAPI E_Config_Dialog *
e_config_dialog_new(E_Comp *c, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data)
e_config_dialog_new(Evas_Object *parent, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data)
{
E_Config_Dialog *cfd;
cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE,
_e_config_dialog_free);
cfd->view = view;
cfd->comp = c;
cfd->parent = parent;
cfd->title = eina_stringshare_add(title);
cfd->name = eina_stringshare_add(name);
cfd->class = eina_stringshare_add(class);
@ -104,23 +104,25 @@ e_config_dialog_find(const char *name, const char *class)
(!e_util_strcmp(class, cfd->class)))
{
E_Zone *z;
E_Client *ec;
z = e_util_zone_current_get(e_manager_current_get());
e_client_uniconify(cfd->dia->win->client);
e_win_raise(cfd->dia->win);
if (z->comp == cfd->dia->win->client->zone->comp)
e_client_desk_set(cfd->dia->win->client, e_desk_current_get(z));
ec = e_win_client_get(cfd->dia->win);
e_client_uniconify(ec);
elm_win_raise(cfd->dia->win);
if (z->comp == ec->zone->comp)
e_client_desk_set(ec, e_desk_current_get(z));
else
{
if (!cfd->dia->win->client->sticky)
e_desk_show(cfd->dia->win->client->desk);
e_util_pointer_center(cfd->dia->win->client);
if (!ec->sticky)
e_desk_show(ec->desk);
e_util_pointer_center(ec);
}
if (cfd->dia->win->client->shaded || cfd->dia->win->client->shading)
e_client_unshade(cfd->dia->win->client, cfd->dia->win->client->shade_dir);
if (ec->shaded || ec->shading)
e_client_unshade(ec, ec->shade_dir);
if ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||
(e_config->focus_setting == E_FOCUS_NEW_WINDOW))
evas_object_focus_set(cfd->dia->win->client->frame, 1);
evas_object_focus_set(ec->frame, 1);
return 1;
}
}
@ -191,9 +193,9 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
if (!pdia) /* creating window for the first time */
{
if ((cfd->view->normal_win) || (e_config->cfgdlg_normal_wins))
cfd->dia = e_dialog_normal_win_new(cfd->comp, cfd->name, buf);
cfd->dia = e_dialog_normal_win_new(cfd->parent, cfd->name, buf);
else
cfd->dia = e_dialog_new(cfd->comp, cfd->name, buf);
cfd->dia = e_dialog_new(cfd->parent, cfd->name, buf);
e_object_del_attach_func_set(E_OBJECT(cfd->dia),
_e_config_dialog_cb_dialog_del);
} /* window was created before - deleting content only */
@ -207,7 +209,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
if (cfd->view->create_cfdata && (!cfd->cfdata))
cfd->cfdata = cfd->view->create_cfdata(cfd);
evas = e_win_evas_get(cfd->dia->win);
evas = evas_object_evas_get(cfd->dia->win);
if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
{
if (cfd->view->advanced.create_widgets)

@ -41,7 +41,7 @@ struct _E_Config_Dialog
E_Config_Dialog_CFData_Type view_type;
E_Config_Dialog_View *view;
E_Config_Dialog_Data *cfdata;
E_Comp *comp;
Evas_Object *parent;
const char *title;
const char *icon;
const char *name;
@ -55,7 +55,7 @@ struct _E_Config_Dialog
unsigned char cfg_changed_auto : 1;
};
EAPI E_Config_Dialog *e_config_dialog_new(E_Comp *c, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data);
EAPI E_Config_Dialog *e_config_dialog_new(Evas_Object *parent, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data);
EAPI int e_config_dialog_find(const char *name, const char *class);
EAPI E_Config_Dialog *e_config_dialog_get(const char *name, const char *class);

@ -5,7 +5,7 @@ static void _e_configure_menu_add(void *data, E_Menu *m);
static void _e_configure_efreet_desktop_cleanup(void);
static void _e_configure_efreet_desktop_update(void);
static Eina_Bool _e_configure_cb_efreet_desktop_cache_update(void *data, int type, void *event);
static void _e_configure_registry_item_full_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func)(E_Comp *c, const char *params), void (*generic_func)(E_Comp *c, const char *params), Efreet_Desktop *desktop, const char *params);
static void _e_configure_registry_item_full_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func)(Evas_Object *parent, const char *params), void (*generic_func)(Evas_Object *parent, const char *params), Efreet_Desktop *desktop, const char *params);
static void _e_configure_registry_item_free(E_Configure_It *eci);
static void _configure_job(void *data);
@ -47,7 +47,7 @@ e_configure_init(void)
}
EAPI void
e_configure_registry_call(const char *path, E_Comp *c, const char *params)
e_configure_registry_call(const char *path, Evas_Object *parent, const char *params)
{
E_Configure_Cat *ecat;
Eina_List *l;
@ -58,7 +58,6 @@ e_configure_registry_call(const char *path, E_Comp *c, const char *params)
cat = ecore_file_dir_get(path);
if (!cat) return;
item = ecore_file_file_get(path);
if (!c) c = e_comp_get(NULL);
EINA_LIST_FOREACH(e_configure_registry, l, ecat)
if (!strcmp(cat, ecat->cat))
{
@ -70,16 +69,16 @@ e_configure_registry_call(const char *path, E_Comp *c, const char *params)
{
if (!params) params = eci->params;
if (eci->func) eci->func(c, params);
if (eci->func) eci->func(parent, params);
else if (eci->generic_func)
eci->generic_func(c, params);
eci->generic_func(parent, params);
else if (eci->desktop)
{
if (custom_desktop_exec.func)
custom_desktop_exec.func(custom_desktop_exec.data,
c, params, eci->desktop);
e_comp_get(NULL), params, eci->desktop);
else
e_exec(e_util_zone_current_get(c->man),
e_exec(e_zone_current_get(e_comp_get(NULL)),
eci->desktop, NULL, NULL, "config");
}
break;
@ -90,19 +89,19 @@ e_configure_registry_call(const char *path, E_Comp *c, const char *params)
}
EAPI void
e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func)(E_Comp *c, const char *params))
e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func)(Evas_Object *parent, const char *params))
{
_e_configure_registry_item_full_add(path, pri, label, icon_file, icon, func, NULL, NULL, NULL);
}
EAPI void
e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func)(E_Comp *c, const char *params))
e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func)(Evas_Object *parent, const char *params))
{