New client: Add client->server communication, with QUIT command.

[plomrogue] / client_prototype.py

diff --git a/client_prototype.py b/client_prototype.py
index f239242ec20c4180c1caa9d20b7116442ffb5e14..3e0ad735b8b8f19d088ad62d37af485b6ea09383 100644 (file)
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -1,5 +1,6 @@
 import curses
 import signal
+import os
 
 
 def set_window_geometries():
@@ -87,7 +88,7 @@ def draw_screen():
                 j = win["start"][int(k == 0)] - sep_size
                 if (j >= 0 and j < screen_size[int(k == 0)]):
                     start = win["start"][k]
-                    start = start if start >= 0 else 0
+                    # start = start if start >= 0 else 0
                     end = win["start"][k] + win["size"][k]
                     end = end if end < screen_size[k] else screen_size[k]
                     if k:
@@ -113,8 +114,7 @@ def draw_screen():
                     stdscr.addch(down, right, '+')
 
     def draw_window_contents():
-        for win in windows:
-            offset, size, winmap = win["func"]()
+        def draw_winmap():
             stop = [0, 0]
             for i in range(2):
                 stop[i] = win["size"][i] + offset[i]
@@ -127,6 +127,36 @@ def draw_screen():
                     if (y_in_screen < screen_size[0]
                             and x_in_screen < screen_size[1]):
                         stdscr.addch(y_in_screen, x_in_screen, cell)
+        def draw_scroll_hints():
+            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)
+                    for j in range(win["size"][ni] - non_hint_space):
+                        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]
+                    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
+                    draw_scroll_arrows('v', '>')
+                    draw_scroll_string(size[i] - offset[i] - win["size"][i])
+        for win in windows:
+            offset, size, winmap = win["func"]()
+            draw_winmap()
+            draw_scroll_hints()
 
     stdscr.clear()
     draw_window_border_lines()
@@ -144,9 +174,11 @@ def main(stdscr):
     set_window_geometries()
     while True:
         draw_screen()
-        char = stdscr.getkey()
-        if ('Q' == char):
-            exit()
+        char = stdscr.getch()
+        if (char >= 0):
+            if chr(char) in commands:
+                commands[chr(char)]()
+
 
 def foo():
     winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
@@ -155,6 +187,12 @@ def foo():
     return offset, size, winmap
 
 
+def command_quit():
+    io["file_out"].write("QUIT\n")
+    io["file_out"].flush()
+    exit()
+
+
 windows = [
     {"config": [1, 33], "func": foo},
     {"config": [-7, 33], "func": foo},
@@ -162,9 +200,20 @@ windows = [
     {"config": [4, 16], "func": foo},
     {"config": [0, -34], "func": foo}
 ]
+io = {
+    "path_out": "server/in"
+}
+commands = {
+    "Q": command_quit
+}
+
 
 sep_size = 1  # Width of inter-window borders and title bars.
 stdscr = None
 screen_size = [0,0]
-
+if (not os.access(io["path_out"], os.F_OK)):
+    print("No server input file found at expected location.")
+    exit()
+io["file_out"] = open(io["path_out"], "a")
 curses.wrapper(main)
+io["file_out"].close()