Skip to content

Commit b380c12

Browse files
luisbocanegraluisbocanegra
authored
Merge pull request #57 from luisbocanegra/dev
Generate intense and faint color variants for terminal, support for f…
2 parents 1935e73 + 592db0b commit b380c12

File tree

2 files changed

+94
-34
lines changed

2 files changed

+94
-34
lines changed

‎schemeconfigs.py

Lines changed: 82 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,56 @@ def __init__(self, colors, wallpaper_data, light_blend_multiplier=1, dark_blend_
1010
dbm = range_check(dark_blend_multiplier,0,4)
1111

1212
tone = 30
13-
pywal_colors_dark = ()
13+
1414
pywal_colors_dark = (blendColors(
1515
tones_neutral['8'], colors['dark']['Primary'], .01),)
16+
pywal_colors_dark_intense = (blendColors(
17+
colors['dark']['OnSurface'], colors['dark']['Secondary'], .7),)
18+
pywal_colors_dark_faint = (blendColors(
19+
colors['dark']['OnSurface'], colors['dark']['Secondary'], .35),)
20+
1621
for x in range(7):
1722
str_x = str(x)
1823
if str_x in colors_best.keys():
1924
pywal_colors_dark += (blendColors(
2025
colors['dark']['OnSurface'], colors_best[str_x], .55),)
26+
pywal_colors_dark_intense += (blendColors(
27+
colors['dark']['OnSurface'], colors_best[str_x], .70),)
28+
pywal_colors_dark_faint += (blendColors(
29+
colors['dark']['OnSurface'], colors_best[str_x], .35),)
2130
else:
2231
pywal_colors_dark += (blendColors(
2332
colors['dark']['OnSurface'], tones_primary[str(tone)], .58),)
33+
pywal_colors_dark_intense += (blendColors(
34+
colors['dark']['OnSurface'], tones_primary[str(tone)], .73),)
35+
pywal_colors_dark_faint += (blendColors(
36+
colors['dark']['OnSurface'], tones_primary[str(tone)], .38),)
2437
tone += 10
2538

2639
tone = 30
27-
pywal_colors_light = ()
2840
pywal_colors_light = (blendColors(
29-
tones_neutral['98'], colors['light']['Primary'], .01),)
41+
tones_neutral['92'], colors['light']['Primary'], .01),)
42+
pywal_colors_light_intense = (blendColors(
43+
colors['light']['OnSurface'], colors['light']['Secondary'], .35),)
44+
pywal_colors_light_faint = (blendColors(
45+
colors['light']['OnSurface'], colors['light']['Secondary'], .7),)
46+
3047
for x in range(7):
3148
str_x = str(x)
3249
if str_x in colors_best.keys():
3350
pywal_colors_light += (blendColors(
34-
colors['light']['OnSurface'], colors_best[str_x], .70),)
51+
colors['light']['OnSurface'], colors_best[str_x], .85),)
52+
pywal_colors_light_intense += (blendColors(
53+
colors['light']['OnSurface'], colors_best[str_x], .80),)
54+
pywal_colors_light_faint += (blendColors(
55+
colors['light']['OnSurface'], colors_best[str_x], .99),)
3556
else:
3657
pywal_colors_light += (blendColors(
37-
colors['light']['OnSurface'], tones_primary[str(tone)], .8),)
58+
colors['light']['OnSurface'], tones_primary[str(tone)], .88),)
59+
pywal_colors_light_intense += (blendColors(
60+
colors['light']['OnSurface'], tones_primary[str(tone)], .83),)
61+
pywal_colors_light_faint += (blendColors(
62+
colors['light']['OnSurface'], tones_primary[str(tone)], .92),)
3863
tone += 10
3964

