#define MAIL_FILE "$MAIL"
#define MAX_IF_BLOCK_DEPTH 5
+/* #define SIGNAL_BLOCKING */
+#undef SIGNAL_BLOCKING
+
#ifdef X11
/* alignments */
static void set_font();
-
int addfont(const char *data_in)
{
if (font_count > MAX_FONTS) {
/* border */
static int draw_borders;
+static int draw_graph_borders;
static int stippled_borders;
static int draw_shades, draw_outline;
/* pad percentages to decimals? */
static int pad_percents = 0;
+#ifdef TCP_PORT_MONITOR
+tcp_port_monitor_collection_args_t tcp_port_monitor_collection_args;
+tcp_port_monitor_args_t tcp_port_monitor_args;
+#endif
+
/* Text that is shown */
static char original_text[] =
"$nodename - $sysname $kernel on $machine\n"
#ifdef X11
-static inline int calc_text_width(const char *s, unsigned int l)
+static inline int calc_text_width(const char *s, int l)
{
#ifdef XFT
if (use_xft) {
OBJ_mpd_track,
OBJ_mpd_percent,
#endif
+#ifdef BMPX
+ OBJ_bmpx_title,
+ OBJ_bmpx_artist,
+ OBJ_bmpx_album,
+ OBJ_bmpx_track,
+ OBJ_bmpx_uri,
+ OBJ_bmpx_bitrate,
+#endif
+#ifdef INFOPIPE
+ OBJ_infopipe_protocol,
+ OBJ_infopipe_version,
+ OBJ_infopipe_status,
+ OBJ_infopipe_playlist_tunes,
+ OBJ_infopipe_playlist_currtune,
+ OBJ_infopipe_usec_position,
+ OBJ_infopipe_position,
+ OBJ_infopipe_usec_time,
+ OBJ_infopipe_time,
+ OBJ_infopipe_bitrate,
+ OBJ_infopipe_frequency,
+ OBJ_infopipe_channels,
+ OBJ_infopipe_title,
+ OBJ_infopipe_file,
+ OBJ_infopipe_bar,
+#endif
#ifdef TCP_PORT_MONITOR
OBJ_tcp_portmon,
#endif
} data;
};
+struct text_object_list {
+ unsigned int text_object_count;
+ struct text_object *text_objects;
+};
+
static unsigned int text_object_count;
static struct text_object *text_objects;
+static void generate_text_internal(char *p, int p_max_size, struct text_object *objs, unsigned int object_count, struct information *cur);
pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER;
return NULL;
}
-/* new_text_object() allocates a new zeroed text_object */
-static struct text_object *new_text_object()
+static struct text_object *new_text_object_internal()
{
- text_object_count++;
- text_objects = (struct text_object *) realloc(text_objects,
- sizeof(struct
- text_object) *
- text_object_count);
- memset(&text_objects[text_object_count - 1], 0,
- sizeof(struct text_object));
-
- return &text_objects[text_object_count - 1];
+ struct text_object *obj = malloc(sizeof(struct text_object));
+ memset(obj, 0, sizeof(struct text_object));
+ return obj;
}
-static void free_text_objects()
+#ifdef MLDONKEY
+void ml_cleanup()
+{
+ if (mlconfig.mldonkey_hostname) {
+ free(mlconfig.mldonkey_hostname);
+ mlconfig.mldonkey_hostname = NULL;
+ }
+}
+#endif
+
+static void free_text_objects(unsigned int count, struct text_object *objs)
{
unsigned int i;
- for (i = 0; i < text_object_count; i++) {
- switch (text_objects[i].type) {
+ for (i = 0; i < count; i++) {
+ switch (objs[i].type) {
case OBJ_acpitemp:
- close(text_objects[i].data.i);
+ close(objs[i].data.i);
break;
case OBJ_acpitempf:
- close(text_objects[i].data.i);
+ close(objs[i].data.i);
break;
case OBJ_i2c:
- close(text_objects[i].data.i2c.fd);
+ close(objs[i].data.i2c.fd);
break;
case OBJ_time:
+ free(objs[i].data.s);
+ break;
case OBJ_utime:
case OBJ_if_existing:
case OBJ_if_mounted:
case OBJ_if_running:
- free(text_objects[i].data.ifblock.s);
+ free(objs[i].data.ifblock.s);
break;
case OBJ_tail:
- free(text_objects[i].data.tail.logfile);
- free(text_objects[i].data.tail.buffer);
+ free(objs[i].data.tail.logfile);
+ free(objs[i].data.tail.buffer);
break;
- case OBJ_text:
- case OBJ_font:
- free(text_objects[i].data.s);
+ case OBJ_text: case OBJ_font:
+ free(objs[i].data.s);
break;
case OBJ_exec:
- free(text_objects[i].data.s);
+ free(objs[i].data.s);
break;
case OBJ_execbar:
- free(text_objects[i].data.s);
+ free(objs[i].data.s);
break;
case OBJ_execgraph:
- free(text_objects[i].data.s);
+ free(objs[i].data.s);
break;
/* case OBJ_execibar:
- free(text_objects[i].data.s);
+ free(objs[i].data.s);
break;
case OBJ_execigraph:
- free(text_objects[i].data.s);
+ free(objs[i].data.s);
break;*/
#ifdef MPD
case OBJ_mpd_title:
case OBJ_mpd_status:
case OBJ_mpd_host:
#endif
+#ifdef BMPX
+ case OBJ_bmpx_title:
+ case OBJ_bmpx_artist:
+ case OBJ_bmpx_album:
+ case OBJ_bmpx_track:
+ case OBJ_bmpx_uri:
+ case OBJ_bmpx_bitrate:
+#endif
case OBJ_pre_exec:
case OBJ_battery:
- free(text_objects[i].data.s);
+ free(objs[i].data.s);
break;
case OBJ_execi:
- free(text_objects[i].data.execi.cmd);
- free(text_objects[i].data.execi.buffer);
+ free(objs[i].data.execi.cmd);
+ free(objs[i].data.execi.buffer);
break;
case OBJ_texeci:
- free(text_objects[i].data.execi.cmd);
- free(text_objects[i].data.execi.buffer);
+ free(objs[i].data.execi.cmd);
+ free(objs[i].data.execi.buffer);
+ break;
+ case OBJ_top:
+ if (info.first_process) {
+ free_all_processes();
+ info.first_process = NULL;
+ }
+ break;
+ case OBJ_top_mem:
+ if (info.first_process) {
+ free_all_processes();
+ info.first_process = NULL;
+ }
break;
}
}
-
- free(text_objects);
- text_objects = NULL;
- text_object_count = 0;
+ free(objs);
+ //text_objects = NULL;
+ //text_object_count = 0;
}
void scan_mixer_bar(const char *arg, int *a, int *w, int *h)
}
}
+
/* construct_text_object() creates a new text_object */
-static void construct_text_object(const char *s, const char *arg)
+static struct text_object *construct_text_object(const char *s, const char *arg)
{
- struct text_object *obj = new_text_object();
+ //struct text_object *obj = new_text_object();
+ struct text_object *obj = new_text_object_internal();
#define OBJ(a, n) if (strcmp(s, #a) == 0) { obj->type = OBJ_##a; need_mask |= (1 << n); {
#define END ; } } else
obj->type = OBJ_text;
snprintf(buf, 256, "${%s}", s);
obj->data.s = strdup(buf);
- } else {
- obj->data.execi.cmd = strdup(arg + n);
- }
+ } else {
+ obj->data.execi.cmd = strdup(arg + n);
+ }
END OBJ(execi, 0) unsigned int n;
if (!arg
ERR("i2c needs arguments");
obj->type = OBJ_text;
//obj->data.s = strdup("${i2c}");
- return;
+ return NULL;
}
if (sscanf(arg, "%63s %63s %d", buf1, buf2, &n) != 3) {
ERR("top needs arguments");
obj->type = OBJ_text;
//obj->data.s = strdup("${top}");
- return;
+ return NULL;
}
if (sscanf(arg, "%63s %i", buf, &n) == 2) {
if (strcmp(buf, "name") == 0) {
obj->data.top.type = TOP_MEM;
} else {
ERR("invalid arg for top");
- return;
+ return NULL;
}
if (n < 1 || n > 10) {
CRIT_ERR("invalid arg for top");
- return;
+ return NULL;
} else {
obj->data.top.num = n - 1;
top_cpu = 1;
}
} else {
ERR("invalid args given for top");
- return;
+ return NULL;
}
END OBJ(top_mem, INFO_TOP)
char buf[64];
ERR("top_mem needs arguments");
obj->type = OBJ_text;
obj->data.s = strdup("${top_mem}");
- return;
+ return NULL;
}
if (sscanf(arg, "%63s %i", buf, &n) == 2) {
if (strcmp(buf, "name") == 0) {
obj->data.top.type = TOP_MEM;
} else {
ERR("invalid arg for top");
- return;
+ return NULL;
}
if (n < 1 || n > 10) {
CRIT_ERR("invalid arg for top");
- return;
+ return NULL;
} else {
obj->data.top.num = n - 1;
top_mem = 1;
}
} else {
ERR("invalid args given for top");
- return;
+ return NULL;
}
END OBJ(addr, INFO_NET)
if(arg) {
ERR("tail needs arguments");
obj->type = OBJ_text;
obj->data.s = strdup("${tail}");
- return;
+ return NULL;
}
if (sscanf(arg, "%63s %i %i", buf, &n1, &n2) == 2) {
if (n1 < 1 || n1 > 30) {
CRIT_ERR("invalid arg for tail, number of lines must be between 1 and 30");
- return;
+ return NULL;
} else {
- FILE *fp;
- fp = fopen(buf, "rt");
- if (fp != NULL) {
+ FILE *fp = NULL;
+ fp = fopen(buf, "r");
+ if (fp) {
obj->data.tail.logfile =
malloc(TEXT_BUFFER_SIZE);
strcpy(obj->data.tail.logfile, buf);
if (n1 < 1 || n1 > 30) {
CRIT_ERR
("invalid arg for tail, number of lines must be between 1 and 30");
- return;
+ return NULL;
} else if (n2 < 1 || n2 < update_interval) {
CRIT_ERR
("invalid arg for tail, interval must be greater than 0 and Conky's interval");
- return;
+ return NULL;
} else {
FILE *fp;
- fp = fopen(buf, "rt");
+ fp = fopen(buf, "r");
if (fp != NULL) {
obj->data.tail.logfile =
malloc(TEXT_BUFFER_SIZE);
else {
ERR("invalid args given for tail");
- return;
+ return NULL;
}
obj->data.tail.buffer = malloc(TEXT_BUFFER_SIZE * 20); /* asumming all else worked */
END OBJ(head, 0)
ERR("head needs arguments");
obj->type = OBJ_text;
obj->data.s = strdup("${head}");
- return;
+ return NULL;
}
if (sscanf(arg, "%63s %i %i", buf, &n1, &n2) == 2) {
if (n1 < 1 || n1 > 30) {
CRIT_ERR("invalid arg for head, number of lines must be between 1 and 30");
- return;
+ return NULL;
} else {
FILE *fp;
- fp = fopen(buf, "rt");
+ fp = fopen(buf, "r");
if (fp != NULL) {
obj->data.tail.logfile =
malloc(TEXT_BUFFER_SIZE);
if (n1 < 1 || n1 > 30) {
CRIT_ERR
("invalid arg for head, number of lines must be between 1 and 30");
- return;
+ return NULL;
} else if (n2 < 1 || n2 < update_interval) {
CRIT_ERR
("invalid arg for head, interval must be greater than 0 and Conky's interval");
- return;
+ return NULL;
} else {
FILE *fp;
- fp = fopen(buf, "rt");
+ fp = fopen(buf, "r");
if (fp != NULL) {
obj->data.tail.logfile =
malloc(TEXT_BUFFER_SIZE);
else {
ERR("invalid args given for head");
- return;
+ return NULL;
}
obj->data.tail.buffer = malloc(TEXT_BUFFER_SIZE * 20); /* asumming all else worked */
END OBJ(loadavg, INFO_LOADAVG) int a = 1, b = 2, c = 3, r = 3;
(void) scan_bar(arg, &obj->data.pair.a, &obj->data.pair.b);
END
#endif
+#ifdef BMPX
+ OBJ(bmpx_title, INFO_BMPX)
+ END
+ OBJ(bmpx_artist, INFO_BMPX)
+ END
+ OBJ(bmpx_album, INFO_BMPX)
+ END
+ OBJ(bmpx_track, INFO_BMPX)
+ END
+ OBJ(bmpx_uri, INFO_BMPX)
+ END
+ OBJ(bmpx_bitrate, INFO_BMPX)
+ END
+#endif
+#ifdef INFOPIPE
+ OBJ(infopipe_protocol, INFO_INFOPIPE) END
+ OBJ(infopipe_version, INFO_INFOPIPE) END
+ OBJ(infopipe_status, INFO_INFOPIPE) END
+ OBJ(infopipe_playlist_tunes, INFO_INFOPIPE) END
+ OBJ(infopipe_playlist_currtune, INFO_INFOPIPE) END
+ OBJ(infopipe_usec_position, INFO_INFOPIPE) END
+ OBJ(infopipe_position, INFO_INFOPIPE) END
+ OBJ(infopipe_usec_time, INFO_INFOPIPE) END
+ OBJ(infopipe_time, INFO_INFOPIPE) END
+ OBJ(infopipe_bitrate, INFO_INFOPIPE) END
+ OBJ(infopipe_frequency, INFO_INFOPIPE) END
+ OBJ(infopipe_channels, INFO_INFOPIPE) END
+ OBJ(infopipe_title, INFO_INFOPIPE) END
+ OBJ(infopipe_file, INFO_INFOPIPE) END
+ OBJ(infopipe_bar, INFO_INFOPIPE)
+ (void) scan_bar(arg, &obj->a, &obj->b);
+ END
+#endif
#ifdef TCP_PORT_MONITOR
OBJ(tcp_portmon, INFO_TCP_PORT_MONITOR)
int argc, port_begin, port_end, item, connection_index;
/* if the port monitor collection hasn't been created, we must create it */
if ( !info.p_tcp_port_monitor_collection )
{
- info.p_tcp_port_monitor_collection = create_tcp_port_monitor_collection();
+ info.p_tcp_port_monitor_collection =
+ create_tcp_port_monitor_collection( &tcp_port_monitor_collection_args );
if ( !info.p_tcp_port_monitor_collection )
{
CRIT_ERR("tcp_portmon: unable to create port monitor collection");
/* if a port monitor for this port does not exist, create one and add it to the collection */
if ( find_tcp_port_monitor( info.p_tcp_port_monitor_collection, port_begin, port_end ) == NULL )
{
- tcp_port_monitor_t * p_monitor = create_tcp_port_monitor( port_begin, port_end );
+ tcp_port_monitor_t * p_monitor =
+ create_tcp_port_monitor( port_begin, port_end, &tcp_port_monitor_args );
if ( !p_monitor )
{
CRIT_ERR("tcp_portmon: unable to create port monitor");
obj->data.s = strdup(buf);
}
#undef OBJ
+
+ return obj;
}
-/* append_text() appends text to last text_object if it's text, if it isn't
- * it creates a new text_object */
-static void append_text(const char *s)
+static struct text_object *create_plain_text(const char *s)
{
- struct text_object *obj;
+ struct text_object *obj;
- if (s == NULL || *s == '\0')
- return;
-
- obj = text_object_count ? &text_objects[text_object_count - 1] : 0;
+ if (s == NULL || *s == '\0') {
+ return NULL;
+ }
+
+ obj = new_text_object_internal();
- /* create a new text object? */
- if (!obj || obj->type != OBJ_text) {
- obj = new_text_object();
- obj->type = OBJ_text;
- obj->data.s = strdup(s);
- } else {
- /* append */
- obj->data.s = (char *) realloc(obj->data.s,
- strlen(obj->data.s) +
- strlen(s) + 1);
- strcat(obj->data.s, s);
- }
+ obj->type = OBJ_text;
+ obj->data.s = strdup(s);
+ return obj;
}
-static void extract_variable_text(const char *p)
+static struct text_object_list *extract_variable_text_internal(const char *p)
{
- const char *s = p;
-
- free_text_objects();
-
+ struct text_object_list *retval;
+ struct text_object *obj;
+ const char *s = p;
+
+ retval = malloc(sizeof(struct text_object_list));
+ memset(retval, 0, sizeof(struct text_object_list));
+ retval->text_object_count = 0;
+
while (*p) {
if (*p == '$') {
*(char *) p = '\0';
- append_text(s);
+ obj = create_plain_text(s);
+ if(obj != NULL) {
+ // allocate memory for the object
+ retval->text_objects = realloc(retval->text_objects,
+ sizeof(struct text_object) * (retval->text_object_count+1));
+ // assign the new object to the end of the list.
+ memcpy(&retval->text_objects[retval->text_object_count++],
+ obj, sizeof(struct text_object));
+ free(obj);
+ }
*(char *) p = '$';
p++;
s = p;
p++;
}
- construct_text_object(buf, arg);
+ // create new object
+ obj = construct_text_object(buf, arg);
+ if(obj != NULL) {
+ // allocate memory for the object
+ retval->text_objects = realloc(retval->text_objects,
+ sizeof(struct text_object) * (retval->text_object_count+1));
+ // assign the new object to the end of the list.
+ memcpy(&retval->text_objects[retval->text_object_count++],
+ obj, sizeof(struct text_object));
+ free(obj);
+ }
}
continue;
- } else
- append_text("$");
+ } else {
+ obj = create_plain_text("$");
+ if(obj != NULL) {
+ // allocate memory for the object
+ retval->text_objects = realloc(retval->text_objects,
+ sizeof(struct text_object) * (retval->text_object_count+1));
+ // assign the new object to the end of the list.
+ memcpy(&retval->text_objects[retval->text_object_count++],
+ obj, sizeof(struct text_object));
+ free(obj);
+ }
+ }
}
-
p++;
}
- append_text(s);
+ obj = create_plain_text(s);
+ if(obj != NULL) {
+ // allocate memory for the object
+ retval->text_objects = realloc(retval->text_objects,
+ sizeof(struct text_object) * (retval->text_object_count+1));
+ // assign the new object to the end of the list.
+ memcpy(&retval->text_objects[retval->text_object_count++],
+ obj, sizeof(struct text_object));
+ free(obj);
+ }
+
if (blockdepth) {
ERR("one or more $endif's are missing");
}
-}
-double current_update_time, last_update_time;
+ return retval;
+}
-static void generate_text()
+static void extract_variable_text(const char *p)
{
- unsigned int i, n;
- struct information *cur = &info;
- char *p;
+ struct text_object_list *list;
- special_count = 0;
+ free_text_objects(text_object_count, text_objects);
+ text_object_count = 0;
+ text_objects = NULL;
- /* update info */
+#ifdef MLDONKEY
+ ml_cleanup();
+#endif /* MLDONKEY */
+
+ list = extract_variable_text_internal(p);
+ text_objects = list->text_objects;
+ text_object_count = list->text_object_count;
- current_update_time = get_time();
+ free(list);
- update_stuff(cur);
+ return;
+}
- /* generate text */
+void parse_conky_vars(char * text, char * p, struct information *cur) {
+ struct text_object_list *object_list = extract_variable_text_internal(text);
+ generate_text_internal(p, P_MAX_SIZE, object_list->text_objects, object_list->text_object_count, cur);
+ free(object_list);
+}
- n = TEXT_BUFFER_SIZE * 4 - 2;
- p = text_buffer;
+static void generate_text_internal(char *p, int p_max_size, struct text_object *objs, unsigned int object_count, struct information *cur)
+{
+ unsigned int i;
- for (i = 0; i < text_object_count; i++) {
- struct text_object *obj = &text_objects[i];
+ for (i = 0; i < object_count; i++) {
+ struct text_object *obj = &objs[i];
#define OBJ(a) break; case OBJ_##a:
OBJ(acpitemp) {
/* does anyone have decimals in acpi temperature? */
if (!use_spacer)
- snprintf(p, n, "%d", (int)
+ snprintf(p, p_max_size, "%d", (int)
get_acpi_temperature(obj->
data.
i));
OBJ(acpitempf) {
/* does anyone have decimals in acpi temperature? */
if (!use_spacer)
- snprintf(p, n, "%d", (int)
+ snprintf(p, p_max_size, "%d", (int)
((get_acpi_temperature(obj->
data.
i)+ 40) * 9.0 / 5 - 40));
i)+ 40) * 9.0 / 5 - 40));
}
OBJ(freq) {
- snprintf(p, n, "%.0f", get_freq());
+ get_freq(p, p_max_size, "%.0f", 1); /* pk */
}
OBJ(freq_g) {
- float ghz = (float)(get_freq()/1000);
- //printf("%f\n", ghz);
- snprintf(p, n, "%'.2f", ghz);
+ get_freq(p, p_max_size, "%'.2f", 1000); /* pk */
}
OBJ(freq_dyn) {
- snprintf(p, n, "%.0f", get_freq_dynamic());
+ if (use_spacer) {
+ get_freq_dynamic(p, 6, "%.0f ", 1 ); /* pk */
+ } else {
+ get_freq_dynamic(p, p_max_size, "%.0f", 1 ); /* pk */
+ }
}
OBJ(freq_dyn_g) {
- float ghz = (float)(get_freq_dynamic()/1000);
- snprintf(p, n, "%'.2f", ghz);
+ if (use_spacer) {
+ get_freq_dynamic(p, 6, "%'.2f ", 1000); /* pk */
+ } else {
+ get_freq_dynamic(p, p_max_size, "%'.2f", 1000); /* pk */
+ }
}
OBJ(adt746xcpu) {
- snprintf(p, n, "%s", get_adt746x_cpu());
+ get_adt746x_cpu(p, p_max_size); /* pk */
}
OBJ(adt746xfan) {
- snprintf(p, n, "%s", get_adt746x_fan());
+ get_adt746x_fan(p, p_max_size); /* pk */
}
OBJ(acpifan) {
- snprintf(p, n, "%s", get_acpi_fan());
+ get_acpi_fan(p, p_max_size); /* pk */
}
OBJ(acpiacadapter) {
- snprintf(p, n, "%s",
- get_acpi_ac_adapter());
+ get_acpi_ac_adapter(p, p_max_size); /* pk */
}
OBJ(battery) {
- get_battery_stuff(p, n, obj->data.s);
+ get_battery_stuff(p, p_max_size, obj->data.s);
}
OBJ(buffers) {
- human_readable(cur->buffers * 1024, p,
- 255);
+ human_readable(cur->buffers * 1024, p, 255);
}
OBJ(cached) {
human_readable(cur->cached * 1024, p, 255);
CRIT_ERR("attempting to use more CPUs then you have!");
}
if (!use_spacer)
- snprintf(p, n, "%*d", pad_percents,
+ snprintf(p, p_max_size, "%*d", pad_percents,
(int) round_to_int(cur->cpu_usage[obj->data.cpu_index] *
100.0));
else
}
#if defined(__linux__)
OBJ(i8k_version) {
- snprintf(p, n, "%s", i8k.version);
+ snprintf(p, p_max_size, "%s", i8k.version);
}
OBJ(i8k_bios) {
- snprintf(p, n, "%s", i8k.bios);
+ snprintf(p, p_max_size, "%s", i8k.bios);
}
OBJ(i8k_serial) {
- snprintf(p, n, "%s", i8k.serial);
+ snprintf(p, p_max_size, "%s", i8k.serial);
}
OBJ(i8k_cpu_temp) {
- snprintf(p, n, "%s", i8k.cpu_temp);
+ snprintf(p, p_max_size, "%s", i8k.cpu_temp);
}
OBJ(i8k_cpu_tempf) {
int cpu_temp;
sscanf(i8k.cpu_temp, "%d", &cpu_temp);
- snprintf(p, n, "%.1f", cpu_temp*(9.0/5.0)+32.0);
+ snprintf(p, p_max_size, "%.1f", cpu_temp*(9.0/5.0)+32.0);
}
OBJ(i8k_left_fan_status) {
int left_fan_status;
sscanf(i8k.left_fan_status, "%d", &left_fan_status);
if(left_fan_status == 0) {
- snprintf(p, n,"off");
+ snprintf(p, p_max_size,"off");
} if(left_fan_status == 1) {
- snprintf(p, n, "low");
+ snprintf(p, p_max_size, "low");
} if(left_fan_status == 2) {
- snprintf(p, n, "high");
+ snprintf(p, p_max_size, "high");
}
}
int right_fan_status;
sscanf(i8k.right_fan_status, "%d", &right_fan_status);
if(right_fan_status == 0) {
- snprintf(p, n,"off");
+ snprintf(p, p_max_size,"off");
} if(right_fan_status == 1) {
- snprintf(p, n, "low");
+ snprintf(p, p_max_size, "low");
} if(right_fan_status == 2) {
- snprintf(p, n, "high");
+ snprintf(p, p_max_size, "high");
}
}
OBJ(i8k_left_fan_rpm) {
- snprintf(p, n, "%s", i8k.left_fan_rpm);
+ snprintf(p, p_max_size, "%s", i8k.left_fan_rpm);
}
OBJ(i8k_right_fan_rpm) {
- snprintf(p, n, "%s", i8k.right_fan_rpm);
+ snprintf(p, p_max_size, "%s", i8k.right_fan_rpm);
}
OBJ(i8k_ac_status) {
int ac_status;
sscanf(i8k.ac_status, "%d", &ac_status);
if(ac_status == -1) {
- snprintf(p, n,"disabled (read i8k docs)");
+ snprintf(p, p_max_size,"disabled (read i8k docs)");
} if(ac_status == 0) {
- snprintf(p, n, "off");
+ snprintf(p, p_max_size, "off");
} if(ac_status == 1) {
- snprintf(p, n, "on");
+ snprintf(p, p_max_size, "on");
}
}
OBJ(i8k_buttons_status) {
- snprintf(p, n, "%s", i8k.buttons_status);
+ snprintf(p, p_max_size, "%s", i8k.buttons_status);
}
#endif /* __linux__ */
OBJ(diskio) {
if (!use_spacer) {
if (diskio_value > 1024*1024) {
- snprintf(p, n, "%.1fG",
+ snprintf(p, p_max_size, "%.1fG",
(double)diskio_value/1024/1024);
} else if (diskio_value > 1024) {
- snprintf(p, n, "%.1fM",
+ snprintf(p, p_max_size, "%.1fM",
(double)diskio_value/1024);
} else if (diskio_value > 0) {
- snprintf(p, n, "%dK", diskio_value);
+ snprintf(p, p_max_size, "%dK", diskio_value);
} else {
- snprintf(p, n, "%d", diskio_value);
+ snprintf(p, p_max_size, "%d", diskio_value);
}
} else {
if (diskio_value > 1024*1024) {
OBJ(downspeed) {
if (!use_spacer) {
- snprintf(p, n, "%d",
+ snprintf(p, p_max_size, "%d",
(int) (obj->data.net->
recv_speed /
1024));
}
OBJ(downspeedf) {
if (!use_spacer)
- snprintf(p, n, "%.1f",
+ snprintf(p, p_max_size, "%.1f",
obj->data.net->
recv_speed / 1024.0);
else
}
#ifdef HAVE_POPEN
OBJ(addr) {
- snprintf(p, n, "%u.%u.%u.%u",
+ snprintf(p, p_max_size, "%u.%u.%u.%u",
obj->data.net->addr.
sa_data[2] & 255,
obj->data.net->addr.
}
OBJ(linkstatus) {
- snprintf(p, n, "%d",
+ snprintf(p, p_max_size, "%d",
obj->data.net->linkstatus);
}
OBJ(exec) {
- char *p2 = p;
FILE *fp = popen(obj->data.s, "r");
- int n2 = fread(p, 1, n, fp);
+ int length = fread(p, 1, p_max_size, fp);
(void) pclose(fp);
- p[n2] = '\0';
- if (n2 && p[n2 - 1] == '\n')
- p[n2 - 1] = '\0';
-
- while (*p2) {
- if (*p2 == '\001')
- *p2 = ' ';
- p2++;
- }
+ /*output[length] = '\0';
+ if (length > 0 && output[length - 1] == '\n') {
+ output[length - 1] = '\0';
+ }*/
+ p[length] = '\0';
+ if (length > 0 && p[length - 1] == '\n') {
+ p[length - 1] = '\0';
+ }
+
+ //parse_conky_vars(output, p, cur);
}
OBJ(execbar) {
char *p2 = p;
FILE *fp = popen(obj->data.s, "r");
- int n2 = fread(p, 1, n, fp);
+ int n2 = fread(p, 1, p_max_size, fp);
(void) pclose(fp);
p[n2] = '\0';
OBJ(execgraph) {
char *p2 = p;
FILE *fp = popen(obj->data.s, "r");
- int n2 = fread(p, 1, n, fp);
+ int n2 = fread(p, 1, p_max_size, fp);
(void) pclose(fp);
p[n2] = '\0';
}
OBJ(execibar) {
- if (current_update_time - obj->data.execi.last_update < obj->data.execi.interval) {
+ if (current_update_time - obj->data.execi.last_update < obj->data.execi.interval) {
new_bar(p, 0, 4, (int) obj->f);
} else {
char *p2 = p;
FILE *fp = popen(obj->data.execi.cmd, "r");
- int n2 = fread(p, 1, n, fp);
+ int n2 = fread(p, 1, p_max_size, fp);
(void) pclose(fp);
p[n2] = '\0';
if (n2 && p[n2 - 1] == '\n')
}
}
OBJ(execigraph) {
- if (current_update_time - obj->data.execi.last_update < obj->data.execi.interval) {
+ if (current_update_time - obj->data.execi.last_update < obj->data.execi.interval) {
new_graph(p, 0, 25, obj->c, obj->d, (int) (obj->f), 100, 0);
} else {
char *p2 = p;
FILE *fp = popen(obj->data.execi.cmd, "r");
- int n2 = fread(p, 1, n, fp);
+ int n2 = fread(p, 1, p_max_size, fp);
(void) pclose(fp);
p[n2] = '\0';
if (n2 && p[n2 - 1] == '\n')
}
OBJ(execi) {
- if (current_update_time -
- obj->data.execi.last_update <
- obj->data.execi.interval) {
- snprintf(p, n, "%s",
- obj->data.execi.buffer);
+ if (current_update_time - obj->data.execi.last_update < obj->data.execi.interval || obj->data.execi.interval == 0) {
+ snprintf(p, p_max_size, "%s", obj->data.execi.buffer);
} else {
- char *p2 = obj->data.execi.buffer;
- FILE *fp =
- popen(obj->data.execi.cmd,
- "r");
- int n2 =
- fread(p2, 1, TEXT_BUFFER_SIZE,
- fp);
+ char *output = obj->data.execi.buffer;
+ FILE *fp = popen(obj->data.execi.cmd, "r");
+ //int length = fread(output, 1, TEXT_BUFFER_SIZE, fp);
+ int length = fread(output, 1, TEXT_BUFFER_SIZE, fp);
(void) pclose(fp);
-
- p2[n2] = '\0';
- if (n2 && p2[n2 - 1] == '\n')
- p2[n2 - 1] = '\0';
-
- while (*p2) {
- if (*p2 == '\001')
- *p2 = ' ';
- p2++;
+
+ output[length] = '\0';
+ if (length > 0 && output[length - 1] == '\n') {
+ output[length - 1] = '\0';
}
-
- snprintf(p, n, "%s",
- obj->data.execi.buffer);
-
- obj->data.execi.last_update =
- current_update_time;
+ obj->data.execi.last_update = current_update_time;
+ snprintf(p, p_max_size, "%s", output);
}
+ //parse_conky_vars(output, p, cur);
}
OBJ(texeci) {
static int running = 0;
- if (current_update_time - obj->data.execi.last_update < obj->data.execi.interval) {
- snprintf(p, n, "%s", obj->data.execi.buffer);
+ if (current_update_time - obj->data.execi.last_update < obj->data.execi.interval) {
+ snprintf(p, p_max_size, "%s", obj->data.execi.buffer);
} else {
static pthread_t execthread;
+ if (running) {
+ pthread_join( execthread, NULL);
+ running = 0;
+ }
if (!running) {
running = 1;
pthread_create( &execthread, NULL, (void*)threaded_exec, (void*) obj);
pthread_mutex_lock( &mutex1 );
obj->data.execi.last_update = current_update_time;
pthread_mutex_unlock( &mutex1 );
- } else {
- pthread_join( execthread, NULL);
- running = 0;
}
- snprintf(p, n, "%s", obj->data.execi.buffer);
+ snprintf(p, p_max_size, "%s", obj->data.execi.buffer);
}
+ //parse_conky_vars(obj->data.execi.buffer, p, cur);
}
#endif
OBJ(fs_bar) {
OBJ(fs_free_perc) {
if (obj->data.fs != NULL) {
if (obj->data.fs->size)
- snprintf(p, n, "%*d",
+ snprintf(p, p_max_size, "%*d",
pad_percents,
(int) ((obj->data.
fs->
obj->data.
fs->size));
else
- snprintf(p, n, "0");
+ snprintf(p, p_max_size, "0");
}
}
OBJ(fs_size) {
OBJ(fs_used) {
if (obj->data.fs != NULL)
human_readable(obj->data.fs->size -
- obj->data.fs->avail,
+ (obj->data.fs->free ? obj->data.fs->free :obj->data.fs->avail),
p, 255);
}
OBJ(fs_bar_free) {
fs->
size)));
else
- snprintf(p, n, "0");
+ snprintf(p, p_max_size, "0");
}
}
OBJ(loadavg) {
float *v = info.loadavg;
if (obj->data.loadavg[2])
- snprintf(p, n, "%.2f %.2f %.2f",
+ snprintf(p, p_max_size, "%.2f %.2f %.2f",
v[obj->data.loadavg[0] -
1],
v[obj->data.loadavg[1] -
v[obj->data.loadavg[2] -
1]);
else if (obj->data.loadavg[1])
- snprintf(p, n, "%.2f %.2f",
+ snprintf(p, p_max_size, "%.2f %.2f",
v[obj->data.loadavg[0] -
1],
v[obj->data.loadavg[1] -
1]);
else if (obj->data.loadavg[0])
- snprintf(p, n, "%.2f",
+ snprintf(p, p_max_size, "%.2f",
v[obj->data.loadavg[0] -
1]);
}
obj->data.i2c.type);
if (r >= 100.0 || r == 0)
- snprintf(p, n, "%d", (int) r);
+ snprintf(p, p_max_size, "%d", (int) r);
else
- snprintf(p, n, "%.1f", r);
+ snprintf(p, p_max_size, "%.1f", r);
}
OBJ(alignr) {
new_alignr(p, obj->data.i);
if_jumped = 0;
}
OBJ(kernel) {
- snprintf(p, n, "%s", cur->uname_s.release);
+ snprintf(p, p_max_size, "%s", cur->uname_s.release);
}
OBJ(machine) {
- snprintf(p, n, "%s", cur->uname_s.machine);
+ snprintf(p, p_max_size, "%s", cur->uname_s.machine);
}
/* memory stuff */
OBJ(memperc) {
if (cur->memmax) {
if (!use_spacer)
- snprintf(p, n, "%*lu",
+ snprintf(p, p_max_size, "%*lu",
pad_percents,
(cur->mem * 100) /
(cur->memmax));
}
/* mixer stuff */
OBJ(mixer) {
- snprintf(p, n, "%d",
+ snprintf(p, p_max_size, "%d",
mixer_get_avg(obj->data.l));
}
OBJ(mixerl) {
- snprintf(p, n, "%d",
+ snprintf(p, p_max_size, "%d",
mixer_get_left(obj->data.l));
}
OBJ(mixerr) {
- snprintf(p, n, "%d",
+ snprintf(p, p_max_size, "%d",
mixer_get_right(obj->data.l));
}
OBJ(mixerbar) {
/* mail stuff */
OBJ(mails) {
- snprintf(p, n, "%d", cur->mail_count);
+ snprintf(p, p_max_size, "%d", cur->mail_count);
}
OBJ(new_mails) {
- snprintf(p, n, "%d", cur->new_mail_count);
+ snprintf(p, p_max_size, "%d", cur->new_mail_count);
}
#ifdef MLDONKEY
OBJ(ml_upload_counter) {
- snprintf(p, n, "%lld",
+ snprintf(p, p_max_size, "%lld",
mlinfo.upload_counter / 1048576);
}
OBJ(ml_download_counter) {
- snprintf(p, n, "%lld",
+ snprintf(p, p_max_size, "%lld",
mlinfo.download_counter /
1048576);
}
OBJ(ml_nshared_files) {
- snprintf(p, n, "%i", mlinfo.nshared_files);
+ snprintf(p, p_max_size, "%i", mlinfo.nshared_files);
}
OBJ(ml_shared_counter) {
- snprintf(p, n, "%lld",
+ snprintf(p, p_max_size, "%lld",
mlinfo.shared_counter / 1048576);
}
OBJ(ml_tcp_upload_rate) {
- snprintf(p, n, "%.2f",
+ snprintf(p, p_max_size, "%.2f",
(float) mlinfo.tcp_upload_rate /
1024);
}
OBJ(ml_tcp_download_rate) {
- snprintf(p, n, "%.2f",
+ snprintf(p, p_max_size, "%.2f",
(float) mlinfo.tcp_download_rate /
1024);
}
OBJ(ml_udp_upload_rate) {
- snprintf(p, n, "%.2f",
+ snprintf(p, p_max_size, "%.2f",
(float) mlinfo.udp_upload_rate /
1024);
}
OBJ(ml_udp_download_rate) {
- snprintf(p, n, "%.2f",
+ snprintf(p, p_max_size, "%.2f",
(float) mlinfo.udp_download_rate /
1024);
}
OBJ(ml_ndownloaded_files) {
- snprintf(p, n, "%i",
+ snprintf(p, p_max_size, "%i",
mlinfo.ndownloaded_files);
}
OBJ(ml_ndownloading_files) {
- snprintf(p, n, "%i",
+ snprintf(p, p_max_size, "%i",
mlinfo.ndownloading_files);
}
#endif
OBJ(nodename) {
- snprintf(p, n, "%s",
+ snprintf(p, p_max_size, "%s",
cur->uname_s.nodename);
}
OBJ(outlinecolor) {
}
OBJ(processes) {
if (!use_spacer)
- snprintf(p, n, "%d", cur->procs);
+ snprintf(p, p_max_size, "%hu", cur->procs);
else
- snprintf(p, 5, "%d ",
+ snprintf(p, 5, "%hu ",
cur->procs);
}
OBJ(running_processes) {
if (!use_spacer)
- snprintf(p, n, "%d",
+ snprintf(p, p_max_size, "%hu",
cur->run_procs);
else
- snprintf(p, 3, "%d ",
+ snprintf(p, 3, "%hu ",
cur->run_procs);
}
OBJ(text) {
- snprintf(p, n, "%s", obj->data.s);
+ snprintf(p, p_max_size, "%s", obj->data.s);
}
OBJ(shadecolor) {
new_bg(p, obj->data.l);
(cur->swapmax) : 0);
}
OBJ(sysname) {
- snprintf(p, n, "%s", cur->uname_s.sysname);
+ snprintf(p, p_max_size, "%s", cur->uname_s.sysname);
}
OBJ(time) {
time_t t = time(NULL);
struct tm *tm = localtime(&t);
setlocale(LC_TIME, "");
- strftime(p, n, obj->data.s, tm);
+ strftime(p, p_max_size, obj->data.s, tm);
}
OBJ(utime) {
time_t t = time(NULL);
struct tm *tm = gmtime(&t);
- strftime(p, n, obj->data.s, tm);
+ strftime(p, p_max_size, obj->data.s, tm);
}
OBJ(totaldown) {
human_readable(obj->data.net->recv, p,
255);
}
OBJ(updates) {
- snprintf(p, n, "%d", total_updates);
+ snprintf(p, p_max_size, "%d", total_updates);
}
OBJ(upspeed) {
if (!use_spacer)
- snprintf(p, n, "%d",
+ snprintf(p, p_max_size, "%d",
(int) (obj->data.net->
trans_speed /
1024));
}
OBJ(upspeedf) {
if (!use_spacer)
- snprintf(p, n, "%.1f",
+ snprintf(p, p_max_size, "%.1f",
obj->data.net->
trans_speed / 1024.0);
else
1024.0), obj->e, 1);
}
OBJ(uptime_short) {
- format_seconds_short(p, n,
+ format_seconds_short(p, p_max_size,
(int) cur->uptime);
}
OBJ(uptime) {
- format_seconds(p, n, (int) cur->uptime);
+ format_seconds(p, p_max_size, (int) cur->uptime);
}
#if defined(__FreeBSD__) && (defined(i386) || defined(__i386__))
OBJ(apm_adapter) {
- snprintf(p, n, "%s", get_apm_adapter());
+ snprintf(p, p_max_size, "%s", get_apm_adapter());
}
OBJ(apm_battery_life) {
char *msg;
msg = get_apm_battery_life();
- snprintf(p, n, "%s", msg);
+ snprintf(p, p_max_size, "%s", msg);
free(msg);
}
OBJ(apm_battery_time) {
char *msg;
msg = get_apm_battery_time();
- snprintf(p, n, "%s", msg);
+ snprintf(p, p_max_size, "%s", msg);
free(msg);
}
#endif /* __FreeBSD__ */
#ifdef SETI
OBJ(seti_prog) {
- snprintf(p, n, "%.2f",
+ snprintf(p, p_max_size, "%.2f",
cur->seti_prog * 100.0f);
}
OBJ(seti_progbar) {
(int) (cur->seti_prog * 255.0f));
}
OBJ(seti_credit) {
- snprintf(p, n, "%.0f", cur->seti_credit);
+ snprintf(p, p_max_size, "%.0f", cur->seti_credit);
}
#endif
#ifdef MPD
OBJ(mpd_title) {
- snprintf(p, n, "%s", cur->mpd.title);
+ snprintf(p, p_max_size, "%s", cur->mpd.title);
}
OBJ(mpd_artist) {
- snprintf(p, n, "%s", cur->mpd.artist);
+ snprintf(p, p_max_size, "%s", cur->mpd.artist);
}
OBJ(mpd_album) {
- snprintf(p, n, "%s", cur->mpd.album);
+ snprintf(p, p_max_size, "%s", cur->mpd.album);
}
OBJ(mpd_random) {
- snprintf(p, n, "%s", cur->mpd.random);
+ snprintf(p, p_max_size, "%s", cur->mpd.random);
}
OBJ(mpd_repeat) {
- snprintf(p, n, "%s", cur->mpd.repeat);
+ snprintf(p, p_max_size, "%s", cur->mpd.repeat);
}
OBJ(mpd_track) {
- snprintf(p, n, "%s", cur->mpd.track);
+ snprintf(p, p_max_size, "%s", cur->mpd.track);
}
OBJ(mpd_vol) {
- snprintf(p, n, "%i", cur->mpd.volume);
+ snprintf(p, p_max_size, "%i", cur->mpd.volume);
}
OBJ(mpd_bitrate) {
- snprintf(p, n, "%i", cur->mpd.bitrate);
+ snprintf(p, p_max_size, "%i", cur->mpd.bitrate);
}
OBJ(mpd_status) {
- snprintf(p, n, "%s", cur->mpd.status);
+ snprintf(p, p_max_size, "%s", cur->mpd.status);
}
OBJ(mpd_elapsed) {
int days = 0, hours = 0, minutes =
}
seconds = tmp;
if (days > 0)
- snprintf(p, n, "%i days %i:%02i:%02i",
+ snprintf(p, p_max_size, "%i days %i:%02i:%02i",
days, hours, minutes,
seconds);
else if (hours > 0)
- snprintf(p, n, "%i:%02i:%02i", hours,
+ snprintf(p, p_max_size, "%i:%02i:%02i", hours,
minutes, seconds);
else
- snprintf(p, n, "%i:%02i", minutes,
+ snprintf(p, p_max_size, "%i:%02i", minutes,
seconds);
}
OBJ(mpd_length) {
}
seconds = tmp;
if (days > 0)
- snprintf(p, n,
+ snprintf(p, p_max_size,
"%i days %i:%02i:%02i",
days, hours, minutes,
seconds);
else if (hours > 0)
- snprintf(p, n, "%i:%02i:%02i", hours,
+ snprintf(p, p_max_size, "%i:%02i:%02i", hours,
minutes, seconds);
else
- snprintf(p, n, "%i:%02i", minutes,
+ snprintf(p, p_max_size, "%i:%02i", minutes,
seconds);
}
OBJ(mpd_percent) {
- snprintf(p, n, "%2.0f",
+ snprintf(p, p_max_size, "%2.0f",
cur->mpd.progress * 100);
}
OBJ(mpd_bar) {
255.0f));
}
#endif
+#ifdef BMPX
+ OBJ(bmpx_title) {
+ snprintf(p, p_max_size, "%s", cur->bmpx.title);
+ }
+ OBJ(bmpx_artist) {
+ snprintf(p, p_max_size, "%s", cur->bmpx.artist);
+ }
+ OBJ(bmpx_album) {
+ snprintf(p, p_max_size, "%s", cur->bmpx.album);
+ }
+ OBJ(bmpx_uri) {
+ snprintf(p, p_max_size, "%s", cur->bmpx.uri);
+ }
+ OBJ(bmpx_track) {
+ snprintf(p, p_max_size, "%i", cur->bmpx.track);
+ }
+ OBJ(bmpx_bitrate) {
+ snprintf(p, p_max_size, "%i", cur->bmpx.bitrate);
+ }
+#endif
+#ifdef INFOPIPE
+ OBJ(infopipe_protocol) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_PROTOCOL]);
+ }
+ OBJ(infopipe_version) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_VERSION]);
+ }
+ OBJ(infopipe_status) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_STATUS]);
+ }
+ OBJ(infopipe_playlist_tunes) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_PLAYLIST_TUNES]);
+ }
+ OBJ(infopipe_playlist_currtune) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_PLAYLIST_CURRTUNE]);
+ }
+ OBJ(infopipe_usec_position) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_USEC_POSITION]);
+ }
+ OBJ(infopipe_position) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_POSITION]);
+ }
+ OBJ(infopipe_usec_time) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_USEC_TIME]);
+ }
+ OBJ(infopipe_time) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_TIME]);
+ }
+ OBJ(infopipe_bitrate) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_BITRATE]);
+ }
+ OBJ(infopipe_frequency) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_FREQUENCY]);
+ }
+ OBJ(infopipe_channels) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_CHANNELS]);
+ }
+ OBJ(infopipe_title) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_TITLE]);
+ }
+ OBJ(infopipe_file) {
+ snprintf(p, p_max_size, "%s", cur->infopipe.items[INFOPIPE_FILE]);
+ }
+ OBJ(infopipe_bar) {
+ double progress;
+ progress= atof(cur->infopipe.items[INFOPIPE_USEC_POSITION]) /
+ atof(cur->infopipe.items[INFOPIPE_USEC_TIME]);
+ new_bar(p,obj->a,obj->b,(int)(progress*255.0f));
+ }
+#endif
OBJ(top) {
if (obj->data.top.type == TOP_NAME
&& obj->data.top.num >= 0
}
-
- /*
- * I'm tired of everything being packed in
- * pee
- * poop
- */
-
-
OBJ(tail) {
- if (current_update_time -obj->data.tail.last_update < obj->data.tail.interval) {
- snprintf(p, n, "%s", obj->data.tail.buffer);
- } else {
+ if (current_update_time -obj->data.tail.last_update >= obj->data.tail.interval) {
obj->data.tail.last_update = current_update_time;
FILE *fp;
int i;
if (obj->data.tail.buffer[strlen(obj->data.tail.buffer)-1] == '\n') {
obj->data.tail.buffer[strlen(obj->data.tail.buffer)-1] = '\0';
}
- snprintf(p, n, "%s", obj->data.tail.buffer);
freetail(freetmp);
- }
- else {
+ } else {
strcpy(obj->data.tail.buffer, "Logfile Empty");
- snprintf(p, n, "Logfile Empty");
- }
- }
- }
+ } /* if readlines */
+ } /* fp == NULL */
+ } /* if cur_upd_time >= */
+
+ //parse_conky_vars(obj->data.tail.buffer, p, cur);
+
}
OBJ(head) {
- if (current_update_time -obj->data.tail.last_update < obj->data.tail.interval) {
- snprintf(p, n, "%s", obj->data.tail.buffer);
- } else {
+ if (current_update_time -obj->data.tail.last_update >= obj->data.tail.interval) {
obj->data.tail.last_update = current_update_time;
FILE *fp;
tailstring *head = NULL;
fp = fopen(obj->data.tail.logfile, "rt");
if (fp == NULL) {
ERR("head logfile failed to open");
- }
- else {
+ } else {
obj->data.tail.readlines = 0;
while (fgets(obj->data.tail.buffer, TEXT_BUFFER_SIZE*20, fp) != NULL && obj->data.tail.readlines <= obj->data.tail.wantedlines) {
addtail(&head, obj->data.tail.buffer);
if (obj->data.tail.buffer[strlen(obj->data.tail.buffer)-1] == '\n') {
obj->data.tail.buffer[strlen(obj->data.tail.buffer)-1] = '\0';
}
- snprintf(p, n, "%s", obj->data.tail.buffer);
- }
- else {
+ } else {
strcpy(obj->data.tail.buffer, "Logfile Empty");
- snprintf(p, n, "Logfile Empty");
- }
- }
- }
+ } /* if readlines > 0 */
+ } /* if fp == null */
+ } /* cur_upd_time >= */
+
+ //parse_conky_vars(obj->data.tail.buffer, p, cur);
+
}
#ifdef TCP_PORT_MONITOR
OBJ(tcp_portmon)
obj->data.tcp_port_monitor.port_range_begin,
obj->data.tcp_port_monitor.port_range_end );
if ( !p_monitor ) {
- snprintf(p, n, "monitor not found");
+ snprintf(p, p_max_size, "monitor not found");
break;
}
if ( peek_tcp_port_monitor( p_monitor,
obj->data.tcp_port_monitor.item,
obj->data.tcp_port_monitor.connection_index,
- p, n ) != 0 )
+ p, p_max_size ) != 0 )
{
- snprintf(p, n, "monitor peek error");
+ snprintf(p, p_max_size, "monitor peek error");
break;
}
}
{
unsigned int a = strlen(p);
p += a;
- n -= a;
+ p_max_size -= a;
}
}
+}
+
+
+double current_update_time, last_update_time;
+
+static void generate_text()
+{
+ struct information *cur = &info;
+ char *p;
+
+ special_count = 0;
+
+ /* update info */
+
+ current_update_time = get_time();
+
+ update_stuff(cur);
+
+ /* add things to the buffer */
+
+ /* generate text */
+
+ p = text_buffer;
+
+ generate_text_internal(p, P_MAX_SIZE, text_objects, text_object_count, cur);
if (stuff_in_upper_case) {
char *p;
//free(p);
}
+
#ifdef X11
static void set_font()
{
width_of_s = get_string_width(s);
if (out_to_console) {
printf("%s\n", s);
+ fflush(stdout); /* output immediately, don't buffer */
}
/* daemon_run(s); the daemon can be called here, but we need to have a buffer in daemon_run() and we need to tell it when everything is ready to be sent */
- strcpy(tmpstring1, s);
+ memset(tmpstring1,0,TEXT_BUFFER_SIZE);
+ memset(tmpstring2,0,TEXT_BUFFER_SIZE);
+ strncpy(tmpstring1, s, TEXT_BUFFER_SIZE-1);
pos = 0;
added = 0;
char space[2];
for (i2 = 0;
i2 < (8 - (1 + pos) % 8) && added <= max;
i2++) {
- tmpstring2[pos + i2] = ' ';
+ /*
+ if ( pos + i2 > TEXT_BUFFER_SIZE-1 )
+ fprintf(stderr,"buffer overrun detected\n");
+ */
+ tmpstring2[ MIN(pos + i2, TEXT_BUFFER_SIZE-1) ] = ' '; /* guard against overrun */
added++;
}
pos += i2;
} else {
if (tmpstring1[i] != 9) {
- tmpstring2[pos] = tmpstring1[i];
+ /*
+ if ( pos > TEXT_BUFFER_SIZE-1 )
+ fprintf(stderr,"buffer overrun detected\n");
+ */
+ tmpstring2[ MIN(pos, TEXT_BUFFER_SIZE-1) ] = tmpstring1[i]; /* guard against overrun */
pos++;
}
}
w = text_start_x + text_width - cur_x - 1;
if (w < 0)
w = 0;
- XSetLineAttributes(display,
- window.gc, 1,
- LineSolid,
- CapButt,
- JoinMiter);
- XDrawRectangle(display,
- window.drawable,
- window.gc, cur_x,
- by, w, h);
+ if (draw_graph_borders) {
+ XSetLineAttributes(display, window.gc, 1, LineSolid, CapButt, JoinMiter);
+ XDrawRectangle(display,window.drawable, window.gc, cur_x, by, w, h);
+ }
XSetLineAttributes(display,
window.gc, 1,
LineSolid,
static void main_loop()
{
+#ifdef SIGNAL_BLOCKING
+ sigset_t newmask, oldmask;
+
+ sigemptyset(&newmask);
+ sigaddset(&newmask,SIGINT);
+ sigaddset(&newmask,SIGTERM);
+ sigaddset(&newmask,SIGUSR1);
+#endif
+
#ifdef X11
Region region = XCreateRegion();
#endif /* X11 */
info.looped = 0;
while (total_run_times == 0 || info.looped < total_run_times - 1) {
info.looped++;
+
+#ifdef SIGNAL_BLOCKING
+ /* block signals. we will inspect for pending signals later */
+ if (sigprocmask(SIG_BLOCK, &newmask, &oldmask) < 0)
+ CRIT_ERR("unable to sigprocmask()");
+#endif
+
#ifdef X11
XFlush(display);
}
#endif /* X11 */
- /* inspect pending signal prior to entering next loop */
+#ifdef SIGNAL_BLOCKING
+ /* unblock signals of interest and let handler fly */
+ if (sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0)
+ CRIT_ERR("unable to sigprocmask()");
+#endif
+
switch(g_signal_pending) {
case SIGUSR1:
{
{
ERR("received SIGINT or SIGTERM to terminate. bye!");
clean_up();
- exit(0);
+#ifdef X11
+ XDestroyRegion(region);
+ region = NULL;
+#endif /* X11 */
+ return; /* return from main_loop */
/*break;*/
}
default:
g_signal_pending=0;
}
+#ifdef X11
+ XDestroyRegion(region);
+ region = NULL;
+#endif /* X11 */
}
static void load_config_file(const char *);
/* it is really pointless to free() memory at the end of program but ak|ra
* wants me to do this */
- free_text_objects();
+ free_text_objects(text_object_count, text_objects);
+ text_object_count = 0;
+ text_objects = NULL;
+
+#ifdef MLDONKEY
+ ml_cleanup();
+#endif /* MLDONKEY */
if (text != original_text)
free(text);
default_fg_color = WhitePixel(display, screen);
default_bg_color = BlackPixel(display, screen);
default_out_color = BlackPixel(display, screen);
- draw_borders = 0;
draw_shades = 1;
+ draw_borders = 0;
+ draw_graph_borders = 1;
draw_outline = 0;
set_first_font("6x10");
gap_x = 5;
mlconfig.mldonkey_login = NULL;
mlconfig.mldonkey_password = NULL;
#endif
+
+#ifdef TCP_PORT_MONITOR
+ tcp_port_monitor_collection_args.min_port_monitors = MIN_PORT_MONITORS_DEFAULT;
+ tcp_port_monitor_args.min_port_monitor_connections = MIN_PORT_MONITOR_CONNECTIONS_DEFAULT;
+#endif
}
static void load_config_file(const char *f)
FILE *fp;
set_default_configurations();
-
- fp = open_file(f, 0);
+ fp = fopen(f, "r");
if (!fp)
return;
CONF("draw_borders") {
draw_borders = string_to_bool(value);
}
+ CONF("draw_graph_borders") {
+ draw_graph_borders = string_to_bool(value);
+ }
CONF("draw_shades") {
draw_shades = string_to_bool(value);
}
use_xft = string_to_bool(value);
}
CONF("font") {
- if (!use_xft) {
- if (value) {
- set_first_font(value);
- } else
- CONF_ERR;
- }
+ if (value) {
+ set_first_font(value);
+ } else
+ CONF_ERR;
}
CONF("xftalpha") {
if (value && font_count >= 0)
}
CONF("font") {
#endif
- if (value) {
- set_first_font(value);
- } else
- CONF_ERR;
+ if (use_xft) {
+ if (value) {
+ set_first_font(value);
+ } else
+ CONF_ERR;
+ }
}
CONF("gap_x") {
if (value)
fclose(fp);
return;
}
+#ifdef TCP_PORT_MONITOR
+ CONF("min_port_monitors")
+ {
+ if ( !value ||
+ (sscanf(value, "%d", &tcp_port_monitor_collection_args.min_port_monitors) != 1) ||
+ tcp_port_monitor_collection_args.min_port_monitors < 0 )
+ {
+ /* an error. use default, warn and continue. */
+ tcp_port_monitor_collection_args.min_port_monitors = MIN_PORT_MONITORS_DEFAULT;
+ CONF_ERR;
+ }
+ else if ( tcp_port_monitor_collection_args.min_port_monitors == 0 )
+ {
+ /* no error, just use default */
+ tcp_port_monitor_collection_args.min_port_monitors = MIN_PORT_MONITORS_DEFAULT;
+ }
+ /* else tcp_port_monitor_collection_args.min_port_monitors > 0 as per config */
+ }
+ CONF("min_port_monitor_connections")
+ {
+ if ( !value ||
+ (sscanf(value, "%d", &tcp_port_monitor_args.min_port_monitor_connections) != 1)
+ || tcp_port_monitor_args.min_port_monitor_connections < 0 )
+ {
+ /* an error. use default, warni and continue. */
+ tcp_port_monitor_args.min_port_monitor_connections = MIN_PORT_MONITOR_CONNECTIONS_DEFAULT;
+ CONF_ERR;
+ }
+ else if ( tcp_port_monitor_args.min_port_monitor_connections == 0 )
+ {
+ /* no error, just use default */
+ tcp_port_monitor_args.min_port_monitor_connections = MIN_PORT_MONITOR_CONNECTIONS_DEFAULT;
+ }
+ /* else tcp_port_monitor_args.min_port_monitor_connections > 0 as per config */
+ }
+#endif
else
ERR("%s: %d: no such configuration: '%s'", f, line, name);
int main(int argc, char **argv)
{
+ struct sigaction act, oact;
+
g_signal_pending=0;
memset(&info, 0, sizeof(info) );
+#ifdef TCP_PORT_MONITOR
+ tcp_port_monitor_collection_args.min_port_monitors = MIN_PORT_MONITORS_DEFAULT;
+ tcp_port_monitor_args.min_port_monitor_connections = MIN_PORT_MONITOR_CONNECTIONS_DEFAULT;
+#endif
+
/* handle command line parameters that don't change configs */
#ifdef X11
char *s;
init_X11();
#endif /* X11 */
- tmpstring1 = (char *)
- malloc(TEXT_BUFFER_SIZE);
- tmpstring2 = (char *)
- malloc(TEXT_BUFFER_SIZE);
-
/* load current_config or CONFIG_FILE */
#ifdef CONFIG_FILE
wm_class_name,
text_width + border_margin * 2 + 1,
text_height + border_margin * 2 + 1,
- on_bottom, fixed_pos, set_transparent, background_colour);
+ on_bottom, fixed_pos, set_transparent, background_colour, info.uname_s.nodename);
#else
init_window
(own_window,
text_width + border_margin * 2 + 1,
text_height + border_margin * 2 + 1,
- on_bottom, set_transparent, background_colour);
+ on_bottom, set_transparent, background_colour, info.uname_s.nodename);
#endif
}
/* Set signal handlers */
- if ( signal(SIGINT,signal_handler) == SIG_ERR ||
- signal(SIGUSR1,signal_handler) == SIG_ERR ||
- signal(SIGTERM,signal_handler) == SIG_ERR )
+ act.sa_handler = signal_handler;
+ sigemptyset(&act.sa_mask);
+ act.sa_flags = 0;
+#ifdef SA_RESTART
+ act.sa_flags |= SA_RESTART;
+#endif
+
+ if ( sigaction(SIGINT,&act,&oact) < 0 ||
+ sigaction(SIGUSR1,&act,&oact) < 0 ||
+ sigaction(SIGTERM,&act,&oact) < 0 )
{
ERR("error setting signal handler: %s", strerror(errno) );
}
+#ifdef INFOPIPE
+ /* joinable thread for infopipe activity */
+ pthread_attr_init(&info.infopipe.thread_attr);
+ pthread_attr_setdetachstate(&info.infopipe.thread_attr, PTHREAD_CREATE_JOINABLE);
+ /* init mutexex */
+ pthread_mutex_init(&info.infopipe.item_mutex, NULL);
+ pthread_mutex_init(&info.infopipe.runnable_mutex, NULL);
+ /* init runnable condition for worker thread */
+ pthread_mutex_lock(&info.infopipe.runnable_mutex);
+ info.infopipe.runnable=1;
+ pthread_mutex_unlock(&info.infopipe.runnable_mutex);
+ if (pthread_create(&info.infopipe.thread, &info.infopipe.thread_attr, infopipe_thread_func, NULL))
+ {
+ CRIT_ERR("unable to create infopipe thread!");
+ }
+#endif
+
main_loop();
- free(tmpstring1);
- free(tmpstring2);
+
+#ifdef INFOPIPE
+ /* signal infopipe worker thread to terminate */
+ pthread_mutex_lock(&info.infopipe.runnable_mutex);
+ info.infopipe.runnable=0;
+ pthread_mutex_unlock(&info.infopipe.runnable_mutex);
+ /* destroy thread attribute and wait for thread */
+ pthread_attr_destroy(&info.infopipe.thread_attr);
+ if (pthread_join(info.infopipe.thread, NULL))
+ {
+ ERR("error joining infopipe thread");
+ }
+ /* destroy mutexes */
+ pthread_mutex_destroy(&info.infopipe.item_mutex);
+ pthread_mutex_destroy(&info.infopipe.runnable_mutex);
+#endif
+
return 0;
}
projects / monky / blobdiff