[PATCH weston 1/4] shell: Split plugin and client configure sections

[Tiago Vignatti]

Before we were using 'shell' section for both the plugin and client
configurations. This commit separates in 'shell-plugin' and 'shell-client',
for organization matters.

Signed-off-by: Tiago Vignatti <tiago.vignatti at intel.com>
---
 clients/desktop-shell.c |    2 +-
 clients/window.c        |    2 +-
 man/weston.ini.man      |   52 +++++++++++++++++++++++++++--------------------
 src/shell.c             |    2 +-
 weston.ini              |   17 ++++++++--------
 5 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
index 41e7daa..e5faf9c 100644
--- a/clients/desktop-shell.c
+++ b/clients/desktop-shell.c
@@ -138,7 +138,7 @@ static const struct config_key launcher_config_keys[] = {
 };
 
 static const struct config_section config_sections[] = {
-	{ "shell",
+	{ "shell-client",
 	  shell_config_keys, ARRAY_LENGTH(shell_config_keys) },
 	{ "launcher",
 	  launcher_config_keys, ARRAY_LENGTH(launcher_config_keys),
diff --git a/clients/window.c b/clients/window.c
index 073ce53..6dfb3b5 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -1105,7 +1105,7 @@ create_cursors(struct display *display)
 		{ "cursor-size", CONFIG_KEY_UNSIGNED_INTEGER, &size },
 	};
 	struct config_section cs[] = {
-		{ "shell", shell_keys, ARRAY_LENGTH(shell_keys), NULL },
+		{ "shell-client", shell_keys, ARRAY_LENGTH(shell_keys), NULL },
 	};
 
 	config_file = config_file_path("weston.ini");
diff --git a/man/weston.ini.man b/man/weston.ini.man
index 8dde82c..e403cb2 100644
--- a/man/weston.ini.man
+++ b/man/weston.ini.man
@@ -62,7 +62,8 @@ The section headers are:
 .RS 4
 .nf
 .BR "core           " "The core modules"
-.BR "shell          " "Desktop customization"
+.BR "shell-plugin   " "Shell plugin customization"
+.BR "shell-client   " "Client shell customization"
 .BR "launcher       " "Add launcher to the panel"
 .BR "screensaver    " "Screensaver selection"
 .BR "output         " "Output configuration"
@@ -98,11 +99,35 @@ directory are:
 .RS
 .PP
 
-.SH "SHELL SECTION"
+.SH "SHELL-PLUGIN SECTION"
 The
-.B shell
-section is used to customize the compositor. Some keys may not be handled by
-different shell plugins.
+.B shell-plugin
+section is used to customize the compositor.
+.PP
+The entries that can appear in this section are:
+.TP 7
+.BI "animation=" zoom
+sets the effect used for opening new windows (string). Can be
+.B zoom,
+.B fade.
+Otherwise, no animation is used.
+.TP 7
+.BI "binding-modifier=" ctrl
+sets the modifier key used for common bindings (string), such as moving
+surfaces, resizing, rotating, switching, closing and setting the transparency
+for windows, controlling the backlight and zooming the desktop. Possible values:
+ctrl, alt, super (default)
+.TP 7
+.BI "num-workspaces=" 6
+defines the number of workspaces (unsigned integer). The user can switch
+workspaces by using the
+binding+F1, F2 keys. If this key is not set, fall back to one workspace.
+
+.SH "SHELL-CLIENT SECTION"
+The
+.B shell-client
+section is used to customize the compositor appearance via shell client. Some
+keys may not be handled by different shell clients.
 .PP
 The entries that can appear in this section are:
 .TP 7
@@ -129,23 +154,6 @@ digit pairs are in order transparency, red, green, and blue. Examples:
 .BI "locking=" true
 enables screen locking (boolean).
 .TP 7
-.BI "animation=" zoom
-sets the effect used for opening new windows (string). Can be
-.B zoom,
-.B fade.
-Otherwise, no animation is used.
-.TP 7
-.BI "binding-modifier=" ctrl
-sets the modifier key used for common bindings (string), such as moving
-surfaces, resizing, rotating, switching, closing and setting the transparency
-for windows, controlling the backlight and zooming the desktop. Possible values:
-ctrl, alt, super (default)
-.TP 7
-.BI "num-workspaces=" 6
-defines the number of workspaces (unsigned integer). The user can switch
-workspaces by using the
-binding+F1, F2 keys. If this key is not set, fall back to one workspace.
-.TP 7
 .BI "cursor-theme=" theme
 sets the cursor theme (string).
 .TP 7
diff --git a/src/shell.c b/src/shell.c
index de5d6f6..f9110a6 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -388,7 +388,7 @@ shell_configuration(struct desktop_shell *shell, const char *config_file)
 	};
 
 	struct config_section cs[] = {
-		{ "shell", shell_keys, ARRAY_LENGTH(shell_keys), NULL },
+		{ "shell-plugin", shell_keys, ARRAY_LENGTH(shell_keys), NULL },
 		{ "screensaver", saver_keys, ARRAY_LENGTH(saver_keys), NULL },
 	};
 
diff --git a/weston.ini b/weston.ini
index c6cff76..8f694a4 100644
--- a/weston.ini
+++ b/weston.ini
@@ -1,21 +1,22 @@
 [core]
 #modules=desktop-shell.so,xwayland.so
 
-[shell]
-background-image=/usr/share/backgrounds/gnome/Aqua.jpg
-background-color=0xff002244
-panel-color=0x90ff0000
-locking=true
+[shell-plugin]
 animation=zoom
+#animation=fade
 #binding-modifier=ctrl
 #num-workspaces=6
-#cursor-theme=whiteglass
-#cursor-size=24
 
+[shell-client]
+background-image=/usr/share/backgrounds/gnome/Aqua.jpg
+background-color=0xff002244
+panel-color=0x90ff0000
+locking=true
 #lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png
 #lockscreen=/usr/share/backgrounds/gnome/Garden.jpg
 #homescreen=/usr/share/backgrounds/gnome/Blinds.jpg
-#animation=fade
+#cursor-theme=whiteglass
+#cursor-size=24
 
 [launcher]
 icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png
-- 
1.7.9.5