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

Allow multiple clickable ranges

Browse Source
This commit is contained in:
Kovid Goyal 2022-01-22 10:52:44 +05:30
parent ce7282a53c
commit 5c832d3190
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kittens/ask/main.py
View File

@ -140,7 +140,7 @@ class Choose(Handler):
def __init__(self, cli_opts: AskCLIOptions) -> None: def __init__(self, cli_opts: AskCLIOptions) -> None:
self.cli_opts = cli_opts self.cli_opts = cli_opts
self.choices: Dict[str, Choice] = {} self.choices: Dict[str, Choice] = {}
self.clickable_ranges: Dict[str, Range] = {} self.clickable_ranges: Dict[str, List[Range]] = {}
if cli_opts.type == 'yesno': if cli_opts.type == 'yesno':
self.allowed = frozenset('yn') self.allowed = frozenset('yn')
else: else:
@ -205,7 +205,7 @@ class Choose(Handler):
x = extra + 1 x = extra + 1
self.print(' ' * x + current_line, end=end) self.print(' ' * x + current_line, end=end)
for letter, sz in current_ranges.items(): for letter, sz in current_ranges.items():
self.clickable_ranges[letter] = Range(x, x + sz - 3, y) self.clickable_ranges[letter] = [Range(x, x + sz - 3, y)]
x += sz x += sz
current_ranges.clear() current_ranges.clear()
y += 1 y += 1
@ -233,7 +233,7 @@ class Choose(Handler):
extra = (self.screen_size.cols - w) // 2 extra = (self.screen_size.cols - w) // 2
x = extra x = extra
nx = x + wcswidth(yes) + len(sep) nx = x + wcswidth(yes) + len(sep)
self.clickable_ranges = {'y': Range(x, x + wcswidth(yes) - 1, y), 'n': Range(nx, nx + 1, y)} self.clickable_ranges = {'y': [Range(x, x + wcswidth(yes) - 1, y)], 'n': [Range(nx, nx + 1, y)]}
self.print(' ' * extra + text, end='') self.print(' ' * extra + text, end='')
def on_text(self, text: str, in_bracketed_paste: bool = False) -> None: def on_text(self, text: str, in_bracketed_paste: bool = False) -> None:
@ -251,11 +251,12 @@ class Choose(Handler):
self.quit_loop(0) self.quit_loop(0)
def on_click(self, ev: MouseEvent) -> None: def on_click(self, ev: MouseEvent) -> None:
for letter, r in self.clickable_ranges.items(): for letter, ranges in self.clickable_ranges.items():
for r in ranges:
if r.has_point(ev.cell_x, ev.cell_y): if r.has_point(ev.cell_x, ev.cell_y):
self.response = letter self.response = letter
self.quit_loop(0) self.quit_loop(0)
break return
def on_resize(self, screen_size: ScreenSize) -> None: def on_resize(self, screen_size: ScreenSize) -> None:
self.screen_size = screen_size self.screen_size = screen_size