diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 633b9606a..8f8f8a4d7 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -568,8 +568,7 @@ _e_config_edd_init(Eina_Bool old)
E_CONFIG_LIST(D, T, gadcons, _e_config_gadcon_edd);
E_CONFIG_LIST(D, T, shelves, _e_config_shelf_edd);
E_CONFIG_VAL(D, T, font_hinting, INT); /**/
- E_CONFIG_VAL(D, T, desklock_personal_passwd, STR);
- E_CONFIG_VAL(D, T, desklock_background, STR);
+ E_CONFIG_VAL(D, T, desklock_passwd, INT);
E_CONFIG_LIST(D, T, desklock_backgrounds, _e_config_desklock_bg_edd); /**/
E_CONFIG_VAL(D, T, desklock_auth_method, INT);
E_CONFIG_VAL(D, T, desklock_login_box_zone, INT);
@@ -1298,6 +1297,12 @@ e_config_load(void)
ecore_file_recursive_rm(buf);
}
}
+ CONFIG_VERSION_CHECK(15)
+ {
+ CONFIG_VERSION_UPDATE_INFO(15);
+ if (e_config->desklock_use_custom_desklock)
+ e_config->desklock_auth_method = E_DESKLOCK_AUTH_METHOD_EXTERNAL;
+ }
}
if (!e_config->remember_internal_fm_windows)
e_config->remember_internal_fm_windows = !!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS);
@@ -1398,6 +1403,7 @@ e_config_load(void)
E_CONFIG_LIMIT(e_config->desklock_autolock_idle, 0, 1);
E_CONFIG_LIMIT(e_config->desklock_autolock_idle_timeout, 1.0, 5400.0);
E_CONFIG_LIMIT(e_config->desklock_use_custom_desklock, 0, 1);
+ E_CONFIG_LIMIT(e_config->desklock_auth_method, 0, E_DESKLOCK_AUTH_METHOD_LAST);
E_CONFIG_LIMIT(e_config->desklock_ask_presentation, 0, 1);
E_CONFIG_LIMIT(e_config->desklock_ask_presentation_timeout, 1.0, 300.0);
E_CONFIG_LIMIT(e_config->border_raise_on_mouse_action, 0, 1);
@@ -1482,11 +1488,6 @@ e_config_load(void)
/* FIXME: disabled auto apply because it causes problems */
e_config->cfgdlg_auto_apply = 0;
- /* FIXME: desklock personalized password id disabled for security reasons */
- e_config->desklock_auth_method = 0;
- if (e_config->desklock_personal_passwd)
- eina_stringshare_del(e_config->desklock_personal_passwd);
- e_config->desklock_personal_passwd = NULL;
ecore_event_add(E_EVENT_CONFIG_LOADED, NULL, NULL, NULL);
}
@@ -2243,8 +2244,6 @@ _e_config_free(E_Config *ecf)
if (ecf->transition_change) eina_stringshare_del(ecf->transition_change);
if (ecf->input_method) eina_stringshare_del(ecf->input_method);
if (ecf->exebuf_term_cmd) eina_stringshare_del(ecf->exebuf_term_cmd);
- if (ecf->desklock_personal_passwd) eina_stringshare_del(ecf->desklock_personal_passwd);
- if (ecf->desklock_background) eina_stringshare_del(ecf->desklock_background);
if (ecf->icon_theme) eina_stringshare_del(ecf->icon_theme);
if (ecf->wallpaper_import_last_dev) eina_stringshare_del(ecf->wallpaper_import_last_dev);
if (ecf->wallpaper_import_last_path) eina_stringshare_del(ecf->wallpaper_import_last_path);
diff --git a/src/bin/e_config.c.orig b/src/bin/e_config.c.orig
new file mode 100644
index 000000000..3ccd865e2
--- /dev/null
+++ b/src/bin/e_config.c.orig
@@ -0,0 +1,2381 @@
+#include "e.h"
+
+#if ((E18_PROFILE >= LOWRES_PDA) && (E18_PROFILE <= HIRES_PDA))
+#define DEF_MENUCLICK 1.25
+#else
+#define DEF_MENUCLICK 0.25
+#endif
+
+EAPI E_Config *e_config = NULL;
+EAPI E_Config_Bindings *e_bindings = NULL;
+
+static int _e_config_revisions = 9;
+
+/* local subsystem functions */
+static void _e_config_save_cb(void *data);
+static void _e_config_free(E_Config *cfg);
+static Eina_Bool _e_config_cb_timer(void *data);
+static int _e_config_eet_close_handle(Eet_File *ef, char *file);
+
+/* local subsystem globals */
+static int _e_config_save_block = 0;
+static E_Powersave_Deferred_Action *_e_config_save_defer = NULL;
+static const char *_e_config_profile = NULL;
+
+static E_Config_DD *_e_config_edd = NULL;
+static E_Config_DD *_e_config_binding_edd = NULL;
+static E_Config_DD *_e_config_module_edd = NULL;
+static E_Config_DD *_e_config_font_fallback_edd = NULL;
+static E_Config_DD *_e_config_font_default_edd = NULL;
+static E_Config_DD *_e_config_theme_edd = NULL;
+static E_Config_DD *_e_config_bindings_mouse_edd = NULL;
+static E_Config_DD *_e_config_bindings_key_edd = NULL;
+static E_Config_DD *_e_config_bindings_edge_edd = NULL;
+static E_Config_DD *_e_config_bindings_signal_edd = NULL;
+static E_Config_DD *_e_config_bindings_wheel_edd = NULL;
+static E_Config_DD *_e_config_bindings_acpi_edd = NULL;
+static E_Config_DD *_e_config_path_append_edd = NULL;
+static E_Config_DD *_e_config_desktop_bg_edd = NULL;
+static E_Config_DD *_e_config_desklock_bg_edd = NULL;
+static E_Config_DD *_e_config_desktop_name_edd = NULL;
+static E_Config_DD *_e_config_desktop_window_profile_edd = NULL;
+static E_Config_DD *_e_config_remember_edd = NULL;
+static E_Config_DD *_e_config_menu_applications_edd = NULL;
+static E_Config_DD *_e_config_color_class_edd = NULL;
+static E_Config_DD *_e_config_gadcon_edd = NULL;
+static E_Config_DD *_e_config_gadcon_client_edd = NULL;
+static E_Config_DD *_e_config_shelf_edd = NULL;
+static E_Config_DD *_e_config_shelf_desk_edd = NULL;
+static E_Config_DD *_e_config_mime_icon_edd = NULL;
+static E_Config_DD *_e_config_syscon_action_edd = NULL;
+static E_Config_DD *_e_config_env_var_edd = NULL;
+static E_Config_DD *_e_config_xkb_layout_edd = NULL;
+static E_Config_DD *_e_config_xkb_option_edd = NULL;
+
+EAPI int E_EVENT_CONFIG_ICON_THEME = 0;
+EAPI int E_EVENT_CONFIG_MODE_CHANGED = 0;
+EAPI int E_EVENT_CONFIG_LOADED = 0;
+
+static E_Dialog *_e_config_error_dialog = NULL;
+
+static void
+_e_config_error_dialog_cb_delete(void *dia)
+{
+ if (dia == _e_config_error_dialog)
+ _e_config_error_dialog = NULL;
+}
+
+static const char *
+_e_config_profile_name_get(Eet_File *ef)
+{
+ /* profile config exists */
+ char *data;
+ const char *s = NULL;
+ int data_len = 0;
+
+ data = eet_read(ef, "config", &data_len);
+ if ((data) && (data_len > 0))
+ {
+ int ok = 1;
+
+ for (s = data; s < (data + data_len); s++)
+ {
+ // if profile is not all ascii (valid printable ascii - no
+ // control codes etc.) or it contains a '/' (invalid as its a
+ // directory delimiter) - then it's invalid
+ if ((*s < ' ') || (*s > '~') || (*s == '/'))
+ {
+ ok = 0;
+ break;
+ }
+ }
+ s = NULL;
+ if (ok)
+ s = eina_stringshare_add_length(data, data_len);
+ free(data);
+ }
+ return s;
+}
+
+static void
+_e_config_edd_shutdown(void)
+{
+ E_CONFIG_DD_FREE(_e_config_edd);
+ E_CONFIG_DD_FREE(_e_config_module_edd);
+ E_CONFIG_DD_FREE(_e_config_font_default_edd);
+ E_CONFIG_DD_FREE(_e_config_font_fallback_edd);
+ E_CONFIG_DD_FREE(_e_config_theme_edd);
+ E_CONFIG_DD_FREE(_e_config_path_append_edd);
+ E_CONFIG_DD_FREE(_e_config_desktop_bg_edd);
+ E_CONFIG_DD_FREE(_e_config_desklock_bg_edd);
+ E_CONFIG_DD_FREE(_e_config_desktop_name_edd);
+ E_CONFIG_DD_FREE(_e_config_desktop_window_profile_edd);
+ E_CONFIG_DD_FREE(_e_config_remember_edd);
+ E_CONFIG_DD_FREE(_e_config_menu_applications_edd);
+ E_CONFIG_DD_FREE(_e_config_gadcon_edd);
+ E_CONFIG_DD_FREE(_e_config_gadcon_client_edd);
+ E_CONFIG_DD_FREE(_e_config_shelf_edd);
+ E_CONFIG_DD_FREE(_e_config_shelf_desk_edd);
+ E_CONFIG_DD_FREE(_e_config_mime_icon_edd);
+ E_CONFIG_DD_FREE(_e_config_syscon_action_edd);
+ E_CONFIG_DD_FREE(_e_config_env_var_edd);
+ E_CONFIG_DD_FREE(_e_config_xkb_layout_edd);
+ E_CONFIG_DD_FREE(_e_config_xkb_option_edd);
+}
+
+static void
+_e_config_edd_init(Eina_Bool old)
+{
+
+ _e_config_gadcon_client_edd = E_CONFIG_DD_NEW("E_Config_Gadcon_Client", E_Config_Gadcon_Client);
+#undef T
+#undef D
+#define T E_Config_Gadcon_Client
+#define D _e_config_gadcon_client_edd
+ E_CONFIG_VAL(D, T, name, STR);
+ E_CONFIG_VAL(D, T, id, STR);
+ E_CONFIG_VAL(D, T, geom.pos, INT);
+ E_CONFIG_VAL(D, T, geom.size, INT);
+ E_CONFIG_VAL(D, T, geom.res, INT);
+ E_CONFIG_VAL(D, T, geom.pos_x, DOUBLE);
+ E_CONFIG_VAL(D, T, geom.pos_y, DOUBLE);
+ E_CONFIG_VAL(D, T, geom.size_w, DOUBLE);
+ E_CONFIG_VAL(D, T, geom.size_h, DOUBLE);
+ E_CONFIG_VAL(D, T, state_info.seq, INT);
+ E_CONFIG_VAL(D, T, state_info.flags, INT);
+ E_CONFIG_VAL(D, T, style, STR);
+ E_CONFIG_VAL(D, T, orient, INT);
+ E_CONFIG_VAL(D, T, autoscroll, UCHAR);
+ E_CONFIG_VAL(D, T, resizable, UCHAR);
+
+ _e_config_gadcon_edd = E_CONFIG_DD_NEW("E_Config_Gadcon", E_Config_Gadcon);
+#undef T
+#undef D
+#define T E_Config_Gadcon
+#define D _e_config_gadcon_edd
+ E_CONFIG_VAL(D, T, name, STR);
+ E_CONFIG_VAL(D, T, id, INT);
+ E_CONFIG_VAL(D, T, zone, UINT);
+ E_CONFIG_LIST(D, T, clients, _e_config_gadcon_client_edd);
+
+ _e_config_shelf_desk_edd = E_CONFIG_DD_NEW("E_Config_Shelf_Desk", E_Config_Shelf_Desk);
+#undef T
+#undef D
+#define T E_Config_Shelf_Desk
+#define D _e_config_shelf_desk_edd
+ E_CONFIG_VAL(D, T, x, INT);
+ E_CONFIG_VAL(D, T, y, INT);
+
+ _e_config_shelf_edd = E_CONFIG_DD_NEW("E_Config_Shelf", E_Config_Shelf);
+#undef T
+#undef D
+#define T E_Config_Shelf
+#define D _e_config_shelf_edd
+ E_CONFIG_VAL(D, T, name, STR);
+ E_CONFIG_VAL(D, T, id, INT);
+ E_CONFIG_VAL(D, T, container, INT);
+ E_CONFIG_VAL(D, T, zone, INT);
+ E_CONFIG_VAL(D, T, layer, INT);
+ E_CONFIG_VAL(D, T, popup, UCHAR);
+ E_CONFIG_VAL(D, T, orient, INT);
+ E_CONFIG_VAL(D, T, fit_along, UCHAR);
+ E_CONFIG_VAL(D, T, fit_size, UCHAR);
+ E_CONFIG_VAL(D, T, style, STR);
+ E_CONFIG_VAL(D, T, size, INT);
+ E_CONFIG_VAL(D, T, overlap, INT);
+ E_CONFIG_VAL(D, T, autohide, INT);
+ E_CONFIG_VAL(D, T, autohide_show_action, INT);
+ E_CONFIG_VAL(D, T, hide_timeout, FLOAT);
+ E_CONFIG_VAL(D, T, hide_duration, FLOAT);
+ E_CONFIG_VAL(D, T, desk_show_mode, INT);
+ E_CONFIG_LIST(D, T, desk_list, _e_config_shelf_desk_edd);
+
+ _e_config_desklock_bg_edd = E_CONFIG_DD_NEW("E_Config_Desklock_Background", E_Config_Desklock_Background);
+#undef T
+#undef D
+#define T E_Config_Desklock_Background
+#define D _e_config_desklock_bg_edd
+ E_CONFIG_VAL(D, T, file, STR);
+
+ _e_config_desktop_bg_edd = E_CONFIG_DD_NEW("E_Config_Desktop_Background", E_Config_Desktop_Background);
+#undef T
+#undef D
+#define T E_Config_Desktop_Background
+#define D _e_config_desktop_bg_edd
+ E_CONFIG_VAL(D, T, container, INT);
+ E_CONFIG_VAL(D, T, zone, INT);
+ E_CONFIG_VAL(D, T, desk_x, INT);
+ E_CONFIG_VAL(D, T, desk_y, INT);
+ E_CONFIG_VAL(D, T, file, STR);
+
+ _e_config_desktop_name_edd = E_CONFIG_DD_NEW("E_Config_Desktop_Name", E_Config_Desktop_Name);
+#undef T
+#undef D
+#define T E_Config_Desktop_Name
+#define D _e_config_desktop_name_edd
+ E_CONFIG_VAL(D, T, container, INT);
+ E_CONFIG_VAL(D, T, zone, INT);
+ E_CONFIG_VAL(D, T, desk_x, INT);
+ E_CONFIG_VAL(D, T, desk_y, INT);
+ E_CONFIG_VAL(D, T, name, STR);
+
+ _e_config_desktop_window_profile_edd = E_CONFIG_DD_NEW("E_Config_Desktop_Window_Profile", E_Config_Desktop_Window_Profile);
+#undef T
+#undef D
+#define T E_Config_Desktop_Window_Profile
+#define D _e_config_desktop_window_profile_edd
+ E_CONFIG_VAL(D, T, container, INT);
+ E_CONFIG_VAL(D, T, zone, INT);
+ E_CONFIG_VAL(D, T, desk_x, INT);
+ E_CONFIG_VAL(D, T, desk_y, INT);
+ E_CONFIG_VAL(D, T, profile, STR);
+
+ _e_config_path_append_edd = E_CONFIG_DD_NEW("E_Path_Dir", E_Path_Dir);
+#undef T
+#undef D
+#define T E_Path_Dir
+#define D _e_config_path_append_edd
+ E_CONFIG_VAL(D, T, dir, STR);
+
+ _e_config_theme_edd = E_CONFIG_DD_NEW("E_Config_Theme", E_Config_Theme);
+#undef T
+#undef D
+#define T E_Config_Theme
+#define D _e_config_theme_edd
+ E_CONFIG_VAL(D, T, category, STR);
+ E_CONFIG_VAL(D, T, file, STR);
+
+ _e_config_module_edd = E_CONFIG_DD_NEW("E_Config_Module", E_Config_Module);
+#undef T
+#undef D
+#define T E_Config_Module
+#define D _e_config_module_edd
+ E_CONFIG_VAL(D, T, name, STR);
+ E_CONFIG_VAL(D, T, enabled, UCHAR);
+ E_CONFIG_VAL(D, T, delayed, UCHAR);
+ E_CONFIG_VAL(D, T, priority, INT);
+
+ _e_config_font_default_edd = E_CONFIG_DD_NEW("E_Font_Default",
+ E_Font_Default);
+#undef T
+#undef D
+#define T E_Font_Default
+#define D _e_config_font_default_edd
+ E_CONFIG_VAL(D, T, text_class, STR);
+ E_CONFIG_VAL(D, T, font, STR);
+ E_CONFIG_VAL(D, T, size, INT);
+
+ _e_config_font_fallback_edd = E_CONFIG_DD_NEW("E_Font_Fallback",
+ E_Font_Fallback);
+#undef T
+#undef D
+#define T E_Font_Fallback
+#define D _e_config_font_fallback_edd
+ E_CONFIG_VAL(D, T, name, STR);
+
+ _e_config_menu_applications_edd = E_CONFIG_DD_NEW("E_Int_Menu_Applications",
+ E_Int_Menu_Applications);
+#undef T
+#undef D
+#define T E_Int_Menu_Applications
+#define D _e_config_menu_applications_edd
+ E_CONFIG_VAL(D, T, orig_path, STR);
+ E_CONFIG_VAL(D, T, try_exec, STR);
+ E_CONFIG_VAL(D, T, exec, STR);
+ E_CONFIG_VAL(D, T, load_time, LL);
+ E_CONFIG_VAL(D, T, exec_valid, INT);
+
+ _e_config_remember_edd = E_CONFIG_DD_NEW("E_Remember", E_Remember);
+#undef T
+#undef D
+#define T E_Remember
+#define D _e_config_remember_edd
+ E_CONFIG_VAL(D, T, match, INT);
+ E_CONFIG_VAL(D, T, no_reopen, INT);
+ E_CONFIG_VAL(D, T, apply_first_only, UCHAR);
+ E_CONFIG_VAL(D, T, keep_settings, UCHAR);
+ E_CONFIG_VAL(D, T, name, STR);
+ E_CONFIG_VAL(D, T, class, STR);
+ E_CONFIG_VAL(D, T, title, STR);
+ E_CONFIG_VAL(D, T, role, STR);
+ E_CONFIG_VAL(D, T, type, INT);
+ E_CONFIG_VAL(D, T, transient, UCHAR);
+ E_CONFIG_VAL(D, T, apply, INT);
+ E_CONFIG_VAL(D, T, max_score, INT);
+ E_CONFIG_VAL(D, T, prop.pos_x, INT);
+ E_CONFIG_VAL(D, T, prop.pos_y, INT);
+ E_CONFIG_VAL(D, T, prop.res_x, INT);
+ E_CONFIG_VAL(D, T, prop.res_y, INT);
+ E_CONFIG_VAL(D, T, prop.pos_w, INT);
+ E_CONFIG_VAL(D, T, prop.pos_h, INT);
+ E_CONFIG_VAL(D, T, prop.w, INT);
+ E_CONFIG_VAL(D, T, prop.h, INT);
+ E_CONFIG_VAL(D, T, prop.layer, INT);
+ E_CONFIG_VAL(D, T, prop.lock_user_location, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_client_location, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_user_size, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_client_size, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_user_stacking, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_client_stacking, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_user_iconify, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_client_iconify, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_user_desk, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_client_desk, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_user_sticky, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_client_sticky, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_user_shade, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_client_shade, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_user_maximize, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_client_maximize, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_user_fullscreen, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_client_fullscreen, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_border, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_close, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_focus_in, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_focus_out, UCHAR);
+ E_CONFIG_VAL(D, T, prop.lock_life, UCHAR);
+ E_CONFIG_VAL(D, T, prop.border, STR);
+ E_CONFIG_VAL(D, T, prop.sticky, UCHAR);
+ E_CONFIG_VAL(D, T, prop.shaded, UCHAR);
+ E_CONFIG_VAL(D, T, prop.skip_winlist, UCHAR);
+ E_CONFIG_VAL(D, T, prop.skip_pager, UCHAR);
+ E_CONFIG_VAL(D, T, prop.skip_taskbar, UCHAR);
+ E_CONFIG_VAL(D, T, prop.fullscreen, UCHAR);
+ E_CONFIG_VAL(D, T, prop.desk_x, INT);
+ E_CONFIG_VAL(D, T, prop.desk_y, INT);
+ E_CONFIG_VAL(D, T, prop.zone, INT);
+ E_CONFIG_VAL(D, T, prop.head, INT);
+ E_CONFIG_VAL(D, T, prop.command, STR);
+ E_CONFIG_VAL(D, T, prop.icon_preference, UCHAR);
+ E_CONFIG_VAL(D, T, prop.desktop_file, STR);
+ E_CONFIG_VAL(D, T, prop.offer_resistance, UCHAR);
+
+ _e_config_color_class_edd = E_CONFIG_DD_NEW("E_Color_Class", E_Color_Class);
+#undef T
+#undef D
+#define T E_Color_Class
+#define D _e_config_color_class_edd
+ E_CONFIG_VAL(D, T, name, STR);
+ E_CONFIG_VAL(D, T, r, INT);
+ E_CONFIG_VAL(D, T, g, INT);
+ E_CONFIG_VAL(D, T, b, INT);
+ E_CONFIG_VAL(D, T, a, INT);
+ E_CONFIG_VAL(D, T, r2, INT);
+ E_CONFIG_VAL(D, T, g2, INT);
+ E_CONFIG_VAL(D, T, b2, INT);
+ E_CONFIG_VAL(D, T, a2, INT);
+ E_CONFIG_VAL(D, T, r3, INT);
+ E_CONFIG_VAL(D, T, g3, INT);
+ E_CONFIG_VAL(D, T, b3, INT);
+ E_CONFIG_VAL(D, T, a3, INT);
+
+ _e_config_mime_icon_edd = E_CONFIG_DD_NEW("E_Config_Mime_Icon",
+ E_Config_Mime_Icon);
+#undef T
+#undef D
+#define T E_Config_Mime_Icon
+#define D _e_config_mime_icon_edd
+ E_CONFIG_VAL(D, T, mime, STR);
+ E_CONFIG_VAL(D, T, icon, STR);
+
+ _e_config_syscon_action_edd = E_CONFIG_DD_NEW("E_Config_Syscon_Action",
+ E_Config_Syscon_Action);
+#undef T
+#undef D
+#define T E_Config_Syscon_Action
+#define D _e_config_syscon_action_edd
+ E_CONFIG_VAL(D, T, action, STR);
+ E_CONFIG_VAL(D, T, params, STR);
+ E_CONFIG_VAL(D, T, button, STR);
+ E_CONFIG_VAL(D, T, icon, STR);
+ E_CONFIG_VAL(D, T, is_main, INT);
+
+ _e_config_env_var_edd = E_CONFIG_DD_NEW("E_Config_Env_Var",
+ E_Config_Env_Var);
+#undef T
+#undef D
+#define T E_Config_Env_Var
+#define D _e_config_env_var_edd
+ E_CONFIG_VAL(D, T, var, STR);
+ E_CONFIG_VAL(D, T, val, STR);
+ E_CONFIG_VAL(D, T, unset, UCHAR);
+
+ _e_config_xkb_layout_edd = E_CONFIG_DD_NEW("E_Config_XKB_Layout",
+ E_Config_XKB_Layout);
+#undef T
+#undef D
+#define T E_Config_XKB_Layout
+#define D _e_config_xkb_layout_edd
+ E_CONFIG_VAL(D, T, name, STR);
+ E_CONFIG_VAL(D, T, model, STR);
+ E_CONFIG_VAL(D, T, variant, STR);
+
+ _e_config_xkb_option_edd = E_CONFIG_DD_NEW("E_Config_XKB_Option",
+ E_Config_XKB_Option);
+#undef T
+#undef D
+#define T E_Config_XKB_Option
+#define D _e_config_xkb_option_edd
+ E_CONFIG_VAL(D, T, name, STR);
+
+ _e_config_edd = E_CONFIG_DD_NEW("E_Config", E_Config);
+#undef T
+#undef D
+#define T E_Config
+#define D _e_config_edd
+ /**/ /* == already configurable via ipc */
+ E_CONFIG_VAL(D, T, config_version, INT); /**/
+ E_CONFIG_VAL(D, T, config_type, UINT); /**/
+ E_CONFIG_VAL(D, T, show_splash, INT); /**/
+ E_CONFIG_VAL(D, T, init_default_theme, STR); /**/
+ E_CONFIG_VAL(D, T, desktop_default_background, STR); /**/
+ E_CONFIG_VAL(D, T, desktop_default_name, STR); /**/
+ E_CONFIG_VAL(D, T, desktop_default_window_profile, STR); /**/
+ E_CONFIG_LIST(D, T, desktop_backgrounds, _e_config_desktop_bg_edd); /**/
+ E_CONFIG_LIST(D, T, desktop_names, _e_config_desktop_name_edd); /**/
+ E_CONFIG_LIST(D, T, desktop_window_profiles, _e_config_desktop_window_profile_edd);
+ E_CONFIG_VAL(D, T, menus_scroll_speed, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, menus_fast_mouse_move_threshhold, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, menus_click_drag_timeout, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, border_shade_animate, INT); /**/
+ E_CONFIG_VAL(D, T, border_shade_transition, INT); /**/
+ E_CONFIG_VAL(D, T, border_shade_speed, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, framerate, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, priority, INT); /**/
+ E_CONFIG_VAL(D, T, image_cache, INT); /**/
+ E_CONFIG_VAL(D, T, font_cache, INT); /**/
+ E_CONFIG_VAL(D, T, edje_cache, INT); /**/
+ E_CONFIG_VAL(D, T, edje_collection_cache, INT); /**/
+ E_CONFIG_VAL(D, T, zone_desks_x_count, INT); /**/
+ E_CONFIG_VAL(D, T, zone_desks_y_count, INT); /**/
+ E_CONFIG_VAL(D, T, show_desktop_icons, INT); /**/
+ E_CONFIG_VAL(D, T, edge_flip_dragging, INT); /**/
+ E_CONFIG_VAL(D, T, use_shaped_win, INT); /**/
+ E_CONFIG_VAL(D, T, language, STR); /**/
+ E_CONFIG_VAL(D, T, no_module_delay, INT); /**/
+ E_CONFIG_VAL(D, T, desklock_language, STR); /**/
+ E_CONFIG_LIST(D, T, modules, _e_config_module_edd); /**/
+ EET_DATA_DESCRIPTOR_ADD_LIST_STRING(D, T, "bad_modules", bad_modules);
+ E_CONFIG_LIST(D, T, font_fallbacks, _e_config_font_fallback_edd); /**/
+ E_CONFIG_LIST(D, T, font_defaults, _e_config_font_default_edd); /**/
+ E_CONFIG_LIST(D, T, themes, _e_config_theme_edd); /**/
+ E_CONFIG_LIST(D, T, mouse_bindings, _e_config_bindings_mouse_edd); /**/
+ E_CONFIG_LIST(D, T, key_bindings, _e_config_bindings_key_edd); /**/
+ E_CONFIG_LIST(D, T, edge_bindings, _e_config_bindings_edge_edd); /**/
+ E_CONFIG_LIST(D, T, signal_bindings, _e_config_bindings_signal_edd); /**/
+ E_CONFIG_LIST(D, T, wheel_bindings, _e_config_bindings_wheel_edd); /**/
+ E_CONFIG_LIST(D, T, acpi_bindings, _e_config_bindings_acpi_edd); /**/
+ E_CONFIG_LIST(D, T, path_append_data, _e_config_path_append_edd); /**/
+ E_CONFIG_LIST(D, T, path_append_images, _e_config_path_append_edd); /**/
+ E_CONFIG_LIST(D, T, path_append_fonts, _e_config_path_append_edd); /**/
+ E_CONFIG_LIST(D, T, path_append_themes, _e_config_path_append_edd); /**/
+ E_CONFIG_LIST(D, T, path_append_init, _e_config_path_append_edd); /**/
+ E_CONFIG_LIST(D, T, path_append_icons, _e_config_path_append_edd); /**/
+ E_CONFIG_LIST(D, T, path_append_modules, _e_config_path_append_edd); /**/
+ E_CONFIG_LIST(D, T, path_append_backgrounds, _e_config_path_append_edd); /**/
+ E_CONFIG_VAL(D, T, window_placement_policy, INT); /**/
+ E_CONFIG_VAL(D, T, window_grouping, INT); /**/
+ E_CONFIG_VAL(D, T, focus_policy, INT); /**/
+ E_CONFIG_VAL(D, T, focus_setting, INT); /**/
+ E_CONFIG_VAL(D, T, pass_click_on, INT); /**/
+ E_CONFIG_VAL(D, T, window_activehint_policy, INT); /**/
+ E_CONFIG_VAL(D, T, always_click_to_raise, INT); /**/
+ E_CONFIG_VAL(D, T, always_click_to_focus, INT); /**/
+ E_CONFIG_VAL(D, T, use_auto_raise, INT); /**/
+ E_CONFIG_VAL(D, T, auto_raise_delay, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, use_resist, INT); /**/
+ E_CONFIG_VAL(D, T, drag_resist, INT); /**/
+ E_CONFIG_VAL(D, T, desk_resist, INT); /**/
+ E_CONFIG_VAL(D, T, window_resist, INT); /**/
+ E_CONFIG_VAL(D, T, gadget_resist, INT); /**/
+ E_CONFIG_VAL(D, T, geometry_auto_resize_limit, INT); /**/
+ E_CONFIG_VAL(D, T, geometry_auto_move, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_warp_while_selecting, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_warp_at_end, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_no_warp_on_direction, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_warp_speed, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, winlist_scroll_animate, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_scroll_speed, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, winlist_list_show_iconified, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_list_show_other_desk_iconified, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_list_show_other_screen_iconified, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_list_show_other_desk_windows, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_list_show_other_screen_windows, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_list_uncover_while_selecting, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_list_jump_desk_while_selecting, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_list_focus_while_selecting, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_list_raise_while_selecting, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_list_move_after_select, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_pos_align_x, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, winlist_pos_align_y, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, winlist_pos_size_w, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, winlist_pos_size_h, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, winlist_pos_min_w, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_pos_min_h, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_pos_max_w, INT); /**/
+ E_CONFIG_VAL(D, T, winlist_pos_max_h, INT); /**/
+ E_CONFIG_VAL(D, T, maximize_policy, INT); /**/
+ E_CONFIG_VAL(D, T, allow_manip, INT); /**/
+ E_CONFIG_VAL(D, T, border_fix_on_shelf_toggle, INT); /**/
+ E_CONFIG_VAL(D, T, allow_above_fullscreen, INT); /**/
+ E_CONFIG_VAL(D, T, kill_if_close_not_possible, INT); /**/
+ E_CONFIG_VAL(D, T, kill_process, INT); /**/
+ E_CONFIG_VAL(D, T, kill_timer_wait, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, ping_clients, INT); /**/
+ E_CONFIG_VAL(D, T, transition_start, STR); /**/
+ E_CONFIG_VAL(D, T, transition_desk, STR); /**/
+ E_CONFIG_VAL(D, T, transition_change, STR); /**/
+ E_CONFIG_LIST(D, T, remembers, _e_config_remember_edd);
+ E_CONFIG_LIST(D, T, menu_applications, _e_config_menu_applications_edd);
+ E_CONFIG_VAL(D, T, remember_internal_windows, INT);
+ E_CONFIG_VAL(D, T, remember_internal_fm_windows, UCHAR);
+ E_CONFIG_VAL(D, T, remember_internal_fm_windows_globally, UCHAR);
+ E_CONFIG_VAL(D, T, move_info_follows, INT); /**/
+ E_CONFIG_VAL(D, T, resize_info_follows, INT); /**/
+ E_CONFIG_VAL(D, T, move_info_visible, INT); /**/
+ E_CONFIG_VAL(D, T, resize_info_visible, INT); /**/
+ E_CONFIG_VAL(D, T, focus_last_focused_per_desktop, INT); /**/
+ E_CONFIG_VAL(D, T, focus_revert_on_hide_or_close, INT); /**/
+ E_CONFIG_VAL(D, T, pointer_slide, INT); /**/
+ E_CONFIG_VAL(D, T, disable_all_pointer_warps, INT); /**/
+ E_CONFIG_VAL(D, T, pointer_warp_speed, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, use_e_cursor, INT); /**/
+ E_CONFIG_VAL(D, T, cursor_size, INT); /**/
+ E_CONFIG_VAL(D, T, menu_autoscroll_margin, INT); /**/
+ E_CONFIG_VAL(D, T, menu_autoscroll_cursor_margin, INT); /**/
+ E_CONFIG_VAL(D, T, transient.move, INT); /* FIXME: implement */
+ E_CONFIG_VAL(D, T, transient.resize, INT); /* FIXME: implement */
+ E_CONFIG_VAL(D, T, transient.raise, INT); /**/
+ E_CONFIG_VAL(D, T, transient.lower, INT); /**/
+ E_CONFIG_VAL(D, T, transient.layer, INT); /**/
+ E_CONFIG_VAL(D, T, transient.desktop, INT); /**/
+ E_CONFIG_VAL(D, T, transient.iconify, INT); /**/
+ E_CONFIG_VAL(D, T, menu_eap_name_show, INT); /**/
+ E_CONFIG_VAL(D, T, menu_eap_generic_show, INT); /**/
+ E_CONFIG_VAL(D, T, menu_eap_comment_show, INT); /**/
+ E_CONFIG_VAL(D, T, fullscreen_policy, INT); /**/
+ E_CONFIG_VAL(D, T, input_method, STR); /**/
+ E_CONFIG_LIST(D, T, path_append_messages, _e_config_path_append_edd); /**/
+ E_CONFIG_VAL(D, T, exebuf_term_cmd, STR);
+ E_CONFIG_LIST(D, T, color_classes, _e_config_color_class_edd);
+ E_CONFIG_VAL(D, T, use_app_icon, INT);
+ E_CONFIG_VAL(D, T, cnfmdlg_disabled, INT); /**/
+ E_CONFIG_VAL(D, T, cfgdlg_auto_apply, INT); /**/
+ E_CONFIG_VAL(D, T, cfgdlg_default_mode, INT); /**/
+ E_CONFIG_LIST(D, T, gadcons, _e_config_gadcon_edd);
+ E_CONFIG_LIST(D, T, shelves, _e_config_shelf_edd);
+ E_CONFIG_VAL(D, T, font_hinting, INT); /**/
+ E_CONFIG_VAL(D, T, desklock_personal_passwd, STR);
+ E_CONFIG_VAL(D, T, desklock_background, STR);
+ E_CONFIG_LIST(D, T, desklock_backgrounds, _e_config_desklock_bg_edd); /**/
+ E_CONFIG_VAL(D, T, desklock_auth_method, INT);
+ E_CONFIG_VAL(D, T, desklock_login_box_zone, INT);
+ E_CONFIG_VAL(D, T, desklock_start_locked, INT);
+ E_CONFIG_VAL(D, T, desklock_on_suspend, INT);
+ E_CONFIG_VAL(D, T, desklock_autolock_screensaver, INT);
+ E_CONFIG_VAL(D, T, desklock_post_screensaver_time, DOUBLE);
+ E_CONFIG_VAL(D, T, desklock_autolock_idle, INT);
+ E_CONFIG_VAL(D, T, desklock_autolock_idle_timeout, DOUBLE);
+ E_CONFIG_VAL(D, T, desklock_use_custom_desklock, INT);
+ E_CONFIG_VAL(D, T, desklock_custom_desklock_cmd, STR);
+ E_CONFIG_VAL(D, T, desklock_ask_presentation, UCHAR);
+ E_CONFIG_VAL(D, T, desklock_ask_presentation_timeout, DOUBLE);
+
+ E_CONFIG_VAL(D, T, screensaver_enable, INT);
+ E_CONFIG_VAL(D, T, screensaver_timeout, INT);
+ E_CONFIG_VAL(D, T, screensaver_interval, INT);
+ E_CONFIG_VAL(D, T, screensaver_blanking, INT);
+ E_CONFIG_VAL(D, T, screensaver_expose, INT);
+ E_CONFIG_VAL(D, T, screensaver_ask_presentation, UCHAR);
+ E_CONFIG_VAL(D, T, screensaver_ask_presentation_timeout, DOUBLE);
+
+ E_CONFIG_VAL(D, T, screensaver_suspend, UCHAR);
+ E_CONFIG_VAL(D, T, screensaver_suspend_on_ac, UCHAR);
+ E_CONFIG_VAL(D, T, screensaver_suspend_delay, DOUBLE);
+
+ E_CONFIG_VAL(D, T, dpms_enable, INT);
+ E_CONFIG_VAL(D, T, dpms_standby_enable, INT);
+ E_CONFIG_VAL(D, T, dpms_suspend_enable, INT);
+ E_CONFIG_VAL(D, T, dpms_off_enable, INT);
+ E_CONFIG_VAL(D, T, dpms_standby_timeout, INT);
+ E_CONFIG_VAL(D, T, dpms_suspend_timeout, INT);
+ E_CONFIG_VAL(D, T, dpms_off_timeout, INT);
+
+ E_CONFIG_VAL(D, T, clientlist_group_by, INT);
+ E_CONFIG_VAL(D, T, clientlist_include_all_zones, INT);
+ E_CONFIG_VAL(D, T, clientlist_separate_with, INT);
+ E_CONFIG_VAL(D, T, clientlist_sort_by, INT);
+ E_CONFIG_VAL(D, T, clientlist_separate_iconified_apps, INT);
+ E_CONFIG_VAL(D, T, clientlist_warp_to_iconified_desktop, INT);
+ E_CONFIG_VAL(D, T, clientlist_limit_caption_len, INT);
+ E_CONFIG_VAL(D, T, clientlist_max_caption_len, INT);
+
+ E_CONFIG_VAL(D, T, mouse_hand, INT);
+ E_CONFIG_VAL(D, T, mouse_accel_numerator, INT);
+ E_CONFIG_VAL(D, T, mouse_accel_denominator, INT);
+ E_CONFIG_VAL(D, T, mouse_accel_threshold, INT);
+
+ E_CONFIG_VAL(D, T, border_raise_on_mouse_action, INT);
+ E_CONFIG_VAL(D, T, desk_flip_wrap, INT);
+ E_CONFIG_VAL(D, T, fullscreen_flip, INT);
+ E_CONFIG_VAL(D, T, multiscreen_flip, INT);
+
+ E_CONFIG_VAL(D, T, icon_theme, STR);
+ E_CONFIG_VAL(D, T, icon_theme_overrides, UCHAR);
+
+ E_CONFIG_VAL(D, T, desk_flip_animate_mode, INT);
+ E_CONFIG_VAL(D, T, desk_flip_animate_type, STR);
+ E_CONFIG_VAL(D, T, desk_flip_animate_interpolation, INT);
+
+ E_CONFIG_VAL(D, T, wallpaper_import_last_dev, STR);
+ E_CONFIG_VAL(D, T, wallpaper_import_last_path, STR);
+
+ E_CONFIG_VAL(D, T, theme_default_border_style, STR);
+
+ E_CONFIG_LIST(D, T, mime_icons, _e_config_mime_icon_edd); /**/
+
+ E_CONFIG_VAL(D, T, desk_auto_switch, INT);
+
+ E_CONFIG_VAL(D, T, screen_limits, INT);
+
+ E_CONFIG_VAL(D, T, thumb_nice, INT);
+
+ E_CONFIG_VAL(D, T, menu_icons_hide, UCHAR);
+ E_CONFIG_VAL(D, T, menu_favorites_show, INT);
+ E_CONFIG_VAL(D, T, menu_apps_show, INT);
+ E_CONFIG_VAL(D, T, menu_gadcon_client_toplevel, INT);
+
+ E_CONFIG_VAL(D, T, ping_clients_interval, INT);
+ E_CONFIG_VAL(D, T, cache_flush_poll_interval, INT);
+
+ E_CONFIG_VAL(D, T, thumbscroll_enable, INT);
+ E_CONFIG_VAL(D, T, thumbscroll_threshhold, INT);
+ E_CONFIG_VAL(D, T, thumbscroll_momentum_threshhold, DOUBLE);
+ E_CONFIG_VAL(D, T, thumbscroll_friction, DOUBLE);
+
+ E_CONFIG_VAL(D, T, filemanager_single_click, UCHAR);
+ E_CONFIG_VAL(D, T, device_desktop, INT);
+ E_CONFIG_VAL(D, T, device_auto_mount, INT);
+ E_CONFIG_VAL(D, T, device_auto_open, INT);
+ E_CONFIG_VAL(D, T, filemanager_copy, UCHAR);
+ E_CONFIG_VAL(D, T, filemanager_secure_rm, UCHAR);
+
+ E_CONFIG_VAL(D, T, border_keyboard.timeout, DOUBLE);
+ E_CONFIG_VAL(D, T, border_keyboard.move.dx, UCHAR);
+ E_CONFIG_VAL(D, T, border_keyboard.move.dy, UCHAR);
+ E_CONFIG_VAL(D, T, border_keyboard.resize.dx, UCHAR);
+ E_CONFIG_VAL(D, T, border_keyboard.resize.dy, UCHAR);
+
+ E_CONFIG_VAL(D, T, scale.min, DOUBLE);
+ E_CONFIG_VAL(D, T, scale.max, DOUBLE);
+ E_CONFIG_VAL(D, T, scale.factor, DOUBLE);
+ E_CONFIG_VAL(D, T, scale.base_dpi, INT);
+ E_CONFIG_VAL(D, T, scale.use_dpi, UCHAR);
+ E_CONFIG_VAL(D, T, scale.use_custom, UCHAR);
+
+ E_CONFIG_VAL(D, T, show_cursor, UCHAR);
+ E_CONFIG_VAL(D, T, idle_cursor, UCHAR);
+
+ E_CONFIG_VAL(D, T, default_system_menu, STR);
+
+ E_CONFIG_VAL(D, T, cfgdlg_normal_wins, UCHAR);
+
+ E_CONFIG_VAL(D, T, syscon.main.icon_size, INT);
+ E_CONFIG_VAL(D, T, syscon.secondary.icon_size, INT);
+ E_CONFIG_VAL(D, T, syscon.extra.icon_size, INT);
+ E_CONFIG_VAL(D, T, syscon.timeout, DOUBLE);
+ E_CONFIG_VAL(D, T, syscon.do_input, UCHAR);
+ E_CONFIG_LIST(D, T, syscon.actions, _e_config_syscon_action_edd);
+
+ E_CONFIG_VAL(D, T, mode.presentation, UCHAR);
+ E_CONFIG_VAL(D, T, mode.offline, UCHAR);
+
+ E_CONFIG_VAL(D, T, exec.expire_timeout, DOUBLE);
+ E_CONFIG_VAL(D, T, exec.show_run_dialog, UCHAR);
+ E_CONFIG_VAL(D, T, exec.show_exit_dialog, UCHAR);
+
+ E_CONFIG_VAL(D, T, null_container_win, UCHAR);
+
+ E_CONFIG_LIST(D, T, env_vars, _e_config_env_var_edd);
+
+ E_CONFIG_VAL(D, T, backlight.normal, DOUBLE);
+ E_CONFIG_VAL(D, T, backlight.dim, DOUBLE);
+ E_CONFIG_VAL(D, T, backlight.transition, DOUBLE);
+ E_CONFIG_VAL(D, T, backlight.timer, DOUBLE);
+ E_CONFIG_VAL(D, T, backlight.sysdev, STR);
+ E_CONFIG_VAL(D, T, backlight.idle_dim, UCHAR);
+
+ E_CONFIG_VAL(D, T, deskenv.load_xrdb, UCHAR);
+ E_CONFIG_VAL(D, T, deskenv.load_xmodmap, UCHAR);
+ E_CONFIG_VAL(D, T, deskenv.load_gnome, UCHAR);
+ E_CONFIG_VAL(D, T, deskenv.load_kde, UCHAR);
+
+ E_CONFIG_VAL(D, T, powersave.none, DOUBLE);
+ E_CONFIG_VAL(D, T, powersave.low, DOUBLE);
+ E_CONFIG_VAL(D, T, powersave.medium, DOUBLE);
+ E_CONFIG_VAL(D, T, powersave.high, DOUBLE);
+ E_CONFIG_VAL(D, T, powersave.extreme, DOUBLE);
+ E_CONFIG_VAL(D, T, powersave.min, INT);
+ E_CONFIG_VAL(D, T, powersave.max, INT);
+
+ E_CONFIG_VAL(D, T, xsettings.enabled, UCHAR);
+ E_CONFIG_VAL(D, T, xsettings.match_e17_theme, UCHAR);
+ E_CONFIG_VAL(D, T, xsettings.match_e17_icon_theme, UCHAR);
+ E_CONFIG_VAL(D, T, xsettings.xft_antialias, INT);
+ E_CONFIG_VAL(D, T, xsettings.xft_hinting, INT);
+ E_CONFIG_VAL(D, T, xsettings.xft_hint_style, STR);
+ E_CONFIG_VAL(D, T, xsettings.xft_rgba, STR);
+ E_CONFIG_VAL(D, T, xsettings.net_theme_name, STR);
+ E_CONFIG_VAL(D, T, xsettings.net_icon_theme_name, STR);
+ E_CONFIG_VAL(D, T, xsettings.gtk_font_name, STR);
+
+ E_CONFIG_VAL(D, T, update.check, UCHAR);
+ E_CONFIG_VAL(D, T, update.later, UCHAR);
+
+ E_CONFIG_LIST(D, T, xkb.used_layouts, _e_config_xkb_layout_edd);
+ E_CONFIG_LIST(D, T, xkb.used_options, _e_config_xkb_option_edd);
+ E_CONFIG_VAL(D, T, xkb.only_label, INT);
+ E_CONFIG_VAL(D, T, xkb.dont_touch_my_damn_keyboard, UCHAR);
+ E_CONFIG_VAL(D, T, xkb.default_model, STR);
+
+ if (old)
+ {
+ E_CONFIG_SUB(D, T, xkb.current_layout, _e_config_xkb_option_edd);
+ E_CONFIG_SUB(D, T, xkb.sel_layout, _e_config_xkb_option_edd);
+ E_CONFIG_SUB(D, T, xkb.lock_layout, _e_config_xkb_option_edd);
+ }
+ else
+ {
+ E_CONFIG_SUB(D, T, xkb.current_layout, _e_config_xkb_layout_edd);
+ E_CONFIG_SUB(D, T, xkb.sel_layout, _e_config_xkb_layout_edd);
+ E_CONFIG_SUB(D, T, xkb.lock_layout, _e_config_xkb_layout_edd);
+ }
+ E_CONFIG_VAL(D, T, xkb.selected_layout, STR);
+ E_CONFIG_VAL(D, T, xkb.cur_layout, STR);
+ E_CONFIG_VAL(D, T, xkb.desklock_layout, STR);
+ //E_CONFIG_VAL(D, T, xkb.cur_group, INT);
+
+ E_CONFIG_VAL(D, T, exe_always_single_instance, UCHAR);
+
+ E_CONFIG_VAL(D, T, use_desktop_window_profile, INT);
+}
+
+/* externally accessible functions */
+EINTERN int
+e_config_init(void)
+{
+ E_EVENT_CONFIG_ICON_THEME = ecore_event_type_new();
+ E_EVENT_CONFIG_MODE_CHANGED = ecore_event_type_new();
+ E_EVENT_CONFIG_LOADED = ecore_event_type_new();
+
+ /* if environment var set - use this profile name */
+ _e_config_profile = eina_stringshare_add(getenv("E_CONF_PROFILE"));
+
+ if (!_e_config_profile)
+ {
+ Eet_File *ef;
+ char buf[PATH_MAX];
+
+ /* try user profile config */
+ e_user_dir_concat_static(buf, "config/profile.cfg");
+ ef = eet_open(buf, EET_FILE_MODE_READ);
+ if (ef)
+ {
+ _e_config_profile = _e_config_profile_name_get(ef);
+ eet_close(ef);
+ ef = NULL;
+ }
+ if (!_e_config_profile)
+ {
+ int i;
+
+ for (i = 1; i <= _e_config_revisions; i++)
+ {
+ e_user_dir_snprintf(buf, sizeof(buf), "config/profile.%i.cfg", i);
+ ef = eet_open(buf, EET_FILE_MODE_READ);
+ if (ef)
+ {
+ _e_config_profile = _e_config_profile_name_get(ef);
+ eet_close(ef);
+ ef = NULL;
+ if (_e_config_profile) break;
+ }
+ }
+ if (!_e_config_profile)
+ {
+ /* use system if no user profile config */
+ e_prefix_data_concat_static(buf, "data/config/profile.cfg");
+ ef = eet_open(buf, EET_FILE_MODE_READ);
+ }
+ }
+ if (ef)
+ {
+ _e_config_profile = _e_config_profile_name_get(ef);
+ eet_close(ef);
+ ef = NULL;
+ }
+ if (!_e_config_profile)
+ {
+ /* no profile config - try other means */
+ char *lnk = NULL;
+
+ /* check symlink - if default is a symlink to another dir */
+ e_prefix_data_concat_static(buf, "data/config/default");
+ lnk = ecore_file_readlink(buf);
+ /* if so use just the filename as the profile - must be a local link */
+ if (lnk)
+ {
+ _e_config_profile = eina_stringshare_add(ecore_file_file_get(lnk));
+ free(lnk);
+ }
+ else
+ _e_config_profile = eina_stringshare_add("default");
+ }
+ if (!getenv("E_CONF_PROFILE"))
+ e_util_env_set("E_CONF_PROFILE", _e_config_profile);
+ }
+
+ _e_config_bindings_mouse_edd = E_CONFIG_DD_NEW("E_Config_Binding_Mouse",
+ E_Config_Binding_Mouse);
+#undef T
+#undef D
+#define T E_Config_Binding_Mouse
+#define D _e_config_bindings_mouse_edd
+ E_CONFIG_VAL(D, T, context, INT);
+ E_CONFIG_VAL(D, T, modifiers, INT);
+ E_CONFIG_VAL(D, T, action, STR);
+ E_CONFIG_VAL(D, T, params, STR);
+ E_CONFIG_VAL(D, T, button, UCHAR);
+ E_CONFIG_VAL(D, T, any_mod, UCHAR);
+
+ _e_config_bindings_key_edd = E_CONFIG_DD_NEW("E_Config_Binding_Key",
+ E_Config_Binding_Key);
+#undef T
+#undef D
+#define T E_Config_Binding_Key
+#define D _e_config_bindings_key_edd
+ E_CONFIG_VAL(D, T, context, INT);
+ E_CONFIG_VAL(D, T, modifiers, INT);
+ E_CONFIG_VAL(D, T, key, STR);
+ E_CONFIG_VAL(D, T, action, STR);
+ E_CONFIG_VAL(D, T, params, STR);
+ E_CONFIG_VAL(D, T, any_mod, UCHAR);
+
+ _e_config_bindings_edge_edd = E_CONFIG_DD_NEW("E_Config_Binding_Edge",
+ E_Config_Binding_Edge);
+#undef T
+#undef D
+#define T E_Config_Binding_Edge
+#define D _e_config_bindings_edge_edd
+ E_CONFIG_VAL(D, T, context, INT);
+ E_CONFIG_VAL(D, T, modifiers, INT);
+ E_CONFIG_VAL(D, T, action, STR);
+ E_CONFIG_VAL(D, T, params, STR);
+ E_CONFIG_VAL(D, T, edge, UCHAR);
+ E_CONFIG_VAL(D, T, any_mod, UCHAR);
+ E_CONFIG_VAL(D, T, drag_only, UCHAR);
+ E_CONFIG_VAL(D, T, delay, FLOAT);
+
+ _e_config_bindings_signal_edd = E_CONFIG_DD_NEW("E_Config_Binding_Signal",
+ E_Config_Binding_Signal);
+#undef T
+#undef D
+#define T E_Config_Binding_Signal
+#define D _e_config_bindings_signal_edd
+ E_CONFIG_VAL(D, T, context, INT);
+ E_CONFIG_VAL(D, T, signal, STR);
+ E_CONFIG_VAL(D, T, source, STR);
+ E_CONFIG_VAL(D, T, modifiers, INT);
+ E_CONFIG_VAL(D, T, any_mod, UCHAR);
+ E_CONFIG_VAL(D, T, action, STR);
+ E_CONFIG_VAL(D, T, params, STR);
+
+ _e_config_bindings_wheel_edd = E_CONFIG_DD_NEW("E_Config_Binding_Wheel",
+ E_Config_Binding_Wheel);
+#undef T
+#undef D
+#define T E_Config_Binding_Wheel
+#define D _e_config_bindings_wheel_edd
+ E_CONFIG_VAL(D, T, context, INT);
+ E_CONFIG_VAL(D, T, direction, INT);
+ E_CONFIG_VAL(D, T, z, INT);
+ E_CONFIG_VAL(D, T, modifiers, INT);
+ E_CONFIG_VAL(D, T, any_mod, UCHAR);
+ E_CONFIG_VAL(D, T, action, STR);
+ E_CONFIG_VAL(D, T, params, STR);
+
+ _e_config_bindings_acpi_edd = E_CONFIG_DD_NEW("E_Config_Binding_Acpi",
+ E_Config_Binding_Acpi);
+#undef T
+#undef D
+#define T E_Config_Binding_Acpi
+#define D _e_config_bindings_acpi_edd
+ E_CONFIG_VAL(D, T, context, INT);
+ E_CONFIG_VAL(D, T, type, INT);
+ E_CONFIG_VAL(D, T, status, INT);
+ E_CONFIG_VAL(D, T, action, STR);
+ E_CONFIG_VAL(D, T, params, STR);
+
+ _e_config_edd_init(EINA_FALSE);
+
+ _e_config_binding_edd = E_CONFIG_DD_NEW("E_Config_Bindings", E_Config_Bindings);
+#undef T
+#undef D
+#define T E_Config_Bindings
+#define D _e_config_binding_edd
+ E_CONFIG_VAL(D, T, config_version, UINT); /**/
+ E_CONFIG_LIST(D, T, mouse_bindings, _e_config_bindings_mouse_edd); /**/
+ E_CONFIG_LIST(D, T, key_bindings, _e_config_bindings_key_edd); /**/
+ E_CONFIG_LIST(D, T, edge_bindings, _e_config_bindings_edge_edd); /**/
+ E_CONFIG_LIST(D, T, signal_bindings, _e_config_bindings_signal_edd); /**/
+ E_CONFIG_LIST(D, T, wheel_bindings, _e_config_bindings_wheel_edd); /**/
+ E_CONFIG_LIST(D, T, acpi_bindings, _e_config_bindings_acpi_edd); /**/
+
+ e_config_load();
+
+ e_config_save_queue();
+ return 1;
+}
+
+EINTERN int
+e_config_shutdown(void)
+{
+ eina_stringshare_del(_e_config_profile);
+ E_CONFIG_DD_FREE(_e_config_binding_edd);
+ E_CONFIG_DD_FREE(_e_config_bindings_mouse_edd);
+ E_CONFIG_DD_FREE(_e_config_bindings_key_edd);
+ E_CONFIG_DD_FREE(_e_config_bindings_edge_edd);
+ E_CONFIG_DD_FREE(_e_config_bindings_signal_edd);
+ E_CONFIG_DD_FREE(_e_config_bindings_wheel_edd);
+ E_CONFIG_DD_FREE(_e_config_bindings_acpi_edd);
+ _e_config_edd_shutdown();
+ return 1;
+}
+
+EAPI void
+e_config_load(void)
+{
+ int reload = 0;
+
+ e_config = e_config_domain_load("e", _e_config_edd);
+ if (e_config)
+ {
+ /* major version change - that means wipe and restart */
+ if ((e_config->config_version) < E_CONFIG_FILE_EPOCH * 1000000)
+ {
+ /* your config is too old - need new defaults */
+ _e_config_free(e_config);
+ e_config = NULL;
+ reload = 1;
+ ecore_timer_add(1.0, _e_config_cb_timer,
+ _("Settings data needed upgrading. Your old settings have
"
+ "been wiped and a new set of defaults initialized. This
"
+ "will happen regularly during development, so don't report a
"
+ "bug. This simply means Enlightenment needs new settings
"
+ "data by default for usable functionality that your old
"
+ "settings simply lack. This new set of defaults will fix
"
+ "that by adding it in. You can re-configure things now to your
"
+ "liking. Sorry for the hiccup in your settings.
"));
+ }
+ /* config is too new? odd! suspect corruption? */
+ else if (e_config->config_version > E_CONFIG_FILE_VERSION)
+ {
+ /* your config is too new - what the fuck??? */
+ _e_config_free(e_config);
+ e_config = NULL;
+ reload = 1;
+ ecore_timer_add(1.0, _e_config_cb_timer,
+ _("Your settings are NEWER than Enlightenment. This is very
"
+ "strange. This should not happen unless you downgraded
"
+ "Enlightenment or copied the settings from a place where
"
+ "a newer version of Enlightenment was running. This is bad and
"
+ "as a precaution your settings have been now restored to
"
+ "defaults. Sorry for the inconvenience.
"));
+ }
+ if (reload)
+ {
+ e_config_profile_del(e_config_profile_get());
+ e_config_profile_set("default");
+ e_config = e_config_domain_load("e", _e_config_edd);
+ }
+ }
+ while (!e_config)
+ {
+ _e_config_edd_shutdown();
+ _e_config_edd_init(EINA_TRUE);
+ e_config = e_config_domain_load("e", _e_config_edd);
+ /* I made a c&p error here and fucked the world, so this ugliness
+ * will be my public mark of shame until E19 :/
+ * -zmike, 2013
+ */
+ if (e_config)
+ {
+ Eina_List *l;
+ E_Config_XKB_Layout *cl;
+ int set = 0;
+
+ /* this is essentially CONFIG_VERSION_CHECK(7) */
+ INF("Performing config upgrade to %d.%d", 1, 7);
+ _e_config_edd_shutdown();
+ _e_config_edd_init(EINA_FALSE);
+ set += !!e_config->xkb.current_layout;
+ set += !!e_config->xkb.sel_layout;
+ set += !!e_config->xkb.lock_layout;
+ EINA_LIST_FOREACH(e_config->xkb.used_layouts, l, cl)
+ {
+ if (e_config->xkb.current_layout && (e_config->xkb.current_layout->name == cl->name))
+ {
+ e_config->xkb.current_layout->model = eina_stringshare_ref(cl->model);
+ e_config->xkb.current_layout->variant = eina_stringshare_ref(cl->variant);
+ set--;
+ }
+ if (e_config->xkb.sel_layout && (e_config->xkb.sel_layout->name == cl->name))
+ {
+ e_config->xkb.sel_layout->model = eina_stringshare_ref(cl->model);
+ e_config->xkb.sel_layout->variant = eina_stringshare_ref(cl->variant);
+ set--;
+ }
+ if (e_config->xkb.lock_layout && (e_config->xkb.lock_layout->name == cl->name))
+ {
+ e_config->xkb.lock_layout->model = eina_stringshare_ref(cl->model);
+ e_config->xkb.lock_layout->variant = eina_stringshare_ref(cl->variant);
+ set--;
+ }
+ if (!set) break;
+ }
+ break;
+ }
+#undef T
+#undef D
+ e_config_profile_set("default");
+ if (!reload) e_config_profile_del(e_config_profile_get());
+ e_config_save_block_set(1);
+ ecore_app_restart();
+ //e_sys_action_do(E_SYS_RESTART, NULL);
+ return;
+ }
+
+#define CONFIG_VERSION_CHECK(VERSION) \
+ if (e_config->config_version - (E_CONFIG_FILE_EPOCH * 1000000) < (VERSION))
+
+#define CONFIG_VERSION_UPDATE_INFO(VERSION) \
+ INF("Performing config upgrade for %d.%d", E_CONFIG_FILE_EPOCH, VERSION);
+
+ /* this should be 6, an xkb fix fucked up the ordering and this is now really broken */
+ CONFIG_VERSION_CHECK(8)
+ {
+ /* e_bindings config domain didn't exist before this version, so we have to do this
+ * check before we load or else we wipe configs :(
+ */
+#undef SET
+#define SET(X) e_bindings->X = e_config->X, e_config->X = NULL
+
+ //CONFIG_VERSION_UPDATE_INFO(6);
+ if (e_config->mouse_bindings || e_config->key_bindings || e_config->edge_bindings ||
+ e_config->signal_bindings || e_config->wheel_bindings || e_config->acpi_bindings)
+ {
+ e_bindings = E_NEW(E_Config_Bindings, 1);
+ SET(mouse_bindings);
+ SET(key_bindings);
+ SET(edge_bindings);
+ SET(signal_bindings);
+ SET(wheel_bindings);
+ SET(acpi_bindings);
+ e_config_domain_save("e_bindings", _e_config_binding_edd, e_bindings);
+#undef SET
+ }
+ else
+ e_bindings = e_config_domain_load("e_bindings", _e_config_binding_edd);
+ }
+ else
+ e_bindings = e_config_domain_load("e_bindings", _e_config_binding_edd);
+
+ if (e_bindings && (e_bindings->config_version != E_CONFIG_BINDINGS_VERSION))
+ {
+ Eina_Stringshare *prof;
+
+ e_config_bindings_free(e_bindings);
+ prof = eina_stringshare_ref(e_config_profile_get());
+ e_config_profile_set("standard");
+ e_bindings = e_config_domain_system_load("e_bindings", _e_config_binding_edd);
+ e_config_profile_set(prof);
+ eina_stringshare_del(prof);
+ ecore_timer_add(1.0, _e_config_cb_timer,
+ _("Your bindings settings version does not match the current settings version.
"
+ "As a result, all bindings have been reloaded from defaults.
"
+ "Sorry for the inconvenience.
"));
+ }
+
+ if (e_config->config_version < E_CONFIG_FILE_VERSION)
+ {
+ CONFIG_VERSION_CHECK(5)
+ {
+ E_Config_XKB_Layout *cl;
+ Eina_List *l;
+
+ CONFIG_VERSION_UPDATE_INFO(5);
+ if (e_config->xkb.cur_layout || e_config->xkb.selected_layout || e_config->xkb.desklock_layout)
+ {
+ EINA_LIST_FOREACH(e_config->xkb.used_layouts, l, cl)
+ {
+ if (cl->name == e_config->xkb.cur_layout)
+ e_config->xkb.current_layout = e_config_xkb_layout_dup(cl);
+ if (cl->name == e_config->xkb.selected_layout)
+ e_config->xkb.sel_layout = e_config_xkb_layout_dup(cl);
+ if (cl->name == e_config->xkb.desklock_layout)
+ e_config->xkb.lock_layout = e_config_xkb_layout_dup(cl);
+ if (((!!e_config->xkb.current_layout) == (!!e_config->xkb.cur_layout)) &&
+ ((!!e_config->xkb.sel_layout) == (!!e_config->xkb.selected_layout)) &&
+ ((!!e_config->xkb.lock_layout) == (!!e_config->xkb.desklock_layout)))
+ break;
+ }
+ }
+ }
+/* this gets done above but I'm leaving it here so it can be seen
+ CONFIG_VERSION_CHECK(6)
+ {
+ CONFIG_VERSION_UPDATE_INFO(6);
+ e_bindings = E_NEW(E_Config_Bindings, 1);
+#undef SET
+#define SET(X) e_bindings->X = e_config->X, e_config->X = NULL
+
+ SET(mouse_bindings);
+ SET(key_bindings);
+ SET(edge_bindings);
+ SET(signal_bindings);
+ SET(wheel_bindings);
+ SET(acpi_bindings);
+#undef SET
+ e_config_domain_save("e_bindings", _e_config_binding_edd, e_bindings);
+ }
+*/
+ CONFIG_VERSION_CHECK(8)
+ {
+ CONFIG_VERSION_UPDATE_INFO(8);
+ if (!e_config->config_type)
+ {
+ /* I guess this probably isn't great, but whatever */
+ if (eina_list_count(e_bindings->key_bindings) > 2)
+ e_config->config_type = E_CONFIG_PROFILE_TYPE_DESKTOP;
+ else
+ e_config->config_type = E_CONFIG_PROFILE_TYPE_TABLET;
+ }
+ }
+ CONFIG_VERSION_CHECK(10)
+ {
+ int do_conf = 0;
+ Eina_List *l, *ll;
+ E_Config_Module *em;
+ int enabled = 0, delayed = 0, priority = 0;
+
+ CONFIG_VERSION_UPDATE_INFO(10);
+ EINA_LIST_FOREACH_SAFE(e_config->modules, l, ll, em)
+ {
+ Eina_Bool do_free = EINA_FALSE;
+
+ if (!e_util_strcmp(em->name, "comp"))
+ do_free = EINA_TRUE;
+ else if ((!e_util_strcmp(em->name, "conf_keybindings")) || (!e_util_strcmp(em->name, "conf_edgebindings")))
+ {
+ do_conf += do_free = EINA_TRUE;
+ enabled |= em->enabled;
+ delayed |= em->delayed;
+ priority = MIN(priority, em->priority);
+ }
+ if (do_free)
+ {
+ e_config->modules = eina_list_remove_list(e_config->modules, l);
+ eina_stringshare_del(em->name);
+ free(em);
+ }
+ if (do_conf == 2) break;
+ }
+ if (do_conf)
+ {
+ em = E_NEW(E_Config_Module, 1);
+ em->name = eina_stringshare_add("conf_bindings");
+ em->enabled = !!enabled;
+ em->delayed = !!delayed;
+ em->priority = priority;
+ e_config->modules = eina_list_append(e_config->modules, em);
+ }
+ }
+ CONFIG_VERSION_CHECK(11)
+ {
+ CONFIG_VERSION_UPDATE_INFO(11);
+ e_config->pointer_warp_speed = e_config->winlist_warp_speed;
+ e_config->winlist_warp_speed = 0;
+ }
+ CONFIG_VERSION_CHECK(12)
+ {
+ CONFIG_VERSION_UPDATE_INFO(12);
+ switch (e_config->desk_flip_animate_mode)
+ {
+ case 1: //pane
+ e_config->desk_flip_animate_type = eina_stringshare_add("auto/pane");
+ break;
+ case 2: //zoom, now known as diagonal
+ e_config->desk_flip_animate_type = eina_stringshare_add("auto/diagonal");
+ break;
+ default:
+ break;
+ }
+ }
+ CONFIG_VERSION_CHECK(13)
+ {
+ E_Config_Theme *et;
+ E_Path_Dir *epd;
+ char buf[PATH_MAX], buf2[PATH_MAX], *f;
+ Eina_List *files;
+ Eina_Bool fail = EINA_FALSE;
+
+ CONFIG_VERSION_UPDATE_INFO(13);
+ // empty out theme elements of config
+ eina_stringshare_del(e_config->init_default_theme);
+ e_config->init_default_theme = NULL;
+ EINA_LIST_FREE(e_config->themes, et)
+ {
+ if (et->category) eina_stringshare_del(et->category);
+ if (et->file) eina_stringshare_del(et->file);
+ E_FREE(et);
+ }
+ EINA_LIST_FREE(e_config->path_append_themes, epd)
+ {
+ if (epd->dir) eina_stringshare_del(epd->dir);
+ E_FREE(epd);
+ }
+ // copy all of ~/.e/e/themes/* into ~/.elementary/themes
+ // and delete original data in ~/.e/e/themes
+ ecore_file_mkpath(elm_theme_user_dir_get());
+ snprintf(buf, sizeof(buf), "%s/themes", e_user_dir_get());
+ files = ecore_file_ls(buf);
+ EINA_LIST_FREE(files, f)
+ {
+ snprintf(buf, sizeof(buf), "%s/themes/%s",
+ e_user_dir_get(), f);
+ snprintf(buf2, sizeof(buf2), "%s/%s",
+ elm_theme_user_dir_get(), f);
+ if (!ecore_file_cp(buf, buf2)) fail = EINA_TRUE;
+ }
+ if (!fail)
+ {
+ snprintf(buf, sizeof(buf), "%s/themes", e_user_dir_get());
+ ecore_file_recursive_rm(buf);
+ }
+ }
+ }
+ if (!e_config->remember_internal_fm_windows)
+ e_config->remember_internal_fm_windows = !!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS);
+
+ e_bindings->config_version = E_CONFIG_BINDINGS_VERSION;
+ e_config->config_version = E_CONFIG_FILE_VERSION;
+
+ /* limit values so they are sane */
+ E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0);
+ E_CONFIG_LIMIT(e_config->show_splash, 0, 1);
+ E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0);
+ E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
+ E_CONFIG_LIMIT(e_config->border_shade_animate, 0, 1);
+ E_CONFIG_LIMIT(e_config->border_shade_transition, 0, 8);
+ E_CONFIG_LIMIT(e_config->border_shade_speed, 1.0, 20000.0);
+ E_CONFIG_LIMIT(e_config->framerate, 1.0, 200.0);
+ E_CONFIG_LIMIT(e_config->priority, 0, 19);
+ E_CONFIG_LIMIT(e_config->image_cache, 0, 256 * 1024);
+ E_CONFIG_LIMIT(e_config->font_cache, 0, 32 * 1024);
+ E_CONFIG_LIMIT(e_config->edje_cache, 0, 256);
+ E_CONFIG_LIMIT(e_config->edje_collection_cache, 0, 512);
+ E_CONFIG_LIMIT(e_config->cache_flush_poll_interval, 8, 32768);
+ E_CONFIG_LIMIT(e_config->zone_desks_x_count, 1, 64);
+ E_CONFIG_LIMIT(e_config->zone_desks_y_count, 1, 64);
+ E_CONFIG_LIMIT(e_config->show_desktop_icons, 0, 1);
+ E_CONFIG_LIMIT(e_config->edge_flip_dragging, 0, 1);
+ E_CONFIG_LIMIT(e_config->window_placement_policy, E_WINDOW_PLACEMENT_SMART, E_WINDOW_PLACEMENT_MANUAL);
+ E_CONFIG_LIMIT(e_config->window_grouping, 0, 1);
+ E_CONFIG_LIMIT(e_config->focus_policy, 0, 2);
+ E_CONFIG_LIMIT(e_config->focus_setting, 0, 3);
+ E_CONFIG_LIMIT(e_config->pass_click_on, 0, 1);
+ E_CONFIG_LIMIT(e_config->window_activehint_policy, 0, 2);
+ E_CONFIG_LIMIT(e_config->always_click_to_raise, 0, 1);
+ E_CONFIG_LIMIT(e_config->always_click_to_focus, 0, 1);
+ E_CONFIG_LIMIT(e_config->use_auto_raise, 0, 1);
+ E_CONFIG_LIMIT(e_config->auto_raise_delay, 0.0, 9.9);
+ E_CONFIG_LIMIT(e_config->use_resist, 0, 1);
+ E_CONFIG_LIMIT(e_config->drag_resist, 0, 100);
+ E_CONFIG_LIMIT(e_config->desk_resist, 0, 100);
+ E_CONFIG_LIMIT(e_config->window_resist, 0, 100);
+ E_CONFIG_LIMIT(e_config->gadget_resist, 0, 100);
+ E_CONFIG_LIMIT(e_config->geometry_auto_move, 0, 1);
+ E_CONFIG_LIMIT(e_config->geometry_auto_resize_limit, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_warp_while_selecting, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_warp_at_end, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_no_warp_on_direction, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_warp_speed, 0.0, 1.0);
+ E_CONFIG_LIMIT(e_config->winlist_scroll_animate, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_scroll_speed, 0.0, 1.0);
+ E_CONFIG_LIMIT(e_config->winlist_list_show_iconified, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_list_show_other_desk_iconified, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_list_show_other_screen_iconified, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_list_show_other_desk_windows, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_list_show_other_screen_windows, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_list_uncover_while_selecting, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_list_jump_desk_while_selecting, 0, 1);
+ E_CONFIG_LIMIT(e_config->winlist_pos_align_x, 0.0, 1.0);
+ E_CONFIG_LIMIT(e_config->winlist_pos_align_y, 0.0, 1.0);
+ E_CONFIG_LIMIT(e_config->winlist_pos_size_w, 0.0, 1.0);
+ E_CONFIG_LIMIT(e_config->winlist_pos_size_h, 0.0, 1.0);
+ E_CONFIG_LIMIT(e_config->winlist_pos_min_w, 0, 4000);
+ E_CONFIG_LIMIT(e_config->winlist_pos_min_h, 0, 4000);
+ E_CONFIG_LIMIT(e_config->winlist_pos_max_w, 8, 4000);
+ E_CONFIG_LIMIT(e_config->winlist_pos_max_h, 8, 4000);
+ E_CONFIG_LIMIT(e_config->maximize_policy, E_MAXIMIZE_FULLSCREEN, E_MAXIMIZE_DIRECTION);
+ E_CONFIG_LIMIT(e_config->allow_manip, 0, 1);
+ E_CONFIG_LIMIT(e_config->border_fix_on_shelf_toggle, 0, 1);
+ E_CONFIG_LIMIT(e_config->allow_above_fullscreen, 0, 1);
+ E_CONFIG_LIMIT(e_config->kill_if_close_not_possible, 0, 1);
+ E_CONFIG_LIMIT(e_config->kill_process, 0, 1);
+ E_CONFIG_LIMIT(e_config->kill_timer_wait, 0.0, 120.0);
+ E_CONFIG_LIMIT(e_config->ping_clients, 0, 1);
+ E_CONFIG_LIMIT(e_config->move_info_follows, 0, 1);
+ E_CONFIG_LIMIT(e_config->resize_info_follows, 0, 1);
+ E_CONFIG_LIMIT(e_config->move_info_visible, 0, 1);
+ E_CONFIG_LIMIT(e_config->resize_info_visible, 0, 1);
+ E_CONFIG_LIMIT(e_config->focus_last_focused_per_desktop, 0, 1);
+ E_CONFIG_LIMIT(e_config->focus_revert_on_hide_or_close, 0, 1);
+ E_CONFIG_LIMIT(e_config->pointer_slide, 0, 1);
+ E_CONFIG_LIMIT(e_config->disable_all_pointer_warps, 0, 1);
+ E_CONFIG_LIMIT(e_config->pointer_warp_speed, 0.0, 1.0);
+ E_CONFIG_LIMIT(e_config->show_cursor, 0, 1);
+ E_CONFIG_LIMIT(e_config->use_e_cursor, 0, 1);
+ E_CONFIG_LIMIT(e_config->cursor_size, 0, 1024);
+ E_CONFIG_LIMIT(e_config->menu_autoscroll_margin, 0, 50);
+ E_CONFIG_LIMIT(e_config->menu_autoscroll_cursor_margin, 0, 50);
+ E_CONFIG_LIMIT(e_config->menu_eap_name_show, 0, 1);
+ E_CONFIG_LIMIT(e_config->menu_eap_generic_show, 0, 1);
+ E_CONFIG_LIMIT(e_config->menu_eap_comment_show, 0, 1);
+ E_CONFIG_LIMIT(e_config->use_app_icon, 0, 1);
+ E_CONFIG_LIMIT(e_config->cnfmdlg_disabled, 0, 1);
+ E_CONFIG_LIMIT(e_config->cfgdlg_auto_apply, 0, 1);
+ E_CONFIG_LIMIT(e_config->cfgdlg_default_mode, 0, 1);
+ E_CONFIG_LIMIT(e_config->font_hinting, 0, 2);
+ E_CONFIG_LIMIT(e_config->desklock_login_box_zone, -2, 1000);
+ E_CONFIG_LIMIT(e_config->desklock_autolock_screensaver, 0, 1);
+ E_CONFIG_LIMIT(e_config->desklock_post_screensaver_time, 0.0, 300.0);
+ E_CONFIG_LIMIT(e_config->desklock_autolock_idle, 0, 1);
+ E_CONFIG_LIMIT(e_config->desklock_autolock_idle_timeout, 1.0, 5400.0);
+ E_CONFIG_LIMIT(e_config->desklock_use_custom_desklock, 0, 1);
+ E_CONFIG_LIMIT(e_config->desklock_ask_presentation, 0, 1);
+ E_CONFIG_LIMIT(e_config->desklock_ask_presentation_timeout, 1.0, 300.0);
+ E_CONFIG_LIMIT(e_config->border_raise_on_mouse_action, 0, 1);
+ E_CONFIG_LIMIT(e_config->desk_flip_wrap, 0, 1);
+ E_CONFIG_LIMIT(e_config->fullscreen_flip, 0, 1);
+ E_CONFIG_LIMIT(e_config->icon_theme_overrides, 0, 1);
+ E_CONFIG_LIMIT(e_config->remember_internal_windows, 0, 3);
+ E_CONFIG_LIMIT(e_config->remember_internal_fm_windows, 0, 1);
+ E_CONFIG_LIMIT(e_config->remember_internal_fm_windows_globally, 0, 1);
+ E_CONFIG_LIMIT(e_config->desk_auto_switch, 0, 1);
+
+ E_CONFIG_LIMIT(e_config->screen_limits, 0, 2);
+
+ E_CONFIG_LIMIT(e_config->dpms_enable, 0, 1);
+ E_CONFIG_LIMIT(e_config->dpms_standby_enable, 0, 1);
+ E_CONFIG_LIMIT(e_config->dpms_suspend_enable, 0, 1);
+ E_CONFIG_LIMIT(e_config->dpms_off_enable, 0, 1);
+ E_CONFIG_LIMIT(e_config->dpms_standby_timeout, 30, 5400);
+ E_CONFIG_LIMIT(e_config->dpms_suspend_timeout, 30, 5400);
+ E_CONFIG_LIMIT(e_config->dpms_off_timeout, 30, 5400);
+
+ E_CONFIG_LIMIT(e_config->backlight.timer, 1, 3600);
+
+ E_CONFIG_LIMIT(e_config->screensaver_timeout, 30, 5400);
+ E_CONFIG_LIMIT(e_config->screensaver_interval, 0, 5400);
+ E_CONFIG_LIMIT(e_config->screensaver_blanking, 0, 2);
+ E_CONFIG_LIMIT(e_config->screensaver_expose, 0, 2);
+ E_CONFIG_LIMIT(e_config->screensaver_ask_presentation, 0, 1);
+ E_CONFIG_LIMIT(e_config->screensaver_ask_presentation_timeout, 1.0, 300.0);
+
+ E_CONFIG_LIMIT(e_config->clientlist_group_by, 0, 2);
+ E_CONFIG_LIMIT(e_config->clientlist_include_all_zones, 0, 1);
+ E_CONFIG_LIMIT(e_config->clientlist_separate_with, 0, 2);
+ E_CONFIG_LIMIT(e_config->clientlist_sort_by, 0, 3);
+ E_CONFIG_LIMIT(e_config->clientlist_separate_iconified_apps, 0, 2);
+ E_CONFIG_LIMIT(e_config->clientlist_warp_to_iconified_desktop, 0, 1);
+ E_CONFIG_LIMIT(e_config->mouse_hand, 0, 1);
+ E_CONFIG_LIMIT(e_config->clientlist_limit_caption_len, 0, 1);
+ E_CONFIG_LIMIT(e_config->clientlist_max_caption_len, 2, E_CLIENTLIST_MAX_CAPTION_LEN);
+
+ E_CONFIG_LIMIT(e_config->mouse_accel_numerator, 1, 10);
+ E_CONFIG_LIMIT(e_config->mouse_accel_denominator, 1, 10);
+ E_CONFIG_LIMIT(e_config->mouse_accel_threshold, 1, 10);
+
+ E_CONFIG_LIMIT(e_config->menu_favorites_show, 0, 1);
+ E_CONFIG_LIMIT(e_config->menu_apps_show, 0, 1);
+ E_CONFIG_LIMIT(e_config->menu_gadcon_client_toplevel, 0, 1);
+
+ E_CONFIG_LIMIT(e_config->ping_clients_interval, 16, 1024);
+
+ E_CONFIG_LIMIT(e_config->mode.presentation, 0, 1);
+ E_CONFIG_LIMIT(e_config->mode.offline, 0, 1);
+
+ E_CONFIG_LIMIT(e_config->exec.expire_timeout, 0.1, 1000);
+ E_CONFIG_LIMIT(e_config->exec.show_run_dialog, 0, 1);
+ E_CONFIG_LIMIT(e_config->exec.show_exit_dialog, 0, 1);
+
+ E_CONFIG_LIMIT(e_config->null_container_win, 0, 1);
+
+ E_CONFIG_LIMIT(e_config->powersave.none, 0.01, 5400.00);
+ E_CONFIG_LIMIT(e_config->powersave.low, 0.01, 5400.00);
+ E_CONFIG_LIMIT(e_config->powersave.medium, 0.01, 5400.00);
+ E_CONFIG_LIMIT(e_config->powersave.high, 0.01, 5400.00);
+ E_CONFIG_LIMIT(e_config->powersave.extreme, 0.01, 5400.00);
+ E_CONFIG_LIMIT(e_config->powersave.min, E_POWERSAVE_MODE_NONE, E_POWERSAVE_MODE_EXTREME);
+ E_CONFIG_LIMIT(e_config->powersave.max, E_POWERSAVE_MODE_NONE, E_POWERSAVE_MODE_EXTREME);
+
+ E_CONFIG_LIMIT(e_config->border_keyboard.move.dx, 1, 255);
+ E_CONFIG_LIMIT(e_config->border_keyboard.move.dy, 1, 255);
+ E_CONFIG_LIMIT(e_config->border_keyboard.resize.dx, 1, 255);
+ E_CONFIG_LIMIT(e_config->border_keyboard.resize.dy, 1, 255);
+
+ E_CONFIG_LIMIT(e_config->multiscreen_flip, 0, 1);
+
+ if (!e_config->icon_theme)
+ e_config->icon_theme = eina_stringshare_add("hicolor"); // FDO default
+
+ /* FIXME: disabled auto apply because it causes problems */
+ e_config->cfgdlg_auto_apply = 0;
+ /* FIXME: desklock personalized password id disabled for security reasons */
+ e_config->desklock_auth_method = 0;
+ if (e_config->desklock_personal_passwd)
+ eina_stringshare_del(e_config->desklock_personal_passwd);
+ e_config->desklock_personal_passwd = NULL;
+
+ ecore_event_add(E_EVENT_CONFIG_LOADED, NULL, NULL, NULL);
+}
+
+EAPI int
+e_config_save(void)
+{
+ E_FREE_FUNC(_e_config_save_defer, e_powersave_deferred_action_del);
+ _e_config_save_cb(NULL);
+ return e_config_domain_save("e", _e_config_edd, e_config);
+}
+
+EAPI void
+e_config_save_flush(void)
+{
+ if (_e_config_save_defer)
+ {
+ e_powersave_deferred_action_del(_e_config_save_defer);
+ _e_config_save_defer = NULL;
+ _e_config_save_cb(NULL);
+ }
+}
+
+EAPI void
+e_config_save_queue(void)
+{
+ if (_e_config_save_defer)
+ e_powersave_deferred_action_del(_e_config_save_defer);
+ _e_config_save_defer = e_powersave_deferred_action_add(_e_config_save_cb,
+ NULL);
+}
+
+EAPI const char *
+e_config_profile_get(void)
+{
+ return _e_config_profile;
+}
+
+EAPI void
+e_config_profile_set(const char *prof)
+{
+ eina_stringshare_replace(&_e_config_profile, prof);
+ e_util_env_set("E_CONF_PROFILE", _e_config_profile);
+}
+
+EAPI char *
+e_config_profile_dir_get(const char *prof)
+{
+ char buf[PATH_MAX];
+
+ e_user_dir_snprintf(buf, sizeof(buf), "config/%s", prof);
+ if (ecore_file_is_dir(buf)) return strdup(buf);
+ e_prefix_data_snprintf(buf, sizeof(buf), "data/config/%s", prof);
+ if (ecore_file_is_dir(buf)) return strdup(buf);
+ return NULL;
+}
+
+static int
+_cb_sort_files(char *f1, char *f2)
+{
+ return strcmp(f1, f2);
+}
+
+EAPI Eina_List *
+e_config_profile_list(void)
+{
+ Eina_List *files;
+ char buf[PATH_MAX], *p;
+ Eina_List *flist = NULL;
+ size_t len;
+
+ len = e_user_dir_concat_static(buf, "config");
+ if (len + 1 >= (int)sizeof(buf))
+ return NULL;
+
+ files = ecore_file_ls(buf);
+
+ buf[len] = '/';
+ len++;
+
+ p = buf + len;
+ len = sizeof(buf) - len;
+ if (files)
+ {
+ char *file;
+
+ files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
+ EINA_LIST_FREE(files, file)
+ {
+ if (eina_strlcpy(p, file, len) >= len)
+ {
+ free(file);
+ continue;
+ }
+ if (ecore_file_is_dir(buf))
+ flist = eina_list_append(flist, file);
+ else
+ free(file);
+ }
+ }
+ len = e_prefix_data_concat_static(buf, "data/config");
+ if (len >= sizeof(buf))
+ return NULL;
+
+ files = ecore_file_ls(buf);
+
+ buf[len] = '/';
+ len++;
+
+ p = buf + len;
+ len = sizeof(buf) - len;
+ if (files)
+ {
+ char *file;
+ files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
+ EINA_LIST_FREE(files, file)
+ {
+ if (eina_strlcpy(p, file, len) >= len)
+ {
+ free(file);
+ continue;
+ }
+ if (ecore_file_is_dir(buf))
+ {
+ const Eina_List *l;
+ const char *tmp;
+ EINA_LIST_FOREACH(flist, l, tmp)
+ if (!strcmp(file, tmp)) break;
+
+ if (!l) flist = eina_list_append(flist, file);
+ else free(file);
+ }
+ else
+ free(file);
+ }
+ }
+ return flist;
+}
+
+EAPI void
+e_config_profile_add(const char *prof)
+{
+ char buf[4096];
+ if (e_user_dir_snprintf(buf, sizeof(buf), "config/%s", prof) >= sizeof(buf))
+ return;
+ ecore_file_mkdir(buf);
+}
+
+EAPI void
+e_config_profile_del(const char *prof)
+{
+ char buf[4096];
+ if (e_user_dir_snprintf(buf, sizeof(buf), "config/%s", prof) >= sizeof(buf))
+ return;
+ ecore_file_recursive_rm(buf);
+}
+
+EAPI void
+e_config_save_block_set(int block)
+{
+ _e_config_save_block = block;
+}
+
+EAPI int
+e_config_save_block_get(void)
+{
+ return _e_config_save_block;
+}
+
+/**
+ * Loads configurations from file located in the working profile
+ * The configurations are stored in a struct declated by the
+ * macros E_CONFIG_DD_NEW and E_CONFIG_TYPE
+ *
+ * @param domain of the configuration file.
+ * @param edd to struct definition
+ * @return returns allocated struct on success, if unable to find config returns null
+ */
+EAPI void *
+e_config_domain_load(const char *domain, E_Config_DD *edd)
+{
+ Eet_File *ef;
+ char buf[4096];
+ void *data = NULL;
+ int i;
+
+ e_user_dir_snprintf(buf, sizeof(buf), "config/%s/%s.cfg",
+ _e_config_profile, domain);
+ ef = eet_open(buf, EET_FILE_MODE_READ);
+ if (ef)
+ {
+ data = eet_data_read(ef, edd, "config");
+ eet_close(ef);
+ if (data) return data;
+ }
+
+ for (i = 1; i <= _e_config_revisions; i++)
+ {
+ e_user_dir_snprintf(buf, sizeof(buf), "config/%s/%s.%i.cfg",
+ _e_config_profile, domain, i);
+ ef = eet_open(buf, EET_FILE_MODE_READ);
+ if (ef)
+ {
+ data = eet_data_read(ef, edd, "config");
+ eet_close(ef);
+ if (data) return data;
+ }
+ }
+ return e_config_domain_system_load(domain, edd);
+}
+
+EAPI void *
+e_config_domain_system_load(const char *domain, E_Config_DD *edd)
+{
+ Eet_File *ef;
+ char buf[4096];
+ void *data = NULL;
+
+ e_prefix_data_snprintf(buf, sizeof(buf), "data/config/%s/%s.cfg",
+ _e_config_profile, domain);
+ ef = eet_open(buf, EET_FILE_MODE_READ);
+ if (ef)
+ {
+ data = eet_data_read(ef, edd, "config");
+ eet_close(ef);
+ return data;
+ }
+
+ return data;
+}
+
+static void
+_e_config_mv_error(const char *from, const char *to)
+{
+ if (!_e_config_error_dialog)
+ {
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
+ "E", "_sys_error_logout_slow");
+ if (dia)
+ {
+ char buf[8192];
+
+ e_dialog_title_set(dia, _("Enlightenment Settings Write Problems"));
+ e_dialog_icon_set(dia, "dialog-error", 64);
+ snprintf(buf, sizeof(buf),
+ _("Enlightenment has had an error while moving config files
"
+ "from:
"
+ "%s
"
+ "
"
+ "to:
"
+ "%s
"
+ "
"
+ "The rest of the write has been aborted for safety.
"),
+ from, 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);
+ e_object_del_attach_func_set(E_OBJECT(dia),
+ _e_config_error_dialog_cb_delete);
+ e_dialog_show(dia);
+ _e_config_error_dialog = dia;
+ }
+ }
+}
+
+EAPI int
+e_config_profile_save(void)
+{
+ Eet_File *ef;
+ char buf[4096], buf2[4096];
+ int ok = 0;
+
+ /* FIXME: check for other sessions fo E running */
+ e_user_dir_concat_static(buf, "config/profile.cfg");
+ e_user_dir_concat_static(buf2, "config/profile.cfg.tmp");
+
+ ef = eet_open(buf2, EET_FILE_MODE_WRITE);
+ if (ef)
+ {
+ ok = eet_write(ef, "config", _e_config_profile,
+ strlen(_e_config_profile), 0);
+ if (_e_config_eet_close_handle(ef, buf2))
+ {
+ Eina_Bool ret = EINA_TRUE;
+
+ if (_e_config_revisions > 0)
+ {
+ int i;
+ char bsrc[4096], bdst[4096];
+
+ for (i = _e_config_revisions; i > 1; i--)
+ {
+ e_user_dir_snprintf(bsrc, sizeof(bsrc), "config/profile.%i.cfg", i - 1);
+ e_user_dir_snprintf(bdst, sizeof(bdst), "config/profile.%i.cfg", i);
+ if ((ecore_file_exists(bsrc)) &&
+ (ecore_file_size(bsrc)))
+ {
+ ret = ecore_file_mv(bsrc, bdst);
+ if (!ret)
+ {
+ _e_config_mv_error(bsrc, bdst);
+ break;
+ }
+ }
+ }
+ if (ret)
+ {
+ e_user_dir_snprintf(bsrc, sizeof(bsrc), "config/profile.cfg");
+ e_user_dir_snprintf(bdst, sizeof(bdst), "config/profile.1.cfg");
+ ret = ecore_file_mv(bsrc, bdst);
+// if (!ret)
+// _e_config_mv_error(bsrc, bdst);
+ }
+ }
+ ret = ecore_file_mv(buf2, buf);
+ if (!ret) _e_config_mv_error(buf2, buf);
+ }
+ ecore_file_unlink(buf2);
+ }
+ return ok;
+}
+
+/**
+ * Saves configurations to file located in the working profile
+ * The configurations are read from a struct declated by the
+ * macros E_CONFIG_DD_NEW and E_CONFIG_TYPE
+ *
+ * @param domain name of the configuration file.
+ * @param edd pointer to struct definition
+ * @param data struct to save as configuration file
+ * @return 1 if save success, 0 on failure
+ */
+EAPI int
+e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data)
+{
+ Eet_File *ef;
+ char buf[4096], buf2[4096];
+ int ok = 0, ret;
+ size_t len, len2;
+
+ if (_e_config_save_block) return 0;
+ /* FIXME: check for other sessions fo E running */
+ len = e_user_dir_snprintf(buf, sizeof(buf), "config/%s", _e_config_profile);
+ if (len + 1 >= sizeof(buf)) return 0;
+
+ ecore_file_mkdir(buf);
+
+ buf[len] = '/';
+ len++;
+
+ len2 = eina_strlcpy(buf + len, domain, sizeof(buf) - len);
+ if (len2 + sizeof(".cfg") >= sizeof(buf) - len) return 0;
+
+ len += len2;
+
+ memcpy(buf + len, ".cfg", sizeof(".cfg"));
+ len += sizeof(".cfg") - 1;
+
+ if (len + sizeof(".tmp") >= sizeof(buf)) return 0;
+ memcpy(buf2, buf, len);
+ memcpy(buf2 + len, ".tmp", sizeof(".tmp"));
+
+ ef = eet_open(buf2, EET_FILE_MODE_WRITE);
+ if (ef)
+ {
+ ok = eet_data_write(ef, edd, "config", data, 1);
+ if (_e_config_eet_close_handle(ef, buf2))
+ {
+ if (_e_config_revisions > 0)
+ {
+ int i;
+ char bsrc[4096], bdst[4096];
+
+ for (i = _e_config_revisions; i > 1; i--)
+ {
+ e_user_dir_snprintf(bsrc, sizeof(bsrc), "config/%s/%s.%i.cfg", _e_config_profile, domain, i - 1);
+ e_user_dir_snprintf(bdst, sizeof(bdst), "config/%s/%s.%i.cfg", _e_config_profile, domain, i);
+ if ((ecore_file_exists(bsrc)) &&
+ (ecore_file_size(bsrc)))
+ {
+ ecore_file_mv(bsrc, bdst);
+ }
+ }
+ e_user_dir_snprintf(bsrc, sizeof(bsrc), "config/%s/%s.cfg", _e_config_profile, domain);
+ e_user_dir_snprintf(bdst, sizeof(bdst), "config/%s/%s.1.cfg", _e_config_profile, domain);
+ ecore_file_mv(bsrc, bdst);
+ }
+ ret = ecore_file_mv(buf2, buf);
+ if (!ret)
+ ERR("*** Error saving config. ***");
+ }
+ ecore_file_unlink(buf2);
+ }
+ return ok;
+}
+
+EAPI E_Config_Binding_Mouse *
+e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in)
+{
+ Eina_List *l;
+ E_Config_Binding_Mouse *eb;
+
+ EINA_LIST_FOREACH(e_bindings->mouse_bindings, l, eb)
+ {
+ if ((eb->context == eb_in->context) &&
+ (eb->button == eb_in->button) &&
+ (eb->modifiers == eb_in->modifiers) &&
+ (eb->any_mod == eb_in->any_mod) &&
+ (((eb->action) && (eb_in->action) && (!strcmp(eb->action, eb_in->action))) ||
+ ((!eb->action) && (!eb_in->action))) &&
+ (((eb->params) && (eb_in->params) && (!strcmp(eb->params, eb_in->params))) ||
+ ((!eb->params) && (!eb_in->params))))
+ return eb;
+ }
+ return NULL;
+}
+
+EAPI E_Config_Binding_Key *
+e_config_binding_key_match(E_Config_Binding_Key *eb_in)
+{
+ Eina_List *l;
+ E_Config_Binding_Key *eb;
+
+ EINA_LIST_FOREACH(e_bindings->mouse_bindings, l, eb)
+ {
+ if ((eb->context == eb_in->context) &&
+ (eb->modifiers == eb_in->modifiers) &&
+ (eb->any_mod == eb_in->any_mod) &&
+ (((eb->key) && (eb_in->key) && (!strcmp(eb->key, eb_in->key))) ||
+ ((!eb->key) && (!eb_in->key))) &&
+ (((eb->action) && (eb_in->action) && (!strcmp(eb->action, eb_in->action))) ||
+ ((!eb->action) && (!eb_in->action))) &&
+ (((eb->params) && (eb_in->params) && (!strcmp(eb->params, eb_in->params))) ||
+ ((!eb->params) && (!eb_in->params))))
+ return eb;
+ }
+ return NULL;
+}
+
+EAPI E_Config_Binding_Edge *
+e_config_binding_edge_match(E_Config_Binding_Edge *eb_in)
+{
+ Eina_List *l;
+ E_Config_Binding_Edge *eb;
+
+ EINA_LIST_FOREACH(e_bindings->edge_bindings, l, eb)
+ {
+ if ((eb->context == eb_in->context) &&
+ (eb->modifiers == eb_in->modifiers) &&
+ (eb->any_mod == eb_in->any_mod) &&
+ (eb->edge == eb_in->edge) &&
+ (eb->delay == eb_in->delay) &&
+ (eb->drag_only == eb_in->drag_only) &&
+ (((eb->action) && (eb_in->action) && (!strcmp(eb->action, eb_in->action))) ||
+ ((!eb->action) && (!eb_in->action))) &&
+ (((eb->params) && (eb_in->params) && (!strcmp(eb->params, eb_in->params))) ||
+ ((!eb->params) && (!eb_in->params))))
+ return eb;
+ }
+ return NULL;
+}
+
+EAPI E_Config_Binding_Signal *
+e_config_binding_signal_match(E_Config_Binding_Signal *eb_in)
+{
+ Eina_List *l;
+ E_Config_Binding_Signal *eb;
+
+ EINA_LIST_FOREACH(e_bindings->signal_bindings, l, eb)
+ {
+ if ((eb->context == eb_in->context) &&
+ (eb->modifiers == eb_in->modifiers) &&
+ (eb->any_mod == eb_in->any_mod) &&
+ (((eb->signal) && (eb_in->signal) && (!strcmp(eb->signal, eb_in->signal))) ||
+ ((!eb->signal) && (!eb_in->signal))) &&
+ (((eb->source) && (eb_in->source) && (!strcmp(eb->source, eb_in->source))) ||
+ ((!eb->source) && (!eb_in->source))) &&
+ (((eb->action) && (eb_in->action) && (!strcmp(eb->action, eb_in->action))) ||
+ ((!eb->action) && (!eb_in->action))) &&
+ (((eb->params) && (eb_in->params) && (!strcmp(eb->params, eb_in->params))) ||
+ ((!eb->params) && (!eb_in->params))))
+ return eb;
+ }
+ return NULL;
+}
+
+EAPI E_Config_Binding_Wheel *
+e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in)
+{
+ Eina_List *l;
+ E_Config_Binding_Wheel *eb;
+
+ EINA_LIST_FOREACH(e_bindings->wheel_bindings, l, eb)
+ {
+ if ((eb->context == eb_in->context) &&
+ (eb->direction == eb_in->direction) &&
+ (eb->z == eb_in->z) &&
+ (eb->modifiers == eb_in->modifiers) &&
+ (eb->any_mod == eb_in->any_mod) &&
+ (((eb->action) && (eb_in->action) && (!strcmp(eb->action, eb_in->action))) ||
+ ((!eb->action) && (!eb_in->action))) &&
+ (((eb->params) && (eb_in->params) && (!strcmp(eb->params, eb_in->params))) ||
+ ((!eb->params) && (!eb_in->params))))
+ return eb;
+ }
+ return NULL;
+}
+
+EAPI E_Config_Binding_Acpi *
+e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in)
+{
+ Eina_List *l;
+ E_Config_Binding_Acpi *eb;
+
+ EINA_LIST_FOREACH(e_bindings->acpi_bindings, l, eb)
+ {
+ if ((eb->context == eb_in->context) &&
+ (eb->type == eb_in->type) &&
+ (eb->status == eb_in->status) &&
+ (((eb->action) && (eb_in->action) &&
+ (!strcmp(eb->action, eb_in->action))) ||
+ ((!eb->action) && (!eb_in->action))) &&
+ (((eb->params) && (eb_in->params) &&
+ (!strcmp(eb->params, eb_in->params))) ||
+ ((!eb->params) && (!eb_in->params))))
+ return eb;
+ }
+ return NULL;
+}
+
+EAPI void
+e_config_mode_changed(void)
+{
+ ecore_event_add(E_EVENT_CONFIG_MODE_CHANGED, NULL, NULL, NULL);
+}
+
+EAPI void
+e_config_binding_acpi_free(E_Config_Binding_Acpi *eba)
+{
+ if (!eba) return;
+ eina_stringshare_del(eba->action);
+ eina_stringshare_del(eba->params);
+ free(eba);
+}
+
+EAPI void
+e_config_binding_key_free(E_Config_Binding_Key *ebk)
+{
+ if (!ebk) return;
+ eina_stringshare_del(ebk->key);
+ eina_stringshare_del(ebk->action);
+ eina_stringshare_del(ebk->params);
+ free(ebk);
+}
+
+EAPI void
+e_config_binding_edge_free(E_Config_Binding_Edge *ebe)
+{
+ if (!ebe) return;
+ eina_stringshare_del(ebe->action);
+ eina_stringshare_del(ebe->params);
+ free(ebe);
+}
+
+EAPI void
+e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm)
+{
+ if (!ebm) return;
+ eina_stringshare_del(ebm->action);
+ eina_stringshare_del(ebm->params);
+ free(ebm);
+}
+
+EAPI void
+e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw)
+{
+ if (!ebw) return;
+ eina_stringshare_del(ebw->action);
+ eina_stringshare_del(ebw->params);
+ free(ebw);
+}
+
+EAPI void
+e_config_binding_signal_free(E_Config_Binding_Signal *ebs)
+{
+ if (!ebs) return;
+ eina_stringshare_del(ebs->signal);
+ eina_stringshare_del(ebs->source);
+ eina_stringshare_del(ebs->action);
+ eina_stringshare_del(ebs->params);
+ free(ebs);
+}
+
+EAPI void
+e_config_bindings_free(E_Config_Bindings *ecb)
+{
+ if (!ecb) return;
+ E_FREE_LIST(ecb->mouse_bindings, e_config_binding_mouse_free);
+ E_FREE_LIST(ecb->key_bindings, e_config_binding_key_free);
+ E_FREE_LIST(ecb->edge_bindings, e_config_binding_edge_free);
+ E_FREE_LIST(ecb->signal_bindings, e_config_binding_signal_free);
+ E_FREE_LIST(ecb->wheel_bindings, e_config_binding_wheel_free);
+ E_FREE_LIST(ecb->acpi_bindings, e_config_binding_acpi_free);
+ free(ecb);
+}
+
+/* local subsystem functions */
+static void
+_e_config_save_cb(void *data __UNUSED__)
+{
+ e_config_profile_save();
+ e_module_save_all();
+ e_config_domain_save("e", _e_config_edd, e_config);
+ e_config_domain_save("e_bindings", _e_config_binding_edd, e_bindings);
+ _e_config_save_defer = NULL;
+}
+
+static void
+_e_config_free(E_Config *ecf)
+{
+ E_Config_Syscon_Action *sca;
+ E_Font_Fallback *eff;
+ E_Config_Module *em;
+ E_Font_Default *efd;
+ E_Config_Theme *et;
+ E_Color_Class *cc;
+ E_Path_Dir *epd;
+ E_Remember *rem;
+ E_Config_Env_Var *evr;
+ E_Config_XKB_Option *op;
+ E_Config_Desktop_Window_Profile *wp;
+ E_Int_Menu_Applications *ema;
+
+ if (!ecf) return;
+
+ EINA_LIST_FREE(ecf->desktop_window_profiles, wp)
+ {
+ eina_stringshare_del(wp->profile);
+ E_FREE(wp);
+ }
+
+ eina_stringshare_del(ecf->xkb.default_model);
+
+ E_FREE_LIST(ecf->xkb.used_layouts, e_config_xkb_layout_free);
+ EINA_LIST_FREE(ecf->xkb.used_options, op)
+ {
+ eina_stringshare_del(op->name);
+ E_FREE(op);
+ }
+
+ EINA_LIST_FREE(ecf->modules, em)
+ {
+ if (em->name) eina_stringshare_del(em->name);
+ E_FREE(em);
+ }
+ EINA_LIST_FREE(ecf->font_fallbacks, eff)
+ {
+ if (eff->name) eina_stringshare_del(eff->name);
+ E_FREE(eff);
+ }
+ EINA_LIST_FREE(ecf->font_defaults, efd)
+ {
+ if (efd->text_class) eina_stringshare_del(efd->text_class);
+ if (efd->font) eina_stringshare_del(efd->font);
+ E_FREE(efd);
+ }
+ EINA_LIST_FREE(ecf->themes, et)
+ {
+ if (et->category) eina_stringshare_del(et->category);
+ if (et->file) eina_stringshare_del(et->file);
+ E_FREE(et);
+ }
+ EINA_LIST_FREE(ecf->path_append_data, epd)
+ {
+ if (epd->dir) eina_stringshare_del(epd->dir);
+ E_FREE(epd);
+ }
+ EINA_LIST_FREE(ecf->path_append_images, epd)
+ {
+ if (epd->dir) eina_stringshare_del(epd->dir);
+ E_FREE(epd);
+ }
+ EINA_LIST_FREE(ecf->path_append_fonts, epd)
+ {
+ if (epd->dir) eina_stringshare_del(epd->dir);
+ E_FREE(epd);
+ }
+ EINA_LIST_FREE(ecf->path_append_themes, epd)
+ {
+ if (epd->dir) eina_stringshare_del(epd->dir);
+ E_FREE(epd);
+ }
+ EINA_LIST_FREE(ecf->path_append_init, epd)
+ {
+ if (epd->dir) eina_stringshare_del(epd->dir);
+ E_FREE(epd);
+ }
+ EINA_LIST_FREE(ecf->path_append_icons, epd)
+ {
+ if (epd->dir) eina_stringshare_del(epd->dir);
+ E_FREE(epd);
+ }
+ EINA_LIST_FREE(ecf->path_append_modules, epd)
+ {
+ if (epd->dir) eina_stringshare_del(epd->dir);
+ E_FREE(epd);
+ }
+ EINA_LIST_FREE(ecf->path_append_backgrounds, epd)
+ {
+ if (epd->dir) eina_stringshare_del(epd->dir);
+ E_FREE(epd);
+ }
+ EINA_LIST_FREE(ecf->path_append_messages, epd)
+ {
+ if (epd->dir) eina_stringshare_del(epd->dir);
+ E_FREE(epd);
+ }
+ EINA_LIST_FREE(ecf->remembers, rem)
+ {
+ if (rem->name) eina_stringshare_del(rem->name);
+ if (rem->class) eina_stringshare_del(rem->class);
+ if (rem->title) eina_stringshare_del(rem->title);
+ if (rem->role) eina_stringshare_del(rem->role);
+ if (rem->prop.border) eina_stringshare_del(rem->prop.border);
+ if (rem->prop.command) eina_stringshare_del(rem->prop.command);
+ E_FREE(rem);
+ }
+ EINA_LIST_FREE(ecf->menu_applications, ema)
+ {
+ if (ema->orig_path) eina_stringshare_del(ema->orig_path);
+ if (ema->try_exec) eina_stringshare_del(ema->try_exec);
+ if (ema->exec) eina_stringshare_del(ema->exec);
+ E_FREE(ema);
+ }
+ EINA_LIST_FREE(ecf->color_classes, cc)
+ {
+ if (cc->name) eina_stringshare_del(cc->name);
+ E_FREE(cc);
+ }
+ if (ecf->init_default_theme) eina_stringshare_del(ecf->init_default_theme);
+ if (ecf->desktop_default_background) eina_stringshare_del(ecf->desktop_default_background);
+ if (ecf->desktop_default_name) eina_stringshare_del(ecf->desktop_default_name);
+ if (ecf->desktop_default_window_profile) eina_stringshare_del(ecf->desktop_default_window_profile);
+ if (ecf->language) eina_stringshare_del(ecf->language);
+ eina_stringshare_del(ecf->desklock_language);
+ eina_stringshare_del(ecf->xkb.selected_layout);
+ eina_stringshare_del(ecf->xkb.cur_layout);
+ eina_stringshare_del(ecf->xkb.desklock_layout);
+ e_config_xkb_layout_free(ecf->xkb.current_layout);
+ e_config_xkb_layout_free(ecf->xkb.sel_layout);
+ e_config_xkb_layout_free(ecf->xkb.lock_layout);
+ eina_stringshare_del(ecf->desk_flip_animate_type);
+ if (ecf->transition_start) eina_stringshare_del(ecf->transition_start);
+ if (ecf->transition_desk) eina_stringshare_del(ecf->transition_desk);
+ if (ecf->transition_change) eina_stringshare_del(ecf->transition_change);
+ if (ecf->input_method) eina_stringshare_del(ecf->input_method);
+ if (ecf->exebuf_term_cmd) eina_stringshare_del(ecf->exebuf_term_cmd);
+ if (ecf->desklock_personal_passwd) eina_stringshare_del(ecf->desklock_personal_passwd);
+ if (ecf->desklock_background) eina_stringshare_del(ecf->desklock_background);
+ if (ecf->icon_theme) eina_stringshare_del(ecf->icon_theme);
+ if (ecf->wallpaper_import_last_dev) eina_stringshare_del(ecf->wallpaper_import_last_dev);
+ if (ecf->wallpaper_import_last_path) eina_stringshare_del(ecf->wallpaper_import_last_path);
+ if (ecf->theme_default_border_style) eina_stringshare_del(ecf->theme_default_border_style);
+ if (ecf->desklock_custom_desklock_cmd) eina_stringshare_del(ecf->desklock_custom_desklock_cmd);
+ EINA_LIST_FREE(ecf->syscon.actions, sca)
+ {
+ if (sca->action) eina_stringshare_del(sca->action);
+ if (sca->params) eina_stringshare_del(sca->params);
+ if (sca->button) eina_stringshare_del(sca->button);
+ if (sca->icon) eina_stringshare_del(sca->icon);
+ E_FREE(sca);
+ }
+ EINA_LIST_FREE(ecf->env_vars, evr)
+ {
+ if (evr->var) eina_stringshare_del(evr->var);
+ if (evr->val) eina_stringshare_del(evr->val);
+ E_FREE(evr);
+ }
+ if (ecf->xsettings.net_icon_theme_name)
+ eina_stringshare_del(ecf->xsettings.net_icon_theme_name);
+ if (ecf->xsettings.net_theme_name)
+ eina_stringshare_del(ecf->xsettings.net_theme_name);
+ if (ecf->xsettings.gtk_font_name)
+ eina_stringshare_del(ecf->xsettings.gtk_font_name);
+ if (ecf->backlight.sysdev)
+ eina_stringshare_del(ecf->backlight.sysdev);
+
+ E_FREE(ecf);
+}
+
+static Eina_Bool
+_e_config_cb_timer(void *data)
+{
+ e_util_dialog_show(_("Settings Upgraded"), "%s", (char *)data);
+ return 0;
+}
+
+static int
+_e_config_eet_close_handle(Eet_File *ef, char *file)
+{
+ Eet_Error err;
+ char *erstr = NULL;
+
+ err = eet_close(ef);
+ switch (err)
+ {
+ case EET_ERROR_NONE:
+ /* all good - no error */
+ break;
+
+ case EET_ERROR_BAD_OBJECT:
+ erstr = _("The EET file handle is bad.");
+ break;
+
+ case EET_ERROR_EMPTY:
+ erstr = _("The file data is empty.");
+ break;
+
+ case EET_ERROR_NOT_WRITABLE:
+ erstr = _("The file is not writable. Perhaps the disk is read-only
or you lost permissions to your files.");
+ break;
+
+ case EET_ERROR_OUT_OF_MEMORY:
+ erstr = _("Memory ran out while preparing the write.
Please free up memory.");
+ break;
+
+ case EET_ERROR_WRITE_ERROR:
+ erstr = _("This is a generic error.");
+ break;
+
+ case EET_ERROR_WRITE_ERROR_FILE_TOO_BIG:
+ erstr = _("The settings file is too large.
It should be very small (a few hundred KB at most).");
+ break;
+
+ case EET_ERROR_WRITE_ERROR_IO_ERROR:
+ erstr = _("You have I/O errors on the disk.
Maybe it needs replacing?");
+ break;
+
+ case EET_ERROR_WRITE_ERROR_OUT_OF_SPACE:
+ erstr = _("You ran out of space while writing the file.");
+ break;
+
+ case EET_ERROR_WRITE_ERROR_FILE_CLOSED:
+ erstr = _("The file was closed while writing.");
+ break;
+
+ case EET_ERROR_MMAP_FAILED:
+ erstr = _("Memory-mapping (mmap) of the file failed.");
+ break;
+
+ case EET_ERROR_X509_ENCODING_FAILED:
+ erstr = _("X509 Encoding failed.");
+ break;
+
+ case EET_ERROR_SIGNATURE_FAILED:
+ erstr = _("Signature failed.");
+ break;
+
+ case EET_ERROR_INVALID_SIGNATURE:
+ erstr = _("The signature was invalid.");
+ break;
+
+ case EET_ERROR_NOT_SIGNED:
+ erstr = _("Not signed.");
+ break;
+
+ case EET_ERROR_NOT_IMPLEMENTED:
+ erstr = _("Feature not implemented.");
+ break;
+
+ case EET_ERROR_PRNG_NOT_SEEDED:
+ erstr = _("PRNG was not seeded.");
+ break;
+
+ case EET_ERROR_ENCRYPT_FAILED:
+ erstr = _("Encryption failed.");
+ break;
+
+ case EET_ERROR_DECRYPT_FAILED:
+ erstr = _("Decryption failed.");
+ break;
+
+ default: /* if we get here eet added errors we don't know */
+ erstr = _("The error is unknown to Enlightenment.");
+ break;
+ }
+ if (erstr)
+ {
+ /* delete any partially-written file */
+ ecore_file_unlink(file);
+ /* only show dialog for first error - further ones are likely */
+ /* more of the same error */
+ if (!_e_config_error_dialog)
+ {
+ E_Dialog *dia;
+
+ dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
+ "E", "_sys_error_logout_slow");
+ if (dia)
+ {
+ char buf[8192];
+
+ e_dialog_title_set(dia, _("Enlightenment Settings Write Problems"));
+ e_dialog_icon_set(dia, "dialog-error", 64);
+ snprintf(buf, sizeof(buf),
+ _("Enlightenment has had an error while writing
"
+ "its config file.
"
+ "%s
"
+ "
"
+ "The file where the error occurred was:
"
+ "%s
"
+ "
"
+ "This file has been deleted to avoid corrupt data.
"),
+ erstr, 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);
+ e_object_del_attach_func_set(E_OBJECT(dia),
+ _e_config_error_dialog_cb_delete);
+ e_dialog_show(dia);
+ _e_config_error_dialog = dia;
+ }
+ }
+ return 0;
+ }
+ return 1;
+}
+
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index f873eeec9..59612ba3c 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -48,7 +48,7 @@ typedef enum
/* increment this whenever a new set of config values are added but the users
* config doesn't need to be wiped - simply new values need to be put in
*/
-#define E_CONFIG_FILE_GENERATION 14
+#define E_CONFIG_FILE_GENERATION 15
#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION)
#define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!!
@@ -206,8 +206,7 @@ struct _E_Config
Eina_List *shelves; // GUI
int font_hinting; // GUI
- const char *desklock_personal_passwd; // GUI
- const char *desklock_background; // OLD DON'T USE
+ int desklock_passwd; // GUI // hashed
Eina_List *desklock_backgrounds; // GUI
int desklock_auth_method; // GUI
int desklock_login_box_zone; // GUI
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index ddd018e1d..8044d4af5 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -128,8 +128,6 @@ e_desklock_init(void)
_e_desklock_idle_poller = ecore_poller_add(ECORE_POLLER_CORE, 256,
_e_desklock_cb_idle_poller, NULL);
- if (e_config->desklock_background)
- e_filereg_register(e_config->desklock_background);
EINA_LIST_FOREACH(e_config->desklock_backgrounds, l, bg)
e_filereg_register(bg->file);
@@ -152,8 +150,6 @@ e_desklock_shutdown(void)
if (edd) waslocked = EINA_TRUE;
if (!x_fatal)
e_desklock_hide();
- if (e_config->desklock_background)
- e_filereg_deregister(e_config->desklock_background);
if (waslocked) e_util_env_set("E_DESKLOCK_LOCKED", "locked");
@@ -163,8 +159,6 @@ e_desklock_shutdown(void)
if (job) ecore_job_del(job);
job = NULL;
- if (e_config->desklock_background)
- e_filereg_deregister(e_config->desklock_background);
EINA_LIST_FOREACH(e_config->desklock_backgrounds, l, bg)
e_filereg_deregister(bg->file);
@@ -249,7 +243,7 @@ e_desklock_show(Eina_Bool suspend)
if (_e_custom_desklock_exe) return 0;
- if (e_config->desklock_use_custom_desklock && e_config->desklock_custom_desklock_cmd && e_config->desklock_custom_desklock_cmd[0])
+ if (e_desklock_is_external() && e_config->desklock_custom_desklock_cmd && e_config->desklock_custom_desklock_cmd[0])
{
e_menu_hide_all();
_e_custom_desklock_exe_handler =
@@ -268,19 +262,22 @@ e_desklock_show(Eina_Bool suspend)
}
#ifndef HAVE_PAM
- e_util_dialog_show(_("Error - no PAM support"),
- _("No PAM support was built into Enlightenment, so
"
- "desk locking is disabled."));
- return 0;
+ if (e_desklock_is_system())
+ {
+ e_util_dialog_show(_("Error - no PAM support"),
+ _("No PAM support was built into Enlightenment, so
"
+ "desk locking is disabled."));
+ return 0;
+ }
#endif
if (edd) return 0;
#ifdef HAVE_PAM
- if (e_config->desklock_auth_method == 1)
+ if (e_desklock_is_personal())
{
#endif
- if (!e_config->desklock_personal_passwd)
+ if (!e_config->desklock_passwd)
{
E_Zone *zone;
@@ -381,7 +378,7 @@ e_desklock_hide(void)
ev->suspend = 1;
ecore_event_add(E_EVENT_DESKLOCK, ev, NULL, NULL);
- if (e_config->desklock_use_custom_desklock)
+ if (e_desklock_is_external())
{
_e_custom_desklock_exe = NULL;
return;
@@ -819,10 +816,8 @@ _e_desklock_check_auth(void)
else if (e_config->desklock_auth_method == 1)
{
#endif
- if ((e_config->desklock_personal_passwd) &&
- (!strcmp(!edd->passwd ? "" : edd->passwd,
- !e_config->desklock_personal_passwd ? "" :
- e_config->desklock_personal_passwd)))
+ if ((e_config->desklock_passwd) && (edd->passwd && edd->passwd[0]) &&
+ (e_config->desklock_passwd == eina_hash_djb2(edd->passwd, strlen(edd->passwd))))
{
/* password ok */
/* security - null out passwd string once we are done with it */
diff --git a/src/bin/e_desklock.h b/src/bin/e_desklock.h
index 2952ca448..bd2ae2b49 100644
--- a/src/bin/e_desklock.h
+++ b/src/bin/e_desklock.h
@@ -10,6 +10,14 @@ typedef enum _E_Desklock_Background_Method {
E_DESKLOCK_BACKGROUND_METHOD_WALLPAPER,
E_DESKLOCK_BACKGROUND_METHOD_CUSTOM,
} E_Desklock_Background_Method;
+
+typedef enum
+{
+ E_DESKLOCK_AUTH_METHOD_SYSTEM = 0,
+ E_DESKLOCK_AUTH_METHOD_PERSONAL = 1,
+ E_DESKLOCK_AUTH_METHOD_EXTERNAL = 2,
+} E_Desklock_Auth_Method;
+
#else
#ifndef E_DESKLOCK_H
#define E_DESKLOCK_H
@@ -35,5 +43,23 @@ EAPI void e_desklock_hide_hook_del(E_Desklock_Hide_Cb cb);
extern EAPI int E_EVENT_DESKLOCK;
+static inline Eina_Bool
+e_desklock_is_external(void)
+{
+ return e_config->desklock_auth_method == E_DESKLOCK_AUTH_METHOD_EXTERNAL;
+}
+
+static inline Eina_Bool
+e_desklock_is_personal(void)
+{
+ return e_config->desklock_auth_method == E_DESKLOCK_AUTH_METHOD_PERSONAL;
+}
+
+static inline Eina_Bool
+e_desklock_is_system(void)
+{
+ return e_config->desklock_auth_method == E_DESKLOCK_AUTH_METHOD_SYSTEM;
+}
+
#endif
#endif
diff --git a/src/modules/conf_display/e_int_config_desklock.c b/src/modules/conf_display/e_int_config_desklock.c
index 143d254ce..0a6aa96a6 100644
--- a/src/modules/conf_display/e_int_config_desklock.c
+++ b/src/modules/conf_display/e_int_config_desklock.c
@@ -9,6 +9,7 @@ static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_D
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static void _cb_method_change(void *data, Evas_Object *obj, void *event_info);
+static void _login_method_change(void *data, Evas_Object *obj, void *event_info);
static void _cb_login_change(void *data, Evas_Object *obj);
static int _zone_count_get(void);
@@ -16,6 +17,7 @@ static void _cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj,
struct _E_Config_Dialog_Data
{
+ Evas_Object *lock_cmd_entry, *passwd_entry;
E_Config_Dialog *cfd, *bg_fsel;
/* Common vars */
@@ -26,9 +28,10 @@ struct _E_Config_Dialog_Data
int start_locked;
int lock_on_suspend;
int auto_lock;
- int locking_method;
+ int desklock_auth_method;
int login_zone;
int zone;
+ char *desklock_personal_passwd;
char *custom_lock_cmd;
/* Layout */
@@ -43,7 +46,6 @@ struct _E_Config_Dialog_Data
E_Desklock_Background_Method bg_method;
int bg_method_prev;
Eina_List *bgs;
- int custom_lock;
int ask_presentation;
double ask_presentation_timeout;
@@ -125,7 +127,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->bg_method_prev = cfdata->bg_method;
cfdata->use_xscreensaver = ecore_x_screensaver_event_available_get();
- cfdata->custom_lock = e_config->desklock_use_custom_desklock;
+ cfdata->desklock_auth_method = e_config->desklock_auth_method;
if (e_config->desklock_custom_desklock_cmd)
cfdata->custom_lock_cmd = strdup(e_config->desklock_custom_desklock_cmd);
@@ -170,6 +172,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
if (cfdata->bg_fsel)
e_object_del(E_OBJECT(cfdata->bg_fsel));
E_FREE(cfdata->custom_lock_cmd);
+ E_FREE(cfdata->desklock_personal_passwd);
EINA_LIST_FREE(cfdata->bgs, bg)
eina_stringshare_del(bg);
E_FREE(cfdata);
@@ -187,7 +190,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
E_Comp *comp;
int screen_count, x = 0;
- screen_count = ecore_x_xinerama_screen_count_get();
+ screen_count = eina_list_count(e_xinerama_screens_get());
otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
@@ -200,12 +203,32 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
e_widget_disabled_set(ow, !cfdata->use_xscreensaver);
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, _("Custom Screenlock Command"), 0);
- ow = e_widget_entry_add(evas, &(cfdata->custom_lock_cmd), NULL, NULL, NULL);
+ rg = e_widget_radio_group_new(&(cfdata->desklock_auth_method));
+ ow = e_widget_radio_add(evas, _("Use System Authentication"), E_DESKLOCK_AUTH_METHOD_SYSTEM, rg);
+ evas_object_smart_callback_add(ow, "changed", _login_method_change, cfdata);
+ e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+ ow = e_widget_radio_add(evas, _("Use Personal Screenlock Password"), E_DESKLOCK_AUTH_METHOD_PERSONAL, rg);
+ evas_object_smart_callback_add(ow, "changed", _login_method_change, cfdata);
+ e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+ ow = e_widget_radio_add(evas, _("Use External Screenlock Command"), E_DESKLOCK_AUTH_METHOD_EXTERNAL, rg);
+ evas_object_smart_callback_add(ow, "changed", _login_method_change, cfdata);
+ e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+
+ of = e_widget_framelist_add(evas, _("Personal Screenlock Password"), 0);
+ cfdata->passwd_entry = ow = e_widget_entry_add(evas, &(cfdata->desklock_personal_passwd), NULL, NULL, NULL);
+ e_widget_entry_password_set(ow, 1);
+ e_widget_framelist_object_append(of, ow);
+ e_widget_list_object_append(ol, of, 1, 1, 0.5);
+
+ of = e_widget_framelist_add(evas, _("External Screenlock Command"), 0);
+ cfdata->lock_cmd_entry = ow = e_widget_entry_add(evas, &(cfdata->custom_lock_cmd), NULL, NULL, NULL);
e_widget_framelist_object_append(of, ow);
- ow = e_widget_check_add(evas, _("Use Custom Screenlock Command"), &cfdata->custom_lock);
- e_widget_framelist_object_append(of, ow);
+ e_widget_disabled_set(cfdata->passwd_entry,
+ (cfdata->desklock_auth_method != E_DESKLOCK_AUTH_METHOD_PERSONAL));
+ e_widget_disabled_set(cfdata->lock_cmd_entry,
+ (cfdata->desklock_auth_method != E_DESKLOCK_AUTH_METHOD_EXTERNAL));
+
e_widget_list_object_append(ol, of, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Locking"), ol,
1, 0, 1, 0, 0.5, 0.0);
@@ -367,6 +390,13 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
const char *bg;
E_Config_Desklock_Background *cbg;
+ e_config->desklock_auth_method = cfdata->desklock_auth_method;
+ if (e_config->desklock_auth_method == E_DESKLOCK_AUTH_METHOD_PERSONAL)
+ {
+ e_config->desklock_passwd =
+ eina_hash_djb2(cfdata->desklock_personal_passwd,
+ strlen(cfdata->desklock_personal_passwd));
+ }
e_config->desklock_start_locked = cfdata->start_locked;
e_config->desklock_on_suspend = cfdata->lock_on_suspend;
e_config->desklock_autolock_idle = cfdata->auto_lock;
@@ -414,7 +444,6 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
else
e_config->desklock_login_box_zone = cfdata->zone;
- e_config->desklock_use_custom_desklock = cfdata->custom_lock;
if (cfdata->custom_lock_cmd)
eina_stringshare_replace(&e_config->desklock_custom_desklock_cmd,
cfdata->custom_lock_cmd);
@@ -442,6 +471,16 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
if (e_config->desklock_autolock_idle != cfdata->auto_lock)
return 1;
+ if (e_config->desklock_auth_method != cfdata->desklock_auth_method)
+ return 1;
+ if (e_config->desklock_auth_method == E_DESKLOCK_AUTH_METHOD_PERSONAL)
+ {
+ if (e_config->desklock_passwd !=
+ eina_hash_djb2(cfdata->desklock_personal_passwd,
+ strlen(cfdata->desklock_personal_passwd)))
+ return 1;
+ }
+
if (e_config->desklock_autolock_screensaver != cfdata->screensaver_lock)
return 1;
@@ -472,9 +511,6 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
return 1;
}
- if (e_config->desklock_use_custom_desklock != cfdata->custom_lock)
- return 1;
-
if (e_config->desklock_custom_desklock_cmd && cfdata->custom_lock_cmd)
{
if (strcmp(e_config->desklock_custom_desklock_cmd, cfdata->custom_lock_cmd) != 0)
@@ -596,6 +632,27 @@ _cb_method_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
}
}
+static void
+_login_method_change(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ E_Config_Dialog_Data *cfdata = data;
+
+ e_widget_disabled_set(cfdata->passwd_entry,
+ (cfdata->desklock_auth_method != E_DESKLOCK_AUTH_METHOD_PERSONAL));
+ if (!e_widget_disabled_get(cfdata->passwd_entry))
+ {
+ e_widget_entry_select_all(cfdata->passwd_entry);
+ e_widget_focus_set(cfdata->passwd_entry, 1);
+ }
+ e_widget_disabled_set(cfdata->lock_cmd_entry,
+ (cfdata->desklock_auth_method != E_DESKLOCK_AUTH_METHOD_EXTERNAL));
+ if (!e_widget_disabled_get(cfdata->lock_cmd_entry))
+ {
+ e_widget_entry_select_all(cfdata->lock_cmd_entry);
+ e_widget_focus_set(cfdata->lock_cmd_entry, 1);
+ }
+}
+
static void
_cb_login_change(void *data, Evas_Object *obj __UNUSED__)
{