mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-27 20:44:56 +00:00
$scroll fix for a text length <= length
This fixes $scroll to only scroll when the text length is greater than the specified length; hopefully without breaking anything. Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
This commit is contained in:
parent
c2e8734cb3
commit
2e4f58d565
14
src/scroll.c
14
src/scroll.c
@ -60,10 +60,16 @@ void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_cr
|
||||
sd->step = 1;
|
||||
}
|
||||
sd->text = malloc(strlen(arg + n1) + sd->show + 1);
|
||||
for(n2 = 0; (unsigned int) n2 < sd->show; n2++) {
|
||||
sd->text[n2] = ' ';
|
||||
|
||||
if (strlen(arg) > sd->show) {
|
||||
for(n2 = 0; (unsigned int) n2 < sd->show; n2++) {
|
||||
sd->text[n2] = ' ';
|
||||
}
|
||||
sd->text[n2] = 0;
|
||||
}
|
||||
sd->text[n2] = 0;
|
||||
else
|
||||
sd->text[0] = 0;
|
||||
|
||||
strcat(sd->text, arg + n1);
|
||||
sd->start = 0;
|
||||
obj->sub = malloc(sizeof(struct text_object));
|
||||
@ -136,7 +142,7 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
|
||||
free(pwithcolors);
|
||||
//scroll
|
||||
sd->start += sd->step;
|
||||
if(buf[sd->start] == 0){
|
||||
if(buf[sd->start] == 0 || sd->start > strlen(buf)){
|
||||
sd->start = 0;
|
||||
}
|
||||
#ifdef X11
|
||||
|
Loading…
Reference in New Issue
Block a user