aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-04-22 09:27:36 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-04-22 09:27:36 +0000
commit070f102605e9123b6297e5b46ee73d26a05e6587 (patch)
treed8d31c5a854444f0daa9bb0f63f36611db9c347f
parentreadme: s/if/is (diff)
parentchangelog: generate-alt-random-writes.py --sixel fixes (diff)
Merge branch 'generate-alt-random-writes-fixes'
-rw-r--r--CHANGELOG.md10
-rwxr-xr-xscripts/generate-alt-random-writes.py51
2 files changed, 48 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 728dbf9b..0c614c4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,9 +29,19 @@
## Unreleased
### Added
### Changed
+
+* `generate-alt-random-writes.py --sixel`: width and height of emitted
+ sixels has been adjusted.
+
+
### Deprecated
### Removed
### Fixed
+
+* `generate-alt-random-writes.py --sixel` sometimes crashing,
+ resulting in PGO build failures.
+
+
### Security
### Contributors
diff --git a/scripts/generate-alt-random-writes.py b/scripts/generate-alt-random-writes.py
index 63becdcf..4e50bd8c 100755
--- a/scripts/generate-alt-random-writes.py
+++ b/scripts/generate-alt-random-writes.py
@@ -2,8 +2,9 @@
import argparse
import enum
import fcntl
-import struct
import random
+import signal
+import struct
import sys
import termios
@@ -37,17 +38,36 @@ def main():
opts = parser.parse_args()
out = opts.out if opts.out is not None else sys.stdout
- try:
- lines, cols, height, width = struct.unpack(
- 'HHHH',
- fcntl.ioctl(sys.stdout.fileno(),
- termios.TIOCGWINSZ,
- struct.pack('HHHH', 0, 0, 0, 0)))
- 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
@@ -59,6 +79,11 @@ def main():
if lines is None or cols is None or height is None or width is None:
raise Exception('could not get terminal width/height; use --rows and --cols')
+ assert lines > 0, f'{lines}'
+ assert cols > 0, f'{cols}'
+ assert width > 0, f'{width}'
+ assert height > 0, f'{height}'
+
# Number of characters to write to screen
count = 256 * 1024**1
@@ -176,7 +201,7 @@ def main():
else:
# Random origin in upper left quadrant
last_pos = random.randrange(lines // 2) + 1, random.randrange(cols // 2) + 1
- last_size = random.randrange(height // 2), random.randrange(width // 2)
+ last_size = random.randrange((height + 1) // 2), random.randrange((width + 1) // 2)
out.write(f'\033[{last_pos[0]};{last_pos[1]}H')
six_height, six_width = last_size