Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-28 01:28:30 +00:00
Code Issues Releases Activity

Add support for scrolling in the other direction

Browse Source
This commit is contained in:
Nikolas Garofil 2010-02-17 17:49:03 +01:00
parent afffe49977
commit 3ceb8cb570
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/variables.xml
View File

@ -3075,12 +3075,14 @@
<command> <command>
<option>scroll</option> <option>scroll</option>
</command> </command>
<option>length (step) text</option> <option>(direction) length (step) text</option>
</term> </term>
<listitem>Scroll 'text' by 'step' characters showing <listitem>Scroll 'text' by 'step' characters to the left
or right (set 'direction' to 'left' or 'right') showing
'length' number of characters at the same time. The text 'length' number of characters at the same time. The text
may also contain variables. 'step' is optional and defaults may also contain variables. 'step' is optional and defaults
to 1 if not set. If a var creates output on multiple lines to 1 if not set. 'direction' is optional and defaults to left
if not set. If a var creates output on multiple lines
then the lines are placed behind each other separated with then the lines are placed behind each other separated with
a '|'-sign. If you change the textcolor inside $scroll it a '|'-sign. If you change the textcolor inside $scroll it
will automatically have it's old value back at the end of will automatically have it's old value back at the end of

39
src/scroll.cc
View File

@ -34,35 +34,49 @@
#include "text_object.h" #include "text_object.h"
#include <vector> #include <vector>
#define SCROLL_LEFT true
#define SCROLL_RIGHT false
struct scroll_data { struct scroll_data {
char *text; char *text;
unsigned int show; unsigned int show;
unsigned int step; unsigned int step;
unsigned int start; signed int start;
long resetcolor; long resetcolor;
bool direction;
}; };
void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_crash, char *free_at_crash2) void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_crash, char *free_at_crash2)
{ {
struct scroll_data *sd; struct scroll_data *sd;
int n1 = 0, n2 = 0; int n1 = 0, n2 = 0;
char dirarg[6];
sd = (struct scroll_data *)malloc(sizeof(struct scroll_data)); sd = (struct scroll_data *)malloc(sizeof(struct scroll_data));
memset(sd, 0, sizeof(struct scroll_data)); memset(sd, 0, sizeof(struct scroll_data));
sd->resetcolor = get_current_text_color(); sd->resetcolor = get_current_text_color();
sd->step = 1; sd->step = 1;
if (!arg || sscanf(arg, "%u %n", &sd->show, &n1) <= 0) { sd->direction = SCROLL_LEFT;
if (arg && sscanf(arg, "%5s %n", dirarg, &n1) == 1) {
if (strcasecmp(dirarg, "right") == 0 || strcasecmp(dirarg, "r") == 0)
sd->direction = SCROLL_RIGHT;
else if ( strcasecmp(dirarg, "left") != 0 && strcasecmp(dirarg, "l") != 0)
n1 = 0;
}
if (!arg || sscanf(arg + n1, "%u %n", &sd->show, &n2) <= 0) {
free(sd); free(sd);
#ifdef BUILD_X11 #ifdef BUILD_X11
free(obj->next); free(obj->next);
#endif #endif
free(free_at_crash2); free(free_at_crash2);
CRIT_ERR(obj, free_at_crash, "scroll needs arguments: <length> [<step>] <text>"); CRIT_ERR(obj, free_at_crash, "scroll needs arguments: [left|right] <length> [<step>] <text>");
} }
n1 += n2;
sscanf(arg + n1, "%u %n", &sd->step, &n2); if(sscanf(arg + n1, "%u %n", &sd->step, &n2) == 1) {
if (*(arg + n1 + n2)) {
n1 += n2; n1 += n2;
} else { } else {
sd->step = 1; sd->step = 1;
@ -135,7 +149,7 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size)
} }
p[j] = 0; p[j] = 0;
//count colorchanges in front of the visible part and place that many colorchanges in front of the visible part //count colorchanges in front of the visible part and place that many colorchanges in front of the visible part
for(j = 0; j < sd->start; j++) { for(j = 0; j < (unsigned) sd->start; j++) {
if(buf[j] == SPECIAL_CHAR) frontcolorchanges++; if(buf[j] == SPECIAL_CHAR) frontcolorchanges++;
} }
pwithcolors=(char*)malloc(strlen(p) + 1 + colorchanges - visibcolorchanges); pwithcolors=(char*)malloc(strlen(p) + 1 + colorchanges - visibcolorchanges);
@ -153,9 +167,16 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size)
strcpy(p, pwithcolors); strcpy(p, pwithcolors);
free(pwithcolors); free(pwithcolors);
//scroll //scroll
sd->start += sd->step; if(sd->direction == SCROLL_LEFT) {
if(buf[sd->start] == 0 || sd->start > strlen(&(buf[0]))){ sd->start += sd->step;
sd->start = 0; if(buf[sd->start] == 0 || (unsigned) sd->start > strlen(&(buf[0]))) {
sd->start = 0;
}
} else {
if(sd->start < 1) {
sd->start = strlen(&(buf[0]));
}
sd->start -= sd->step;
} }
#ifdef BUILD_X11 #ifdef BUILD_X11
//reset color when scroll is finished //reset color when scroll is finished