Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-10-03 07:29:10 +00:00
Code Issues Releases Activity

Fix multiline stuff without X11.

Browse Source
This commit is contained in:
Brenden Matthews 2009-07-20 20:11:33 -06:00
parent 5d0e3922aa
commit 636ba55909
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conky.c
View File

@ -451,10 +451,10 @@ int check_contains(char *f, char *s)
return ret; return ret;
} }
#define SECRIT_MULTILINE_CHAR '\x02'
#ifdef X11 #ifdef X11
#define SECRIT_MULTILINE_CHAR '\x02'
static inline int calc_text_width(const char *s, int l) static inline int calc_text_width(const char *s, int l)
{ {
if ((output_methods & TO_X) == 0) { if ((output_methods & TO_X) == 0) {
@ -3711,6 +3711,7 @@ static inline double get_barnum(char *buf)
return barnum; return barnum;
} }
#ifdef X11
/* substitutes all occurrences of '\n' with SECRIT_MULTILINE_CHAR, which allows /* substitutes all occurrences of '\n' with SECRIT_MULTILINE_CHAR, which allows
* multiline objects like $exec work with $align[rc] and friends * multiline objects like $exec work with $align[rc] and friends
*/ */
@ -3726,6 +3727,7 @@ void substitute_newlines(char *p, long l)
p++; p++;
} }
} }
#endif /* X11 */
static void generate_text_internal(char *p, int p_max_size, static void generate_text_internal(char *p, int p_max_size,
struct text_object root, struct information *cur) struct text_object root, struct information *cur)
@ -6018,9 +6020,11 @@ static void generate_text_internal(char *p, int p_max_size,
a = outptr - p; a = outptr - p;
} }
#endif /* HAVE_ICONV */ #endif /* HAVE_ICONV */
#ifdef X11
if (obj->type != OBJ_text) { if (obj->type != OBJ_text) {
substitute_newlines(p, a - 2); substitute_newlines(p, a - 2);
} }
#endif /* X11 */
p += a; p += a;
p_max_size -= a; p_max_size -= a;
} }