Merge commit 'remotes/yangtse/master'

diff --git a/gui.c b/gui.c
index 2fddc2f8dbbf2674fae9613fcb8b99da616044ed..0cb4b74afd0d616afedb06ec18fdc4f3329fc9d2 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -979,7 +979,7 @@ static int send_output(void)
 static int client_cmd_cmdline(char *cmd)
 {
        int ret, fds[3] = {0, 1, 0};
-       char *c = make_message(BINDIR "/para_client %s", cmd);
+       char *c = make_message(BINDIR "/para_client -- %s", cmd);
 
        outputf(COLOR_COMMAND, "%s", c);
        print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n");

diff --git a/gui.ggo b/gui.ggo
index 9701c39ee523952a2ecd31c1147ce75a83813a72..40a40563873e2c640f2ff73f7100360b65ab3dea 100644 (file)
--- a/gui.ggo
+++ b/gui.ggo
@@ -1,9 +1,52 @@
+#------------------------
 section "general options"
-option "auto_decode" a "auto-decode audio stream" flag on
-option "config_file" c "(default='~/.paraslash/gui.conf')" string typestr="filename" optional
-option "loglevel" l "set loglevel (0-6)" int typestr="level" default="4" optional
-option "timeout" t "set timeout" int typestr="milliseconds" default="30" optional
-option "stat_cmd" s "command to read server and audiod status data from" string typestr="command" default="para_audioc stat" optional
+#------------------------
 
+option "config_file" c
+#~~~~~~~~~~~~~~~~~~~~~~
+"(default='~/.paraslash/gui.conf')"
+
+       string typestr="filename"
+       optional
+
+option "loglevel" l
+#~~~~~~~~~~~~~~~~~~
+ "set loglevel (0-6)"
+
+       int typestr="level"
+       default="4"
+       optional
+
+option "timeout" t
+#~~~~~~~~~~~~~~~~~
+"set timeout"
+
+       int typestr="milliseconds"
+       default="30"
+       optional
+
+option "stat_cmd" s
+#~~~~~~~~~~~~~~~~~~
+"command to read server and audiod status
+data from"
+
+       string typestr="command"
+       default="para_audioc stat"
+       optional
+
+#---------------------------------
 section "mapping keys to commands"
-option "key_map" k "Map key k to command c using mode m. Mode may be d, x or p for display, external and paraslash commands, respectively. Of course, this option may be given multiple times, one for each key mapping." string typestr="k:m:c" optional multiple
+#---------------------------------
+
+option "key_map" k
+#~~~~~~~~~~~~~~~~~
+
+"Map key k to command c using mode m. Mode
+may be d, x or p for display, external and
+paraslash commands, respectively. Of course,
+this option may be given multiple times, one
+for each key mapping."
+
+       string typestr="k:m:c"
+       optional
+       multiple