From 2639e7d2e2cd4fe2901fa3043261523c6a75daf8 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 14 Nov 2020 13:46:10 +0100 Subject: scripts: generate-alt-random-writes: don’t re-use ‘count’ variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/generate-alt-random-writes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/generate-alt-random-writes.py b/scripts/generate-alt-random-writes.py index 9af73cfd..e650effd 100755 --- a/scripts/generate-alt-random-writes.py +++ b/scripts/generate-alt-random-writes.py @@ -57,9 +57,9 @@ def main(): bottom = rand.read(1)[0] % 3 out.write(f'\033[{top};{lines - bottom}r') - count = rand.read(1)[0] % (lines - 1) + lines_to_scroll = rand.read(1)[0] % (lines - 1) rev = rand.read(1)[0] % 2 - out.write(f'\033[{count + 1}{"T" if rev == 1 else "S"}') + out.write(f'\033[{lines_to_scroll + 1}{"T" if rev == 1 else "S"}') continue # Generate a random location and a random character -- cgit v1.3 From 66527b39b1ed9bfd4b88199def998389142fda54 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 15 Nov 2020 13:49:06 +0100 Subject: scripts: generate-alt-random-writes: add command line arguments for cols/rows --- scripts/generate-alt-random-writes.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'scripts') diff --git a/scripts/generate-alt-random-writes.py b/scripts/generate-alt-random-writes.py index e650effd..7e77a51f 100755 --- a/scripts/generate-alt-random-writes.py +++ b/scripts/generate-alt-random-writes.py @@ -18,6 +18,8 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument( 'out', type=argparse.FileType(mode='w'), nargs='?', help='name of output file') + parser.add_argument('--cols', type=int) + parser.add_argument('--rows', type=int) parser.add_argument('--colors-regular', action='store_true') parser.add_argument('--colors-bright', action='store_true') parser.add_argument('--colors-rgb', action='store_true') @@ -33,6 +35,11 @@ def main(): termios.TIOCGWINSZ, struct.pack('HHHH', 0, 0, 0, 0))) + if opts.rows is not None: + lines = opts.rows + if opts.cols is not None: + cols = opts.cols + # Number of characters to write to screen count = 256 * 1024**1 -- cgit v1.3 From 5aa97189df3a6816d39041e974396deda9a01c49 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 15 Nov 2020 13:59:45 +0100 Subject: scripts: generate-alt-random-writes: mix new/old-style RGB escapes --- scripts/generate-alt-random-writes.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/generate-alt-random-writes.py b/scripts/generate-alt-random-writes.py index 7e77a51f..1ac36401 100755 --- a/scripts/generate-alt-random-writes.py +++ b/scripts/generate-alt-random-writes.py @@ -92,8 +92,15 @@ def main(): elif color_variant == ColorVariant.RGB: do_bg = rand.read(1)[0] % 2 + base = 48 if do_bg else 38 rgb = rand.read(3) - out.write(f'\033[{48 if do_bg else 38}:2::{rgb[0]}:{rgb[1]}:{rgb[2]}m') + + if rand.read(1)[0] % 2: + # Old-style + out.write(f'\033[{base};2;{rgb[0]};{rgb[1]};{rgb[2]}m') + else: + # New-style (sub-parameter based) + out.write(f'\033[{base}:2::{rgb[0]}:{rgb[1]}:{rgb[2]}m') out.write(c * repeat) -- cgit v1.3 From c679da7316d1b032e94347edc1841072f779670b Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 15 Nov 2020 14:00:20 +0100 Subject: scripts: generate-alt-random-writes: add support for emitting 256-indexed colors --- scripts/generate-alt-random-writes.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'scripts') diff --git a/scripts/generate-alt-random-writes.py b/scripts/generate-alt-random-writes.py index 1ac36401..0120fe7b 100755 --- a/scripts/generate-alt-random-writes.py +++ b/scripts/generate-alt-random-writes.py @@ -11,6 +11,7 @@ class ColorVariant(enum.IntEnum): NONE = enum.auto() REGULAR = enum.auto() BRIGHT = enum.auto() + CUBE = enum.auto() RGB = enum.auto() @@ -22,6 +23,7 @@ def main(): parser.add_argument('--rows', type=int) parser.add_argument('--colors-regular', action='store_true') parser.add_argument('--colors-bright', action='store_true') + parser.add_argument('--colors-256', action='store_true') parser.add_argument('--colors-rgb', action='store_true') parser.add_argument('--scroll', action='store_true') parser.add_argument('--scroll-region', action='store_true') @@ -49,6 +51,7 @@ def main(): color_variants = ([ColorVariant.NONE] + ([ColorVariant.REGULAR] if opts.colors_regular else []) + ([ColorVariant.BRIGHT] if opts.colors_bright else []) + + ([ColorVariant.CUBE] if opts.colors_256 else []) + ([ColorVariant.RGB] if opts.colors_rgb else [])) # Enter alt screen @@ -90,6 +93,18 @@ def main(): idx = rand.read(1)[0] % 8 out.write(f'\033[{base + idx}m') + elif color_variant == ColorVariant.CUBE: + do_bg = rand.read(1)[0] % 2 + base = 48 if do_bg else 38 + + idx = rand.read(1)[0] % 256 + if rand.read(1)[0] % 2: + # Old-style + out.write(f'\033[{base};5;{idx}m') + else: + # New-style (sub-parameter based) + out.write(f'\033[{base}:2:5:{idx}m') + elif color_variant == ColorVariant.RGB: do_bg = rand.read(1)[0] % 2 base = 48 if do_bg else 38 -- cgit v1.3 From 1e1fb157dc5762f571d8e39e837c010ef9aaf45b Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 16 Nov 2020 20:01:58 +0100 Subject: scripts: generate-alt-random-writes: mix \e[S with \n --- scripts/generate-alt-random-writes.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/generate-alt-random-writes.py b/scripts/generate-alt-random-writes.py index 0120fe7b..5e7ab540 100755 --- a/scripts/generate-alt-random-writes.py +++ b/scripts/generate-alt-random-writes.py @@ -69,7 +69,11 @@ def main(): lines_to_scroll = rand.read(1)[0] % (lines - 1) rev = rand.read(1)[0] % 2 - out.write(f'\033[{lines_to_scroll + 1}{"T" if rev == 1 else "S"}') + if not rev and rand.read(1)[0] % 2: + out.write(f'\033[{lines};{cols}H') + out.write('\n' * lines_to_scroll) + else: + out.write(f'\033[{lines_to_scroll + 1}{"T" if rev == 1 else "S"}') continue # Generate a random location and a random character -- cgit v1.3 From 60c86372310c96759334fc6c0a5c46b729b470f9 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 16 Nov 2020 20:02:38 +0100 Subject: scripts: generate-alt-random-writes: don’t always reset all attributes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/generate-alt-random-writes.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/generate-alt-random-writes.py b/scripts/generate-alt-random-writes.py index 5e7ab540..d4fd8dda 100755 --- a/scripts/generate-alt-random-writes.py +++ b/scripts/generate-alt-random-writes.py @@ -123,10 +123,11 @@ def main(): out.write(c * repeat) - if color_variant != ColorVariant.NONE: - do_sgr_reset = rand.read(1)[0] % 2 - if do_sgr_reset: - out.write('\033[m') + do_sgr_reset = rand.read(1)[0] % 2 + if do_sgr_reset: + reset_actions = ['\033[m', '\033[39m', '\033[49m'] + idx = rand.read(1)[0] % len(reset_actions) + out.write(reset_actions[idx]) # Leave alt screen out.write('\033[m\033[r\033[?1049l') -- cgit v1.3 From b437013a3b7968a4f211d55725e4e0e406edb076 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 16 Nov 2020 20:02:53 +0100 Subject: scripts: generate-alt-random-writes: add support for bold/italic/underline --- scripts/generate-alt-random-writes.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'scripts') diff --git a/scripts/generate-alt-random-writes.py b/scripts/generate-alt-random-writes.py index d4fd8dda..7fee96d4 100755 --- a/scripts/generate-alt-random-writes.py +++ b/scripts/generate-alt-random-writes.py @@ -27,6 +27,9 @@ def main(): parser.add_argument('--colors-rgb', action='store_true') parser.add_argument('--scroll', action='store_true') parser.add_argument('--scroll-region', action='store_true') + parser.add_argument('--attr-bold', action='store_true') + parser.add_argument('--attr-italic', action='store_true') + parser.add_argument('--attr-underline', action='store_true') opts = parser.parse_args() out = opts.out if opts.out is not None else sys.stdout @@ -121,6 +124,13 @@ def main(): # New-style (sub-parameter based) out.write(f'\033[{base}:2::{rgb[0]}:{rgb[1]}:{rgb[2]}m') + if opts.attr_bold and rand.read(1)[0] % 5 == 0: + out.write('\033[1m') + if opts.attr_italic and rand.read(1)[0] % 5 == 0: + out.write('\033[3m') + if opts.attr_underline and rand.read(1)[0] % 5 == 0: + out.write('\033[4m') + out.write(c * repeat) do_sgr_reset = rand.read(1)[0] % 2 -- cgit v1.3 From 96db338262a850a9aec4f6c1d04e4ea601be3467 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 16 Nov 2020 20:22:12 +0100 Subject: scripts: generate-alt-random-writes: add unicode and multi-column chars --- scripts/generate-alt-random-writes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/generate-alt-random-writes.py b/scripts/generate-alt-random-writes.py index 7fee96d4..f9601595 100755 --- a/scripts/generate-alt-random-writes.py +++ b/scripts/generate-alt-random-writes.py @@ -49,7 +49,7 @@ def main(): count = 256 * 1024**1 # Characters to choose from - alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRTSTUVWXYZ0123456789 ' + alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRTSTUVWXYZ0123456789 öäå 👨👩🧒' color_variants = ([ColorVariant.NONE] + ([ColorVariant.REGULAR] if opts.colors_regular else []) + -- cgit v1.3