afiw/cwm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'xdg' into mistress

Browse source
This commit is contained in:
cælōrum spectātrīx 2026-01-28 16:32:31 +01:00
commit 8e794ae50f
3 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
conf.c
View file

@ -283,6 +283,7 @@ void
conf_init(struct conf *c) conf_init(struct conf *c)
{ {
const char *home; const char *home;
char *xdg_config_home;
struct passwd *pw; struct passwd *pw;
unsigned int i; unsigned int i;
@ -326,7 +327,11 @@ conf_init(struct conf *c)
else else
home = "/"; home = "/";
} }
xasprintf(&c->conf_file, "%s/%s", home, ".cwmrc"); 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->known_hosts, "%s/%s", home, ".ssh/known_hosts"); xasprintf(&c->known_hosts, "%s/%s", home, ".ssh/known_hosts");
} }

20
cwm.1
View file

@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd $Mdocdate: July 20 2023 $ .Dd $Mdocdate: January 25 2026 $
.Dt CWM 1 .Dt CWM 1
.Os .Os
.Sh NAME .Sh NAME
@ -39,7 +39,7 @@ Specify an alternative configuration file.
By default, By default,
.Nm .Nm
loads loads
.Pa ~/.cwmrc , .Pa $XDG_CONFIG_HOME/cwm/cwmrc ,
if present. if present.
Any error messages from lines in the configuration file will be sent to Any error messages from lines in the configuration file will be sent to
.Em stderr ; .Em stderr ;
@ -255,16 +255,21 @@ Show list of applications as defined in the configuration file.
Selecting an item will spawn that application. Selecting an item will spawn that application.
.El .El
.Sh ENVIRONMENT .Sh ENVIRONMENT
.Bl -tag -width "DISPLAYXXX" -compact .Bl -tag -width "XDG_CONFIG_HOME" -compact
.It DISPLAY .It Ev DISPLAY
.Nm .Nm
starts on this display unless the starts on this display unless the
.Fl d .Fl d
option is given. 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 .El
.Sh FILES .Sh FILES
.Bl -tag -width "~/.cwmrcXX" -compact .Bl -tag -width "$XDG_CONFIG_HOME/cwm/cwmrc" -compact
.It Pa ~/.cwmrc .It Pa $XDG_CONFIG_HOME/cwm/cwmrc
Default Default
.Nm .Nm
configuration file. configuration file.
@ -289,6 +294,7 @@ was developed by
with contributions from with contributions from
.An Andy Adamson Aq dros@monkey.org , .An Andy Adamson Aq dros@monkey.org ,
.An Niels Provos Aq provos@monkey.org , .An Niels Provos Aq provos@monkey.org ,
.An Antti Nyk\(:anen Aq aon@iki.fi ,
and and
.An Antti Nyk\(:anen Aq aon@iki.fi . .An Lilianna Smólska Aq afiw@linuxposting.xyz .
Ideas, discussion with many others. Ideas, discussion with many others.

14
cwmrc.5
View file

@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd $Mdocdate: August 20 2025 $ .Dd $Mdocdate: January 25 2026 $
.Dt CWMRC 5 .Dt CWMRC 5
.Os .Os
.Sh NAME .Sh NAME
@ -452,9 +452,17 @@ Move pointer 10 times
.Ar moveamount .Ar moveamount
pixels left. pixels left.
.El .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/cwm/
is used as the value.
.El
.Sh FILES .Sh FILES
.Bl -tag -width "~/.cwmrcXXX" -compact .Bl -tag -width "$XDG_CONFIG_HOME/cwm/cwmrc" -compact
.It Pa ~/.cwmrc .It Pa $XDG_CONFIG_HOME/cwm/cwmrc
Default Default
.Xr cwm 1 .Xr cwm 1
configuration file. configuration file.