mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-27 18:51:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-icat_typeerror_on_print_window_size' of https://github.com/nertro/kitty

Browse Source
This commit is contained in:
Kovid Goyal
2022-03-12 08:08:32 +05:30
parent 14e0b01b40 c8a258f36b
commit f6fb36c58a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kittens/icat/main.py
View File

@@ -515,7 +515,12 @@ def main(args: List[str] = sys.argv) -> None:
if cli_opts.print_window_size: if cli_opts.print_window_size:
screen_size_function.cache_clear() screen_size_function.cache_clear()
with open(os.ctermid()) as tty: with open(os.ctermid()) as tty:
ss = screen_size_function(tty)() try:
fd = tty.fileno()
except AttributeError:
# use default value for fd if ctermid is not available
fd = None
ss = screen_size_function(fd)()
print(f'{ss.width}x{ss.height}', end='') print(f'{ss.width}x{ss.height}', end='')
raise SystemExit(0) raise SystemExit(0)

2
kitty/utils.py
View File

@@ -178,7 +178,7 @@ class ScreenSizeGetter:
return cast(ScreenSize, self.ans) return cast(ScreenSize, self.ans)
@lru_cache(maxsize=64) @lru_cache(maxsize=64, typed=True)
def screen_size_function(fd: Optional[int] = None) -> ScreenSizeGetter: def screen_size_function(fd: Optional[int] = None) -> ScreenSizeGetter:
return ScreenSizeGetter(fd) return ScreenSizeGetter(fd)