4065
# Base text states taken from Breeze Color Scheme
@@ -403,9 +428,19 @@ def __init__(self, colors, wallpaper_data, light_blend_multiplier=1, dark_blend_
403428

404429
"special": {
405430
"background": pywal_colors_light[0],
431+
"backgroundIntense": blendColors(
432+
tones_neutral['8'], colors['light']['Primary'], .0),
433+
"backgroundFaint": blendColors(
434+
tones_neutral['8'], colors['light']['Primary'], .35),
406435
"foreground": colors['light']['OnSurface'],
407-
"cursor": colors['light']['OnSurface'],
436+
"foregroundIntense": blendColors(
437+
colors['light']['OnSurface'], colors['light']['Secondary'], .7),
438+
"foregroundFaint": blendColors(
439+
colors['light']['OnSurface'], colors['light']['Secondary'], .35),
440+
441+
"cursor": colors['dark']['OnSurface'],
408442
},
443+
409444
"colors": {
410445
"color0": pywal_colors_light[0],
411446
"color1": pywal_colors_light[1],
@@ -415,14 +450,22 @@ def __init__(self, colors, wallpaper_data, light_blend_multiplier=1, dark_blend_
415450
"color5": pywal_colors_light[5],
416451
"color6": pywal_colors_light[6],
417452
"color7": pywal_colors_light[7],
418-
"color8": colors['light']['Secondary'],
419-
"color9": pywal_colors_light[1],
420-
"color10": pywal_colors_light[2],
421-
"color11": pywal_colors_light[3],
422-
"color12": pywal_colors_light[4],
423-
"color13": pywal_colors_light[5],
424-
"color14": pywal_colors_light[6],
425-
"color15": pywal_colors_light[7]
453+
"color8": pywal_colors_light_intense[0],
454+
"color9": pywal_colors_light_intense[1],
455+
"color10": pywal_colors_light_intense[2],
456+
"color11": pywal_colors_light_intense[3],
457+
"color12": pywal_colors_light_intense[4],
458+
"color13": pywal_colors_light_intense[5],
459+
"color14": pywal_colors_light_intense[6],
460+
"color15": pywal_colors_light_intense[7],
461+
"color16": pywal_colors_light_faint[0],
462+
"color17": pywal_colors_light_faint[1],
463+
"color18": pywal_colors_light_faint[2],
464+
"color19": pywal_colors_light_faint[3],
465+
"color20": pywal_colors_light_faint[4],
466+
"color21": pywal_colors_light_faint[5],
467+
"color22": pywal_colors_light_faint[6],
468+
"color23": pywal_colors_light_faint[7]
426469
}
427470
}
428471

@@ -432,9 +475,18 @@ def __init__(self, colors, wallpaper_data, light_blend_multiplier=1, dark_blend_
432475

433476
"special": {
434477
"background": pywal_colors_dark[0],
478+
"backgroundIntense": blendColors(
479+
tones_neutral['8'], colors['dark']['Primary'], .0),
480+
"backgroundFaint": blendColors(
481+
tones_neutral['8'], colors['dark']['Primary'], .35),
435482
"foreground": colors['dark']['OnSurface'],
483+
"foregroundIntense": blendColors(
484+
colors['dark']['OnSurface'], colors['dark']['Secondary'], .7),
485+
"foregroundFaint": blendColors(
486+
colors['dark']['OnSurface'], colors['dark']['Secondary'], .35),
436487
"cursor": colors['dark']['OnSurface'],
437488
},
489+
438490
"colors": {
439491
"color0": pywal_colors_dark[0],
440492
"color1": pywal_colors_dark[1],
@@ -444,14 +496,22 @@ def __init__(self, colors, wallpaper_data, light_blend_multiplier=1, dark_blend_
444496
"color5": pywal_colors_dark[5],
445497
"color6": pywal_colors_dark[6],
446498
"color7": pywal_colors_dark[7],
447-
"color8": colors['dark']['Secondary'],
448-
"color9": pywal_colors_dark[1],
449-
"color10": pywal_colors_dark[2],
450-
"color11": pywal_colors_dark[3],
451-
"color12": pywal_colors_dark[4],
452-
"color13": pywal_colors_dark[5],
453-
"color14": pywal_colors_dark[6],
454-
"color15": pywal_colors_dark[7]
499+
"color8": pywal_colors_dark_intense[0],
500+
"color9": pywal_colors_dark_intense[1],
501+
"color10": pywal_colors_dark_intense[2],
502+
"color11": pywal_colors_dark_intense[3],
503+
"color12": pywal_colors_dark_intense[4],
504+
"color13": pywal_colors_dark_intense[5],
505+
"color14": pywal_colors_dark_intense[6],
506+
"color15": pywal_colors_dark_intense[7],
507+
"color16": pywal_colors_dark_faint[0],
508+
"color17": pywal_colors_dark_faint[1],
509+
"color18": pywal_colors_dark_faint[2],
510+
"color19": pywal_colors_dark_faint[3],
511+
"color20": pywal_colors_dark_faint[4],
512+
"color21": pywal_colors_dark_faint[5],
513+
"color22": pywal_colors_dark_faint[6],
514+
"color23": pywal_colors_dark_faint[7]
455515
}
456516
}
457517
dark_active=colors['dark']['OnBackground']

‎utils.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -769,8 +769,8 @@ def konsole_export_scheme(light=None, pywal_light=None, schemes=None):
769769
if not config.has_section(section):
770770
config.add_section(section)
771771
config['Background']['Color'] = tup2str(hex2rgb(pywal_colors['special']['background']))
772-
config['BackgroundIntense']['Color'] = tup2str(hex2rgb(pywal_colors['special']['background']))
773-
config['BackgroundFaint']['Color'] = tup2str(hex2rgb(pywal_colors['special']['background']))
772+
config['BackgroundIntense']['Color'] = tup2str(hex2rgb(pywal_colors['special']['backgroundIntense']))
773+
config['BackgroundFaint']['Color'] = tup2str(hex2rgb(pywal_colors['special']['backgroundFaint']))
774774
config['Color0']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color0']))
775775
config['Color1']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color1']))
776776
config['Color2']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color2']))
@@ -789,18 +789,18 @@ def konsole_export_scheme(light=None, pywal_light=None, schemes=None):
789789
config['Color6Intense']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color14']))
790790
config['Color7Intense']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color15']))
791791

792-
config['Color0Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color8']))
793-
config['Color1Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color9']))
794-
config['Color2Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color10']))
795-
config['Color3Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color11']))
796-
config['Color4Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color12']))
797-
config['Color5Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color13']))
798-
config['Color6Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color14']))
799-
config['Color7Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color15']))
792+
config['Color0Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color16']))
793+
config['Color1Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color17']))
794+
config['Color2Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color18']))
795+
config['Color3Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color19']))
796+
config['Color4Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color20']))
797+
config['Color5Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color21']))
798+
config['Color6Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color22']))
799+
config['Color7Faint']['Color'] = tup2str(hex2rgb(pywal_colors['colors']['color23']))
800800

801801
config['Foreground']['Color'] = tup2str(hex2rgb(pywal_colors['special']['foreground']))
802-
config['ForegroundIntense']['Color'] = tup2str(hex2rgb(pywal_colors['special']['foreground']))
803-
config['ForegroundFaint']['Color'] = tup2str(hex2rgb(pywal_colors['special']['foreground']))
802+
config['ForegroundIntense']['Color'] = tup2str(hex2rgb(pywal_colors['special']['foregroundIntense']))
803+
config['ForegroundFaint']['Color'] = tup2str(hex2rgb(pywal_colors['special']['foregroundFaint']))
804804

805805
config['General']['Description'] = "MaterialYou"
806806

0 commit comments

Comments
 (0)