X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client_prototype.py;h=9f2a91ee3d32f5875cb67211891b2b7753bbdea2;hb=ec0dcf6e4a9bbac02aa9f013c90fa42cdd971439;hp=6813207d9d737c69d060edddfa87291c2dba903e;hpb=69d3c23f7a68cb653ee27ca9f35144b807b2fc31;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 6813207..9f2a91e 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -1,5 +1,6 @@
 import curses
 import signal
+import os
 
 
 def set_window_geometries():
@@ -127,8 +128,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 +137,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,7 +165,7 @@ def draw_screen():
     stdscr.refresh()
 
 
-def main(stdscr):
+def cursed_main(stdscr):
     curses.noecho()
     curses.curs_set(False)
     # stdscr.keypad(True)
@@ -177,8 +175,10 @@ def main(stdscr):
     while True:
         draw_screen()
         char = stdscr.getch()
-        if (char >= 0 and chr(char) == 'Q'):
-            exit()
+        if (char >= 0):
+            if chr(char) in commands:
+                commands[chr(char)]()
+
 
 def foo():
     winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
@@ -187,6 +187,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 +200,28 @@ 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]
 
-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")
+    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()