-/*
- * Conky, a system monitor, based on torsmo
+/* Conky, a system monitor, based on torsmo
*
* Any original torsmo code is licensed under the BSD license
*
* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+ * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * (see AUTHORS)
* All rights reserved.
*
* This program is free software: you can redistribute it and/or modify
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- * $Id$
- */
+ * $Id$ */
#include "conky.h"
#include <stdio.h>
#include <sys/stat.h>
#include <netinet/in.h>
#include <netdb.h>
+#include <fcntl.h>
+#include <getopt.h>
#ifdef HAVE_ICONV
#include <iconv.h>
/* #define SIGNAL_BLOCKING */
#undef SIGNAL_BLOCKING
-static void print_version()
+static void print_version(void)
{
- printf("Conky %s compiled %s for %s\n",
- VERSION, BUILD_DATE, BUILD_ARCH);
+ printf("Conky %s compiled %s for %s\n", VERSION, BUILD_DATE, BUILD_ARCH);
- printf(
- "\nCompiled in features:\n\n"
+ printf("\nCompiled in features:\n\n"
+ "System config file: %s\n\n"
#ifdef X11
- " X11:\n"
+ " X11:\n"
# ifdef HAVE_XDAMAGE
- " * Xdamage extension\n"
+ " * Xdamage extension\n"
# endif /* HAVE_XDAMAGE */
# ifdef HAVE_XDBE
- " * Xdbe extension (double buffer)\n"
+ " * Xdbe extension (double buffer)\n"
# endif /* HAVE_XDBE */
# ifdef XFT
- " * xft\n"
+ " * xft\n"
# endif /* XFT */
-
#endif /* X11 */
- "\n Music detection:\n"
+ "\n Music detection:\n"
#ifdef AUDACIOUS
- " * audacious\n"
+ " * audacious\n"
#endif /* AUDACIOUS */
#ifdef BMPX
- " * bmpx\n"
+ " * bmpx\n"
#endif /* BMPX */
#ifdef MPD
- " * mpd\n"
+ " * mpd\n"
#endif /* MPD */
#ifdef XMMS2
- " * xmms2\n"
+ " * xmms2\n"
#endif /* XMMS2 */
- "\n General features:\n"
+ "\n General features:\n"
#ifdef HDDTEMP
- " * hddtemp\n"
+ " * hddtemp\n"
#endif /* HDDTEMP */
#ifdef TCP_PORT_MONITOR
- " * portmon\n"
+ " * portmon\n"
#endif /* TCP_PORT_MONITOR */
#ifdef RSS
- " * rss\n"
+ " * rss\n"
#endif /* RSS */
#ifdef HAVE_IWLIB
- " * wireless\n"
-#endif
- "\n");
+ " * wireless\n"
+#endif /* HAVE_IWLIB */
+#ifdef SMAPI
+ " * smapi\n"
+#endif /* SMAPI */
+ "", SYSTEM_CONFIG_FILE
+ );
exit(0);
}
+static const char *suffixes[] = { "B", "kiB", "MiB", "GiB", "TiB", "PiB", "" };
+
#ifdef X11
-/*
- * text size
- */
+/* text size */
static int text_start_x, text_start_y; /* text start position in window */
static int text_width, text_height;
enum alignment {
TOP_LEFT = 1,
TOP_RIGHT,
+ TOP_MIDDLE,
BOTTOM_LEFT,
BOTTOM_RIGHT,
+ BOTTOM_MIDDLE,
+ MIDDLE_LEFT,
+ MIDDLE_RIGHT,
NONE
};
-
/* for fonts */
struct font_list {
- char name[TEXT_BUFFER_SIZE];
+ char name[DEFAULT_TEXT_BUFFER_SIZE];
int num;
XFontStruct *font;
#ifdef XFT
XftFont *xftfont;
int font_alpha;
-#endif
-
+#endif
};
+
static int selected_font = 0;
static int font_count = -1;
struct font_list *fonts = NULL;
#ifdef XFT
-#define font_height() (use_xft ? (fonts[selected_font].xftfont->ascent + fonts[selected_font].xftfont->descent) : \
-(fonts[selected_font].font->max_bounds.ascent + fonts[selected_font].font->max_bounds.descent))
-#define font_ascent() (use_xft ? fonts[selected_font].xftfont->ascent : fonts[selected_font].font->max_bounds.ascent)
-#define font_descent() (use_xft ? fonts[selected_font].xftfont->descent : fonts[selected_font].font->max_bounds.descent)
+#define font_height() (use_xft ? (fonts[selected_font].xftfont->ascent + \
+ fonts[selected_font].xftfont->descent) \
+ : (fonts[selected_font].font->max_bounds.ascent + \
+ fonts[selected_font].font->max_bounds.descent))
+#define font_ascent() (use_xft ? fonts[selected_font].xftfont->ascent \
+ : fonts[selected_font].font->max_bounds.ascent)
+#define font_descent() (use_xft ? fonts[selected_font].xftfont->descent \
+ : fonts[selected_font].font->max_bounds.descent)
#else
-#define font_height() (fonts[selected_font].font->max_bounds.ascent + fonts[selected_font].font->max_bounds.descent)
+#define font_height() (fonts[selected_font].font->max_bounds.ascent + \
+ fonts[selected_font].font->max_bounds.descent)
#define font_ascent() fonts[selected_font].font->max_bounds.ascent
#define font_descent() fonts[selected_font].font->max_bounds.descent
#define MAX_FONTS 64 // hmm, no particular reason, just makes sense.
-
-static void set_font();
+static void set_font(void);
int addfont(const char *data_in)
{
if (fonts != NULL) {
free(fonts);
}
- if ((fonts = (struct font_list*)malloc(sizeof(struct font_list))) == NULL) {
+ if ((fonts = (struct font_list *) malloc(sizeof(struct font_list)))
+ == NULL) {
CRIT_ERR("malloc");
}
+ memset(fonts, 0, sizeof(struct font_list));
}
- fonts = realloc(fonts, (sizeof(struct font_list) * (font_count+1)));
+ fonts = realloc(fonts, (sizeof(struct font_list) * (font_count + 1)));
+ memset(&fonts[font_count], 0, sizeof(struct font_list));
if (fonts == NULL) {
CRIT_ERR("realloc in addfont");
}
- if (strlen(data_in) < TEXT_BUFFER_SIZE) { // must account for null terminator
- strncpy(fonts[font_count].name, data_in, TEXT_BUFFER_SIZE);
+ // must account for null terminator
+ if (strlen(data_in) < DEFAULT_TEXT_BUFFER_SIZE) {
+ strncpy(fonts[font_count].name, data_in, DEFAULT_TEXT_BUFFER_SIZE);
#ifdef XFT
fonts[font_count].font_alpha = 0xffff;
#endif
void set_first_font(const char *data_in)
{
if (font_count < 0) {
- if ((fonts = (struct font_list*)malloc(sizeof(struct font_list))) == NULL) {
+ if ((fonts = (struct font_list *) malloc(sizeof(struct font_list)))
+ == NULL) {
CRIT_ERR("malloc");
}
+ memset(fonts, 0, sizeof(struct font_list));
font_count++;
}
if (strlen(data_in) > 1) {
- strncpy(fonts[0].name, data_in, TEXT_BUFFER_SIZE-1);
+ strncpy(fonts[0].name, data_in, DEFAULT_TEXT_BUFFER_SIZE - 1);
#ifdef XFT
fonts[0].font_alpha = 0xffff;
#endif
}
}
-void free_fonts()
+void free_fonts(void)
{
int i;
- for (i=0;i<=font_count;i++) {
+
+ for (i = 0; i <= font_count; i++) {
#ifdef XFT
if (use_xft) {
XftFontClose(display, fonts[i].xftfont);
+ fonts[i].xftfont = 0;
} else
#endif
{
XFreeFont(display, fonts[i].font);
+ fonts[i].font = 0;
}
-}
+ }
free(fonts);
- fonts = NULL;
+ fonts = 0;
font_count = -1;
selected_font = 0;
- set_first_font("6x10");
}
-
-static void load_fonts()
+static void load_fonts(void)
{
int i;
- for (i=0; i <= font_count; i++) {
+
+ for (i = 0; i <= font_count; i++) {
#ifdef XFT
- /* load Xft font */
- if (use_xft) {
- /*if (fonts[i].xftfont != NULL && selected_font == 0) {
- XftFontClose(display, fonts[i].xftfont);
- }*/
- if ((fonts[i].xftfont =
- XftFontOpenName(display, screen, fonts[i].name)) != NULL)
+ /* load Xft font */
+ if (use_xft && fonts[i].xftfont) {
continue;
-
- ERR("can't load Xft font '%s'", fonts[i].name);
- if ((fonts[i].xftfont =
- XftFontOpenName(display, screen,
- "courier-12")) != NULL)
+ } else if (use_xft) {
+ /* if (fonts[i].xftfont != NULL && selected_font == 0) {
+ XftFontClose(display, fonts[i].xftfont);
+ } */
+ fonts[i].xftfont = XftFontOpenName(display, screen,
+ fonts[i].name);
+ if (fonts[i].xftfont != NULL) {
+ continue;
+ }
+
+ ERR("can't load Xft font '%s'", fonts[i].name);
+ if ((fonts[i].xftfont = XftFontOpenName(display, screen,
+ "courier-12")) != NULL) {
+ continue;
+ }
+
+ ERR("can't load Xft font '%s'", "courier-12");
+
+ if ((fonts[i].font = XLoadQueryFont(display, "fixed")) == NULL) {
+ CRIT_ERR("can't load font '%s'", "fixed");
+ }
+ use_xft = 0;
+
continue;
-
- ERR("can't load Xft font '%s'", "courier-12");
-
- if ((fonts[i].font = XLoadQueryFont(display, "fixed")) == NULL) {
- CRIT_ERR("can't load font '%s'", "fixed");
}
- use_xft = 0;
-
- continue;
- }
#endif
- /* load normal font */
-/* if (fonts[i].font != NULL)
- XFreeFont(display, fonts[i].font);*/
-
- if ((fonts[i].font = XLoadQueryFont(display, fonts[i].name)) == NULL) {
- ERR("can't load font '%s'", fonts[i].name);
- if ((fonts[i].font = XLoadQueryFont(display, "fixed")) == NULL) {
- CRIT_ERR("can't load font '%s'", "fixed");
- printf("loaded fixed?\n");
+ /* load normal font */
+ /* if (fonts[i].font != NULL) {
+ XFreeFont(display, fonts[i].font);
+ } */
+
+ if (fonts[i].font || (fonts[i].font = XLoadQueryFont(display, fonts[i].name)) == NULL) {
+ ERR("can't load font '%s'", fonts[i].name);
+ if ((fonts[i].font = XLoadQueryFont(display, "fixed")) == NULL) {
+ CRIT_ERR("can't load font '%s'", "fixed");
+ printf("loaded fixed?\n");
+ }
}
}
- }
}
#endif /* X11 */
/* create own window or draw stuff to root? */
static int set_transparent = 0;
-
#ifdef OWN_WINDOW
static int own_window = 0;
static int background_colour = 0;
+
/* fixed size/pos is set if wm/user changes them */
static int fixed_size = 0, fixed_pos = 0;
#endif
static int sensor_device;
#endif
-static long color0, color1, color2, color3, color4, color5, color6, color7, color8, color9;
+static long color0, color1, color2, color3, color4, color5, color6, color7,
+ color8, color9;
/* maximum number of special things, e.g. fonts, offsets, aligns, etc. */
static unsigned int max_specials = MAX_SPECIALS_DEFAULT;
static unsigned int max_user_text = MAX_USER_TEXT_DEFAULT;
/* maximum size of individual text buffers, ie $exec buffer size */
-unsigned int text_buffer_size = TEXT_BUFFER_SIZE;
+unsigned int text_buffer_size = DEFAULT_TEXT_BUFFER_SIZE;
#ifdef HAVE_ICONV
#define CODEPAGE_LENGTH 20
{
if (iconv_cd) {
long i;
+
for (i = 0; i < iconv_count; i++) {
if (iconv_cd[i]) {
iconv_close(*iconv_cd[i]);
free(iconv_cd);
}
iconv_cd = 0;
-
}
#endif
static int pad_percents = 0;
#ifdef TCP_PORT_MONITOR
-tcp_port_monitor_args_t tcp_port_monitor_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"
- "$hr\n"
- "${color grey}Uptime:$color $uptime\n"
- "${color grey}Frequency (in MHz):$color $freq\n"
- "${color grey}Frequency (in GHz):$color $freq_g\n"
- "${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4}\n"
- "${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4}\n"
- "${color grey}CPU Usage:$color $cpu% ${cpubar 4}\n"
- "${color grey}Processes:$color $processes ${color grey}Running:$color $running_processes\n"
- "$hr\n"
- "${color grey}File systems:\n"
- " / $color${fs_free /}/${fs_size /} ${fs_bar 6 /}\n"
- "${color grey}Networking:\n"
- " Up:$color ${upspeed eth0} k/s${color grey} - Down:$color ${downspeed eth0} k/s\n"
- "$hr\n"
-#ifdef MPD
- "${color grey}MPD: $mpd_status $mpd_artist - $mpd_title from $mpd_album at $mpd_vol\n"
- "Bitrate: $mpd_bitrate\n" "Progress: $mpd_bar\n"
-#endif
-#ifdef XMMS2
- "${color grey}XMMS2: $xmms2_status $xmms2_artist - $xmms2_title from $xmms2_album\n"
- "Progress: $xmms2_bar\n"
-#endif
- "${color grey}Name PID CPU% MEM%\n"
- " ${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}\n"
- " ${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}\n"
- " ${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}\n"
- " ${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}\n"
- "${tail /var/log/Xorg.0.log 3}";
-
-static char *text = original_text;
+static char *text = 0;
long text_lines;
static int total_updates;
{
int ret = 0;
FILE *where = fopen(f, "r");
+
if (where) {
char buf1[256], buf2[256];
+
while (fgets(buf1, 256, where)) {
sscanf(buf1, "%255s", buf2);
if (strstr(buf2, s)) {
return ret;
}
-
#ifdef X11
static inline int calc_text_width(const char *s, int l)
{
#ifdef XFT
if (use_xft) {
XGlyphInfo gi;
+
if (utf8_mode) {
- XftTextExtentsUtf8(display, fonts[selected_font].xftfont, (FcChar8 *)s, l, &gi);
+ XftTextExtentsUtf8(display, fonts[selected_font].xftfont,
+ (const FcChar8 *) s, l, &gi);
} else {
- XftTextExtents8(display, fonts[selected_font].xftfont, (FcChar8 *)s, l, &gi);
+ XftTextExtents8(display, fonts[selected_font].xftfont,
+ (const FcChar8 *) s, l, &gi);
}
return gi.xOff;
} else
/* formatted text to render on screen, generated in generate_text(),
* drawn in draw_stuff() */
-static char text_buffer[TEXT_BUFFER_SIZE * 4];
+static char *text_buffer;
/* special stuff in text_buffer */
#define SPECIAL_CHAR '\x01'
-enum {
+enum special_types {
HORIZONTAL_LINE,
STIPPLED_HR,
BAR,
double graph_scale;
int graph_width;
int scaled;
- short font_added;
- unsigned long first_colour; // for graph gradient
+ unsigned long first_colour; // for graph gradient
unsigned long last_colour;
+ short font_added;
};
-/* create specials array on heap instead of stack with introduction of max_specials */
+/* create specials array on heap instead of stack with introduction of
+ * max_specials */
static struct special_t *specials = NULL;
static unsigned int special_count;
+
#ifdef X11
static unsigned int special_index; /* used when drawing */
#endif /* X11 */
-#define MAX_GRAPH_DEPTH 256 /* why 256? cause an array of more then 256 doubles seems excessive, and who needs that kind of precision anyway? */
+/* why 256? cause an array of more then 256 doubles seems excessive,
+ * and who needs that kind of precision anyway? */
+#define MAX_GRAPH_DEPTH 256
-static struct special_t *new_special(char *buf, int t)
+static struct special_t *new_special(char *buf, enum special_types t)
{
- if (special_count >= max_specials)
+ if (special_count >= max_specials) {
CRIT_ERR("too many special things in text");
+ }
buf[0] = SPECIAL_CHAR;
buf[1] = '\0';
return &specials[special_count++];
}
-long fwd_fcharfind(FILE* fp, char val, unsigned int step) {
+long fwd_fcharfind(FILE *fp, char val, unsigned int step)
+{
#define BUFSZ 0x1000
long ret = -1;
unsigned int count = 0;
long orig_pos = ftell(fp);
long buf_pos = -1;
long buf_size = BUFSZ;
- char* cur_found = NULL;
- while(count < step) {
- if(cur_found == NULL) {
+ char *cur_found = NULL;
+
+ while (count < step) {
+ if (cur_found == NULL) {
buf_size = fread(buf, 1, buf_size, fp);
buf_pos = 0;
}
- cur_found = memchr(buf+buf_pos, val, buf_size-buf_pos);
- if(cur_found != NULL) {
- buf_pos = cur_found-buf+1;
+ cur_found = memchr(buf + buf_pos, val, buf_size - buf_pos);
+ if (cur_found != NULL) {
+ buf_pos = cur_found - buf + 1;
count++;
- }
- else {
- if(feof(fp))
+ } else {
+ if (feof(fp)) {
break;
+ }
}
}
- if(count == step)
+ if (count == step) {
ret = ftell(fp) - buf_size + buf_pos - 1;
+ }
fseek(fp, orig_pos, SEEK_SET);
return ret;
#undef BUFSZ
}
#ifndef HAVE_MEMRCHR
-void *
-memrchr (const void *buffer, int c, size_t n)
+void *memrchr(const void *buffer, char c, size_t n)
{
const unsigned char *p = buffer;
- for (p += n; n ; n--)
- if (*--p == c)
- return (void *)p;
+ for (p += n; n; n--) {
+ if (*--p == c) {
+ return (void *) p;
+ }
+ }
return NULL;
}
#endif
-long rev_fcharfind(FILE* fp, char val, unsigned int step) {
+
+long rev_fcharfind(FILE *fp, char val, unsigned int step)
+{
#define BUFSZ 0x1000
long ret = -1;
unsigned int count = 0;
long buf_pos = -1;
long file_pos = orig_pos;
long buf_size = BUFSZ;
- char* cur_found;
- while(count < step) {
- if(buf_pos <= 0) {
- if(file_pos > BUFSZ) {
- fseek(fp, file_pos-BUFSZ, SEEK_SET);
- }
- else {
+ char *cur_found;
+
+ while (count < step) {
+ if (buf_pos <= 0) {
+ if (file_pos > BUFSZ) {
+ fseek(fp, file_pos - BUFSZ, SEEK_SET);
+ } else {
buf_size = file_pos;
fseek(fp, 0, SEEK_SET);
}
file_pos = ftell(fp);
buf_pos = fread(buf, 1, buf_size, fp);
}
- cur_found =
- memrchr(
- buf,
- (int)val,
- (size_t)buf_pos);
- if(cur_found != NULL) {
- buf_pos = cur_found-buf;
+ cur_found = memrchr(buf, val, (size_t) buf_pos);
+ if (cur_found != NULL) {
+ buf_pos = cur_found - buf;
count++;
} else {
buf_pos = -1;
- if(file_pos == 0) {
+ if (file_pos == 0) {
break;
}
}
}
fseek(fp, orig_pos, SEEK_SET);
- if(count == step)
+ if (count == step) {
ret = file_pos + buf_pos;
+ }
return ret;
#undef BUFSZ
}
static void new_bar(char *buf, int w, int h, int usage)
{
struct special_t *s = new_special(buf, BAR);
+
s->arg = (usage > 255) ? 255 : ((usage < 0) ? 0 : usage);
s->width = w;
s->height = h;
static const char *scan_bar(const char *args, int *w, int *h)
{
- *w = 0; /* zero width means all space that is available */
+ /* zero width means all space that is available */
+ *w = 0;
*h = 6;
/* bar's argument is either height or height,width */
if (args) {
int n = 0;
- if (sscanf(args, "%d,%d %n", h, w, &n) <= 1)
+
+ if (sscanf(args, "%d,%d %n", h, w, &n) <= 1) {
sscanf(args, "%d %n", h, &n);
+ }
args += n;
}
static char *scan_font(const char *args)
{
- if (args && *args)
+ if (args && *args) {
return strdup(args);
-
+ }
+
return NULL;
}
#ifdef X11
-static void new_font(char *buf, char * args) {
+static void new_font(char *buf, char *args)
+{
if (args) {
struct special_t *s = new_special(buf, FONT);
- if (!s->font_added || strcmp(args, fonts[s->font_added].name)) {
+
+ if (s->font_added > font_count || !s->font_added || strncmp(args, fonts[s->font_added].name, DEFAULT_TEXT_BUFFER_SIZE)) {
int tmp = selected_font;
+
selected_font = s->font_added = addfont(args);
load_fonts();
selected_font = tmp;
} else {
struct special_t *s = new_special(buf, FONT);
int tmp = selected_font;
+
selected_font = s->font_added = 0;
- load_fonts();
selected_font = tmp;
}
}
inline void graph_append(struct special_t *graph, double f)
{
+ int i;
+
if (!graph->scaled && f > graph->graph_scale) {
f = graph->graph_scale;
}
- int i;
+
if (graph->scaled) {
graph->graph_scale = 1;
}
- graph->graph[0] = f; /* add new data */
- for (i = graph->graph_width - 1; i > 0; i--) { /* shift all the data by 1 */
+ graph->graph[0] = f; /* add new data */
+ /* shift all the data by 1 */
+ for (i = graph->graph_width - 1; i > 0; i--) {
graph->graph[i] = graph->graph[i - 1];
if (graph->scaled && graph->graph[i] > graph->graph_scale) {
- graph->graph_scale = graph->graph[i]; /* check if we need to update the scale */
+ /* check if we need to update the scale */
+ graph->graph_scale = graph->graph[i];
}
}
}
short colour_depth = 0;
-void set_up_gradient();
+void set_up_gradient(void);
/* precalculated: 31/255, and 63/255 */
#define CONST_8_TO_5_BITS 0.12156862745098
#define CONST_8_TO_6_BITS 0.247058823529412
-/* adjust color values depending on color depth*/
+/* adjust color values depending on color depth */
static unsigned int adjust_colors(unsigned int color)
{
double r, g, b;
+
if (colour_depth == 0) {
set_up_gradient();
}
r = (color & 0xff0000) >> 16;
g = (color & 0xff00) >> 8;
b = color & 0xff;
- color = (int)(r * CONST_8_TO_5_BITS) << 11;
- color |= (int)(g * CONST_8_TO_6_BITS) << 5;
- color |= (int)(b * CONST_8_TO_5_BITS);
+ color = (int) (r * CONST_8_TO_5_BITS) << 11;
+ color |= (int) (g * CONST_8_TO_6_BITS) << 5;
+ color |= (int) (b * CONST_8_TO_5_BITS);
}
return color;
}
-static void new_graph(char *buf, int w, int h, unsigned int first_colour, unsigned int second_colour, double i, int scale, int append)
+static void new_graph(char *buf, int w, int h, unsigned int first_colour,
+ unsigned int second_colour, double i, int scale, int append)
{
struct special_t *s = new_special(buf, GRAPH);
+
s->width = w;
if (s->graph == NULL) {
if (s->width > 0 && s->width < MAX_GRAPH_DEPTH) {
- s->graph_width = s->width/* - 2*/; // subtract 2 for the box
+ // subtract 2 for the box
+ s->graph_width = s->width /* - 2 */;
} else {
s->graph_width = MAX_GRAPH_DEPTH - 2;
}
} else {
s->scaled = 1;
}
- /*if (s->width) {
+ /* if (s->width) {
s->graph_width = s->width - 2; // subtract 2 for rectangle around
- }*/
+ } */
if (s->scaled) {
s->graph_scale = 1;
} else {
}
}
-static const char *scan_graph(const char *args, int *w, int *h, unsigned int *first_colour, unsigned int *last_colour, unsigned int *scale)
+static char *scan_graph(const char *args, int *w, int *h,
+ unsigned int *first_colour, unsigned int *last_colour,
+ unsigned int *scale)
{
- *w = 0; /* zero width means all space that is available */
+ char buf[64];
+
+ /* zero width means all space that is available */
+ *w = 0;
*h = 25;
*first_colour = 0;
*last_colour = 0;
+ *scale = 0;
/* graph's argument is either height or height,width */
if (args) {
- if (sscanf(args, "%*s %d,%d %x %x %i", h, w, first_colour, last_colour, scale) < 5) {
- if (sscanf(args, "%*s %d,%d %x %x", h, w, first_colour, last_colour) < 4) {
- *scale = 0;
- if (sscanf(args, "%d,%d %x %x %i", h, w, first_colour, last_colour, scale) < 5) {
- *scale = 0;
- if (sscanf(args, "%d,%d %x %x", h, w, first_colour, last_colour) < 4) {
- *w = 0;
- *h = 25;
- if (sscanf(args, "%*s %x %x %i", first_colour, last_colour, scale) < 3) {
- *w = 0;
- *h = 25;
- *scale = 0;
- if (sscanf(args, "%*s %x %x", first_colour, last_colour) < 2) {
- *w = 0;
- *h = 25;
- if (sscanf(args, "%x %x %i", first_colour, last_colour, scale) < 3) {
- *first_colour = 0;
- *last_colour = 0;
- *scale = 0;
- if (sscanf(args, "%x %x", first_colour, last_colour) < 2) {
- *first_colour = 0;
- *last_colour = 0;
- if (sscanf(args, "%d,%d %i", h, w, scale) < 3) {
- *first_colour = 0;
- *last_colour = 0;
- *scale = 0;
- if (sscanf(args, "%d,%d", h, w) < 2) {
- *first_colour = 0;
- *last_colour = 0;
- sscanf(args, "%*s %d,%d", h, w);
- }}}}}}}}}}} // haha
- return args;
-}
+ if (sscanf(args, "%d,%d %x %x %u", h, w, first_colour, last_colour,
+ scale) == 5) {
+ return NULL;
+ }
+ *scale = 0;
+ if (sscanf(args, "%d,%d %x %x", h, w, first_colour, last_colour) == 4) {
+ return NULL;
+ }
+ if (sscanf(args, "%63s %d,%d %x %x %u", buf, h, w, first_colour,
+ last_colour, scale) == 6) {
+ return strdup(buf);
+ }
+ *scale = 0;
+ if (sscanf(args, "%63s %d,%d %x %x", buf, h, w, first_colour,
+ last_colour) == 5) {
+ return strdup(buf);
+ }
+ buf[0] = '\0';
+ *h = 25;
+ *w = 0;
+ if (sscanf(args, "%x %x %u", first_colour, last_colour, scale) == 3) {
+ return NULL;
+ }
+ *scale = 0;
+ if (sscanf(args, "%x %x", first_colour, last_colour) == 2) {
+ return NULL;
+ }
+ if (sscanf(args, "%63s %x %x %u", buf, first_colour, last_colour,
+ scale) == 4) {
+ return strdup(buf);
+ }
+ *scale = 0;
+ if (sscanf(args, "%63s %x %x", buf, first_colour, last_colour) == 3) {
+ return strdup(buf);
+ }
+ buf[0] = '\0';
+ *first_colour = 0;
+ *last_colour = 0;
+ if (sscanf(args, "%d,%d %u", h, w, scale) == 3) {
+ return NULL;
+ }
+ *scale = 0;
+ if (sscanf(args, "%d,%d", h, w) == 2) {
+ return NULL;
+ }
+ if (sscanf(args, "%63s %d,%d %u", buf, h, w, scale) < 4) {
+ *scale = 0;
+ //TODO: check the return value and throw an error?
+ sscanf(args, "%63s %d,%d", buf, h, w);
+ }
+
+ return strdup(buf);
+ }
+ if (buf[0] == '\0') {
+ return NULL;
+ } else {
+ return strdup(buf);
+ }
+}
static inline void new_hr(char *buf, int a)
{
static inline void new_stippled_hr(char *buf, int a, int b)
{
struct special_t *s = new_special(buf, STIPPLED_HR);
+
s->height = b;
s->arg = a;
}
new_special(buf, GOTO)->arg = c;
}
-static inline void new_tab(char *buf, int a, int b) {
+static inline void new_tab(char *buf, int a, int b)
+{
struct special_t *s = new_special(buf, TAB);
+
s->width = a;
s->arg = b;
}
/* quite boring functions */
-static inline void for_each_line(char *b, void (*f) (char *))
+static inline void for_each_line(char *b, void f(char *))
{
char *ps, *pe;
}
}
- if (ps < pe)
+ if (ps < pe) {
f(ps);
+ }
}
static void convert_escapes(char *buf)
while (*s) {
if (*s == '\\') {
s++;
- if (*s == 'n')
+ if (*s == 'n') {
*p++ = '\n';
- else if (*s == '\\')
+ } else if (*s == '\\') {
*p++ = '\\';
+ }
s++;
- } else
+ } else {
*p++ = *s++;
+ }
}
*p = '\0';
}
+/* Prints anything normally printed with snprintf according to the current value
+ * of use_spacer. Actually slightly more flexible than snprintf, as you can
+ * safely specify the destination buffer as one of your inputs. */
+static int spaced_print(char *buf, int size, const char *format, int width,
+ const char *func_name, ...) {
+ int len;
+ va_list argp;
+ char *tempbuf;
+
+ if (size < 1) {
+ return 0;
+ }
+ tempbuf = malloc(size * sizeof(char));
+
+ // Passes the varargs along to vsnprintf
+ va_start(argp, func_name);
+ vsnprintf(tempbuf, size, format, argp);
+ va_end(argp);
+
+ switch (use_spacer) {
+ case NO_SPACER:
+ len = snprintf(buf, size, "%s", tempbuf);
+ break;
+ case LEFT_SPACER:
+ len = snprintf(buf, size, "%*s", width - 1, tempbuf);
+ break;
+ case RIGHT_SPACER:
+ len = snprintf(buf, size, "%-*s", width - 1, tempbuf);
+ break;
+ default:
+ CRIT_ERR("%s encountered invalid use_spacer value (%d)", func_name,
+ use_spacer);
+ }
+
+ free(tempbuf);
+
+ return len;
+}
+
/* converts from bytes to human readable format (k, M, G, T) */
-static void human_readable(long long a, char *buf, int size)
+static void human_readable(long long num, char *buf, int size, const char *func_name)
{
- // Strange conditional due to possible overflows
- if(a / 1024 / 1024 / 1024.0 > 1024.0){
- snprintf(buf, size, "%.2fTiB", (a / 1024 / 1024 / 1024) / 1024.0);
+ const char **suffix = suffixes;
+ float fnum;
+ int precision, len;
+ static const int WIDTH = 10, SHORT_WIDTH = 8;
+
+ if (num < 1024LL) {
+ if (short_units) {
+ spaced_print(buf, size, "%lld%c", SHORT_WIDTH, func_name, num,
+ **suffix);
+ } else {
+ spaced_print(buf, size, "%lld%s", WIDTH, func_name, num, *suffix);
+ }
+ return;
}
- else if (a >= 1024 * 1024 * 1024) {
- snprintf(buf, size, "%.2fGiB", (a / 1024 / 1024) / 1024.0);
+
+ while (num / 1024 >= 1000LL && **(suffix + 2)) {
+ num /= 1024;
+ suffix++;
}
- else if (a >= 1024 * 1024) {
- double m = (a / 1024) / 1024.0;
- if (m >= 100.0)
- snprintf(buf, size, "%.0fMiB", m);
- else
- snprintf(buf, size, "%.1fMiB", m);
- } else if (a >= 1024)
- snprintf(buf, size, "%LdKiB", a / (long long) 1024);
- else
- snprintf(buf, size, "%LdB", a);
+
+ suffix++;
+ fnum = num / 1024.0;
+
+ precision = 3;
+ do {
+ precision--;
+ if (precision < 0) {
+ break;
+ }
+ if (short_units) {
+ len = spaced_print(buf, size, "%.*f%c", SHORT_WIDTH, func_name,
+ precision, fnum, **suffix);
+ } else {
+ len = spaced_print(buf, size, "%.*f%s", WIDTH, func_name, precision,
+ fnum, *suffix);
+ }
+ } while (len >= (short_units ? SHORT_WIDTH : WIDTH) || len >= size);
}
/* text handling */
enum text_object_type {
OBJ_addr,
+#if defined(__linux__)
+ OBJ_addrs,
+#endif /* __linux__ */
#ifndef __OpenBSD__
OBJ_acpiacadapter,
OBJ_adt746xcpu,
OBJ_color7,
OBJ_color8,
OBJ_color9,
+ OBJ_conky_version,
+ OBJ_conky_build_date,
+ OBJ_conky_build_arch,
OBJ_font,
OBJ_cpu,
OBJ_cpubar,
OBJ_execgraph,
OBJ_execibar,
OBJ_execigraph,
+ OBJ_execp,
+ OBJ_execpi,
OBJ_freq,
OBJ_freq_g,
OBJ_freq_dyn,
OBJ_fs_free,
OBJ_fs_free_perc,
OBJ_fs_size,
+ OBJ_fs_type,
OBJ_fs_used,
OBJ_fs_used_perc,
OBJ_goto,
OBJ_platform,
OBJ_hwmon,
#if defined(__linux__)
+ OBJ_disk_protect,
OBJ_i8k_version,
OBJ_i8k_bios,
OBJ_i8k_serial,
OBJ_i8k_right_fan_status,
OBJ_i8k_left_fan_rpm,
OBJ_i8k_right_fan_rpm,
- OBJ_i8k_ac_status,
+ OBJ_i8k_ac_status,
OBJ_i8k_buttons_status,
OBJ_ibm_fan,
OBJ_ibm_temps,
OBJ_ibm_volume,
OBJ_ibm_brightness,
- OBJ_pb_battery,
+ OBJ_if_up,
+ OBJ_if_gw,
+ OBJ_ioscheduler,
+ OBJ_gw_iface,
+ OBJ_gw_ip,
+ OBJ_laptop_mode,
+ OBJ_pb_battery,
OBJ_voltage_mv,
OBJ_voltage_v,
OBJ_wireless_essid,
OBJ_mixerbar,
OBJ_mixerlbar,
OBJ_mixerrbar,
+ OBJ_nameserver,
OBJ_new_mails,
OBJ_nodename,
OBJ_pre_exec,
OBJ_swapmax,
OBJ_swapperc,
OBJ_sysname,
- OBJ_temp1, /* i2c is used instead in these */
+ OBJ_temp1, /* i2c is used instead in these */
OBJ_temp2,
OBJ_text,
OBJ_time,
OBJ_upspeedgraph,
OBJ_uptime,
OBJ_uptime_short,
+ OBJ_user_names,
+ OBJ_user_terms,
+ OBJ_user_times,
+ OBJ_user_number,
OBJ_imap,
OBJ_imap_messages,
OBJ_imap_unseen,
OBJ_pop3,
OBJ_pop3_unseen,
OBJ_pop3_used,
-#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
+ || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
OBJ_apm_adapter,
OBJ_apm_battery_time,
OBJ_apm_battery_life,
OBJ_mpd_percent,
OBJ_mpd_smart,
#endif
+ OBJ_music_player_interval,
#ifdef XMMS2
- OBJ_xmms2_artist,
- OBJ_xmms2_album,
- OBJ_xmms2_title,
- OBJ_xmms2_genre,
- OBJ_xmms2_comment,
- OBJ_xmms2_decoder,
- OBJ_xmms2_transport,
- OBJ_xmms2_url,
- OBJ_xmms2_date,
- OBJ_xmms2_tracknr,
- OBJ_xmms2_bitrate,
- OBJ_xmms2_id,
- OBJ_xmms2_duration,
- OBJ_xmms2_elapsed,
- OBJ_xmms2_size,
+ OBJ_xmms2_artist,
+ OBJ_xmms2_album,
+ OBJ_xmms2_title,
+ OBJ_xmms2_genre,
+ OBJ_xmms2_comment,
+ OBJ_xmms2_url,
+ OBJ_xmms2_date,
+ OBJ_xmms2_tracknr,
+ OBJ_xmms2_bitrate,
+ OBJ_xmms2_id,
+ OBJ_xmms2_duration,
+ OBJ_xmms2_elapsed,
+ OBJ_xmms2_size,
OBJ_xmms2_percent,
OBJ_xmms2_status,
OBJ_xmms2_bar,
OBJ_xmms2_smart,
+ OBJ_xmms2_playlist,
+ OBJ_xmms2_timesplayed,
#endif
#ifdef AUDACIOUS
OBJ_audacious_status,
#ifdef HDDTEMP
OBJ_hddtemp,
#endif
+#ifdef SMAPI
+ OBJ_smapi,
+ OBJ_smapi_bat_bar,
+ OBJ_smapi_bat_perc,
+ OBJ_if_smapi_bat_installed,
+#endif
OBJ_entropy_avail,
OBJ_entropy_poolsize,
OBJ_entropy_bar
};
struct text_object {
- int type;
- int a, b;
- long line;
- unsigned int c, d, e;
- float f;
- char global_mode;
union {
- char *s; /* some string */
- int i; /* some integer */
- long l; /* some other integer */
+ char *s; /* some string */
+ int i; /* some integer */
+ long l; /* some other integer */
unsigned int sensor;
- struct net_stat *net;
+ struct net_stat *net;
struct fs_stat *fs;
+ struct diskio_stat *diskio;
unsigned char loadavg[3];
unsigned int cpu_index;
struct mail_s *mail;
} mboxscan;
struct {
- char *tz; /* timezone variable */
- char *fmt; /* time display formatting */
+ char *tz; /* timezone variable */
+ char *fmt; /* time display formatting */
} tztime;
struct {
struct fs_stat *fs;
int w, h;
- } fsbar; /* 3 */
+ } fsbar; /* 3 */
struct {
int l;
int w, h;
- } mixerbar; /* 3 */
+ } mixerbar; /* 3 */
struct {
int fd;
double last_update;
float interval;
char *buffer;
+ /* If not -1, a file descriptor to read from when
+ * logfile is a FIFO. */
+ int fd;
} tail;
struct {
char *cmd;
char *buffer;
double data;
- } execi; /* 5 */
+ } execi; /* 5 */
struct {
float interval;
struct {
int a, b;
- } pair; /* 2 */
+ } pair; /* 2 */
#ifdef TCP_PORT_MONITOR
struct {
- in_port_t port_range_begin; /* starting port to monitor */
- in_port_t port_range_end; /* ending port to monitor */
- int item; /* enum from libtcp-portmon.h, e.g. COUNT, etc. */
- int connection_index; /* 0 to n-1 connections. */
+ /* starting port to monitor */
+ in_port_t port_range_begin;
+ /* ending port to monitor */
+ in_port_t port_range_end;
+ /* enum from libtcp-portmon.h, e.g. COUNT, etc. */
+ int item;
+ /* 0 to n-1 connections. */
+ int connection_index;
} tcp_port_monitor;
#endif
#ifdef HDDTEMP
char *addr;
int port;
char *dev;
- } hddtemp; /* 2 */
+ } hddtemp; /* 2 */
#endif
#ifdef RSS
struct {
int delay;
} rss;
#endif
+ struct local_mail_s local_mail;
} data;
+ int type;
+ int a, b;
+ long line;
+ unsigned int c, d, e;
+ float f;
+ char global_mode;
};
struct text_object_list {
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);
+static unsigned int global_text_object_count;
+static struct text_object *global_text_objects;
+static void generate_text_internal(char *p, int p_max_size,
+ struct text_object *objs, unsigned int object_count,
+ struct information *cur);
#define MAXDATASIZE 1000
#define POP3 1
#define IMAP 2
-struct mail_s* parse_mail_args(char type, const char *arg) {
+struct mail_s *parse_mail_args(char type, const char *arg)
+{
struct mail_s *mail;
+ char *tmp;
+
mail = malloc(sizeof(struct mail_s));
memset(mail, 0, sizeof(struct mail_s));
- char *tmp;
- if (sscanf(arg, "%128s %128s %128s", mail->host, mail->user, mail->pass) != 3) {
+
+ if (sscanf(arg, "%128s %128s %128s", mail->host, mail->user, mail->pass)
+ != 3) {
if (type == POP3) {
ERR("Scanning IMAP args failed");
- } else if (type == IMAP) {
+ } else if (type == IMAP) {
ERR("Scanning POP3 args failed");
}
}
if (mail->pass[0] == '*' && mail->pass[1] == '\0') {
int fp = fileno(stdin);
struct termios term;
+
tcgetattr(fp, &term);
term.c_lflag &= ~ECHO;
tcsetattr(fp, TCSANOW, &term);
}
tmp = strstr(arg, "-e ");
if (tmp) {
- tmp += 3;
int len = 1024;
+ tmp += 3;
+
if (tmp[0] == '\'') {
- len = strstr(tmp+1, "'") - tmp - 1;
+ len = strstr(tmp + 1, "'") - tmp - 1;
if (len > 1024) {
len = 1024;
}
}
- strncpy(mail->command, tmp+1, len);
+ strncpy(mail->command, tmp + 1, len);
} else {
mail->command[0] = '\0';
}
return mail;
}
-void *imap_thread(struct mail_s* mail)
+void *imap_thread(void *arg)
{
int sockfd, numbytes;
char recvbuf[MAXDATASIZE];
struct stat stat_buf;
struct hostent *he;
struct sockaddr_in their_addr; // connector's address information
- if ((he = gethostbyname(mail->host)) == NULL) { // get the host info
+ struct mail_s *mail = (struct mail_s *)arg;
+
+ if ((he = gethostbyname(mail->host)) == NULL) { // get the host info
herror("gethostbyname");
exit(1);
}
while (fail < 5) {
+ struct timeval timeout;
+ int res;
+ fd_set fdset;
+
if (fail > 0) {
- ERR("Trying IMAP connection again for %s@%s (try %i/5)", mail->user, mail->host, fail + 1);
+ ERR("Trying IMAP connection again for %s@%s (try %i/5)",
+ mail->user, mail->host, fail + 1);
}
if ((sockfd = socket(PF_INET, SOCK_STREAM, 0)) == -1) {
perror("socket");
goto next_iteration;
}
- their_addr.sin_family = AF_INET; // host byte order
- their_addr.sin_port = htons(mail->port); // short, network byte order
+ // host byte order
+ their_addr.sin_family = AF_INET;
+ // short, network byte order
+ their_addr.sin_port = htons(mail->port);
their_addr.sin_addr = *((struct in_addr *) he->h_addr);
- memset(&(their_addr.sin_zero), '\0', 8); // zero the rest of the struct
+ // zero the rest of the struct
+ memset(&(their_addr.sin_zero), '\0', 8);
- if (connect
- (sockfd, (struct sockaddr *) &their_addr,
- sizeof(struct sockaddr)) == -1) {
+ if (connect(sockfd, (struct sockaddr *) &their_addr,
+ sizeof(struct sockaddr)) == -1) {
perror("connect");
fail++;
goto next_iteration;
}
- struct timeval timeout;
- int res;
- fd_set fdset;
+
timeout.tv_sec = 60; // 60 second timeout i guess
timeout.tv_usec = 0;
FD_ZERO(&fdset);
FD_SET(sockfd, &fdset);
res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
if (res > 0) {
- if ((numbytes =
- recv(sockfd, recvbuf, MAXDATASIZE - 1,
- 0)) == -1) {
+ if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
perror("recv");
fail++;
goto next_iteration;
goto next_iteration;
}
strncpy(sendbuf, "a1 login ", MAXDATASIZE);
- strncat(sendbuf, mail->user,
- MAXDATASIZE - strlen(sendbuf) - 1);
+ strncat(sendbuf, mail->user, MAXDATASIZE - strlen(sendbuf) - 1);
strncat(sendbuf, " ", MAXDATASIZE - strlen(sendbuf) - 1);
- strncat(sendbuf, mail->pass,
- MAXDATASIZE - strlen(sendbuf) - 1);
- strncat(sendbuf, "\n", MAXDATASIZE - strlen(sendbuf) - 1);
+ strncat(sendbuf, mail->pass, MAXDATASIZE - strlen(sendbuf) - 1);
+ strncat(sendbuf, "\r\n", MAXDATASIZE - strlen(sendbuf) - 1);
if (send(sockfd, sendbuf, strlen(sendbuf), 0) == -1) {
perror("send a1");
fail++;
FD_SET(sockfd, &fdset);
res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
if (res > 0) {
- if ((numbytes =
- recv(sockfd, recvbuf, MAXDATASIZE - 1,
- 0)) == -1) {
+ if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
perror("recv a1");
fail++;
goto next_iteration;
goto next_iteration;
}
strncpy(sendbuf, "a2 STATUS ", MAXDATASIZE);
- strncat(sendbuf, mail->folder,
- MAXDATASIZE - strlen(sendbuf) - 1);
- strncat(sendbuf, " (MESSAGES UNSEEN)\n",
+ strncat(sendbuf, mail->folder, MAXDATASIZE - strlen(sendbuf) - 1);
+ strncat(sendbuf, " (MESSAGES UNSEEN)\r\n",
MAXDATASIZE - strlen(sendbuf) - 1);
if (send(sockfd, sendbuf, strlen(sendbuf), 0) == -1) {
perror("send a2");
FD_SET(sockfd, &fdset);
res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
if (res > 0) {
- if ((numbytes =
- recv(sockfd, recvbuf, MAXDATASIZE - 1,
- 0)) == -1) {
+ if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
perror("recv a2");
fail++;
goto next_iteration;
fail++;
goto next_iteration;
} else {
- timed_thread_lock (mail->p_timed_thread);
- sscanf(reply, "MESSAGES %lu UNSEEN %lu",
- &mail->messages,
- &mail->unseen);
- timed_thread_unlock (mail->p_timed_thread);
+ timed_thread_lock(mail->p_timed_thread);
+ sscanf(reply, "MESSAGES %lu UNSEEN %lu", &mail->messages,
+ &mail->unseen);
+ timed_thread_unlock(mail->p_timed_thread);
}
- strncpy(sendbuf, "a3 logout\n", MAXDATASIZE);
+ strncpy(sendbuf, "a3 logout\r\n", MAXDATASIZE);
if (send(sockfd, sendbuf, strlen(sendbuf), 0) == -1) {
perror("send a3");
fail++;
FD_SET(sockfd, &fdset);
res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
if (res > 0) {
- if ((numbytes =
- recv(sockfd, recvbuf, MAXDATASIZE - 1,
- 0)) == -1) {
+ if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
perror("recv a3");
fail++;
goto next_iteration;
fail++;
goto next_iteration;
}
- if (strlen(mail->command) > 1 && (mail->unseen > old_unseen || (mail->messages > old_messages && mail->unseen > 0))) { // new mail goodie
+ if (strlen(mail->command) > 1 && (mail->unseen > old_unseen
+ || (mail->messages > old_messages && mail->unseen > 0))) {
+ // new mail goodie
if (system(mail->command) == -1) {
perror("system()");
}
old_unseen = mail->unseen;
old_messages = mail->messages;
next_iteration:
- if ((fstat(sockfd, &stat_buf)==0) && S_ISSOCK(stat_buf.st_mode))
- /* if a valid socket, close it */
- close(sockfd);
- if (timed_thread_test (mail->p_timed_thread))
- timed_thread_exit (mail->p_timed_thread);
+ if ((fstat(sockfd, &stat_buf) == 0) && S_ISSOCK(stat_buf.st_mode)) {
+ /* if a valid socket, close it */
+ close(sockfd);
+ }
+ if (timed_thread_test(mail->p_timed_thread)) {
+ timed_thread_exit(mail->p_timed_thread);
+ }
}
+ mail->unseen = 0;
+ mail->messages = 0;
return 0;
}
-void *pop3_thread(struct mail_s *mail)
+void *pop3_thread(void *arg)
{
int sockfd, numbytes;
char recvbuf[MAXDATASIZE];
struct stat stat_buf;
struct hostent *he;
struct sockaddr_in their_addr; // connector's address information
- if ((he = gethostbyname(mail->host)) == NULL) { // get the host info
+ struct mail_s *mail = (struct mail_s *)arg;
+
+ if ((he = gethostbyname(mail->host)) == NULL) { // get the host info
herror("gethostbyname");
exit(1);
}
while (fail < 5) {
+ struct timeval timeout;
+ int res;
+ fd_set fdset;
+
if (fail > 0) {
- ERR("Trying POP3 connection again for %s@%s (try %i/5)", mail->user, mail->host, fail + 1);
+ ERR("Trying POP3 connection again for %s@%s (try %i/5)",
+ mail->user, mail->host, fail + 1);
}
if ((sockfd = socket(PF_INET, SOCK_STREAM, 0)) == -1) {
perror("socket");
goto next_iteration;
}
- their_addr.sin_family = AF_INET; // host byte order
- their_addr.sin_port = htons(mail->port); // short, network byte order
+ // host byte order
+ their_addr.sin_family = AF_INET;
+ // short, network byte order
+ their_addr.sin_port = htons(mail->port);
their_addr.sin_addr = *((struct in_addr *) he->h_addr);
- memset(&(their_addr.sin_zero), '\0', 8); // zero the rest of the struct
+ // zero the rest of the struct
+ memset(&(their_addr.sin_zero), '\0', 8);
- if (connect
- (sockfd, (struct sockaddr *) &their_addr,
- sizeof(struct sockaddr)) == -1) {
+ if (connect(sockfd, (struct sockaddr *) &their_addr,
+ sizeof(struct sockaddr)) == -1) {
perror("connect");
fail++;
goto next_iteration;
}
- struct timeval timeout;
- int res;
- fd_set fdset;
+
timeout.tv_sec = 60; // 60 second timeout i guess
timeout.tv_usec = 0;
FD_ZERO(&fdset);
FD_SET(sockfd, &fdset);
res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
if (res > 0) {
- if ((numbytes =
- recv(sockfd, recvbuf, MAXDATASIZE - 1,
- 0)) == -1) {
+ if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
perror("recv");
fail++;
goto next_iteration;
goto next_iteration;
}
strncpy(sendbuf, "USER ", MAXDATASIZE);
- strncat(sendbuf, mail->user,
- MAXDATASIZE - strlen(sendbuf) - 1);
- strncat(sendbuf, "\n", MAXDATASIZE - strlen(sendbuf) - 1);
+ strncat(sendbuf, mail->user, MAXDATASIZE - strlen(sendbuf) - 1);
+ strncat(sendbuf, "\r\n", MAXDATASIZE - strlen(sendbuf) - 1);
if (send(sockfd, sendbuf, strlen(sendbuf), 0) == -1) {
perror("send USER");
fail++;
FD_SET(sockfd, &fdset);
res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
if (res > 0) {
- if ((numbytes =
- recv(sockfd, recvbuf, MAXDATASIZE - 1,
- 0)) == -1) {
+ if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
perror("recv USER");
fail++;
goto next_iteration;
goto next_iteration;
}
strncpy(sendbuf, "PASS ", MAXDATASIZE);
- strncat(sendbuf, mail->pass,
- MAXDATASIZE - strlen(sendbuf) - 1);
- strncat(sendbuf, "\n", MAXDATASIZE - strlen(sendbuf) - 1);
+ strncat(sendbuf, mail->pass, MAXDATASIZE - strlen(sendbuf) - 1);
+ strncat(sendbuf, "\r\n", MAXDATASIZE - strlen(sendbuf) - 1);
if (send(sockfd, sendbuf, strlen(sendbuf), 0) == -1) {
perror("send PASS");
fail++;
FD_SET(sockfd, &fdset);
res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
if (res > 0) {
- if ((numbytes =
- recv(sockfd, recvbuf, MAXDATASIZE - 1,
- 0)) == -1) {
+ if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
perror("recv PASS");
fail++;
goto next_iteration;
fail++;
goto next_iteration;
}
- strncpy(sendbuf, "STAT\n", MAXDATASIZE);
+ strncpy(sendbuf, "STAT\r\n", MAXDATASIZE);
if (send(sockfd, sendbuf, strlen(sendbuf), 0) == -1) {
perror("send STAT");
fail++;
FD_SET(sockfd, &fdset);
res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
if (res > 0) {
- if ((numbytes =
- recv(sockfd, recvbuf, MAXDATASIZE - 1,
- 0)) == -1) {
+ if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
perror("recv STAT");
fail++;
goto next_iteration;
fail++;
goto next_iteration;
} else {
- timed_thread_lock (mail->p_timed_thread);
- sscanf(reply, "%lu %lu", &mail->unseen,
- &mail->used);
- timed_thread_unlock (mail->p_timed_thread);
+ timed_thread_lock(mail->p_timed_thread);
+ sscanf(reply, "%lu %lu", &mail->unseen, &mail->used);
+ timed_thread_unlock(mail->p_timed_thread);
}
- strncpy(sendbuf, "QUIT\n", MAXDATASIZE);
+ strncpy(sendbuf, "QUIT\r\n", MAXDATASIZE);
if (send(sockfd, sendbuf, strlen(sendbuf), 0) == -1) {
perror("send QUIT");
fail++;
FD_SET(sockfd, &fdset);
res = select(sockfd + 1, &fdset, NULL, NULL, &timeout);
if (res > 0) {
- if ((numbytes =
- recv(sockfd, recvbuf, MAXDATASIZE - 1,
- 0)) == -1) {
+ if ((numbytes = recv(sockfd, recvbuf, MAXDATASIZE - 1, 0)) == -1) {
perror("recv QUIT");
fail++;
goto next_iteration;
fail++;
goto next_iteration;
}
- if (strlen(mail->command) > 1 && mail->unseen > old_unseen) { // new mail goodie
+ if (strlen(mail->command) > 1 && mail->unseen > old_unseen) {
+ // new mail goodie
if (system(mail->command) == -1) {
perror("system()");
}
fail = 0;
old_unseen = mail->unseen;
next_iteration:
- if ((fstat(sockfd, &stat_buf)==0) && S_ISSOCK(stat_buf.st_mode))
- /* if a valid socket, close it */
- close(sockfd);
- if (timed_thread_test (mail->p_timed_thread))
- timed_thread_exit (mail->p_timed_thread);
+ if ((fstat(sockfd, &stat_buf) == 0) && S_ISSOCK(stat_buf.st_mode)) {
+ /* if a valid socket, close it */
+ close(sockfd);
+ }
+ if (timed_thread_test(mail->p_timed_thread)) {
+ timed_thread_exit(mail->p_timed_thread);
+ }
}
+ mail->unseen = 0;
+ mail->used = 0;
return 0;
}
-
-void *threaded_exec(struct text_object *obj) {
+void *threaded_exec(void *arg)
+{
+ FILE *fp;
+ char *p2;
+ int n2;
+ struct text_object *obj = (struct text_object *)arg;
while (1) {
- char *p2 = obj->data.texeci.buffer;
- FILE *fp = popen(obj->data.texeci.cmd,"r");
- timed_thread_lock (obj->data.texeci.p_timed_thread);
- int n2 = fread(p2, 1, text_buffer_size, fp);
- (void) pclose(fp);
+ p2 = obj->data.texeci.buffer;
+ fp = popen(obj->data.texeci.cmd, "r");
+
+ timed_thread_lock(obj->data.texeci.p_timed_thread);
+ n2 = fread(p2, 1, text_buffer_size, fp);
+
+ pclose(fp);
p2[n2] = '\0';
if (n2 && p2[n2 - 1] == '\n') {
p2[n2 - 1] = '\0';
}
p2++;
}
- timed_thread_unlock (obj->data.texeci.p_timed_thread);
- if (timed_thread_test (obj->data.texeci.p_timed_thread))
- timed_thread_exit (obj->data.texeci.p_timed_thread);
+ timed_thread_unlock(obj->data.texeci.p_timed_thread);
+ if (timed_thread_test(obj->data.texeci.p_timed_thread)) {
+ timed_thread_exit(obj->data.texeci.p_timed_thread);
+ }
}
return 0;
}
-static struct text_object *new_text_object_internal()
+static struct text_object *new_text_object_internal(void)
{
struct text_object *obj = malloc(sizeof(struct text_object));
memset(obj, 0, sizeof(struct text_object));
static void free_text_objects(unsigned int count, struct text_object *objs)
{
unsigned int i;
+
for (i = 0; i < count; i++) {
switch (objs[i].type) {
#ifndef __OpenBSD__
case OBJ_acpitemp:
- close(objs[i].data.i);
- break;
case OBJ_acpitempf:
close(objs[i].data.i);
break;
case OBJ_i2c:
+ case OBJ_platform:
+ case OBJ_hwmon:
close(objs[i].data.sysfs.fd);
break;
- case OBJ_platform:
- close(objs[i].data.sysfs.fd);
- break;
- case OBJ_hwmon:
- close(objs[i].data.sysfs.fd);
- break;
#endif /* !__OpenBSD__ */
case OBJ_time:
- free(objs[i].data.s);
- break;
case OBJ_utime:
free(objs[i].data.s);
break;
free(objs[i].data.mboxscan.args);
free(objs[i].data.mboxscan.output);
break;
+ case OBJ_mails:
+ case OBJ_new_mails:
+ free(objs[i].data.local_mail.box);
+ break;
case OBJ_imap:
free(info.mail);
break;
break;
case OBJ_text:
case OBJ_font:
- free(objs[i].data.s);
- break;
case OBJ_image:
- free(objs[i].data.s);
- break;
case OBJ_exec:
- free(objs[i].data.s);
- break;
case OBJ_execbar:
- free(objs[i].data.s);
- break;
case OBJ_execgraph:
+ case OBJ_execp:
free(objs[i].data.s);
break;
- /* case OBJ_execibar:
- free(objs[i].data.s);
- break;
- case OBJ_execigraph:
- free(objs[i].data.s);
- break;*/
#ifdef HAVE_ICONV
case OBJ_iconv_start:
free_iconv();
break;
#endif
-#ifdef MPD
- case OBJ_mpd_title:
- if (info.mpd.title) {
- free(info.mpd.title);
- info.mpd.title = 0;
- }
- break;
- case OBJ_mpd_artist:
- if (info.mpd.artist) {
- free(info.mpd.artist);
- info.mpd.artist = 0;
- }
- break;
- case OBJ_mpd_album:
- if (info.mpd.album) {
- free(info.mpd.album);
- info.mpd.album = 0;
- }
- break;
- case OBJ_mpd_random:
- if (info.mpd.random) {
- free(info.mpd.random);
- info.mpd.random = 0;
- }
- break;
- case OBJ_mpd_repeat:
- if (info.mpd.repeat) {
- free(info.mpd.repeat);
- info.mpd.repeat = 0;
- }
- break;
- case OBJ_mpd_track:
- if (info.mpd.track) {
- free(info.mpd.track);
- info.mpd.track = 0;
- }
+#ifdef __LINUX__
+ case OBJ_disk_protect:
+ free(objs[i].data.s);
break;
- case OBJ_mpd_name:
- if (info.mpd.name) {
- free(info.mpd.name);
- info.mpd.name = 0;
- }
+ case OBJ_if_up:
+ free(objs[i].data.ifblock.s);
+ free(objs[i].data.ifblock.str);
break;
- case OBJ_mpd_file:
- if (info.mpd.file) {
- free(info.mpd.file);
- info.mpd.file = 0;
+ case OBJ_if_gw:
+ free(objs[i].data.ifblock.s);
+ free(objs[i].data.ifblock.str);
+ case OBJ_gw_iface:
+ case OBJ_gw_ip:
+ if (info.gw_info.iface) {
+ free(info.gw_info.iface);
+ info.gw_info.iface = 0;
}
- break;
- case OBJ_mpd_status:
- if (info.mpd.status) {
- free(info.mpd.status);
- info.mpd.status = 0;
+ if (info.gw_info.ip) {
+ free(info.gw_info.ip);
+ info.gw_info.ip = 0;
}
break;
- case OBJ_mpd_smart:
- if (info.mpd.artist) {
- free(info.mpd.artist);
- info.mpd.artist = 0;
- }
- if (info.mpd.title) {
- free(info.mpd.title);
- info.mpd.title = 0;
- }
- if (info.mpd.file) {
- free(info.mpd.file);
- info.mpd.file = 0;
- }
+ case OBJ_ioscheduler:
+ if(objs[i].data.s)
+ free(objs[i].data.s);
break;
- case OBJ_mpd_host:
#endif
#ifdef XMMS2
case OBJ_xmms2_artist:
info.xmms2.comment = 0;
}
break;
- case OBJ_xmms2_decoder:
- if (info.xmms2.decoder) {
- free(info.xmms2.decoder);
- info.xmms2.url = 0;
- }
- break;
- case OBJ_xmms2_transport:
- if (info.xmms2.transport) {
- free(info.xmms2.transport);
- info.xmms2.url = 0;
- }
- break;
case OBJ_xmms2_url:
if (info.xmms2.url) {
free(info.xmms2.url);
info.xmms2.status = 0;
}
break;
+ case OBJ_xmms2_playlist:
+ if (info.xmms2.playlist) {
+ free(info.xmms2.playlist);
+ info.xmms2.playlist = 0;
+ }
+ break;
case OBJ_xmms2_smart:
if (info.xmms2.artist) {
free(info.xmms2.artist);
case OBJ_bmpx_track:
case OBJ_bmpx_uri:
case OBJ_bmpx_bitrate:
+ break;
#endif
#ifdef RSS
case OBJ_rss:
break;
#endif
case OBJ_pre_exec:
+ break;
#ifndef __OpenBSD__
case OBJ_battery:
free(objs[i].data.s);
free(objs[i].data.s);
break;
#endif /* !__OpenBSD__ */
+ case OBJ_execpi:
case OBJ_execi:
+ case OBJ_execibar:
+ case OBJ_execigraph:
free(objs[i].data.execi.cmd);
free(objs[i].data.execi.buffer);
break;
free(objs[i].data.texeci.cmd);
free(objs[i].data.texeci.buffer);
break;
+ case OBJ_nameserver:
+ free_dns_data();
+ break;
case OBJ_top:
- if (info.first_process) {
- free_all_processes();
- info.first_process = NULL;
- }
- break;
- case OBJ_top_mem:
+ case OBJ_top_mem:
if (info.first_process) {
free_all_processes();
info.first_process = NULL;
case OBJ_entropy_poolsize:
case OBJ_entropy_bar:
break;
+ case OBJ_user_names:
+ if (info.users.names) {
+ free(info.users.names);
+ info.users.names = 0;
+ }
+ break;
+ case OBJ_user_terms:
+ if (info.users.terms) {
+ free(info.users.terms);
+ info.users.terms = 0;
+ }
+ break;
+ case OBJ_user_times:
+ if (info.users.times) {
+ free(info.users.times);
+ info.users.times = 0;
+ }
+ break;
+#ifdef SMAPI
+ case OBJ_smapi:
+ case OBJ_smapi_bat_perc:
+ free(objs[i].data.s);
+ break;
+ case OBJ_if_smapi_bat_installed:
+ free(objs[i].data.ifblock.s);
+ free(objs[i].data.ifblock.str);
+ break;
+#endif
+#ifdef MPD
+ case OBJ_mpd_title:
+ case OBJ_mpd_artist:
+ case OBJ_mpd_album:
+ case OBJ_mpd_random:
+ case OBJ_mpd_repeat:
+ case OBJ_mpd_vol:
+ case OBJ_mpd_bitrate:
+ case OBJ_mpd_status:
+ case OBJ_mpd_host:
+ case OBJ_mpd_port:
+ case OBJ_mpd_password:
+ case OBJ_mpd_bar:
+ case OBJ_mpd_elapsed:
+ case OBJ_mpd_length:
+ case OBJ_mpd_track:
+ case OBJ_mpd_name:
+ case OBJ_mpd_file:
+ case OBJ_mpd_percent:
+ case OBJ_mpd_smart:
+ free_mpd_vars(&info);
+ break;
+#endif
}
}
free(objs);
- //text_objects = NULL;
- //text_object_count = 0;
+ /* text_objects = NULL;
+ text_object_count = 0; */
}
void scan_mixer_bar(const char *arg, int *a, int *w, int *h)
if (arg && sscanf(arg, "%63s %n", buf1, &n) >= 1) {
*a = mixer_init(buf1);
- (void) scan_bar(arg + n, w, h);
+ scan_bar(arg + n, w, h);
} else {
- *a = mixer_init(0);
- (void) scan_bar(arg, w, h);
+ *a = mixer_init(NULL);
+ scan_bar(arg, w, h);
}
}
-
/* construct_text_object() creates a new text_object */
-static struct text_object *construct_text_object(const char *s, const char *arg, unsigned int object_count, struct text_object *text_objects, long line)
+static struct text_object *construct_text_object(const char *s,
+ const char *arg, unsigned int object_count,
+ struct text_object *text_objects, long line)
{
- //struct text_object *obj = new_text_object();
+ // struct text_object *obj = new_text_object();
struct text_object *obj = new_text_object_internal();
+
obj->line = line;
-#define OBJ(a, n) if (strcmp(s, #a) == 0) { obj->type = OBJ_##a; need_mask |= (1 << n); {
-#define END ; } } else
+#define OBJ(a, n) if (strcmp(s, #a) == 0) { \
+ obj->type = OBJ_##a; need_mask |= (1 << n); {
+#define END } } else
-#ifdef X11
+#ifdef X11
if (s[0] == '#') {
obj->type = OBJ_color;
obj->data.l = get_x11_color(s);
} else
#endif /* X11 */
-#ifndef __OpenBSD__
- OBJ(acpitemp, 0) obj->data.i = open_acpi_temperature(arg);
- END OBJ(acpitempf, 0) obj->data.i = open_acpi_temperature(arg);
- END OBJ(acpiacadapter, 0)
-#endif /* !__OpenBSD__ */
#ifdef __OpenBSD__
OBJ(freq, INFO_FREQ)
#else
+ OBJ(acpitemp, 0)
+ obj->data.i = open_acpi_temperature(arg);
+ END OBJ(acpitempf, 0)
+ obj->data.i = open_acpi_temperature(arg);
+ END OBJ(acpiacadapter, 0)
END OBJ(freq, INFO_FREQ)
-#endif
- get_cpu_count();
- if (!arg
- || !isdigit(arg[0])
- || strlen(arg) >=2
- || atoi(&arg[0])==0
- || (unsigned int)atoi(&arg[0])>info.cpu_count)
- {
- obj->data.cpu_index=1;
-// ERR("freq: Invalid CPU number or you don't have that many CPUs! Displaying the clock for CPU 1.");
- }
- else
- {
- obj->data.cpu_index=atoi(&arg[0]);
- }
- obj->a = 1;
+#endif /* !__OpenBSD__ */
+ get_cpu_count();
+ if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0
+ || (unsigned int) atoi(&arg[0]) > info.cpu_count) {
+ obj->data.cpu_index = 1;
+ /* ERR("freq: Invalid CPU number or you don't have that many CPUs! "
+ "Displaying the clock for CPU 1."); */
+ } else {
+ obj->data.cpu_index = atoi(&arg[0]);
+ }
+ obj->a = 1;
END OBJ(freq_g, INFO_FREQ)
- get_cpu_count();
- if (!arg
- || !isdigit(arg[0])
- || strlen(arg) >=2
- || atoi(&arg[0])==0
- || (unsigned int)atoi(&arg[0])>info.cpu_count)
- {
- obj->data.cpu_index=1;
-// ERR("freq_g: Invalid CPU number or you don't have that many CPUs! Displaying the clock for CPU 1.");
- }
- else
- {
- obj->data.cpu_index=atoi(&arg[0]);
- }
- obj->a = 1;
+ get_cpu_count();
+ if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0
+ || (unsigned int) atoi(&arg[0]) > info.cpu_count) {
+ obj->data.cpu_index = 1;
+ /* ERR("freq_g: Invalid CPU number or you don't have that many "
+ "CPUs! Displaying the clock for CPU 1."); */
+ } else {
+ obj->data.cpu_index = atoi(&arg[0]);
+ }
+ obj->a = 1;
#if defined(__linux__)
END OBJ(voltage_mv, 0)
- get_cpu_count();
- if (!arg
- || !isdigit(arg[0])
- || strlen(arg) >=2
- || atoi(&arg[0])==0
- || (unsigned int)atoi(&arg[0])>info.cpu_count)
- {
- obj->data.cpu_index=1;
-// ERR("voltage_mv: Invalid CPU number or you don't have that many CPUs! Displaying voltage for CPU 1.");
- }
- else
- {
- obj->data.cpu_index=atoi(&arg[0]);
- }
- obj->a = 1;
+ get_cpu_count();
+ if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0
+ || (unsigned int) atoi(&arg[0]) > info.cpu_count) {
+ obj->data.cpu_index = 1;
+ /* ERR("voltage_mv: Invalid CPU number or you don't have that many "
+ "CPUs! Displaying voltage for CPU 1."); */
+ } else {
+ obj->data.cpu_index = atoi(&arg[0]);
+ }
+ obj->a = 1;
END OBJ(voltage_v, 0)
- get_cpu_count();
- if (!arg
- || !isdigit(arg[0])
- || strlen(arg) >=2
- || atoi(&arg[0])==0
- || (unsigned int)atoi(&arg[0])>info.cpu_count)
- {
- obj->data.cpu_index=1;
-// ERR("voltage_v: Invalid CPU number or you don't have that many CPUs! Displaying voltage for CPU 1.");
- }
- else
- {
- obj->data.cpu_index=atoi(&arg[0]);
- }
- obj->a = 1;
+ get_cpu_count();
+ if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0
+ || (unsigned int) atoi(&arg[0]) > info.cpu_count) {
+ obj->data.cpu_index = 1;
+ /* ERR("voltage_v: Invalid CPU number or you don't have that many "
+ "CPUs! Displaying voltage for CPU 1."); */
+ } else {
+ obj->data.cpu_index = atoi(&arg[0]);
+ }
+ obj->a = 1;
#ifdef HAVE_IWLIB
END OBJ(wireless_essid, INFO_NET)
- if(arg)
- obj->data.net = get_net_stat(arg);
- else
- CRIT_ERR("wireless_essid: needs an argument");
+ if (arg) {
+ obj->data.net = get_net_stat(arg);
+ } else {
+ CRIT_ERR("wireless_essid: needs an argument");
+ }
END OBJ(wireless_mode, INFO_NET)
- if(arg)
- obj->data.net = get_net_stat(arg);
- else
- CRIT_ERR("wireless_mode: needs an argument");
+ if (arg) {
+ obj->data.net = get_net_stat(arg);
+ } else {
+ CRIT_ERR("wireless_mode: needs an argument");
+ }
END OBJ(wireless_bitrate, INFO_NET)
- if(arg)
- obj->data.net = get_net_stat(arg);
- else
- CRIT_ERR("wireless_bitrate: needs an argument");
+ if (arg) {
+ obj->data.net = get_net_stat(arg);
+ } else {
+ CRIT_ERR("wireless_bitrate: needs an argument");
+ }
END OBJ(wireless_ap, INFO_NET)
- if(arg)
- obj->data.net = get_net_stat(arg);
- else
- CRIT_ERR("wireless_ap: needs an argument");
+ if (arg) {
+ obj->data.net = get_net_stat(arg);
+ } else {
+ CRIT_ERR("wireless_ap: needs an argument");
+ }
END OBJ(wireless_link_qual, INFO_NET)
- if(arg)
- obj->data.net = get_net_stat(arg);
- else
- CRIT_ERR("wireless_link_qual: needs an argument");
+ if (arg) {
+ obj->data.net = get_net_stat(arg);
+ } else {
+ CRIT_ERR("wireless_link_qual: needs an argument");
+ }
END OBJ(wireless_link_qual_max, INFO_NET)
- if(arg)
- obj->data.net = get_net_stat(arg);
- else
- CRIT_ERR("wireless_link_qual_max: needs an argument");
+ if (arg) {
+ obj->data.net = get_net_stat(arg);
+ } else {
+ CRIT_ERR("wireless_link_qual_max: needs an argument");
+ }
END OBJ(wireless_link_qual_perc, INFO_NET)
- if(arg)
- obj->data.net = get_net_stat(arg);
- else
- CRIT_ERR("wireless_link_qual_perc: needs an argument");
+ if (arg) {
+ obj->data.net = get_net_stat(arg);
+ } else {
+ CRIT_ERR("wireless_link_qual_perc: needs an argument");
+ }
END OBJ(wireless_link_bar, INFO_NET)
- if(arg) {
- arg = scan_bar(arg, &obj->a, &obj->b);
- obj->data.net = get_net_stat(arg);
- } else
- CRIT_ERR("wireless_link_bar: needs an argument");
+ if (arg) {
+ arg = scan_bar(arg, &obj->a, &obj->b);
+ obj->data.net = get_net_stat(arg);
+ } else {
+ CRIT_ERR("wireless_link_bar: needs an argument");
+ }
#endif /* HAVE_IWLIB */
#endif /* __linux__ */
- END OBJ(freq_dyn, 0);
- END OBJ(freq_dyn_g, 0);
+ END OBJ(freq_dyn, 0)
+ END OBJ(freq_dyn_g, 0)
+
#ifndef __OpenBSD__
- END OBJ(acpifan, 0);
- END OBJ(battery, 0);
- char bat[64];
- if (arg)
- sscanf(arg, "%63s", bat);
- else
- strcpy(bat, "BAT0");
- obj->data.s = strdup(bat);
- END OBJ(battery_time, 0);
- char bat[64];
- if (arg)
- sscanf(arg, "%63s", bat);
- else
- strcpy(bat, "BAT0");
- obj->data.s = strdup(bat);
- END OBJ(battery_percent, 0);
- char bat[64];
- if (arg)
- sscanf(arg, "%63s", bat);
- else
- strcpy(bat, "BAT0");
- obj->data.s = strdup(bat);
- END OBJ(battery_bar, 0);
- char bat[64];
- if (arg) {
- arg = scan_bar(arg, &obj->a, &obj->b);
- sscanf(arg, "%63s", bat);
- } else {
- strcpy(bat, "BAT0");
- }
- obj->data.s = strdup(bat);
+ END OBJ(acpifan, 0)
+ END OBJ(battery, 0)
+ char bat[64];
+
+ if (arg) {
+ sscanf(arg, "%63s", bat);
+ } else {
+ strcpy(bat, "BAT0");
+ }
+ obj->data.s = strdup(bat);
+ END OBJ(battery_time, 0)
+ char bat[64];
+
+ if (arg) {
+ sscanf(arg, "%63s", bat);
+ } else {
+ strcpy(bat, "BAT0");
+ }
+ obj->data.s = strdup(bat);
+ END OBJ(battery_percent, 0)
+ char bat[64];
+
+ if (arg) {
+ sscanf(arg, "%63s", bat);
+ } else {
+ strcpy(bat, "BAT0");
+ }
+ obj->data.s = strdup(bat);
+ END OBJ(battery_bar, 0)
+ char bat[64];
+ obj->b = 6;
+ if (arg) {
+ arg = scan_bar(arg, &obj->a, &obj->b);
+ sscanf(arg, "%63s", bat);
+ } else {
+ strcpy(bat, "BAT0");
+ }
+ obj->data.s = strdup(bat);
#endif /* !__OpenBSD__ */
+
#if defined(__linux__)
+ END OBJ(disk_protect, 0)
+ if (arg)
+ obj->data.s = strdup(arg);
+ else
+ CRIT_ERR("disk_protect needs an argument");
END OBJ(i8k_version, INFO_I8K)
- END OBJ(i8k_bios, INFO_I8K)
- END OBJ(i8k_serial, INFO_I8K)
- END OBJ(i8k_cpu_temp, INFO_I8K)
- END OBJ(i8k_cpu_tempf, INFO_I8K)
- END OBJ(i8k_left_fan_status, INFO_I8K)
- END OBJ(i8k_right_fan_status, INFO_I8K)
- END OBJ(i8k_left_fan_rpm, INFO_I8K)
- END OBJ(i8k_right_fan_rpm, INFO_I8K)
- END OBJ(i8k_ac_status, INFO_I8K)
- END OBJ(i8k_buttons_status, INFO_I8K)
+ END OBJ(i8k_bios, INFO_I8K)
+ END OBJ(i8k_serial, INFO_I8K)
+ END OBJ(i8k_cpu_temp, INFO_I8K)
+ END OBJ(i8k_cpu_tempf, INFO_I8K)
+ END OBJ(i8k_left_fan_status, INFO_I8K)
+ END OBJ(i8k_right_fan_status, INFO_I8K)
+ END OBJ(i8k_left_fan_rpm, INFO_I8K)
+ END OBJ(i8k_right_fan_rpm, INFO_I8K)
+ END OBJ(i8k_ac_status, INFO_I8K)
+ END OBJ(i8k_buttons_status, INFO_I8K)
END OBJ(ibm_fan, 0)
END OBJ(ibm_temps, 0)
- if (!arg) {
- CRIT_ERR("ibm_temps: needs an argument");
- }
- if (!isdigit(arg[0])
- || strlen(arg) >=2
- || atoi(&arg[0]) >=8)
- {
- obj->data.sensor=0;
- ERR("Invalid temperature sensor! Sensor number must be 0 to 7. Using 0 (CPU temp sensor).");
- }
+ if (!arg) {
+ CRIT_ERR("ibm_temps: needs an argument");
+ }
+ if (!isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) >= 8) {
+ obj->data.sensor = 0;
+ ERR("Invalid temperature sensor! Sensor number must be 0 to 7. "
+ "Using 0 (CPU temp sensor).");
+ }
obj->data.sensor = atoi(&arg[0]);
END OBJ(ibm_volume, 0)
END OBJ(ibm_brightness, 0)
+ END OBJ(if_up, 0)
+ if (blockdepth >= MAX_IF_BLOCK_DEPTH) {
+ CRIT_ERR("MAX_IF_BLOCK_DEPTH exceeded");
+ }
+ if (!arg) {
+ ERR("if_up needs an argument");
+ obj->data.ifblock.s = 0;
+ } else
+ obj->data.ifblock.s = strdup(arg);
+ blockstart[blockdepth] = object_count;
+ obj->data.ifblock.pos = object_count + 2;
+ blockdepth++;
+ END OBJ(if_gw, 0)
+ if (blockdepth >= MAX_IF_BLOCK_DEPTH) {
+ CRIT_ERR("MAX_IF_BLOCK_DEPTH exceeded");
+ }
+ blockstart[blockdepth] = object_count;
+ obj->data.ifblock.pos = object_count + 2;
+ blockdepth++;
+ END OBJ(ioscheduler, 0)
+ if (!arg) {
+ CRIT_ERR("get_ioscheduler needs an argument (e.g. hda)");
+ obj->data.s = 0;
+ } else
+ obj->data.s = strdup(arg);
+ END OBJ(laptop_mode, 0)
END OBJ(pb_battery, 0)
- if (arg && strcmp(arg, "status") == 0) {
- obj->data.i = PB_BATT_STATUS;
- } else if (arg && strcmp(arg, "percent") == 0) {
- obj->data.i = PB_BATT_PERCENT;
- } else if (arg && strcmp(arg, "time") == 0) {
- obj->data.i = PB_BATT_TIME;
- } else {
- ERR("pb_battery: needs one argument: status, percent or time");
- free(obj);
- return NULL;
- }
+ if (arg && strcmp(arg, "status") == 0) {
+ obj->data.i = PB_BATT_STATUS;
+ } else if (arg && strcmp(arg, "percent") == 0) {
+ obj->data.i = PB_BATT_PERCENT;
+ } else if (arg && strcmp(arg, "time") == 0) {
+ obj->data.i = PB_BATT_TIME;
+ } else {
+ ERR("pb_battery: needs one argument: status, percent or time");
+ free(obj);
+ return NULL;
+ }
#endif /* __linux__ */
#if defined(__OpenBSD__)
- END OBJ(obsd_sensors_temp, 0);
- if(!arg) {
+ END OBJ(obsd_sensors_temp, 0)
+ if (!arg) {
CRIT_ERR("obsd_sensors_temp: needs an argument");
}
- if(!isdigit(arg[0]) || atoi(&arg[0]) < 0 || atoi(&arg[0]) > OBSD_MAX_SENSORS-1) {
- obj->data.sensor=0;
+ if (!isdigit(arg[0]) || atoi(&arg[0]) < 0
+ || atoi(&arg[0]) > OBSD_MAX_SENSORS - 1) {
+ obj->data.sensor = 0;
ERR("Invalid temperature sensor number!");
}
- obj->data.sensor = atoi(&arg[0]);
- END OBJ(obsd_sensors_fan, 0);
- if(!arg) {
- CRIT_ERR("obsd_sensors_fan: needs 2 arguments (device and sensor number)");
- }
- if(!isdigit(arg[0]) || atoi(&arg[0]) < 0 || atoi(&arg[0]) > OBSD_MAX_SENSORS-1) {
- obj->data.sensor=0;
+ obj->data.sensor = atoi(&arg[0]);
+ END OBJ(obsd_sensors_fan, 0)
+ if (!arg) {
+ CRIT_ERR("obsd_sensors_fan: needs 2 arguments (device and sensor "
+ "number)");
+ }
+ if (!isdigit(arg[0]) || atoi(&arg[0]) < 0
+ || atoi(&arg[0]) > OBSD_MAX_SENSORS - 1) {
+ obj->data.sensor = 0;
ERR("Invalid fan sensor number!");
}
- obj->data.sensor = atoi(&arg[0]);
- END OBJ(obsd_sensors_volt, 0);
- if(!arg) {
- CRIT_ERR("obsd_sensors_volt: needs 2 arguments (device and sensor number)");
- }
- if(!isdigit(arg[0]) || atoi(&arg[0]) < 0 || atoi(&arg[0]) > OBSD_MAX_SENSORS-1) {
- obj->data.sensor=0;
+ obj->data.sensor = atoi(&arg[0]);
+ END OBJ(obsd_sensors_volt, 0)
+ if (!arg) {
+ CRIT_ERR("obsd_sensors_volt: needs 2 arguments (device and sensor "
+ "number)");
+ }
+ if (!isdigit(arg[0]) || atoi(&arg[0]) < 0
+ || atoi(&arg[0]) > OBSD_MAX_SENSORS - 1) {
+ obj->data.sensor = 0;
ERR("Invalid voltage sensor number!");
}
- obj->data.sensor = atoi(&arg[0]);
- END OBJ(obsd_vendor, 0);
- END OBJ(obsd_product, 0);
+ obj->data.sensor = atoi(&arg[0]);
+ END OBJ(obsd_vendor, 0)
+ END OBJ(obsd_product, 0)
#endif /* __OpenBSD__ */
- END OBJ(buffers, INFO_BUFFERS)
- END OBJ(cached, INFO_BUFFERS)
- END OBJ(cpu, INFO_CPU)
+ END OBJ(buffers, INFO_BUFFERS)
+ END OBJ(cached, INFO_BUFFERS)
+ END OBJ(cpu, INFO_CPU)
if (arg) {
if (strncmp(arg, "cpu", 3) == 0 && isdigit(arg[3])) {
obj->data.cpu_index = atoi(&arg[3]);
arg += 4;
- } else {obj->data.cpu_index = 0; }
+ } else {
+ obj->data.cpu_index = 0;
+ }
} else {
obj->data.cpu_index = 0;
}
if (strncmp(arg, "cpu", 3) == 0 && isdigit(arg[3])) {
obj->data.cpu_index = atoi(&arg[3]);
arg += 4;
+ } else {
+ obj->data.cpu_index = 0;
}
- else {obj->data.cpu_index = 0;}
- (void) scan_bar(arg, &obj->a, &obj->b);
+ scan_bar(arg, &obj->a, &obj->b);
} else {
- (void) scan_bar(arg, &obj->a, &obj->b);
+ scan_bar(arg, &obj->a, &obj->b);
obj->data.cpu_index = 0;
}
END OBJ(cpugraph, INFO_CPU)
- if (arg) {
- if (strncmp(arg, "cpu", 3) == 0 && isdigit(arg[3])) {
- obj->data.cpu_index = atoi(&arg[3]);
- arg += 4;
+ char *buf = scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d,
+ &obj->e);
+
+ if (buf) {
+ if (strncmp(buf, "cpu", 3) == 0 && isdigit(buf[3])) {
+ obj->data.cpu_index = atoi(&buf[3]);
+ } else {
+ obj->data.cpu_index = 0;
}
- (void) scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d, &obj->e);
- } else {
- (void) scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d, &obj->e);
- obj->data.cpu_index = 0;
+ free(buf);
}
END OBJ(diskio, INFO_DISKIO)
+ if (arg) {
+ obj->data.diskio = prepare_diskio_stat(arg);
+ } else {
+ obj->data.diskio = NULL;
+ }
END OBJ(diskio_read, INFO_DISKIO)
+ if (arg) {
+ obj->data.diskio = prepare_diskio_stat(arg);
+ } else {
+ obj->data.diskio = NULL;
+ }
END OBJ(diskio_write, INFO_DISKIO)
- END OBJ(diskiograph, INFO_DISKIO) (void) scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d, &obj->e);
- END OBJ(diskiograph_read, INFO_DISKIO) (void) scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d, &obj->e);
- END OBJ(diskiograph_write, INFO_DISKIO) (void) scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d, &obj->e);
- END OBJ(color, 0)
+ if (arg) {
+ obj->data.diskio = prepare_diskio_stat(arg);
+ } else {
+ obj->data.diskio = NULL;
+ }
+ END OBJ(diskiograph, INFO_DISKIO)
+ char *buf = scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d,
+ &obj->e);
+
+ if (buf) {
+ obj->data.diskio = prepare_diskio_stat(buf);
+ free(buf);
+ } else {
+ obj->data.diskio = NULL;
+ }
+ END OBJ(diskiograph_read, INFO_DISKIO)
+ char *buf = scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d,
+ &obj->e);
+
+ if (buf) {
+ obj->data.diskio = prepare_diskio_stat(buf);
+ free(buf);
+ } else {
+ obj->data.diskio = NULL;
+ }
+ END OBJ(diskiograph_write, INFO_DISKIO)
+ char *buf = scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d,
+ &obj->e);
+
+ if (buf) {
+ obj->data.diskio = prepare_diskio_stat(buf);
+ free(buf);
+ } else {
+ obj->data.diskio = NULL;
+ }
+ END OBJ(color, 0)
#ifdef X11
obj->data.l = arg ? get_x11_color(arg) : default_fg_color;
#endif /* X11 */
obj->data.l = color9;
END OBJ(font, 0)
obj->data.s = scan_font(arg);
- END OBJ(downspeed, INFO_NET)
- if(arg) {
+ END OBJ(conky_version, 0)
+ END OBJ(conky_build_date, 0)
+ END OBJ(conky_build_arch, 0)
+ END OBJ(downspeed, INFO_NET)
+ if (arg) {
obj->data.net = get_net_stat(arg);
- }
- else {
+ } else {
CRIT_ERR("downspeed needs argument");
}
END OBJ(downspeedf, INFO_NET)
- if(arg) {
+ if (arg) {
obj->data.net = get_net_stat(arg);
- }
- else {
+ } else {
CRIT_ERR("downspeedf needs argument");
}
END OBJ(downspeedgraph, INFO_NET)
- (void) scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d, &obj->e);
- char buf[64];
- sscanf(arg, "%63s %*i,%*i %*i", buf);
- obj->data.net = get_net_stat(buf);
- if (sscanf(arg, "%*s %d,%d %*d", &obj->b, &obj->a) <= 1) {
- if (sscanf(arg, "%*s %d,%d", &obj->b, &obj->a) <= 1) {
- obj->a = 0;
- obj->b = 25;
+ char *buf = scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d,
+ &obj->e);
+
+ if (buf) {
+ obj->data.net = get_net_stat(buf);
+ free(buf);
}
- }
END OBJ(else, 0)
if (blockdepth) {
- (text_objects[blockstart[blockdepth - 1]]).data.ifblock.pos = object_count;
+ (text_objects[blockstart[blockdepth - 1]]).data.ifblock.pos =
+ object_count;
blockstart[blockdepth - 1] = object_count;
obj->data.ifblock.pos = object_count + 2;
} else {
END OBJ(endif, 0)
if (blockdepth) {
blockdepth--;
- text_objects[blockstart[blockdepth]].data.ifblock.pos = object_count;
+ text_objects[blockstart[blockdepth]].data.ifblock.pos =
+ object_count;
} else {
ERR("$endif: no matching $if_*");
}
- END
- OBJ(image, 0) obj->data.s = strdup(arg ? arg : "");
- END
+ END OBJ(image, 0)
+ obj->data.s = strdup(arg ? arg : "");
#ifdef HAVE_POPEN
- OBJ(exec, 0) obj->data.s = strdup(arg ? arg : "");
- END OBJ(execbar, 0) obj->data.s = strdup(arg ? arg : "");
- END OBJ(execgraph, 0) obj->data.s = strdup(arg ? arg : "");
- END OBJ(execibar, 0) unsigned int n;
- if (!arg || sscanf(arg, "%f %n", &obj->data.execi.interval, &n) <= 0) {
- char buf[256];
- ERR("${execibar <interval> command}");
- obj->type = OBJ_text;
- snprintf(buf, 256, "${%s}", s);
- obj->data.s = strdup(buf);
- } else {
- obj->data.execi.cmd = strdup(arg + n);
- }
- END OBJ(execigraph, 0) unsigned int n;
- if (!arg || sscanf(arg, "%f %n", &obj->data.execi.interval, &n) <= 0) {
- char buf[256];
- ERR("${execigraph <interval> command}");
- obj->type = OBJ_text;
- snprintf(buf, 256, "${%s}", s);
- obj->data.s = strdup(buf);
- } else {
- obj->data.execi.cmd = strdup(arg + n);
- }
- END OBJ(execi, 0) unsigned int n;
- if (!arg || sscanf(arg, "%f %n", &obj->data.execi.interval, &n) <= 0) {
- char buf[256];
- ERR("${execi <interval> command}");
- obj->type = OBJ_text;
- snprintf(buf, 256, "${%s}", s);
- obj->data.s = strdup(buf);
- } else {
- obj->data.execi.cmd = strdup(arg + n);
- obj->data.execi.buffer =
- (char *) calloc(1, text_buffer_size);
- }
- END OBJ(texeci, 0) unsigned int n;
- if (!arg || sscanf(arg, "%f %n", &obj->data.texeci.interval, &n) <= 0) {
- char buf[256];
- ERR("${texeci <interval> command}");
- obj->type = OBJ_text;
- snprintf(buf, 256, "${%s}", s);
- obj->data.s = strdup(buf);
- } else {
- obj->data.texeci.cmd = strdup(arg + n);
- obj->data.texeci.buffer =
- (char *) calloc(1, text_buffer_size);
- }
- obj->data.texeci.p_timed_thread = NULL;
- END OBJ(pre_exec, 0) obj->type = OBJ_text;
- if (arg) {
- FILE *fp = popen(arg, "r");
- unsigned int n;
- char buf[2048];
+ END OBJ(exec, 0)
+ obj->data.s = strdup(arg ? arg : "");
+ END OBJ(execp, 0)
+ obj->data.s = strdup(arg ? arg : "");
+ END OBJ(execbar, 0)
+ obj->data.s = strdup(arg ? arg : "");
+ END OBJ(execgraph, 0)
+ obj->data.s = strdup(arg ? arg : "");
+ END OBJ(execibar, 0)
+ int n;
+
+ if (!arg || sscanf(arg, "%f %n", &obj->data.execi.interval, &n) <= 0) {
+ char buf[256];
+
+ ERR("${execibar <interval> command}");
+ obj->type = OBJ_text;
+ snprintf(buf, 256, "${%s}", s);
+ obj->data.s = strdup(buf);
+ } else {
+ obj->data.execi.cmd = strdup(arg + n);
+ }
+ END OBJ(execigraph, 0)
+ int n;
- n = fread(buf, 1, 2048, fp);
- buf[n] = '\0';
+ if (!arg || sscanf(arg, "%f %n", &obj->data.execi.interval, &n) <= 0) {
+ char buf[256];
- if (n && buf[n - 1] == '\n')
- buf[n - 1] = '\0';
+ ERR("${execigraph <interval> command}");
+ obj->type = OBJ_text;
+ snprintf(buf, 256, "${%s}", s);
+ obj->data.s = strdup(buf);
+ } else {
+ obj->data.execi.cmd = strdup(arg + n);
+ }
+ END OBJ(execi, 0)
+ int n;
- (void) pclose(fp);
+ if (!arg || sscanf(arg, "%f %n", &obj->data.execi.interval, &n) <= 0) {
+ char buf[256];
- obj->data.s = strdup(buf);
- } else
- obj->data.s = strdup("");
- END
-#endif
- OBJ(fs_bar, INFO_FS) obj->data.fsbar.h = 4;
- arg = scan_bar(arg, &obj->data.fsbar.w, &obj->data.fsbar.h);
- if (arg) {
- while (isspace(*arg))
- arg++;
- if (*arg == '\0')
- arg = "/";
- } else
- arg = "/";
- obj->data.fsbar.fs = prepare_fs_stat(arg);
- END OBJ(fs_bar_free, INFO_FS) obj->data.fsbar.h = 4;
- if (arg) {
- unsigned int n;
- if (sscanf(arg, "%d %n", &obj->data.fsbar.h, &n) >= 1)
- arg += n;
- } else
- arg = "/";
- obj->data.fsbar.fs = prepare_fs_stat(arg);
- END OBJ(fs_free, INFO_FS) if (!arg)
- arg = "/";
- obj->data.fs = prepare_fs_stat(arg);
- END OBJ(fs_used_perc, INFO_FS) if (!arg)
- arg = "/";
- obj->data.fs = prepare_fs_stat(arg);
- END OBJ(fs_free_perc, INFO_FS) if (!arg)
- arg = "/";
- obj->data.fs = prepare_fs_stat(arg);
- END OBJ(fs_size, INFO_FS) if (!arg)
- arg = "/";
- obj->data.fs = prepare_fs_stat(arg);
- END OBJ(fs_used, INFO_FS) if (!arg)
- arg = "/";
- obj->data.fs = prepare_fs_stat(arg);
- END OBJ(hr, 0) obj->data.i = arg ? atoi(arg) : 1;
- END OBJ(offset, 0) obj->data.i = arg ? atoi(arg) : 1;
- END OBJ(voffset, 0) obj->data.i = arg ? atoi(arg) : 1;
- END OBJ(goto, 0)
+ ERR("${execi <interval> command}");
+ obj->type = OBJ_text;
+ snprintf(buf, 256, "${%s}", s);
+ obj->data.s = strdup(buf);
+ } else {
+ obj->data.execi.cmd = strdup(arg + n);
+ obj->data.execi.buffer = malloc(text_buffer_size);
+ }
+ END OBJ(execpi, 0)
+ int n;
- if (!arg) {
- ERR("goto needs arguments");
- obj->type = OBJ_text;
- obj->data.s = strdup("${goto}");
- return NULL;
- }
-
- obj->data.i = atoi(arg);
-
- END OBJ(tab, 0)
- int a = 10, b = 0;
- if (arg) {
- if (sscanf(arg, "%d %d", &a, &b) != 2)
- sscanf(arg, "%d", &b);
- }
- if (a <= 0)
- a = 1;
- obj->data.pair.a = a;
- obj->data.pair.b = b;
+ if (!arg || sscanf(arg, "%f %n", &obj->data.execi.interval, &n) <= 0) {
+ char buf[256];
-#ifndef __OpenBSD__
- END OBJ(i2c, INFO_SYSFS)
- char buf1[64], buf2[64];
- int n;
+ ERR("${execi <interval> command}");
+ obj->type = OBJ_text;
+ snprintf(buf, 256, "${%s}", s);
+ obj->data.s = strdup(buf);
+ } else {
+ obj->data.execi.cmd = strdup(arg + n);
+ obj->data.execi.buffer = malloc(text_buffer_size);
+ }
+ END OBJ(texeci, 0)
+ int n;
- if (!arg) {
- ERR("i2c needs arguments");
+ if (!arg || sscanf(arg, "%f %n", &obj->data.texeci.interval, &n) <= 0) {
+ char buf[256];
+
+ ERR("${texeci <interval> command}");
+ obj->type = OBJ_text;
+ snprintf(buf, 256, "${%s}", s);
+ obj->data.s = strdup(buf);
+ } else {
+ obj->data.texeci.cmd = strdup(arg + n);
+ obj->data.texeci.buffer = malloc(text_buffer_size);
+ }
+ obj->data.texeci.p_timed_thread = NULL;
+ END OBJ(pre_exec, 0)
obj->type = OBJ_text;
- //obj->data.s = strdup("${i2c}");
- return NULL;
- }
+ if (arg) {
+ FILE *fp = popen(arg, "r");
+ unsigned int n;
+ char buf[2048];
- if (sscanf(arg, "%63s %63s %d", buf1, buf2, &n) != 3) {
- /* if scanf couldn't read three values, read type and num and use default device */
- sscanf(arg, "%63s %d", buf2, &n);
- obj->data.sysfs.fd =
- open_i2c_sensor(0, buf2, n, &obj->data.sysfs.arg, obj->data.sysfs.devtype);
- strncpy(obj->data.sysfs.type, buf2, 63);
- } else {
- obj->data.sysfs.fd =
- open_i2c_sensor(buf1, buf2, n, &obj->data.sysfs.arg, obj->data.sysfs.devtype);
- strncpy(obj->data.sysfs.type, buf2, 63);
- }
-
- END OBJ(platform, INFO_SYSFS)
- char buf1[64], buf2[64];
- int n;
-
- if (!arg) {
- ERR("platform needs arguments");
- obj->type = OBJ_text;
- return NULL;
- }
-
- if (sscanf(arg, "%63s %63s %d", buf1, buf2, &n) != 3) {
- /* if scanf couldn't read three values, read type and num and use default device */
- sscanf(arg, "%63s %d", buf2, &n);
- obj->data.sysfs.fd =
- open_platform_sensor(0, buf2, n, &obj->data.sysfs.arg, obj->data.sysfs.devtype);
- strncpy(obj->data.sysfs.type, buf2, 63);
- } else {
- obj->data.sysfs.fd =
- open_platform_sensor(buf1, buf2, n, &obj->data.sysfs.arg, obj->data.sysfs.devtype);
- strncpy(obj->data.sysfs.type, buf2, 63);
- }
-
- END OBJ(hwmon, INFO_SYSFS)
- char buf1[64], buf2[64];
- int n;
-
- if (!arg) {
- ERR("hwmon needs argumanets");
- obj->type = OBJ_text;
- return NULL;
- }
-
- if (sscanf(arg, "%63s %63s %d", buf1, buf2, &n) != 3) {
- /* if scanf couldn't read three values, read type and num and use default device */
- sscanf(arg, "%63s %d", buf2, &n);
- obj->data.sysfs.fd =
- open_hwmon_sensor(0, buf2, n, &obj->data.sysfs.arg, obj->data.sysfs.devtype);
- strncpy(obj->data.sysfs.type, buf2, 63);
- } else {
- obj->data.sysfs.fd =
- open_hwmon_sensor(buf1, buf2, n, &obj->data.sysfs.arg, obj->data.sysfs.devtype);
- strncpy(obj->data.sysfs.type, buf2, 63);
- }
-#endif /* !__OpenBSD__ */
+ n = fread(buf, 1, 2048, fp);
+ buf[n] = '\0';
- END OBJ(top, INFO_TOP)
- char buf[64];
- int n;
- if (!arg) {
- ERR("top needs arguments");
- obj->type = OBJ_text;
- //obj->data.s = strdup("${top}");
- return NULL;
- }
- if (sscanf(arg, "%63s %i", buf, &n) == 2) {
- if (strcmp(buf, "name") == 0) {
- obj->data.top.type = TOP_NAME;
- } else if (strcmp(buf, "cpu") == 0) {
- obj->data.top.type = TOP_CPU;
- } else if (strcmp(buf, "pid") == 0) {
- obj->data.top.type = TOP_PID;
- } else if (strcmp(buf, "mem") == 0) {
- obj->data.top.type = TOP_MEM;
+ if (n && buf[n - 1] == '\n') {
+ buf[n - 1] = '\0';
+ }
+
+ pclose(fp);
+
+ obj->data.s = strdup(buf);
} else {
- ERR("invalid arg for top");
- return NULL;
+ obj->data.s = strdup("");
}
- if (n < 1 || n > 10) {
- CRIT_ERR("invalid arg for top");
- return NULL;
+#endif
+ END OBJ(fs_bar, INFO_FS)
+ arg = scan_bar(arg, &obj->data.fsbar.w, &obj->data.fsbar.h);
+ if (arg) {
+ while (isspace(*arg)) {
+ arg++;
+ }
+ if (*arg == '\0') {
+ arg = "/";
+ }
} else {
- obj->data.top.num = n - 1;
- top_cpu = 1;
+ arg = "/";
}
- } else {
- ERR("invalid args given for top");
- return NULL;
- }
- END OBJ(top_mem, INFO_TOP)
- char buf[64];
- int n;
- if (!arg) {
- ERR("top_mem needs arguments");
- obj->type = OBJ_text;
- obj->data.s = strdup("${top_mem}");
- return NULL;
- }
- if (sscanf(arg, "%63s %i", buf, &n) == 2) {
- if (strcmp(buf, "name") == 0) {
- obj->data.top.type = TOP_NAME;
- } else if (strcmp(buf, "cpu") == 0) {
- obj->data.top.type = TOP_CPU;
- } else if (strcmp(buf, "pid") == 0) {
- obj->data.top.type = TOP_PID;
- } else if (strcmp(buf, "mem") == 0) {
- obj->data.top.type = TOP_MEM;
+ obj->data.fsbar.fs = prepare_fs_stat(arg);
+ END OBJ(fs_bar_free, INFO_FS)
+ arg = scan_bar(arg, &obj->data.fsbar.w, &obj->data.fsbar.h);
+ if (arg) {
+ while (isspace(*arg)) {
+ arg++;
+ }
+ if (*arg == '\0') {
+ arg = "/";
+ }
} else {
- ERR("invalid arg for top");
+ arg = "/";
+ }
+
+ obj->data.fsbar.fs = prepare_fs_stat(arg);
+ END OBJ(fs_free, INFO_FS)
+ if (!arg) {
+ arg = "/";
+ }
+ obj->data.fs = prepare_fs_stat(arg);
+ END OBJ(fs_used_perc, INFO_FS)
+ if (!arg) {
+ arg = "/";
+ }
+ obj->data.fs = prepare_fs_stat(arg);
+ END OBJ(fs_free_perc, INFO_FS)
+ if (!arg) {
+ arg = "/";
+ }
+ obj->data.fs = prepare_fs_stat(arg);
+ END OBJ(fs_size, INFO_FS)
+ if (!arg) {
+ arg = "/";
+ }
+ obj->data.fs = prepare_fs_stat(arg);
+ END OBJ(fs_type, INFO_FS)
+ if (!arg) {
+ arg = "/";
+ }
+ obj->data.fs = prepare_fs_stat(arg);
+ END OBJ(fs_used, INFO_FS)
+ if (!arg) {
+ arg = "/";
+ }
+ obj->data.fs = prepare_fs_stat(arg);
+ END OBJ(hr, 0)
+ obj->data.i = arg ? atoi(arg) : 1;
+ END OBJ(nameserver, INFO_DNS)
+ obj->data.i = arg ? atoi(arg) : 0;
+ END OBJ(offset, 0)
+ obj->data.i = arg ? atoi(arg) : 1;
+ END OBJ(voffset, 0)
+ obj->data.i = arg ? atoi(arg) : 1;
+ END OBJ(goto, 0)
+
+ if (!arg) {
+ ERR("goto needs arguments");
+ obj->type = OBJ_text;
+ obj->data.s = strdup("${goto}");
return NULL;
}
- if (n < 1 || n > 10) {
- CRIT_ERR("invalid arg for top");
+
+ obj->data.i = atoi(arg);
+
+ END OBJ(tab, 0)
+ int a = 10, b = 0;
+
+ if (arg) {
+ if (sscanf(arg, "%d %d", &a, &b) != 2) {
+ sscanf(arg, "%d", &b);
+ }
+ }
+ if (a <= 0) {
+ a = 1;
+ }
+ obj->data.pair.a = a;
+ obj->data.pair.b = b;
+
+#ifndef __OpenBSD__
+ END OBJ(i2c, INFO_SYSFS)
+ char buf1[64], buf2[64];
+ int n;
+
+ if (!arg) {
+ ERR("i2c needs arguments");
+ obj->type = OBJ_text;
+ // obj->data.s = strdup("${i2c}");
return NULL;
+ }
+
+ if (sscanf(arg, "%63s %63s %d", buf1, buf2, &n) != 3) {
+ /* if scanf couldn't read three values, read type and num and use
+ * default device */
+ sscanf(arg, "%63s %d", buf2, &n);
+ obj->data.sysfs.fd = open_i2c_sensor(0, buf2, n,
+ &obj->data.sysfs.arg, obj->data.sysfs.devtype);
+ strncpy(obj->data.sysfs.type, buf2, 63);
} else {
- obj->data.top.num = n - 1;
- top_mem = 1;
+ obj->data.sysfs.fd = open_i2c_sensor(buf1, buf2, n,
+ &obj->data.sysfs.arg, obj->data.sysfs.devtype);
+ strncpy(obj->data.sysfs.type, buf2, 63);
}
- } else {
- ERR("invalid args given for top");
- return NULL;
- }
- END OBJ(addr, INFO_NET)
- if(arg) {
- obj->data.net = get_net_stat(arg);
+
+ END OBJ(platform, INFO_SYSFS)
+ char buf1[64], buf2[64];
+ int n;
+
+ if (!arg) {
+ ERR("platform needs arguments");
+ obj->type = OBJ_text;
+ return NULL;
}
- else {
- CRIT_ERR("addr needs argument");
+
+ if (sscanf(arg, "%63s %63s %d", buf1, buf2, &n) != 3) {
+ /* if scanf couldn't read three values, read type and num and use
+ * default device */
+ sscanf(arg, "%63s %d", buf2, &n);
+ obj->data.sysfs.fd = open_platform_sensor(0, buf2, n,
+ &obj->data.sysfs.arg, obj->data.sysfs.devtype);
+ strncpy(obj->data.sysfs.type, buf2, 63);
+ } else {
+ obj->data.sysfs.fd = open_platform_sensor(buf1, buf2, n,
+ &obj->data.sysfs.arg, obj->data.sysfs.devtype);
+ strncpy(obj->data.sysfs.type, buf2, 63);
}
- END OBJ(tail, 0)
- char buf[64];
- int n1, n2;
- if (!arg) {
- ERR("tail needs arguments");
- obj->type = OBJ_text;
- obj->data.s = strdup("${tail}");
- 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");
+
+ END OBJ(hwmon, INFO_SYSFS)
+ char buf1[64], buf2[64];
+ int n;
+
+ if (!arg) {
+ ERR("hwmon needs argumanets");
+ obj->type = OBJ_text;
return NULL;
+ }
+
+ if (sscanf(arg, "%63s %63s %d", buf1, buf2, &n) != 3) {
+ /* if scanf couldn't read three values, read type and num and use
+ * default device */
+ sscanf(arg, "%63s %d", buf2, &n);
+ obj->data.sysfs.fd = open_hwmon_sensor(0, buf2, n,
+ &obj->data.sysfs.arg, obj->data.sysfs.devtype);
+ strncpy(obj->data.sysfs.type, buf2, 63);
} else {
- FILE *fp = NULL;
- fp = fopen(buf, "r");
- if (fp) {
- obj->data.tail.logfile =
- malloc(text_buffer_size);
- strcpy(obj->data.tail.logfile, buf);
- obj->data.tail.wantedlines = n1;
- obj->data.tail.interval =
- update_interval * 2;
- fclose(fp);
+ obj->data.sysfs.fd = open_hwmon_sensor(buf1, buf2, n,
+ &obj->data.sysfs.arg, obj->data.sysfs.devtype);
+ strncpy(obj->data.sysfs.type, buf2, 63);
+ }
+#endif /* !__OpenBSD__ */
+
+ END OBJ(top, INFO_TOP)
+ char buf[64];
+ int n;
+
+ if (!arg) {
+ ERR("top needs arguments");
+ obj->type = OBJ_text;
+ // obj->data.s = strdup("${top}");
+ return NULL;
+ }
+ if (sscanf(arg, "%63s %i", buf, &n) == 2) {
+ if (strcmp(buf, "name") == 0) {
+ obj->data.top.type = TOP_NAME;
+ } else if (strcmp(buf, "cpu") == 0) {
+ obj->data.top.type = TOP_CPU;
+ } else if (strcmp(buf, "pid") == 0) {
+ obj->data.top.type = TOP_PID;
+ } else if (strcmp(buf, "mem") == 0) {
+ obj->data.top.type = TOP_MEM;
+ } else if (strcmp(buf, "time") == 0) {
+ obj->data.top.type = TOP_TIME;
} else {
- //fclose (fp);
- CRIT_ERR("tail logfile does not exist, or you do not have correct permissions");
+ ERR("invalid arg for top");
+ return NULL;
}
- }
- } else if (sscanf(arg, "%63s %i %i", buf, &n1, &n2) == 3) {
- if (n1 < 1 || n1 > 30) {
- CRIT_ERR
- ("invalid arg for tail, number of lines must be between 1 and 30");
+ if (n < 1 || n > 10) {
+ CRIT_ERR("invalid arg for top");
+ return NULL;
+ } else {
+ obj->data.top.num = n - 1;
+ top_cpu = 1;
+ }
+ } else {
+ ERR("invalid args given for top");
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");
+ }
+ END OBJ(top_mem, INFO_TOP)
+ char buf[64];
+ int n;
+
+ if (!arg) {
+ ERR("top_mem needs arguments");
+ obj->type = OBJ_text;
+ obj->data.s = strdup("${top_mem}");
return NULL;
- } else {
- FILE *fp;
- fp = fopen(buf, "r");
- if (fp != NULL) {
- obj->data.tail.logfile =
- malloc(text_buffer_size);
- strcpy(obj->data.tail.logfile, buf);
- obj->data.tail.wantedlines = n1;
- obj->data.tail.interval = n2;
- fclose(fp);
+ }
+ if (sscanf(arg, "%63s %i", buf, &n) == 2) {
+ if (strcmp(buf, "name") == 0) {
+ obj->data.top.type = TOP_NAME;
+ } else if (strcmp(buf, "cpu") == 0) {
+ obj->data.top.type = TOP_CPU;
+ } else if (strcmp(buf, "pid") == 0) {
+ obj->data.top.type = TOP_PID;
+ } else if (strcmp(buf, "mem") == 0) {
+ obj->data.top.type = TOP_MEM;
+ } else if (strcmp(buf, "time") == 0) {
+ obj->data.top.type = TOP_TIME;
+ } else {
+ ERR("invalid arg for top");
+ return NULL;
+ }
+ if (n < 1 || n > 10) {
+ CRIT_ERR("invalid arg for top");
+ return NULL;
} else {
- //fclose (fp);
- CRIT_ERR("tail logfile does not exist, or you do not have correct permissions");
+ obj->data.top.num = n - 1;
+ top_mem = 1;
}
+ } else {
+ ERR("invalid args given for top");
+ return NULL;
}
- }
-
- else {
- ERR("invalid args given for tail");
- return NULL;
- }
- obj->data.tail.buffer = malloc(text_buffer_size * 20); /* asumming all else worked */
- END OBJ(head, 0)
+ END OBJ(addr, INFO_NET)
+ if (arg) {
+ obj->data.net = get_net_stat(arg);
+ } else {
+ CRIT_ERR("addr needs argument");
+ }
+#if defined(__linux__)
+ END OBJ(addrs, INFO_NET)
+ if (arg) {
+ obj->data.net = get_net_stat(arg);
+ } else {
+ CRIT_ERR("addrs needs argument");
+ }
+#endif /* __linux__ */
+ END OBJ(tail, 0)
char buf[64];
- int n1, n2;
- if (!arg) {
- ERR("head needs arguments");
- obj->type = OBJ_text;
- obj->data.s = strdup("${head}");
- 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");
+ int n1, n2;
+ struct stat st;
+
+ if (!arg) {
+ ERR("tail needs arguments");
+ obj->type = OBJ_text;
+ obj->data.s = strdup("${tail}");
return NULL;
- } else {
- FILE *fp;
- fp = fopen(buf, "r");
- if (fp != NULL) {
- obj->data.tail.logfile =
- malloc(text_buffer_size);
- strcpy(obj->data.tail.logfile, buf);
- obj->data.tail.wantedlines = n1;
- obj->data.tail.interval =
- update_interval * 2;
- fclose(fp);
+ }
+ 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 NULL;
+ } else {
+ FILE *fp = NULL;
+ int fd;
+
+ obj->data.tail.fd = -1;
+
+ if (stat(buf, &st) == 0) {
+ if (S_ISFIFO(st.st_mode)) {
+ fd = open(buf, O_RDONLY | O_NONBLOCK);
+
+ if (fd == -1) {
+ CRIT_ERR("tail logfile does not exist, or you do "
+ "not have correct permissions");
+ }
+
+ obj->data.tail.fd = fd;
+ } else {
+ fp = fopen(buf, "r");
+ }
+ }
+
+ if (fp || obj->data.tail.fd != -1) {
+ obj->data.tail.logfile = malloc(text_buffer_size);
+ strcpy(obj->data.tail.logfile, buf);
+ obj->data.tail.wantedlines = n1;
+ obj->data.tail.interval = update_interval * 2;
+
+ if (obj->data.tail.fd == -1) {
+ fclose(fp);
+ }
+ } else {
+ // fclose(fp);
+ CRIT_ERR("tail logfile does not exist, or you do not have "
+ "correct permissions");
+ }
+ }
+ } else if (sscanf(arg, "%63s %i %i", buf, &n1, &n2) == 3) {
+ if (n1 < 1 || n1 > 30) {
+ CRIT_ERR("invalid arg for tail, number of lines must be "
+ "between 1 and 30");
+ 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 NULL;
} else {
- //fclose (fp);
- CRIT_ERR("head logfile does not exist, or you do not have correct permissions");
+ FILE *fp = 0;
+ int fd;
+
+ obj->data.tail.fd = -1;
+
+ if (stat(buf, &st) == 0) {
+ if (S_ISFIFO(st.st_mode)) {
+ fd = open(buf, O_RDONLY | O_NONBLOCK);
+
+ if (fd == -1) {
+ CRIT_ERR("tail logfile does not exist, or you do "
+ "not have correct permissions");
+ }
+
+ obj->data.tail.fd = fd;
+ } else {
+ fp = fopen(buf, "r");
+ }
+ }
+
+ if (fp || obj->data.tail.fd != -1) {
+ obj->data.tail.logfile = malloc(text_buffer_size);
+ strcpy(obj->data.tail.logfile, buf);
+ obj->data.tail.wantedlines = n1;
+ obj->data.tail.interval = n2;
+
+ if (obj->data.tail.fd == -1) {
+ fclose(fp);
+ }
+ } else {
+ // fclose(fp);
+ CRIT_ERR("tail logfile does not exist, or you do not have "
+ "correct permissions");
+ }
}
- }
- } else if (sscanf(arg, "%63s %i %i", buf, &n1, &n2) == 3) {
- if (n1 < 1 || n1 > 30) {
- CRIT_ERR
- ("invalid arg for head, number of lines must be between 1 and 30");
+ } else {
+ ERR("invalid args given for tail");
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");
+ }
+ /* asumming all else worked */
+ obj->data.tail.buffer = malloc(text_buffer_size * 20);
+ END OBJ(head, 0)
+ char buf[64];
+ int n1, n2;
+
+ if (!arg) {
+ ERR("head needs arguments");
+ obj->type = OBJ_text;
+ obj->data.s = strdup("${head}");
return NULL;
- } else {
- FILE *fp;
- fp = fopen(buf, "r");
- if (fp != NULL) {
- obj->data.tail.logfile =
- malloc(text_buffer_size);
- strcpy(obj->data.tail.logfile, buf);
- obj->data.tail.wantedlines = n1;
- obj->data.tail.interval = n2;
- fclose(fp);
+ }
+ 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 NULL;
+ } else {
+ FILE *fp;
+
+ fp = fopen(buf, "r");
+ if (fp != NULL) {
+ obj->data.tail.logfile = malloc(text_buffer_size);
+ strcpy(obj->data.tail.logfile, buf);
+ obj->data.tail.wantedlines = n1;
+ obj->data.tail.interval = update_interval * 2;
+ fclose(fp);
+ } else {
+ // fclose(fp);
+ CRIT_ERR("head logfile does not exist, or you do not have "
+ "correct permissions");
+ }
+ }
+ } else if (sscanf(arg, "%63s %i %i", buf, &n1, &n2) == 3) {
+ if (n1 < 1 || n1 > 30) {
+ CRIT_ERR("invalid arg for head, number of lines must be "
+ "between 1 and 30");
+ 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 NULL;
} else {
- //fclose (fp);
- CRIT_ERR("head logfile does not exist, or you do not have correct permissions");
+ FILE *fp;
+
+ fp = fopen(buf, "r");
+ if (fp != NULL) {
+ obj->data.tail.logfile = malloc(text_buffer_size);
+ strcpy(obj->data.tail.logfile, buf);
+ obj->data.tail.wantedlines = n1;
+ obj->data.tail.interval = n2;
+ fclose(fp);
+ } else {
+ // fclose(fp);
+ CRIT_ERR("head logfile does not exist, or you do not have "
+ "correct permissions");
+ }
}
+ } else {
+ ERR("invalid args given for head");
+ return NULL;
}
- }
+ /* asumming all else worked */
+ obj->data.tail.buffer = malloc(text_buffer_size * 20);
+ END OBJ(loadavg, INFO_LOADAVG)
+ int a = 1, b = 2, c = 3, r = 3;
- else {
- ERR("invalid args given for head");
- 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;
- if (arg) {
- r = sscanf(arg, "%d %d %d", &a, &b, &c);
- if (r >= 3 && (c < 1 || c > 3))
- r--;
- if (r >= 2 && (b < 1 || b > 3))
- r--, b = c;
- if (r >= 1 && (a < 1 || a > 3))
- r--, a = b, b = c;
- }
- obj->data.loadavg[0] = (r >= 1) ? (unsigned char) a : 0;
- obj->data.loadavg[1] = (r >= 2) ? (unsigned char) b : 0;
- obj->data.loadavg[2] = (r >= 3) ? (unsigned char) c : 0;
+ if (arg) {
+ r = sscanf(arg, "%d %d %d", &a, &b, &c);
+ if (r >= 3 && (c < 1 || c > 3)) {
+ r--;
+ }
+ if (r >= 2 && (b < 1 || b > 3)) {
+ r--, b = c;
+ }
+ if (r >= 1 && (a < 1 || a > 3)) {
+ r--, a = b, b = c;
+ }
+ }
+ obj->data.loadavg[0] = (r >= 1) ? (unsigned char) a : 0;
+ obj->data.loadavg[1] = (r >= 2) ? (unsigned char) b : 0;
+ obj->data.loadavg[2] = (r >= 3) ? (unsigned char) c : 0;
END OBJ(if_empty, 0)
if (blockdepth >= MAX_IF_BLOCK_DEPTH) {
CRIT_ERR("MAX_IF_BLOCK_DEPTH exceeded");
}
- if (!arg) {
- ERR("if_empty needs an argument");
- obj->data.ifblock.s = 0;
- } else
- obj->data.ifblock.s = strdup(arg);
- blockstart[blockdepth] = object_count;
- obj->data.ifblock.pos = object_count + 2;
- blockdepth++;
+ if (!arg) {
+ ERR("if_empty needs an argument");
+ obj->data.ifblock.s = 0;
+ } else {
+ obj->data.ifblock.s = strdup(arg);
+ }
+ blockstart[blockdepth] = object_count;
+ obj->data.ifblock.pos = object_count + 2;
+ blockdepth++;
END OBJ(if_existing, 0)
if (blockdepth >= MAX_IF_BLOCK_DEPTH) {
CRIT_ERR("MAX_IF_BLOCK_DEPTH exceeded");
}
- if (!arg) {
- ERR("if_existing needs an argument or two");
- obj->data.ifblock.s = NULL;
- obj->data.ifblock.str = NULL;
- } else {
- char buf1[256], buf2[256];
- int r = sscanf(arg, "%255s %255[^\n]", buf1, buf2);
- if (r == 1) {
- obj->data.ifblock.s = strdup(buf1);
- obj->data.ifblock.str = NULL;
+ if (!arg) {
+ ERR("if_existing needs an argument or two");
+ obj->data.ifblock.s = NULL;
+ obj->data.ifblock.str = NULL;
} else {
- obj->data.ifblock.s = strdup(buf1);
- obj->data.ifblock.str = strdup(buf2);
+ char buf1[256], buf2[256];
+ int r = sscanf(arg, "%255s %255[^\n]", buf1, buf2);
+
+ if (r == 1) {
+ obj->data.ifblock.s = strdup(buf1);
+ obj->data.ifblock.str = NULL;
+ } else {
+ obj->data.ifblock.s = strdup(buf1);
+ obj->data.ifblock.str = strdup(buf2);
+ }
}
- }
- blockstart[blockdepth] = object_count;
- obj->data.ifblock.pos = object_count + 2;
- blockdepth++;
+ blockstart[blockdepth] = object_count;
+ obj->data.ifblock.pos = object_count + 2;
+ blockdepth++;
END OBJ(if_mounted, 0)
if (blockdepth >= MAX_IF_BLOCK_DEPTH) {
CRIT_ERR("MAX_IF_BLOCK_DEPTH exceeded");
}
- if (!arg) {
- ERR("if_mounted needs an argument");
- obj->data.ifblock.s = 0;
- } else
- obj->data.ifblock.s = strdup(arg);
- blockstart[blockdepth] = object_count;
- obj->data.ifblock.pos = object_count + 2;
- blockdepth++;
+ if (!arg) {
+ ERR("if_mounted needs an argument");
+ obj->data.ifblock.s = 0;
+ } else {
+ obj->data.ifblock.s = strdup(arg);
+ }
+ blockstart[blockdepth] = object_count;
+ obj->data.ifblock.pos = object_count + 2;
+ blockdepth++;
END OBJ(if_running, 0)
if (blockdepth >= MAX_IF_BLOCK_DEPTH) {
CRIT_ERR("MAX_IF_BLOCK_DEPTH exceeded");
}
- if (arg) {
- char buf[256];
- snprintf(buf, 256, "pidof %s >/dev/null", arg);
- obj->data.ifblock.s = strdup(buf);
- } else {
- ERR("if_running needs an argument");
- obj->data.ifblock.s = 0;
- }
- blockstart[blockdepth] = object_count;
- obj->data.ifblock.pos = object_count + 2;
- blockdepth++;
+ if (arg) {
+ char buf[256];
+
+ snprintf(buf, 256, "pidof %s >/dev/null", arg);
+ obj->data.ifblock.s = strdup(buf);
+ } else {
+ ERR("if_running needs an argument");
+ obj->data.ifblock.s = 0;
+ }
+ blockstart[blockdepth] = object_count;
+ obj->data.ifblock.pos = object_count + 2;
+ blockdepth++;
END OBJ(kernel, 0)
- END OBJ(machine, 0)
- END OBJ(mails, INFO_MAIL)
- END OBJ(mboxscan, 0)
- obj->data.mboxscan.args = (char*)malloc(TEXT_BUFFER_SIZE);
- obj->data.mboxscan.output = (char*)malloc(text_buffer_size);
+ END OBJ(machine, 0)
+ END OBJ(mails, 0)
+ float n1;
+ char box[256], dst[256];
+
+ if (!arg) {
+ n1 = 9.5;
+ strncpy(box, MAIL_FILE, sizeof(box));
+ } else {
+ if (sscanf(arg, "%s %f", box, &n1) != 2) {
+ n1 = 9.5;
+ strncpy(box, arg, sizeof(box));
+ }
+ }
+
+ variable_substitute(box, dst, sizeof(dst));
+ obj->data.local_mail.box = strdup(dst);
+ obj->data.local_mail.interval = n1;
+ END OBJ(mboxscan, 0)
+ obj->data.mboxscan.args = (char *) malloc(text_buffer_size);
+ obj->data.mboxscan.output = (char *) malloc(text_buffer_size);
/* if '1' (in mboxscan.c) then there was SIGUSR1, hmm */
obj->data.mboxscan.output[0] = 1;
- strncpy(obj->data.mboxscan.args, arg, TEXT_BUFFER_SIZE);
- END OBJ(mem, INFO_MEM)
- END OBJ(memmax, INFO_MEM)
- END OBJ(memperc, INFO_MEM)
- END OBJ(membar, INFO_MEM)
- (void) scan_bar(arg, &obj->data.pair.a, &obj->data.pair.b);
+ strncpy(obj->data.mboxscan.args, arg, text_buffer_size);
+ END OBJ(mem, INFO_MEM)
+ END OBJ(memmax, INFO_MEM)
+ END OBJ(memperc, INFO_MEM)
+ END OBJ(membar, INFO_MEM)
+ scan_bar(arg, &obj->data.pair.a, &obj->data.pair.b);
END OBJ(memgraph, INFO_MEM)
- (void) scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d, &obj->e);
- END OBJ(mixer, INFO_MIXER) obj->data.l = mixer_init(arg);
- END OBJ(mixerl, INFO_MIXER) obj->data.l = mixer_init(arg);
- END OBJ(mixerr, INFO_MIXER) obj->data.l = mixer_init(arg);
+ char *buf = scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d,
+ &obj->e);
+
+ if (buf) {
+ free(buf);
+ }
+ END OBJ(mixer, INFO_MIXER)
+ obj->data.l = mixer_init(arg);
+ END OBJ(mixerl, INFO_MIXER)
+ obj->data.l = mixer_init(arg);
+ END OBJ(mixerr, INFO_MIXER)
+ obj->data.l = mixer_init(arg);
END OBJ(mixerbar, INFO_MIXER)
- scan_mixer_bar(arg, &obj->data.mixerbar.l,
- &obj->data.mixerbar.w, &obj->data.mixerbar.h);
+ scan_mixer_bar(arg, &obj->data.mixerbar.l, &obj->data.mixerbar.w,
+ &obj->data.mixerbar.h);
END OBJ(mixerlbar, INFO_MIXER)
- scan_mixer_bar(arg, &obj->data.mixerbar.l,
- &obj->data.mixerbar.w, &obj->data.mixerbar.h);
+ scan_mixer_bar(arg, &obj->data.mixerbar.l, &obj->data.mixerbar.w,
+ &obj->data.mixerbar.h);
END OBJ(mixerrbar, INFO_MIXER)
- scan_mixer_bar(arg, &obj->data.mixerbar.l,
- &obj->data.mixerbar.w, &obj->data.mixerbar.h);
- END
- OBJ(new_mails, INFO_MAIL)
- END OBJ(nodename, 0)
- END OBJ(processes, INFO_PROCS)
- END OBJ(running_processes, INFO_RUN_PROCS)
- END OBJ(shadecolor, 0)
+ scan_mixer_bar(arg, &obj->data.mixerbar.l, &obj->data.mixerbar.w,
+ &obj->data.mixerbar.h);
+ END OBJ(new_mails, 0)
+ float n1;
+ char box[256], dst[256];
+
+ if (!arg) {
+ n1 = 9.5;
+ strncpy(box, MAIL_FILE, sizeof(box));
+ } else {
+ if (sscanf(arg, "%s %f", box, &n1) != 2) {
+ n1 = 9.5;
+ strncpy(box, arg, sizeof(box));
+ }
+ }
+
+ variable_substitute(box, dst, sizeof(dst));
+ obj->data.local_mail.box = strdup(dst);
+ obj->data.local_mail.interval = n1;
+ END OBJ(nodename, 0)
+ END OBJ(processes, INFO_PROCS)
+ END OBJ(running_processes, INFO_RUN_PROCS)
+ END OBJ(shadecolor, 0)
#ifdef X11
obj->data.l = arg ? get_x11_color(arg) : default_bg_color;
#endif /* X11 */
END OBJ(stippled_hr, 0)
#ifdef X11
int a = stippled_borders, b = 1;
- if (arg) {
- if (sscanf(arg, "%d %d", &a, &b) != 2)
- sscanf(arg, "%d", &b);
- }
- if (a <= 0)
- a = 1;
- obj->data.pair.a = a;
- obj->data.pair.b = b;
+
+ if (arg) {
+ if (sscanf(arg, "%d %d", &a, &b) != 2) {
+ sscanf(arg, "%d", &b);
+ }
+ }
+ if (a <= 0) {
+ a = 1;
+ }
+ obj->data.pair.a = a;
+ obj->data.pair.b = b;
#endif /* X11 */
END OBJ(swap, INFO_MEM)
- END OBJ(swapmax, INFO_MEM)
- END OBJ(swapperc, INFO_MEM)
- END OBJ(swapbar, INFO_MEM)
- (void) scan_bar(arg, &obj->data.pair.a, &obj->data.pair.b);
+ END OBJ(swapmax, INFO_MEM)
+ END OBJ(swapperc, INFO_MEM)
+ END OBJ(swapbar, INFO_MEM)
+ scan_bar(arg, &obj->data.pair.a, &obj->data.pair.b);
END OBJ(sysname, 0)
#ifndef __OpenBSD__
- END OBJ(temp1, INFO_SYSFS) obj->type = OBJ_i2c;
- obj->data.sysfs.fd =
- open_i2c_sensor(0, "temp", 1, &obj->data.sysfs.arg,
- obj->data.sysfs.devtype);
- END OBJ(temp2, INFO_SYSFS) obj->type = OBJ_i2c;
- obj->data.sysfs.fd =
- open_i2c_sensor(0, "temp", 2, &obj->data.sysfs.arg,
- obj->data.sysfs.devtype);
+ END OBJ(temp1, INFO_SYSFS)
+ obj->type = OBJ_i2c;
+ obj->data.sysfs.fd = open_i2c_sensor(0, "temp", 1,
+ &obj->data.sysfs.arg, obj->data.sysfs.devtype);
+ END OBJ(temp2, INFO_SYSFS)
+ obj->type = OBJ_i2c;
+ obj->data.sysfs.fd = open_i2c_sensor(0, "temp", 2,
+ &obj->data.sysfs.arg, obj->data.sysfs.devtype);
#endif
- END OBJ(time, 0) obj->data.s = strdup(arg ? arg : "%F %T");
- END OBJ(utime, 0) obj->data.s = strdup(arg ? arg : "%F %T");
+ END OBJ(time, 0)
+ obj->data.s = strdup(arg ? arg : "%F %T");
+ END OBJ(utime, 0)
+ obj->data.s = strdup(arg ? arg : "%F %T");
END OBJ(tztime, 0)
char buf1[256], buf2[256], *fmt, *tz;
+
fmt = tz = NULL;
if (arg) {
int nArgs = sscanf(arg, "%255s %255[^\n]", buf1, buf2);
+
switch (nArgs) {
case 2:
tz = buf1;
#ifdef HAVE_ICONV
END OBJ(iconv_start, 0)
if (iconv_converting) {
- CRIT_ERR("You must stop your last iconv conversion before starting another");
+ CRIT_ERR("You must stop your last iconv conversion before "
+ "starting another");
}
if (arg) {
char iconv_from[CODEPAGE_LENGTH];
char iconv_to[CODEPAGE_LENGTH];
+
if (sscanf(arg, "%s %s", iconv_from, iconv_to) != 2) {
CRIT_ERR("Invalid arguments for iconv_start");
} else {
iconv_t new_iconv;
+
new_iconv = iconv_open(iconv_to, iconv_from);
- if (new_iconv == (iconv_t)(-1)) {
+ if (new_iconv == (iconv_t) (-1)) {
ERR("Can't convert from %s to %s.", iconv_from, iconv_to);
} else {
obj->a = register_iconv(&new_iconv);
}
END OBJ(iconv_stop, 0)
iconv_converting = 0;
-
+
#endif
END OBJ(totaldown, INFO_NET)
- if(arg) {
+ if (arg) {
obj->data.net = get_net_stat(arg);
- }
- else {
+ } else {
CRIT_ERR("totaldown needs argument");
}
- END OBJ(totalup, INFO_NET) obj->data.net = get_net_stat(arg);
- if(arg) {
+ END OBJ(totalup, INFO_NET)
obj->data.net = get_net_stat(arg);
- }
- else {
- CRIT_ERR("totalup needs argument");
- }
+ if (arg) {
+ obj->data.net = get_net_stat(arg);
+ } else {
+ CRIT_ERR("totalup needs argument");
+ }
END OBJ(updates, 0)
- END OBJ(alignr, 0) obj->data.i = arg ? atoi(arg) : 0;
- END OBJ(alignc, 0) obj->data.i = arg ? atoi(arg) : 0;
+ END OBJ(alignr, 0)
+ obj->data.i = arg ? atoi(arg) : 0;
+ END OBJ(alignc, 0)
+ obj->data.i = arg ? atoi(arg) : 0;
END OBJ(upspeed, INFO_NET)
- if(arg) {
+ if (arg) {
obj->data.net = get_net_stat(arg);
- }
- else {
+ } else {
CRIT_ERR("upspeed needs argument");
}
- END OBJ(upspeedf, INFO_NET)
- if(arg) {
+ END OBJ(upspeedf, INFO_NET)
+ if (arg) {
obj->data.net = get_net_stat(arg);
- }
- else {
+ } else {
CRIT_ERR("upspeedf needs argument");
}
END OBJ(upspeedgraph, INFO_NET)
- (void) scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d, &obj->e);
- char buf[64];
- sscanf(arg, "%63s %*i,%*i %*i", buf);
- obj->data.net = get_net_stat(buf);
- if (sscanf(arg, "%*s %d,%d %*d", &obj->b, &obj->a) <= 1) {
- if (sscanf(arg, "%*s %d,%d", &obj->a, &obj->a) <= 1) {
- obj->a = 0;
- obj->b = 25;
- }
- }
- END OBJ(uptime_short, INFO_UPTIME) END OBJ(uptime, INFO_UPTIME) END
+ char *buf = scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d,
+ &obj->e);
+
+ if (buf) {
+ obj->data.net = get_net_stat(buf);
+ free(buf);
+ }
+ END OBJ(uptime_short, INFO_UPTIME)
+ END OBJ(uptime, INFO_UPTIME)
+ END OBJ(user_names, INFO_USERS)
+ END OBJ(user_times, INFO_USERS)
+ END OBJ(user_terms, INFO_USERS)
+ END OBJ(user_number, INFO_USERS)
+ END OBJ(gw_iface, INFO_GW)
+ END OBJ(gw_ip, INFO_GW)
+ END OBJ(if_gw, INFO_GW)
#ifndef __OpenBSD__
- OBJ(adt746xcpu, 0) END OBJ(adt746xfan, 0) END
+ END OBJ(adt746xcpu, 0)
+ END OBJ(adt746xfan, 0)
#endif /* !__OpenBSD__ */
-#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
- OBJ(apm_adapter, 0) END
- OBJ(apm_battery_life, 0) END
- OBJ(apm_battery_time, 0) END
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
+ || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
+ END OBJ(apm_adapter, 0)
+ END OBJ(apm_battery_life, 0)
+ END OBJ(apm_battery_time, 0)
#endif /* __FreeBSD__ */
- OBJ(imap_unseen, 0)
+ END OBJ(imap_unseen, 0)
if (arg) {
// proccss
obj->data.mail = parse_mail_args(IMAP, arg);
} else {
obj->global_mode = 1;
}
- END
- OBJ(imap_messages, 0)
+ END OBJ(imap_messages, 0)
if (arg) {
// proccss
obj->data.mail = parse_mail_args(IMAP, arg);
} else {
obj->global_mode = 1;
}
- END
- OBJ(pop3_unseen, 0)
+ END OBJ(pop3_unseen, 0)
if (arg) {
// proccss
obj->data.mail = parse_mail_args(POP3, arg);
} else {
obj->global_mode = 1;
}
- END
- OBJ(pop3_used, 0)
+ END OBJ(pop3_used, 0)
if (arg) {
// proccss
obj->data.mail = parse_mail_args(POP3, arg);
} else {
obj->global_mode = 1;
}
- END
+#ifdef SMAPI
+ END OBJ(smapi, 0)
+ if (arg)
+ obj->data.s = strdup(arg);
+ else
+ ERR("smapi needs an argument");
+ END OBJ(if_smapi_bat_installed, 0)
+ if (blockdepth >= MAX_IF_BLOCK_DEPTH) {
+ CRIT_ERR("MAX_IF_BLOCK_DEPTH exceeded");
+ }
+ if (!arg) {
+ ERR("if_smapi_bat_installed needs an argument");
+ obj->data.ifblock.s = 0;
+ } else
+ obj->data.ifblock.s = strdup(arg);
+ blockstart[blockdepth] = object_count;
+ obj->data.ifblock.pos = object_count + 2;
+ blockdepth++;
+ END OBJ(smapi_bat_perc, 0)
+ if (arg)
+ obj->data.s = strdup(arg);
+ else
+ ERR("smapi_bat_perc needs an argument");
+ END OBJ(smapi_bat_bar, 0)
+ if(arg) {
+ int cnt;
+ if(sscanf(arg, "%i %n", &obj->data.i, &cnt) <= 0) {
+ ERR("first argument to smapi_bat_bar must be an integer value");
+ obj->data.i = -1;
+ } else {
+ obj->b = 4;
+ arg = scan_bar(arg + cnt, &obj->a, &obj->b);
+ }
+ } else
+ ERR("if_smapi_bat_bar needs an argument");
+#endif /* SMAPI */
#ifdef MPD
- OBJ(mpd_artist, INFO_MPD) END
- OBJ(mpd_title, INFO_MPD)
- {
+ END OBJ(mpd_artist, INFO_MPD)
+ END OBJ(mpd_title, INFO_MPD)
if (arg) {
- sscanf (arg, "%d", &info.mpd.max_title_len);
+ sscanf(arg, "%d", &info.mpd.max_title_len);
if (info.mpd.max_title_len > 0) {
info.mpd.max_title_len++;
} else {
- CRIT_ERR ("mpd_title: invalid length argument");
+ CRIT_ERR("mpd_title: invalid length argument");
}
- } else {
- info.mpd.max_title_len = 0;
- }
- }
- END OBJ(mpd_random, INFO_MPD)
- END OBJ(mpd_repeat, INFO_MPD)
- END OBJ(mpd_elapsed, INFO_MPD)
- END OBJ(mpd_length, INFO_MPD)
- END OBJ(mpd_track, INFO_MPD)
- END OBJ(mpd_name, INFO_MPD)
- END OBJ(mpd_file, INFO_MPD)
- END OBJ(mpd_percent, INFO_MPD)
- END OBJ(mpd_album, INFO_MPD)
- END OBJ(mpd_vol, INFO_MPD)
- END OBJ(mpd_bitrate, INFO_MPD)
- END OBJ(mpd_status, INFO_MPD)
- END OBJ(mpd_bar, INFO_MPD)
- (void) scan_bar(arg, &obj->data.pair.a, &obj->data.pair.b);
- END OBJ(mpd_smart, INFO_MPD) END
+ } else {
+ info.mpd.max_title_len = 0;
+ }
+ END OBJ(mpd_random, INFO_MPD)
+ END OBJ(mpd_repeat, INFO_MPD)
+ END OBJ(mpd_elapsed, INFO_MPD)
+ END OBJ(mpd_length, INFO_MPD)
+ END OBJ(mpd_track, INFO_MPD)
+ END OBJ(mpd_name, INFO_MPD)
+ END OBJ(mpd_file, INFO_MPD)
+ END OBJ(mpd_percent, INFO_MPD)
+ END OBJ(mpd_album, INFO_MPD)
+ END OBJ(mpd_vol, INFO_MPD)
+ END OBJ(mpd_bitrate, INFO_MPD)
+ END OBJ(mpd_status, INFO_MPD)
+ END OBJ(mpd_bar, INFO_MPD)
+ scan_bar(arg, &obj->data.pair.a, &obj->data.pair.b);
+ END OBJ(mpd_smart, INFO_MPD)
#endif
#ifdef XMMS2
- OBJ(xmms2_artist, INFO_XMMS2)
- END OBJ(xmms2_album, INFO_XMMS2)
- END OBJ(xmms2_title, INFO_XMMS2)
- END OBJ(xmms2_genre, INFO_XMMS2)
- END OBJ(xmms2_comment, INFO_XMMS2)
- END OBJ(xmms2_decoder, INFO_XMMS2)
- END OBJ(xmms2_transport, INFO_XMMS2)
- END OBJ(xmms2_url, INFO_XMMS2)
- END OBJ(xmms2_tracknr, INFO_XMMS2)
- END OBJ(xmms2_bitrate, INFO_XMMS2)
- END OBJ(xmms2_date, INFO_XMMS2)
- END OBJ(xmms2_id, INFO_XMMS2)
- END OBJ(xmms2_duration, INFO_XMMS2)
- END OBJ(xmms2_elapsed, INFO_XMMS2)
- END OBJ(xmms2_size, INFO_XMMS2)
- END OBJ(xmms2_status, INFO_XMMS2)
- END OBJ(xmms2_percent, INFO_XMMS2)
- END OBJ(xmms2_bar, INFO_XMMS2)
- (void) scan_bar(arg, &obj->data.pair.a, &obj->data.pair.b);
- END OBJ(xmms2_smart, INFO_XMMS2)
- END
+ END OBJ(xmms2_artist, INFO_XMMS2)
+ END OBJ(xmms2_album, INFO_XMMS2)
+ END OBJ(xmms2_title, INFO_XMMS2)
+ END OBJ(xmms2_genre, INFO_XMMS2)
+ END OBJ(xmms2_comment, INFO_XMMS2)
+ END OBJ(xmms2_url, INFO_XMMS2)
+ END OBJ(xmms2_tracknr, INFO_XMMS2)
+ END OBJ(xmms2_bitrate, INFO_XMMS2)
+ END OBJ(xmms2_date, INFO_XMMS2)
+ END OBJ(xmms2_id, INFO_XMMS2)
+ END OBJ(xmms2_duration, INFO_XMMS2)
+ END OBJ(xmms2_elapsed, INFO_XMMS2)
+ END OBJ(xmms2_size, INFO_XMMS2)
+ END OBJ(xmms2_status, INFO_XMMS2)
+ END OBJ(xmms2_percent, INFO_XMMS2)
+ END OBJ(xmms2_bar, INFO_XMMS2)
+ scan_bar(arg, &obj->data.pair.a, &obj->data.pair.b);
+ END OBJ(xmms2_smart, INFO_XMMS2)
+ END OBJ(xmms2_playlist, INFO_XMMS2)
+ END OBJ(xmms2_timesplayed, INFO_XMMS2)
#endif
#ifdef AUDACIOUS
- OBJ(audacious_status, INFO_AUDACIOUS) END
- OBJ(audacious_title, INFO_AUDACIOUS)
- {
- if (arg) {
- sscanf (arg, "%d", &info.audacious.max_title_len);
- if (info.audacious.max_title_len > 0) {
- info.audacious.max_title_len++;
- } else {
- CRIT_ERR ("audacious_title: invalid length argument");
- }
- } else {
+ END OBJ(audacious_status, INFO_AUDACIOUS)
+ END OBJ(audacious_title, INFO_AUDACIOUS)
+ if (arg) {
+ sscanf(arg, "%d", &info.audacious.max_title_len);
+ if (info.audacious.max_title_len > 0) {
info.audacious.max_title_len++;
- }
- }
- END
- OBJ(audacious_length, INFO_AUDACIOUS) END
- OBJ(audacious_length_seconds, INFO_AUDACIOUS) END
- OBJ(audacious_position, INFO_AUDACIOUS) END
- OBJ(audacious_position_seconds, INFO_AUDACIOUS) END
- OBJ(audacious_bitrate, INFO_AUDACIOUS) END
- OBJ(audacious_frequency, INFO_AUDACIOUS) END
- OBJ(audacious_channels, INFO_AUDACIOUS) END
- OBJ(audacious_filename, INFO_AUDACIOUS) END
- OBJ(audacious_playlist_length, INFO_AUDACIOUS) END
- OBJ(audacious_playlist_position, INFO_AUDACIOUS) END
- OBJ(audacious_bar, INFO_AUDACIOUS)
- (void) scan_bar(arg, &obj->a, &obj->b);
- END
+ } else {
+ CRIT_ERR("audacious_title: invalid length argument");
+ }
+ }
+ END OBJ(audacious_length, INFO_AUDACIOUS)
+ END OBJ(audacious_length_seconds, INFO_AUDACIOUS)
+ END OBJ(audacious_position, INFO_AUDACIOUS)
+ END OBJ(audacious_position_seconds, INFO_AUDACIOUS)
+ END OBJ(audacious_bitrate, INFO_AUDACIOUS)
+ END OBJ(audacious_frequency, INFO_AUDACIOUS)
+ END OBJ(audacious_channels, INFO_AUDACIOUS)
+ END OBJ(audacious_filename, INFO_AUDACIOUS)
+ END OBJ(audacious_playlist_length, INFO_AUDACIOUS)
+ END OBJ(audacious_playlist_position, INFO_AUDACIOUS)
+ END OBJ(audacious_bar, INFO_AUDACIOUS)
+ scan_bar(arg, &obj->a, &obj->b);
#endif
#ifdef BMPX
- OBJ(bmpx_title, INFO_BMPX)
+ END OBJ(bmpx_title, INFO_BMPX)
memset(&(info.bmpx), 0, sizeof(struct bmpx_s));
- END
- OBJ(bmpx_artist, INFO_BMPX)
+ END OBJ(bmpx_artist, INFO_BMPX)
memset(&(info.bmpx), 0, sizeof(struct bmpx_s));
- END
- OBJ(bmpx_album, INFO_BMPX)
+ END OBJ(bmpx_album, INFO_BMPX)
memset(&(info.bmpx), 0, sizeof(struct bmpx_s));
- END
- OBJ(bmpx_track, INFO_BMPX)
+ END OBJ(bmpx_track, INFO_BMPX)
memset(&(info.bmpx), 0, sizeof(struct bmpx_s));
- END
- OBJ(bmpx_uri, INFO_BMPX)
+ END OBJ(bmpx_uri, INFO_BMPX)
memset(&(info.bmpx), 0, sizeof(struct bmpx_s));
- END
- OBJ(bmpx_bitrate, INFO_BMPX)
+ END OBJ(bmpx_bitrate, INFO_BMPX)
memset(&(info.bmpx), 0, sizeof(struct bmpx_s));
- END
#endif
#ifdef RSS
- OBJ(rss, 0)
+ END OBJ(rss, 0)
if (arg) {
int argc, delay, act_par;
- char *uri = (char *)malloc(128 * sizeof(char));
- char *action = (char *)malloc(64 * sizeof(char));
+ char *uri = (char *) malloc(128 * sizeof(char));
+ char *action = (char *) malloc(64 * sizeof(char));
- argc = sscanf(arg, "%127s %d %63s %d", uri, &delay, action, &act_par);
+ argc = sscanf(arg, "%127s %d %63s %d", uri, &delay, action,
+ &act_par);
obj->data.rss.uri = uri;
obj->data.rss.delay = delay;
obj->data.rss.action = action;
obj->data.rss.act_par = act_par;
init_rss_info();
- } else
- CRIT_ERR("rss needs arguments: <uri> <delay in minutes> <action> [act_par]");
-
- END
+ } else {
+ CRIT_ERR("rss needs arguments: <uri> <delay in minutes> <action> "
+ "[act_par]");
+ }
#endif
#ifdef HDDTEMP
- OBJ(hddtemp, 0)
- if (!arg || scan_hddtemp(arg, &obj->data.hddtemp.dev,
- &obj->data.hddtemp.addr, &obj->data.hddtemp.port)) {
+ END OBJ(hddtemp, 0)
+ if (!arg || scan_hddtemp(arg, &obj->data.hddtemp.dev,
+ &obj->data.hddtemp.addr, &obj->data.hddtemp.port)) {
ERR("hddtemp needs arguments");
obj->type = OBJ_text;
obj->data.s = strdup("${hddtemp}");
return NULL;
}
- END
#endif
#ifdef TCP_PORT_MONITOR
- OBJ(tcp_portmon, INFO_TCP_PORT_MONITOR)
+ END OBJ(tcp_portmon, INFO_TCP_PORT_MONITOR)
int argc, port_begin, port_end, item, connection_index;
- char itembuf[32];
- memset(itembuf,0,sizeof(itembuf));
- connection_index=0;
- /* massive argument checking */
- if (!arg) {
- CRIT_ERR("tcp_portmon: needs arguments");
- }
- argc=sscanf(arg, "%d %d %31s %d", &port_begin, &port_end, itembuf, &connection_index);
- if ( (argc != 3) && (argc != 4) )
- {
- CRIT_ERR("tcp_portmon: requires 3 or 4 arguments");
- }
- if ( (port_begin<1) || (port_begin>65535) || (port_end<1) || (port_end>65535) )
- {
- CRIT_ERR("tcp_portmon: port values must be from 1 to 65535");
- }
- if ( port_begin > port_end )
- {
- CRIT_ERR("tcp_portmon: starting port must be <= ending port");
- }
- if ( strncmp(itembuf,"count",31) == 0 )
- item=COUNT;
- else if ( strncmp(itembuf,"rip",31) == 0 )
- item=REMOTEIP;
- else if ( strncmp(itembuf,"rhost",31) == 0 )
- item=REMOTEHOST;
- else if ( strncmp(itembuf,"rport",31) == 0 )
- item=REMOTEPORT;
- else if ( strncmp(itembuf,"rservice",31) == 0 )
- item=REMOTESERVICE;
- else if ( strncmp(itembuf,"lip",31) == 0 )
- item=LOCALIP;
- else if ( strncmp(itembuf,"lhost",31) == 0 )
- item=LOCALHOST;
- else if ( strncmp(itembuf,"lport",31) == 0 )
- item=LOCALPORT;
- else if ( strncmp(itembuf,"lservice",31) == 0 )
- item=LOCALSERVICE;
- else
- {
- CRIT_ERR("tcp_portmon: invalid item specified");
- }
- if ( (argc==3) && (item!=COUNT) )
- {
- CRIT_ERR("tcp_portmon: 3 argument form valid only for \"count\" item");
- }
- if ( (argc==4) && (connection_index<0) )
- {
- CRIT_ERR("tcp_portmon: connection index must be non-negative");
- }
- /* ok, args looks good. save the text object data */
- obj->data.tcp_port_monitor.port_range_begin = (in_port_t)port_begin;
- obj->data.tcp_port_monitor.port_range_end = (in_port_t)port_end;
- obj->data.tcp_port_monitor.item = item;
- obj->data.tcp_port_monitor.connection_index = 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 ();
- if ( !info.p_tcp_port_monitor_collection )
- {
- CRIT_ERR("tcp_portmon: unable to create port monitor collection");
+ char itembuf[32];
+
+ memset(itembuf, 0, sizeof(itembuf));
+ connection_index = 0;
+ /* massive argument checking */
+ if (!arg) {
+ CRIT_ERR("tcp_portmon: needs arguments");
+ }
+ argc = sscanf(arg, "%d %d %31s %d", &port_begin, &port_end, itembuf,
+ &connection_index);
+ if ((argc != 3) && (argc != 4)) {
+ CRIT_ERR("tcp_portmon: requires 3 or 4 arguments");
+ }
+ if ((port_begin < 1) || (port_begin > 65535) || (port_end < 1)
+ || (port_end > 65535)) {
+ CRIT_ERR("tcp_portmon: port values must be from 1 to 65535");
+ }
+ if (port_begin > port_end) {
+ CRIT_ERR("tcp_portmon: starting port must be <= ending port");
+ }
+ if (strncmp(itembuf, "count", 31) == 0) {
+ item = COUNT;
+ } else if (strncmp(itembuf, "rip", 31) == 0) {
+ item = REMOTEIP;
+ } else if (strncmp(itembuf, "rhost", 31) == 0) {
+ item = REMOTEHOST;
+ } else if (strncmp(itembuf, "rport", 31) == 0) {
+ item = REMOTEPORT;
+ } else if (strncmp(itembuf, "rservice", 31) == 0) {
+ item = REMOTESERVICE;
+ } else if (strncmp(itembuf, "lip", 31) == 0) {
+ item = LOCALIP;
+ } else if (strncmp(itembuf, "lhost", 31) == 0) {
+ item = LOCALHOST;
+ } else if (strncmp(itembuf, "lport", 31) == 0) {
+ item = LOCALPORT;
+ } else if (strncmp(itembuf, "lservice", 31) == 0) {
+ item = LOCALSERVICE;
+ } else {
+ CRIT_ERR("tcp_portmon: invalid item specified");
}
- }
+ if ((argc == 3) && (item != COUNT)) {
+ CRIT_ERR("tcp_portmon: 3 argument form valid only for \"count\" "
+ "item");
+ }
+ if ((argc == 4) && (connection_index < 0)) {
+ CRIT_ERR("tcp_portmon: connection index must be non-negative");
+ }
+ /* ok, args looks good. save the text object data */
+ obj->data.tcp_port_monitor.port_range_begin = (in_port_t) port_begin;
+ obj->data.tcp_port_monitor.port_range_end = (in_port_t) port_end;
+ obj->data.tcp_port_monitor.item = item;
+ obj->data.tcp_port_monitor.connection_index = connection_index;
- /* 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_args );
- if ( !p_monitor )
- {
- CRIT_ERR("tcp_portmon: unable to create port monitor");
+ /* 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();
+ if (!info.p_tcp_port_monitor_collection) {
+ CRIT_ERR("tcp_portmon: unable to create port monitor "
+ "collection");
+ }
}
- /* add the newly created monitor to the collection */
- if ( insert_tcp_port_monitor_into_collection( info.p_tcp_port_monitor_collection,
- p_monitor ) != 0 )
- {
- CRIT_ERR("tcp_portmon: unable to add port monitor to 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_args);
+
+ if (!p_monitor) {
+ CRIT_ERR("tcp_portmon: unable to create port monitor");
+ }
+ /* add the newly created monitor to the collection */
+ if (insert_tcp_port_monitor_into_collection(
+ info.p_tcp_port_monitor_collection, p_monitor) != 0) {
+ CRIT_ERR("tcp_portmon: unable to add port monitor to "
+ "collection");
+ }
}
- }
- END
#endif
- OBJ(entropy_avail, INFO_ENTROPY) END
- OBJ(entropy_poolsize, INFO_ENTROPY) END
- OBJ(entropy_bar, INFO_ENTROPY)
- (void) scan_bar(arg, &obj->a, &obj->b);
- END
-
- {
+ END OBJ(entropy_avail, INFO_ENTROPY)
+ END OBJ(entropy_poolsize, INFO_ENTROPY)
+ END OBJ(entropy_bar, INFO_ENTROPY)
+ scan_bar(arg, &obj->a, &obj->b);
+ END {
char buf[256];
+
ERR("unknown variable %s", s);
obj->type = OBJ_text;
snprintf(buf, 256, "${%s}", s);
return obj;
}
-static struct text_object_list *extract_variable_text_internal(const char *p)
+static struct text_object_list *extract_variable_text_internal(const char *const_p)
{
struct text_object_list *retval;
struct text_object *obj;
- const char *s = p;
+ char *p, *s, *orig_p;
+ long line;
+
+ p = strdup(const_p);
+ s = orig_p = p;
retval = malloc(sizeof(struct text_object_list));
memset(retval, 0, sizeof(struct text_object_list));
retval->text_object_count = 0;
- long line = text_lines;
+ line = text_lines;
while (*p) {
if (*p == '\n') {
line++;
}
if (*p == '$') {
- *(char *) p = '\0';
+ *p = '\0';
obj = create_plain_text(s);
- if(obj != NULL) {
+ if (obj != NULL) {
// allocate memory for the object
- retval->text_objects = realloc(retval->text_objects,
- sizeof(struct text_object) * (retval->text_object_count+1));
+ 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));
+ memcpy(&retval->text_objects[retval->text_object_count++], obj,
+ sizeof(struct text_object));
free(obj);
}
- *(char *) p = '$';
+ *p = '$';
p++;
s = p;
/* variable is either $foo or ${foo} */
if (*p == '{') {
unsigned int brl = 1, brr = 0;
+
p++;
s = p;
while (*p && brl != brr) {
- if (*p == '{') brl++;
- if (*p == '}') brr++;
+ if (*p == '{') {
+ brl++;
+ }
+ if (*p == '}') {
+ brr++;
+ }
p++;
}
p--;
} else {
s = p;
- if (*p == '#')
+ if (*p == '#') {
p++;
- while (*p && (isalnum((int) *p)
- || *p == '_'))
+ }
+ while (*p && (isalnum((int) *p) || *p == '_')) {
p++;
+ }
}
/* copy variable to buffer */
strncpy(buf, s, len);
buf[len] = '\0';
- if (*p == '}')
+ if (*p == '}') {
p++;
+ }
s = p;
var = getenv(buf);
- /* if variable wasn't found from environment, use some special */
+ /* if variable wasn't found in environment, use some special */
if (!var) {
- char *p;
+ char *tmp_p;
char *arg = 0;
/* split arg */
arg = strchr(buf, ' ');
*arg = '\0';
arg++;
- while (isspace((int) *arg))
+ while (isspace((int) *arg)) {
arg++;
- if (!*arg)
+ }
+ if (!*arg) {
arg = 0;
+ }
}
/* lowercase variable name */
- p = buf;
- while (*p) {
- *p = tolower(*p);
- p++;
+ tmp_p = buf;
+ while (*tmp_p) {
+ *tmp_p = tolower(*tmp_p);
+ tmp_p++;
}
// create new object
- obj = construct_text_object(buf, arg, retval->text_object_count, retval->text_objects, line);
- if(obj != NULL) {
+ obj = construct_text_object(buf, arg,
+ retval->text_object_count, retval->text_objects, line);
+ if (obj != NULL) {
// allocate memory for the object
- retval->text_objects = realloc(retval->text_objects,
- sizeof(struct text_object) * (retval->text_object_count+1));
+ 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));
+ memcpy(
+ &retval->text_objects[retval->text_object_count++],
+ obj, sizeof(struct text_object));
free(obj);
}
}
continue;
} else {
obj = create_plain_text("$");
- if(obj != NULL) {
+ if (obj != NULL) {
// allocate memory for the object
- retval->text_objects = realloc(retval->text_objects,
- sizeof(struct text_object) * (retval->text_object_count+1));
+ 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));
+ obj, sizeof(struct text_object));
free(obj);
}
}
p++;
}
obj = create_plain_text(s);
- if(obj != NULL) {
+ if (obj != NULL) {
// allocate memory for the object
retval->text_objects = realloc(retval->text_objects,
- sizeof(struct text_object) * (retval->text_object_count+1));
+ 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));
+ memcpy(&retval->text_objects[retval->text_object_count++], obj,
+ sizeof(struct text_object));
free(obj);
}
ERR("one or more $endif's are missing");
}
+ free(orig_p);
return retval;
}
{
struct text_object_list *list;
- free_text_objects(text_object_count, text_objects);
- text_object_count = 0;
- text_objects = NULL;
-
+ free_text_objects(global_text_object_count, global_text_objects);
+ if (tmpstring1) {
+ free(tmpstring1);
+ tmpstring1 = 0;
+ }
+ if (tmpstring2) {
+ free(tmpstring2);
+ tmpstring2 = 0;
+ }
+ if (text_buffer) {
+ free(text_buffer);
+ text_buffer = 0;
+ }
+ global_text_object_count = 0;
+ global_text_objects = NULL;
list = extract_variable_text_internal(p);
- text_objects = list->text_objects;
- text_object_count = list->text_object_count;
+ global_text_objects = list->text_objects;
+ global_text_object_count = list->text_object_count;
free(list);
+}
+
+struct text_object_list *parse_conky_vars(char *text, char *p, struct information *cur)
+{
+ struct text_object_list *object_list =
+ extract_variable_text_internal(text);
- return;
+ generate_text_internal(p, max_user_text, object_list->text_objects,
+ object_list->text_object_count, cur);
+ return object_list;
}
-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);
+/* Allows reading from a FIFO (i.e., /dev/xconsole).
+ * The file descriptor is set to non-blocking which makes this possible.
+ *
+ * FIXME: Since lseek cannot seek a file descriptor long lines will break. */
+static void tail_pipe(struct text_object *obj, char *dst, size_t dst_size)
+{
+#define TAIL_PIPE_BUFSIZE 4096
+ int lines = 0;
+ int line_len = 0;
+ int last_line = 0;
+ int fd = obj->data.tail.fd;
+
+ while (1) {
+ char buf[TAIL_PIPE_BUFSIZE];
+ ssize_t len = read(fd, buf, sizeof(buf));
+ int i;
+
+ if (len == -1) {
+ if (errno != EAGAIN) {
+ strcpy(obj->data.tail.buffer, "Logfile Read Error");
+ snprintf(dst, dst_size, "Logfile Read Error");
+ }
+
+ break;
+ } else if (len == 0) {
+ strcpy(obj->data.tail.buffer, "Logfile Empty");
+ snprintf(dst, dst_size, "Logfile Empty");
+ break;
+ }
+
+ for (line_len = 0, i = 0; i < len; i++) {
+ int pos = 0;
+ char *p;
+
+ if (buf[i] == '\n') {
+ lines++;
+
+ if (obj->data.tail.readlines > 0) {
+ int n;
+ int olines = 0;
+ int first_line = 0;
+
+ for (n = 0; obj->data.tail.buffer[n]; n++) {
+ if (obj->data.tail.buffer[n] == '\n') {
+ if (!first_line) {
+ first_line = n + 1;
+ }
+
+ if (++olines < obj->data.tail.wantedlines) {
+ pos = n + 1;
+ continue;
+ }
+
+ n++;
+ p = obj->data.tail.buffer + first_line;
+ pos = n - first_line;
+ memmove(obj->data.tail.buffer,
+ obj->data.tail.buffer + first_line, strlen(p));
+ obj->data.tail.buffer[pos] = 0;
+ break;
+ }
+ }
+ }
+
+ p = buf + last_line;
+ line_len++;
+ memcpy(&(obj->data.tail.buffer[pos]), p, line_len);
+ obj->data.tail.buffer[pos + line_len] = 0;
+ last_line = i + 1;
+ line_len = 0;
+ obj->data.tail.readlines = lines;
+ continue;
+ }
+
+ line_len++;
+ }
+ }
+
+ snprintf(dst, dst_size, "%s", obj->data.tail.buffer);
}
-static void generate_text_internal(char *p, int p_max_size, struct text_object *objs, unsigned int object_count, struct information *cur)
+char *format_time(unsigned long time, const int width)
+{
+ char buf[10];
+ unsigned long nt; // narrow time, for speed on 32-bit
+ unsigned cc; // centiseconds
+ unsigned nn; // multi-purpose whatever
+
+ nt = time;
+ cc = nt % 100; // centiseconds past second
+ nt /= 100; // total seconds
+ nn = nt % 60; // seconds past the minute
+ nt /= 60; // total minutes
+ if (width >= snprintf(buf, sizeof buf, "%lu:%02u.%02u",
+ nt, nn, cc)) {
+ return strdup(buf);
+ }
+ if (width >= snprintf(buf, sizeof buf, "%lu:%02u", nt, nn)) {
+ return strdup(buf);
+ }
+ nn = nt % 60; // minutes past the hour
+ nt /= 60; // total hours
+ if (width >= snprintf(buf, sizeof buf, "%lu,%02u", nt, nn)) {
+ return strdup(buf);
+ }
+ nn = nt; // now also hours
+ if (width >= snprintf(buf, sizeof buf, "%uh", nn)) {
+ return strdup(buf);
+ }
+ nn /= 24; // now days
+ if (width >= snprintf(buf, sizeof buf, "%ud", nn)) {
+ return strdup(buf);
+ }
+ nn /= 7; // now weeks
+ if (width >= snprintf(buf, sizeof buf, "%uw", nn)) {
+ return strdup(buf);
+ }
+ // well shoot, this outta' fit...
+ return strdup("<inf>");
+}
+
+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;
#ifdef HAVE_ICONV
- char buff_in[P_MAX_SIZE] = {0};
+ char buff_in[p_max_size];
+ buff_in[0] = 0;
iconv_converting = 0;
#endif
for (i = 0; i < object_count; i++) {
struct text_object *obj = &objs[i];
+ if (p_max_size < 1) {
+ break;
+ };
+
#define OBJ(a) break; case OBJ_##a:
switch (obj->type) {
default:
- {
- ERR("not implemented obj type %d",
- obj->type);
- }
+ ERR("not implemented obj type %d", obj->type);
#ifndef __OpenBSD__
- OBJ(acpitemp) {
- /* does anyone have decimals in acpi temperature? */
- if (!use_spacer)
- snprintf(p, p_max_size, "%d", (int)
- get_acpi_temperature(obj->
- data.
- i));
- else
- snprintf(p, 5, "%d ", (int)
- get_acpi_temperature(obj->
- data.
- i));
- }
- OBJ(acpitempf) {
- /* does anyone have decimals in acpi temperature? */
- if (!use_spacer)
- snprintf(p, p_max_size, "%d", (int)
- ((get_acpi_temperature(obj->
- data.
- i)+ 40) * 9.0 / 5 - 40));
- else
- snprintf(p, 5, "%d ", (int)
- ((get_acpi_temperature(obj->
- data.
- i)+ 40) * 9.0 / 5 - 40));
- }
+ OBJ(acpitemp) {
+ /* does anyone have decimals in acpi temperature? */
+ spaced_print(p, p_max_size, "%d", 5, "acpitemp",
+ round_to_int(get_acpi_temperature(obj->data.i)));
+ }
+ OBJ(acpitempf) {
+ /* does anyone have decimals in acpi temperature? */
+ spaced_print(p, p_max_size, "%d", 5, "acpitemp",
+ round_to_int((get_acpi_temperature(obj->data.i) + 40) *
+ 9.0 / 5 - 40));
+ }
#endif /* !__OpenBSD__ */
- OBJ(freq) {
- if (obj->a) {
- obj->a = get_freq(p, p_max_size, "%.0f", 1, obj->data.cpu_index);
- }
+ OBJ(freq) {
+ if (obj->a) {
+ obj->a = get_freq(p, p_max_size, "%.0f", 1,
+ obj->data.cpu_index);
}
- OBJ(freq_g) {
- if (obj->a) {
- obj->a = get_freq(p, p_max_size, "%'.2f", 1000, obj->data.cpu_index);
- }
+ }
+ OBJ(freq_g) {
+ if (obj->a) {
+#ifndef __OpenBSD__
+ obj->a = get_freq(p, p_max_size, "%'.2f", 1000,
+ obj->data.cpu_index);
+#else
+ /* OpenBSD has no such flag (SUSv2) */
+ obj->a = get_freq(p, p_max_size, "%.2f", 1000,
+ obj->data.cpu_index);
+#endif
}
+ }
#if defined(__linux__)
- OBJ(voltage_mv) {
- if (obj->a) {
- obj->a = get_voltage(p, p_max_size, "%.0f", 1, obj->data.cpu_index);
- }
+ OBJ(voltage_mv) {
+ if (obj->a) {
+ obj->a = get_voltage(p, p_max_size, "%.0f", 1,
+ obj->data.cpu_index);
}
- OBJ(voltage_v) {
- if (obj->a) {
- obj->a = get_voltage(p, p_max_size, "%'.3f", 1000, obj->data.cpu_index);
- }
+ }
+ OBJ(voltage_v) {
+ if (obj->a) {
+ obj->a = get_voltage(p, p_max_size, "%'.3f", 1000,
+ obj->data.cpu_index);
}
+ }
+
#ifdef HAVE_IWLIB
- OBJ(wireless_essid) {
- snprintf(p, p_max_size, "%s", obj->data.net->essid);
- }
- OBJ(wireless_mode) {
- snprintf(p, p_max_size, "%s", obj->data.net->mode);
- }
- OBJ(wireless_bitrate) {
- snprintf(p, p_max_size, "%s", obj->data.net->bitrate);
- }
- OBJ(wireless_ap) {
- snprintf(p, p_max_size, "%s", obj->data.net->ap);
- }
- OBJ(wireless_link_qual) {
- if (!use_spacer)
- snprintf(p, p_max_size, "%d", obj->data.net->link_qual);
- else
- snprintf(p, 4, "%d ", obj->data.net->link_qual);
- }
- OBJ(wireless_link_qual_max) {
- if (!use_spacer)
- snprintf(p, p_max_size, "%d", obj->data.net->link_qual_max);
- else
- snprintf(p, 4, "%d ", obj->data.net->link_qual_max);
- }
- OBJ(wireless_link_qual_perc) {
- if(obj->data.net->link_qual_max > 0) {
- if (!use_spacer)
- snprintf(p, p_max_size, "%.0f%%", (double)obj->data.net->link_qual / obj->data.net->link_qual_max * 100);
- else
- snprintf(p, 5, "%.0f%% ", (double)obj->data.net->link_qual / obj->data.net->link_qual_max * 100);
- } else snprintf(p, p_max_size, "unk");
- }
- OBJ(wireless_link_bar) {
- new_bar(p, obj->a, obj->b, ((double)obj->data.net->link_qual/obj->data.net->link_qual_max)*255.0);
+ OBJ(wireless_essid) {
+ snprintf(p, p_max_size, "%s", obj->data.net->essid);
+ }
+ OBJ(wireless_mode) {
+ snprintf(p, p_max_size, "%s", obj->data.net->mode);
+ }
+ OBJ(wireless_bitrate) {
+ snprintf(p, p_max_size, "%s", obj->data.net->bitrate);
+ }
+ OBJ(wireless_ap) {
+ snprintf(p, p_max_size, "%s", obj->data.net->ap);
+ }
+ OBJ(wireless_link_qual) {
+ spaced_print(p, p_max_size, "%d", 4, "wireless_link_qual",
+ obj->data.net->link_qual);
+ }
+ OBJ(wireless_link_qual_max) {
+ spaced_print(p, p_max_size, "%d", 4,
+ "wireless_link_qual_max", obj->data.net->link_qual_max);
+ }
+ OBJ(wireless_link_qual_perc) {
+ if (obj->data.net->link_qual_max > 0) {
+ spaced_print(p, p_max_size, "%.0f", 5,
+ "wireless_link_qual_perc",
+ (double) obj->data.net->link_qual /
+ obj->data.net->link_qual_max * 100);
+ } else {
+ spaced_print(p, p_max_size, "unk", 5,
+ "wireless_link_qual_perc");
}
+ }
+ OBJ(wireless_link_bar) {
+ new_bar(p, obj->a, obj->b, ((double) obj->data.net->link_qual /
+ obj->data.net->link_qual_max) * 255.0);
+ }
#endif /* HAVE_IWLIB */
#endif /* __linux__ */
- OBJ(freq_dyn) {
- if (use_spacer) {
- get_freq_dynamic(p, 6, "%.0f ", 1 );
- } else {
- get_freq_dynamic(p, p_max_size, "%.0f", 1 );
- }
- }
- OBJ(freq_dyn_g) {
- if (use_spacer) {
- get_freq_dynamic(p, 6, "%'.2f ", 1000);
- } else {
- get_freq_dynamic(p, p_max_size, "%'.2f", 1000);
- }
- }
+ OBJ(freq_dyn) {
+ get_freq_dynamic(p, p_max_size, "%.0f", 1);
+ spaced_print(p, p_max_size, "%s", 6, "freq_dyn", p);
+ }
+ OBJ(freq_dyn_g) {
#ifndef __OpenBSD__
- OBJ(adt746xcpu) {
- get_adt746x_cpu(p, p_max_size);
- }
- OBJ(adt746xfan) {
- get_adt746x_fan(p, p_max_size);
- }
- OBJ(acpifan) {
- get_acpi_fan(p, p_max_size);
- }
- OBJ(acpiacadapter) {
- get_acpi_ac_adapter(p, p_max_size);
- }
- OBJ(battery) {
- get_battery_stuff(p, p_max_size, obj->data.s, BATTERY_STATUS);
- }
- OBJ(battery_time) {
- get_battery_stuff(p, p_max_size, obj->data.s, BATTERY_TIME);
+ get_freq_dynamic(p, p_max_size, "%'.2f", 1000);
+#else
+ get_freq_dynamic(p, p_max_size, "%.2f", 1000);
+#endif
+ spaced_print(p, p_max_size, "%s", 6, "freq_dyn", p);
+ }
+
+#ifndef __OpenBSD__
+ OBJ(adt746xcpu) {
+ get_adt746x_cpu(p, p_max_size);
+ }
+ OBJ(adt746xfan) {
+ get_adt746x_fan(p, p_max_size);
+ }
+ OBJ(acpifan) {
+ get_acpi_fan(p, p_max_size);
+ }
+ OBJ(acpiacadapter) {
+ get_acpi_ac_adapter(p, p_max_size);
+ }
+ OBJ(battery) {
+ get_battery_stuff(p, p_max_size, obj->data.s, BATTERY_STATUS);
+ }
+ OBJ(battery_time) {
+ get_battery_stuff(p, p_max_size, obj->data.s, BATTERY_TIME);
+ }
+ OBJ(battery_percent) {
+ spaced_print(p, p_max_size, "%*d", 4, "battery_percent",
+ pad_percents, get_battery_perct(obj->data.s));
+ }
+ OBJ(battery_bar) {
+ new_bar(p, obj->a, obj->b, get_battery_perct_bar(obj->data.s));
+ }
+#endif /* __OpenBSD__ */
+
+ OBJ(buffers) {
+ human_readable(cur->buffers * 1024, p, 255, "buffers");
+ }
+ OBJ(cached) {
+ human_readable(cur->cached * 1024, p, 255, "buffers");
+ }
+ OBJ(cpu) {
+ if (obj->data.cpu_index > info.cpu_count) {
+ printf("obj->data.cpu_index %i info.cpu_count %i",
+ obj->data.cpu_index, info.cpu_count);
+ CRIT_ERR("attempting to use more CPUs then you have!");
}
- OBJ(battery_percent) {
- snprintf(p, p_max_size, "%d",
- get_battery_perct(obj->data.s));
+ spaced_print(p, p_max_size, "%*d", 4, "cpu", pad_percents,
+ round_to_int(cur->cpu_usage[obj->data.cpu_index] * 100.0));
+ }
+ OBJ(cpubar) {
+ new_bar(p, obj->a, obj->b,
+ round_to_int(cur->cpu_usage[obj->data.cpu_index] * 255.0));
+ }
+ OBJ(cpugraph) {
+ new_graph(p, obj->a, obj->b, obj->c, obj->d, (unsigned int)
+ round_to_int(cur->cpu_usage[obj->data.cpu_index] * 100),
+ 100, 1);
+ }
+ OBJ(color) {
+ new_fg(p, obj->data.l);
+ }
+ OBJ(color0) {
+ new_fg(p, color0);
+ }
+ OBJ(color1) {
+ new_fg(p, color1);
+ }
+ OBJ(color2) {
+ new_fg(p, color2);
+ }
+ OBJ(color3) {
+ new_fg(p, color3);
+ }
+ OBJ(color4) {
+ new_fg(p, color4);
+ }
+ OBJ(color5) {
+ new_fg(p, color5);
+ }
+ OBJ(color6) {
+ new_fg(p, color6);
+ }
+ OBJ(color7) {
+ new_fg(p, color7);
+ }
+ OBJ(color8) {
+ new_fg(p, color8);
+ }
+ OBJ(color9) {
+ new_fg(p, color9);
+ }
+ OBJ(conky_version) {
+ snprintf(p, p_max_size, "%s", VERSION);
+ }
+ OBJ(conky_build_date) {
+ snprintf(p, p_max_size, "%s", BUILD_DATE);
+ }
+ OBJ(conky_build_arch) {
+ snprintf(p, p_max_size, "%s", BUILD_ARCH);
+ }
+#if defined(__linux__)
+ OBJ(disk_protect) {
+ snprintf(p, p_max_size, "%s",
+ get_disk_protect_queue(obj->data.s));
+ }
+ OBJ(i8k_version) {
+ snprintf(p, p_max_size, "%s", i8k.version);
+ }
+ OBJ(i8k_bios) {
+ snprintf(p, p_max_size, "%s", i8k.bios);
+ }
+ OBJ(i8k_serial) {
+ snprintf(p, p_max_size, "%s", i8k.serial);
+ }
+ OBJ(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, 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, p_max_size, "off");
}
- OBJ(battery_bar) {
- new_bar(p, obj->a, obj->b, get_battery_perct_bar(obj->data.s));
+ if (left_fan_status == 1) {
+ snprintf(p, p_max_size, "low");
}
-#endif /* __OpenBSD__ */
- OBJ(buffers) {
- human_readable(cur->buffers * 1024, p, 255);
+ if (left_fan_status == 2) {
+ snprintf(p, p_max_size, "high");
}
- OBJ(cached) {
- human_readable(cur->cached * 1024, p, 255);
+ }
+ OBJ(i8k_right_fan_status) {
+ int right_fan_status;
+
+ sscanf(i8k.right_fan_status, "%d", &right_fan_status);
+ if (right_fan_status == 0) {
+ snprintf(p, p_max_size, "off");
}
- OBJ(cpu) {
- if (obj->data.cpu_index > info.cpu_count) {
- printf("obj->data.cpu_index %i info.cpu_count %i", obj->data.cpu_index, info.cpu_count);
- CRIT_ERR("attempting to use more CPUs then you have!");
- }
- if (!use_spacer)
- snprintf(p, p_max_size, "%*d", pad_percents,
- (int) round_to_int(cur->cpu_usage[obj->data.cpu_index] *
- 100.0));
- else
- snprintf(p, 4, "%*d ",
- pad_percents,
- (int) round_to_int(cur->cpu_usage[obj->data.cpu_index] *
- 100.0));
+ if (right_fan_status == 1) {
+ snprintf(p, p_max_size, "low");
}
- OBJ(cpubar) {
- new_bar(p, obj->a,
- obj->b,
- (int) round_to_int(cur->cpu_usage[obj->data.cpu_index] * 255.0));
+ if (right_fan_status == 2) {
+ snprintf(p, p_max_size, "high");
}
- OBJ(cpugraph) {
- new_graph(p, obj->a,
- obj->b, obj->c, obj->d,
- (unsigned int) round_to_int(cur->cpu_usage[obj->data.cpu_index] *
- 100), 100, 1);
+ }
+ OBJ(i8k_left_fan_rpm) {
+ snprintf(p, p_max_size, "%s", i8k.left_fan_rpm);
+ }
+ OBJ(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, p_max_size, "disabled (read i8k docs)");
}
- OBJ(color) {
- new_fg(p, obj->data.l);
+ if (ac_status == 0) {
+ snprintf(p, p_max_size, "off");
}
- OBJ(color0) {
- new_fg(p, color0);
+ if (ac_status == 1) {
+ snprintf(p, p_max_size, "on");
}
- OBJ(color1) {
- new_fg(p, color1);
+ }
+ OBJ(i8k_buttons_status) {
+ snprintf(p, p_max_size, "%s", i8k.buttons_status);
+ }
+ OBJ(ibm_fan) {
+ get_ibm_acpi_fan(p, p_max_size);
+ }
+ OBJ(ibm_temps) {
+ get_ibm_acpi_temps();
+ snprintf(p, p_max_size, "%d", ibm_acpi.temps[obj->data.sensor]);
+ }
+ OBJ(ibm_volume) {
+ get_ibm_acpi_volume(p, p_max_size);
+ }
+ OBJ(ibm_brightness) {
+ get_ibm_acpi_brightness(p, p_max_size);
+ }
+ OBJ(if_up) {
+ if ((obj->data.ifblock.s)
+ && (!interface_up(obj->data.ifblock.s))) {
+ i = obj->data.ifblock.pos;
+ if_jumped = 1;
+ } else {
+ if_jumped = 0;
}
- OBJ(color2) {
- new_fg(p, color2);
+ }
+ OBJ(if_gw) {
+ if (!cur->gw_info.count) {
+ i = obj->data.ifblock.pos;
+ if_jumped = 1;
+ } else {
+ if_jumped = 0;
}
- OBJ(color3) {
- new_fg(p, color3);
+ }
+ OBJ(gw_iface) {
+ snprintf(p, p_max_size, "%s", cur->gw_info.iface);
+ }
+ OBJ(gw_ip) {
+ snprintf(p, p_max_size, "%s", cur->gw_info.ip);
+ }
+ OBJ(laptop_mode) {
+ snprintf(p, p_max_size, "%d", get_laptop_mode());
+ }
+ OBJ(pb_battery) {
+ get_powerbook_batt_info(p, p_max_size, obj->data.i);
+ }
+#endif /* __linux__ */
+
+#ifdef __OpenBSD__
+ OBJ(obsd_sensors_temp) {
+ obsd_sensors.device = sensor_device;
+ update_obsd_sensors();
+ snprintf(p, p_max_size, "%.1f",
+ obsd_sensors.temp[obsd_sensors.device][obj->data.sensor]);
+ }
+ OBJ(obsd_sensors_fan) {
+ obsd_sensors.device = sensor_device;
+ update_obsd_sensors();
+ snprintf(p, p_max_size, "%d",
+ obsd_sensors.fan[obsd_sensors.device][obj->data.sensor]);
+ }
+ OBJ(obsd_sensors_volt) {
+ obsd_sensors.device = sensor_device;
+ update_obsd_sensors();
+ snprintf(p, p_max_size, "%.2f",
+ obsd_sensors.volt[obsd_sensors.device][obj->data.sensor]);
+ }
+ OBJ(obsd_vendor) {
+ get_obsd_vendor(p, p_max_size);
+ }
+ OBJ(obsd_product) {
+ get_obsd_product(p, p_max_size);
+ }
+#endif /* __OpenBSD__ */
+
+#ifdef X11
+ OBJ(font) {
+ new_font(p, obj->data.s);
+ }
+#endif
+ /* TODO: move this correction from kB to kB/s elsewhere
+ * (or get rid of it??) */
+ OBJ(diskio) {
+ if (obj->data.diskio) {
+ human_readable(
+ (obj->data.diskio->current / update_interval) * 1024LL,
+ p, p_max_size, "diskio");
+ } else {
+ human_readable(diskio_value * 1024LL, p, p_max_size,
+ "diskio");
}
- OBJ(color4) {
- new_fg(p, color4);
+ }
+ OBJ(diskio_write) {
+ if (obj->data.diskio) {
+ human_readable((obj->data.diskio->current_write / update_interval) * 1024LL, p, p_max_size,
+ "diskio_write");
+ } else {
+ human_readable(diskio_write_value * 1024LL, p, p_max_size,
+ "diskio_write");
}
- OBJ(color5) {
- new_fg(p, color5);
+ }
+ OBJ(diskio_read) {
+ if (obj->data.diskio) {
+ human_readable((obj->data.diskio->current_read / update_interval) * 1024LL, p, p_max_size,
+ "diskio_read");
+ } else {
+ human_readable(diskio_read_value * 1024LL, p, p_max_size,
+ "diskio_read");
}
- OBJ(color6) {
- new_fg(p, color6);
+ }
+ OBJ(diskiograph) {
+ if (obj->data.diskio) {
+ new_graph(p, obj->a, obj->b, obj->c, obj->d,
+ obj->data.diskio->current, obj->e, 1);
+ } else {
+ new_graph(p, obj->a, obj->b, obj->c, obj->d, diskio_value,
+ obj->e, 1);
}
- OBJ(color7) {
- new_fg(p, color7);
+ }
+ OBJ(diskiograph_read) {
+ if (obj->data.diskio) {
+ new_graph(p, obj->a, obj->b, obj->c, obj->d,
+ obj->data.diskio->current_read, obj->e, 1);
+ } else {
+ new_graph(p, obj->a, obj->b, obj->c, obj->d,
+ diskio_read_value, obj->e, 1);
}
- OBJ(color8) {
- new_fg(p, color8);
+ }
+ OBJ(diskiograph_write) {
+ if (obj->data.diskio) {
+ new_graph(p, obj->a, obj->b, obj->c, obj->d,
+ obj->data.diskio->current_write, obj->e, 1);
+ } else {
+ new_graph(p, obj->a, obj->b, obj->c, obj->d,
+ diskio_write_value, obj->e, 1);
}
- OBJ(color9) {
- new_fg(p, color9);
+ }
+ OBJ(downspeed) {
+ spaced_print(p, p_max_size, "%d", 6, "downspeed",
+ round_to_int(obj->data.net->recv_speed / 1024));
+ }
+ OBJ(downspeedf) {
+ spaced_print(p, p_max_size, "%.1f", 8, "downspeedf",
+ obj->data.net->recv_speed / 1024.0);
+ }
+ OBJ(downspeedgraph) {
+ new_graph(p, obj->a, obj->b, obj->c, obj->d,
+ obj->data.net->recv_speed / 1024.0, obj->e, 1);
+ }
+ OBJ(else) {
+ if (!if_jumped) {
+ i = obj->data.ifblock.pos - 1;
+ } else {
+ if_jumped = 0;
}
+ }
+ OBJ(endif) {
+ if_jumped = 0;
+ }
+#ifdef HAVE_POPEN
+ OBJ(addr) {
+ snprintf(p, p_max_size, "%u.%u.%u.%u",
+ obj->data.net->addr.sa_data[2] & 255,
+ obj->data.net->addr.sa_data[3] & 255,
+ obj->data.net->addr.sa_data[4] & 255,
+ obj->data.net->addr.sa_data[5] & 255);
+ }
+
#if defined(__linux__)
- OBJ(i8k_version) {
- snprintf(p, p_max_size, "%s", i8k.version);
- }
- OBJ(i8k_bios) {
- snprintf(p, p_max_size, "%s", i8k.bios);
- }
- OBJ(i8k_serial) {
- snprintf(p, p_max_size, "%s", i8k.serial);
- }
- OBJ(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, 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, p_max_size,"off");
- } if(left_fan_status == 1) {
- snprintf(p, p_max_size, "low");
- } if(left_fan_status == 2) {
- snprintf(p, p_max_size, "high");
- }
+ OBJ(addrs) {
+ if(NULL != obj->data.net->addrs && strlen(obj->data.net->addrs) > 2)
+ {
+ obj->data.net->addrs[strlen(obj->data.net->addrs) - 2] = 0; /* remove ", " from end of string */
+ strcpy(p, obj->data.net->addrs);
+ }
+ else
+ strcpy(p, "0.0.0.0");
+ }
+#endif /* __linux__ */
- }
- OBJ(i8k_right_fan_status) {
- int right_fan_status;
- sscanf(i8k.right_fan_status, "%d", &right_fan_status);
- if(right_fan_status == 0) {
- snprintf(p, p_max_size,"off");
- } if(right_fan_status == 1) {
- snprintf(p, p_max_size, "low");
- } if(right_fan_status == 2) {
- snprintf(p, p_max_size, "high");
- }
- }
- OBJ(i8k_left_fan_rpm) {
- snprintf(p, p_max_size, "%s", i8k.left_fan_rpm);
- }
- OBJ(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, p_max_size,"disabled (read i8k docs)");
- } if(ac_status == 0) {
- snprintf(p, p_max_size, "off");
- } if(ac_status == 1) {
- snprintf(p, p_max_size, "on");
+#if defined(IMLIB2) && defined(X11)
+ OBJ(image) {
+ if (obj->a < 1) {
+ obj->a++;
+ } else {
+ Imlib_Image image, buffer;
+
+ image = imlib_load_image(obj->data.s);
+ imlib_context_set_image(image);
+ if (image) {
+ int w, h;
+
+ w = imlib_image_get_width();
+ h = imlib_image_get_height();
+ buffer = imlib_create_image(w, h);
+ imlib_context_set_display(display);
+ imlib_context_set_drawable(window.drawable);
+ imlib_context_set_colormap(DefaultColormap(display,
+ screen));
+ imlib_context_set_visual(DefaultVisual(display,
+ screen));
+ imlib_context_set_image(buffer);
+ imlib_blend_image_onto_image(image, 0, 0, 0, w, h,
+ text_start_x, text_start_y, w, h);
+ imlib_render_image_on_drawable(text_start_x,
+ text_start_y);
+ imlib_free_image();
+ imlib_context_set_image(image);
+ imlib_free_image();
}
}
- OBJ(i8k_buttons_status) {
- snprintf(p, p_max_size, "%s", i8k.buttons_status);
-
- }
- OBJ(ibm_fan) {
- get_ibm_acpi_fan(p, p_max_size);
- }
- OBJ(ibm_temps) {
- get_ibm_acpi_temps();
- snprintf(p, p_max_size, "%d",
- ibm_acpi.temps[obj->data.sensor]);
- }
- OBJ(ibm_volume) {
- get_ibm_acpi_volume(p, p_max_size);
- }
- OBJ(ibm_brightness) {
- get_ibm_acpi_brightness(p, p_max_size);
- }
- OBJ(pb_battery) {
- get_powerbook_batt_info(p, p_max_size, obj->data.i);
- }
-#endif /* __linux__ */
+ }
+#endif /* IMLIB2 */
-#ifdef __OpenBSD__
- OBJ(obsd_sensors_temp) {
- obsd_sensors.device = sensor_device;
- update_obsd_sensors();
- snprintf(p, p_max_size, "%.1f",
- obsd_sensors.temp[obsd_sensors.device][obj->data.sensor]);
- }
+ OBJ(exec) {
+ FILE *fp = popen(obj->data.s, "r");
+ int length = fread(p, 1, p_max_size, fp);
- OBJ(obsd_sensors_fan) {
- obsd_sensors.device = sensor_device;
- update_obsd_sensors();
- snprintf(p, p_max_size, "%d",
- obsd_sensors.fan[obsd_sensors.device][obj->data.sensor]);
+ pclose(fp);
+
+ p[length] = '\0';
+ if (length > 0 && p[length - 1] == '\n') {
+ p[length - 1] = '\0';
}
+ }
+ OBJ(execp) {
+ FILE *fp;
+ struct information *my_info;
+ struct text_object_list *text_objects;
+ int length;
- OBJ(obsd_sensors_volt) {
- obsd_sensors.device = sensor_device;
- update_obsd_sensors();
- snprintf(p, p_max_size, "%.2f",
- obsd_sensors.volt[obsd_sensors.device][obj->data.sensor]);
+ fp = popen(obj->data.s, "r");
+ fread(p, 1, p_max_size, fp);
+ pclose(fp);
+
+ my_info = malloc(sizeof(struct information));
+ memcpy(my_info, cur, sizeof(struct information));
+ text_objects = parse_conky_vars(p, p, my_info);
+
+ length = strlen(p);
+
+ p[length] = '\0';
+ if (length > 0 && p[length - 1] == '\n') {
+ p[length - 1] = '\0';
}
- OBJ(obsd_vendor) {
- get_obsd_vendor(p, p_max_size);
+ free_text_objects(text_objects->text_object_count, text_objects->text_objects);
+ free(text_objects);
+ free(my_info);
+ }
+ OBJ(execbar) {
+ char *p2 = p;
+ FILE *fp = popen(obj->data.s, "r");
+ int n2 = fread(p, 1, p_max_size, fp);
+ double barnum;
+
+ pclose(fp);
+ p[n2] = '\0';
+ if (n2 && p[n2 - 1] == '\n') {
+ p[n2 - 1] = '\0';
}
- OBJ(obsd_product) {
- get_obsd_product(p, p_max_size);
+ while (*p2) {
+ if (*p2 == '\001') {
+ *p2 = ' ';
+ }
+ p2++;
}
-#endif /* __OpenBSD__ */
- OBJ(font) {
-#ifdef X11
- new_font(p, obj->data.s);
-#endif /* X11 */
+ if (sscanf(p, "%lf", &barnum) == 0) {
+ ERR("reading execbar value failed (perhaps it's not the "
+ "correct format?)");
}
- void format_diskio(unsigned int diskio_value)
- {
- if (!use_spacer) {
- if (diskio_value > 1024*1024) {
- snprintf(p, p_max_size, "%.1fGiB",
- (double)diskio_value/1024/1024);
- } else if (diskio_value > 1024) {
- snprintf(p, p_max_size, "%.1fMiB",
- (double)diskio_value/1024);
- } else if (diskio_value > 0) {
- snprintf(p, p_max_size, "%dKiB", diskio_value);
- } else {
- snprintf(p, p_max_size, "%dB", diskio_value);
- }
- } else {
- if (diskio_value > 1024*1024) {
- snprintf(p, 12, "%.1fGiB ",
- (double)diskio_value/1024/1024);
- } else if (diskio_value > 1024) {
- snprintf(p, 12, "%.1fMiB ",
- (double)diskio_value/1024);
- } else if (diskio_value > 0) {
- snprintf(p, 12, "%dKiB ", diskio_value);
- } else {
- snprintf(p, 12, "%dB ", diskio_value);
- }
- }
+ if (barnum > 100 || barnum < 0) {
+ ERR("your execbar value is not between 0 and 100, "
+ "therefore it will be ignored");
+ } else {
+ barnum = barnum / 100.0;
+ new_bar(p, 0, 4, (int) (barnum * 255.0));
}
- OBJ(diskio) {
- format_diskio(diskio_value);
- }
- OBJ(diskio_write) {
- format_diskio(diskio_write_value);
- }
- OBJ(diskio_read) {
- format_diskio(diskio_read_value);
- }
- OBJ(diskiograph) {
- new_graph(p, obj->a,
- obj->b, obj->c, obj->d,
- diskio_value, obj->e, 1);
- }
- OBJ(diskiograph_read) {
- new_graph(p, obj->a,
- obj->b, obj->c, obj->d,
- diskio_read_value, obj->e, 1);
- }
- OBJ(diskiograph_write) {
- new_graph(p, obj->a,
- obj->b, obj->c, obj->d,
- diskio_write_value, obj->e, 1);
- }
- OBJ(downspeed) {
- if (!use_spacer) {
- snprintf(p, p_max_size, "%d",
- (int) (obj->data.net->
- recv_speed /
- 1024));
- } else
- snprintf(p, 6, "%d ",
- (int) (obj->data.net->
- recv_speed /
- 1024));
- }
- OBJ(downspeedf) {
- if (!use_spacer)
- snprintf(p, p_max_size, "%.1f",
- obj->data.net->
- recv_speed / 1024.0);
- else
- snprintf(p, 8, "%.1f ",
- obj->data.net->
- recv_speed / 1024.0);
- }
- OBJ(downspeedgraph) {
- /*
- if (obj->data.net->recv_speed == 0)
- obj->data.net->recv_speed = 0.01;
- */
- new_graph(p, obj->a, obj->b, obj->c, obj->d,
- (obj->data.net->recv_speed /
- 1024.0), obj->e, 1);
+ }
+ OBJ(execgraph) {
+ char *p2 = p;
+ FILE *fp = popen(obj->data.s, "r");
+ int n2 = fread(p, 1, p_max_size, fp);
+ double barnum;
+
+ pclose(fp);
+ p[n2] = '\0';
+ if (n2 && p[n2 - 1] == '\n') {
+ p[n2 - 1] = '\0';
}
- OBJ(else) {
- if (!if_jumped) {
- i = obj->data.ifblock.pos - 1;
- } else {
- if_jumped = 0;
+ while (*p2) {
+ if (*p2 == '\001') {
+ *p2 = ' ';
}
+ p2++;
}
- OBJ(endif) {
- if_jumped = 0;
- }
-#ifdef HAVE_POPEN
- OBJ(addr) {
- snprintf(p, p_max_size, "%u.%u.%u.%u",
- obj->data.net->addr.
- sa_data[2] & 255,
- obj->data.net->addr.
- sa_data[3] & 255,
- obj->data.net->addr.
- sa_data[4] & 255,
- obj->data.net->addr.
- sa_data[5] & 255);
+ if (sscanf(p, "%lf", &barnum) == 0) {
+ ERR("reading execgraph value failed (perhaps it's not the "
+ "correct format?)");
}
-#if defined(IMLIB2) && defined(X11)
- OBJ(image) {
- if (obj->a < 1) {
- obj->a++;
- } else {
- Imlib_Image image, buffer;
- image = imlib_load_image(obj->data.s);
- imlib_context_set_image(image);
- if (image) {
- int w, h;
- w = imlib_image_get_width();
- h = imlib_image_get_height();
- buffer = imlib_create_image(w, h);
- imlib_context_set_display(display);
- imlib_context_set_drawable(window.drawable);
- imlib_context_set_colormap(DefaultColormap(display, screen));
- imlib_context_set_visual(DefaultVisual(display, screen));
- imlib_context_set_image(buffer);
- imlib_blend_image_onto_image(image, 0, 0, 0, w, h, text_start_x, text_start_y, w, h);
- imlib_render_image_on_drawable(text_start_x, text_start_y);
- imlib_free_image();
- imlib_context_set_image(image);
- imlib_free_image();
- }
- }
+ if (barnum > 100 || barnum < 0) {
+ ERR("your execgraph value is not between 0 and 100, "
+ "therefore it will be ignored");
+ } else {
+ new_graph(p, 0, 25, obj->c, obj->d, (int) (barnum),
+ obj->e, 1);
}
-#endif /* IMLIB2 */
- OBJ(exec) {
- FILE *fp = popen(obj->data.s, "r");
- int length = fread(p, 1, p_max_size, fp);
- (void) pclose(fp);
-
- /*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';
+ }
+ OBJ(execibar) {
+ 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, p_max_size, fp);
+ float barnum;
+
+ pclose(fp);
+ p[n2] = '\0';
+ if (n2 && p[n2 - 1] == '\n') {
+ p[n2 - 1] = '\0';
}
- //parse_conky_vars(output, p, cur);
+ while (*p2) {
+ if (*p2 == '\001') {
+ *p2 = ' ';
+ }
+ p2++;
+ }
+
+ if (sscanf(p, "%f", &barnum) == 0) {
+ ERR("reading execibar value failed (perhaps it's not "
+ "the correct format?)");
+ }
+ if (barnum > 100 || barnum < 0) {
+ ERR("your execibar value is not between 0 and 100, "
+ "therefore it will be ignored");
+ } else {
+ obj->f = 255 * barnum / 100.0;
+ new_bar(p, 0, 4, (int) obj->f);
+ }
+ obj->data.execi.last_update = current_update_time;
}
- OBJ(execbar) {
+ }
+ OBJ(execigraph) {
+ 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.s, "r");
+ FILE *fp = popen(obj->data.execi.cmd, "r");
int n2 = fread(p, 1, p_max_size, fp);
- (void) pclose(fp);
+ float barnum;
+ pclose(fp);
p[n2] = '\0';
- if (n2 && p[n2 - 1] == '\n')
+ if (n2 && p[n2 - 1] == '\n') {
p[n2 - 1] = '\0';
+ }
while (*p2) {
- if (*p2 == '\001')
+ if (*p2 == '\001') {
*p2 = ' ';
+ }
p2++;
}
- double barnum;
- if (sscanf(p, "%lf", &barnum) == 0) {
- ERR("reading execbar value failed (perhaps it's not the correct format?)");
+
+ if (sscanf(p, "%f", &barnum) == 0) {
+ ERR("reading execigraph value failed (perhaps it's not "
+ "the correct format?)");
}
if (barnum > 100 || barnum < 0) {
- ERR("your execbar value is not between 0 and 100, therefore it will be ignored");
+ ERR("your execigraph value is not between 0 and 100, "
+ "therefore it will be ignored");
} else {
- barnum = barnum / 100.0;
- new_bar(p, 0, 4, (int) (barnum * 255.0));
+ obj->f = barnum;
+ new_graph(p, 0, 25, obj->c, obj->d, (int) (obj->f),
+ 100, 1);
}
+ obj->data.execi.last_update = current_update_time;
+ }
+ }
+ OBJ(execi) {
+ 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 *output = obj->data.execi.buffer;
+ FILE *fp = popen(obj->data.execi.cmd, "r");
+ int length = fread(output, 1, text_buffer_size, fp);
+
+ pclose(fp);
+ output[length] = '\0';
+ if (length > 0 && output[length - 1] == '\n') {
+ output[length - 1] = '\0';
+ }
+ obj->data.execi.last_update = current_update_time;
+ snprintf(p, p_max_size, "%s", output);
}
- OBJ(execgraph) {
- char *p2 = p;
- FILE *fp = popen(obj->data.s, "r");
- int n2 = fread(p, 1, p_max_size, fp);
- (void) pclose(fp);
+ // parse_conky_vars(output, p, cur);
+ }
+ OBJ(execpi) {
+ struct text_object_list *text_objects = 0;
+ struct information *my_info =
+ malloc(sizeof(struct information));
+ memcpy(my_info, cur, sizeof(struct information));
- p[n2] = '\0';
- if (n2 && p[n2 - 1] == '\n')
- p[n2 - 1] = '\0';
+ if (current_update_time - obj->data.execi.last_update
+ < obj->data.execi.interval
+ || obj->data.execi.interval == 0) {
+ text_objects = parse_conky_vars(obj->data.execi.buffer, p, my_info);
+ } else {
+ char *output = obj->data.execi.buffer;
+ FILE *fp = popen(obj->data.execi.cmd, "r");
+ int length = fread(output, 1, text_buffer_size, fp);
- while (*p2) {
- if (*p2 == '\001')
- *p2 = ' ';
- p2++;
+ pclose(fp);
+
+ output[length] = '\0';
+ if (length > 0 && output[length - 1] == '\n') {
+ output[length - 1] = '\0';
}
- double barnum;
- if (sscanf(p, "%lf", &barnum) == 0) {
- ERR("reading execgraph value failed (perhaps it's not the correct format?)");
+
+ text_objects = parse_conky_vars(obj->data.execi.buffer, p, my_info);
+ obj->data.execi.last_update = current_update_time;
+ }
+ free_text_objects(text_objects->text_object_count, text_objects->text_objects);
+ free(text_objects);
+ free(my_info);
+ }
+ OBJ(texeci) {
+ if (!obj->data.texeci.p_timed_thread) {
+ obj->data.texeci.p_timed_thread =
+ timed_thread_create(&threaded_exec,
+ (void *) obj, obj->data.texeci.interval * 1000000);
+ if (!obj->data.texeci.p_timed_thread) {
+ ERR("Error creating texeci timed thread");
}
- if (barnum > 100 || barnum < 0) {
- ERR("your execgraph value is not between 0 and 100, therefore it will be ignored");
- } else {
- new_graph(p, 0, 25, obj->c, obj->d, (int) (barnum), obj->e, 1);
+ timed_thread_register(obj->data.texeci.p_timed_thread,
+ &obj->data.texeci.p_timed_thread);
+ if (timed_thread_run(obj->data.texeci.p_timed_thread)) {
+ ERR("Error running texeci timed thread");
}
-
}
- OBJ(execibar) {
- 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, 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++;
- }
- float barnum;
- if (sscanf(p, "%f", &barnum) == 0) {
- ERR("reading execibar value failed (perhaps it's not the correct format?)");
+ timed_thread_lock(obj->data.texeci.p_timed_thread);
+ snprintf(p, p_max_size, "%s", obj->data.texeci.buffer);
+ timed_thread_unlock(obj->data.texeci.p_timed_thread);
+ }
+#endif /* HAVE_POPEN */
+ OBJ(imap_unseen) {
+ if (obj->global_mode && info.mail) {
+ // this means we use info
+ if (!info.mail->p_timed_thread) {
+ info.mail->p_timed_thread =
+ timed_thread_create(&imap_thread,
+ (void *) info.mail, info.mail->interval * 1000000);
+ if (!info.mail->p_timed_thread) {
+ ERR("Error creating imap timed thread");
}
- if (barnum > 100 || barnum < 0) {
- ERR("your execibar value is not between 0 and 100, therefore it will be ignored");
- } else {
- obj->f = 255 * barnum / 100.0;
- new_bar(p, 0, 4, (int) obj->f);
+ timed_thread_register(info.mail->p_timed_thread,
+ &info.mail->p_timed_thread);
+ if (timed_thread_run(info.mail->p_timed_thread)) {
+ ERR("Error running imap timed thread");
}
- obj->data.execi.last_update =
- current_update_time;
}
- }
- OBJ(execigraph) {
- 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, 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++;
+ timed_thread_lock(info.mail->p_timed_thread);
+ snprintf(p, p_max_size, "%lu", info.mail->unseen);
+ timed_thread_unlock(info.mail->p_timed_thread);
+ } else if (obj->data.mail) {
+ // this means we use obj
+ if (!obj->data.mail->p_timed_thread) {
+ obj->data.mail->p_timed_thread =
+ timed_thread_create(&imap_thread,
+ (void *) obj->data.mail,
+ obj->data.mail->interval * 1000000);
+ if (!obj->data.mail->p_timed_thread) {
+ ERR("Error creating imap timed thread");
}
- float barnum;
- if (sscanf(p, "%f", &barnum) == 0) {
- ERR("reading execigraph value failed (perhaps it's not the correct format?)");
- }
- if (barnum > 100 || barnum < 0) {
- ERR("your execigraph value is not between 0 and 100, therefore it will be ignored");
- } else {
- obj->f = barnum;
- new_graph(p, 0, 25, obj->c, obj->d, (int) (obj->f), 100, 1);
+ timed_thread_register(obj->data.mail->p_timed_thread,
+ &obj->data.mail->p_timed_thread);
+ if (timed_thread_run(obj->data.mail->p_timed_thread)) {
+ ERR("Error running imap timed thread");
}
- obj->data.execi.last_update = current_update_time;
-
}
-
- }
- OBJ(execi) {
- 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 *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);
-
- output[length] = '\0';
- if (length > 0 && output[length - 1] == '\n') {
- output[length - 1] = '\0';
+ timed_thread_lock(obj->data.mail->p_timed_thread);
+ snprintf(p, p_max_size, "%lu", obj->data.mail->unseen);
+ timed_thread_unlock(obj->data.mail->p_timed_thread);
+ } else if (!obj->a) {
+ // something is wrong, warn once then stop
+ ERR("Theres a problem with your imap_unseen settings. "
+ "Check that the global IMAP settings are defined "
+ "properly (line %li).", obj->line);
+ obj->a++;
+ }
+ }
+ OBJ(imap_messages) {
+ if (obj->global_mode && info.mail) {
+ // this means we use info
+ if (!info.mail->p_timed_thread) {
+ info.mail->p_timed_thread =
+ timed_thread_create(&imap_thread,
+ (void *) info.mail, info.mail->interval * 1000000);
+ if (!info.mail->p_timed_thread) {
+ ERR("Error creating imap timed thread");
+ }
+ timed_thread_register(info.mail->p_timed_thread,
+ &info.mail->p_timed_thread);
+ if (timed_thread_run(info.mail->p_timed_thread)) {
+ ERR("Error running imap timed thread");
}
- obj->data.execi.last_update = current_update_time;
- snprintf(p, p_max_size, "%s", output);
}
- //parse_conky_vars(output, p, cur);
- }
- OBJ(texeci) {
- if (!obj->data.texeci.p_timed_thread)
- {
- obj->data.texeci.p_timed_thread=
- timed_thread_create ((void*)threaded_exec, (void*) obj,
- obj->data.texeci.interval * 1000000);
- if (!obj->data.texeci.p_timed_thread)
- ERR("Error starting texeci thread");
- timed_thread_register (obj->data.texeci.p_timed_thread,
- &obj->data.texeci.p_timed_thread);
+ timed_thread_lock(info.mail->p_timed_thread);
+ snprintf(p, p_max_size, "%lu", info.mail->messages);
+ timed_thread_unlock(info.mail->p_timed_thread);
+ } else if (obj->data.mail) {
+ // this means we use obj
+ if (!obj->data.mail->p_timed_thread) {
+ obj->data.mail->p_timed_thread =
+ timed_thread_create(&imap_thread,
+ (void *) obj->data.mail,
+ obj->data.mail->interval * 1000000);
+ if (!obj->data.mail->p_timed_thread) {
+ ERR("Error creating imap timed thread");
+ }
+ timed_thread_register(obj->data.mail->p_timed_thread,
+ &obj->data.mail->p_timed_thread);
+ if (timed_thread_run(obj->data.mail->p_timed_thread)) {
+ ERR("Error runninging imap timed thread");
+ }
}
- timed_thread_lock (obj->data.texeci.p_timed_thread);
- snprintf(p, p_max_size, "%s", obj->data.texeci.buffer);
- timed_thread_unlock (obj->data.texeci.p_timed_thread);
- }
-#endif /* HAVE_POPEN */
- OBJ(imap_unseen) {
- if (obj->global_mode && info.mail) { // this means we use info
- if (!info.mail->p_timed_thread)
- {
- info.mail->p_timed_thread =
- timed_thread_create ((void*)imap_thread,
- (void*)info.mail,
- info.mail->interval * 1000000);
- if (!info.mail->p_timed_thread)
- ERR("Error starting imap thread");
- timed_thread_register (info.mail->p_timed_thread,
- &info.mail->p_timed_thread);
+ timed_thread_lock(obj->data.mail->p_timed_thread);
+ snprintf(p, p_max_size, "%lu", obj->data.mail->messages);
+ timed_thread_lock(obj->data.mail->p_timed_thread);
+ } else if (!obj->a) {
+ // something is wrong, warn once then stop
+ ERR("Theres a problem with your imap_messages settings. "
+ "Check that the global IMAP settings are defined "
+ "properly (line %li).", obj->line);
+ obj->a++;
+ }
+ }
+ OBJ(pop3_unseen) {
+ if (obj->global_mode && info.mail) {
+ // this means we use info
+ if (!info.mail->p_timed_thread) {
+ info.mail->p_timed_thread =
+ timed_thread_create(&pop3_thread,
+ (void *) info.mail, info.mail->interval * 1000000);
+ if (!info.mail->p_timed_thread) {
+ ERR("Error creating pop3 timed thread");
}
- timed_thread_lock (info.mail->p_timed_thread);
- snprintf(p, p_max_size, "%lu", info.mail->unseen);
- timed_thread_unlock (info.mail->p_timed_thread);
- } else if (obj->data.mail) { // this means we use obj
- if (!obj->data.mail->p_timed_thread)
- {
- obj->data.mail->p_timed_thread =
- timed_thread_create ((void*)imap_thread,
- (void*)obj->data.mail,
- obj->data.mail->interval * 1000000);
- if (!obj->data.mail->p_timed_thread)
- ERR("Error starting imap thread");
- timed_thread_register (obj->data.mail->p_timed_thread,
- &obj->data.mail->p_timed_thread);
+ timed_thread_register(info.mail->p_timed_thread,
+ &info.mail->p_timed_thread);
+ if (timed_thread_run(info.mail->p_timed_thread)) {
+ ERR("Error running pop3 timed thread");
}
- timed_thread_lock (obj->data.mail->p_timed_thread);
- snprintf(p, p_max_size, "%lu", obj->data.mail->unseen);
- timed_thread_unlock (obj->data.mail->p_timed_thread);
- } else if (!obj->a) { // something is wrong, warn once then stop
- ERR("Theres a problem with your imap_unseen settings. Check that the global IMAP settings are defined properly (line %li).", obj->line);
- obj->a++;
}
- }
- OBJ(imap_messages) {
- if (obj->global_mode && info.mail) { // this means we use info
- if (!info.mail->p_timed_thread)
- {
- info.mail->p_timed_thread =
- timed_thread_create ((void*)imap_thread,
- (void*)info.mail,
- info.mail->interval * 1000000);
- if (!info.mail->p_timed_thread)
- ERR("Error starting imap thread");
- timed_thread_register (info.mail->p_timed_thread,
- &info.mail->p_timed_thread);
+ timed_thread_lock(info.mail->p_timed_thread);
+ snprintf(p, p_max_size, "%lu", info.mail->unseen);
+ timed_thread_unlock(info.mail->p_timed_thread);
+ } else if (obj->data.mail) {
+ // this means we use obj
+ if (!obj->data.mail->p_timed_thread) {
+ obj->data.mail->p_timed_thread =
+ timed_thread_create(&pop3_thread,
+ (void *) obj->data.mail,
+ obj->data.mail->interval * 1000000);
+ if (!obj->data.mail->p_timed_thread) {
+ ERR("Error creating pop3 timed thread");
+ }
+ timed_thread_register(obj->data.mail->p_timed_thread,
+ &obj->data.mail->p_timed_thread);
+ if (timed_thread_run(obj->data.mail->p_timed_thread)) {
+ ERR("Error running pop3 timed thread");
}
- timed_thread_lock (info.mail->p_timed_thread);
- snprintf(p, p_max_size, "%lu", info.mail->messages);
- timed_thread_unlock (info.mail->p_timed_thread);
- } else if (obj->data.mail) { // this means we use obj
- if (!obj->data.mail->p_timed_thread)
- {
- obj->data.mail->p_timed_thread =
- timed_thread_create ((void*)imap_thread,
- (void*)obj->data.mail,
- obj->data.mail->interval * 1000000);
- if (!obj->data.mail->p_timed_thread)
- ERR("Error starting imap thread");
- timed_thread_register (obj->data.mail->p_timed_thread,
- &obj->data.mail->p_timed_thread);
- }
- timed_thread_lock (obj->data.mail->p_timed_thread);
- snprintf(p, p_max_size, "%lu", obj->data.mail->messages);
- timed_thread_lock (obj->data.mail->p_timed_thread);
- } else if (!obj->a) { // something is wrong, warn once then stop
- ERR("Theres a problem with your imap_messages settings. Check that the global IMAP settings are defined properly (line %li).", obj->line);
- obj->a++;
}
- }
- OBJ(pop3_unseen) {
- if (obj->global_mode && info.mail) { // this means we use info
- if (!info.mail->p_timed_thread)
- {
- info.mail->p_timed_thread =
- timed_thread_create ((void*)pop3_thread,
- (void*)info.mail,
- info.mail->interval * 1000000);
- if (!info.mail->p_timed_thread)
- ERR("Error starting pop3 thread");
- timed_thread_register (info.mail->p_timed_thread,
- &info.mail->p_timed_thread);
+ timed_thread_lock(obj->data.mail->p_timed_thread);
+ snprintf(p, p_max_size, "%lu", obj->data.mail->unseen);
+ timed_thread_unlock(obj->data.mail->p_timed_thread);
+ } else if (!obj->a) {
+ // something is wrong, warn once then stop
+ ERR("Theres a problem with your pop3_unseen settings. "
+ "Check that the global POP3 settings are defined "
+ "properly (line %li).", obj->line);
+ obj->a++;
+ }
+ }
+ OBJ(pop3_used) {
+ if (obj->global_mode && info.mail) {
+ // this means we use info
+ if (!info.mail->p_timed_thread) {
+ info.mail->p_timed_thread =
+ timed_thread_create(&pop3_thread,
+ (void *) info.mail, info.mail->interval * 1000000);
+ if (!info.mail->p_timed_thread) {
+ ERR("Error creating pop3 timed thread");
}
- timed_thread_lock (info.mail->p_timed_thread);
- snprintf(p, p_max_size, "%lu", info.mail->unseen);
- timed_thread_unlock (info.mail->p_timed_thread);
- } else if (obj->data.mail) { // this means we use obj
- if (!obj->data.mail->p_timed_thread)
- {
- obj->data.mail->p_timed_thread =
- timed_thread_create ((void*)pop3_thread,
- (void*)obj->data.mail,
- obj->data.mail->interval * 1000000);
- if (!obj->data.mail->p_timed_thread)
- ERR("Error starting pop3 thread");
- timed_thread_register (obj->data.mail->p_timed_thread,
- &obj->data.mail->p_timed_thread);
+ timed_thread_register(info.mail->p_timed_thread,
+ &info.mail->p_timed_thread);
+ if (timed_thread_run(info.mail->p_timed_thread)) {
+ ERR("Error running pop3 timed thread");
}
- timed_thread_lock (obj->data.mail->p_timed_thread);
- snprintf(p, p_max_size, "%lu", obj->data.mail->unseen);
- timed_thread_unlock (obj->data.mail->p_timed_thread);
- } else if (!obj->a) { // something is wrong, warn once then stop
- ERR("Theres a problem with your pop3_unseen settings. Check that the global POP3 settings are defined properly (line %li).", obj->line);
- obj->a++;
}
- }
- OBJ(pop3_used) {
- if (obj->global_mode && info.mail) { // this means we use info
- if (!info.mail->p_timed_thread)
- {
- info.mail->p_timed_thread =
- timed_thread_create ((void*)pop3_thread,
- (void*)info.mail,
- info.mail->interval * 1000000);
- if (!info.mail->p_timed_thread)
- ERR("Error starting pop3 thread");
- timed_thread_register (info.mail->p_timed_thread,
- &info.mail->p_timed_thread);
+ timed_thread_lock(info.mail->p_timed_thread);
+ snprintf(p, p_max_size, "%.1f",
+ info.mail->used / 1024.0 / 1024.0);
+ timed_thread_unlock(info.mail->p_timed_thread);
+ } else if (obj->data.mail) {
+ // this means we use obj
+ if (!obj->data.mail->p_timed_thread) {
+ obj->data.mail->p_timed_thread =
+ timed_thread_create(&pop3_thread,
+ (void *) obj->data.mail,
+ obj->data.mail->interval * 1000000);
+ if (!obj->data.mail->p_timed_thread) {
+ ERR("Error creating pop3 timed thread");
}
- timed_thread_lock (info.mail->p_timed_thread);
- snprintf(p, p_max_size, "%.1f", info.mail->used/1024.0/1024.0);
- timed_thread_unlock (info.mail->p_timed_thread);
- } else if (obj->data.mail) { // this means we use obj
- if (!obj->data.mail->p_timed_thread)
- {
- obj->data.mail->p_timed_thread =
- timed_thread_create ((void*)pop3_thread,
- (void*)obj->data.mail,
- obj->data.mail->interval * 1000000);
- if (!obj->data.mail->p_timed_thread)
- ERR("Error starting pop3 thread");
- timed_thread_register (obj->data.mail->p_timed_thread,
- &obj->data.mail->p_timed_thread);
+ timed_thread_register(obj->data.mail->p_timed_thread,
+ &obj->data.mail->p_timed_thread);
+ if (timed_thread_run(obj->data.mail->p_timed_thread)) {
+ ERR("Error running pop3 timed thread");
}
- timed_thread_lock (obj->data.mail->p_timed_thread);
- snprintf(p, p_max_size, "%.1f", obj->data.mail->used/1024.0/1024.0);
- timed_thread_unlock (obj->data.mail->p_timed_thread);
- } else if (!obj->a) { // something is wrong, warn once then stop
- ERR("Theres a problem with your pop3_used settings. Check that the global POP3 settings are defined properly (line %li).", obj->line);
- obj->a++;
}
+ timed_thread_lock(obj->data.mail->p_timed_thread);
+ snprintf(p, p_max_size, "%.1f",
+ obj->data.mail->used / 1024.0 / 1024.0);
+ timed_thread_unlock(obj->data.mail->p_timed_thread);
+ } else if (!obj->a) {
+ // something is wrong, warn once then stop
+ ERR("Theres a problem with your pop3_used settings. "
+ "Check that the global POP3 settings are defined "
+ "properly (line %li).", obj->line);
+ obj->a++;
}
+ }
OBJ(fs_bar) {
if (obj->data.fs != NULL) {
- if (obj->data.fs->size == 0)
- new_bar(p,
- obj->data.fsbar.w,
- obj->data.fsbar.h,
- 255);
- else
- new_bar(p,
- obj->data.fsbar.w,
- obj->data.fsbar.h,
- (int) (255 -
- obj->data.
- fsbar.fs->
- avail *
- 255 /
- obj->data.
- fs->size));
+ if (obj->data.fs->size == 0) {
+ new_bar(p, obj->data.fsbar.w, obj->data.fsbar.h, 255);
+ } else {
+ new_bar(p, obj->data.fsbar.w, obj->data.fsbar.h,
+ (int) (255 - obj->data.fsbar.fs->avail * 255 /
+ obj->data.fs->size));
+ }
}
}
OBJ(fs_free) {
- if (obj->data.fs != NULL)
- human_readable(obj->data.fs->avail,
- p, 255);
+ if (obj->data.fs != NULL) {
+ human_readable(obj->data.fs->avail, p, 255, "fs_free");
+ }
}
OBJ(fs_free_perc) {
if (obj->data.fs != NULL) {
- if (obj->data.fs->size)
- snprintf(p, p_max_size, "%*d",
- pad_percents,
- (int) ((obj->data.
- fs->
- avail *
- 100) /
- obj->data.
- fs->size));
- else
+ if (obj->data.fs->size) {
+ spaced_print(p, p_max_size, "%*d", 4, "fs_free_perc",
+ pad_percents, (int) ((obj->data.fs->avail * 100) /
+ obj->data.fs->size));
+ } else {
snprintf(p, p_max_size, "0");
+ }
}
}
OBJ(fs_size) {
+ if (obj->data.fs != NULL) {
+ human_readable(obj->data.fs->size, p, 255, "fs_size");
+ }
+ }
+ OBJ(fs_type) {
if (obj->data.fs != NULL)
- human_readable(obj->data.fs->size,
- p, 255);
+ snprintf(p, p_max_size, "%s", obj->data.fs->type);
}
OBJ(fs_used) {
- if (obj->data.fs != NULL)
- human_readable(obj->data.fs->size -
- (obj->data.fs->free ? obj->data.fs->free :obj->data.fs->avail),
- p, 255);
+ if (obj->data.fs != NULL) {
+ human_readable(obj->data.fs->size - (obj->data.fs->free
+ ? obj->data.fs->free : obj->data.fs->avail), p, 255,
+ "fs_used");
+ }
}
OBJ(fs_bar_free) {
if (obj->data.fs != NULL) {
- if (obj->data.fs->size == 0)
- new_bar(p,
- obj->data.fsbar.w,
- obj->data.fsbar.h,
- 255);
- else
- new_bar(p,
- obj->data.fsbar.w,
- obj->data.fsbar.h,
- (int) (obj->data.
- fsbar.fs->
- avail *
- 255 /
- obj->data.
- fs->size));
+ if (obj->data.fs->size == 0) {
+ new_bar(p, obj->data.fsbar.w, obj->data.fsbar.h, 255);
+ } else {
+ new_bar(p, obj->data.fsbar.w, obj->data.fsbar.h,
+ (int) (obj->data.fsbar.fs->avail * 255 /
+ obj->data.fs->size));
+ }
}
}
OBJ(fs_used_perc) {
if (obj->data.fs != NULL) {
- if (obj->data.fs->size)
- snprintf(p, 4, "%d",
- 100 - ((int)
- ((obj->
- data.fs->
- avail *
- 100) /
- obj->data.
- fs->
- size)));
- else
+ if (obj->data.fs->size) {
+ spaced_print(p, 4, "%*d", 4, "fs_used_perc",
+ pad_percents, 100 - ((int) ((obj->data.fs->avail * 100) /
+ obj->data.fs->size)));
+ } else {
snprintf(p, p_max_size, "0");
+ }
}
}
OBJ(loadavg) {
float *v = info.loadavg;
- if (obj->data.loadavg[2])
+ if (obj->data.loadavg[2]) {
snprintf(p, p_max_size, "%.2f %.2f %.2f",
- v[obj->data.loadavg[0] -
- 1],
- v[obj->data.loadavg[1] -
- 1],
- v[obj->data.loadavg[2] -
- 1]);
- else if (obj->data.loadavg[1])
+ v[obj->data.loadavg[0] - 1],
+ v[obj->data.loadavg[1] - 1],
+ v[obj->data.loadavg[2] - 1]);
+ } else if (obj->data.loadavg[1]) {
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])
+ v[obj->data.loadavg[0] - 1],
+ v[obj->data.loadavg[1] - 1]);
+ } else if (obj->data.loadavg[0]) {
snprintf(p, p_max_size, "%.2f",
- v[obj->data.loadavg[0] -
- 1]);
+ v[obj->data.loadavg[0] - 1]);
+ }
}
OBJ(goto) {
new_goto(p, obj->data.i);
OBJ(hr) {
new_hr(p, obj->data.i);
}
+ OBJ(nameserver) {
+ if (cur->nameserver_info.nscount > obj->data.i)
+ snprintf(p, p_max_size, "%s",
+ cur->nameserver_info.ns_list[obj->data.i]);
+ }
#ifdef RSS
OBJ(rss) {
- PRSS* data = get_rss_info(obj->data.rss.uri, obj->data.rss.delay);
+ PRSS *data = get_rss_info(obj->data.rss.uri,
+ obj->data.rss.delay);
char *str;
- if(data == NULL)
+
+ if (data == NULL) {
snprintf(p, p_max_size, "prss: Error reading RSS data\n");
- else {
- if(!strcmp(obj->data.rss.action, "feed_title")) {
- str = data->title;
- if(str[strlen(str)-1] == '\n')
- str[strlen(str)-1] = 0; // remove trailing new line if one exists
- snprintf(p, p_max_size, "%s", str);
- } else if(!strcmp(obj->data.rss.action, "item_title")) {
- if(obj->data.rss.act_par < data->item_count) {
+ } else {
+ if (!strcmp(obj->data.rss.action, "feed_title")) {
+ str = data->title;
+ // remove trailing new line if one exists
+ if (str[strlen(str) - 1] == '\n') {
+ str[strlen(str) - 1] = 0;
+ }
+ snprintf(p, p_max_size, "%s", str);
+ } else if (!strcmp(obj->data.rss.action, "item_title")) {
+ if (obj->data.rss.act_par < data->item_count) {
str = data->items[obj->data.rss.act_par].title;
- if(str[strlen(str)-1] == '\n')
- str[strlen(str)-1] = 0; // remove trailing new line if one exists
+ // remove trailing new line if one exists
+ if (str[strlen(str) - 1] == '\n') {
+ str[strlen(str) - 1] = 0;
+ }
snprintf(p, p_max_size, "%s", str);
}
- } else if(!strcmp(obj->data.rss.action, "item_desc")) {
- if(obj->data.rss.act_par < data->item_count) {
- str = data->items[obj->data.rss.act_par].description;
- if(str[strlen(str)-1] == '\n')
- str[strlen(str)-1] = 0; // remove trailing new line if one exists
+ } else if (!strcmp(obj->data.rss.action, "item_desc")) {
+ if (obj->data.rss.act_par < data->item_count) {
+ str =
+ data->items[obj->data.rss.act_par].description;
+ // remove trailing new line if one exists
+ if (str[strlen(str) - 1] == '\n') {
+ str[strlen(str) - 1] = 0;
+ }
snprintf(p, p_max_size, "%s", str);
}
- } else if(!strcmp(obj->data.rss.action, "item_titles")) {
- if(data->item_count > 0) {
+ } else if (!strcmp(obj->data.rss.action, "item_titles")) {
+ if (data->item_count > 0) {
int itmp;
- p[0] = 0;
int show;
- if(obj->data.rss.act_par > data->item_count)
+
+ p[0] = 0;
+
+ if (obj->data.rss.act_par > data->item_count) {
show = data->item_count;
- else show = obj->data.rss.act_par;
- for(itmp = 0; itmp < show; itmp++) {
+ } else {
+ show = obj->data.rss.act_par;
+ }
+ for (itmp = 0; itmp < show; itmp++) {
PRSS_Item *item = &data->items[itmp];
+
str = item->title;
- if(str) {
- if(itmp>0) // don't add new line before first item
+ if (str) {
+ // don't add new line before first item
+ if (itmp > 0) {
strncat(p, "\n", p_max_size);
- if(str[strlen(str)-1] == '\n')
- str[strlen(str)-1] = 0; // remove trailing new line if one exists, we have our own
+ }
+ /* remove trailing new line if one exists,
+ * we have our own */
+ if (str[strlen(str) - 1] == '\n') {
+ str[strlen(str) - 1] = 0;
+ }
strncat(p, str, p_max_size);
}
}
OBJ(hddtemp) {
char *temp;
char unit;
-
- temp = get_hddtemp_info(obj->data.hddtemp.dev,
- obj->data.hddtemp.addr, obj->data.hddtemp.port, &unit);
+
+ temp = get_hddtemp_info(obj->data.hddtemp.dev,
+ obj->data.hddtemp.addr, obj->data.hddtemp.port, &unit);
if (!temp) {
snprintf(p, p_max_size, "N/A");
} else if (unit == '*') {
snprintf(p, p_max_size, "%s", temp);
} else {
- snprintf(p, p_max_size, "%s°%c", temp, unit);
+ snprintf(p, p_max_size, "%s°%c", temp, unit);
}
}
#endif
OBJ(i2c) {
double r;
- r = get_sysfs_info(&obj->data.sysfs.fd,
- obj->data.sysfs.arg,
- obj->data.sysfs.devtype,
- obj->data.sysfs.type);
+ r = get_sysfs_info(&obj->data.sysfs.fd, obj->data.sysfs.arg,
+ obj->data.sysfs.devtype, obj->data.sysfs.type);
- if (r >= 100.0 || r == 0)
+ if (r >= 100.0 || r == 0) {
snprintf(p, p_max_size, "%d", (int) r);
- else
+ } else {
+ snprintf(p, p_max_size, "%.1f", r);
+ }
+ }
+ OBJ(platform) {
+ double r;
+
+ r = get_sysfs_info(&obj->data.sysfs.fd, obj->data.sysfs.arg,
+ obj->data.sysfs.devtype, obj->data.sysfs.type);
+
+ if (r >= 100.0 || r == 0) {
+ snprintf(p, p_max_size, "%d", (int) r);
+ } else {
+ snprintf(p, p_max_size, "%.1f", r);
+ }
+ }
+ OBJ(hwmon) {
+ double r;
+
+ r = get_sysfs_info(&obj->data.sysfs.fd, obj->data.sysfs.arg,
+ obj->data.sysfs.devtype, obj->data.sysfs.type);
+
+ if (r >= 100.0 || r == 0) {
+ snprintf(p, p_max_size, "%d", (int) r);
+ } else {
snprintf(p, p_max_size, "%.1f", r);
+ }
}
- OBJ(platform) {
- double r;
-
- r = get_sysfs_info(&obj->data.sysfs.fd,
- obj->data.sysfs.arg,
- obj->data.sysfs.devtype,
- obj->data.sysfs.type);
-
- if (r >= 100.0 || r == 0)
- snprintf(p, p_max_size, "%d", (int) r);
- else
- snprintf(p, p_max_size, "%.1f", r);
- }
- OBJ(hwmon) {
- double r;
-
- r = get_sysfs_info(&obj->data.sysfs.fd,
- obj->data.sysfs.arg,
- obj->data.sysfs.devtype,
- obj->data.sysfs.type);
-
- if (r >= 100.0 || r == 0)
- snprintf(p, p_max_size, "%d", (int) r);
- else
- snprintf(p, p_max_size, "%.1f", r);
- }
#endif /* !__OpenBSD__ */
OBJ(alignr) {
new_alignr(p, obj->data.i);
new_alignc(p, obj->data.i);
}
OBJ(if_empty) {
+ struct text_object_list *text_objects;
struct information *my_info =
- malloc(sizeof(struct information));
+ malloc(sizeof(struct information));
memcpy(my_info, cur, sizeof(struct information));
- parse_conky_vars(obj->data.ifblock.s, p, my_info);
+ text_objects = parse_conky_vars(obj->data.ifblock.s, p, my_info);
+
if (strlen(p) != 0) {
i = obj->data.ifblock.pos;
if_jumped = 1;
if_jumped = 0;
}
p[0] = '\0';
+ free_text_objects(text_objects->text_object_count, text_objects->text_objects);
+ free(text_objects);
free(my_info);
}
OBJ(if_existing) {
struct stat tmp;
+
if ((obj->data.ifblock.s)
- && (stat(obj->data.ifblock.s, &tmp) ==
- -1)) {
+ && (stat(obj->data.ifblock.s, &tmp) == -1)) {
i = obj->data.ifblock.pos;
if_jumped = 1;
} else {
- if (obj->data.ifblock.str) {
- if (!check_contains(obj->data.ifblock.s,
- obj->data.ifblock.str)) {
+ if (obj->data.ifblock.str) {
+ if (!check_contains(obj->data.ifblock.s,
+ obj->data.ifblock.str)) {
i = obj->data.ifblock.pos;
if_jumped = 1;
- } else
- if_jumped = 0;
- } else
- if_jumped = 0;
+ } else {
+ if_jumped = 0;
+ }
+ } else {
+ if_jumped = 0;
+ }
}
}
OBJ(if_mounted) {
if ((obj->data.ifblock.s)
- && (!check_mount(obj->data.ifblock.s))) {
+ && (!check_mount(obj->data.ifblock.s))) {
i = obj->data.ifblock.pos;
if_jumped = 1;
} else {
}
}
OBJ(if_running) {
- if ((obj->data.ifblock.s)
- && system(obj->data.ifblock.s)) {
+ if ((obj->data.ifblock.s) && system(obj->data.ifblock.s)) {
i = obj->data.ifblock.pos;
if_jumped = 1;
} else {
if_jumped = 0;
}
}
+ OBJ(ioscheduler) {
+ snprintf(p, p_max_size, "%s", get_ioscheduler(obj->data.s));
+ }
OBJ(kernel) {
snprintf(p, p_max_size, "%s", cur->uname_s.release);
}
/* memory stuff */
OBJ(mem) {
- human_readable(cur->mem * 1024, p, 255);
+ human_readable(cur->mem * 1024, p, 255, "mem");
}
OBJ(memmax) {
- human_readable(cur->memmax * 1024, p, 255);
+ human_readable(cur->memmax * 1024, p, 255, "memmax");
}
OBJ(memperc) {
if (cur->memmax) {
- if (!use_spacer)
- snprintf(p, p_max_size, "%*Lu",
- pad_percents,
- (cur->mem * 100) /
- (cur->memmax));
- else
- snprintf(p, 4, "%*Lu ",
- pad_percents,
- (cur->mem * 100) /
- (cur->memmax));
+ spaced_print(p, p_max_size, "%*llu", 4, "memperc",
+ pad_percents, cur->mem * 100 / cur->memmax);
}
}
OBJ(membar) {
- new_bar(p, obj->data.pair.a,
- obj->data.pair.b,
- cur->memmax ? (cur->mem * 255) /
- (cur->memmax) : 0);
+ new_bar(p, obj->data.pair.a, obj->data.pair.b,
+ cur->memmax ? (cur->mem * 255) / (cur->memmax) : 0);
}
-
OBJ(memgraph) {
- new_graph(p, obj->a,
- obj->b, obj->c, obj->d,
- cur->memmax ? (cur->mem * 100.0) /
- (cur->memmax) : 0.0, 100, 1);
+ new_graph(p, obj->a, obj->b, obj->c, obj->d,
+ cur->memmax ? (cur->mem * 100.0) / (cur->memmax) : 0.0,
+ 100, 1);
}
+
/* mixer stuff */
OBJ(mixer) {
- snprintf(p, p_max_size, "%d",
- mixer_get_avg(obj->data.l));
+ snprintf(p, p_max_size, "%d", mixer_get_avg(obj->data.l));
}
OBJ(mixerl) {
- snprintf(p, p_max_size, "%d",
- mixer_get_left(obj->data.l));
+ snprintf(p, p_max_size, "%d", mixer_get_left(obj->data.l));
}
OBJ(mixerr) {
- snprintf(p, p_max_size, "%d",
- mixer_get_right(obj->data.l));
+ snprintf(p, p_max_size, "%d", mixer_get_right(obj->data.l));
}
OBJ(mixerbar) {
- new_bar(p, obj->data.mixerbar.w,
- obj->data.mixerbar.h,
- mixer_get_avg(obj->data.mixerbar.
- l) * 255 / 100);
+ new_bar(p, obj->data.mixerbar.w, obj->data.mixerbar.h,
+ mixer_get_avg(obj->data.mixerbar.l) * 255 / 100);
}
OBJ(mixerlbar) {
- new_bar(p, obj->data.mixerbar.w,
- obj->data.mixerbar.h,
- mixer_get_left(obj->data.mixerbar.
- l) * 255 / 100);
+ new_bar(p, obj->data.mixerbar.w, obj->data.mixerbar.h,
+ mixer_get_left(obj->data.mixerbar.l) * 255 / 100);
}
OBJ(mixerrbar) {
- new_bar(p, obj->data.mixerbar.w,
- obj->data.mixerbar.h,
- mixer_get_right(obj->data.mixerbar.
- l) * 255 / 100);
+ new_bar(p, obj->data.mixerbar.w, obj->data.mixerbar.h,
+ mixer_get_right(obj->data.mixerbar.l) * 255 / 100);
}
/* mail stuff */
OBJ(mails) {
- snprintf(p, p_max_size, "%d", cur->mail_count);
+ update_mail_count(&obj->data.local_mail);
+ snprintf(p, p_max_size, "%d", obj->data.local_mail.mail_count);
}
OBJ(mboxscan) {
- mbox_scan(obj->data.mboxscan.args, obj->data.mboxscan.output, TEXT_BUFFER_SIZE);
+ mbox_scan(obj->data.mboxscan.args, obj->data.mboxscan.output,
+ text_buffer_size);
snprintf(p, p_max_size, "%s", obj->data.mboxscan.output);
}
OBJ(new_mails) {
- snprintf(p, p_max_size, "%d", cur->new_mail_count);
+ update_mail_count(&obj->data.local_mail);
+ snprintf(p, p_max_size, "%d",
+ obj->data.local_mail.new_mail_count);
}
-
OBJ(nodename) {
- snprintf(p, p_max_size, "%s",
- cur->uname_s.nodename);
+ snprintf(p, p_max_size, "%s", cur->uname_s.nodename);
}
OBJ(outlinecolor) {
new_outline(p, obj->data.l);
}
OBJ(processes) {
- if (!use_spacer)
- snprintf(p, p_max_size, "%hu", cur->procs);
- else
- snprintf(p, 5, "%hu ",
- cur->procs);
+ spaced_print(p, p_max_size, "%hu", 5, "processes", cur->procs);
}
OBJ(running_processes) {
- if (!use_spacer)
- snprintf(p, p_max_size, "%hu",
- cur->run_procs);
- else
- snprintf(p, 3, "%hu ",
- cur->run_procs);
+ spaced_print(p, p_max_size, "%hu", 3, "running_processes", cur->run_procs);
}
OBJ(text) {
snprintf(p, p_max_size, "%s", obj->data.s);
new_bg(p, obj->data.l);
}
OBJ(stippled_hr) {
- new_stippled_hr(p, obj->data.pair.a,
- obj->data.pair.b);
+ new_stippled_hr(p, obj->data.pair.a, obj->data.pair.b);
}
OBJ(swap) {
- human_readable(cur->swap * 1024, p, 255);
+ human_readable(cur->swap * 1024, p, 255, "swap");
}
OBJ(swapmax) {
- human_readable(cur->swapmax * 1024, p,
- 255);
+ human_readable(cur->swapmax * 1024, p, 255, "swapmax");
}
OBJ(swapperc) {
if (cur->swapmax == 0) {
- strncpy(p, "No swap", 255);
+ strncpy(p, "No swap", p_max_size);
} else {
- if (!use_spacer)
- snprintf(p, 255, "%*Lu",
- pad_percents,
- (cur->swap *
- 100) /
- cur->swapmax);
- else
- snprintf(p, 4, "%*Lu ",
- pad_percents,
- (cur->swap *
- 100) /
- cur->swapmax);
+ spaced_print(p, p_max_size, "%*llu", 4, "swapperc",
+ pad_percents, cur->swap * 100 / cur->swapmax);
}
}
OBJ(swapbar) {
- new_bar(p, obj->data.pair.a,
- obj->data.pair.b,
- cur->swapmax ? (cur->swap * 255) /
- (cur->swapmax) : 0);
+ new_bar(p, obj->data.pair.a, obj->data.pair.b,
+ cur->swapmax ? (cur->swap * 255) / (cur->swapmax) : 0);
}
OBJ(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, p_max_size, obj->data.s, tm);
}
OBJ(utime) {
time_t t = time(NULL);
struct tm *tm = gmtime(&t);
+
strftime(p, p_max_size, obj->data.s, tm);
}
OBJ(tztime) {
- char* oldTZ = NULL;
+ char *oldTZ = NULL;
+ time_t t;
+ struct tm *tm;
+
if (obj->data.tztime.tz) {
oldTZ = getenv("TZ");
setenv("TZ", obj->data.tztime.tz, 1);
tzset();
}
- time_t t = time(NULL);
- struct tm *tm = localtime(&t);
+ t = time(NULL);
+ tm = localtime(&t);
+
setlocale(LC_TIME, "");
strftime(p, p_max_size, obj->data.tztime.fmt, tm);
if (oldTZ) {
} else {
unsetenv("TZ");
}
- // Needless to free oldTZ since getenv gives ptr to static data
+ // Needless to free oldTZ since getenv gives ptr to static data
}
OBJ(totaldown) {
- human_readable(obj->data.net->recv, p,
- 255);
+ human_readable(obj->data.net->recv, p, 255, "totaldown");
}
OBJ(totalup) {
- human_readable(obj->data.net->trans, p,
- 255);
+ human_readable(obj->data.net->trans, p, 255, "totalup");
}
OBJ(updates) {
snprintf(p, p_max_size, "%d", total_updates);
}
OBJ(upspeed) {
- if (!use_spacer)
- snprintf(p, p_max_size, "%d",
- (int) (obj->data.net->
- trans_speed /
- 1024));
- else
- snprintf(p, 6, "%d ",
- (int) (obj->data.net->
- trans_speed /
- 1024));
+ spaced_print(p, p_max_size, "%d", 6, "upspeed",
+ round_to_int(obj->data.net->trans_speed / 1024));
}
OBJ(upspeedf) {
- if (!use_spacer)
- snprintf(p, p_max_size, "%.1f",
- obj->data.net->
- trans_speed / 1024.0);
- else
- snprintf(p, 8, "%.1f ",
- obj->data.net->
- trans_speed / 1024.0);
+ spaced_print(p, p_max_size, "%.1f", 8, "upspeedf",
+ obj->data.net->trans_speed / 1024.0);
}
OBJ(upspeedgraph) {
- /*
- if (obj->data.net->trans_speed == 0)
- obj->data.net->trans_speed = 0.01;
- */
new_graph(p, obj->a, obj->b, obj->c, obj->d,
- (obj->data.net->trans_speed /
- 1024.0), obj->e, 1);
+ obj->data.net->trans_speed / 1024.0, obj->e, 1);
}
OBJ(uptime_short) {
- format_seconds_short(p, p_max_size,
- (int) cur->uptime);
+ format_seconds_short(p, p_max_size, (int) cur->uptime);
}
OBJ(uptime) {
format_seconds(p, p_max_size, (int) cur->uptime);
}
-
-#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
+ OBJ(user_names) {
+ snprintf(p, p_max_size, "%s", cur->users.names);
+ }
+ OBJ(user_terms) {
+ snprintf(p, p_max_size, "%s", cur->users.terms);
+ }
+ OBJ(user_times) {
+ snprintf(p, p_max_size, "%s", cur->users.times);
+ }
+ OBJ(user_number) {
+ snprintf(p, p_max_size, "%d", cur->users.number);
+ }
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
+ || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
OBJ(apm_adapter) {
- char *msg;
+ char *msg;
+
msg = get_apm_adapter();
snprintf(p, p_max_size, "%s", msg);
free(msg);
}
OBJ(apm_battery_life) {
- char *msg;
+ char *msg;
+
msg = get_apm_battery_life();
snprintf(p, p_max_size, "%s", msg);
free(msg);
}
OBJ(apm_battery_time) {
- char *msg;
+ char *msg;
+
msg = get_apm_battery_time();
snprintf(p, p_max_size, "%s", msg);
free(msg);
#ifdef MPD
OBJ(mpd_title) {
- snprintf(p, cur->mpd.max_title_len > 0 ?
- cur->mpd.max_title_len : p_max_size, "%s",
- cur->mpd.title);
+ snprintf(p, cur->mpd.max_title_len > 0
+ ? cur->mpd.max_title_len : p_max_size, "%s",
+ cur->mpd.title);
}
OBJ(mpd_artist) {
snprintf(p, p_max_size, "%s", cur->mpd.artist);
snprintf(p, p_max_size, "%s", cur->mpd.status);
}
OBJ(mpd_elapsed) {
- int days = 0, hours = 0, minutes =
- 0, seconds = 0;
+ int days = 0, hours = 0, minutes = 0, seconds = 0;
int tmp = cur->mpd.elapsed;
+
while (tmp >= 86400) {
tmp -= 86400;
days++;
minutes++;
}
seconds = tmp;
- if (days > 0)
- snprintf(p, p_max_size, "%i days %i:%02i:%02i",
- days, hours, minutes,
- seconds);
- else if (hours > 0)
- snprintf(p, p_max_size, "%i:%02i:%02i", hours,
- minutes, seconds);
- else
- snprintf(p, p_max_size, "%i:%02i", minutes,
- seconds);
+ if (days > 0) {
+ snprintf(p, p_max_size, "%i days %i:%02i:%02i", days,
+ hours, minutes, seconds);
+ } else if (hours > 0) {
+ snprintf(p, p_max_size, "%i:%02i:%02i", hours, minutes,
+ seconds);
+ } else {
+ snprintf(p, p_max_size, "%i:%02i", minutes, seconds);
+ }
}
OBJ(mpd_length) {
- int days = 0, hours = 0, minutes =
- 0, seconds = 0;
+ int days = 0, hours = 0, minutes = 0, seconds = 0;
int tmp = cur->mpd.length;
+
while (tmp >= 86400) {
tmp -= 86400;
days++;
minutes++;
}
seconds = tmp;
- if (days > 0)
- snprintf(p, p_max_size,
- "%i days %i:%02i:%02i",
- days, hours, minutes,
- seconds);
- else if (hours > 0)
- snprintf(p, p_max_size, "%i:%02i:%02i", hours,
- minutes, seconds);
- else
- snprintf(p, p_max_size, "%i:%02i", minutes,
- seconds);
+ if (days > 0) {
+ snprintf(p, p_max_size, "%i days %i:%02i:%02i", days,
+ hours, minutes, seconds);
+ } else if (hours > 0) {
+ snprintf(p, p_max_size, "%i:%02i:%02i", hours, minutes,
+ seconds);
+ } else {
+ snprintf(p, p_max_size, "%i:%02i", minutes, seconds);
+ }
}
OBJ(mpd_percent) {
- snprintf(p, p_max_size, "%2.0f",
- cur->mpd.progress * 100);
+ spaced_print(p, p_max_size, "%*d", 4, "mpd_percent",
+ pad_percents, (int) (cur->mpd.progress * 100));
}
OBJ(mpd_bar) {
- new_bar(p, obj->data.pair.a,
- obj->data.pair.b,
- (int) (cur->mpd.progress *
- 255.0f));
+ new_bar(p, obj->data.pair.a, obj->data.pair.b,
+ (int) (cur->mpd.progress * 255.0f));
}
OBJ(mpd_smart) {
- if (strlen(cur->mpd.title) < 2 && strlen(cur->mpd.artist) < 2) {
+ memset(p, 0, p_max_size);
+ if (cur->mpd.artist && *cur->mpd.artist && cur->mpd.title
+ && *cur->mpd.title) {
+ snprintf(p, p_max_size, "%s - %s", cur->mpd.artist,
+ cur->mpd.title);
+ } else if (cur->mpd.title && *cur->mpd.title) {
+ snprintf(p, p_max_size, "%s", cur->mpd.title);
+ } else if (cur->mpd.artist && *cur->mpd.artist) {
+ snprintf(p, p_max_size, "%s", cur->mpd.artist);
+ } else if (cur->mpd.file && *cur->mpd.file) {
snprintf(p, p_max_size, "%s", cur->mpd.file);
} else {
- snprintf(p, p_max_size, "%s - %s", cur->mpd.artist, cur->mpd.title);
+ *p = 0;
}
}
#endif
+
#ifdef XMMS2
OBJ(xmms2_artist) {
snprintf(p, p_max_size, "%s", cur->xmms2.artist);
OBJ(xmms2_comment) {
snprintf(p, p_max_size, "%s", cur->xmms2.comment);
}
- OBJ(xmms2_decoder) {
- snprintf(p, p_max_size, "%s", cur->xmms2.decoder);
- }
- OBJ(xmms2_transport) {
- snprintf(p, p_max_size, "%s", cur->xmms2.transport);
- }
OBJ(xmms2_url) {
snprintf(p, p_max_size, "%s", cur->xmms2.url);
}
OBJ(xmms2_status) {
snprintf(p, p_max_size, "%s", cur->xmms2.status);
}
- OBJ(xmms2_date) {
- snprintf(p, p_max_size, "%s", cur->xmms2.date);
+ OBJ(xmms2_date) {
+ snprintf(p, p_max_size, "%s", cur->xmms2.date);
}
OBJ(xmms2_tracknr) {
- if (cur->xmms2.tracknr != -1)
- snprintf(p, p_max_size, "%i", cur->xmms2.tracknr);
+ if (cur->xmms2.tracknr != -1) {
+ snprintf(p, p_max_size, "%i", cur->xmms2.tracknr);
+ }
}
OBJ(xmms2_bitrate) {
snprintf(p, p_max_size, "%i", cur->xmms2.bitrate);
}
- OBJ(xmms2_id) {
+ OBJ(xmms2_id) {
snprintf(p, p_max_size, "%u", cur->xmms2.id);
}
- OBJ(xmms2_size) {
+ OBJ(xmms2_size) {
snprintf(p, p_max_size, "%2.1f", cur->xmms2.size);
}
OBJ(xmms2_elapsed) {
- int tmp = cur->xmms2.elapsed;
- snprintf(p, p_max_size, "%02d:%02d",
- tmp / 60000, (tmp / 1000) % 60);
+ snprintf(p, p_max_size, "%02d:%02d", cur->xmms2.elapsed / 60000,
+ (cur->xmms2.elapsed / 1000) % 60);
}
OBJ(xmms2_duration) {
- int tmp = cur->xmms2.duration;
snprintf(p, p_max_size, "%02d:%02d",
- tmp / 60000, (tmp / 1000) % 60);
+ cur->xmms2.duration / 60000,
+ (cur->xmms2.duration / 1000) % 60);
}
OBJ(xmms2_percent) {
- snprintf(p, p_max_size, "%2.0f",
- cur->xmms2.progress * 100);
+ snprintf(p, p_max_size, "%2.0f", cur->xmms2.progress * 100);
}
OBJ(xmms2_bar) {
- new_bar(p, obj->data.pair.a,
- obj->data.pair.b,
- (int) (cur->xmms2.progress *
- 255.0f));
+ new_bar(p, obj->data.pair.a, obj->data.pair.b,
+ (int) (cur->xmms2.progress * 255.0f));
+ }
+ OBJ(xmms2_playlist) {
+ snprintf(p, p_max_size, "%s", cur->xmms2.playlist);
+ }
+ OBJ(xmms2_timesplayed) {
+ snprintf(p, p_max_size, "%i", cur->xmms2.timesplayed);
}
OBJ(xmms2_smart) {
- if (strlen(cur->xmms2.title) < 2 && strlen(cur->xmms2.title) < 2) {
+ if (strlen(cur->xmms2.title) < 2
+ && strlen(cur->xmms2.title) < 2) {
snprintf(p, p_max_size, "%s", cur->xmms2.url);
} else {
- snprintf(p, p_max_size, "%s - %s", cur->xmms2.artist, cur->xmms2.title);
+ snprintf(p, p_max_size, "%s - %s", cur->xmms2.artist,
+ cur->xmms2.title);
}
}
#endif
#ifdef AUDACIOUS
OBJ(audacious_status) {
- snprintf(p, p_max_size, "%s", cur->audacious.items[AUDACIOUS_STATUS]);
+ snprintf(p, p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_STATUS]);
}
- OBJ(audacious_title) {
- snprintf(p, cur->audacious.max_title_len > 0 ?
- cur->audacious.max_title_len : p_max_size, "%s",
- cur->audacious.items[AUDACIOUS_TITLE]);
+ OBJ(audacious_title) {
+ snprintf(p, cur->audacious.max_title_len > 0
+ ? cur->audacious.max_title_len : p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_TITLE]);
}
- OBJ(audacious_length) {
- snprintf(p, p_max_size, "%s", cur->audacious.items[AUDACIOUS_LENGTH]);
+ OBJ(audacious_length) {
+ snprintf(p, p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_LENGTH]);
}
- OBJ(audacious_length_seconds) {
- snprintf(p, p_max_size, "%s", cur->audacious.items[AUDACIOUS_LENGTH_SECONDS]);
+ OBJ(audacious_length_seconds) {
+ snprintf(p, p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_LENGTH_SECONDS]);
}
- OBJ(audacious_position) {
- snprintf(p, p_max_size, "%s", cur->audacious.items[AUDACIOUS_POSITION]);
+ OBJ(audacious_position) {
+ snprintf(p, p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_POSITION]);
}
- OBJ(audacious_position_seconds) {
- snprintf(p, p_max_size, "%s", cur->audacious.items[AUDACIOUS_POSITION_SECONDS]);
+ OBJ(audacious_position_seconds) {
+ snprintf(p, p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_POSITION_SECONDS]);
}
- OBJ(audacious_bitrate) {
- snprintf(p, p_max_size, "%s", cur->audacious.items[AUDACIOUS_BITRATE]);
+ OBJ(audacious_bitrate) {
+ snprintf(p, p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_BITRATE]);
}
- OBJ(audacious_frequency) {
- snprintf(p, p_max_size, "%s", cur->audacious.items[AUDACIOUS_FREQUENCY]);
+ OBJ(audacious_frequency) {
+ snprintf(p, p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_FREQUENCY]);
}
- OBJ(audacious_channels) {
- snprintf(p, p_max_size, "%s", cur->audacious.items[AUDACIOUS_CHANNELS]);
+ OBJ(audacious_channels) {
+ snprintf(p, p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_CHANNELS]);
}
- OBJ(audacious_filename) {
- snprintf(p, p_max_size, "%s", cur->audacious.items[AUDACIOUS_FILENAME]);
+ OBJ(audacious_filename) {
+ snprintf(p, p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_FILENAME]);
}
- OBJ(audacious_playlist_length) {
- snprintf(p, p_max_size, "%s", cur->audacious.items[AUDACIOUS_PLAYLIST_LENGTH]);
+ OBJ(audacious_playlist_length) {
+ snprintf(p, p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_PLAYLIST_LENGTH]);
}
- OBJ(audacious_playlist_position) {
- snprintf(p, p_max_size, "%s", cur->audacious.items[AUDACIOUS_PLAYLIST_POSITION]);
+ OBJ(audacious_playlist_position) {
+ snprintf(p, p_max_size, "%s",
+ cur->audacious.items[AUDACIOUS_PLAYLIST_POSITION]);
}
- OBJ(audacious_bar) {
- double progress;
- progress= atof(cur->audacious.items[AUDACIOUS_POSITION_SECONDS]) /
- atof(cur->audacious.items[AUDACIOUS_LENGTH_SECONDS]);
- new_bar(p,obj->a,obj->b,(int)(progress*255.0f));
+ OBJ(audacious_bar) {
+ double progress;
+
+ progress =
+ atof(cur->audacious.items[AUDACIOUS_POSITION_SECONDS]) /
+ atof(cur->audacious.items[AUDACIOUS_LENGTH_SECONDS]);
+ new_bar(p, obj->a, obj->b, (int) (progress * 255.0f));
}
#endif
+
#ifdef BMPX
OBJ(bmpx_title) {
snprintf(p, p_max_size, "%s", cur->bmpx.title);
snprintf(p, p_max_size, "%s", cur->bmpx.uri);
}
OBJ(bmpx_track) {
- snprintf(p, p_max_size, "%i", cur->bmpx.track);
+ snprintf(p, p_max_size, "%i", cur->bmpx.track);
}
OBJ(bmpx_bitrate) {
snprintf(p, p_max_size, "%i", cur->bmpx.bitrate);
}
#endif
OBJ(top) {
- if (obj->data.top.type == TOP_NAME
- && obj->data.top.num >= 0
- && obj->data.top.num < 10) {
- snprintf(p, 17, "%-17s", cur->cpu[obj->data.top.num]->name);
- } else if (obj->data.top.type == TOP_CPU
- && obj->data.top.num >= 0
- && obj->data.top.num < 10) {
- snprintf(p, 7, "%7.3f",
- cur->cpu[obj->data.top.
- num]->amount);
- } else if (obj->data.top.type == TOP_PID
- && obj->data.top.num >= 0
- && obj->data.top.num < 10) {
- snprintf(p, 8, "%7i",
- cur->cpu[obj->data.top.
- num]->pid);
- } else if (obj->data.top.type == TOP_MEM
- && obj->data.top.num >= 0
- && obj->data.top.num < 10) {
- snprintf(p, 7, "%7.3f",
- cur->cpu[obj->data.top.
- num]->totalmem);
+ if (obj->data.top.num >= 0 && obj->data.top.num < 10) {
+ char *time;
+
+ switch (obj->data.top.type) {
+ case TOP_NAME:
+ snprintf(p, 16, "%-15s",
+ cur->cpu[obj->data.top.num]->name);
+ break;
+ case TOP_CPU:
+ snprintf(p, 7, "%6.2f",
+ cur->cpu[obj->data.top.num]->amount);
+ break;
+ case TOP_PID:
+ snprintf(p, 6, "%5i",
+ cur->cpu[obj->data.top.num]->pid);
+ break;
+ case TOP_MEM:
+ snprintf(p, 7, "%6.2f",
+ cur->cpu[obj->data.top.num]->totalmem);
+ break;
+ case TOP_TIME:
+ time = format_time(
+ cur->cpu[obj->data.top.num]->total_cpu_time, 9);
+ snprintf(p, 10, "%9s", time);
+ free(time);
+ break;
+ default:
+ ERR("Unhandled top data type: %d\n",
+ obj->data.top.type);
+ }
+ } else {
+ ERR("Top index < 0 or > 10: %d\n", obj->data.top.num);
}
}
OBJ(top_mem) {
- if (obj->data.top.type == TOP_NAME
- && obj->data.top.num >= 0
- && obj->data.top.num < 10) {
- snprintf(p, 17, "%-17s",
- cur->memu[obj->data.top.
- num]->name);
- } else if (obj->data.top.type == TOP_CPU
- && obj->data.top.num >= 0
- && obj->data.top.num < 10) {
- snprintf(p, 7, "%7.3f",
- cur->memu[obj->data.top.
- num]->amount);
- } else if (obj->data.top.type == TOP_PID
- && obj->data.top.num >= 0
- && obj->data.top.num < 10) {
- snprintf(p, 8, "%7i",
- cur->memu[obj->data.top.
- num]->pid);
- } else if (obj->data.top.type == TOP_MEM
- && obj->data.top.num >= 0
- && obj->data.top.num < 10) {
- snprintf(p, 7, "%7.3f",
- cur->memu[obj->data.top.
- num]->totalmem);
+ if (obj->data.top.num >= 0 && obj->data.top.num < 10) {
+ char *time;
+
+ switch (obj->data.top.type) {
+ case TOP_NAME:
+ snprintf(p, 16, "%-15s",
+ cur->memu[obj->data.top.num]->name);
+ break;
+ case TOP_CPU:
+ snprintf(p, 7, "%6.2f",
+ cur->memu[obj->data.top.num]->amount);
+ break;
+ case TOP_PID:
+ snprintf(p, 6, "%5i",
+ cur->memu[obj->data.top.num]->pid);
+ break;
+ case TOP_MEM:
+ snprintf(p, 7, "%6.2f",
+ cur->memu[obj->data.top.num]->totalmem);
+ break;
+ case TOP_TIME:
+ time = format_time(
+ cur->memu[obj->data.top.num]->total_cpu_time,
+ 9);
+ snprintf(p, 10, "%9s", time);
+ free(time);
+ break;
+ default:
+ ERR("Unhandled top data type: %d\n",
+ obj->data.top.type);
+ }
+ } else {
+ ERR("Top index < 0 or > 10: %d\n", obj->data.top.num);
}
}
-
-
OBJ(tail) {
- if (current_update_time -obj->data.tail.last_update < obj->data.tail.interval) {
- snprintf(p, p_max_size, "%s", obj->data.tail.buffer);
+ if (current_update_time - obj->data.tail.last_update
+ < obj->data.tail.interval) {
+ snprintf(p, p_max_size, "%s", obj->data.tail.buffer);
} else {
- obj->data.tail.last_update = current_update_time;
FILE *fp;
- long nl=0, bsize;
+ long nl = 0, bsize;
int iter;
+
+ obj->data.tail.last_update = current_update_time;
+
+ if (obj->data.tail.fd != -1) {
+ tail_pipe(obj, p, p_max_size);
+ goto head;
+ }
+
fp = fopen(obj->data.tail.logfile, "rt");
+
if (fp == NULL) {
- /* Send one message, but do not consistently spam on
- * missing logfiles. */
- if(obj->data.tail.readlines != 0) {
+ /* Send one message, but do not consistently spam
+ * on missing logfiles. */
+ if (obj->data.tail.readlines != 0) {
ERR("tail logfile failed to open");
strcpy(obj->data.tail.buffer, "Logfile Missing");
}
obj->data.tail.readlines = 0;
snprintf(p, p_max_size, "Logfile Missing");
- }
- else {
+ } else {
obj->data.tail.readlines = 0;
- /* -1 instead of 0 to avoid counting a trailing newline */
- fseek(fp, -1, SEEK_END);
+ /* -1 instead of 0 to avoid counting a trailing
+ * newline */
+ fseek(fp, -1, SEEK_END);
bsize = ftell(fp) + 1;
- for(iter = obj->data.tail.wantedlines; iter > 0; iter--) {
+ for (iter = obj->data.tail.wantedlines; iter > 0;
+ iter--) {
nl = rev_fcharfind(fp, '\n', iter);
- if(nl >= 0)
+ if (nl >= 0) {
break;
+ }
}
obj->data.tail.readlines = iter;
- if(obj->data.tail.readlines < obj->data.tail.wantedlines) {
+ if (obj->data.tail.readlines
+ < obj->data.tail.wantedlines) {
fseek(fp, 0, SEEK_SET);
- }
- else {
- fseek(fp, nl+1, SEEK_SET);
+ } else {
+ fseek(fp, nl + 1, SEEK_SET);
bsize -= ftell(fp);
}
- /* Make sure bsize is at least 1 byte smaller than
- * the buffer max size. */
- if(bsize > (long)((text_buffer_size*20) - 1)) {
- fseek(fp, bsize - text_buffer_size*20 - 1, SEEK_CUR);
- bsize = text_buffer_size*20 - 1;
+ /* Make sure bsize is at least 1 byte smaller than the
+ * buffer max size. */
+ if (bsize > (long) ((text_buffer_size * 20) - 1)) {
+ fseek(fp, bsize - text_buffer_size * 20 - 1,
+ SEEK_CUR);
+ bsize = text_buffer_size * 20 - 1;
}
bsize = fread(obj->data.tail.buffer, 1, bsize, fp);
fclose(fp);
- if(bsize > 0) {
- /* Clean up trailing newline, make sure the buffer
- * is null terminated. */
- if(obj->data.tail.buffer[bsize-1] == '\n')
- obj->data.tail.buffer[bsize-1] = '\0';
- else
+ if (bsize > 0) {
+ /* Clean up trailing newline, make sure the
+ * buffer is null terminated. */
+ if (obj->data.tail.buffer[bsize - 1] == '\n') {
+ obj->data.tail.buffer[bsize - 1] = '\0';
+ } else {
obj->data.tail.buffer[bsize] = '\0';
- snprintf(p, p_max_size, "%s", obj->data.tail.buffer);
- }
- else {
+ }
+ snprintf(p, p_max_size, "%s",
+ obj->data.tail.buffer);
+ } else {
strcpy(obj->data.tail.buffer, "Logfile Empty");
snprintf(p, p_max_size, "Logfile Empty");
- } /* bsize > 0 */
- } /* fp == NULL */
- } /* if cur_upd_time >= */
-
- //parse_conky_vars(obj->data.tail.buffer, p, cur);
-
+ } /* bsize > 0 */
+ } /* fp == NULL */
+ } /* if cur_upd_time >= */
+ // parse_conky_vars(obj->data.tail.buffer, p, cur);
}
+
+head:
OBJ(head) {
- if (current_update_time -obj->data.tail.last_update < obj->data.tail.interval) {
+ if (current_update_time - obj->data.tail.last_update
+ < obj->data.tail.interval) {
snprintf(p, p_max_size, "%s", obj->data.tail.buffer);
} else {
- obj->data.tail.last_update = current_update_time;
FILE *fp;
- long nl=0;
+ long nl = 0;
int iter;
+
+ obj->data.tail.last_update = current_update_time;
+
fp = fopen(obj->data.tail.logfile, "rt");
if (fp == NULL) {
- /* Send one message, but do not consistently spam on
- * missing logfiles. */
- if(obj->data.tail.readlines != 0) {
+ /* Send one message, but do not consistently spam
+ * on missing logfiles. */
+ if (obj->data.tail.readlines != 0) {
ERR("head logfile failed to open");
strcpy(obj->data.tail.buffer, "Logfile Missing");
}
snprintf(p, p_max_size, "Logfile Missing");
} else {
obj->data.tail.readlines = 0;
- for(iter = obj->data.tail.wantedlines; iter > 0; iter--) {
+ for (iter = obj->data.tail.wantedlines; iter > 0;
+ iter--) {
nl = fwd_fcharfind(fp, '\n', iter);
- if(nl >= 0)
+ if (nl >= 0) {
break;
+ }
}
obj->data.tail.readlines = iter;
- /* Make sure nl is at least 1 byte smaller than
- * the buffer max size. */
- if(nl > (long)((text_buffer_size*20) - 1)) {
- nl = text_buffer_size*20 - 1;
+ /* Make sure nl is at least 1 byte smaller than the
+ * buffer max size. */
+ if (nl > (long) ((text_buffer_size * 20) - 1)) {
+ nl = text_buffer_size * 20 - 1;
}
nl = fread(obj->data.tail.buffer, 1, nl, fp);
fclose(fp);
- if(nl > 0) {
+ if (nl > 0) {
/* Clean up trailing newline, make sure the buffer
* is null terminated. */
- if (obj->data.tail.buffer[nl-1] == '\n') {
- obj->data.tail.buffer[nl-1] = '\0';
- }
- else {
+ if (obj->data.tail.buffer[nl - 1] == '\n') {
+ obj->data.tail.buffer[nl - 1] = '\0';
+ } else {
obj->data.tail.buffer[nl] = '\0';
}
- snprintf(p, p_max_size, "%s", obj->data.tail.buffer);
- }
- else {
+ snprintf(p, p_max_size, "%s",
+ obj->data.tail.buffer);
+ } else {
strcpy(obj->data.tail.buffer, "Logfile Empty");
snprintf(p, p_max_size, "Logfile Empty");
- } /* nl > 0 */
- } /* if fp == null */
- } /* cur_upd_time >= */
-
- //parse_conky_vars(obj->data.tail.buffer, p, cur);
-
+ } /* nl > 0 */
+ } /* if fp == null */
+ } /* cur_upd_time >= */
+ // parse_conky_vars(obj->data.tail.buffer, p, cur);
}
+
#ifdef TCP_PORT_MONITOR
- OBJ(tcp_portmon)
- {
+ OBJ(tcp_portmon) {
/* grab a pointer to this port monitor */
- tcp_port_monitor_t * p_monitor =
- find_tcp_port_monitor( info.p_tcp_port_monitor_collection,
- obj->data.tcp_port_monitor.port_range_begin,
- obj->data.tcp_port_monitor.port_range_end );
- if ( !p_monitor ) {
+ tcp_port_monitor_t *p_monitor =
+ find_tcp_port_monitor(info.p_tcp_port_monitor_collection,
+ obj->data.tcp_port_monitor.port_range_begin,
+ obj->data.tcp_port_monitor.port_range_end);
+
+ if (!p_monitor) {
snprintf(p, p_max_size, "monitor not found");
break;
}
/* now grab the text of interest */
- if ( peek_tcp_port_monitor( p_monitor,
- obj->data.tcp_port_monitor.item,
- obj->data.tcp_port_monitor.connection_index,
- p, p_max_size ) != 0 )
- {
+ if (peek_tcp_port_monitor(p_monitor,
+ obj->data.tcp_port_monitor.item,
+ obj->data.tcp_port_monitor.connection_index, p,
+ p_max_size) != 0) {
snprintf(p, p_max_size, "monitor peek error");
break;
}
#endif
#ifdef HAVE_ICONV
- OBJ(iconv_start)
- {
+ OBJ(iconv_start) {
iconv_converting = 1;
iconv_selected = obj->a;
-
}
- OBJ(iconv_stop)
- {
+ OBJ(iconv_stop) {
iconv_converting = 0;
iconv_selected = 0;
}
#endif
- OBJ(entropy_avail)
- {
- snprintf(p, p_max_size, "%d", cur->entropy.entropy_avail);
+
+ OBJ(entropy_avail) {
+ snprintf(p, p_max_size, "%d", cur->entropy.entropy_avail);
}
- OBJ(entropy_poolsize)
- {
+ OBJ(entropy_poolsize) {
snprintf(p, p_max_size, "%d", cur->entropy.poolsize);
}
- OBJ(entropy_bar)
- {
+ OBJ(entropy_bar) {
double entropy_perc;
- entropy_perc = (double)cur->entropy.entropy_avail /
- (double)cur->entropy.poolsize;
- new_bar(p,obj->a,obj->b,(int)(entropy_perc * 255.0f));
- }
+ entropy_perc = (double) cur->entropy.entropy_avail /
+ (double) cur->entropy.poolsize;
+ new_bar(p, obj->a, obj->b, (int) (entropy_perc * 255.0f));
+ }
+#ifdef SMAPI
+ OBJ(smapi) {
+ char *s;
+ if(obj->data.s) {
+ s = smapi_get_val(obj->data.s);
+ snprintf(p, p_max_size, "%s", s);
+ free(s);
+ }
+ }
+ OBJ(if_smapi_bat_installed) {
+ int idx;
+ if(obj->data.ifblock.s && sscanf(obj->data.ifblock.s, "%i", &idx) == 1) {
+ if(!smapi_bat_installed(idx)) {
+ i = obj->data.ifblock.pos;
+ if_jumped = 1;
+ } else
+ if_jumped = 0;
+ } else
+ ERR("argument to if_smapi_bat_installed must be an integer");
+ }
+ OBJ(smapi_bat_perc) {
+ int idx, val;
+ if(obj->data.s && sscanf(obj->data.s, "%i", &idx) == 1) {
+ val = smapi_bat_installed(idx) ?
+ smapi_get_bat_int(idx, "remaining_percent") : 0;
+ spaced_print(p, p_max_size, "%*d", 4, "smapi_bat_perc", pad_percents, val);
+ } else
+ ERR("argument to smapi_bat_perc must be an integer");
+ }
+ OBJ(smapi_bat_bar) {
+ if(obj->data.i >= 0 && smapi_bat_installed(obj->data.i))
+ new_bar(p, obj->a, obj->b, (int)
+ (255 * smapi_get_bat_int(obj->data.i, "remaining_percent") / 100));
+ else
+ new_bar(p, obj->a, obj->b, 0);
+ }
+#endif /* SMAPI */
break;
}
unsigned int a = strlen(p);
#ifdef HAVE_ICONV
- if (a > 0 && iconv_converting && iconv_selected > 0 && (iconv_cd[iconv_selected - 1] != (iconv_t)(-1))) {
+ if (a > 0 && iconv_converting && iconv_selected > 0
+ && (iconv_cd[iconv_selected - 1] != (iconv_t) (-1))) {
int bytes;
size_t dummy1, dummy2;
char *ptr = buff_in;
char *outptr = p;
dummy1 = dummy2 = a;
-
- strncpy(buff_in, p, P_MAX_SIZE);
+
+ strncpy(buff_in, p, p_max_size);
iconv(*iconv_cd[iconv_selected - 1], NULL, NULL, NULL, NULL);
while (dummy1 > 0) {
- bytes = iconv(*iconv_cd[iconv_selected - 1], &ptr, &dummy1, &outptr, &dummy2);
+ bytes = iconv(*iconv_cd[iconv_selected - 1], &ptr, &dummy1,
+ &outptr, &dummy2);
if (bytes == -1) {
ERR("Iconv codeset conversion failed");
break;
}
}
- /* It is nessecary when we are converting from multibyte to singlebyte codepage */
+ /* It is nessecary when we are converting from multibyte to
+ * singlebyte codepage */
a = outptr - p;
}
-#endif
+#endif /* HAVE_ICONV */
p += a;
p_max_size -= a;
}
}
}
-
double current_update_time, last_update_time;
-static void generate_text()
+static void generate_text(void)
{
struct information *cur = &info;
char *p;
-
special_count = 0;
/* update info */
current_update_time = get_time();
- update_stuff(cur);
+ update_stuff();
/* fix diskio rates to b/s (use update_interval */
diskio_read_value = diskio_read_value / update_interval;
diskio_write_value = diskio_write_value / update_interval;
diskio_value = diskio_value / update_interval;
-
/* add things to the buffer */
p = text_buffer;
- generate_text_internal(p, P_MAX_SIZE, text_objects, text_object_count, cur);
+ generate_text_internal(p, max_user_text, global_text_objects,
+ global_text_object_count, cur);
if (stuff_in_upper_case) {
char *p;
}
}
-
last_update_time = current_update_time;
total_updates++;
- //free(p);
+ // free(p);
}
-
#ifdef X11
-static void set_font()
+static void set_font(void)
{
#ifdef XFT
if (use_xft) {
- if (window.xftdraw != NULL) {
- XftDrawDestroy(window.xftdraw);
- }
- window.xftdraw = XftDrawCreate(display, window.drawable,
- DefaultVisual(display,
- screen),
- DefaultColormap(display,
- screen));
- } else
+ if (window.xftdraw != NULL) {
+ XftDrawDestroy(window.xftdraw);
+ }
+ window.xftdraw = XftDrawCreate(display, window.drawable,
+ DefaultVisual(display, screen), DefaultColormap(display, screen));
+ } else
#endif
-{
- XSetFont(display, window.gc, fonts[selected_font].font->fid);
-}
+ {
+ XSetFont(display, window.gc, fonts[selected_font].font->fid);
+ }
}
#endif /* X11 */
static inline int get_string_width_special(char *s)
{
- if (!s) {
- return 0;
- }
#ifdef X11
char *p, *final;
- p = strdup(s);
- final = p;
int index = 1;
int width = 0;
unsigned int i;
+
+ if (!s) {
+ return 0;
+ }
+
+ p = strdup(s);
+ final = p;
+
while (*p) {
if (*p == SPECIAL_CHAR) {
- /* shift everything over by 1 so that the special char doesn't mess up the size calculation */
+ /* shift everything over by 1 so that the special char
+ * doesn't mess up the size calculation */
for (i = 0; i < strlen(p); i++) {
*(p + i) = *(p + i + 1);
}
- if (specials[special_index+index].type == GRAPH || specials[special_index+index].type == BAR) {
- width += specials[special_index+index].width;
+ if (specials[special_index + index].type == GRAPH
+ || specials[special_index + index].type == BAR) {
+ width += specials[special_index + index].width;
}
index++;
} else {
free(final);
return width;
#else
- return strlen(s);
+ return (s) ? strlen(s) : 0;
#endif /* X11 */
}
static void text_size_updater(char *s);
int last_font_height;
-static void update_text_area()
+static void update_text_area(void)
{
int x, y;
last_font_height = font_height();
for_each_line(text_buffer, text_size_updater);
text_width += 1;
- if (text_height < minimum_height)
+ if (text_height < minimum_height) {
text_height = minimum_height;
- if (text_width > maximum_width && maximum_width > 0)
+ }
+ if (text_width > maximum_width && maximum_width > 0) {
text_width = maximum_width;
+ }
}
- /* get text position on workarea */
- switch (text_alignment) {
- case TOP_LEFT:
- x = gap_x;
- y = gap_y;
- break;
-
- case TOP_RIGHT:
- x = workarea[2] - text_width - gap_x;
- y = gap_y;
- break;
-
- default:
- case BOTTOM_LEFT:
- x = gap_x;
- y = workarea[3] - text_height - gap_y;
- break;
-
- case BOTTOM_RIGHT:
- x = workarea[2] - text_width - gap_x;
- y = workarea[3] - text_height - gap_y;
- break;
-
+ /* get text position on workarea */
+ switch (text_alignment) {
+ case TOP_LEFT:
+ x = gap_x;
+ y = gap_y;
+ break;
+
+ case TOP_RIGHT:
+ x = workarea[2] - text_width - gap_x;
+ y = gap_y;
+ break;
+
+ case TOP_MIDDLE:
+ x = workarea[2] / 2 - text_width / 2 - gap_x;
+ y = gap_y;
+ break;
+
+ default:
+ case BOTTOM_LEFT:
+ x = gap_x;
+ y = workarea[3] - text_height - gap_y;
+ break;
+
+ case BOTTOM_RIGHT:
+ x = workarea[2] - text_width - gap_x;
+ y = workarea[3] - text_height - gap_y;
+ break;
+
+ case BOTTOM_MIDDLE:
+ x = workarea[2] / 2 - text_width / 2 - gap_x;
+ y = workarea[3] - text_height - gap_y;
+ break;
+
+ case MIDDLE_LEFT:
+ x = gap_x;
+ y = workarea[3] / 2 - text_height / 2 - gap_y;
+ break;
+
+ case MIDDLE_RIGHT:
+ x = workarea[2] - text_width - gap_x;
+ y = workarea[3] / 2 - text_height / 2 - gap_y;
+ break;
+
#ifdef OWN_WINDOW
- case NONE: // Let the WM manage the window
- x = window.x;
- y = window.y;
+ case NONE: // Let the WM manage the window
+ x = window.x;
+ y = window.y;
- fixed_pos = 1;
- fixed_size = 1;
- break;
+ fixed_pos = 1;
+ fixed_size = 1;
+ break;
#endif
}
#ifdef OWN_WINDOW
} else
#endif
{
- /* If window size doesn't match to workarea's size, then window
- * probably includes panels (gnome).
+ /* If window size doesn't match to workarea's size,
+ * then window probably includes panels (gnome).
* Blah, doesn't work on KDE. */
- if (workarea[2] != window.width
- || workarea[3] != window.height) {
+ if (workarea[2] != window.width || workarea[3] != window.height) {
y += workarea[1];
x += workarea[0];
}
}
}
-/*
- * drawing stuff
- */
+/* drawing stuff */
static int cur_x, cur_y; /* current x and y for drawing */
static int draw_mode; /* FG, BG or OUTLINE */
{
int w = 0;
char *p;
+
/* get string widths and skip specials */
p = s;
while (*p) {
*p = SPECIAL_CHAR;
if (specials[special_index].type == BAR
- || specials[special_index].type == GRAPH) {
+ || 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;
last_font_height += font_ascent();
}
} else if (specials[special_index].type == OFFSET) {
- w += specials[special_index].arg + get_string_width("a"); /* filthy, but works */
+ if (specials[special_index].arg > 0) {
+ w += specials[special_index].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 >= 0)
- w += (int)specials[special_index].arg - cur_x;
- } else if (specials[special_index].type == TAB) {
- int start = specials[special_index].arg;
+ if (specials[special_index].arg > cur_x) {
+ w = (int) specials[special_index].arg;
+ }
+ } else if (specials[special_index].type == TAB) {
+ int start = specials[special_index].arg;
int step = specials[special_index].width;
- if (!step || step < 0)
+
+ 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;
last_font_height = font_height();
}
}
-
+
special_index++;
s = p + 1;
}
static void draw_string(const char *s)
{
- if (s[0] == '\0')
- return;
int i, i2, pos, width_of_s;
- int max=0;
+ int max = 0;
int added;
+ char space[2];
+
+ if (s[0] == '\0') {
+ return;
+ }
+
width_of_s = get_string_width(s);
if (out_to_console) {
printf("%s\n", s);
- fflush(stdout); /* output immediately, don't buffer */
+ fflush(stdout); /* output immediately, don't buffer */
}
- memset(tmpstring1,0,TEXT_BUFFER_SIZE);
- memset(tmpstring2,0,TEXT_BUFFER_SIZE);
- strncpy(tmpstring1, s, TEXT_BUFFER_SIZE-1);
+ 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];
+
snprintf(space, 2, " ");
#ifdef X11
max = ((text_width - width_of_s) / get_string_width(space));
#endif /* X11 */
- /*
- * This code looks for tabs in the text and coverts them to spaces.
- * The trick is getting the correct number of spaces,
- * and not going over the window's size without forcing
- * the window larger.
- */
- for (i = 0; i < TEXT_BUFFER_SIZE; i++) {
- if (tmpstring1[i] == '\t') // 9 is ascii tab
- {
+ /* This code looks for tabs in the text and coverts them to spaces.
+ * The trick is getting the correct number of spaces, and not going
+ * over the window's size without forcing the window larger. */
+ for (i = 0; i < (int)text_buffer_size; i++) {
+ if (tmpstring1[i] == '\t') { // 9 is ascii tab
i2 = 0;
- for (i2 = 0;
- i2 < (8 - (1 + pos) % 8) && added <= max;
- 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 */
+ for (i2 = 0; i2 < (8 - (1 + pos) % 8) && added <= max; i2++) {
+ /* guard against overrun */
+ tmpstring2[MIN(pos + i2, (int)text_buffer_size - 1)] = ' ';
added++;
}
pos += i2;
} else {
if (tmpstring1[i] != 9) {
- /*
- if ( pos > TEXT_BUFFER_SIZE-1 )
- fprintf(stderr,"buffer overrun detected\n");
- */
- tmpstring2[ MIN(pos, TEXT_BUFFER_SIZE-1) ] = tmpstring1[i]; /* guard against overrun */
+ /* guard against overrun */
+ tmpstring2[MIN(pos, (int)text_buffer_size - 1)] = tmpstring1[i];
pos++;
}
}
}
#ifdef X11
if (text_width == maximum_width) {
- /* this means the text is probably pushing the limit, so we'll chop it */
- while (cur_x + get_string_width(tmpstring2) - text_start_x > maximum_width && strlen(tmpstring2) > 0) {
- tmpstring2[strlen(tmpstring2)-1] = '\0';
+ /* this means the text is probably pushing the limit,
+ * so we'll chop it */
+ while (cur_x + get_string_width(tmpstring2) - text_start_x
+ > maximum_width && strlen(tmpstring2) > 0) {
+ tmpstring2[strlen(tmpstring2) - 1] = '\0';
}
}
#endif /* X11 */
if (use_xft) {
XColor c;
XftColor c2;
+
c.pixel = current_color;
XQueryColor(display, DefaultColormap(display, screen), &c);
c2.color.alpha = fonts[selected_font].font_alpha;
if (utf8_mode) {
XftDrawStringUtf8(window.xftdraw, &c2, fonts[selected_font].xftfont,
- cur_x, cur_y, (XftChar8 *) s,
- strlen(s));
+ cur_x, cur_y, (const XftChar8 *) s, strlen(s));
} else {
XftDrawString8(window.xftdraw, &c2, fonts[selected_font].xftfont,
- cur_x, cur_y, (XftChar8 *) s,
- strlen(s));
+ cur_x, cur_y, (const XftChar8 *) s, strlen(s));
}
} else
#endif
{
- XDrawString(display, window.drawable, window.gc,
- cur_x, cur_y, s, strlen(s));
+ XDrawString(display, window.drawable, window.gc, cur_x, cur_y, s,
+ strlen(s));
}
cur_x += width_of_s;
#endif /* X11 */
- memcpy(tmpstring1, s, TEXT_BUFFER_SIZE);
+ memcpy(tmpstring1, s, text_buffer_size);
}
long redmask, greenmask, bluemask;
-void set_up_gradient()
+void set_up_gradient(void)
{
+ int i;
#ifdef X11
colour_depth = DisplayPlanes(display, screen);
#else
colour_depth = 16;
#endif /* X11 */
if (colour_depth != 24 && colour_depth != 16) {
- ERR("using non-standard colour depth, gradients may look like a lolly-pop");
+ ERR("using non-standard colour depth, gradients may look like a "
+ "lolly-pop");
}
- int i;
+
redmask = 0;
greenmask = 0;
bluemask = 0;
- for(i = (colour_depth / 3)-1; i>=0; i--) {
+ for (i = (colour_depth / 3) - 1; i >= 0; i--) {
redmask |= 1 << i;
greenmask |= 1 << i;
bluemask |= 1 << i;
}
- if (colour_depth%3 == 1) {
+ if (colour_depth % 3 == 1) {
greenmask |= 1 << (colour_depth / 3);
}
- redmask = redmask << (2*colour_depth / 3 + colour_depth%3);
+ redmask = redmask << (2 * colour_depth / 3 + colour_depth % 3);
greenmask = greenmask << (colour_depth / 3);
}
-inline unsigned long do_gradient(unsigned long first_colour, unsigned long last_colour) { /* this function returns the next colour between two colours for a gradient */
+/* this function returns the next colour between two colours for a gradient */
+inline unsigned long do_gradient(unsigned long first_colour,
+ unsigned long last_colour)
+{
int tmp_color = 0;
- int red1, green1, blue1; // first colour
- int red2, green2, blue2; // second colour
- int red3 = 0, green3 = 0, blue3 = 0; // difference
- short redshift = (2*colour_depth / 3 + colour_depth%3);
+ int red1, green1, blue1; // first colour
+ int red2, green2, blue2; // second colour
+ int red3 = 0, green3 = 0, blue3 = 0; // difference
+ short redshift = (2 * colour_depth / 3 + colour_depth % 3);
short greenshift = (colour_depth / 3);
+
red1 = (first_colour & redmask) >> redshift;
green1 = (first_colour & greenmask) >> greenshift;
blue1 = first_colour & bluemask;
return tmp_color;
}
-inline unsigned long gradient_max(unsigned long first_colour, unsigned long last_colour) { /* this function returns the max diff for a gradient */
+/* this function returns the max diff for a gradient */
+inline unsigned long gradient_max(unsigned long first_colour,
+ unsigned long last_colour)
+{
+ int red1, green1, blue1; // first colour
+ int red2, green2, blue2; // second colour
+ int red3 = 0, green3 = 0, blue3 = 0; // difference
+ long redshift, greenshift;
+ int max;
+
if (colour_depth == 0) {
set_up_gradient();
}
- int red1, green1, blue1; // first colour
- int red2, green2, blue2; // second colour
- long redshift = (2*colour_depth / 3 + colour_depth%3);
- long greenshift = (colour_depth / 3);
- int red3 = 0, green3 = 0, blue3 = 0; // difference
+ redshift = (2 * colour_depth / 3 + colour_depth % 3);
+ greenshift = (colour_depth / 3);
+
red1 = (first_colour & redmask) >> redshift;
green1 = (first_colour & greenmask) >> greenshift;
blue1 = first_colour & bluemask;
red3 = abs(red1 - red2);
green3 = abs(green1 - green2);
blue3 = abs(blue1 - blue2);
- int max = red3;
- if (green3 > max)
+ max = red3;
+
+ if (green3 > max) {
max = green3;
- if (blue3 > max)
+ }
+ if (blue3 > max) {
max = blue3;
+ }
return max;
}
{
#ifdef X11
char *p;
+ int cur_y_add = 0;
+ short font_h;
+
cur_x = text_start_x;
cur_y += font_ascent();
- int cur_y_add = 0;
- short font_h = font_height();
+ font_h = font_height();
/* find specials and draw stuff */
p = s;
/* draw special */
switch (specials[special_index].type) {
- case HORIZONTAL_LINE:
+ case HORIZONTAL_LINE:
{
- int h =
- specials[special_index].height;
+ int h = specials[special_index].height;
int mid = font_ascent() / 2;
- w = text_start_x + text_width -
- cur_x;
-
- XSetLineAttributes(display,
- window.gc, h,
- LineSolid,
- CapButt,
- JoinMiter);
- XDrawLine(display, window.drawable,
- window.gc, cur_x,
- cur_y - mid / 2,
- cur_x + w,
- cur_y - mid / 2);
+
+ w = text_start_x + text_width - cur_x;
+
+ XSetLineAttributes(display, window.gc, h, LineSolid,
+ CapButt, JoinMiter);
+ XDrawLine(display, window.drawable, window.gc, cur_x,
+ cur_y - mid / 2, cur_x + w, cur_y - mid / 2);
+ break;
}
- break;
- case STIPPLED_HR:
+ case STIPPLED_HR:
{
- int h =
- specials[special_index].height;
- int s =
- specials[special_index].arg;
+ int h = specials[special_index].height;
+ int s = specials[special_index].arg;
int mid = font_ascent() / 2;
char ss[2] = { s, s };
- w = text_start_x + text_width -
- cur_x - 1;
-
- XSetLineAttributes(display,
- window.gc, h,
- LineOnOffDash,
- CapButt,
- JoinMiter);
- XSetDashes(display, window.gc, 0,
- ss, 2);
- XDrawLine(display, window.drawable,
- window.gc, cur_x,
- cur_y - mid / 2,
- cur_x + w,
- cur_y - mid / 2);
+
+ w = text_start_x + text_width - cur_x - 1;
+ XSetLineAttributes(display, window.gc, h, LineOnOffDash,
+ CapButt, JoinMiter);
+ XSetDashes(display, window.gc, 0, ss, 2);
+ XDrawLine(display, window.drawable, window.gc, cur_x,
+ cur_y - mid / 2, cur_x + w, cur_y - mid / 2);
+ break;
}
- break;
- case BAR:
+ case BAR:
{
- if (cur_x - text_start_x > maximum_width && maximum_width > 0) {
+ int h, bar_usage, by;
+ if (cur_x - text_start_x > maximum_width
+ && maximum_width > 0) {
break;
}
- int h =
- specials[special_index].height;
- int bar_usage =
- specials[special_index].arg;
- int by = cur_y - (font_ascent() / 2) - 1;
+ h = specials[special_index].height;
+ bar_usage = specials[special_index].arg;
+ by = cur_y - (font_ascent() / 2) - 1;
+
if (h < font_height()) {
by -= h / 2 - 1;
}
w = specials[special_index].width;
- if (w == 0)
- w = text_start_x +
- text_width - cur_x - 1;
- if (w < 0)
+ if (w == 0) {
+ 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);
- XFillRectangle(display,
- window.drawable,
- window.gc, cur_x,
- by,
- w * bar_usage / 255,
- h);
- if (specials[special_index].
- height > cur_y_add
- && specials[special_index].
- height > font_h) {
- cur_y_add =
- specials
- [special_index].height;
+ XSetLineAttributes(display, window.gc, 1, LineSolid,
+ CapButt, JoinMiter);
+
+ XDrawRectangle(display, window.drawable, window.gc, cur_x,
+ by, w, h);
+ XFillRectangle(display, window.drawable, window.gc, cur_x,
+ by, w * bar_usage / 255, h);
+ if (specials[special_index].height > cur_y_add
+ && specials[special_index].height > font_h) {
+ cur_y_add = specials[special_index].height;
}
+ break;
}
- break;
- case GRAPH:
- {
- if (cur_x - text_start_x > maximum_width && maximum_width > 0) {
+ case GRAPH:
+ {
+ int h, by, i, j = 0;
+ int gradient_size = 0;
+ float gradient_factor = 0;
+ float gradient_update = 0;
+ unsigned long last_colour = current_color;
+ unsigned long tmpcolour = current_color;
+ if (cur_x - text_start_x > maximum_width
+ && maximum_width > 0) {
break;
}
- int h =
- specials[special_index].height;
- unsigned long last_colour = current_color;
- int by = cur_y - (font_ascent()/2) - 1;
+ h = specials[special_index].height;
+ by = cur_y - (font_ascent() / 2) - 1;
+
if (h < font_height()) {
by -= h / 2 - 1;
}
w = specials[special_index].width;
- if (w == 0)
+ if (w == 0) {
w = text_start_x + text_width - cur_x - 1;
- if (w < 0)
+ }
+ if (w < 0) {
w = 0;
+ }
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,
+ CapButt, JoinMiter);
+ XDrawRectangle(display, window.drawable, window.gc,
+ cur_x, by, w, h);
}
- XSetLineAttributes(display,
- window.gc, 1,
- LineSolid,
- CapButt,
- JoinMiter);
- int i;
- int j = 0;
- int gradient_size = 0;
- float gradient_factor = 0;
- float gradient_update = 0;
- unsigned long tmpcolour = current_color;
- if (specials[special_index].last_colour != 0 || specials[special_index].first_colour != 0) {
- tmpcolour = specials[special_index].last_colour;
- gradient_size = gradient_max(specials[special_index].last_colour, specials[special_index].first_colour);
- gradient_factor = (float)gradient_size / (w - 2);
- }
- for (i = w - 2; i > -1; i--) {
- if (specials[special_index].last_colour != 0 || specials[special_index].first_colour != 0) {
- XSetForeground(display, window.gc, tmpcolour);
- gradient_update += gradient_factor;
- while (gradient_update > 0) {
- tmpcolour = do_gradient(tmpcolour, specials[special_index].first_colour);
- gradient_update--;
- }
- }
- if ((w - i) / ((float) (w - 2) / (specials[special_index].graph_width)) > j && j < MAX_GRAPH_DEPTH - 3) {
- j++;
- }
- XDrawLine(display, window.drawable, window.gc, cur_x + i + 1, by + h, cur_x + i + 1, by + h - specials[special_index].graph[j] * (h - 1) / specials[special_index].graph_scale); /* this is mugfugly, but it works */
+ XSetLineAttributes(display, window.gc, 1, LineSolid,
+ CapButt, JoinMiter);
+
+ if (specials[special_index].last_colour != 0
+ || specials[special_index].first_colour != 0) {
+ tmpcolour = specials[special_index].last_colour;
+ gradient_size =
+ gradient_max(specials[special_index].last_colour,
+ specials[special_index].first_colour);
+ gradient_factor = (float) gradient_size / (w - 2);
}
- if (specials[special_index].
- height > cur_y_add
- && specials[special_index].
- height > font_h) {
- cur_y_add =
- specials
- [special_index].height;
+ for (i = w - 2; i > -1; i--) {
+ if (specials[special_index].last_colour != 0
+ || specials[special_index].first_colour != 0) {
+ XSetForeground(display, window.gc, tmpcolour);
+ gradient_update += gradient_factor;
+ while (gradient_update > 0) {
+ tmpcolour = do_gradient(tmpcolour,
+ specials[special_index].first_colour);
+ gradient_update--;
+ }
+ }
+ if ((w - i) / ((float) (w - 2) /
+ (specials[special_index].graph_width)) > j
+ && j < MAX_GRAPH_DEPTH - 3) {
+ j++;
+ }
+ /* this is mugfugly, but it works */
+ XDrawLine(display, window.drawable, window.gc,
+ cur_x + i + 1, by + h, cur_x + i + 1,
+ by + h - specials[special_index].graph[j] *
+ (h - 1) / specials[special_index].graph_scale);
+ }
+ if (specials[special_index].height > cur_y_add
+ && specials[special_index].height > font_h) {
+ cur_y_add = specials[special_index].height;
}
-/* if (draw_mode == BG) {
- set_foreground_color(default_bg_color);
+ /* if (draw_mode == BG) {
+ set_foreground_color(default_bg_color);
+ } else if (draw_mode == OUTLINE) {
+ set_foreground_color(default_out_color);
+ } else {
+ set_foreground_color(default_fg_color);
+ } */
+ set_foreground_color(last_colour);
+ break;
}
- else if (draw_mode == OUTLINE) {
- set_foreground_color(default_out_color);
- } else {
- set_foreground_color(default_fg_color);
- }*/
- set_foreground_color(last_colour);
- }
- break;
-
+
case FONT:
{
int old = font_ascent();
+
cur_y -= font_ascent();
selected_font = specials[special_index].font_added;
if (cur_y + font_ascent() < cur_y + old) {
cur_y += font_ascent();
}
set_font();
+ break;
}
- break;
- case FG:
- if (draw_mode == FG)
- set_foreground_color(specials
- [special_index].
- arg);
- break;
+ case FG:
+ if (draw_mode == FG) {
+ set_foreground_color(specials[special_index].arg);
+ }
+ break;
- case BG:
- if (draw_mode == BG)
- set_foreground_color(specials
- [special_index].
- arg);
- break;
+ case BG:
+ if (draw_mode == BG) {
+ set_foreground_color(specials[special_index].arg);
+ }
+ break;
- case OUTLINE:
- if (draw_mode == OUTLINE)
- set_foreground_color(specials
- [special_index].
- arg);
- break;
+ case OUTLINE:
+ if (draw_mode == OUTLINE) {
+ set_foreground_color(specials[special_index].arg);
+ }
+ break;
- case OFFSET:
- w += specials[special_index].arg;
- break;
-
- case VOFFSET:
- cur_y += specials[special_index].arg;
- break;
+ case OFFSET:
+ w += specials[special_index].arg;
+ break;
- case GOTO:
- if (specials[special_index].arg >= 0)
- cur_x = (int)specials[special_index].arg;
- break;
+ case VOFFSET:
+ cur_y += specials[special_index].arg;
+ break;
+
+ case GOTO:
+ if (specials[special_index].arg >= 0) {
+ cur_x = (int) specials[special_index].arg;
+ }
+ break;
- case TAB:
+ case TAB:
{
int start = specials[special_index].arg;
int step = specials[special_index].width;
- if (!step || step < 0)
+
+ if (!step || step < 0) {
step = 10;
+ }
w = step - (cur_x - text_start_x - start) % step;
+ break;
}
- break;
- case ALIGNR:
+ case ALIGNR:
{
- int pos_x = text_start_x + text_width - get_string_width_special(s) /*+ border_margin*/;
- /*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 border_margin %i border_width %i\n", pos_x, text_start_x, text_width, cur_x, get_string_width_special(s), gap_x, specials[special_index].arg, border_margin, border_width);*/
+ /* TODO: add back in "+ border_margin" to the end of
+ * this line? */
+ int pos_x = text_start_x + text_width -
+ get_string_width_special(s);
+
+ /* 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 border_margin %i "
+ "border_width %i\n", pos_x, text_start_x, text_width,
+ cur_x, get_string_width_special(s), gap_x,
+ specials[special_index].arg, border_margin,
+ border_width); */
if (pos_x > specials[special_index].arg && pos_x > cur_x) {
cur_x = pos_x - specials[special_index].arg;
+ }
+ break;
}
- }
- break;
- case ALIGNC:
+ case ALIGNC:
{
- int pos_x = (text_width)/2 - get_string_width_special(s)/2 - (cur_x - text_start_x);
- /*int pos_x = text_start_x + text_width/2 - get_string_width_special(s)/2;*/
- /*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, 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;
+ int pos_x = (text_width) / 2 - get_string_width_special(s) /
+ 2 - (cur_x - text_start_x);
+ /* int pos_x = text_start_x + text_width / 2 -
+ get_string_width_special(s) / 2; */
+
+ /* 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,
+ 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;
+ }
+ break;
}
- break;
-
}
cur_x += w;
#endif /* X11 */
}
-static void draw_text()
+static void draw_text(void)
{
#ifdef X11
cur_y = text_start_y;
unsigned int b = (border_width + 1) / 2;
if (stippled_borders) {
- char ss[2] =
- { stippled_borders, stippled_borders };
- XSetLineAttributes(display, window.gc,
- border_width, LineOnOffDash,
- CapButt, JoinMiter);
+ char ss[2] = { stippled_borders, stippled_borders };
+ XSetLineAttributes(display, window.gc, border_width, LineOnOffDash,
+ CapButt, JoinMiter);
XSetDashes(display, window.gc, 0, ss, 2);
} else {
- XSetLineAttributes(display, window.gc,
- border_width, LineSolid,
- CapButt, JoinMiter);
+ XSetLineAttributes(display, window.gc, border_width, LineSolid,
+ CapButt, JoinMiter);
}
XDrawRectangle(display, window.drawable, window.gc,
- text_start_x - border_margin + b,
- text_start_y - border_margin + b,
- text_width + border_margin * 2 - 1 - b * 2,
- text_height + border_margin * 2 - 1 -
- b * 2);
+ text_start_x - border_margin + b, text_start_y - border_margin + b,
+ text_width + border_margin * 2 - 1 - b * 2,
+ text_height + border_margin * 2 - 1 - b * 2);
}
/* draw text */
for_each_line(text_buffer, draw_line);
}
-static void draw_stuff()
+static void draw_stuff(void)
{
#ifdef X11
selected_font = 0;
}
if (draw_outline) {
- selected_font = 0;
int i, j;
- for (i = -1; i < 2; i++)
+ selected_font = 0;
+
+ for (i = -1; i < 2; i++) {
for (j = -1; j < 2; j++) {
- if (i == 0 && j == 0)
+ if (i == 0 && j == 0) {
continue;
+ }
text_start_x += i;
text_start_y += j;
set_foreground_color(default_out_color);
text_start_x -= i;
text_start_y -= j;
}
+ }
}
set_foreground_color(default_fg_color);
#ifdef HAVE_XDBE
if (use_xdbe) {
XdbeSwapInfo swap;
+
swap.swap_window = window.window;
swap.swap_action = XdbeBackground;
XdbeSwapBuffers(display, &swap, 1);
#endif
#endif /* X11 */
}
+
#ifdef X11
static void clear_text(int exposures)
{
#ifdef HAVE_XDBE
if (use_xdbe) {
- return; /* The swap action is XdbeBackground, which clears */
+ /* The swap action is XdbeBackground, which clears */
+ return;
} else
#endif
{
- /* there is some extra space for borders and outlines */
- XClearArea(display, window.window,
- text_start_x - border_margin - 1,
- text_start_y - border_margin - 1,
- text_width + border_margin * 2 + 2,
- text_height + border_margin * 2 + 2,
- exposures ? True : 0);
+ /* there is some extra space for borders and outlines */
+ XClearArea(display, window.window, text_start_x - border_margin - 1,
+ text_start_y - border_margin - 1,
+ text_width + border_margin * 2 + 2,
+ text_height + border_margin * 2 + 2, exposures ? True : 0);
}
}
#endif /* X11 */
static int need_to_update;
/* update_text() generates new text and clears old text area */
-static void update_text()
+static void update_text(void)
{
generate_text();
#ifdef X11
need_to_update = 1;
}
-static void main_loop()
+static void main_loop(void)
{
#ifdef SIGNAL_BLOCKING
- sigset_t newmask, oldmask;
-
- sigemptyset(&newmask);
- sigaddset(&newmask,SIGINT);
- sigaddset(&newmask,SIGTERM);
- sigaddset(&newmask,SIGUSR1);
+ sigset_t newmask, oldmask;
#endif
-
#ifdef X11
Region region = XCreateRegion();
+
#ifdef HAVE_XDAMAGE
+ Damage damage;
+ XserverRegion region2, part;
int event_base, error_base;
- if (!XDamageQueryExtension (display, &event_base, &error_base)) {
+
+ if (!XDamageQueryExtension(display, &event_base, &error_base)) {
ERR("Xdamage extension unavailable");
}
- Damage damage = XDamageCreate(display, window.window, XDamageReportNonEmpty);
- XserverRegion region2 = XFixesCreateRegionFromWindow(display, window.window, 0);
- XserverRegion part = XFixesCreateRegionFromWindow(display, window.window, 0);
+ damage = XDamageCreate(display, window.window, XDamageReportNonEmpty);
+ region2 = XFixesCreateRegionFromWindow(display, window.window, 0);
+ part = XFixesCreateRegionFromWindow(display, window.window, 0);
#endif /* HAVE_XDAMAGE */
#endif /* X11 */
+#ifdef SIGNAL_BLOCKING
+ sigemptyset(&newmask);
+ sigaddset(&newmask, SIGINT);
+ sigaddset(&newmask, SIGTERM);
+ sigaddset(&newmask, SIGUSR1);
+#endif
+
info.looped = 0;
while (total_run_times == 0 || info.looped < total_run_times) {
info.looped++;
#ifdef SIGNAL_BLOCKING
/* block signals. we will inspect for pending signals later */
- if (sigprocmask(SIG_BLOCK, &newmask, &oldmask) < 0)
+ if (sigprocmask(SIG_BLOCK, &newmask, &oldmask) < 0) {
CRIT_ERR("unable to sigprocmask()");
+ }
#endif
#ifdef X11
fd_set fdsr;
struct timeval tv;
int s;
- double t =
- update_interval - (get_time() -
- last_update_time);
+ double t = update_interval - (get_time() - last_update_time);
- if (t < 0)
+ if (t < 0) {
t = 0;
+ }
tv.tv_sec = (long) t;
tv.tv_usec = (long) (t * 1000000) % 1000000;
FD_ZERO(&fdsr);
FD_SET(ConnectionNumber(display), &fdsr);
-
- s = select(ConnectionNumber(display) + 1, &fdsr, 0,
- 0, &tv);
-#else
- usleep(update_interval*1000000); /* FIXME just sleep for the interval time if no X11 */
-#endif /* X11 */
-#ifdef X11
+ s = select(ConnectionNumber(display) + 1, &fdsr, 0, 0, &tv);
if (s == -1) {
- if (errno != EINTR)
- ERR("can't select(): %s",
- strerror(errno));
+ if (errno != EINTR) {
+ ERR("can't select(): %s", strerror(errno));
+ }
} else {
/* timeout */
- if (s == 0)
+ if (s == 0) {
+#else
+ /* FIXME just sleep for the interval time if no X11 */
+ usleep(update_interval * 1000000);
#endif /* X11 */
update_text();
#ifdef X11
+ }
}
}
-
+
if (need_to_update) {
#ifdef OWN_WINDOW
int wx = window.x, wy = window.y;
#ifdef OWN_WINDOW
if (own_window) {
/* resize window if it isn't right size */
- if (!fixed_size &&
- (text_width + border_margin * 2 + 1 !=
- window.width
- || text_height + border_margin * 2 + 1 !=
- window.height)) {
- window.width =
- text_width +
- border_margin * 2 + 1;
- window.height =
- text_height +
- border_margin * 2 + 1;
- XResizeWindow(display,
- window.window,
- window.width,
- window.height);
- if (own_window) {
- set_transparent_background(window.window);
- }
- }
+ if (!fixed_size
+ && (text_width + border_margin * 2 + 1 != window.width
+ || text_height + border_margin * 2 + 1 != window.height)) {
+ window.width = text_width + border_margin * 2 + 1;
+ window.height = text_height + border_margin * 2 + 1;
+ XResizeWindow(display, window.window, window.width,
+ window.height);
+ if (own_window) {
+ set_transparent_background(window.window);
+ }
+ }
/* move window if it isn't in right position */
- if (!fixed_pos
- && (window.x != wx
- || window.y != wy)) {
- XMoveWindow(display, window.window,
- window.x, window.y);
+ if (!fixed_pos && (window.x != wx || window.y != wy)) {
+ XMoveWindow(display, window.window, window.x, window.y);
}
}
#endif
#ifdef HAVE_XDBE
if (use_xdbe) {
XRectangle r;
+
r.x = text_start_x - border_margin;
r.y = text_start_y - border_margin;
r.width = text_width + border_margin * 2;
}
/* handle X events */
-
while (XPending(display)) {
XEvent ev;
+
XNextEvent(display, &ev);
switch (ev.type) {
- case Expose:
+ case Expose:
{
XRectangle r;
+
r.x = ev.xexpose.x;
r.y = ev.xexpose.y;
r.width = ev.xexpose.width;
r.height = ev.xexpose.height;
- XUnionRectWithRegion(&r, region,
- region);
+ XUnionRectWithRegion(&r, region, region);
+ break;
}
- break;
#ifdef OWN_WINDOW
- case ReparentNotify:
- /* set background to ParentRelative for all parents */
- if (own_window) {
- set_transparent_background(window.
- window);
- }
- break;
+ case ReparentNotify:
+ /* set background to ParentRelative for all parents */
+ if (own_window) {
+ set_transparent_background(window.window);
+ }
+ break;
+
+ case ConfigureNotify:
+ if (own_window) {
+ /* if window size isn't what expected, set fixed size */
+ if (ev.xconfigure.width != window.width
+ || ev.xconfigure.height != window.height) {
+ if (window.width != 0 && window.height != 0) {
+ fixed_size = 1;
+ }
+
+ /* clear old stuff before screwing up
+ * size and pos */
+ clear_text(1);
+
+ {
+ XWindowAttributes attrs;
+
+ if (XGetWindowAttributes(display,
+ window.window, &attrs)) {
+ window.width = attrs.width;
+ window.height = attrs.height;
+ }
+ }
- case ConfigureNotify:
- if (own_window) {
- /* if window size isn't what expected, set fixed size */
- if (ev.xconfigure.width !=
- window.width
- || ev.xconfigure.height !=
- window.height) {
- if (window.width != 0
- && window.height != 0)
- fixed_size = 1;
-
- /* clear old stuff before screwing up size and pos */
- clear_text(1);
-
- {
- XWindowAttributes
- attrs;
- if (XGetWindowAttributes(display, window.window, &attrs)) {
- window.
- width =
- attrs.
- width;
- window.
- height
- =
- attrs.
- height;
+ text_width = window.width - border_margin * 2 - 1;
+ text_height = window.height - border_margin * 2 - 1;
+ if (text_width > maximum_width
+ && maximum_width > 0) {
+ text_width = maximum_width;
}
}
- text_width =
- window.width -
- border_margin * 2 - 1;
- text_height =
- window.height -
- border_margin * 2 - 1;
- if (text_width > maximum_width && maximum_width > 0)
- text_width = maximum_width;
+ /* if position isn't what expected, set fixed pos
+ * total_updates avoids setting fixed_pos when window
+ * is set to weird locations when started */
+ /* // this is broken
+ if (total_updates >= 2 && !fixed_pos
+ && (window.x != ev.xconfigure.x
+ || window.y != ev.xconfigure.y)
+ && (ev.xconfigure.x != 0
+ || ev.xconfigure.y != 0)) {
+ fixed_pos = 1;
+ } */
+ set_font();
}
+ break;
- /* if position isn't what expected, set fixed pos, total_updates
- * avoids setting fixed_pos when window is set to weird locations
- * when started */
- /*if (total_updates >= 2 this is broken
- && !fixed_pos
- && (window.x != ev.xconfigure.x
- || window.y !=
- ev.xconfigure.y)
- && (ev.xconfigure.x != 0
- || ev.xconfigure.y != 0)) {
- fixed_pos = 1;
- }*/
- set_font();
- }
- break;
-
- case ButtonPress:
- if (own_window)
- {
- /* if an ordinary window with decorations */
- if ((window.type==TYPE_NORMAL) && (!TEST_HINT(window.hints,HINT_UNDECORATED)))
- {
- /* allow conky to hold input focus.*/
- break;
- }
- else
- {
- /* forward the click to the desktop window */
- XUngrabPointer(display, ev.xbutton.time);
- ev.xbutton.window = window.desktop;
- XSendEvent(display, ev.xbutton.window, False, ButtonPressMask, &ev);
- XSetInputFocus(display, ev.xbutton.window,RevertToParent,ev.xbutton.time);
- }
- }
- break;
+ case ButtonPress:
+ if (own_window) {
+ /* if an ordinary window with decorations */
+ if ((window.type == TYPE_NORMAL)
+ && (!TEST_HINT(window.hints,
+ HINT_UNDECORATED))) {
+ /* allow conky to hold input focus. */
+ break;
+ } else {
+ /* forward the click to the desktop window */
+ XUngrabPointer(display, ev.xbutton.time);
+ ev.xbutton.window = window.desktop;
+ XSendEvent(display, ev.xbutton.window, False,
+ ButtonPressMask, &ev);
+ XSetInputFocus(display, ev.xbutton.window,
+ RevertToParent, ev.xbutton.time);
+ }
+ }
+ break;
- case ButtonRelease:
- if (own_window)
- {
- /* if an ordinary window with decorations */
- if ((window.type==TYPE_NORMAL) && (!TEST_HINT(window.hints,HINT_UNDECORATED)))
- {
- /* allow conky to hold input focus.*/
- break;
- }
- else
- {
- /* forward the release to the desktop window */
- ev.xbutton.window = window.desktop;
- XSendEvent(display, ev.xbutton.window, False, ButtonReleaseMask, &ev);
- }
- }
- break;
+ case ButtonRelease:
+ if (own_window) {
+ /* if an ordinary window with decorations */
+ if ((window.type == TYPE_NORMAL)
+ && (!TEST_HINT(window.hints,
+ HINT_UNDECORATED))) {
+ /* allow conky to hold input focus. */
+ break;
+ } else {
+ /* forward the release to the desktop window */
+ ev.xbutton.window = window.desktop;
+ XSendEvent(display, ev.xbutton.window, False,
+ ButtonReleaseMask, &ev);
+ }
+ }
+ break;
#endif
- default:
+ default:
#ifdef HAVE_XDAMAGE
- if (ev.type == event_base + XDamageNotify) {
- XDamageNotifyEvent *dev = (XDamageNotifyEvent *) &ev;
- XFixesSetRegion(display, part, &dev->area, 1);
- XFixesUnionRegion(display, region2, region2, part);
- }
+ if (ev.type == event_base + XDamageNotify) {
+ XDamageNotifyEvent *dev = (XDamageNotifyEvent *) &ev;
+
+ XFixesSetRegion(display, part, &dev->area, 1);
+ XFixesUnionRegion(display, region2, region2, part);
+ }
#endif /* HAVE_XDAMAGE */
- break;
+ break;
}
- }
+ }
+
#ifdef HAVE_XDAMAGE
XDamageSubtract(display, damage, region2, None);
XFixesSetRegion(display, region2, 0, 0);
* to XdbeSwapBuffers. That means that if we're using XDBE, we need to
* redraw the text even if it wasn't part of the exposed area. OTOH,
* if we're not going to call draw_stuff at all, then no swap happens
- * and we can safely do nothing.
- */
+ * and we can safely do nothing. */
if (!XEmptyRegion(region)) {
#ifdef HAVE_XDBE
if (use_xdbe) {
XRectangle r;
+
r.x = text_start_x - border_margin;
r.y = text_start_y - border_margin;
r.width = text_width + border_margin * 2;
r.height = text_height + border_margin * 2;
XUnionRectWithRegion(&r, region, region);
- }
+ }
#endif
XSetRegion(display, window.gc, region);
#ifdef XFT
#ifdef SIGNAL_BLOCKING
/* unblock signals of interest and let handler fly */
- if (sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0)
+ if (sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0) {
CRIT_ERR("unable to sigprocmask()");
+ }
#endif
- switch(g_signal_pending) {
- case SIGUSR1:
- {
- ERR("received SIGUSR1. reloading the config file.");
- reload_config();
- break;
- }
- case SIGINT:
- case SIGTERM:
- {
- ERR("received SIGINT or SIGTERM to terminate. bye!");
- clean_up();
+ switch (g_signal_pending) {
+ case SIGHUP:
+ case SIGUSR1:
+ ERR("received SIGHUP or SIGUSR1. reloading the config file.");
+ reload_config();
+ break;
+ case SIGINT:
+ case SIGTERM:
+ ERR("received SIGINT or SIGTERM to terminate. bye!");
+ clean_up();
#ifdef X11
- XDestroyRegion(region);
- region = NULL;
+ XDestroyRegion(region);
+ region = NULL;
+#ifdef HAVE_XDAMAGE
+ XDamageDestroy(display, damage);
+ XFixesDestroyRegion(display, region2);
+ XFixesDestroyRegion(display, part);
+#endif /* HAVE_XDAMAGE */
#endif /* X11 */
- return; /* return from main_loop */
- /*break;*/
- }
- default:
- {
- /* Reaching here means someone set a signal( SIGXXXX, signal_handler )
- * but didn't write any code to deal with it. if you don't want to
- * handle a signal, don't set a handler on it in the first place. */
- if (g_signal_pending)
- ERR("ignoring signal (%d)", g_signal_pending);
- break;
- }
+ return; /* return from main_loop */
+ /* break; */
+ default:
+ /* Reaching here means someone set a signal
+ * (SIGXXXX, signal_handler), but didn't write any code
+ * to deal with it.
+ * If you don't want to handle a signal, don't set a handler on
+ * it in the first place. */
+ if (g_signal_pending) {
+ ERR("ignoring signal (%d)", g_signal_pending);
+ }
+ break;
}
- g_signal_pending=0;
-
+ g_signal_pending = 0;
}
+
#if defined(X11) && defined(HAVE_XDAMAGE)
XDamageDestroy(display, damage);
XFixesDestroyRegion(display, region2);
/* reload the config file */
void reload_config(void)
{
- timed_thread_destroy_registered_threads ();
+ timed_thread_destroy_registered_threads();
if (info.cpu_usage) {
free(info.cpu_usage);
info.cpu_usage = NULL;
}
+ if (info.mail) {
+ free(info.mail);
+ }
+
+#ifdef MPD
+ if (info.mpd.title) {
+ free(info.mpd.title);
+ info.mpd.title = NULL;
+ }
+ if (info.mpd.artist) {
+ free(info.mpd.artist);
+ info.mpd.artist = NULL;
+ }
+ if (info.mpd.album) {
+ free(info.mpd.album);
+ info.mpd.album = NULL;
+ }
+ if (info.mpd.random) {
+ free(info.mpd.random);
+ info.mpd.random = NULL;
+ }
+ if (info.mpd.repeat) {
+ free(info.mpd.repeat);
+ info.mpd.repeat = NULL;
+ }
+ if (info.mpd.track) {
+ free(info.mpd.track);
+ info.mpd.track = NULL;
+ }
+ if (info.mpd.name) {
+ free(info.mpd.name);
+ info.mpd.name = NULL;
+ }
+ if (info.mpd.file) {
+ free(info.mpd.file);
+ info.mpd.file = NULL;
+ }
+ if (info.mpd.status) {
+ free(info.mpd.status);
+ info.mpd.status = NULL;
+ }
+#endif
+
+#ifdef X11
+ free_fonts();
+ load_fonts();
+ set_font();
+#endif /* X11 */
+
#ifdef TCP_PORT_MONITOR
- destroy_tcp_port_monitor_collection( info.p_tcp_port_monitor_collection );
+ destroy_tcp_port_monitor_collection(info.p_tcp_port_monitor_collection);
#endif
if (current_config) {
load_config_file(current_config);
/* re-init specials array */
- if ((specials = realloc ((void *)specials, sizeof(struct special_t)*max_specials)) == 0)
- ERR("failed to realloc specials array");
+ if ((specials = realloc((void *) specials,
+ sizeof(struct special_t) * max_specials)) == 0) {
+ ERR("failed to realloc specials array");
+ }
#ifdef X11
- load_fonts();
- set_font();
- XClearWindow(display, RootWindow(display, screen)); // clear the window first
+ // clear the window first
+ XClearWindow(display, RootWindow(display, screen));
#endif /* X11 */
#ifdef TCP_PORT_MONITOR
- info.p_tcp_port_monitor_collection = NULL;
-#endif
-#ifdef AUDACIOUS
- if (create_audacious_thread() !=0)
- CRIT_ERR("unable to create audacious thread!");
- timed_thread_register (info.audacious.p_timed_thread, &info.audacious.p_timed_thread);
+ info.p_tcp_port_monitor_collection = NULL;
#endif
extract_variable_text(text);
free(text);
text = NULL;
+ if (tmpstring1) {
+ free(tmpstring1);
+ }
+ tmpstring1 = malloc(text_buffer_size);
+ memset(tmpstring1, 0, text_buffer_size);
+ if (tmpstring2) {
+ free(tmpstring2);
+ }
+ tmpstring2 = malloc(text_buffer_size);
+ memset(tmpstring2, 0, text_buffer_size);
+ if (text_buffer) {
+ free(text_buffer);
+ }
+ text_buffer = malloc(max_user_text);
+ memset(text_buffer, 0, max_user_text);
update_text();
}
}
void clean_up(void)
{
- timed_thread_destroy_registered_threads ();
+ timed_thread_destroy_registered_threads();
if (info.cpu_usage) {
free(info.cpu_usage);
}
#endif
#ifdef OWN_WINDOW
- if (own_window)
- {
+ if (own_window) {
XDestroyWindow(display, window.window);
XClearWindow(display, RootWindow(display, screen));
XFlush(display);
- }
- else
+ } else
#endif
{
XClearWindow(display, RootWindow(display, screen));
}
XFreeGC(display, window.gc);
+ free_fonts();
#endif /* X11 */
- free_text_objects(text_object_count, text_objects);
- text_object_count = 0;
- text_objects = NULL;
+ free_text_objects(global_text_object_count, global_text_objects);
+ if (tmpstring1) {
+ free(tmpstring1);
+ tmpstring1 = 0;
+ }
+ if (tmpstring2) {
+ free(tmpstring2);
+ tmpstring2 = 0;
+ }
+ if (text_buffer) {
+ free(text_buffer);
+ text_buffer = 0;
+ }
+ global_text_object_count = 0;
+ global_text_objects = NULL;
- if (text != original_text)
+ if (text) {
free(text);
+ text = 0;
+ }
free(current_config);
- free(current_mail_spool);
#ifdef TCP_PORT_MONITOR
- destroy_tcp_port_monitor_collection( info.p_tcp_port_monitor_collection );
+ destroy_tcp_port_monitor_collection(info.p_tcp_port_monitor_collection);
info.p_tcp_port_monitor_collection = NULL;
#endif
#ifdef RSS
if (specials) {
unsigned int i;
- for(i=0;i<special_count;i++)
- if(specials[i].type == GRAPH)
+
+ for (i = 0; i < special_count; i++) {
+ if (specials[i].type == GRAPH) {
free(specials[i].graph);
- free (specials);
- specials=NULL;
+ }
+ }
+ free(specials);
+ specials = NULL;
}
+
+ clear_diskio_stats();
}
static int string_to_bool(const char *s)
{
- if (!s)
+ if (!s) {
return 1;
- if (strcasecmp(s, "yes") == 0)
+ } else if (strcasecmp(s, "yes") == 0) {
return 1;
- if (strcasecmp(s, "true") == 0)
+ } else if (strcasecmp(s, "true") == 0) {
return 1;
- if (strcasecmp(s, "1") == 0)
+ } else if (strcasecmp(s, "1") == 0) {
return 1;
+ }
return 0;
}
+
#ifdef X11
static enum alignment string_to_alignment(const char *s)
{
- if (strcasecmp(s, "top_left") == 0)
+ if (strcasecmp(s, "top_left") == 0) {
return TOP_LEFT;
- else if (strcasecmp(s, "top_right") == 0)
+ } else if (strcasecmp(s, "top_right") == 0) {
return TOP_RIGHT;
- else if (strcasecmp(s, "bottom_left") == 0)
+ } else if (strcasecmp(s, "top_middle") == 0) {
+ return TOP_MIDDLE;
+ } else if (strcasecmp(s, "bottom_left") == 0) {
return BOTTOM_LEFT;
- else if (strcasecmp(s, "bottom_right") == 0)
+ } else if (strcasecmp(s, "bottom_right") == 0) {
return BOTTOM_RIGHT;
- else if (strcasecmp(s, "tl") == 0)
+ } else if (strcasecmp(s, "bottom_middle") == 0) {
+ return BOTTOM_MIDDLE;
+ } else if (strcasecmp(s, "middle_left") == 0) {
+ return MIDDLE_LEFT;
+ } else if (strcasecmp(s, "middle_right") == 0) {
+ return MIDDLE_RIGHT;
+ } else if (strcasecmp(s, "tl") == 0) {
return TOP_LEFT;
- else if (strcasecmp(s, "tr") == 0)
+ } else if (strcasecmp(s, "tr") == 0) {
return TOP_RIGHT;
- else if (strcasecmp(s, "bl") == 0)
+ } else if (strcasecmp(s, "tm") == 0) {
+ return TOP_MIDDLE;
+ } else if (strcasecmp(s, "bl") == 0) {
return BOTTOM_LEFT;
- else if (strcasecmp(s, "br") == 0)
+ } else if (strcasecmp(s, "br") == 0) {
return BOTTOM_RIGHT;
- else if (strcasecmp(s, "none") == 0)
+ } else if (strcasecmp(s, "bm") == 0) {
+ return BOTTOM_MIDDLE;
+ } else if (strcasecmp(s, "ml") == 0) {
+ return MIDDLE_LEFT;
+ } else if (strcasecmp(s, "mr") == 0) {
+ return MIDDLE_RIGHT;
+ } else if (strcasecmp(s, "none") == 0) {
return NONE;
+ }
return TOP_LEFT;
}
#endif /* X11 */
-
static void set_default_configurations(void)
{
fork_to_background = 0;
info.net_avg_samples = 2;
info.memmax = 0;
top_cpu = 0;
+ cpu_separate = 0;
+ short_units = 0;
top_mem = 0;
#ifdef MPD
strcpy(info.mpd.host, "localhost");
info.mpd.file = NULL;
#endif
#ifdef XMMS2
- info.xmms2.artist = NULL;
- info.xmms2.album = NULL;
- info.xmms2.title = NULL;
- info.xmms2.genre = NULL;
- info.xmms2.comment = NULL;
- info.xmms2.decoder = NULL;
- info.xmms2.transport = NULL;
- info.xmms2.url = NULL;
- info.xmms2.status = NULL;
+ info.xmms2.artist = NULL;
+ info.xmms2.album = NULL;
+ info.xmms2.title = NULL;
+ info.xmms2.genre = NULL;
+ info.xmms2.comment = NULL;
+ info.xmms2.url = NULL;
+ info.xmms2.status = NULL;
+ info.xmms2.playlist = NULL;
#endif
- use_spacer = 0;
+ use_spacer = NO_SPACER;
#ifdef X11
out_to_console = 0;
#else
draw_outline = 0;
set_first_font("6x10");
gap_x = 5;
- gap_y = 5;
+ gap_y = 60;
minimum_width = 5;
minimum_height = 5;
maximum_width = 0;
#ifdef OWN_WINDOW
own_window = 0;
- window.type=TYPE_NORMAL;
- window.hints=0;
- strcpy(window.class_name, "Conky");
- update_uname();
- sprintf(window.title,"%s - conky",info.uname_s.nodename);
+ window.type = TYPE_NORMAL;
+ window.hints = 0;
+ strcpy(window.class_name, "Conky");
+ update_uname();
+ sprintf(window.title, "Conky (%s)", info.uname_s.nodename);
#endif
stippled_borders = 0;
border_margin = 3;
free(current_mail_spool);
{
char buf[256];
+
variable_substitute(MAIL_FILE, buf, 256);
- if (buf[0] != '\0')
+ if (buf[0] != '\0') {
current_mail_spool = strdup(buf);
+ }
}
no_buffers = 1;
- update_interval = 10.0;
+ update_interval = 3.0;
+ info.music_player_interval = 1.0;
stuff_in_upper_case = 0;
+ info.users.number = 1;
#ifdef TCP_PORT_MONITOR
- tcp_port_monitor_args.max_port_monitor_connections = MAX_PORT_MONITOR_CONNECTIONS_DEFAULT;
+ tcp_port_monitor_args.max_port_monitor_connections =
+ MAX_PORT_MONITOR_CONNECTIONS_DEFAULT;
#endif
}
set_default_configurations();
fp = fopen(f, "r");
- if (!fp)
+ if (!fp) {
return;
+ }
while (!feof(fp)) {
char buf[256], *p, *p2, *name, *value;
+
line++;
- if (fgets(buf, 256, fp) == NULL)
+ if (fgets(buf, 256, fp) == NULL) {
break;
+ }
p = buf;
/* break at comment */
p2 = strchr(p, '#');
- if (p2)
+ if (p2) {
*p2 = '\0';
+ }
/* skip spaces */
- while (*p && isspace((int) *p))
+ while (*p && isspace((int) *p)) {
p++;
- if (*p == '\0')
+ }
+ if (*p == '\0') {
continue; /* empty line */
+ }
name = p;
/* skip name */
p2 = p;
- while (*p2 && !isspace((int) *p2))
+ while (*p2 && !isspace((int) *p2)) {
p2++;
+ }
if (*p2 != '\0') {
*p2 = '\0'; /* break at name's end */
p2++;
/* get value */
if (*p2) {
p = p2;
- while (*p && isspace((int) *p))
+ while (*p && isspace((int) *p)) {
p++;
+ }
value = p;
p2 = value + strlen(value);
- while (isspace((int) *(p2 - 1)))
+ while (isspace((int) *(p2 - 1))) {
*--p2 = '\0';
+ }
} else {
value = 0;
}
#define CONF2(a) if (strcasecmp(name, a) == 0)
#define CONF(a) else CONF2(a)
-#define CONF3(a,b) \
-else if (strcasecmp(name, a) == 0 || strcasecmp(name, b) == 0)
-
+#define CONF3(a, b) else if (strcasecmp(name, a) == 0 \
+ || strcasecmp(name, b) == 0)
#ifdef X11
CONF2("alignment") {
- if (value) {
- int a = string_to_alignment(value);
- if (a <= 0)
+ if (value) {
+ int a = string_to_alignment(value);
+
+ if (a <= 0) {
+ CONF_ERR;
+ } else {
+ text_alignment = a;
+ }
+ } else {
CONF_ERR;
- else
- text_alignment = a;
- } else
- CONF_ERR;
+ }
}
CONF("background") {
fork_to_background = string_to_bool(value);
}
-
#else
CONF2("background") {
fork_to_background = string_to_bool(value);
#endif /* X11 */
#ifdef X11
CONF("border_margin") {
- if (value)
+ if (value) {
border_margin = strtol(value, 0, 0);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("border_width") {
- if (value)
+ if (value) {
border_width = strtol(value, 0, 0);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("color0") {
- if (value)
+ if (value) {
color0 = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("color1") {
- if (value)
+ if (value) {
color1 = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("color2") {
- if (value)
+ if (value) {
color2 = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("color3") {
- if (value)
+ if (value) {
color3 = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("color4") {
- if (value)
+ if (value) {
color4 = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("color5") {
- if (value)
+ if (value) {
color5 = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("color6") {
- if (value)
+ if (value) {
color6 = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("color7") {
- if (value)
+ if (value) {
color7 = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("color8") {
- if (value)
+ if (value) {
color8 = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("color9") {
- if (value)
+ if (value) {
color9 = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("default_color") {
- if (value)
+ if (value) {
default_fg_color = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF3("default_shade_color", "default_shadecolor") {
- if (value)
+ if (value) {
default_bg_color = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF3("default_outline_color", "default_outlinecolor") {
- if (value)
+ if (value) {
default_out_color = get_x11_color(value);
- else
+ } else {
CONF_ERR;
+ }
}
#endif /* X11 */
CONF("imap") {
}
#ifdef MPD
CONF("mpd_host") {
- if (value)
+ if (value) {
strncpy(info.mpd.host, value, 127);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("mpd_port") {
if (value) {
info.mpd.port = strtol(value, 0, 0);
- if (info.mpd.port < 1
- || info.mpd.port > 0xffff)
+ if (info.mpd.port < 1 || info.mpd.port > 0xffff) {
CONF_ERR;
+ }
}
}
CONF("mpd_password") {
- if (value)
+ if (value) {
strncpy(info.mpd.password, value, 127);
- else
+ } else {
CONF_ERR;
+ }
}
#endif
+ CONF("music_player_interval") {
+ if (value) {
+ info.music_player_interval = strtod(value, 0);
+ } else {
+ CONF_ERR;
+ }
+ }
#ifdef __OpenBSD__
CONF("sensor_device") {
- if(value)
+ if (value) {
sensor_device = strtol(value, 0, 0);
- else
+ } else {
CONF_ERR;
+ }
}
#endif
CONF("cpu_avg_samples") {
if (value) {
cpu_avg_samples = strtol(value, 0, 0);
- if (cpu_avg_samples < 1
- || cpu_avg_samples > 14)
+ if (cpu_avg_samples < 1 || cpu_avg_samples > 14) {
CONF_ERR;
- else
- info.
- cpu_avg_samples
- = cpu_avg_samples;
- } else
+ } else {
+ info.cpu_avg_samples = cpu_avg_samples;
+ }
+ } else {
CONF_ERR;
+ }
}
CONF("net_avg_samples") {
if (value) {
net_avg_samples = strtol(value, 0, 0);
- if (net_avg_samples < 1
- || net_avg_samples > 14)
+ if (net_avg_samples < 1 || net_avg_samples > 14) {
CONF_ERR;
- else
- info.
- net_avg_samples
- = net_avg_samples;
- } else
+ } else {
+ info.net_avg_samples = net_avg_samples;
+ }
+ } else {
CONF_ERR;
+ }
}
-
-
-
-
-
#ifdef HAVE_XDBE
CONF("double_buffer") {
- use_xdbe = string_to_bool(value);
+ use_xdbe = string_to_bool(value);
}
#endif
#ifdef X11
CONF("override_utf8_locale") {
- utf8_mode = string_to_bool(value);
+ utf8_mode = string_to_bool(value);
}
-
CONF("draw_borders") {
draw_borders = string_to_bool(value);
}
out_to_console = string_to_bool(value);
}
CONF("use_spacer") {
- use_spacer = string_to_bool(value);
+ if (value) {
+ if (strcasecmp(value, "left") == 0) {
+ use_spacer = LEFT_SPACER;
+ } else if (strcasecmp(value, "right") == 0) {
+ use_spacer = RIGHT_SPACER;
+ } else if (strcasecmp(value, "none") == 0) {
+ use_spacer = NO_SPACER;
+ } else {
+ use_spacer = string_to_bool(value);
+ ERR("use_spacer should have an argument of left, right, or"
+ " none. '%s' seems to be some form of '%s', so"
+ " defaulting to %s.", value,
+ use_spacer ? "true" : "false",
+ use_spacer ? "right" : "none");
+ if (use_spacer) {
+ use_spacer = RIGHT_SPACER;
+ } else {
+ use_spacer = NO_SPACER;
+ }
+ }
+ } else {
+ ERR("use_spacer should have an argument. Defaulting to right.");
+ use_spacer = RIGHT_SPACER;
+ }
}
#ifdef X11
#ifdef XFT
CONF("font") {
if (value) {
set_first_font(value);
- } else
+ } else {
CONF_ERR;
+ }
}
CONF("xftalpha") {
- if (value && font_count >= 0)
- fonts[0].font_alpha = atof(value)
- * 65535.0;
- else
+ if (value && font_count >= 0) {
+ fonts[0].font_alpha = atof(value) * 65535.0;
+ } else {
CONF_ERR;
+ }
}
CONF("xftfont") {
if (use_xft) {
#else
CONF("use_xft") {
- if (string_to_bool(value))
+ if (string_to_bool(value)) {
ERR("Xft not enabled");
+ }
}
CONF("xftfont") {
/* xftfont silently ignored when no Xft */
#endif
if (value) {
set_first_font(value);
- } else
+ } else {
CONF_ERR;
+ }
#ifdef XFT
}
#endif
}
CONF("gap_x") {
- if (value)
+ if (value) {
gap_x = atoi(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("gap_y") {
- if (value)
+ if (value) {
gap_y = atoi(value);
- else
+ } else {
CONF_ERR;
+ }
}
#endif /* X11 */
CONF("mail_spool") {
if (value) {
char buf[256];
+
variable_substitute(value, buf, 256);
- if (buf[0]
- != '\0') {
- if (current_mail_spool)
+ if (buf[0] != '\0') {
+ if (current_mail_spool) {
free(current_mail_spool);
+ }
current_mail_spool = strdup(buf);
}
- } else
+ } else {
CONF_ERR;
+ }
}
#ifdef X11
CONF("minimum_size") {
- if (value) {
- if (sscanf
- (value, "%d %d", &minimum_width,
- &minimum_height) != 2)
- if (sscanf
- (value, "%d",
- &minimum_width) != 1)
+ if (value) {
+ if (sscanf(value, "%d %d", &minimum_width, &minimum_height)
+ != 2) {
+ if (sscanf(value, "%d", &minimum_width) != 1) {
+ CONF_ERR;
+ }
+ }
+ } else {
CONF_ERR;
- } else
- CONF_ERR;
+ }
}
CONF("maximum_width") {
if (value) {
- if (sscanf(value, "%d", &maximum_width) != 1)
+ if (sscanf(value, "%d", &maximum_width) != 1) {
CONF_ERR;
- } else
+ }
+ } else {
CONF_ERR;
+ }
}
#endif /* X11 */
CONF("no_buffers") {
no_buffers = string_to_bool(value);
}
+ CONF("top_cpu_separate") {
+ cpu_separate = string_to_bool(value);
+ }
+ CONF("short_units") {
+ short_units = string_to_bool(value);
+ }
CONF("pad_percents") {
- pad_percents = atoi(value);
+ pad_percents = atoi(value);
}
#ifdef X11
#ifdef OWN_WINDOW
CONF("own_window") {
- if (value)
- own_window = string_to_bool(value);
- else
- CONF_ERR;
+ if (value) {
+ own_window = string_to_bool(value);
+ } else {
+ CONF_ERR;
+ }
}
CONF("own_window_class") {
- if (value)
- {
- memset(window.class_name,0,sizeof(window.class_name));
- strncpy(window.class_name, value, sizeof(window.class_name)-1);
- }
- else
- CONF_ERR;
- }
- CONF("own_window_title") {
- if (value)
- {
- memset(window.title,0,sizeof(window.title));
- strncpy(window.title, value, sizeof(window.title)-1);
- }
- else
- CONF_ERR;
- }
+ if (value) {
+ memset(window.class_name, 0, sizeof(window.class_name));
+ strncpy(window.class_name, value,
+ sizeof(window.class_name) - 1);
+ } else {
+ CONF_ERR;
+ }
+ }
+ CONF("own_window_title") {
+ if (value) {
+ memset(window.title, 0, sizeof(window.title));
+ strncpy(window.title, value, sizeof(window.title) - 1);
+ } else {
+ CONF_ERR;
+ }
+ }
CONF("own_window_transparent") {
- if (value)
- set_transparent = string_to_bool(value);
- else
- CONF_ERR;
+ if (value) {
+ set_transparent = string_to_bool(value);
+ } else {
+ CONF_ERR;
+ }
}
CONF("own_window_colour") {
if (value) {
background_colour = get_x11_color(value);
} else {
- ERR("Invalid colour for own_winder_colour (try omitting the '#' for hex colours");
+ ERR("Invalid colour for own_window_colour (try omitting the "
+ "'#' for hex colours");
}
}
CONF("own_window_hints") {
char delim[] = ", ";
/* tokenize the value into individual hints */
- if ((p_hint=strtok_r(value, delim, &p_save)) != NULL)
- do {
- /*fprintf(stderr, "hint [%s] parsed\n", p_hint);*/
- if (strncmp(p_hint,"undecorate",10) == 0)
- SET_HINT(window.hints,HINT_UNDECORATED);
- else if (strncmp(p_hint,"below",5) == 0)
- SET_HINT(window.hints,HINT_BELOW);
- else if (strncmp(p_hint,"above",5) == 0)
- SET_HINT(window.hints,HINT_ABOVE);
- else if (strncmp(p_hint,"sticky",6) == 0)
- SET_HINT(window.hints,HINT_STICKY);
- else if (strncmp(p_hint,"skip_taskbar",12) == 0)
- SET_HINT(window.hints,HINT_SKIP_TASKBAR);
- else if (strncmp(p_hint,"skip_pager",10) == 0)
- SET_HINT(window.hints,HINT_SKIP_PAGER);
- else
- CONF_ERR;
-
- p_hint=strtok_r(NULL, delim, &p_save);
- }
- while (p_hint!=NULL);
- }
- else
- CONF_ERR;
+ if ((p_hint = strtok_r(value, delim, &p_save)) != NULL) {
+ do {
+ /* fprintf(stderr, "hint [%s] parsed\n", p_hint); */
+ if (strncmp(p_hint, "undecorate", 10) == 0) {
+ SET_HINT(window.hints, HINT_UNDECORATED);
+ } else if (strncmp(p_hint, "below", 5) == 0) {
+ SET_HINT(window.hints, HINT_BELOW);
+ } else if (strncmp(p_hint, "above", 5) == 0) {
+ SET_HINT(window.hints, HINT_ABOVE);
+ } else if (strncmp(p_hint, "sticky", 6) == 0) {
+ SET_HINT(window.hints, HINT_STICKY);
+ } else if (strncmp(p_hint, "skip_taskbar", 12) == 0) {
+ SET_HINT(window.hints, HINT_SKIP_TASKBAR);
+ } else if (strncmp(p_hint, "skip_pager", 10) == 0) {
+ SET_HINT(window.hints, HINT_SKIP_PAGER);
+ } else {
+ CONF_ERR;
+ }
+
+ p_hint = strtok_r(NULL, delim, &p_save);
+ } while (p_hint != NULL);
+ }
+ } else {
+ CONF_ERR;
+ }
}
CONF("own_window_type") {
if (value) {
- if (strncmp(value,"normal",6)==0)
+ if (strncmp(value, "normal", 6) == 0) {
window.type = TYPE_NORMAL;
- else if (strncmp(value,"desktop",7)==0)
+ } else if (strncmp(value, "desktop", 7) == 0) {
window.type = TYPE_DESKTOP;
- else if (strncmp(value,"override",8)==0)
+ } else if (strncmp(value, "override", 8) == 0) {
window.type = TYPE_OVERRIDE;
- else
- CONF_ERR;
+ } else {
+ CONF_ERR;
+ }
+ } else {
+ CONF_ERR;
}
- else
- CONF_ERR;
}
#endif
CONF("stippled_borders") {
- if (value)
+ if (value) {
stippled_borders = strtol(value, 0, 0);
- else
+ } else {
stippled_borders = 4;
+ }
}
#endif /* X11 */
CONF("temp1") {
- ERR("temp1 configuration is obsolete, use ${i2c <i2c device here> temp 1}");
+ ERR("temp1 configuration is obsolete, use ${i2c <i2c device here> "
+ "temp 1}");
}
- CONF("temp1") {
- ERR("temp2 configuration is obsolete, use ${i2c <i2c device here> temp 2}");
+ CONF("temp2") {
+ ERR("temp2 configuration is obsolete, use ${i2c <i2c device here> "
+ "temp 2}");
}
CONF("update_interval") {
- if (value)
+ if (value) {
update_interval = strtod(value, 0);
- else
+ } else {
CONF_ERR;
+ }
+ if (info.music_player_interval == 0) {
+ // default to update_interval
+ info.music_player_interval = update_interval;
+ }
}
CONF("total_run_times") {
- if (value)
+ if (value) {
total_run_times = strtod(value, 0);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("uppercase") {
stuff_in_upper_case = string_to_bool(value);
}
CONF("max_specials") {
- if (value)
+ if (value) {
max_specials = atoi(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("max_user_text") {
- if (value)
+ if (value) {
max_user_text = atoi(value);
- else
+ } else {
CONF_ERR;
+ }
}
CONF("text_buffer_size") {
- if (value)
+ if (value) {
text_buffer_size = atoi(value);
- else
+ if (text_buffer_size < DEFAULT_TEXT_BUFFER_SIZE) {
+ ERR("text_buffer_size must be >=%i bytes", DEFAULT_TEXT_BUFFER_SIZE);
+ text_buffer_size = DEFAULT_TEXT_BUFFER_SIZE;
+ }
+ } else {
CONF_ERR;
+ }
}
CONF("text") {
- if (text != original_text)
+ if (text) {
free(text);
+ text = 0;
+ }
- text = (char *)
- malloc(1);
- text[0]
- = '\0';
+ text = (char *) malloc(1);
+ text[0] = '\0';
while (!feof(fp)) {
- unsigned
- int l = strlen(text);
- if (fgets(buf, 256, fp) == NULL)
+ unsigned int l = strlen(text);
+
+ if (fgets(buf, 256, fp) == NULL) {
break;
- text = (char *)
- realloc(text, l + strlen(buf)
- + 1);
+ }
+ text = (char *) realloc(text, l + strlen(buf) + 1);
strcat(text, buf);
- if (strlen(text) > max_user_text)
+ if (strlen(text) > max_user_text) {
break;
+ }
}
fclose(fp);
text_lines = line + 1;
return;
}
#ifdef TCP_PORT_MONITOR
- CONF("max_port_monitor_connections")
- {
- if ( !value ||
- (sscanf(value, "%d", &tcp_port_monitor_args.max_port_monitor_connections) != 1)
- || tcp_port_monitor_args.max_port_monitor_connections < 0 )
- {
+ CONF("max_port_monitor_connections") {
+ if (!value || (sscanf(value, "%d",
+ &tcp_port_monitor_args.max_port_monitor_connections) != 1)
+ || tcp_port_monitor_args.max_port_monitor_connections < 0) {
/* an error. use default, warn and continue. */
- tcp_port_monitor_args.max_port_monitor_connections =
+ tcp_port_monitor_args.max_port_monitor_connections =
MAX_PORT_MONITOR_CONNECTIONS_DEFAULT;
CONF_ERR;
- }
- else if ( tcp_port_monitor_args.max_port_monitor_connections == 0 )
- {
+ } else if (tcp_port_monitor_args.max_port_monitor_connections
+ == 0) {
/* no error, just use default */
- tcp_port_monitor_args.max_port_monitor_connections =
+ tcp_port_monitor_args.max_port_monitor_connections =
MAX_PORT_MONITOR_CONNECTIONS_DEFAULT;
}
- /* else tcp_port_monitor_args.max_port_monitor_connections > 0 as per config */
+ /* else tcp_port_monitor_args.max_port_monitor_connections > 0
+ * as per config */
}
#endif
-
- else
- ERR("%s: %d: no such configuration: '%s'", f, line, name);
+ else {
+ ERR("%s: %d: no such configuration: '%s'", f, line, name);
+ }
#undef CONF
#undef CONF2
}
fclose(fp);
-#undef CONF_ERR
+#undef CONF_ERR
+ if (info.music_player_interval == 0) {
+ // default to update_interval
+ info.music_player_interval = update_interval;
+ }
}
- /* : means that character before that takes an argument */
-static const char *getopt_string = "vVdt:f:u:i:hc:w:x:y:a:"
+/* : means that character before that takes an argument */
+static const char *getopt_string = "vVdt:u:i:hc:"
#ifdef X11
- "x:y:w:a:f:"
+ "x:y:w:a:f:"
#ifdef OWN_WINDOW
- "o"
+ "o"
#endif
#ifdef HAVE_XDBE
- "b"
+ "b"
#endif
#endif /* X11 */
- ;
+ ;
+static const struct option longopts[] = {
+ { "help", 0, NULL, 'h' },
+ { "version", 0, NULL, 'V' },
+ { "config", 1, NULL, 'c' },
+ { "daemonize", 0, NULL, 'd' },
+#ifdef X11
+ { "alignment", 1, NULL, 'a' },
+ { "font", 1, NULL, 'f' },
+#ifdef OWN_WINDOW
+ { "own-window", 0, NULL, 'o' },
+#endif
+#ifdef HAVE_XDBE
+ { "double-buffer", 0, NULL, 'b' },
+#endif
+ { "window-id", 1, NULL, 'w' },
+#endif /* X11 */
+ { "text", 1, NULL, 't' },
+ { "interval", 0, NULL, 'u' },
+ { 0, 0, 0, 0 }
+};
int main(int argc, char **argv)
{
+#ifdef X11
+ char *s, *temp;
+ unsigned int x;
+#endif
struct sigaction act, oact;
- g_signal_pending=0;
+ g_signal_pending = 0;
memset(&info, 0, sizeof(info));
#ifdef TCP_PORT_MONITOR
- tcp_port_monitor_args.max_port_monitor_connections = MAX_PORT_MONITOR_CONNECTIONS_DEFAULT;
+ tcp_port_monitor_args.max_port_monitor_connections =
+ MAX_PORT_MONITOR_CONNECTIONS_DEFAULT;
#endif
/* handle command line parameters that don't change configs */
#ifdef X11
- char *s, *temp;
- unsigned int x;
-
- if (((s = getenv("LC_ALL")) && *s) || ((s = getenv("LC_CTYPE")) &&
- *s) || ((s = getenv("LANG")) && *s)) {
- temp = (char *)malloc((strlen(s) + 1) * sizeof(char));
+ if (((s = getenv("LC_ALL")) && *s) || ((s = getenv("LC_CTYPE")) && *s)
+ || ((s = getenv("LANG")) && *s)) {
+ temp = (char *) malloc((strlen(s) + 1) * sizeof(char));
if (temp == NULL) {
ERR("malloc failed");
}
if (strstr(temp, "utf-8") || strstr(temp, "utf8")) {
utf8_mode = 1;
}
-
+
free(temp);
}
if (!setlocale(LC_CTYPE, "")) {
}
#endif /* X11 */
while (1) {
- int c = getopt(argc,
- argv,
- getopt_string);
- if (c == -1)
+ int c = getopt_long(argc, argv, getopt_string, longopts, NULL);
+
+ if (c == -1) {
break;
+ }
switch (c) {
- case 'v':
- case 'V':
- print_version();
- case 'c':
- /* if current_config is set to a strdup of CONFIG_FILE, free it (even
- * though free() does the NULL check itself;), then load optarg value */
- if (current_config)
- free(current_config);
- current_config = strdup(optarg);
- break;
+ case 'v':
+ case 'V':
+ print_version();
+ case 'c':
+ if (current_config) {
+ free(current_config);
+ }
+ current_config = strdup(optarg);
+ break;
- case 'h':
- printf
- ("Usage: %s [OPTION]...\n"
- "Conky is a system monitor that renders text on desktop or to own transparent\n"
- "window. Command line options will override configurations defined in config\n"
- "file.\n"
- " -V version\n"
- " -c FILE config file to load instead of "
- CONFIG_FILE
- "\n"
- " -d daemonize, fork to background\n"
- " -h help\n"
+ case 'h':
+ printf("Usage: %s [OPTION]...\n"
+ "Conky is a system monitor that renders text on desktop or to own transparent\n"
+ "window. Command line options will override configurations defined in config\n"
+ "file.\n"
+ " -V, --version version\n"
+ " -c, --config=FILE config file to load\n"
+ " -d, --daemonize daemonize, fork to background\n"
+ " -h, --help help\n"
#ifdef X11
- " -a ALIGNMENT text alignment on screen, {top,bottom}_{left,right}\n"
- " -f FONT font to use\n"
+ " -a, --alignment=ALIGNMENT text alignment on screen, {top,bottom}_{left,right}\n"
+ " -f, --font=FONT font to use\n"
#ifdef OWN_WINDOW
- " -o create own window to draw\n"
+ " -o, --own-window create own window to draw\n"
#endif
#ifdef HAVE_XDBE
- " -b double buffer (prevents flickering)\n"
+ " -b, --double-buffer double buffer (prevents flickering)\n"
#endif
- " -w WIN_ID window id to draw\n"
- " -x X x position\n"
- " -y Y y position\n"
+ " -w, --window-id=WIN_ID window id to draw\n"
+ " -x X x position\n"
+ " -y Y y position\n"
#endif /* X11 */
- " -t TEXT text to render, remember single quotes, like -t '$uptime'\n"
- " -u SECS update interval\n"
- " -i NUM number of times to update Conky\n", argv[0]);
- return 0;
+ " -t, --text=TEXT text to render, remember single quotes, like -t '$uptime'\n"
+ " -u, --interval=SECS update interval\n"
+ " -i NUM number of times to update Conky\n",
+ argv[0]
+ );
+ return 0;
#ifdef X11
- case 'w':
- window.window = strtol(optarg, 0, 0);
- break;
+ case 'w':
+ window.window = strtol(optarg, 0, 0);
+ break;
#endif /* X11 */
- case '?':
- exit(EXIT_FAILURE);
+ case '?':
+ exit(EXIT_FAILURE);
}
}
#ifdef X11
- /* initalize X BEFORE we load config. (we need to so that 'screen' is set) */
+ /* initalize X BEFORE we load config.
+ * (we need to so that 'screen' is set) */
init_X11();
#endif /* X11 */
- /* load current_config or CONFIG_FILE */
+ /* check if specified config file is valid */
+ if (current_config) {
+ struct stat sb;
+ if (stat(current_config, &sb) ||
+ (!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode))) {
+ ERR("invalid configuration file '%s'\n", current_config);
+ free(current_config);
+ current_config = 0;
+ }
+ }
+
+ /* load current_config, CONFIG_FILE or SYSTEM_CONFIG_FILE */
-#ifdef CONFIG_FILE
- if (current_config == NULL) {
+ if (!current_config) {
/* load default config file */
char buf[256];
+ FILE *fp;
- variable_substitute(CONFIG_FILE, buf, 256);
-
- if (buf[0] != '\0')
+ /* Try to use personal config file first */
+ variable_substitute(CONFIG_FILE, buf, sizeof(buf));
+ if (buf[0] && (fp = fopen(buf, "r"))) {
current_config = strdup(buf);
- }
-#endif
+ fclose(fp);
+ }
- if (current_config != NULL && fopen((const char *)current_config, (const char *)"r"))
- load_config_file(current_config);
- else {
- set_default_configurations();
+ /* Try to use system config file if personal config not readable */
+ if (!current_config && (fp = fopen(SYSTEM_CONFIG_FILE, "r"))) {
+ current_config = strdup(SYSTEM_CONFIG_FILE);
+ fclose(fp);
+ }
+
+ /* No readable config found */
+ if (!current_config) {
+ CRIT_ERR("no readable personal or system-wide config file found");
+ }
}
+ load_config_file(current_config);
+
/* init specials array */
- if ((specials = calloc (sizeof(struct special_t), max_specials)) == 0)
- ERR("failed to create specials array");
+ if ((specials = calloc(sizeof(struct special_t), max_specials)) == 0) {
+ ERR("failed to create specials array");
+ }
#ifdef MAIL_FILE
if (current_mail_spool == NULL) {
char buf[256];
+
variable_substitute(MAIL_FILE, buf, 256);
- if (buf[0] != '\0')
+ if (buf[0] != '\0') {
current_mail_spool = strdup(buf);
+ }
}
#endif
/* handle other command line arguments */
-#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) \
+ || defined(__NetBSD__)
optind = optreset = 1;
#else
optind = 0;
#endif
-#if defined(__FreeBSD__)
- if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null",
- O_RDONLY, "kvm_open")) == NULL)
- CRIT_ERR( "cannot read kvm");
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY,
+ "kvm_open")) == NULL) {
+ CRIT_ERR("cannot read kvm");
+ }
#endif
-
+
while (1) {
- int c = getopt(argc,
- argv,
- getopt_string);
- if (c == -1)
+ int c = getopt_long(argc, argv, getopt_string, longopts, NULL);
+
+ if (c == -1) {
break;
+ }
switch (c) {
- case 'd':
- fork_to_background = 1;
- break;
+ case 'd':
+ fork_to_background = 1;
+ break;
#ifdef X11
case 'f':
- set_first_font(optarg);
- break;
+ set_first_font(optarg);
+ break;
case 'a':
text_alignment = string_to_alignment(optarg);
break;
#ifdef OWN_WINDOW
- case 'o':
- own_window = 1;
- break;
+ case 'o':
+ own_window = 1;
+ break;
#endif
#ifdef HAVE_XDBE
- case 'b':
+ case 'b':
use_xdbe = 1;
- break;
+ break;
#endif
#endif /* X11 */
- case 't':
- if (text != original_text)
- free(text);
- text = strdup(optarg);
- convert_escapes(text);
- break;
+ case 't':
+ if (text) {
+ free(text);
+ text = 0;
+ }
+ text = strdup(optarg);
+ convert_escapes(text);
+ break;
- case 'u':
- update_interval = strtod(optarg, 0);
- break;
+ case 'u':
+ update_interval = strtod(optarg, 0);
+ if (info.music_player_interval == 0) {
+ // default to update_interval
+ info.music_player_interval = update_interval;
+ }
+ break;
- case 'i':
- total_run_times = strtod(optarg, 0);
- break;
+ case 'i':
+ total_run_times = strtod(optarg, 0);
+ break;
#ifdef X11
- case 'x':
- gap_x = atoi(optarg);
- break;
+ case 'x':
+ gap_x = atoi(optarg);
+ break;
- case 'y':
- gap_y = atoi(optarg);
- break;
+ case 'y':
+ gap_y = atoi(optarg);
+ break;
#endif /* X11 */
- case '?':
- exit(EXIT_FAILURE);
+ case '?':
+ exit(EXIT_FAILURE);
}
}
/* generate text and get initial size */
extract_variable_text(text);
- if (text != original_text) {
+ if (text) {
free(text);
+ text = 0;
}
text = NULL;
/* fork */
if (fork_to_background) {
int pid = fork();
+
switch (pid) {
- case -1:
- ERR("Conky: couldn't fork() to background: %s", strerror(errno));
- break;
+ case -1:
+ ERR("Conky: couldn't fork() to background: %s",
+ strerror(errno));
+ break;
- case 0:
- /* child process */
- usleep(25000);
- fprintf(stderr,"\n"); fflush(stderr);
- break;
+ case 0:
+ /* child process */
+ usleep(25000);
+ fprintf(stderr, "\n");
+ fflush(stderr);
+ break;
- default:
- /* parent process */
- fprintf(stderr,"Conky: forked to background, pid is %d\n", pid); fflush(stderr);
- return 0;
+ default:
+ /* parent process */
+ fprintf(stderr, "Conky: forked to background, pid is %d\n",
+ pid);
+ fflush(stderr);
+ return 0;
}
}
+ text_buffer = malloc(max_user_text);
+ memset(text_buffer, 0, max_user_text);
+ tmpstring1 = malloc(text_buffer_size);
+ memset(tmpstring1, 0, text_buffer_size);
+ tmpstring2 = malloc(text_buffer_size);
+ memset(tmpstring2, 0, text_buffer_size);
+
#ifdef X11
selected_font = 0;
update_text_area(); /* to get initial size of the window */
- init_window
- (own_window,
- text_width + border_margin * 2 + 1,
- text_height + border_margin * 2 + 1,
- set_transparent, background_colour, argv, argc);
-
+#ifdef OWN_WINDOW
+ init_window(own_window, text_width + border_margin * 2 + 1,
+ text_height + border_margin * 2 + 1, set_transparent, background_colour,
+ argv, argc);
+#else /* OWN_WINDOW */
+ init_window(0, text_width + border_margin * 2 + 1,
+ text_height + border_margin * 2 + 1, set_transparent, 0,
+ argv, argc);
+#endif /* OWN_WINDOW */
+
selected_font = 0;
update_text_area(); /* to position text/window on screen */
#endif /* X11 */
draw_stuff();
#endif /* X11 */
-
/* Set signal handlers */
act.sa_handler = signal_handler;
sigemptyset(&act.sa_mask);
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) );
+ if (sigaction(SIGINT, &act, &oact) < 0
+ || sigaction(SIGUSR1, &act, &oact) < 0
+ || sigaction(SIGHUP,&act,&oact) < 0
+ || sigaction(SIGTERM, &act, &oact) < 0) {
+ ERR("error setting signal handler: %s", strerror(errno));
}
-#ifdef AUDACIOUS
- if (create_audacious_thread() !=0)
- CRIT_ERR("unable to create audacious thread!");
- timed_thread_register (info.audacious.p_timed_thread, &info.audacious.p_timed_thread);
-#endif
+ /* *************** *
+ * MAIN CONKY LOOP *
+ * *************** */
+ main_loop();
- /*
- * ***************
- * MAIN CONKY LOOP
- * ***************
- *
- */
- main_loop();
-
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
kvm_close(kd);
#endif
-
+
return 0;
}
void signal_handler(int sig)
{
- /* signal handler is light as a feather, as it should be.
+ /* signal handler is light as a feather, as it should be.
* we will poll g_signal_pending with each loop of conky
* and do any signal processing there, NOT here. */
- g_signal_pending=sig;
+ g_signal_pending = sig;
}
projects / monky / blobdiff