Menu
▾
▴
[Conky-commits] SF.net SVN: conky:[1271] trunk/conky1
|
From: <n0...@us...> - 2008-11-29 13:02:48
|
Revision: 1271
http://conky.svn.sourceforge.net/conky/?rev=1271&view=rev
Author: n0-1
Date: 2008-11-29 13:02:42 +0000 (Sat, 29 Nov 2008)
Log Message:
-----------
improve template support
* handle escaped characters in parameters to the template object, too
* add samples to the documentation
* do some code cleanup by outsourcing the string substitution into it's
own function
Modified Paths:
--------------
trunk/conky1/doc/config_settings.xml
trunk/conky1/doc/variables.xml
trunk/conky1/src/conky.c
Modified: trunk/conky1/doc/config_settings.xml
===================================================================
--- trunk/conky1/doc/config_settings.xml 2008-11-29 01:34:54 UTC (rev 1270)
+++ trunk/conky1/doc/config_settings.xml 2008-11-29 13:02:42 UTC (rev 1271)
@@ -360,7 +360,15 @@
<varlistentry>
<term><command><option>templateN</option></command></term>
<listitem>
- Define a template for later use inside TEXT segments. Substitute N by a digit between 0 and 9, inclusively. The value of the variable is being inserted into the stuff below TEXT at the corresponding position, but before some substitutions are applied: any occuring '\N' (where N is a positive integer) will be substituted by the Nth param specified, any occuring '\n' will be translated into a real newline and '\\' is being substituted by a single backslash ('\').
+ Define a template for later use inside TEXT segments. Substitute N by a digit between 0 and 9, inclusively.
+ The value of the variable is being inserted into the stuff below TEXT at the corresponding position,
+ but before some substitutions are applied:
+ <simplelist>
+ <member>'\n' -> newline</member>
+ <member>'\\' -> backslash</member>
+ <member>'\ ' -> space</member>
+ <member>'\N' -> template argument N</member>
+ </simplelist>
<para></para></listitem>
</varlistentry>
Modified: trunk/conky1/doc/variables.xml
===================================================================
--- trunk/conky1/doc/variables.xml 2008-11-29 01:34:54 UTC (rev 1270)
+++ trunk/conky1/doc/variables.xml 2008-11-29 13:02:42 UTC (rev 1271)
@@ -1978,8 +1978,37 @@
<option>(arg3 ...)</option>
</term>
<listitem>
- Evaluate the content of the templateN configuration variable (where N is a value between 0 and 9, inclusively), applying substitutions as described in the documentation of the corresponding configuration variable. The number of arguments is optional, but must match the highest referred index in the template.
+ Evaluate the content of the templateN configuration variable (where N is a value between 0 and 9, inclusively),
+ applying substitutions as described in the documentation of the corresponding configuration variable.
+ The number of arguments is optional, but must match the highest referred index in the template. You can use the
+ same special sequences in each argument as the ones valid for a template definition, e.g. to allow an argument
+ to contain a whitespace. Also simple nesting of templates is possible this way.
<para></para></listitem>
+ <listitem>
+ Here are some examples of template definitions:
+ <simplelist>
+ <member>template0 $\1\2</member>
+ <member>template1 \1: ${fs_used \2} / ${fs_size \2}</member>
+ <member>template2 \1 \2</member>
+ </simplelist>
+ The following list shows sample usage of the templates defined above,
+ with the equivalent syntax when not using any template at all:
+ <table>
+ <tgroup cols="2">
+ <thead>
+ <row rowsep="1"><entry>using template</entry><entry>same without template</entry></row>
+ </thead>
+ <tbody>
+ <row><entry>${template0 node name}</entry><entry>$nodename</entry></row>
+ <row><entry>${template1 root /}</entry><entry>root: ${fs_free /} / ${fs_size /}</entry></row>
+ <row>
+ <entry><programlisting>${template1 ${template2\ disk\ root} /}</programlisting></entry>
+ <entry><programlisting>disk root: ${fs_free /} / ${fs_size /}</programlisting></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <para></para></listitem>
</varlistentry>
<varlistentry>
Modified: trunk/conky1/src/conky.c
===================================================================
--- trunk/conky1/src/conky.c 2008-11-29 01:34:54 UTC (rev 1270)
+++ trunk/conky1/src/conky.c 2008-11-29 13:02:42 UTC (rev 1271)
@@ -4265,6 +4265,61 @@
return obj;
}
+/* backslash_escape - do the actual substitution task for template objects
+ *
+ * The field templates is used for substituting the \N occurences. Set it to
+ * NULL to leave them as they are.
+ */
+static char *backslash_escape(const char *src, char **templates, unsigned int template_count)
+{
+ char *src_dup;
+ const char *p;
+ int dup_idx = 0, dup_len;
+
+ dup_len = strlen(src);
+ if (templates) {
+ unsigned int i;
+ for (i = 0; i < template_count; i++)
+ dup_len += strlen(templates[i]);
+ }
+
+ src_dup = malloc(dup_len * sizeof(char));
+ p = src;
+ while (*p) {
+ switch (*p) {
+ case '\\':
+ if (!*(p + 1))
+ break;
+ if (*(p + 1) == '\\') {
+ src_dup[dup_idx++] = '\\';
+ p++;
+ } else if (*(p + 1) == ' ') {
+ src_dup[dup_idx++] = ' ';
+ p++;
+ } else if (*(p + 1) == 'n') {
+ src_dup[dup_idx++] = '\n';
+ p++;
+ } else if (templates) {
+ unsigned int tmpl_num;
+ int digits;
+ if ((sscanf(p + 1, "%u%n", &tmpl_num, &digits) <= 0) ||
+ (tmpl_num > template_count))
+ break;
+ sprintf(src_dup + dup_idx, "%s", templates[tmpl_num - 1]);
+ dup_idx += strlen(templates[tmpl_num - 1]);
+ p += digits;
+ }
+ break;
+ default:
+ src_dup[dup_idx++] = *p;
+ break;
+ }
+ p++;
+ }
+ src_dup[dup_idx] = '\0';
+ src_dup = realloc(src_dup, (strlen(src_dup) + 1) * sizeof(char));
+ return src_dup;
+}
static struct text_object_list *extract_variable_text_internal(const char *, char);
/* handle_template_object - core logic of the template object
@@ -4283,8 +4338,7 @@
{
char *args_dup, *template_dup, *p, *p_old;
char **argsp = NULL;
- int text_idx;
- unsigned int tmpl_num, argcnt = 0, template_idx;
+ unsigned int argcnt = 0, template_idx, i;
char *eval_text;
struct text_object_list *eval_list;
@@ -4295,10 +4349,12 @@
args_dup = strdup(args);
p = args_dup;
while (*p) {
- while (*p && *p == ' ')
+ while (*p && (*p == ' ' && *(p - 1) != '\\'))
p++;
+ if (*(p - 1) == '\\')
+ p--;
p_old = p;
- while (*p && *p != ' ')
+ while (*p && (*p != ' ' || *(p - 1) == '\\'))
p++;
if (*p) {
(*p) = '\0';
@@ -4307,51 +4363,22 @@
argsp = realloc(argsp, ++argcnt * sizeof(char *));
argsp[argcnt - 1] = p_old;
}
+ for (i = 0; i < argcnt; i++) {
+ char *tmp;
+ tmp = backslash_escape(argsp[i], NULL, 0);
+#if 0
+ printf("%s: substituted arg '%s' to '%s'\n", tmpl, argsp[i], tmp);
+#endif
+ sprintf(argsp[i], "%s", tmp);
+ free(tmp);
+ }
p = template_dup = strdup(template[template_idx]);
- /* not exact text len, but always enough so don't care. */
- eval_text = calloc(strlen(template_dup) + strlen(args), sizeof(char *));
- memset(eval_text, 0, strlen(template_dup) + strlen(args));
-
- text_idx = 0;
- while (*p) {
- switch (*p) {
- case '\\':
- if (*(p + 1) == '\\') {
- eval_text[text_idx++] = '\\';
- p++;
- break;
- }
- if (*(p + 1) == 'n') {
- eval_text[text_idx++] = '\n';
- p++;
- break;
- }
- if ((sscanf(p, "\\%u", &tmpl_num) != 1) ||
- (tmpl_num > argcnt))
- return 1;
- tmpl_num--; /* convert number to array idx */
- memcpy(eval_text + text_idx,
- argsp[tmpl_num], strlen(argsp[tmpl_num]));
- text_idx += strlen(argsp[tmpl_num]);
- /* following is tricky:
- * jump over all decimal digits of tmpl_num,
- * but beware of the fact that it could be 0
- * at the beginning. */
- p++;
- while (tmpl_num > 9) {
- tmpl_num /= 10;
- p++;
- }
- break;
- default:
- eval_text[text_idx++] = *p;
- break;
- }
- p++;
- }
-
+ eval_text = backslash_escape(template[template_idx], argsp, argcnt);
+#if 0
+ printf("substituted %s, output is '%s'\n", tmpl, eval_text);
+#endif
eval_list = extract_variable_text_internal(eval_text, allow_threaded);
if (eval_list) {
(*list)->text_objects = realloc((*list)->text_objects,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
