summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-09-10 17:58:30 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-09-10 17:58:30 +0100
commitb4cfada8e84d626a07ee5c201246974268c6702e (patch)
tree488290cf601fa67bc019dcaa46da76f68f0c6bec /data
parente924b29694c5e3124943fb309c21dc37a7f7a66d (diff)
downloadenlightenment-b4cfada8e84d626a07ee5c201246974268c6702e.tar.gz
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.
Diffstat (limited to 'data')
-rw-r--r--data/config/default/e.src4
-rw-r--r--data/config/standard/e.src82
-rw-r--r--data/config/standard/e_bindings.src30
-rw-r--r--data/config/tiling/e.src83
-rw-r--r--data/config/tiling/e_bindings.src32
5 files changed, 52 insertions, 179 deletions
diff --git a/data/config/default/e.src b/data/config/default/e.src
index 6c601c5d39..4b081d0b3c 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 cd18b67ecf..31b2982f25 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 5896c040d0..0df2f62f99 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 b3d984c2b4..2ec6af31a9 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 77d1337172..cd33c35bf8 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;
+ }
}
}