free(buf);
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)");
+ "~/.i3status.conf, $XDG_CONFIG_HOME/i3status/config, "
+ "/etc/i3status.conf and $XDG_CONFIG_DIRS/i3status/config)");
return NULL;
}
cfg_opt_t battery_opts[] = {
CFG_STR("format", "%status %percentage %remaining", CFGF_NONE),
+ CFG_STR("path", "/sys/class/power_supply/BAT%d/uevent", CFGF_NONE),
CFG_BOOL("last_full_capacity", false, CFGF_NONE),
CFG_END()
};
};
cfg_opt_t load_opts[] = {
- CFG_STR("format", "%5min %10min %15min", CFGF_NONE),
+ CFG_STR("format", "%1min %5min %15min", CFGF_NONE),
CFG_END()
};
};
cfg_opt_t opts[] = {
- CFG_STR_LIST("order", "{ipv6,\"run_watch DHCP\",\"wireless wlan0\",\"ethernet eth0\",\"battery 0\",\"cpu_temperature 0\",load,time}", CFGF_NONE),
+ CFG_STR_LIST("order", "{}", CFGF_NONE),
CFG_SEC("general", general_opts, CFGF_NONE),
CFG_SEC("run_watch", run_watch_opts, CFGF_TITLE | CFGF_MULTI),
CFG_SEC("wireless", wireless_opts, CFGF_TITLE | CFGF_MULTI),
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;
}
if (configfile == NULL)
configfile = get_config_path();
- cfg = cfg_init(opts, CFGF_NONE);
+ cfg = cfg_init(opts, CFGF_NOCASE);
if (cfg_parse(cfg, configfile) == CFG_PARSE_ERROR)
return EXIT_FAILURE;
+ if (cfg_size(cfg, "order") == 0)
+ die("Your 'order' array is empty. Please fix your config.\n");
+
cfg_general = cfg_getsec(cfg, "general");
if (cfg_general == NULL)
die("Could not get section \"general\"\n");
output_format = O_DZEN2;
else if (strcasecmp(output_str, "xmobar") == 0)
output_format = O_XMOBAR;
+ else if (strcasecmp(output_str, "i3bar") == 0)
+ output_format = O_I3BAR;
else if (strcasecmp(output_str, "none") == 0)
output_format = O_NONE;
else die("Unknown output format: \"%s\"\n", output_str);
|| !valid_color(cfg_getstr(cfg_general, "color_separator")))
die("Bad color format");
+ if (output_format == O_I3BAR) {
+ /* Initialize the i3bar protocol. See i3/docs/i3bar-protocol
+ * for details. */
+ printf("{\"version\":1}\n[\n");
+ }
+
if ((general_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
die("Could not create socket\n");
struct tm tm;
while (1) {
- time_t current_time = time(NULL);
+ 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;
}
+ if (output_format == O_I3BAR)
+ printf("[");
for (j = 0; j < cfg_size(cfg, "order"); j++) {
if (j > 0)
print_seperator();
print_eth_info(title, cfg_getstr(sec, "format_up"), cfg_getstr(sec, "format_down"));
CASE_SEC_TITLE("battery")
- print_battery_info(atoi(title), cfg_getstr(sec, "format"), cfg_getbool(sec, "last_full_capacity"));
+ print_battery_info(atoi(title), cfg_getstr(sec, "path"), cfg_getstr(sec, "format"), cfg_getbool(sec, "last_full_capacity"));
CASE_SEC_TITLE("run_watch")
print_run_watch(title, cfg_getstr(sec, "pidfile"), cfg_getstr(sec, "format"));
CASE_SEC("cpu_usage")
print_cpu_usage(cfg_getstr(sec, "format"));
}
+ if (output_format == O_I3BAR)
+ printf("],");
printf("\n");
fflush(stdout);