8 commits

Author	SHA1	Message	Date
Drew DeVault	e1ff88a8d2	Correct typo in swaylock(1)	2017-02-25 12:44:39 -05:00
Fabio Alessandro Locati	b6ea813e01	Improve swaylock man	2017-02-25 17:22:31 +00:00
Calvin Lee	46bd2bb5df	Documentation and style fixes for swaylock	2017-02-21 21:17:01 -07:00
Calvin Lee	34e2c70abc	Feature for #1078: Configurable swaylock colors ... Colors are configured through the command line so that swaylock conforms to the i3lock fork 'github.com/chrjguill/i3lock-color'. Differences from it are that one letter options '-r' and '-s' are not implimentend because '-s' is already used by '--scaling' in swaylock. This commit also fixed whitespace in 'include/swaylock/swaylock.h' and changed `parse_color` in 'common/util.h' so that it can accept colors that do not start with a hash. This was done to keep compatability with the i3lock fork.	2017-02-21 14:12:31 -07:00
Zandr Martin	54d38d3931	add --no-unlock-indicator to swaylock	2016-05-26 10:16:34 -05:00
Nuew	644c13de77	Change 'display' to 'output' in swaylock docs where necessary	2016-03-24 18:49:58 -04:00
Nuew	0aa4383c9a	Add choice of display to --image. ... Additionally - Made background colors display when an image is enabled if a --color is specified. - Link CJson to swaylock. - Add the --socket option to swaylock.	2016-03-24 18:02:34 -04:00
Aaron Ouellette	133009b652	add a manpage for swaylock	2016-03-01 10:23:45 -05:00