New client: Only redraw screen when content change can be assumed.

[plomrogue] / client_prototype.py

diff --git a/client_prototype.py b/client_prototype.py
index 6813207d9d737c69d060edddfa87291c2dba903e..9a67b98d0e0ac54d72de916b5aa0ec6ef21d2dfe 100644 (file)
--- 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,45 @@ def draw_screen():
     stdscr.refresh()
 
 
-def main(stdscr):
+def test_and_poll_server():
+    half_wait_time = 5
+    new_file_content = io["file_in"].read()
+    # TODO: do something useful with new_file_content
+    server_answered = len(new_file_content) > 0
+    if server_answered:
+        test_and_poll_server.ping_sent = False
+    elif test_and_poll_server.wait_start + half_wait_time < time.time():
+        if not test_and_poll_server.ping_sent:
+            io["file_out"].write("PING\n")
+            io["file_out"].flush()
+            test_and_poll_server.ping_sent = True
+            test_and_poll_server.wait_start = time.time()
+        elif test_and_poll_server.ping_sent:
+            raise SystemExit("Server not answering anymore.")
+test_and_poll_server.wait_start = 0
+
+
+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:
+            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
+        test_and_poll_server()
+
 
 def foo():
     winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
@@ -187,6 +214,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 +227,32 @@ windows = [
     {"config": [4, 16], "func": foo},
     {"config": [0, -34], "func": foo}
 ]
-
+io = {
+    "path_out": "server/in",
+    "path_in": "server/out"
+}
+commands = {
+    "Q": command_quit
+}
 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:
+    if "file_out" in io:
+        io["file_out"].close()
+    if "file_in" in io:
+        io["file_in"].close()