marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don’t use a default setting for 'order'

Browse Source 
This will make i3status depend on a useful configuration file (so
/etc/i3status.conf has to be installed) to actually output anything.

However, it fixes a very common error: people edit their i3status.conf and
don’t get that the first order directive has to use =, not +=. Since order is
now empty by default, you can use += everywhere.
This commit is contained in:
Michael Stapelberg 2011-10-10 20:29:44 +01:00
parent 9429d93a7e
commit 692f0124a3
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
i3status.c
View File

@ -253,7 +253,7 @@ int main(int argc, char *argv[]) {
}; };
cfg_opt_t opts[] = { 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("general", general_opts, CFGF_NONE),
CFG_SEC("run_watch", run_watch_opts, CFGF_TITLE | CFGF_MULTI), CFG_SEC("run_watch", run_watch_opts, CFGF_TITLE | CFGF_MULTI),
CFG_SEC("wireless", wireless_opts, CFGF_TITLE | CFGF_MULTI), CFG_SEC("wireless", wireless_opts, CFGF_TITLE | CFGF_MULTI),
@ -307,6 +307,9 @@ int main(int argc, char *argv[]) {
if (cfg_parse(cfg, configfile) == CFG_PARSE_ERROR) if (cfg_parse(cfg, configfile) == CFG_PARSE_ERROR)
return EXIT_FAILURE; 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"); cfg_general = cfg_getsec(cfg, "general");
if (cfg_general == NULL) if (cfg_general == NULL)
die("Could not get section \"general\"\n"); die("Could not get section \"general\"\n");

2
i3status.conf
View File

@ -3,7 +3,7 @@ general {
interval = 5 interval = 5
} }
order = "ipv6" order += "ipv6"
order += "disk /" order += "disk /"
order += "run_watch DHCP" order += "run_watch DHCP"
order += "run_watch VPN" order += "run_watch VPN"

2
man/i3status.man
View File

@ -51,7 +51,7 @@ general {
interval = 5 interval = 5
} }
order = "ipv6" order += "ipv6"
order += "disk /" order += "disk /"
order += "run_watch DHCP" order += "run_watch DHCP"
order += "run_watch VPN" order += "run_watch VPN"