extern/pywal
1
0
Fork 0
mirror of https://github.com/dylanaraps/pywal.git synced 2024-11-25 09:23:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

alpha: Work with -R.

Browse Source
This commit is contained in:
Dylan Araps 2018-05-26 08:59:36 +10:00
parent ac5d62db2f
commit 603276a126
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pywal/__main__.py
View File

@ -142,6 +142,9 @@ def parse_args(parser):
scheme_dir = os.path.join(CACHE_DIR, "schemes") scheme_dir = os.path.join(CACHE_DIR, "schemes")
shutil.rmtree(scheme_dir, ignore_errors=True) shutil.rmtree(scheme_dir, ignore_errors=True)
if args.a:
util.Color.alpha_num = args.a
if args.i: if args.i:
image_file = image.get(args.i, iterative=args.iterative) image_file = image.get(args.i, iterative=args.iterative)
colors_plain = colors.get(image_file, args.l, args.backend) colors_plain = colors.get(image_file, args.l, args.backend)
@ -152,9 +155,6 @@ def parse_args(parser):
if args.R: if args.R:
colors_plain = theme.file(os.path.join(CACHE_DIR, "colors.json")) colors_plain = theme.file(os.path.join(CACHE_DIR, "colors.json"))
if args.a:
util.Color.alpha_num = args.a
if args.b: if args.b:
args.b = "#%s" % (args.b.strip("#")) args.b = "#%s" % (args.b.strip("#"))
colors_plain["special"]["background"] = args.b colors_plain["special"]["background"] = args.b

30
pywal/sequences.py
View File

@ -9,10 +9,8 @@ from .settings import CACHE_DIR, OS
from . import util 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.""" """Convert a hex color to a special sequence."""
alpha = util.Color.alpha_num
if OS == "Darwin": if OS == "Darwin":
return "\033]P%s%s\033\\" % (iterm_name, color.strip("#")) return "\033]P%s%s\033\\" % (iterm_name, color.strip("#"))
@ -41,6 +39,8 @@ def set_iterm_tab_color(color):
def create_sequences(colors): def create_sequences(colors):
"""Create the escape sequences.""" """Create the escape sequences."""
alpha = colors["alpha"]
# Colors 0-15. # Colors 0-15.
sequences = [set_color(index, colors["colors"]["color%s" % index]) sequences = [set_color(index, colors["colors"]["color%s" % index])
for index in range(16)] for index in range(16)]
@ -49,13 +49,15 @@ def create_sequences(colors):
# Source: https://goo.gl/KcoQgP # Source: https://goo.gl/KcoQgP
# 10 = foreground, 11 = background, 12 = cursor foregound # 10 = foreground, 11 = background, 12 = cursor foregound
# 13 = mouse foreground # 13 = mouse foreground
sequences.extend([set_special(10, colors["special"]["foreground"], "g"), sequences.extend([
set_special(11, colors["special"]["background"], "h"), set_special(10, colors["special"]["foreground"], "g"),
set_special(12, colors["special"]["cursor"], "l"), set_special(11, colors["special"]["background"], "h", alpha),
set_special(13, colors["special"]["foreground"], "l"), set_special(12, colors["special"]["cursor"], "l"),
set_special(17, colors["special"]["foreground"], "l"), set_special(13, colors["special"]["foreground"], "l"),
set_special(19, colors["special"]["background"], "l"), set_special(17, colors["special"]["foreground"], "l"),
set_color(232, colors["special"]["background"])]) 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 # 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 # 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[8m # Conceal text.
# \033]708;#000000\033\\ # Garbage sequence. # \033]708;#000000\033\\ # Garbage sequence.
# \033[u # Restore cursor position. # \033[u # Restore cursor position.
sequences.extend(["\033[s\033[1000H\033[8m%s\033[u" % sequences.extend([
set_special(708, colors['special']['background']), "\033[s\033[1000H\033[8m%s\033[u" %
set_special(13, colors["special"]["cursor"], "l")]) set_special(708, colors["special"]["background"], "h", alpha),
set_special(13, colors["special"]["cursor"], "l")
])
if OS == "Darwin": if OS == "Darwin":
sequences += set_iterm_tab_color(colors["special"]["background"]) sequences += set_iterm_tab_color(colors["special"]["background"])