From b4cfada8e84d626a07ee5c201246974268c6702e Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 10 Sep 2019 17:58:30 +0100 Subject: [PATCH] module and config - remove pointless config vars that have no use we dont need to delay module loading anymore so remove allof this - priority too shouldn't be necessary as well and was just a workaround. this remvoes all of that removing some e module api's and module struct members as well as some global config fields. it also ensures all config files are up to date as well. --- data/config/default/e.src | 4 +- data/config/standard/e.src | 82 +---------- data/config/standard/e_bindings.src | 30 +++-- data/config/tiling/e.src | 83 +----------- data/config/tiling/e_bindings.src | 32 +++-- src/bin/e_config.c | 22 +-- src/bin/e_config.h | 4 - src/bin/e_main.c | 2 - src/bin/e_module.c | 127 +----------------- src/bin/e_module.h | 4 +- src/bin/e_shelf.c | 49 ++++--- src/bin/e_shelf.h | 1 + src/modules/conf/e_mod_main.c | 2 - src/modules/conf_applications/e_mod_main.c | 1 - src/modules/conf_bindings/e_mod_main.c | 1 - src/modules/conf_dialogs/e_mod_main.c | 1 - src/modules/conf_display/e_mod_main.c | 1 - src/modules/conf_interaction/e_mod_main.c | 1 - src/modules/conf_intl/e_mod_main.c | 1 - src/modules/conf_menus/e_mod_main.c | 1 - src/modules/conf_paths/e_mod_main.c | 1 - .../e_int_config_performance.c | 21 +-- src/modules/conf_performance/e_mod_main.c | 1 - src/modules/conf_shelves/e_mod_main.c | 1 - src/modules/conf_theme/e_mod_main.c | 1 - .../conf_window_manipulation/e_mod_main.c | 1 - .../conf_window_remembers/e_mod_main.c | 1 - src/modules/everything/e_mod_main.c | 3 - src/modules/everything/evry_plug_settings.c | 5 +- src/modules/everything/evry_view.c | 27 ++-- src/modules/fileman/e_mod_main.c | 1 - src/modules/gadman/e_mod_main.c | 1 - src/modules/quickaccess/e_mod_main.c | 1 - src/modules/shot/e_mod_main.c | 2 - src/modules/syscon/e_mod_main.c | 1 - src/modules/vkbd/e_mod_main.c | 1 - src/modules/winlist/e_mod_main.c | 1 - 37 files changed, 103 insertions(+), 416 deletions(-) diff --git a/data/config/default/e.src b/data/config/default/e.src index 6c601c5d3..4b081d0b3 100644 --- a/data/config/default/e.src +++ b/data/config/default/e.src @@ -1,5 +1,5 @@ group "E_Config" struct { - value "config_version" int: 1000014; + value "config_version" int: 1000028; value "config_type" uint: 0; // this profile seems to just be super minimalist value "show_splash" int: 0; value "desktop_default_name" string: "%i-%i"; @@ -26,8 +26,6 @@ group "E_Config" struct { group "E_Config_Module" struct { value "name" string: "wizard"; value "enabled" uchar: 1; - value "delayed" uchar: 0; - value "priority" int: 0; } } value "window_placement_policy" int: 0; diff --git a/data/config/standard/e.src b/data/config/standard/e.src index cd18b67ec..31b2982f2 100644 --- a/data/config/standard/e.src +++ b/data/config/standard/e.src @@ -1,5 +1,5 @@ group "E_Config" struct { - value "config_version" int: 1000014; + value "config_version" int: 1000028; value "config_type" uint: 3; value "show_splash" int: 1; value "desktop_default_name" string: "%i-%i"; @@ -10,7 +10,6 @@ group "E_Config" struct { value "border_shade_animate" int: 1; value "border_shade_transition" int: 3; value "border_shade_speed" double: 3000.0; - value "framerate" double: 60.0; value "priority" int: 3; value "image_cache" int: 4096; value "font_cache" int: 512; @@ -217,7 +216,6 @@ group "E_Config" struct { value "powersave.extreme" double: 1200.0; value "powersave.min" int: 0; value "powersave.max" int: 5; - value "no_module_delay" int: 1; group "syscon.actions" list { group "E_Config_Syscon_Action" struct { value "action" string: "halt"; @@ -550,7 +548,7 @@ group "E_Config" struct { value "mime" string: "application/x-desktop"; value "icon" string: "DESKTOP"; } - group "E_Config_Mime_Icon" struct { + group "E_Config_Mime_Icon" struct { value "mime" string: "application/vnd.oasis.opendocument.presentation"; value "icon" string: "THUMB"; } @@ -871,227 +869,153 @@ group "E_Config" struct { group "E_Config_Module" struct { value "name" string: "tasks"; value "enabled" uchar: 1; - value "delayed" uchar: 0; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "mixer"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_window_remembers"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_interaction"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "fileman"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "fileman_opinfo"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_window_manipulation"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_theme"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_shelves"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_performance"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_paths"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_menus"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_bindings"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_intl"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_display"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_dialogs"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_applications"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_randr"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "xkbswitch"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "winlist"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "pager"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "temperature"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "cpufreq"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "battery"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "clock"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "ibar"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "start"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "gadman"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: -100; } group "E_Config_Module" struct { value "name" string: "syscon"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "lokker"; value "enabled" uchar: 1; - value "delayed" uchar: 0; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "notification"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "everything"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: -1000; } group "E_Config_Module" struct { value "name" string: "shot"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "backlight"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "connman"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "bluez5"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } } - group "xkb.used_layouts" list { + group "xkb.used_layouts" list { group "E_Config_XKB_Layout" struct { value "name" string: "us"; value "model" string: "default"; diff --git a/data/config/standard/e_bindings.src b/data/config/standard/e_bindings.src index 5896c040d..0df2f62f9 100644 --- a/data/config/standard/e_bindings.src +++ b/data/config/standard/e_bindings.src @@ -433,32 +433,32 @@ group "E_Config_Bindings" struct { value "modifiers" int: 0; value "action" string: "desk_flip_in_direction"; value "edge" uchar: 1; - value "any_mod" uchar: 0; - value "delay" float: 0.3000000119209289550781250; + value "any_mod" uchar: 1; + value "delay" float: 0.3; } group "E_Config_Binding_Edge" struct { value "context" int: 3; value "modifiers" int: 0; value "action" string: "desk_flip_in_direction"; value "edge" uchar: 2; - value "any_mod" uchar: 0; - value "delay" float: 0.3000000119209289550781250; + value "any_mod" uchar: 1; + value "delay" float: 0.3; } group "E_Config_Binding_Edge" struct { value "context" int: 3; value "modifiers" int: 0; value "action" string: "desk_flip_in_direction"; value "edge" uchar: 3; - value "any_mod" uchar: 0; - value "delay" float: 0.3000000119209289550781250; + value "any_mod" uchar: 1; + value "delay" float: 0.3; } group "E_Config_Binding_Edge" struct { value "context" int: 3; value "modifiers" int: 0; value "action" string: "desk_flip_in_direction"; value "edge" uchar: 4; - value "any_mod" uchar: 0; - value "delay" float: 0.3000000119209289550781250; + value "any_mod" uchar: 1; + value "delay" float: 0.3; } } group "key_bindings" list { @@ -1006,5 +1006,19 @@ group "E_Config_Bindings" struct { value "button" uchar: 3; value "any_mod" uchar: 0; } + group "E_Config_Binding_Mouse" struct { + value "context" int: 9; + value "modifiers" int: 4; + value "action" string: "gadget_move"; + value "button" uchar: 1; + value "any_mod" uchar: 0; + } + group "E_Config_Binding_Mouse" struct { + value "context" int: 9; + value "modifiers" int: 4; + value "action" string: "gadget_resize"; + value "button" uchar: 2; + value "any_mod" uchar: 0; + } } } diff --git a/data/config/tiling/e.src b/data/config/tiling/e.src index b3d984c2b..2ec6af31a 100644 --- a/data/config/tiling/e.src +++ b/data/config/tiling/e.src @@ -1,5 +1,5 @@ group "E_Config" struct { - value "config_version" int: 1000014; + value "config_version" int: 1000028; value "config_type" uint: 3; value "show_splash" int: 1; value "desktop_default_name" string: "%i-%i"; @@ -10,7 +10,6 @@ group "E_Config" struct { value "border_shade_animate" int: 1; value "border_shade_transition" int: 3; value "border_shade_speed" double: 3000.0; - value "framerate" double: 60.0; value "priority" int: 3; value "image_cache" int: 4096; value "font_cache" int: 512; @@ -548,7 +547,7 @@ group "E_Config" struct { value "mime" string: "application/x-desktop"; value "icon" string: "DESKTOP"; } - group "E_Config_Mime_Icon" struct { + group "E_Config_Mime_Icon" struct { value "mime" string: "application/vnd.oasis.opendocument.presentation"; value "icon" string: "THUMB"; } @@ -886,234 +885,158 @@ group "E_Config" struct { group "E_Config_Module" struct { value "name" string: "tasks"; value "enabled" uchar: 1; - value "delayed" uchar: 0; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "mixer"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_window_remembers"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_interaction"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "fileman"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "fileman_opinfo"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_window_manipulation"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_theme"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_shelves"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_performance"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_paths"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_menus"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_bindings"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_intl"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_display"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_dialogs"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_applications"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf_randr"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "conf"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "xkbswitch"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "winlist"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "pager"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "temperature"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "cpufreq"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "battery"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "clock"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "ibar"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "start"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "gadman"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: -100; } group "E_Config_Module" struct { value "name" string: "syscon"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "lokker"; value "enabled" uchar: 1; - value "delayed" uchar: 0; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "notification"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "everything"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: -1000; } group "E_Config_Module" struct { value "name" string: "shot"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "backlight"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "connman"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "bluez5"; value "enabled" uchar: 1; - value "delayed" uchar: 1; - value "priority" int: 0; } group "E_Config_Module" struct { value "name" string: "tiling"; value "enabled" uchar: 1; - value "delayed" uchar: 0; - value "priority" int: 0; } } - group "xkb.used_layouts" list { + group "xkb.used_layouts" list { group "E_Config_XKB_Layout" struct { value "name" string: "us"; value "model" string: "default"; diff --git a/data/config/tiling/e_bindings.src b/data/config/tiling/e_bindings.src index 77d133717..cd33c35bf 100644 --- a/data/config/tiling/e_bindings.src +++ b/data/config/tiling/e_bindings.src @@ -433,32 +433,32 @@ group "E_Config_Bindings" struct { value "modifiers" int: 0; value "action" string: "desk_flip_in_direction"; value "edge" uchar: 1; - value "any_mod" uchar: 0; - value "delay" float: 0.3000000119209289550781250; + value "any_mod" uchar: 1; + value "delay" float: 0.3; } group "E_Config_Binding_Edge" struct { value "context" int: 3; value "modifiers" int: 0; value "action" string: "desk_flip_in_direction"; value "edge" uchar: 2; - value "any_mod" uchar: 0; - value "delay" float: 0.3000000119209289550781250; + value "any_mod" uchar: 1; + value "delay" float: 0.3; } group "E_Config_Binding_Edge" struct { value "context" int: 3; value "modifiers" int: 0; value "action" string: "desk_flip_in_direction"; value "edge" uchar: 3; - value "any_mod" uchar: 0; - value "delay" float: 0.3000000119209289550781250; + value "any_mod" uchar: 1; + value "delay" float: 0.3; } group "E_Config_Binding_Edge" struct { value "context" int: 3; - value "modifiers" int: 0; + value "modifiers" int: 1; value "action" string: "desk_flip_in_direction"; value "edge" uchar: 4; - value "any_mod" uchar: 0; - value "delay" float: 0.3000000119209289550781250; + value "any_mod" uchar: 1; + value "delay" float: 0.3; } } group "key_bindings" list { @@ -1039,5 +1039,19 @@ group "E_Config_Bindings" struct { value "button" uchar: 1; value "any_mod" uchar: 0; } + group "E_Config_Binding_Mouse" struct { + value "context" int: 9; + value "modifiers" int: 4; + value "action" string: "gadget_move"; + value "button" uchar: 1; + value "any_mod" uchar: 0; + } + group "E_Config_Binding_Mouse" struct { + value "context" int: 9; + value "modifiers" int: 4; + value "action" string: "gadget_resize"; + value "button" uchar: 2; + value "any_mod" uchar: 0; + } } } diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 521e7c4e7..3f1b12233 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -280,8 +280,6 @@ _e_config_edd_init(Eina_Bool old) #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); @@ -475,14 +473,12 @@ _e_config_edd_init(Eina_Bool old) 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, 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, 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); @@ -1218,7 +1214,7 @@ e_config_load(void) int do_conf = 0; Eina_List *l, *ll; E_Config_Module *em; - int enabled = 0, delayed = 0, priority = 0; + int enabled = 0; CONFIG_VERSION_UPDATE_INFO(10); EINA_LIST_FOREACH_SAFE(e_config->modules, l, ll, em) @@ -1231,8 +1227,6 @@ e_config_load(void) { do_conf += do_free = EINA_TRUE; enabled |= em->enabled; - delayed |= em->delayed; - priority = MIN(priority, em->priority); } if (do_free) { @@ -1247,8 +1241,6 @@ e_config_load(void) 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); } } @@ -1353,7 +1345,6 @@ e_config_load(void) em = E_NEW(E_Config_Module, 1); em->name = eina_stringshare_add("lokker"); em->enabled = 1; - em->delayed = 0; e_config->modules = eina_list_append(e_config->modules, em); } } @@ -1430,7 +1421,6 @@ e_config_load(void) module = E_NEW(E_Config_Module, 1); module->name = eina_stringshare_add("wireless"); module->enabled = 1; - module->delayed = 1; e_config->modules = eina_list_append(e_config->modules, module); } else if (eina_streq(em->name, "clock")) @@ -1438,7 +1428,6 @@ e_config_load(void) module = E_NEW(E_Config_Module, 1); module->name = eina_stringshare_add("time"); module->enabled = 1; - module->delayed = 1; e_config->modules = eina_list_append(e_config->modules, module); } } @@ -1473,7 +1462,6 @@ e_config_load(void) module = E_NEW(E_Config_Module, 1); module->name = eina_stringshare_add("luncher"); module->enabled = 1; - module->delayed = 1; e_config->modules = eina_list_append(e_config->modules, module); } } @@ -1496,7 +1484,6 @@ e_config_load(void) module = E_NEW(E_Config_Module, 1); module->name = eina_stringshare_add("sysinfo"); module->enabled = 1; - module->delayed = 1; e_config->modules = eina_list_append(e_config->modules, module); } } @@ -1512,6 +1499,7 @@ e_config_load(void) Eina_List *l; E_Config_Binding_Edge *ebe; + CONFIG_VERSION_UPDATE_INFO(25); EINA_LIST_FOREACH(e_bindings->edge_bindings, l, ebe) { if ((ebe->context == E_BINDING_CONTEXT_ZONE) && @@ -1524,7 +1512,6 @@ e_config_load(void) ebe->any_mod = 1; } } - CONFIG_VERSION_UPDATE_INFO(25); e_config_save_queue(); } CONFIG_VERSION_CHECK(26) @@ -1536,6 +1523,7 @@ e_config_load(void) E_Config_Gadcon *gc; E_Config_Gadcon_Client *gcc; + CONFIG_VERSION_UPDATE_INFO(26); EINA_LIST_FOREACH(e_config->modules, l, em) { if (!em->enabled) continue; @@ -1562,7 +1550,6 @@ e_config_load(void) } } } - CONFIG_VERSION_UPDATE_INFO(26); e_config_save_queue(); } CONFIG_VERSION_CHECK(28) @@ -1570,6 +1557,7 @@ e_config_load(void) Eina_List *l, *ll; E_Config_Binding_Mouse *ebm; + CONFIG_VERSION_UPDATE_INFO(28); EINA_LIST_FOREACH_SAFE(e_bindings->mouse_bindings, l, ll, ebm) { if ((eina_streq(ebm->action, "gadget_menu")) || @@ -1583,7 +1571,6 @@ e_config_load(void) free(ebm); } } - CONFIG_VERSION_UPDATE_INFO(27); e_config_save_queue(); } } @@ -1605,7 +1592,6 @@ e_config_load(void) 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->zone_desks_x_count, 1, 64); E_CONFIG_LIMIT(e_config->zone_desks_y_count, 1, 64); diff --git a/src/bin/e_config.h b/src/bin/e_config.h index 565b8abf2..183585181 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -69,13 +69,11 @@ struct _E_Config int border_shade_animate; // GUI int border_shade_transition; // GUI double border_shade_speed; // GUI - double framerate; // GUI int priority; // GUI int zone_desks_x_count; // GUI int zone_desks_y_count; // GUI int show_desktop_icons; // GUI int edge_flip_dragging; // GUI - int no_module_delay; // GUI const char *language; // GUI const char *desklock_language; // GUI Eina_List *modules; // GUI @@ -485,8 +483,6 @@ struct _E_Config_Module { const char *name; unsigned char enabled; - unsigned char delayed; - int priority; }; struct _E_Config_Binding_Mouse diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 71c7fb3e2..fb8adf520 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -620,8 +620,6 @@ main(int argc, char **argv) TS("E_Ipc Init Done"); _e_main_shutdown_push(e_ipc_shutdown); - edje_frametime_set(1.0 / e_config->framerate); - TS("E_Font Init"); if (!e_font_init()) { diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 49686d0a8..9a183e3d5 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -12,17 +12,13 @@ static void _e_module_free(E_Module *m); static void _e_module_dialog_disable_create(const char *title, const char *body, E_Module *m); static void _e_module_cb_dialog_disable(void *data, E_Dialog *dia); static void _e_module_event_update_free(void *data, void *event); -static Eina_Bool _e_module_cb_idler(void *data); static int _e_module_sort_name(const void *d1, const void *d2); -static int _e_module_sort_priority(const void *d1, const void *d2); static void _e_module_whitelist_check(void); static Eina_Bool _e_module_desktop_list_cb(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata); /* local subsystem globals */ static Eina_List *_e_modules = NULL; static Eina_Hash *_e_modules_hash = NULL; -static Ecore_Idle_Enterer *_e_module_idler = NULL; -static Eina_List *_e_modules_delayed = NULL; static Eina_Bool _e_modules_initting = EINA_FALSE; static Eina_Bool _e_modules_init_end = EINA_FALSE; @@ -288,8 +284,6 @@ e_module_all_load(void) free(em); } } - e_config->modules = - eina_list_sort(e_config->modules, 0, _e_module_sort_priority); EINA_LIST_FOREACH_SAFE(e_config->modules, l, ll, em) { @@ -302,15 +296,7 @@ e_module_all_load(void) free(em); continue; } - if ((em->delayed) && (em->enabled) && (!e_config->no_module_delay)) - { - if (!_e_module_idler) - _e_module_idler = ecore_idle_enterer_add(_e_module_cb_idler, NULL); - _e_modules_delayed = - eina_list_append(_e_modules_delayed, - eina_stringshare_add(em->name)); - } - else if (em->enabled) + if (em->enabled) { E_Module *m; @@ -324,14 +310,10 @@ e_module_all_load(void) if (m) e_module_enable(m); } } - - if (!_e_modules_delayed) - { - ecore_event_add(E_EVENT_MODULE_INIT_END, NULL, NULL, NULL); - _e_modules_init_end = EINA_TRUE; - _e_modules_initting = EINA_FALSE; - _e_module_whitelist_check(); - } + ecore_event_add(E_EVENT_MODULE_INIT_END, NULL, NULL, NULL); + _e_modules_init_end = EINA_TRUE; + _e_modules_initting = EINA_FALSE; + _e_module_whitelist_check(); unsetenv("E_MODULE_LOAD"); } @@ -670,50 +652,6 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body) e_win_client_icon_set(dia->win, icon); } -E_API void -e_module_delayed_set(E_Module *m, int delayed) -{ - Eina_List *l; - E_Config_Module *em; - - EINA_LIST_FOREACH(e_config->modules, l, em) - { - if (!em) continue; - if (!e_util_strcmp(m->name, em->name)) - { - if (em->delayed != delayed) - { - em->delayed = delayed; - e_config_save_queue(); - } - break; - } - } -} - -E_API void -e_module_priority_set(E_Module *m, int priority) -{ - /* Set the loading order for a module. - More priority means load earlier */ - Eina_List *l; - E_Config_Module *em; - - EINA_LIST_FOREACH(e_config->modules, l, em) - { - if (!em) continue; - if (!e_util_strcmp(m->name, em->name)) - { - if (em->priority != priority) - { - em->priority = priority; - e_config_save_queue(); - } - break; - } - } -} - E_API Eina_List * e_module_desktop_list(void) { @@ -847,51 +785,6 @@ _e_module_cb_dialog_disable(void *data, E_Dialog *dia) e_config_save_queue(); } -static Eina_Bool -_e_module_cb_idler(void *data EINA_UNUSED) -{ - while (_e_modules_delayed) - { - const char *name; - E_Module *m; - - name = eina_list_data_get(_e_modules_delayed); - _e_modules_delayed = - eina_list_remove_list(_e_modules_delayed, _e_modules_delayed); - if (eina_hash_find(_e_modules_hash, name)) - { - eina_stringshare_del(name); - break; - } - m = NULL; - if (name) m = e_module_new(name); - if (m) - { -#ifndef E_RELEASE_BUILD - char buf[1024]; - snprintf(buf, sizeof(buf), "DELAYED MODULE LOAD: %s", name); - e_main_ts(buf); -#endif - e_module_enable(m); - } - eina_stringshare_del(name); - break; - } - if (_e_modules_delayed) - { - e_util_wakeup(); - return ECORE_CALLBACK_RENEW; - } - - ecore_event_add(E_EVENT_MODULE_INIT_END, NULL, NULL, NULL); - _e_modules_init_end = EINA_TRUE; - _e_modules_initting = EINA_FALSE; - _e_module_whitelist_check(); - - _e_module_idler = NULL; - return ECORE_CALLBACK_CANCEL; -} - static int _e_module_sort_name(const void *d1, const void *d2) { @@ -904,16 +797,6 @@ _e_module_sort_name(const void *d1, const void *d2) return strcmp(m1->name, m2->name); } -static int -_e_module_sort_priority(const void *d1, const void *d2) -{ - const E_Config_Module *m1, *m2; - - m1 = d1; - m2 = d2; - return m2->priority - m1->priority; -} - static void _e_module_event_update_free(void *data EINA_UNUSED, void *event) { diff --git a/src/bin/e_module.h b/src/bin/e_module.h index 69c850f25..48c670372 100644 --- a/src/bin/e_module.h +++ b/src/bin/e_module.h @@ -76,8 +76,6 @@ E_API Eina_List *e_module_list(void); E_API Eina_List *e_module_desktop_list(void); E_API void e_module_desktop_free(E_Module_Desktop *md); E_API void e_module_dialog_show(E_Module *m, const char *title, const char *body); -E_API void e_module_delayed_set(E_Module *m, int delayed); -E_API void e_module_priority_set(E_Module *m, int priority); -E_API Eina_Bool e_module_loading_get(void); +E_API Eina_Bool e_module_loading_get(void); #endif #endif diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index c08f33c91..e21c65dcc 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -353,7 +353,6 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, E_Layer laye shelves = eina_list_append(shelves, es); es->hidden = 0; - es->hide_step = 0; es->locked = 0; es->hide_origin = -1; @@ -500,8 +499,11 @@ e_shelf_toggle(E_Shelf *es, int show) es->hide_timer = NULL; } if (!es->hide_animator) - es->hide_animator = - ecore_animator_add(_e_shelf_cb_hide_animator, es); + { + es->hide_begin = ecore_loop_time_get(); + es->hide_animator = + ecore_animator_add(_e_shelf_cb_hide_animator, es); + } } } else if ((!show) && (!es->hidden) && ((!es->gadcon) || (!es->gadcon->editing)) && @@ -847,7 +849,6 @@ e_shelf_position_calc(E_Shelf *es) default: break; } - es->hide_step = 0; es->hide_origin = -1; if ((es->x == x) && (es->y == y) && (es->w == w) && (es->h == h)) return; @@ -2033,7 +2034,8 @@ static Eina_Bool _e_shelf_cb_hide_animator(void *data) { E_Shelf *es; - int step, hide_max = 0; + int hide_max = 0; + double pos; es = data; if (!es->gadcon) @@ -2070,30 +2072,16 @@ _e_shelf_cb_hide_animator(void *data) break; } - step = (hide_max / e_config->framerate) / es->cfg->hide_duration; - if (!step) step = 1; - + pos = (ecore_loop_time_get() - es->hide_begin) / es->cfg->hide_duration; if (es->hidden) { - if (es->hide_step < hide_max) - { - if (es->hide_step + step > hide_max) - es->hide_step = hide_max; - else - es->hide_step += step; - } - else goto end; + es->hide_step = hide_max * pos; + if (es->hide_step > hide_max) es->hide_step = hide_max; } else { - if (es->hide_step > 0) - { - if (es->hide_step < step) - es->hide_step = 0; - else - es->hide_step -= step; - } - else goto end; + es->hide_step = hide_max * (1.0 - pos); + if (es->hide_step <= 0) es->hide_step = 0; } switch (es->gadcon->orient) @@ -2129,6 +2117,14 @@ _e_shelf_cb_hide_animator(void *data) break; } + if (es->hidden) + { + if (es->hide_step == hide_max) goto end; + } + else + { + if (es->hide_step == 0) goto end; + } return ECORE_CALLBACK_RENEW; end: @@ -2157,7 +2153,10 @@ _e_shelf_cb_hide_animator_timer(void *data) es = data; if (!es->hide_animator) - es->hide_animator = ecore_animator_add(_e_shelf_cb_hide_animator, es); + { + es->hide_begin = ecore_loop_time_get(); + es->hide_animator = ecore_animator_add(_e_shelf_cb_hide_animator, es); + } es->hide_timer = NULL; return ECORE_CALLBACK_CANCEL; } diff --git a/src/bin/e_shelf.h b/src/bin/e_shelf.h index 59accf942..82dcdde34 100644 --- a/src/bin/e_shelf.h +++ b/src/bin/e_shelf.h @@ -30,6 +30,7 @@ struct _E_Shelf E_Menu *menu; Ecore_Timer *hide_timer; Ecore_Animator *hide_animator; + double hide_begin; int hide_step; int hidden_state_size; int hide_origin; diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c index c43def08f..83d1975df 100644 --- a/src/modules/conf/e_mod_main.c +++ b/src/modules/conf/e_mod_main.c @@ -276,8 +276,6 @@ e_modapi_init(E_Module *m) maug = e_int_menus_menu_augmentation_add_sorted("config/0", _("Settings Panel"), _e_mod_menu_add, NULL, NULL, NULL); - e_module_delayed_set(m, 1); - snprintf(buf, sizeof(buf), "%s/e-module-conf.edj", e_module_dir_get(conf_module)); diff --git a/src/modules/conf_applications/e_mod_main.c b/src/modules/conf_applications/e_mod_main.c index cee7f37ba..922abd997 100644 --- a/src/modules/conf_applications/e_mod_main.c +++ b/src/modules/conf_applications/e_mod_main.c @@ -64,7 +64,6 @@ e_modapi_init(E_Module *m) e_int_config_apps_ibar_other); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_bindings/e_mod_main.c b/src/modules/conf_bindings/e_mod_main.c index 25b611add..97f0a46b7 100644 --- a/src/modules/conf_bindings/e_mod_main.c +++ b/src/modules/conf_bindings/e_mod_main.c @@ -40,7 +40,6 @@ e_modapi_init(E_Module *m) "preferences-desktop-signal-bindings", e_int_config_signalbindings); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_dialogs/e_mod_main.c b/src/modules/conf_dialogs/e_mod_main.c index 09cec4c07..7db7b7f10 100644 --- a/src/modules/conf_dialogs/e_mod_main.c +++ b/src/modules/conf_dialogs/e_mod_main.c @@ -18,7 +18,6 @@ e_modapi_init(E_Module *m) e_configure_registry_item_add("settings/dialogs", 10, _("Dialogs"), NULL, "preferences-system", e_int_config_dialogs); e_configure_registry_item_add("settings/profiles", 50, _("Profiles"), NULL, "preferences-profiles", e_int_config_profiles); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_display/e_mod_main.c b/src/modules/conf_display/e_mod_main.c index f548a44fd..e19bba899 100644 --- a/src/modules/conf_display/e_mod_main.c +++ b/src/modules/conf_display/e_mod_main.c @@ -46,7 +46,6 @@ e_modapi_init(E_Module *m) e_int_config_desk); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_interaction/e_mod_main.c b/src/modules/conf_interaction/e_mod_main.c index 77639e418..5bc40b927 100644 --- a/src/modules/conf_interaction/e_mod_main.c +++ b/src/modules/conf_interaction/e_mod_main.c @@ -25,7 +25,6 @@ e_modapi_init(E_Module *m) "preferences-desktop-mouse", e_int_config_mouse); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_intl/e_mod_main.c b/src/modules/conf_intl/e_mod_main.c index c9483977b..23a917fe5 100644 --- a/src/modules/conf_intl/e_mod_main.c +++ b/src/modules/conf_intl/e_mod_main.c @@ -28,7 +28,6 @@ e_modapi_init(E_Module *m) _("Input Method Settings"), NULL, "preferences-imc", e_int_config_imc); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_menus/e_mod_main.c b/src/modules/conf_menus/e_mod_main.c index 179cdc4ed..77f70f2d0 100644 --- a/src/modules/conf_menus/e_mod_main.c +++ b/src/modules/conf_menus/e_mod_main.c @@ -17,7 +17,6 @@ e_modapi_init(E_Module *m) e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "preferences-menus"); e_configure_registry_item_add("menus/menu_settings", 30, _("Menu Settings"), NULL, "preferences-menu-settings", e_int_config_menus); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_paths/e_mod_main.c b/src/modules/conf_paths/e_mod_main.c index f2d41e6c8..7d3f4e501 100644 --- a/src/modules/conf_paths/e_mod_main.c +++ b/src/modules/conf_paths/e_mod_main.c @@ -25,7 +25,6 @@ e_modapi_init(E_Module *m) "preferences-variables", e_int_config_env); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_performance/e_int_config_performance.c b/src/modules/conf_performance/e_int_config_performance.c index f417a7216..bf274168a 100644 --- a/src/modules/conf_performance/e_int_config_performance.c +++ b/src/modules/conf_performance/e_int_config_performance.c @@ -8,9 +8,7 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dia struct _E_Config_Dialog_Data { - double framerate; int priority; - int module_delay; }; E_Config_Dialog * @@ -41,9 +39,7 @@ _create_data(E_Config_Dialog *cfd EINA_UNUSED) cfdata = E_NEW(E_Config_Dialog_Data, 1); if (!cfdata) return NULL; - cfdata->framerate = e_config->framerate; cfdata->priority = e_config->priority; - cfdata->module_delay = !e_config->no_module_delay; return cfdata; } @@ -56,11 +52,7 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) static int _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { - if (cfdata->framerate <= 0.0) cfdata->framerate = 1.0; - e_config->framerate = cfdata->framerate; - edje_frametime_set(1.0 / e_config->framerate); e_config->priority = cfdata->priority; - e_config->no_module_delay = !cfdata->module_delay; ecore_exe_run_priority_set(e_config->priority); e_config_save_queue(); return 1; @@ -69,10 +61,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) static int _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { - if (cfdata->framerate <= 0.0) cfdata->framerate = 1.0; - return ((!EINA_DBL_EQ(e_config->framerate, cfdata->framerate)) || - (e_config->priority != cfdata->priority) || - (e_config->no_module_delay != (!cfdata->module_delay))); + return ((e_config->priority != cfdata->priority)); } static Evas_Object * @@ -81,11 +70,6 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data Evas_Object *ob, *ol; ol = e_widget_list_add(evas, 0, 0); - ob = e_widget_label_add(evas, _("Framerate")); - e_widget_list_object_append(ol, ob, 1, 1, 0.5); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f fps"), 5.0, 200.0, 1.0, 0, - &(cfdata->framerate), NULL, 100); - e_widget_list_object_append(ol, ob, 1, 0, 0.5); ob = e_widget_label_add(evas, _("Application priority")); e_widget_list_object_append(ol, ob, 1, 1, 0.5); @@ -93,8 +77,5 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data &(cfdata->priority), 100); e_widget_list_object_append(ol, ob, 1, 0, 0.5); - ob = e_widget_check_add(evas, _("Allow module load delay"), &(cfdata->module_delay)); - e_widget_list_object_append(ol, ob, 1, 0, 0.5); - return ol; } diff --git a/src/modules/conf_performance/e_mod_main.c b/src/modules/conf_performance/e_mod_main.c index e04007a38..c7c88c6bb 100644 --- a/src/modules/conf_performance/e_mod_main.c +++ b/src/modules/conf_performance/e_mod_main.c @@ -18,7 +18,6 @@ e_modapi_init(E_Module *m) e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "preferences-system-performance", e_int_config_performance); e_configure_registry_item_add("advanced/powermanagement", 50, _("Power Management"), NULL, "preferences-system-power-management", e_int_config_powermanagement); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_shelves/e_mod_main.c b/src/modules/conf_shelves/e_mod_main.c index 20db2a334..98cfca910 100644 --- a/src/modules/conf_shelves/e_mod_main.c +++ b/src/modules/conf_shelves/e_mod_main.c @@ -28,7 +28,6 @@ e_modapi_init(E_Module *m) _e_mod_menu_add, NULL, NULL, NULL); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_theme/e_mod_main.c b/src/modules/conf_theme/e_mod_main.c index 1499de933..591a75541 100644 --- a/src/modules/conf_theme/e_mod_main.c +++ b/src/modules/conf_theme/e_mod_main.c @@ -94,7 +94,6 @@ e_modapi_init(E_Module *m) _e_mod_menu_theme_add, NULL, NULL, NULL); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_window_manipulation/e_mod_main.c b/src/modules/conf_window_manipulation/e_mod_main.c index b3f15bfe6..e87ce68fc 100644 --- a/src/modules/conf_window_manipulation/e_mod_main.c +++ b/src/modules/conf_window_manipulation/e_mod_main.c @@ -21,7 +21,6 @@ e_modapi_init(E_Module *m) e_configure_registry_item_add("windows/window_list_menu", 40, _("Window List Menu"), NULL, "preferences-winlist", e_int_config_clientlist); e_configure_registry_item_add("windows/window_process", 50, _("Window Process Management"), NULL, "preferences-window-process", e_int_config_window_process); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/conf_window_remembers/e_mod_main.c b/src/modules/conf_window_remembers/e_mod_main.c index f504fdb7d..547882ef9 100644 --- a/src/modules/conf_window_remembers/e_mod_main.c +++ b/src/modules/conf_window_remembers/e_mod_main.c @@ -18,7 +18,6 @@ e_modapi_init(E_Module *m) "preferences-desktop-window-remember", e_int_config_remembers); conf_module = m; - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c index 9c556c1c1..38949a4b2 100644 --- a/src/modules/everything/e_mod_main.c +++ b/src/modules/everything/e_mod_main.c @@ -138,9 +138,6 @@ e_modapi_init(E_Module *m) evry_view_help_init(); evry_gadget_init(); - e_module_priority_set(m, -1000); - e_module_delayed_set(m, 1); - /* cleanup every hour :) */ cleanup_timer = ecore_timer_loop_add(3600, _cleanup_history, NULL); diff --git a/src/modules/everything/evry_plug_settings.c b/src/modules/everything/evry_plug_settings.c index a071b3eb8..0128abc98 100644 --- a/src/modules/everything/evry_plug_settings.c +++ b/src/modules/everything/evry_plug_settings.c @@ -203,12 +203,9 @@ _plugins_shutdown(void) /***************************************************************************/ Eina_Bool -evry_plug_settings_init(E_Module *m) +evry_plug_settings_init(E_Module *m EINA_UNUSED) { EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown); - - e_module_delayed_set(m, 1); - return EINA_TRUE; } diff --git a/src/modules/everything/evry_view.c b/src/modules/everything/evry_view.c index b0be7b00f..8800a0c74 100644 --- a/src/modules/everything/evry_view.c +++ b/src/modules/everything/evry_view.c @@ -40,7 +40,9 @@ struct _Smart_Data double last_select; double scroll_align; + double scroll_align_from; double scroll_align_to; + double animator_start; Ecore_Animator *animator; int slide_offset; @@ -756,25 +758,20 @@ _animator(void *data) { Smart_Data *sd = evas_object_smart_data_get(data); if (!sd) return ECORE_CALLBACK_CANCEL; - double da; - double spd = ((25.0 / (double)e_config->framerate) / - (double)(1 + sd->view->zoom)); - if (spd > 0.9) spd = 0.9; - + double pos = (ecore_loop_time_get() - sd->animator_start) / 0.2; int wait = 0; + if (pos < 0.0) pos = 0.0; + else if (pos > 1.0) pos = 1.0; if (!EINA_DBL_EQ(sd->scroll_align, sd->scroll_align_to)) { - sd->scroll_align = ((sd->scroll_align * (1.0 - spd)) + - (sd->scroll_align_to * spd)); - + sd->scroll_align = ((sd->scroll_align_from * (1.0 - pos)) + + (sd->scroll_align_to * pos)); da = sd->scroll_align - sd->scroll_align_to; if (da < 0.0) da = -da; - if (da < 0.02) - sd->scroll_align = sd->scroll_align_to; - else - wait++; + if (da < 0.02) sd->scroll_align = sd->scroll_align_to; + else wait++; e_scrollframe_child_pos_set(sd->view->sframe, 0, sd->scroll_align); @@ -868,7 +865,11 @@ _pan_item_select(Evas_Object *obj, Item *it, int scroll) sd->scroll_align_to = align; if ((!EINA_DBL_EQ(align, sd->cy)) && !sd->animator) - sd->animator = ecore_animator_add(_animator, obj); + { + sd->animator_start = ecore_loop_time_get(); + sd->scroll_align_from = sd->scroll_align; + sd->animator = ecore_animator_add(_animator, obj); + } } else { diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c index b7eb6b92a..1e94f79fd 100644 --- a/src/modules/fileman/e_mod_main.c +++ b/src/modules/fileman/e_mod_main.c @@ -59,7 +59,6 @@ e_modapi_init(E_Module *m) if (act2) act2->func.go = _e_mod_action_fileman_reset_cb; maug = e_int_menus_menu_augmentation_add_sorted("main/1", _("Navigate"), _e_mod_menu_add, NULL, NULL, NULL); - e_module_delayed_set(m, 1); e_fwin_init(); diff --git a/src/modules/gadman/e_mod_main.c b/src/modules/gadman/e_mod_main.c index 3c4d294fc..cebab433e 100644 --- a/src/modules/gadman/e_mod_main.c +++ b/src/modules/gadman/e_mod_main.c @@ -27,7 +27,6 @@ e_modapi_init(E_Module *m) /* Set this module to be loaded after all other modules, or we don't see modules loaded after this */ - e_module_priority_set(m, 100); gadman_init(m); diff --git a/src/modules/quickaccess/e_mod_main.c b/src/modules/quickaccess/e_mod_main.c index 792252d0b..2afdece8d 100644 --- a/src/modules/quickaccess/e_mod_main.c +++ b/src/modules/quickaccess/e_mod_main.c @@ -56,7 +56,6 @@ e_modapi_init(E_Module *m) qa_mod = E_NEW(Mod, 1); qa_mod->module = m; m->data = qa_mod; - e_module_delayed_set(m, 0); conf_edd = e_qa_config_dd_new(); qa_config = e_config_domain_load("module.quickaccess", conf_edd); if (qa_config) diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c index fd0599a25..f0ff786d2 100644 --- a/src/modules/shot/e_mod_main.c +++ b/src/modules/shot/e_mod_main.c @@ -1056,8 +1056,6 @@ e_modapi_init(E_Module *m) return NULL; } - e_module_delayed_set(m, 1); - shot_module = m; act = e_action_add("shot"); if (act) diff --git a/src/modules/syscon/e_mod_main.c b/src/modules/syscon/e_mod_main.c index 4bca63b07..0464e9272 100644 --- a/src/modules/syscon/e_mod_main.c +++ b/src/modules/syscon/e_mod_main.c @@ -36,7 +36,6 @@ e_modapi_init(E_Module *m) e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced"); e_configure_registry_item_add("advanced/syscon", 10, _("System Controls"), NULL, "system-shutdown", e_int_config_syscon); e_syscon_gadget_init(m); - e_module_delayed_set(m, 1); return m; } diff --git a/src/modules/vkbd/e_mod_main.c b/src/modules/vkbd/e_mod_main.c index b4259f404..3051cce41 100644 --- a/src/modules/vkbd/e_mod_main.c +++ b/src/modules/vkbd/e_mod_main.c @@ -85,7 +85,6 @@ e_modapi_init(E_Module *m) "vkbd_toggle", NULL, NULL, 0); } - e_module_delayed_set(m, 1); ki_delay_timer = ecore_timer_add(1.0, _il_ki_delay_cb, NULL); e_kbd_send_init(); return m; diff --git a/src/modules/winlist/e_mod_main.c b/src/modules/winlist/e_mod_main.c index ebb15bf0c..7fd255b8c 100644 --- a/src/modules/winlist/e_mod_main.c +++ b/src/modules/winlist/e_mod_main.c @@ -65,7 +65,6 @@ e_modapi_init(E_Module *m) e_action_predef_name_set(N_("Window : List"), N_("Window on the Right"), "winlist", "right", NULL, 0); } - e_module_delayed_set(m, 1); return m; }