enlightenment
/
enlightenment
5
6
Fork 8
Code Issues 17 Pull Requests Projects Releases Wiki Activity

rewrite theme menu scanning to not need a scan every time the menu opens

Browse Source 
SVN revision: 79210
devs/princeamd/enlightenment-0.17-elive
Mike Blumenkrantz 11 years ago
parent bcac7d0525
commit c064a1d2b0
1 changed files with 189 additions and 157 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 346
      src/modules/conf_theme/e_mod_main.c

346
src/modules/conf_theme/e_mod_main.c
Unescape View File

@ -1,13 +1,9 @@
#include "e.h"
#include "e_mod_main.h"
/* actual module specifics */
static void _e_mod_run_wallpaper_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_mod_menu_wallpaper_add(void *data, E_Menu *m);
static void _e_mod_run_theme_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_mod_menu_theme_add(void *data, E_Menu *m);
static Eio_File *eio_ls[2] = {NULL};
static Eio_Monitor *eio_mon[2] = {NULL};
static Eina_List *handlers = NULL;
static Eina_List *sthemes = NULL;
static Eina_List *themes = NULL;
static const char *cur_theme = NULL;
@ -22,135 +18,6 @@ EAPI E_Module_Api e_modapi =
"Settings - Theme"
};
EAPI void *
e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("internal", -1, _("Internal"),
NULL, "enlightenment/internal");
e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"),
NULL, "preferences-system-windows", e_int_config_wallpaper_desk);
e_configure_registry_item_add("internal/borders_border", -1, _("Border"),
NULL, "preferences-system-windows", e_int_config_borders_border);
e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
"preferences-look");
e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL,
"preferences-desktop-wallpaper",
e_int_config_wallpaper);
e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL,
"preferences-desktop-theme",
e_int_config_theme);
e_configure_registry_item_add("appearance/xsettings", 20, _("Application Theme"), NULL,
"preferences-desktop-theme",
e_int_config_xsettings);
e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL,
"preferences-desktop-color",
e_int_config_color_classes);
e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL,
"preferences-desktop-font",
e_int_config_fonts);
e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL,
"preferences-system-windows",
e_int_config_borders);
e_configure_registry_item_add("appearance/transitions", 60, _("Transitions"), NULL,
"preferences-transitions",
e_int_config_transitions);
e_configure_registry_item_add("appearance/scale", 70, _("Scaling"), NULL,
"preferences-scale",
e_int_config_scale);
e_configure_registry_item_add("appearance/startup", 80, _("Startup"), NULL,
"preferences-startup",
e_int_config_startup);
maug[0] =
e_int_menus_menu_augmentation_add_sorted("config/1", _("Wallpaper"),
_e_mod_menu_wallpaper_add, NULL, NULL, NULL);
maug[1] =
e_int_menus_menu_augmentation_add_sorted("config/1", _("Theme"),
_e_mod_menu_theme_add, NULL, NULL, NULL);
conf_module = m;
e_module_delayed_set(m, 1);
return m;
}
EAPI int
e_modapi_shutdown(E_Module *m __UNUSED__)
{
E_Config_Dialog *cfd;
/* remove module-supplied menu additions */
if (maug[0])
{
e_int_menus_menu_augmentation_del("config/1", maug[0]);
maug[0] = NULL;
}
if (maug[1])
{
e_int_menus_menu_augmentation_del("config/1", maug[1]);
maug[1] = NULL;
}
if (eio_ls[0])
eio_file_cancel(eio_ls[0]);
else
E_FREE_LIST(themes, free);
if (eio_ls[1])
eio_file_cancel(eio_ls[1]);
else
E_FREE_LIST(sthemes, free);
eio_ls[0] = eio_ls[1] = NULL;
cur_theme = NULL;
while ((cfd = e_config_dialog_get("E", "appearance/startup")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/scale")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/transitions")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/borders")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/fonts")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/colors")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "apppearance/theme")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/wallpaper")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/xsettings")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/startup");
e_configure_registry_item_del("appearance/scale");
e_configure_registry_item_del("appearance/transitions");
e_configure_registry_item_del("appearance/borders");
e_configure_registry_item_del("appearance/fonts");
e_configure_registry_item_del("appearance/colors");
e_configure_registry_item_del("appearance/theme");
e_configure_registry_item_del("appearance/wallpaper");
e_configure_registry_item_del("appearance/xsettings");
e_configure_registry_category_del("appearance");
while ((cfd = e_config_dialog_get("E", "internal/borders_border")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/wallpaper")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/borders");
e_configure_registry_item_del("internal/wallpaper_desk");
e_configure_registry_category_del("internal");
conf_module = NULL;
return 1;
}
EAPI int
e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}
/* menu item add hook */
static void
_e_mod_run_wallpaper_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
@ -195,14 +62,6 @@ _sort_cb(const char *a, const char *b)
return e_util_strcasecmp(f1, f2);
}
static void
_item_del(void *data)
{
E_Menu_Item *mi = data;
free(mi->cb.data);
}
static void
_theme_set(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
{
@ -250,7 +109,6 @@ _item_new(char *file, E_Menu *m)
sfx = strrchr(name, '.');
name = strndupa(name, sfx - name);
mi = e_menu_item_new(m);
e_object_del_attach_func_set(E_OBJECT(mi), _item_del);
e_menu_item_label_set(mi, name);
if (used)
e_menu_item_disabled_set(mi, 1);
@ -261,10 +119,8 @@ _item_new(char *file, E_Menu *m)
}
static void
_init_done_cb(void *data, Eio_File *handler)
_init_done_cb(void *data __UNUSED__, Eio_File *handler)
{
char *file;
if ((!eio_ls[0]) && (!eio_ls[1])) goto out;
if (eio_ls[0] == handler)
{
@ -276,14 +132,7 @@ _init_done_cb(void *data, Eio_File *handler)
eio_ls[1] = NULL;
sthemes = eina_list_sort(sthemes, 0, (Eina_Compare_Cb)_sort_cb);
}
if ((eio_ls[0]) || (eio_ls[1])) return;
EINA_LIST_FREE(themes, file)
_item_new(file, data);
e_menu_item_separator_set(e_menu_item_new(data), 1);
EINA_LIST_FREE(sthemes, file)
_item_new(file, data);
e_menu_thaw(data);
return;
out:
E_FREE_LIST(themes, free);
@ -307,7 +156,8 @@ _e_mod_menu_theme_add(void *data __UNUSED__, E_Menu *m)
{
E_Menu_Item *mi;
E_Config_Theme *ct;
char buf[PATH_MAX];
char *file;
Eina_List *l;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Theme"));
@ -319,13 +169,195 @@ _e_mod_menu_theme_add(void *data __UNUSED__, E_Menu *m)
cur_theme = ct->file;
m = e_menu_new();
e_object_del_attach_func_set(E_OBJECT(m), _e_mod_menu_theme_del);
e_menu_freeze(m);
e_menu_title_set(m, "Themes");
e_menu_item_submenu_set(mi, m);
e_object_unref(E_OBJECT(m));
EINA_LIST_FOREACH(themes, l, file)
_item_new(file, m);
if (themes && sthemes)
e_menu_item_separator_set(e_menu_item_new(m), 1);
EINA_LIST_FOREACH(sthemes, l, file)
_item_new(file, m);
}
static Eina_Bool
_monitor_theme_rescan(void *d __UNUSED__, int type __UNUSED__, Eio_Monitor_Event *ev)
{
char buf[PATH_MAX];
if (eio_mon[0] == ev->monitor)
{
if (eio_ls[0]) return ECORE_CALLBACK_RENEW;
E_FREE_LIST(themes, free);
e_user_dir_concat_static(buf, "themes");
eio_ls[0] = eio_file_ls(buf, _eio_filter_cb, _init_main_cb, _init_done_cb, _init_error_cb, NULL);
}
else
{
if (eio_ls[1]) return ECORE_CALLBACK_RENEW;
E_FREE_LIST(sthemes, free);
e_prefix_data_concat_static(buf, "data/themes");
eio_ls[1] = eio_file_ls(buf, _eio_filter_cb, _init_main_cb, _init_done_cb, _init_error_cb, NULL);
}
return ECORE_CALLBACK_RENEW;
}
static Eina_Bool
_monitor_error(void *d __UNUSED__, int type __UNUSED__, Eio_Monitor_Event *ev)
{
if (eio_mon[0] == ev->monitor)
eio_mon[0] = NULL;
else
eio_mon[1] = NULL;
return ECORE_CALLBACK_RENEW;
}
EAPI void *
e_modapi_init(E_Module *m)
{
char buf[PATH_MAX];
e_configure_registry_category_add("internal", -1, _("Internal"),
NULL, "enlightenment/internal");
e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"),
NULL, "preferences-system-windows", e_int_config_wallpaper_desk);
e_configure_registry_item_add("internal/borders_border", -1, _("Border"),
NULL, "preferences-system-windows", e_int_config_borders_border);
e_configure_registry_category_add("appearance", 10, _("Look"), NULL,
"preferences-look");
e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL,
"preferences-desktop-wallpaper",
e_int_config_wallpaper);
e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL,
"preferences-desktop-theme",
e_int_config_theme);
e_configure_registry_item_add("appearance/xsettings", 20, _("Application Theme"), NULL,
"preferences-desktop-theme",
e_int_config_xsettings);
e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL,
"preferences-desktop-color",
e_int_config_color_classes);
e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL,
"preferences-desktop-font",
e_int_config_fonts);
e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL,
"preferences-system-windows",
e_int_config_borders);
e_configure_registry_item_add("appearance/transitions", 60, _("Transitions"), NULL,
"preferences-transitions",
e_int_config_transitions);
e_configure_registry_item_add("appearance/scale", 70, _("Scaling"), NULL,
"preferences-scale",
e_int_config_scale);
e_configure_registry_item_add("appearance/startup", 80, _("Startup"), NULL,
"preferences-startup",
e_int_config_startup);
maug[0] =
e_int_menus_menu_augmentation_add_sorted("config/1", _("Wallpaper"),
_e_mod_menu_wallpaper_add, NULL, NULL, NULL);
maug[1] =
e_int_menus_menu_augmentation_add_sorted("config/1", _("Theme"),
_e_mod_menu_theme_add, NULL, NULL, NULL);
conf_module = m;
e_module_delayed_set(m, 1);
e_user_dir_concat_static(buf, "themes");
eio_ls[0] = eio_file_ls(buf, _eio_filter_cb, _init_main_cb, _init_done_cb, _init_error_cb, m);
eio_mon[0] = eio_monitor_add(buf);
e_prefix_data_concat_static(buf, "data/themes");
eio_ls[1] = eio_file_ls(buf, _eio_filter_cb, _init_main_cb, _init_done_cb, _init_error_cb, m);
eio_mon[1] = eio_monitor_add(buf);
E_LIST_HANDLER_APPEND(handlers, EIO_MONITOR_SELF_DELETED, _monitor_error, NULL);
E_LIST_HANDLER_APPEND(handlers, EIO_MONITOR_FILE_CREATED, _monitor_theme_rescan, NULL);
E_LIST_HANDLER_APPEND(handlers, EIO_MONITOR_FILE_DELETED, _monitor_theme_rescan, NULL);
E_LIST_HANDLER_APPEND(handlers, EIO_MONITOR_ERROR, _monitor_error, NULL);
return m;
}
EAPI int
e_modapi_shutdown(E_Module *m __UNUSED__)
{
E_Config_Dialog *cfd;
/* remove module-supplied menu additions */
if (maug[0])
{
e_int_menus_menu_augmentation_del("config/1", maug[0]);
maug[0] = NULL;
}
if (maug[1])
{
e_int_menus_menu_augmentation_del("config/1", maug[1]);
maug[1] = NULL;
}
if (eio_ls[0])
eio_file_cancel(eio_ls[0]);
else
E_FREE_LIST(themes, free);
if (eio_ls[1])
eio_file_cancel(eio_ls[1]);
else
E_FREE_LIST(sthemes, free);
if (eio_mon[0]) eio_monitor_del(eio_mon[0]);
if (eio_mon[1]) eio_monitor_del(eio_mon[1]);
E_FREE_LIST(handlers, ecore_event_handler_del);
eio_ls[0] = eio_ls[1] = NULL;
eio_mon[0] = eio_mon[1] = NULL;
cur_theme = NULL;
while ((cfd = e_config_dialog_get("E", "appearance/startup")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/scale")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/transitions")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/borders")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/fonts")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/colors")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "apppearance/theme")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/wallpaper")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/xsettings")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/startup");
e_configure_registry_item_del("appearance/scale");
e_configure_registry_item_del("appearance/transitions");
e_configure_registry_item_del("appearance/borders");
e_configure_registry_item_del("appearance/fonts");
e_configure_registry_item_del("appearance/colors");
e_configure_registry_item_del("appearance/theme");
e_configure_registry_item_del("appearance/wallpaper");
e_configure_registry_item_del("appearance/xsettings");
e_configure_registry_category_del("appearance");
while ((cfd = e_config_dialog_get("E", "internal/borders_border")))
e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "appearance/wallpaper")))
e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("appearance/borders");
e_configure_registry_item_del("internal/wallpaper_desk");
e_configure_registry_category_del("internal");
conf_module = NULL;
return 1;
}
EAPI int
e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}

Write Preview
Loading…
Cancel
Save