From a9236129f64118b16a76f2aa59c9d9448def2383 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Thu, 22 Apr 2021 11:20:55 +0200 Subject: generate-alt-random: don’t run TIOCGWINSZ ioctl if --cols and --rows were used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/generate-alt-random-writes.py | 59 ++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 29 deletions(-) (limited to 'scripts') diff --git a/scripts/generate-alt-random-writes.py b/scripts/generate-alt-random-writes.py index df053844..4e50bd8c 100755 --- a/scripts/generate-alt-random-writes.py +++ b/scripts/generate-alt-random-writes.py @@ -38,35 +38,36 @@ def main(): opts = parser.parse_args() out = opts.out if opts.out is not None else sys.stdout - try: - def dummy(*args): - """Need a handler installed for sigwait() to trigger.""" - pass - signal.signal(signal.SIGWINCH, dummy) - - while True: - with open('/dev/tty', 'rb') as pty: - lines, cols, height, width = struct.unpack( - 'HHHH', - fcntl.ioctl(pty, - termios.TIOCGWINSZ, - struct.pack('HHHH', 0, 0, 0, 0))) - - if width > 0 and height > 0: - break - - # We’re early; the foot window hasn’t been mapped yet. Or, - # to be more precise, fonts haven’t yet been loaded, - # meaning it doesn’t have any cell geometry yet. - signal.sigwait([signal.SIGWINCH]) - - signal.signal(signal.SIGWINCH, signal.SIG_DFL) - - except OSError: - lines = None - cols = None - height = None - width = None + if opts.rows is None or opts.cols is None: + try: + def dummy(*args): + """Need a handler installed for sigwait() to trigger.""" + pass + signal.signal(signal.SIGWINCH, dummy) + + while True: + with open('/dev/tty', 'rb') as pty: + lines, cols, height, width = struct.unpack( + 'HHHH', + fcntl.ioctl(pty, + termios.TIOCGWINSZ, + struct.pack('HHHH', 0, 0, 0, 0))) + + if width > 0 and height > 0: + break + + # We’re early; the foot window hasn’t been mapped yet. Or, + # to be more precise, fonts haven’t yet been loaded, + # meaning it doesn’t have any cell geometry yet. + signal.sigwait([signal.SIGWINCH]) + + signal.signal(signal.SIGWINCH, signal.SIG_DFL) + + except OSError: + lines = None + cols = None + height = None + width = None if opts.rows is not None: lines = opts.rows -- cgit v1.3