KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More work on the diff kitten

Browse Source
This commit is contained in:
Kovid Goyal 2018-05-03 18:05:55 +05:30
parent de1a2f7682
commit 866b53f384
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kittens/diff/config.py
View File

@ -34,12 +34,15 @@ def set_formats(opts):
formats['filler'] = '48' + color_as_sgr(opts.filler_bg) formats['filler'] = '48' + color_as_sgr(opts.filler_bg)
formats['hunk_margin'] = '38' + color_as_sgr(opts.margin_fg) + ';48' + color_as_sgr(opts.hunk_margin_bg) formats['hunk_margin'] = '38' + color_as_sgr(opts.margin_fg) + ';48' + color_as_sgr(opts.hunk_margin_bg)
formats['hunk'] = '38' + color_as_sgr(opts.margin_fg) + ';48' + color_as_sgr(opts.hunk_bg) formats['hunk'] = '38' + color_as_sgr(opts.margin_fg) + ';48' + color_as_sgr(opts.hunk_bg)
formats['removed_highlight'] = '48' + color_as_sgr(opts.highlight_removed_bg)
formats['added_highlight'] = '48' + color_as_sgr(opts.highlight_added_bg)
type_map = {} type_map = {}
for name in ( for name in (
'foreground background title_fg title_bg margin_bg margin_fg removed_bg removed_margin_bg added_bg added_margin_bg filler_bg hunk_bg hunk_margin_bg' 'foreground background title_fg title_bg margin_bg margin_fg removed_bg removed_margin_bg added_bg added_margin_bg filler_bg hunk_bg hunk_margin_bg'
' highlight_removed_bg highlight_added_bg'
).split(): ).split():
type_map[name] = to_color type_map[name] = to_color

28
kittens/diff/diff.conf
View File

@ -1,13 +1,15 @@
foreground black foreground black
background white background white
title_fg black title_fg black
title_bg white title_bg white
margin_bg #fafbfc margin_bg #fafbfc
margin_fg #aaaaaa margin_fg #aaaaaa
removed_bg #ffeef0 removed_bg #ffeef0
removed_margin_bg #ffdce0 highlight_removed_bg #fdb8c0
added_bg #e6ffed removed_margin_bg #ffdce0
added_margin_bg #cdffd8 added_bg #e6ffed
filler_bg #fafbfc highlight_added_bg #acf2bd
hunk_margin_bg #dbedff added_margin_bg #cdffd8
hunk_bg #f1f8ff filler_bg #fafbfc
hunk_margin_bg #dbedff
hunk_bg #f1f8ff