X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client_prototype.py;h=b19f50cb771d96e301a425f78cbb72ce2e576d45;hb=a553633d2be3971ba3a6bab2b00e74aa6c5c308f;hp=6813207d9d737c69d060edddfa87291c2dba903e;hpb=69d3c23f7a68cb653ee27ca9f35144b807b2fc31;p=plomrogue diff --git a/client_prototype.py b/client_prototype.py index 6813207..b19f50c 100644 --- a/client_prototype.py +++ b/client_prototype.py @@ -1,5 +1,7 @@ import curses +import os import signal +import time def set_window_geometries(): @@ -77,6 +79,7 @@ def set_window_geometries(): for win in windows: set_window_size() place_window() + cursed_main.redraw = True def draw_screen(): @@ -127,8 +130,8 @@ def draw_screen(): and x_in_screen < screen_size[1]): stdscr.addch(y_in_screen, x_in_screen, cell) def draw_scroll_hints(): - def draw_scroll_string(hint_number): - hint = ' ' + str(hint_number + 1) + ' more ' + unit + ' ' + def draw_scroll_string(n_lines_outside): + hint = ' ' + str(n_lines_outside + 1) + ' more ' + unit + ' ' if len(hint) <= win["size"][ni]: non_hint_space = win["size"][ni] - len(hint) hint_offset = int(non_hint_space / 2) @@ -136,24 +139,21 @@ def draw_screen(): pos_2 = win["start"][ni] + hint_offset + j x, y = (pos_2, pos_1) if ni else (pos_1, pos_2) stdscr.addch(y, x, hint[j], curses.A_REVERSE) + def draw_scroll_arrows(ar1, ar2): + for j in range(win["size"][ni]): + pos_2 = win["start"][ni] + j + x, y = (pos_2, pos_1) if ni else (pos_1, pos_2) + stdscr.addch(y, x, ar1 if ni else ar2, curses.A_REVERSE) for i in range(2): ni = int(i == 0) unit = 'rows' if ni else 'columns' if (offset[i] > 0): pos_1 = win["start"][i] - for j in range(win["size"][ni]): - pos_2 = win["start"][ni] + j - x, y = (pos_2, pos_1) if ni else (pos_1, pos_2) - stdscr.addch(y, x, '^' if ni else '<', - curses.A_REVERSE) + draw_scroll_arrows('^', '<') draw_scroll_string(offset[i]) if (size[i] > offset[i] + win["size"][i]): pos_1 = win["start"][i] + win["size"][i] - 1 - for j in range(win["size"][ni]): - pos_2 = win["start"][ni] + j - x, y = (pos_2, pos_1) if ni else (pos_1, pos_2) - stdscr.addch(y, x, 'v' if ni else '>', - curses.A_REVERSE) + draw_scroll_arrows('v', '>') draw_scroll_string(size[i] - offset[i] - win["size"][i]) for win in windows: offset, size, winmap = win["func"]() @@ -167,18 +167,64 @@ def draw_screen(): stdscr.refresh() -def main(stdscr): +def ping_test(server_answered): + half_wait_time = 5 + if server_answered: + ping_test.sent = False + elif ping_test.wait_start + half_wait_time < time.time(): + if not ping_test.sent: + io["file_out"].write("PING\n") + io["file_out"].flush() + ping_test.sent = True + ping_test.wait_start = time.time() + elif ping_test.sent: + raise SystemExit("Server not answering anymore.") +ping_test.wait_start = 0 + + +def read_into_message_queue(string): + if string == "": + return + new_open_end = False + if string[-1] is not "\n": + new_open_end = True + new_messages = string.splitlines() + logfile = open("log", "a") + logfile.write(str(new_messages) + "\n") + logfile.flush() + logfile.close() + if message_queue["open_end"]: + message_queue["messages"][-1] = message_queue["messages"][-1] + new_messages[0] + del new_messages[0] + message_queue["messages"] = message_queue["messages"] + new_messages + if new_open_end: + message_queue["open_end"] = True + + +def cursed_main(stdscr): curses.noecho() curses.curs_set(False) # stdscr.keypad(True) signal.signal(signal.SIGWINCH, lambda ignore_1, ignore_2: set_window_geometries()) set_window_geometries() + delay = 1 while True: - draw_screen() + stdscr.timeout(delay) + delay = delay * 2 if delay < 1000 else delay + if cursed_main.redraw: + delay = 1 + draw_screen() + cursed_main.redraw = False char = stdscr.getch() - if (char >= 0 and chr(char) == 'Q'): - exit() + if (char >= 0): + if chr(char) in commands: + commands[chr(char)]() + cursed_main.redraw = True + new_data_from_server = io["file_in"].read() + ping_test(len(new_data_from_server) > 0) + read_into_message_queue(new_data_from_server) + def foo(): winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x'] @@ -187,6 +233,12 @@ def foo(): return offset, size, winmap +def command_quit(): + io["file_out"].write("QUIT\n") + io["file_out"].flush() + raise SystemExit("Received QUIT command, forwarded to server, leaving.") + + windows = [ {"config": [1, 33], "func": foo}, {"config": [-7, 33], "func": foo}, @@ -194,9 +246,40 @@ windows = [ {"config": [4, 16], "func": foo}, {"config": [0, -34], "func": foo} ] - +io = { + "path_out": "server/in", + "path_in": "server/out" +} +commands = { + "Q": command_quit +} +message_queue = { + "open_end": False, + "messages": [] +} sep_size = 1 # Width of inter-window borders and title bars. stdscr = None screen_size = [0,0] -curses.wrapper(main) + +try: + if (not os.access(io["path_out"], os.F_OK)): + msg = "No server input file found at " + io["path_out"] + "." + raise SystemExit(msg) + io["file_out"] = open(io["path_out"], "a") + io["file_in"] = open(io["path_in"], "r") + curses.wrapper(cursed_main) +except SystemExit as exit: + print("ABORTING: " + exit.args[0]) +except: + print("SOMETHING WENT WRONG IN UNEXPECTED WAYS") + raise +finally: + logfile = open("log", "a") + logfile.write(str(message_queue)) + logfile.flush() + logfile.close() + if "file_out" in io: + io["file_out"].close() + if "file_in" in io: + io["file_in"].close()