Merge pull request #452 from LoLei/441-new

[Feature] Use last used wallpaper for color generation
This commit is contained in:
black 2019-09-11 21:16:09 +03:00 committed by GitHub
commit d279ed656f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -101,6 +101,9 @@ def get_args():
arg.add_argument("-v", action="store_true",
help="Print \"wal\" version.")
arg.add_argument("-w", action="store_true",
help="Use last used wallpaper for color generation.")
arg.add_argument("-e", action="store_true",
help="Skip reloading gtk/xrdb/i3/sway/polybar")
@ -138,6 +141,7 @@ def parse_args_exit(parser):
if not args.i and \
not args.theme and \
not args.R and \
not args.w and \
not args.backend:
parser.error("No input specified.\n"
"--backend, --theme, -i or -R are required.")
@ -175,6 +179,11 @@ def parse_args(parser):
if args.R:
colors_plain = theme.file(os.path.join(CACHE_DIR, "colors.json"))
if args.w:
cached_wallpaper = util.read_file(os.path.join(CACHE_DIR, "wal"))
colors_plain = colors.get(cached_wallpaper[0], args.l, args.backend,
sat=args.saturate)
if args.b:
args.b = "#%s" % (args.b.strip("#"))
colors_plain["special"]["background"] = args.b