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

Fix usage of icat function show

Browse Source 
The `screen_size` function was not initialized yet
This commit is contained in:
Benoit de Chezelles 2019-10-18 04:48:36 +02:00
parent 2112932d04
commit 10e5fcc375
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kittens/icat/main.py
View File

@ -22,7 +22,6 @@ from ..tui.images import (
) )
from ..tui.operations import clear_images_on_screen, serialize_gr_command from ..tui.operations import clear_images_on_screen, serialize_gr_command
screen_size = None
OPTIONS = '''\ OPTIONS = '''\
--align --align
type=choices type=choices
@ -97,6 +96,16 @@ Do not print out anything to stdout during operation.
''' '''
screen_size = None
def get_screen_size():
global screen_size
if screen_size is None:
screen_size = screen_size_function()
return screen_size()
def options_spec(): def options_spec():
if not hasattr(options_spec, 'ans'): if not hasattr(options_spec, 'ans'):
options_spec.ans = OPTIONS.format( options_spec.ans = OPTIONS.format(
@ -122,7 +131,7 @@ def calculate_in_cell_x_offset(width, cell_width, align):
def set_cursor(cmd, width, height, align): def set_cursor(cmd, width, height, align):
ss = screen_size() ss = get_screen_size()
cw = int(ss.width / ss.cols) cw = int(ss.width / ss.cols)
num_of_cells_needed = int(ceil(width / cw)) num_of_cells_needed = int(ceil(width / cw))
if num_of_cells_needed > ss.cols: if num_of_cells_needed > ss.cols:
@ -143,7 +152,7 @@ def set_cursor(cmd, width, height, align):
def set_cursor_for_place(place, cmd, width, height, align): def set_cursor_for_place(place, cmd, width, height, align):
x = place.left + 1 x = place.left + 1
ss = screen_size() ss = get_screen_size()
cw = int(ss.width / ss.cols) cw = int(ss.width / ss.cols)
num_of_cells_needed = int(ceil(width / cw)) num_of_cells_needed = int(ceil(width / cw))
cmd['X'] = calculate_in_cell_x_offset(width, cw, align) cmd['X'] = calculate_in_cell_x_offset(width, cw, align)
@ -189,7 +198,7 @@ def show(outfile, width, height, fmt, transmit_mode='t', align='center', place=N
def process(path, args, is_tempfile): def process(path, args, is_tempfile):
m = identify(path) m = identify(path)
ss = screen_size() ss = get_screen_size()
available_width = args.place.width * (ss.width / ss.cols) if args.place else ss.width available_width = args.place.width * (ss.width / ss.cols) if args.place else ss.width
available_height = args.place.height * (ss.height / ss.rows) if args.place else 10 * m.height available_height = args.place.height * (ss.height / ss.rows) if args.place else 10 * m.height
needs_scaling = m.width > available_width or m.height > available_height needs_scaling = m.width > available_width or m.height > available_height
@ -334,7 +343,7 @@ def main(args=sys.argv):
sys.stdin.close() sys.stdin.close()
sys.stdin = open(os.ctermid(), 'r') sys.stdin = open(os.ctermid(), 'r')
screen_size = screen_size_function() screen_size = get_screen_size()
signal.signal(signal.SIGWINCH, lambda signum, frame: setattr(screen_size, 'changed', True)) signal.signal(signal.SIGWINCH, lambda signum, frame: setattr(screen_size, 'changed', True))
if screen_size().width == 0: if screen_size().width == 0:
if args.detect_support: if args.detect_support: