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.
This commit is contained in:
Nuew 2016-03-24 18:02:34 -04:00
parent dcf5c67681
commit 0aa4383c9a
3 changed files with 131 additions and 36 deletions

View file

@ -23,10 +23,11 @@ Options
Show help message and quit.
*-c, \--color* <rrggbb[aa]>::
Turn the screen into the given color instead of white.
Turn the screen into the given color instead of white. If an image is in use,
also enables color display.
*-i, \--image* <path>::
Display the given image.
*-i, \--image* [<display>:]<path>::
Display the given image, optionally only on the given display.
*-s, \--scaling*::
Scaling mode for images: stretch, fill, fit, center, or tile.
@ -37,6 +38,11 @@ Options
*-v, \--version*::
Show the version number and quit.
*--socket <path>*::
Use the specified socket path. Otherwise, swaymsg will ask sway where the
socket is (which is the value of $SWAYSOCK, then of $I3SOCK).
Authors
-------