mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config-parser: consolidate shell files into weston.ini only

Browse Source 
The shell choice happens in the configuration file now.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
This commit is contained in:
Tiago Vignatti
2012-03-21 19:49:18 +02:00
committed by Kristian Høgsberg
parent 6bd4d97271
commit 9a206c4da5
6 changed files with 30 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/desktop-shell.c
+2 -2
View File
@@ -118,7 +118,7 @@ static const struct config_key launcher_config_keys[] = {
};
static const struct config_section config_sections[] = {
{ "desktop-shell",
{ "shell",
shell_config_keys, ARRAY_LENGTH(shell_config_keys) },
{ "launcher",
launcher_config_keys, ARRAY_LENGTH(launcher_config_keys),
@@ -728,7 +728,7 @@ int main(int argc, char *argv[])
desktop_shell_set_background(desktop.shell, output->output, s);
}
config_file = config_file_path("weston-desktop-shell.ini");
config_file = config_file_path("weston.ini");
ret = parse_config_file(config_file,
config_sections, ARRAY_LENGTH(config_sections),
&desktop);
clients/tablet-shell.c
+7 -12
View File
@@ -54,13 +54,10 @@ static char *key_launcher_icon;
static char *key_launcher_path;
static void launcher_section_done(void *data);
static const struct config_key lockscreen_config_keys[] = {
{ "icon", CONFIG_KEY_STRING, &key_lockscreen_icon },
{ "background", CONFIG_KEY_STRING, &key_lockscreen_background },
};
static const struct config_key homescreen_config_keys[] = {
{ "background", CONFIG_KEY_STRING, &key_homescreen_background },
static const struct config_key shell_config_keys[] = {
{ "lockscreen-icon", CONFIG_KEY_STRING, &key_lockscreen_icon },
{ "lockscreen", CONFIG_KEY_STRING, &key_lockscreen_background },
{ "homescreen", CONFIG_KEY_STRING, &key_homescreen_background },
};
static const struct config_key launcher_config_keys[] = {
@@ -69,10 +66,8 @@ static const struct config_key launcher_config_keys[] = {
};
static const struct config_section config_sections[] = {
{ "lockscreen",
lockscreen_config_keys, ARRAY_LENGTH(lockscreen_config_keys) },
{ "homescreen",
homescreen_config_keys, ARRAY_LENGTH(homescreen_config_keys) },
{ "shell",
shell_config_keys, ARRAY_LENGTH(shell_config_keys) },
{ "launcher",
launcher_config_keys, ARRAY_LENGTH(launcher_config_keys),
launcher_section_done }
@@ -327,7 +322,7 @@ int main(int argc, char *argv[])
"tablet_shell", 1);
shell = tablet_shell_create(display, id);
config_file = config_file_path("weston-tablet-shell.ini");
config_file = config_file_path("weston.ini");
parse_config_file(config_file,
config_sections, ARRAY_LENGTH(config_sections),
shell);