*
* i3status – Generates a status line for dzen2 or xmobar
*
- * Copyright © 2008-2009 Michael Stapelberg and contributors
+ * Copyright © 2008-2011 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>
#include <sys/types.h>
#include <time.h>
#include <sys/time.h>
+#include <locale.h>
#include "i3status.h"
}
static char *get_config_path() {
- /* 1: check for $XDG_CONFIG_HOME/i3/config */
char *xdg_config_home, *xdg_config_dirs, *config_path;
+ /* 1: check the traditional path under the home directory */
+ config_path = resolve_tilde("~/.i3status.conf");
+ if (path_exists(config_path))
+ return config_path;
+
+ /* 2: check for $XDG_CONFIG_HOME/i3status/config */
if ((xdg_config_home = getenv("XDG_CONFIG_HOME")) == NULL)
xdg_config_home = "~/.config";
return config_path;
free(config_path);
- /* 2: check for $XDG_CONFIG_DIRS/i3/config */
+ /* 3: check the traditional path under /etc */
+ config_path = SYSCONFDIR "/i3status.conf";
+ if (path_exists(config_path))
+ return sstrdup(config_path);
+
+ /* 4: check for $XDG_CONFIG_DIRS/i3status/config */
if ((xdg_config_dirs = getenv("XDG_CONFIG_DIRS")) == NULL)
xdg_config_dirs = "/etc/xdg";
}
free(buf);
- /* 3: check traditional paths */
- config_path = resolve_tilde("~/.i3status.conf");
- if (path_exists(config_path))
- return config_path;
-
- config_path = strdup(SYSCONFDIR "/i3status.conf");
- if (!path_exists(config_path))
- die("Neither $XDG_CONFIG_HOME/i3status/config, nor "
- "$XDG_CONFIG_DIRS/i3status/config, nor ~/.i3status.conf nor "
- SYSCONFDIR "/i3status.conf exist.");
-
- return config_path;
+ die("Unable to find the configuration file (looked at "
+ "~/.i3status/config, $XDG_CONFIG_HOME/i3status/config, "
+ "/etc/i3status/config and $XDG_CONFIG_DIRS/i3status/config)");
+ return NULL;
}
int main(int argc, char *argv[]) {
unsigned int j;
cfg_opt_t general_opts[] = {
- CFG_STR("output_format", "dzen2", CFGF_NONE),
+ CFG_STR("output_format", "auto", CFGF_NONE),
CFG_BOOL("colors", 1, CFGF_NONE),
CFG_STR("color_good", "#00FF00", CFGF_NONE),
CFG_STR("color_degraded", "#FFFF00", CFGF_NONE),
CFG_END()
};
+ cfg_opt_t usage_opts[] = {
+ CFG_STR("format", "%usage", CFGF_NONE),
+ CFG_END()
+ };
+
cfg_opt_t temp_opts[] = {
CFG_STR("format", "%degrees C", CFGF_NONE),
+ CFG_STR("path", NULL, CFGF_NONE),
CFG_END()
};
CFG_SEC("time", time_opts, CFGF_NONE),
CFG_SEC("ddate", ddate_opts, CFGF_NONE),
CFG_SEC("load", load_opts, CFGF_NONE),
+ CFG_SEC("cpu_usage", usage_opts, CFGF_NONE),
CFG_END()
};
action.sa_handler = sigpipe;
sigaction(SIGPIPE, &action, NULL);
+ if (setlocale(LC_ALL, "") == NULL)
+ die("Could not set locale. Please make sure all your LC_* / LANG settings are correct.");
+
while ((o = getopt_long(argc, argv, "c:hv", long_options, &option_index)) != -1)
if ((char)o == 'c')
configfile = optarg;
else if ((char)o == 'h') {
- printf("i3status " VERSION " © 2008-2010 Michael Stapelberg and contributors\n"
+ printf("i3status " VERSION " © 2008-2011 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-2010 Michael Stapelberg and contributors\n");
+ printf("i3status " VERSION " © 2008-2011 Michael Stapelberg and contributors\n");
return 0;
}
die("Could not get section \"general\"\n");
char *output_str = cfg_getstr(cfg_general, "output_format");
+ if (strcasecmp(output_str, "auto") == 0) {
+ fprintf(stderr, "i3status: trying to auto-detect output_format setting\n");
+ output_str = auto_detect_format();
+ if (!output_str) {
+ output_str = "none";
+ fprintf(stderr, "i3status: falling back to \"none\"\n");
+ } else {
+ fprintf(stderr, "i3status: auto-detected \"%s\"\n", output_str);
+ }
+ }
+
if (strcasecmp(output_str, "dzen2") == 0)
output_format = O_DZEN2;
else if (strcasecmp(output_str, "xmobar") == 0)
int interval = cfg_getint(cfg_general, "interval");
+ struct tm tm;
while (1) {
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ time_t current_time = tv.tv_sec;
+ struct tm *current_tm = NULL;
+ if (current_time != (time_t) -1) {
+ localtime_r(¤t_time, &tm);
+ current_tm = &tm;
+ }
for (j = 0; j < cfg_size(cfg, "order"); j++) {
if (j > 0)
print_seperator();
print_load(cfg_getstr(sec, "format"));
CASE_SEC("time")
- print_time(cfg_getstr(sec, "format"));
+ print_time(cfg_getstr(sec, "format"), current_tm);
CASE_SEC("ddate")
- print_ddate(cfg_getstr(sec, "format"));
+ print_ddate(cfg_getstr(sec, "format"), current_tm);
CASE_SEC_TITLE("volume")
print_volume(cfg_getstr(sec, "format"),
cfg_getint(sec, "mixer_idx"));
CASE_SEC_TITLE("cpu_temperature")
- print_cpu_temperature_info(atoi(title), cfg_getstr(sec, "format"));
+ print_cpu_temperature_info(atoi(title), cfg_getstr(sec, "path"), cfg_getstr(sec, "format"));
+
+ CASE_SEC("cpu_usage")
+ print_cpu_usage(cfg_getstr(sec, "format"));
}
printf("\n");
fflush(stdout);
* we don’t use sleep(interval) but we sleep until the next
* second (with microsecond precision) plus (interval-1)
* seconds. */
- struct timeval current_time;
- gettimeofday(¤t_time, NULL);
- struct timespec ts = {interval - 1, (10e5 - current_time.tv_usec) * 1000};
+ struct timeval current_timeval;
+ gettimeofday(¤t_timeval, NULL);
+ struct timespec ts = {interval - 1, (10e5 - current_timeval.tv_usec) * 1000};
nanosleep(&ts, NULL);
}
}
projects / i3 / i3status / blobdiff