*
* i3status – Generates a status line for dzen2 or xmobar
*
- * Copyright © 2008-2012 Michael Stapelberg and contributors
+ * Copyright © 2008 Michael Stapelberg and contributors
* Copyright © 2009 Thorsten Toepper <atsutane at freethoughts dot de>
* Copyright © 2010 Axel Wagner <mail at merovius dot de>
* Copyright © 2010 Fernando Tarlá Cardoso Lemos <fernandotcl at gmail dot com>
void **cur_instance;
+pthread_cond_t i3status_sleep_cond = PTHREAD_COND_INITIALIZER;
+pthread_mutex_t i3status_sleep_mutex = PTHREAD_MUTEX_INITIALIZER;
+
/*
* Set the exit_upon_signal flag, because one cannot do anything in a safe
* manner in a signal handler (e.g. fprintf, which we really want to do for
*
*/
static int valid_color(const char *value) {
- if (strlen(value) != 7)
- return 0;
+ const int len = strlen(value);
+
+ if (output_format == O_LEMONBAR) {
+ /* lemonbar supports an optional alpha channel */
+ if (len != strlen("#rrggbb") && len != strlen("#aarrggbb")) {
+ return 0;
+ }
+ } else {
+ if (len != strlen("#rrggbb")) {
+ return 0;
+ }
+ }
if (value[0] != '#')
return 0;
- for (int i = 1; i < 7; ++i) {
+ for (int i = 1; i < len; ++i) {
if (value[i] >= '0' && value[i] <= '9')
continue;
if (value[i] >= 'a' && value[i] <= 'f')
cfg_opt_t run_watch_opts[] = {
CFG_STR("pidfile", NULL, CFGF_NONE),
CFG_STR("format", "%title: %status", CFGF_NONE),
+ CFG_STR("format_down", NULL, CFGF_NONE),
CFG_CUSTOM_ALIGN_OPT,
CFG_CUSTOM_COLOR_OPTS,
CFG_CUSTOM_MIN_WIDTH_OPT,
cfg_opt_t path_exists_opts[] = {
CFG_STR("path", NULL, CFGF_NONE),
CFG_STR("format", "%title: %status", CFGF_NONE),
+ CFG_STR("format_down", NULL, CFGF_NONE),
CFG_CUSTOM_ALIGN_OPT,
CFG_CUSTOM_COLOR_OPTS,
CFG_CUSTOM_MIN_WIDTH_OPT,
if ((char)o == 'c')
configfile = optarg;
else if ((char)o == 'h') {
- printf("i3status " VERSION " © 2008-2012 Michael Stapelberg and contributors\n"
+ printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n"
"Syntax: %s [-c <configfile>] [-h] [-v]\n",
argv[0]);
return 0;
} else if ((char)o == 'v') {
- printf("i3status " VERSION " © 2008-2012 Michael Stapelberg and contributors\n");
+ printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n");
return 0;
}
output_format = O_XMOBAR;
else if (strcasecmp(output_str, "i3bar") == 0)
output_format = O_I3BAR;
+ else if (strcasecmp(output_str, "lemonbar") == 0)
+ output_format = O_LEMONBAR;
else if (strcasecmp(output_str, "term") == 0)
output_format = O_TERM;
else if (strcasecmp(output_str, "none") == 0)
const char *separator = cfg_getstr(cfg_general, "separator");
+ /* lemonbar needs % to be escaped with another % */
+ pct_mark = (output_format == O_LEMONBAR) ? "%%" : "%";
+
// if no custom separator has been provided, use the default one
if (strcasecmp(separator, "default") == 0)
separator = get_default_separator();
char buffer[4096];
void **per_instance = calloc(cfg_size(cfg, "order"), sizeof(*per_instance));
+ pthread_mutex_lock(&i3status_sleep_mutex);
while (1) {
if (exit_upon_signal) {
CASE_SEC_TITLE("run_watch") {
SEC_OPEN_MAP("run_watch");
- print_run_watch(json_gen, buffer, title, cfg_getstr(sec, "pidfile"), cfg_getstr(sec, "format"));
+ print_run_watch(json_gen, buffer, title, cfg_getstr(sec, "pidfile"), cfg_getstr(sec, "format"), cfg_getstr(sec, "format_down"));
SEC_CLOSE_MAP;
}
CASE_SEC_TITLE("path_exists") {
SEC_OPEN_MAP("path_exists");
- print_path_exists(json_gen, buffer, title, cfg_getstr(sec, "path"), cfg_getstr(sec, "format"));
+ print_path_exists(json_gen, buffer, title, cfg_getstr(sec, "path"), cfg_getstr(sec, "format"), cfg_getstr(sec, "format_down"));
SEC_CLOSE_MAP;
}
CASE_SEC("time") {
SEC_OPEN_MAP("time");
- print_time(json_gen, buffer, cfg_getstr(sec, "format"), NULL, tv.tv_sec);
+ print_time(json_gen, buffer, NULL, cfg_getstr(sec, "format"), NULL, tv.tv_sec);
SEC_CLOSE_MAP;
}
CASE_SEC_TITLE("tztime") {
SEC_OPEN_MAP("tztime");
- print_time(json_gen, buffer, cfg_getstr(sec, "format"), cfg_getstr(sec, "timezone"), tv.tv_sec);
+ print_time(json_gen, buffer, title, cfg_getstr(sec, "format"), cfg_getstr(sec, "timezone"), tv.tv_sec);
SEC_CLOSE_MAP;
}
fflush(stdout);
/* To provide updates on every full second (as good as possible)
- * we don’t use sleep(interval) but we sleep until the next
- * second (with microsecond precision) plus (interval-1)
- * seconds. We also align to 60 seconds modulo interval such
+ * we don’t use sleep(interval) but we sleep until the next second.
+ * We also align to 60 seconds modulo interval such
* that we start with :00 on every new minute. */
- struct timeval current_timeval;
- gettimeofday(¤t_timeval, NULL);
- struct timespec ts = {interval - 1 - (current_timeval.tv_sec % interval), (10e5 - current_timeval.tv_usec) * 1000};
- nanosleep(&ts, NULL);
+ struct timespec ts;
+#if defined(__APPLE__)
+ gettimeofday(&tv, NULL);
+ ts.tv_sec = tv.tv_sec;
+#else
+ clock_gettime(CLOCK_REALTIME, &ts);
+#endif
+ ts.tv_sec += interval - (ts.tv_sec % interval);
+ ts.tv_nsec = 0;
+
+ /* Sleep to absolute time 'ts', unless the condition
+ * 'i3status_sleep_cond' is signaled from another thread */
+ pthread_cond_timedwait(&i3status_sleep_cond, &i3status_sleep_mutex, &ts);
}
}