}
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[]) {
cfg_opt_t temp_opts[] = {
CFG_STR("format", "%degrees C", CFGF_NONE),
+ CFG_STR("path", NULL, CFGF_NONE),
CFG_END()
};
int interval = cfg_getint(cfg_general, "interval");
while (1) {
+ time_t current_time = time(NULL);
+ struct tm *current_tm = NULL;
+ if (current_time != (time_t) -1)
+ current_tm = localtime(¤t_time);
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"));
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"));
}
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);
}
}