mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-11-17 18:45:10 +00:00
change specials back to ll (fixed bug mentioned in previous commit)
This commit is contained in:
Nikolas Garofil
parent
f603fbfd88
commit
2f838fe676
200
src/conky.cc
200
src/conky.cc
@ -882,6 +882,7 @@ int get_string_width(const char *s)
|
||||
static int get_string_width_special(char *s, int special_index)
|
||||
{
|
||||
char *p, *final;
|
||||
special_t *current = specials;
|
||||
int idx = 1;
|
||||
int width = 0;
|
||||
long i;
|
||||
@ -895,6 +896,11 @@ static int get_string_width_special(char *s, int special_index)
|
||||
p = strndup(s, text_buffer_size);
|
||||
final = p;
|
||||
|
||||
for(i = 0; i < special_index; i++)
|
||||
current = current->next;
|
||||
for(i = 0; i < idx; i++)
|
||||
current = current->next;
|
||||
|
||||
while (*p) {
|
||||
if (*p == SPECIAL_CHAR) {
|
||||
/* shift everything over by 1 so that the special char
|
||||
@ -902,12 +908,13 @@ static int get_string_width_special(char *s, int special_index)
|
||||
for (i = 0; i < (long)strlen(p); i++) {
|
||||
*(p + i) = *(p + i + 1);
|
||||
}
|
||||
if (specials[special_index + idx].type == GRAPH
|
||||
|| specials[special_index + idx].type == GAUGE
|
||||
|| specials[special_index + idx].type == BAR) {
|
||||
width += specials[special_index + idx].width;
|
||||
if (current->type == GRAPH
|
||||
|| current->type == GAUGE
|
||||
|| current->type == BAR) {
|
||||
width += current->width;
|
||||
}
|
||||
idx++;
|
||||
current = current->next;
|
||||
} else if (*p == SECRIT_MULTILINE_CHAR) {
|
||||
*p = 0;
|
||||
break;
|
||||
@ -1031,6 +1038,10 @@ static int text_size_updater(char *s, int special_index)
|
||||
int lw;
|
||||
int contain_SECRIT_MULTILINE_CHAR = 0;
|
||||
char *p;
|
||||
special_t *current = specials;
|
||||
|
||||
for(int i = 0; i < special_index; i++)
|
||||
current = current->next;
|
||||
|
||||
if ((output_methods & TO_X) == 0)
|
||||
return 0;
|
||||
@ -1042,40 +1053,41 @@ static int text_size_updater(char *s, int special_index)
|
||||
w += get_string_width(s);
|
||||
*p = SPECIAL_CHAR;
|
||||
|
||||
if (specials[special_index].type == BAR
|
||||
|| specials[special_index].type == GAUGE
|
||||
|| specials[special_index].type == GRAPH) {
|
||||
w += specials[special_index].width;
|
||||
if (specials[special_index].height > last_font_height) {
|
||||
last_font_height = specials[special_index].height;
|
||||
if (current->type == BAR
|
||||
|| current->type == GAUGE
|
||||
|| current->type == GRAPH) {
|
||||
w += current->width;
|
||||
if (current->height > last_font_height) {
|
||||
last_font_height = current->height;
|
||||
last_font_height += font_height();
|
||||
}
|
||||
} else if (specials[special_index].type == OFFSET) {
|
||||
if (specials[special_index].arg > 0) {
|
||||
w += specials[special_index].arg;
|
||||
} else if (current->type == OFFSET) {
|
||||
if (current->arg > 0) {
|
||||
w += current->arg;
|
||||
}
|
||||
} else if (specials[special_index].type == VOFFSET) {
|
||||
last_font_height += specials[special_index].arg;
|
||||
} else if (specials[special_index].type == GOTO) {
|
||||
if (specials[special_index].arg > cur_x) {
|
||||
w = (int) specials[special_index].arg;
|
||||
} else if (current->type == VOFFSET) {
|
||||
last_font_height += current->arg;
|
||||
} else if (current->type == GOTO) {
|
||||
if (current->arg > cur_x) {
|
||||
w = (int) current->arg;
|
||||
}
|
||||
} else if (specials[special_index].type == TAB) {
|
||||
int start = specials[special_index].arg;
|
||||
int step = specials[special_index].width;
|
||||
} else if (current->type == TAB) {
|
||||
int start = current->arg;
|
||||
int step = current->width;
|
||||
|
||||
if (!step || step < 0) {
|
||||
step = 10;
|
||||
}
|
||||
w += step - (cur_x - text_start_x - start) % step;
|
||||
} else if (specials[special_index].type == FONT) {
|
||||
selected_font = specials[special_index].font_added;
|
||||
} else if (current->type == FONT) {
|
||||
selected_font = current->font_added;
|
||||
if (font_height() > last_font_height) {
|
||||
last_font_height = font_height();
|
||||
}
|
||||
}
|
||||
|
||||
special_index++;
|
||||
current = current->next;
|
||||
s = p + 1;
|
||||
} else if (*p == SECRIT_MULTILINE_CHAR) {
|
||||
contain_SECRIT_MULTILINE_CHAR = 1;
|
||||
@ -1291,11 +1303,14 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
s = p + 1;
|
||||
}
|
||||
/* draw special */
|
||||
switch (specials[special_index].type) {
|
||||
special_t *current = specials;
|
||||
for(int i = 0; i < special_index; i++)
|
||||
current = current->next;
|
||||
switch (current->type) {
|
||||
#ifdef BUILD_X11
|
||||
case HORIZONTAL_LINE:
|
||||
{
|
||||
int h = specials[special_index].height;
|
||||
int h = current->height;
|
||||
int mid = font_ascent() / 2;
|
||||
|
||||
w = text_start_x + text_width - cur_x;
|
||||
@ -1309,8 +1324,8 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
|
||||
case STIPPLED_HR:
|
||||
{
|
||||
int h = specials[special_index].height;
|
||||
char tmp_s = specials[special_index].arg;
|
||||
int h = current->height;
|
||||
char tmp_s = current->arg;
|
||||
int mid = font_ascent() / 2;
|
||||
char ss[2] = { tmp_s, tmp_s };
|
||||
|
||||
@ -1331,15 +1346,15 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
&& maximum_width > 0) {
|
||||
break;
|
||||
}
|
||||
h = specials[special_index].height;
|
||||
bar_usage = specials[special_index].arg;
|
||||
scale = specials[special_index].scale;
|
||||
h = current->height;
|
||||
bar_usage = current->arg;
|
||||
scale = current->scale;
|
||||
by = cur_y - (font_ascent() / 2) - 1;
|
||||
|
||||
if (h < font_h) {
|
||||
by -= h / 2 - 1;
|
||||
}
|
||||
w = specials[special_index].width;
|
||||
w = current->width;
|
||||
if (w == 0) {
|
||||
w = text_start_x + text_width - cur_x - 1;
|
||||
}
|
||||
@ -1375,13 +1390,13 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
break;
|
||||
}
|
||||
|
||||
h = specials[special_index].height;
|
||||
h = current->height;
|
||||
by = cur_y - (font_ascent() / 2) - 1;
|
||||
|
||||
if (h < font_h) {
|
||||
by -= h / 2 - 1;
|
||||
}
|
||||
w = specials[special_index].width;
|
||||
w = current->width;
|
||||
if (w == 0) {
|
||||
w = text_start_x + text_width - cur_x - 1;
|
||||
}
|
||||
@ -1396,8 +1411,8 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
cur_x, by, w, h * 2, 0, 180*64);
|
||||
|
||||
#ifdef MATH
|
||||
usage = specials[special_index].arg;
|
||||
scale = specials[special_index].scale;
|
||||
usage = current->arg;
|
||||
scale = current->scale;
|
||||
angle = M_PI * usage / scale;
|
||||
px = (float)(cur_x+(w/2.))-(float)(w/2.)*cos(angle);
|
||||
py = (float)(by+(h))-(float)(h)*sin(angle);
|
||||
@ -1427,13 +1442,13 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
&& maximum_width > 0) {
|
||||
break;
|
||||
}
|
||||
h = specials[special_index].height;
|
||||
h = current->height;
|
||||
by = cur_y - (font_ascent() / 2) - 1;
|
||||
|
||||
if (h < font_h) {
|
||||
by -= h / 2 - 1;
|
||||
}
|
||||
w = specials[special_index].width;
|
||||
w = current->width;
|
||||
if (w == 0) {
|
||||
w = text_start_x + text_width - cur_x - 1;
|
||||
}
|
||||
@ -1449,37 +1464,37 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
XSetLineAttributes(display, window.gc, 1, LineSolid,
|
||||
CapButt, JoinMiter);
|
||||
|
||||
if (specials[special_index].last_colour != 0
|
||||
|| specials[special_index].first_colour != 0) {
|
||||
tmpcolour = do_gradient(w - 1, specials[special_index].last_colour, specials[special_index].first_colour);
|
||||
if (current->last_colour != 0
|
||||
|| current->first_colour != 0) {
|
||||
tmpcolour = do_gradient(w - 1, current->last_colour, current->first_colour);
|
||||
}
|
||||
colour_idx = 0;
|
||||
for (i = w - 2; i > -1; i--) {
|
||||
if (specials[special_index].last_colour != 0
|
||||
|| specials[special_index].first_colour != 0) {
|
||||
if (specials[special_index].tempgrad) {
|
||||
if (current->last_colour != 0
|
||||
|| current->first_colour != 0) {
|
||||
if (current->tempgrad) {
|
||||
#ifdef DEBUG_lol
|
||||
assert(
|
||||
(int)((float)(w - 2) - specials[special_index].graph[j] *
|
||||
(w - 2) / (float)specials[special_index].scale)
|
||||
(int)((float)(w - 2) - current->graph[j] *
|
||||
(w - 2) / (float)current->scale)
|
||||
< w - 1
|
||||
);
|
||||
assert(
|
||||
(int)((float)(w - 2) - specials[special_index].graph[j] *
|
||||
(w - 2) / (float)specials[special_index].scale)
|
||||
(int)((float)(w - 2) - current->graph[j] *
|
||||
(w - 2) / (float)current->scale)
|
||||
> -1
|
||||
);
|
||||
if (specials[special_index].graph[j] == specials[special_index].scale) {
|
||||
if (current->graph[j] == current->scale) {
|
||||
assert(
|
||||
(int)((float)(w - 2) - specials[special_index].graph[j] *
|
||||
(w - 2) / (float)specials[special_index].scale)
|
||||
(int)((float)(w - 2) - current->graph[j] *
|
||||
(w - 2) / (float)current->scale)
|
||||
== 0
|
||||
);
|
||||
}
|
||||
#endif /* DEBUG_lol */
|
||||
XSetForeground(display, window.gc, tmpcolour[
|
||||
(int)((float)(w - 2) - specials[special_index].graph[j] *
|
||||
(w - 2) / (float)specials[special_index].scale)
|
||||
(int)((float)(w - 2) - current->graph[j] *
|
||||
(w - 2) / (float)current->scale)
|
||||
]);
|
||||
} else {
|
||||
XSetForeground(display, window.gc, tmpcolour[colour_idx++]);
|
||||
@ -1488,10 +1503,10 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
/* this is mugfugly, but it works */
|
||||
XDrawLine(display, window.drawable, window.gc,
|
||||
cur_x + i + 1, by + h, cur_x + i + 1,
|
||||
round_to_int((double)by + h - specials[special_index].graph[j] *
|
||||
(h - 1) / specials[special_index].scale));
|
||||
round_to_int((double)by + h - current->graph[j] *
|
||||
(h - 1) / current->scale));
|
||||
if ((w - i) / ((float) (w - 2) /
|
||||
(specials[special_index].graph_width)) > j
|
||||
(current->graph_width)) > j
|
||||
&& j < MAX_GRAPH_DEPTH - 3) {
|
||||
j++;
|
||||
}
|
||||
@ -1552,16 +1567,16 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
cur_y = tmp_y;
|
||||
}
|
||||
#ifdef MATH
|
||||
if (show_graph_scale && (specials[special_index].show_scale == 1)) {
|
||||
if (show_graph_scale && (current->show_scale == 1)) {
|
||||
int tmp_x = cur_x;
|
||||
int tmp_y = cur_y;
|
||||
char *tmp_str;
|
||||
cur_x += font_ascent() / 2;
|
||||
cur_y += font_h / 2;
|
||||
tmp_str = (char *)
|
||||
calloc(log10(floor(specials[special_index].scale)) + 4,
|
||||
calloc(log10(floor(current->scale)) + 4,
|
||||
sizeof(char));
|
||||
sprintf(tmp_str, "%.1f", specials[special_index].scale);
|
||||
sprintf(tmp_str, "%.1f", current->scale);
|
||||
draw_string(tmp_str);
|
||||
free(tmp_str);
|
||||
cur_x = tmp_x;
|
||||
@ -1577,7 +1592,7 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
int old = font_ascent();
|
||||
|
||||
cur_y -= font_ascent();
|
||||
selected_font = specials[special_index].font_added;
|
||||
selected_font = current->font_added;
|
||||
set_font();
|
||||
if (cur_y + font_ascent() < cur_y + old) {
|
||||
cur_y += old;
|
||||
@ -1590,43 +1605,43 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
#endif /* BUILD_X11 */
|
||||
case FG:
|
||||
if (draw_mode == FG) {
|
||||
set_foreground_color(specials[special_index].arg);
|
||||
set_foreground_color(current->arg);
|
||||
}
|
||||
break;
|
||||
|
||||
#ifdef BUILD_X11
|
||||
case BG:
|
||||
if (draw_mode == BG) {
|
||||
set_foreground_color(specials[special_index].arg);
|
||||
set_foreground_color(current->arg);
|
||||
}
|
||||
break;
|
||||
|
||||
case OUTLINE:
|
||||
if (draw_mode == OUTLINE) {
|
||||
set_foreground_color(specials[special_index].arg);
|
||||
set_foreground_color(current->arg);
|
||||
}
|
||||
break;
|
||||
|
||||
case OFFSET:
|
||||
w += specials[special_index].arg;
|
||||
w += current->arg;
|
||||
last_special_needed = special_index;
|
||||
break;
|
||||
|
||||
case VOFFSET:
|
||||
cur_y += specials[special_index].arg;
|
||||
cur_y += current->arg;
|
||||
break;
|
||||
|
||||
case GOTO:
|
||||
if (specials[special_index].arg >= 0) {
|
||||
cur_x = (int) specials[special_index].arg;
|
||||
if (current->arg >= 0) {
|
||||
cur_x = (int) current->arg;
|
||||
}
|
||||
last_special_needed = special_index;
|
||||
break;
|
||||
|
||||
case TAB:
|
||||
{
|
||||
int start = specials[special_index].arg;
|
||||
int step = specials[special_index].width;
|
||||
int start = current->arg;
|
||||
int step = current->width;
|
||||
|
||||
if (!step || step < 0) {
|
||||
step = 10;
|
||||
@ -1645,13 +1660,13 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
|
||||
/* printf("pos_x %i text_start_x %i text_width %i cur_x %i "
|
||||
"get_string_width(p) %i gap_x %i "
|
||||
"specials[special_index].arg %i window.border_inner_margin %i "
|
||||
"current->arg %i window.border_inner_margin %i "
|
||||
"window.border_width %i\n", pos_x, text_start_x, text_width,
|
||||
cur_x, get_string_width_special(s), gap_x,
|
||||
specials[special_index].arg, window.border_inner_margin,
|
||||
current->arg, window.border_inner_margin,
|
||||
window.border_width); */
|
||||
if (pos_x > specials[special_index].arg && pos_x > cur_x) {
|
||||
cur_x = pos_x - specials[special_index].arg;
|
||||
if (pos_x > current->arg && pos_x > cur_x) {
|
||||
cur_x = pos_x - current->arg;
|
||||
}
|
||||
last_special_needed = special_index;
|
||||
break;
|
||||
@ -1667,11 +1682,11 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
|
||||
|
||||
/* printf("pos_x %i text_start_x %i text_width %i cur_x %i "
|
||||
"get_string_width(p) %i gap_x %i "
|
||||
"specials[special_index].arg %i\n", pos_x, text_start_x,
|
||||
"current->arg %i\n", pos_x, text_start_x,
|
||||
text_width, cur_x, get_string_width(s), gap_x,
|
||||
specials[special_index].arg); */
|
||||
if (pos_x > specials[special_index].arg) {
|
||||
w = pos_x - specials[special_index].arg;
|
||||
current->arg); */
|
||||
if (pos_x > current->arg) {
|
||||
w = pos_x - current->arg;
|
||||
}
|
||||
last_special_needed = special_index;
|
||||
break;
|
||||
@ -2399,10 +2414,18 @@ void clean_up_x11() {
|
||||
}
|
||||
#endif
|
||||
|
||||
void free_specials(special_t *current) {
|
||||
if (current) {
|
||||
free_specials(current->next);
|
||||
if(current->type == GRAPH)
|
||||
free(current->graph);
|
||||
delete current;
|
||||
current = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void clean_up(void *memtofree1, void* memtofree2)
|
||||
{
|
||||
int i;
|
||||
|
||||
free_update_callbacks();
|
||||
|
||||
#ifdef BUILD_NCURSES
|
||||
@ -2468,14 +2491,7 @@ void clean_up(void *memtofree1, void* memtofree2)
|
||||
xmlCleanupParser();
|
||||
#endif /* BUILD_WEATHER_XOAP */
|
||||
|
||||
if (specials) {
|
||||
for (i = 0; i < special_count; i++) {
|
||||
if (specials[i].type == GRAPH) {
|
||||
free(specials[i].graph);
|
||||
}
|
||||
}
|
||||
free_and_zero(specials);
|
||||
}
|
||||
free_specials(specials);
|
||||
|
||||
clear_net_stats();
|
||||
clear_diskio_stats();
|
||||
@ -3535,13 +3551,6 @@ char load_config_file(const char *f)
|
||||
CONF("uppercase") {
|
||||
stuff_in_uppercase = string_to_bool(value);
|
||||
}
|
||||
CONF("max_specials") {
|
||||
if (value) {
|
||||
max_specials = atoi(value);
|
||||
} else {
|
||||
CONF_ERR;
|
||||
}
|
||||
}
|
||||
CONF("max_user_text") {
|
||||
if (value) {
|
||||
max_user_text = atoi(value);
|
||||
@ -4091,11 +4100,6 @@ void initialisation(int argc, char **argv) {
|
||||
currentconffile = conftree_add(currentconffile, current_config.c_str());
|
||||
}
|
||||
|
||||
/* init specials array */
|
||||
if ((specials = (special_t*)calloc(sizeof(struct special_t), max_specials)) == 0) {
|
||||
NORM_ERR("failed to create specials array");
|
||||
}
|
||||
|
||||
#ifdef MAIL_FILE
|
||||
if (current_mail_spool == NULL) {
|
||||
char buf[256];
|
||||
|
||||
@ -40,11 +40,6 @@
|
||||
#endif /* HAVE_SYS_PARAM_H */
|
||||
#include <algorithm>
|
||||
|
||||
/* maximum number of special things, e.g. fonts, offsets, aligns, etc. */
|
||||
int max_specials = 512;
|
||||
|
||||
/* create specials array on heap instead of stack with introduction of
|
||||
* max_specials */
|
||||
struct special_t *specials = NULL;
|
||||
|
||||
int special_count;
|
||||
@ -251,16 +246,32 @@ char *scan_graph(struct text_object *obj, const char *args, double defscale)
|
||||
* Printing various special text objects
|
||||
*/
|
||||
|
||||
struct special_t *new_special_t_node()
|
||||
{
|
||||
special_t *newnode = new special_t;
|
||||
|
||||
newnode->graph = NULL;
|
||||
newnode->next = NULL;
|
||||
return newnode;
|
||||
}
|
||||
|
||||
struct special_t *new_special(char *buf, enum special_types t)
|
||||
{
|
||||
if (special_count >= max_specials) {
|
||||
CRIT_ERR(NULL, NULL, "too many special things in text");
|
||||
}
|
||||
special_t* current;
|
||||
|
||||
buf[0] = SPECIAL_CHAR;
|
||||
buf[1] = '\0';
|
||||
specials[special_count].type = t;
|
||||
return &specials[special_count++];
|
||||
if(!specials)
|
||||
specials = new_special_t_node();
|
||||
current = specials;
|
||||
for(int i=0; i < special_count; i++) {
|
||||
if(current->next == NULL)
|
||||
current->next = new_special_t_node();
|
||||
current = current->next;
|
||||
}
|
||||
current->type = t;
|
||||
special_count++;
|
||||
return current;
|
||||
}
|
||||
|
||||
void new_gauge_in_shell(struct text_object *obj, char *p, int p_max_size, double usage)
|
||||
|
||||
@ -73,6 +73,7 @@ struct special_t {
|
||||
unsigned long last_colour;
|
||||
short font_added;
|
||||
char tempgrad;
|
||||
struct special_t *next;
|
||||
};
|
||||
|
||||
/* direct access to the registered specials (FIXME: bad encapsulation) */
|
||||
@ -91,9 +92,6 @@ extern int default_gauge_height;
|
||||
/* forward declare to avoid mutual inclusion between specials.h and text_object.h */
|
||||
struct text_object;
|
||||
|
||||
/* max number of specials allowed (TODO: use linked list instead) */
|
||||
extern int max_specials;
|
||||
|
||||
/* scanning special arguments */
|
||||
const char *scan_bar(struct text_object *, const char *, double);
|
||||
const char *scan_gauge(struct text_object *, const char *, double);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user