From 311a6f1b412c63e56740ab770a31534c3d7ce3f9 Mon Sep 17 00:00:00 2001 From: troido Date: Sat, 18 Apr 2020 11:43:19 +0200 Subject: added --reset-style and --blink-bright-background command line arguments --- asciifarmclient/display.py | 4 ++-- asciifarmclient/main.py | 4 ++-- asciifarmclient/parseargs.py | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'asciifarmclient') diff --git a/asciifarmclient/display.py b/asciifarmclient/display.py index b3c32d8..53e9cf3 100644 --- a/asciifarmclient/display.py +++ b/asciifarmclient/display.py @@ -16,7 +16,7 @@ ALPHABET = "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`ab class Display: - def __init__(self, charMap): + def __init__(self, charMap, ratuil_args={}): self.characters = {} @@ -46,7 +46,7 @@ class Display: self.layout = Layout.from_xml_file(fname) self.layout.get("field").set_char_size(charMap.get("charwidth", 1)) - self.screen = Screen() + self.screen = Screen(**ratuil_args) self.screen.clear() self.layout.set_target(self.screen) diff --git a/asciifarmclient/main.py b/asciifarmclient/main.py index d720477..8c79fac 100644 --- a/asciifarmclient/main.py +++ b/asciifarmclient/main.py @@ -16,7 +16,7 @@ from ratuil.screen import Screen def main(argv=None): - (name, socketType, address, keybindings, characters, colours, logfile) = parse_args(argv) + (name, socketType, address, keybindings, characters, colours, logfile, ratuil_args) = parse_args(argv) connection = Connection(socketType) @@ -39,7 +39,7 @@ def main(argv=None): tty.setraw(sys.stdin) Screen.default.hide_cursor() - display = Display(characters) + display = Display(characters, ratuil_args) client = Client(display, name, connection, keybindings, logfile) signal.signal(signal.SIGWINCH, client.onSigwinch) try: diff --git a/asciifarmclient/parseargs.py b/asciifarmclient/parseargs.py index a8b393b..db63d46 100644 --- a/asciifarmclient/parseargs.py +++ b/asciifarmclient/parseargs.py @@ -29,6 +29,8 @@ def parse_args(argv): parser.add_argument('-k', '--keybindings', help='The file with the keybinding configuration. This file is a JSON file.', default="default") parser.add_argument('-c', '--characters', help='The file with the character mappings for the graphics. If it is either of these names: {} it will be loaded from the charmaps directory.'.format(list(loaders.standardCharFiles.keys())), default="default") parser.add_argument('-o', '--logfile', help='All game messages will be written to this file.', default=None) + parser.add_argument('--reset-style', help='Reset the style when it changes. Useful on some terminals', action="store_true") + parser.add_argument('--blink-bright-background', help='Use blink attribute to make background brighter. Useful for terminals that don\'t have bright backgrounds usually. Implies --reset-style', action="store_true") colourGroup = parser.add_mutually_exclusive_group() colourGroup.add_argument('-l', '--colours', '--colors', help='enable colours! :)', action="store_true") @@ -63,4 +65,4 @@ def parse_args(argv): else: name = username - return (name, args.socket, address, keybindings, charmap, colours, args.logfile) + return (name, args.socket, address, keybindings, charmap, colours, args.logfile, {"always_reset": args.reset_style, "blink_bright_background": args.blink_bright_background}) -- cgit