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

Fix table row generation for non-name unicode input panels

Browse Source
This commit is contained in:
Kovid Goyal 2018-02-13 10:50:06 +05:30
parent 67e0d3723a
commit b0f5d8dfdc
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kittens/tui/operations.py
View File

@ -18,7 +18,7 @@ MODES = dict(
DECKM=(1, '?'), DECKM=(1, '?'),
DECSCNM=(5, '?'), DECSCNM=(5, '?'),
DECOM=(6, '?'), DECOM=(6, '?'),
DECAWM=(6, '?'), DECAWM=(7, '?'),
DECARM=(8, '?'), DECARM=(8, '?'),
DECTCEM=(25, '?'), DECTCEM=(25, '?'),
MOUSE_BUTTON_TRACKING=(1000, '?'), MOUSE_BUTTON_TRACKING=(1000, '?'),

18
kittens/unicode_input/main.py
View File

@ -139,7 +139,7 @@ class Table:
self.codepoints = [] self.codepoints = []
self.current_idx = 0 self.current_idx = 0
self.text = '' self.text = ''
self.num_cols = self.num_rows = 0 self.num_cols = 0
self.mode = HEX self.mode = HEX
@property @property
@ -189,7 +189,7 @@ class Table:
def cell(i, idx, c, desc): def cell(i, idx, c, desc):
yield colored(idx, 'green') + ' ' yield colored(idx, 'green') + ' '
yield colored(c, 'gray', True) + ' ' yield colored(c, 'gray', True)
w = wcswidth(c) w = wcswidth(c)
if w < 2: if w < 2:
yield ' ' * (2 - w) yield ' ' * (2 - w)
@ -197,7 +197,7 @@ class Table:
num = len(self.codepoints) num = len(self.codepoints)
if num < 1: if num < 1:
self.text = '' self.text = ''
self.num_cols = self.num_rows = 0 self.num_cols = 0
return self.text return self.text
idx_size = len(encode_hint(num - 1)) idx_size = len(encode_hint(num - 1))
@ -205,7 +205,7 @@ class Table:
if self.mode is NAME: if self.mode is NAME:
sizes = [idx_size + 2 + len(p[2]) + 2 for p in parts] sizes = [idx_size + 2 + len(p[2]) + 2 for p in parts]
else: else:
sizes = [idx_size + 3 for p in parts] sizes = [idx_size + 3]
longest = max(sizes) if sizes else 0 longest = max(sizes) if sizes else 0
col_width = longest + 2 col_width = longest + 2
col_width = min(col_width, 40) col_width = min(col_width, 40)
@ -213,7 +213,7 @@ class Table:
num_cols = self.num_cols = cols // col_width num_cols = self.num_cols = cols // col_width
buf = [] buf = []
a = buf.append a = buf.append
rows_left = self.num_rows = rows rows_left = rows
for i, (idx, c, desc) in enumerate(parts): for i, (idx, c, desc) in enumerate(parts):
if i > 0 and i % num_cols == 0: if i > 0 and i % num_cols == 0:
@ -308,10 +308,13 @@ class UnicodeInput(Handler):
colored(c, 'green'), hex(ord(c))[2:], styled(name(c) or '', italic=True, fg=FAINT)) colored(c, 'green'), hex(ord(c))[2:], styled(name(c) or '', italic=True, fg=FAINT))
self.prompt = self.prompt_template.format(colored(c, color)) self.prompt = self.prompt_template.format(colored(c, color))
def initialize(self, *args): def init_terminal_state(self):
Handler.initialize(self, *args)
self.write(set_line_wrapping(False)) self.write(set_line_wrapping(False))
self.write(set_window_title(_('Unicode input'))) self.write(set_window_title(_('Unicode input')))
def initialize(self, *args):
Handler.initialize(self, *args)
self.init_terminal_state()
self.draw_screen() self.draw_screen()
def draw_title_bar(self): def draw_title_bar(self):
@ -413,6 +416,7 @@ class UnicodeInput(Handler):
p = subprocess.Popen(editor + [favorites_path]) p = subprocess.Popen(editor + [favorites_path])
if p.wait() == 0: if p.wait() == 0:
load_favorites(refresh=True) load_favorites(refresh=True)
self.init_terminal_state()
self.refresh() self.refresh()
def switch_mode(self, mode): def switch_mode(self, mode):