* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
/* debugging level, used by logging.h */
int global_debug_level = 0;
+/* disable inotify auto reload feature if desired */
+int disable_auto_reload = 0;
+
/* two strings for internal use */
static char *tmpstring1, *tmpstring2;
# ifdef XFT
" * Xft\n"
# endif /* XFT */
+# ifdef USE_ARGB
+ " * ARGB visual\n"
+# endif /* USE_ARGB */
#endif /* X11 */
"\n Music detection:\n"
#ifdef AUDACIOUS
/* alignments */
enum alignment {
- TOP_LEFT = 1,
+ ALIGNMENT_ERROR,
+ TOP_LEFT,
TOP_RIGHT,
TOP_MIDDLE,
BOTTOM_LEFT,
/* fork? */
static int fork_to_background;
+/* set to 0 after the first time conky is run, so we don't fork again after the
+ * first forking */
+static int first_pass = 1;
+
static int cpu_avg_samples, net_avg_samples, diskio_avg_samples;
/* filenames for output */
}
fclose(where);
} else {
- NORM_ERR("Could not open the file");
+ NORM_ERR("Could not open the file '%s'", f);
}
return ret;
}
#define SECRIT_MULTILINE_CHAR '\x02'
-static inline int calc_text_width(const char *s)
+int calc_text_width(const char *s)
{
size_t slen = strlen(s);
get_acpi_fan(p, p_max_size);
}
OBJ(acpiacadapter) {
- get_acpi_ac_adapter(p, p_max_size);
+ get_acpi_ac_adapter(p, p_max_size, (const char *)obj->data.opaque);
}
OBJ(battery) {
get_battery_stuff(p, p_max_size, obj->data.s, BATTERY_STATUS);
print_cmdline_to_pid(obj, p, p_max_size);
}
OBJ(cpu) {
- if (obj->data.i > info.cpu_count) {
- NORM_ERR("obj->data.i %i info.cpu_count %i",
- obj->data.i, info.cpu_count);
- CRIT_ERR(NULL, NULL, "attempting to use more CPUs than you have!");
- }
- percent_print(p, p_max_size,
+ if (cur->cpu_usage) {
+ if (obj->data.i > info.cpu_count) {
+ NORM_ERR("obj->data.i %i info.cpu_count %i",
+ obj->data.i, info.cpu_count);
+ CRIT_ERR(NULL, NULL, "attempting to use more CPUs than you have!");
+ }
+ percent_print(p, p_max_size,
round_to_int(cur->cpu_usage[obj->data.i] * 100.0));
+ }
}
OBJ(cpugauge)
new_gauge(obj, p, p_max_size, round_to_int(cur->cpu_usage[obj->data.i] * 255.0));
print_diskiograph(obj, p, p_max_size);
}
OBJ(diskiograph_read) {
- print_diskiograph(obj, p, p_max_size);
+ print_diskiograph_read(obj, p, p_max_size);
}
OBJ(diskiograph_write) {
- print_diskiograph(obj, p, p_max_size);
+ print_diskiograph_write(obj, p, p_max_size);
}
#endif /* X11 */
OBJ(downspeed) {
DO_JUMP;
} else if (spc) {
*spc = '\0';
- if (check_contains(obj->data.s, spc + 1))
+ if (!check_contains(obj->data.s, spc + 1))
DO_JUMP;
*spc = ' ';
}
tmp_info = malloc(sizeof(struct information));
memcpy(tmp_info, &info, sizeof(struct information));
parse_conky_vars(&subroot, text, p, p_max_size, tmp_info);
- DBGP("evaluated '%s' to '%s'", text, p);
+ DBGP2("evaluated '%s' to '%s'", text, p);
free_text_objects(&subroot, 1);
free(tmp_info);
update_interval_old = interval;
}
-static inline int get_string_width(const char *s)
+int get_string_width(const char *s)
{
return *s ? calc_text_width(s) : 0;
}
static int text_size_updater(char *s, int special_index)
{
int w = 0;
+ int lw;
+ int contain_SECRIT_MULTILINE_CHAR = 0;
char *p;
if ((output_methods & TO_X) == 0)
special_index++;
s = p + 1;
} else if (*p == SECRIT_MULTILINE_CHAR) {
- int lw;
+ contain_SECRIT_MULTILINE_CHAR = 1;
*p = '\0';
lw = get_string_width(s);
*p = SECRIT_MULTILINE_CHAR;
}
p++;
}
- w += get_string_width(s);
+ /* Check also last substring if string contains SECRIT_MULTILINE_CHAR */
+ if (contain_SECRIT_MULTILINE_CHAR) {
+ lw = get_string_width(s);
+ w = lw > w ? lw : w;
+ } else {
+ w += get_string_width(s);
+ }
if (w > text_width) {
text_width = w;
}
{
#ifdef X11
if (output_methods & TO_X) {
- current_color = c;
- XSetForeground(display, window.gc, c);
+#ifdef USE_ARGB
+ if (have_argb_visual) {
+ current_color = c | (own_window_argb_value << 24);
+ } else {
+#endif /* USE_ARGB */
+ current_color = c;
+#ifdef USE_ARGB
+ }
+#endif /* USE_ARGB */
+ XSetForeground(display, window.gc, current_color);
}
#endif /* X11 */
#ifdef NCURSES
XftColor c2;
c.pixel = current_color;
- XQueryColor(display, DefaultColormap(display, screen), &c);
+ // query color on custom colormap
+ XQueryColor(display, window.colourmap, &c);
c2.pixel = c.pixel;
c2.color.red = c.red;
if (seconds != 0) {
timeunits = seconds / 86400; seconds %= 86400;
if (timeunits > 0) {
- asprintf(&tmp_day_str, "%dd", timeunits);
+ if (asprintf(&tmp_day_str, "%dd", timeunits) < 0) {
+ tmp_day_str = 0;
+ }
} else {
tmp_day_str = strdup("");
}
timeunits = seconds / 3600; seconds %= 3600;
if (timeunits > 0) {
- asprintf(&tmp_hour_str, "%dh", timeunits);
+ if (asprintf(&tmp_hour_str, "%dh", timeunits) < 0) {
+ tmp_day_str = 0;
+ }
} else {
tmp_hour_str = strdup("");
}
timeunits = seconds / 60; seconds %= 60;
if (timeunits > 0) {
- asprintf(&tmp_min_str, "%dm", timeunits);
+ if (asprintf(&tmp_min_str, "%dm", timeunits) < 0) {
+ tmp_min_str = 0;
+ }
} else {
tmp_min_str = strdup("");
}
if (seconds > 0) {
- asprintf(&tmp_sec_str, "%ds", seconds);
+ if (asprintf(&tmp_sec_str, "%ds", seconds) < 0) {
+ tmp_sec_str = 0;
+ }
} else {
tmp_sec_str = strdup("");
}
- asprintf(&tmp_str, "%s%s%s%s", tmp_day_str, tmp_hour_str, tmp_min_str, tmp_sec_str);
- free(tmp_day_str); free(tmp_hour_str); free(tmp_min_str); free(tmp_sec_str);
+ if (asprintf(&tmp_str, "%s%s%s%s", tmp_day_str,
+ tmp_hour_str, tmp_min_str, tmp_sec_str) < 0) {
+ tmp_str = 0;
+ }
+#define FREE(a) if ((a)) free((a));
+ FREE(tmp_day_str); FREE(tmp_hour_str); FREE(tmp_min_str); FREE(tmp_sec_str);
} else {
- asprintf(&tmp_str, "Range not possible"); // should never happen, but better safe then sorry
+ tmp_str = strdup("Range not possible"); /* should never happen, but better safe then sorry */
}
cur_x += (w / 2) - (font_ascent() * (strlen(tmp_str) / 2));
cur_y += font_h / 2;
draw_string(tmp_str);
- free(tmp_str);
+ FREE(tmp_str);
+#undef FREE
cur_x = tmp_x;
cur_y = tmp_y;
}
draw_stuff(); /* redraw everything in our newly sized window */
XResizeWindow(display, window.window, window.width,
window.height); /* resize window */
- set_transparent_background(window.window);
+ set_transparent_background(window.window, own_window_argb_value);
#ifdef HAVE_XDBE
/* swap buffers */
xdbe_swap_buffers();
#ifdef OWN_WINDOW
case ReparentNotify:
- /* set background to ParentRelative for all parents */
+ /* make background transparent */
if (own_window) {
- set_transparent_background(window.window);
+ set_transparent_background(window.window, own_window_argb_value);
}
break;
break;
}
#ifdef HAVE_SYS_INOTIFY_H
- if (inotify_fd != -1 && inotify_config_wd == -1 && current_config != 0) {
+ if (!disable_auto_reload && inotify_fd != -1 && inotify_config_wd == -1 && current_config != 0) {
inotify_config_wd = inotify_add_watch(inotify_fd,
current_config,
IN_MODIFY);
}
- if (inotify_fd != -1 && inotify_config_wd != -1 && current_config != 0) {
+ if (!disable_auto_reload && inotify_fd != -1 && inotify_config_wd != -1 && current_config != 0) {
int len = 0, idx = 0;
fd_set descriptors;
struct timeval time_to_wait;
current_config,
IN_MODIFY);
}
+ break;
}
#ifdef HAVE_LUA
else {
idx += INOTIFY_EVENT_SIZE + ev->len;
}
}
+ } else if (disable_auto_reload && inotify_fd != -1) {
+ inotify_rm_watch(inotify_fd, inotify_config_wd);
+ close(inotify_fd);
+ inotify_fd = inotify_config_wd = 0;
}
#endif /* HAVE_SYS_INOTIFY_H */
#endif /* HAVE_LUA */
g_signal_pending = 0;
}
- clean_up(NULL, NULL);
+ clean_up(current_mail_spool, NULL);
#ifdef HAVE_SYS_INOTIFY_H
if (inotify_fd != -1) {
{
char *current_config_copy = strdup(current_config);
clean_up(NULL, NULL);
+ sleep(1); /* slight pause */
current_config = current_config_copy;
initialisation(argc_copy, argv_copy);
}
{
int i;
+ free_update_callbacks();
+
#ifdef NCURSES
if(output_methods & TO_NCURSES) {
endwin();
#endif /* X11 */
- free_update_callbacks();
-
free_templates();
free_text_objects(&global_root_object, 0);
} else if (strcasecmp(s, "none") == EQUAL) {
return NONE;
}
- return TOP_LEFT;
+ return ALIGNMENT_ERROR;
}
#endif /* X11 */
output_methods = TO_STDOUT;
#endif
#ifdef X11
+#ifdef BUILD_XFT
+ use_xft = 0;
+#endif
show_graph_scale = 0;
show_graph_range = 0;
draw_shades = 1;
window.hints = 0;
strcpy(window.class_name, PACKAGE_NAME);
sprintf(window.title, PACKAGE_NAME" (%s)", info.uname_s.nodename);
+#ifdef USE_ARGB
+ use_argb_visual = 0;
+ own_window_argb_value = 255;
+#endif
#endif
stippled_borders = 0;
window.border_inner_margin = 3;
text_alignment = BOTTOM_LEFT;
info.x11.monitor.number = 1;
info.x11.monitor.current = 0;
- info.x11.desktop.current = 1;
+ info.x11.desktop.current = 1;
info.x11.desktop.number = 1;
info.x11.desktop.nitems = 0;
- info.x11.desktop.all_names = NULL;
- info.x11.desktop.name = NULL;
+ info.x11.desktop.all_names = NULL;
+ info.x11.desktop.name = NULL;
#endif /* X11 */
free_templates();
XMoveWindow(display, window.window, window.x, window.y);
}
if (own_window) {
- set_transparent_background(window.window);
+ set_transparent_background(window.window, own_window_argb_value);
}
#endif
return 0;
}
+#ifdef X11
+void setalignment(int* ltext_alignment, unsigned int windowtype, const char* value, const char *f, int line, char setbyconffile) {
+#ifdef OWN_WINDOW
+ if (windowtype == TYPE_DOCK) {
+ NORM_ERR("alignment is disabled when own_window_type is dock");
+ } else
+#endif /*OWN_WINDOW */
+ if (value) {
+ int a = string_to_alignment(value);
+
+ if (a <= 0) {
+ if (setbyconffile) {
+ CONF_ERR;
+ } else NORM_ERR("'%s' is not a alignment setting", value);
+ } else {
+ *ltext_alignment = a;
+ }
+ } else if (setbyconffile) {
+ CONF_ERR;
+ }
+}
+#endif /* X11 */
+
char load_config_file(const char *f)
{
int line = 0;
}
}
CONF("alignment") {
-#ifdef OWN_WINDOW
- if (window.type == TYPE_DOCK)
- ;
- else
-#endif /*OWN_WINDOW */
- if (value) {
- int a = string_to_alignment(value);
-
- if (a <= 0) {
- CONF_ERR;
- } else {
- text_alignment = a;
- }
- } else {
- CONF_ERR;
- }
+ setalignment(&text_alignment, window.type, value, f, line, 1);
}
CONF("background") {
fork_to_background = string_to_bool(value);
CONF("border_width") {
if (value) {
window.border_width = strtol(value, 0, 0);
- if (window.border_width < 0) window.border_width = 0;
+ if (window.border_width < 1) window.border_width = 1;
} else {
CONF_ERR;
}
CONF("extra_newline") {
extra_newline = string_to_bool(value);
}
+ CONF("disable_auto_reload") {
+ disable_auto_reload = string_to_bool(value);
+ }
CONF("out_to_stderr") {
if(string_to_bool(value))
output_methods |= TO_STDERR;
CONF_ERR;
}
}
+#ifdef USE_ARGB
+ CONF("own_window_argb_visual") {
+ use_argb_visual = string_to_bool(value);
+ }
+ CONF("own_window_argb_value") {
+ own_window_argb_value = strtol(value, 0, 0);
+ if (own_window_argb_value > 255 || own_window_argb_value < 0) {
+ CONF_ERR2("own_window_argb_value must be <= 255 and >= 0");
+ }
+ }
+#endif /* USE_ARGB */
#endif
CONF("stippled_borders") {
if (value) {
static const struct option longopts[] = {
{ "help", 0, NULL, 'h' },
{ "version", 0, NULL, 'V' },
+ { "quiet", 0, NULL, 'q' },
{ "debug", 0, NULL, 'D' },
{ "config", 1, NULL, 'c' },
#ifdef CONFIG_OUTPUT
{ "window-id", 1, NULL, 'w' },
#endif /* X11 */
{ "text", 1, NULL, 't' },
- { "interval", 0, NULL, 'u' },
- { "pause", 0, NULL, 'p' },
+ { "interval", 1, NULL, 'u' },
+ { "pause", 1, NULL, 'p' },
{ 0, 0, 0, 0 }
};
+void set_current_config(void);
+void set_current_config(void)
+{
+ /* 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))) {
+ NORM_ERR("invalid configuration file '%s'\n", current_config);
+ free(current_config);
+ current_config = 0;
+ }
+ }
+
+ /* load current_config, CONFIG_FILE or SYSTEM_CONFIG_FILE */
+
+ if (!current_config) {
+ /* load default config file */
+ char buf[DEFAULT_TEXT_BUFFER_SIZE];
+ FILE *fp;
+
+ /* Try to use personal config file first */
+ to_real_path(buf, CONFIG_FILE);
+ if (buf[0] && (fp = fopen(buf, "r"))) {
+ current_config = strndup(buf, max_user_text);
+ fclose(fp);
+ }
+
+ /* Try to use system config file if personal config not readable */
+ if (!current_config && (fp = fopen(SYSTEM_CONFIG_FILE, "r"))) {
+ current_config = strndup(SYSTEM_CONFIG_FILE, max_user_text);
+ fclose(fp);
+ }
+
+ /* No readable config found */
+ if (!current_config) {
+#define NOCFGFILEFOUND "no readable personal or system-wide config file found"
+#ifdef BUILD_BUILTIN_CONFIG
+ current_config = strdup("==builtin==");
+ NORM_ERR(NOCFGFILEFOUND
+ ", using builtin default");
+#else
+ CRIT_ERR(NULL, NULL, NOCFGFILEFOUND);
+#endif /* ! CONF_OUTPUT */
+ }
+ }
+}
+
void initialisation(int argc, char **argv) {
struct sigaction act, oact;
set_default_configurations();
+ set_current_config();
load_config_file(current_config);
currentconffile = conftree_add(currentconffile, current_config);
set_first_font(optarg);
break;
case 'a':
- text_alignment = string_to_alignment(optarg);
+ setalignment(&text_alignment, window.type, optarg, NULL, 0, 0);
break;
#ifdef OWN_WINDOW
break;
#endif /* X11 */
case 'p':
- startup_pause = atoi(optarg);
- sleep(startup_pause);
+ if (first_pass) {
+ startup_pause = atoi(optarg);
+ sleep(startup_pause);
+ }
break;
case '?':
}
global_text = NULL;
/* fork */
- if (fork_to_background) {
+ if (fork_to_background && first_pass) {
int pid = fork();
switch (pid) {
current_config = strndup(optarg, max_user_text);
break;
case 'q':
- freopen("/dev/null", "w", stderr);
+ if (!freopen("/dev/null", "w", stderr)) {
+ NORM_ERR("unable to redirect stderr to /dev/null");
+ }
break;
case 'h':
print_help(argv[0]);
}
}
- /* 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))) {
- NORM_ERR("invalid configuration file '%s'\n", current_config);
- free(current_config);
- current_config = 0;
- }
- }
-
- /* load current_config, CONFIG_FILE or SYSTEM_CONFIG_FILE */
-
- if (!current_config) {
- /* load default config file */
- char buf[DEFAULT_TEXT_BUFFER_SIZE];
- FILE *fp;
-
- /* Try to use personal config file first */
- to_real_path(buf, CONFIG_FILE);
- if (buf[0] && (fp = fopen(buf, "r"))) {
- current_config = strndup(buf, max_user_text);
- fclose(fp);
- }
-
- /* Try to use system config file if personal config not readable */
- if (!current_config && (fp = fopen(SYSTEM_CONFIG_FILE, "r"))) {
- current_config = strndup(SYSTEM_CONFIG_FILE, max_user_text);
- fclose(fp);
- }
-
- /* No readable config found */
- if (!current_config) {
-#ifdef CONFIG_OUTPUT
- current_config = strdup("==builtin==");
- NORM_ERR("no readable personal or system-wide config file found,"
- " using builtin default");
-#else
- CRIT_ERR(NULL, NULL, "no readable personal or system-wide config file found");
-#endif /* ! CONF_OUTPUT */
- }
- }
+ set_current_config();
#ifdef XOAP
/* Load xoap keys, if existing */
#endif /* XOAP */
#ifdef HAVE_SYS_INOTIFY_H
- inotify_fd = inotify_init1(IN_NONBLOCK);
+ inotify_fd = inotify_init();
+ if(inotify_fd != -1) {
+ int fl;
+
+ fl = fcntl(inotify_fd, F_GETFL);
+ fcntl(inotify_fd, F_SETFL, fl | O_NONBLOCK);
+ }
#endif /* HAVE_SYS_INOTIFY_H */
initialisation(argc, argv);
+ first_pass = 0; /* don't ever call fork() again */
+
main_loop();
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
projects / monky / blobdiff