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

Merge branch 'master' of https://github.com/jaeheum/kitty into master

Browse Source
This commit is contained in:
Kovid Goyal 2020-08-03 08:58:24 +05:30
commit 110a3e7e0f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
kittens/hints/main.py
View File

@ -72,7 +72,7 @@ def decode_hint(x: str, alphabet: str = DEFAULT_HINT_ALPHABET) -> int:
return i return i
def highlight_mark(m: Mark, text: str, current_input: str, alphabet: str) -> str: def highlight_mark(m: Mark, text: str, current_input: str, alphabet: str, colors: Dict[str, str]) -> str:
hint = encode_hint(m.index, alphabet) hint = encode_hint(m.index, alphabet)
if current_input and not hint.startswith(current_input): if current_input and not hint.startswith(current_input):
return faint(text) return faint(text)
@ -80,19 +80,19 @@ def highlight_mark(m: Mark, text: str, current_input: str, alphabet: str) -> str
text = text[len(hint):] text = text[len(hint):]
return styled( return styled(
hint, hint,
fg='black', fg=colors['foreground'],
bg='green', bg=colors['background'],
bold=True bold=True
) + styled( ) + styled(
text, fg='gray', fg_intense=True, bold=True text, fg=colors['text'], fg_intense=True, bold=True
) )
def render(text: str, current_input: str, all_marks: Sequence[Mark], ignore_mark_indices: Set[int], alphabet: str) -> str: def render(text: str, current_input: str, all_marks: Sequence[Mark], ignore_mark_indices: Set[int], alphabet: str, colors: Dict[str, str]) -> str:
for mark in reversed(all_marks): for mark in reversed(all_marks):
if mark.index in ignore_mark_indices: if mark.index in ignore_mark_indices:
continue continue
mtext = highlight_mark(mark, text[mark.start:mark.end], current_input, alphabet) mtext = highlight_mark(mark, text[mark.start:mark.end], current_input, alphabet, colors)
text = text[:mark.start] + mtext + text[mark.end:] text = text[:mark.start] + mtext + text[mark.end:]
text = text.replace('\0', '') text = text.replace('\0', '')
@ -105,6 +105,9 @@ class Hints(Handler):
def __init__(self, text: str, all_marks: Sequence[Mark], index_map: Dict[int, Mark], args: HintsCLIOptions): def __init__(self, text: str, all_marks: Sequence[Mark], index_map: Dict[int, Mark], args: HintsCLIOptions):
self.text, self.index_map = text, index_map self.text, self.index_map = text, index_map
self.alphabet = args.alphabet or DEFAULT_HINT_ALPHABET self.alphabet = args.alphabet or DEFAULT_HINT_ALPHABET
self.colors = {'foreground': args.hints_foreground_color,
'background': args.hints_background_color,
'text': args.hints_text_color}
self.all_marks = all_marks self.all_marks = all_marks
self.ignore_mark_indices: Set[int] = set() self.ignore_mark_indices: Set[int] = set()
self.args = args self.args = args
@ -198,7 +201,7 @@ class Hints(Handler):
def draw_screen(self) -> None: def draw_screen(self) -> None:
if self.current_text is None: if self.current_text is None:
self.current_text = render(self.text, self.current_input, self.all_marks, self.ignore_mark_indices, self.alphabet) self.current_text = render(self.text, self.current_input, self.all_marks, self.ignore_mark_indices, self.alphabet, self.colors)
self.cmd.clear_screen() self.cmd.clear_screen()
self.write(self.current_text) self.write(self.current_text)
@ -513,6 +516,24 @@ type=bool-set
Have the hints increase from top to bottom instead of decreasing from top to bottom. Have the hints increase from top to bottom instead of decreasing from top to bottom.
--hints-foreground-color
default=black
type=str
The foreground color for hints
--hints-background-color
default=green
type=str
The background color for hints
--hints-text-color
default=gray
type=str
The foreground color for text pointed by the hints
--customize-processing --customize-processing
Name of a python file in the kitty config directory which will be imported to provide Name of a python file in the kitty config directory which will be imported to provide
custom implementations for pattern finding and performing actions custom implementations for pattern finding and performing actions