diff options
| -rw-r--r-- | pywal/__main__.py | 6 | ||||
| -rw-r--r-- | pywal/sequences.py | 30 |
2 files changed, 20 insertions, 16 deletions
diff --git a/pywal/__main__.py b/pywal/__main__.py index 214466e..73c2d83 100644 --- a/pywal/__main__.py +++ b/pywal/__main__.py @@ -142,6 +142,9 @@ def parse_args(parser): scheme_dir = os.path.join(CACHE_DIR, "schemes") shutil.rmtree(scheme_dir, ignore_errors=True) + if args.a: + util.Color.alpha_num = args.a + if args.i: image_file = image.get(args.i, iterative=args.iterative) colors_plain = colors.get(image_file, args.l, args.backend) @@ -152,9 +155,6 @@ def parse_args(parser): if args.R: colors_plain = theme.file(os.path.join(CACHE_DIR, "colors.json")) - if args.a: - util.Color.alpha_num = args.a - if args.b: args.b = "#%s" % (args.b.strip("#")) colors_plain["special"]["background"] = args.b diff --git a/pywal/sequences.py b/pywal/sequences.py index 28aab89..b713a6e 100644 --- a/pywal/sequences.py +++ b/pywal/sequences.py @@ -9,10 +9,8 @@ from .settings import CACHE_DIR, OS from . import util -def set_special(index, color, iterm_name="h"): +def set_special(index, color, iterm_name="h", alpha=100): """Convert a hex color to a special sequence.""" - alpha = util.Color.alpha_num - if OS == "Darwin": return "\033]P%s%s\033\\" % (iterm_name, color.strip("#")) @@ -41,6 +39,8 @@ def set_iterm_tab_color(color): def create_sequences(colors): """Create the escape sequences.""" + alpha = colors["alpha"] + # Colors 0-15. sequences = [set_color(index, colors["colors"]["color%s" % index]) for index in range(16)] @@ -49,13 +49,15 @@ def create_sequences(colors): # Source: https://goo.gl/KcoQgP # 10 = foreground, 11 = background, 12 = cursor foregound # 13 = mouse foreground - sequences.extend([set_special(10, colors["special"]["foreground"], "g"), - set_special(11, colors["special"]["background"], "h"), - set_special(12, colors["special"]["cursor"], "l"), - set_special(13, colors["special"]["foreground"], "l"), - set_special(17, colors["special"]["foreground"], "l"), - set_special(19, colors["special"]["background"], "l"), - set_color(232, colors["special"]["background"])]) + sequences.extend([ + set_special(10, colors["special"]["foreground"], "g"), + set_special(11, colors["special"]["background"], "h", alpha), + set_special(12, colors["special"]["cursor"], "l"), + set_special(13, colors["special"]["foreground"], "l"), + set_special(17, colors["special"]["foreground"], "l"), + set_special(19, colors["special"]["background"], "l"), + set_color(232, colors["special"]["background"]) + ]) # This escape sequence doesn't work in VTE terminals and their parsing of # unknown sequences is garbage so we need to use some escape sequence @@ -65,9 +67,11 @@ def create_sequences(colors): # \033[8m # Conceal text. # \033]708;#000000\033\\ # Garbage sequence. # \033[u # Restore cursor position. - sequences.extend(["\033[s\033[1000H\033[8m%s\033[u" % - set_special(708, colors['special']['background']), - set_special(13, colors["special"]["cursor"], "l")]) + sequences.extend([ + "\033[s\033[1000H\033[8m%s\033[u" % + set_special(708, colors["special"]["background"], "h", alpha), + set_special(13, colors["special"]["cursor"], "l") + ]) if OS == "Darwin": sequences += set_iterm_tab_color(colors["special"]["background"]) |