diff --git a/GNUmakefile b/GNUmakefile index 78c4bc0..95afec1 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -16,4 +16,6 @@ $(PROG): $(OBJS) .PHONY: clean clean: - rm -f $(OBJS) parse.c + rm -f $(OBJS) + +.PRECIOUS: parse.c diff --git a/conf.c b/conf.c index 6f44650..83a3d34 100644 --- a/conf.c +++ b/conf.c @@ -283,7 +283,6 @@ void conf_init(struct conf *c) { const char *home; - char *xdg_config_home; struct passwd *pw; unsigned int i; @@ -327,11 +326,7 @@ conf_init(struct conf *c) else home = "/"; } - xdg_config_home = getenv("XDG_CONFIG_HOME"); - if ((xdg_config_home == NULL) || (*xdg_config_home == '\0')) - xasprintf(&c->conf_file, "%s/%s", home, ".config/cwm/cwmrc"); - else - xasprintf(&c->conf_file, "%s/%s", xdg_config_home, "cwm/cwmrc"); + xasprintf(&c->conf_file, "%s/%s", home, ".cwmrc"); xasprintf(&c->known_hosts, "%s/%s", home, ".ssh/known_hosts"); } diff --git a/cwm.1 b/cwm.1 index 5966f73..107e0b4 100644 --- a/cwm.1 +++ b/cwm.1 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 25 2026 $ +.Dd $Mdocdate: July 20 2023 $ .Dt CWM 1 .Os .Sh NAME @@ -39,7 +39,7 @@ Specify an alternative configuration file. By default, .Nm loads -.Pa $XDG_CONFIG_HOME/cwm/cwmrc , +.Pa ~/.cwmrc , if present. Any error messages from lines in the configuration file will be sent to .Em stderr ; @@ -255,21 +255,16 @@ Show list of applications as defined in the configuration file. Selecting an item will spawn that application. .El .Sh ENVIRONMENT -.Bl -tag -width "XDG_CONFIG_HOME" -compact -.It Ev DISPLAY +.Bl -tag -width "DISPLAYXXX" -compact +.It DISPLAY .Nm starts on this display unless the .Fl d option is given. -.It Ev XDG_CONFIG_HOME -determines the default location of the configuration file. -If unset or empty, -.Pa ~/.config/cwm/ -is used as the value. .El .Sh FILES -.Bl -tag -width "$XDG_CONFIG_HOME/cwm/cwmrc" -compact -.It Pa $XDG_CONFIG_HOME/cwm/cwmrc +.Bl -tag -width "~/.cwmrcXX" -compact +.It Pa ~/.cwmrc Default .Nm configuration file. @@ -294,7 +289,6 @@ was developed by with contributions from .An Andy Adamson Aq dros@monkey.org , .An Niels Provos Aq provos@monkey.org , -.An Antti Nyk\(:anen Aq aon@iki.fi , and -.An Lilianna Smólska Aq afiw@linuxposting.xyz . +.An Antti Nyk\(:anen Aq aon@iki.fi . Ideas, discussion with many others. diff --git a/cwmrc.5 b/cwmrc.5 index 9b37cc8..6329663 100644 --- a/cwmrc.5 +++ b/cwmrc.5 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 25 2026 $ +.Dd $Mdocdate: August 20 2025 $ .Dt CWMRC 5 .Os .Sh NAME @@ -452,17 +452,9 @@ Move pointer 10 times .Ar moveamount pixels left. .El -.Sh ENVIRONMENT -.Bl -tag -width "XDG_CONFIG_HOME" -compact -.It Ev XDG_CONFIG_HOME -determines the default location of the configuration file. -If unset or empty, -.Pa ~/.config/ -is used as the value. -.El .Sh FILES -.Bl -tag -width "$XDG_CONFIG_HOME/cwm/cwmrc" -compact -.It Pa $XDG_CONFIG_HOME/cwm/cwmrc +.Bl -tag -width "~/.cwmrcXXX" -compact +.It Pa ~/.cwmrc Default .Xr cwm 1 configuration file.