projects
/
monky
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
52ad674
)
Specials can be within multi-line objects.
author
Brenden Matthews
<brenden@rty.ca>
Sat, 18 Jul 2009 20:25:57 +0000
(14:25 -0600)
committer
Brenden Matthews
<brenden@rty.ca>
Sat, 18 Jul 2009 20:25:57 +0000
(14:25 -0600)
src/conky.c
patch
|
blob
|
history
diff --git
a/src/conky.c
b/src/conky.c
index
22300d0
..
6291772
100644
(file)
--- a/
src/conky.c
+++ b/
src/conky.c
@@
-6448,13
+6448,14
@@
static void draw_string(const char *s)
}
#ifdef X11
}
#ifdef X11
-int draw_each_line_inner(char *s, int special_index, const int last_special_applied)
+int draw_each_line_inner(char *s, int special_index, int last_special_applied)
{
int font_h = font_height();
int cur_y_add = 0;
char *recurse = 0;
char *p = s;
int last_special_needed = -1;
{
int font_h = font_height();
int cur_y_add = 0;
char *recurse = 0;
char *p = s;
int last_special_needed = -1;
+ int orig_special_index = special_index;
cur_x = text_start_x;
cur_y += font_ascent();
cur_x = text_start_x;
cur_y += font_ascent();
@@
-6866,7
+6867,12
@@
int draw_each_line_inner(char *s, int special_index, const int last_special_appl
cur_x += w;
cur_x += w;
- if (special_index != last_special_applied) special_index++;
+ if (special_index != last_special_applied) {
+ special_index++;
+ } else {
+ special_index = orig_special_index;
+ last_special_applied = -1;
+ }
}
p++;
}
}
p++;
}