X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client_prototype.py;h=8201a75db31b3898dede5e3df87a71769ef776fb;hb=7afd130c2f85eb46bdad2eee652c7e1ce71ca5bc;hp=1801da1072f2cff77e5e1ca0e71420d5555c1ed8;hpb=aad061535f0856757bcc84f64c6847cf11914ee6;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 1801da1..8201a75 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -1,4 +1,5 @@
 import curses
+import math
 import os
 import signal
 import time
@@ -120,10 +121,11 @@ def draw_screen():
             stop = [0, 0]
             for i in range(2):
                 stop[i] = win["size"][i] + offset[i]
-                stop[i] = stop[i] if stop[i] < size[i] else size[i]
+                if stop[i] >= winmap_size[i]:
+                    stop[i] = winmap_size[i]
             for y in range(offset[0], stop[0]):
                 for x in range(offset[1], stop[1]):
-                    cell = winmap[y * size[1] + x]
+                    cell = winmap[y * winmap_size[1] + x]
                     y_in_screen = win["start"][0] + (y - offset[0])
                     x_in_screen = win["start"][1] + (x - offset[1])
                     if (y_in_screen < screen_size[0]
@@ -151,12 +153,13 @@ def draw_screen():
                     pos_1 = win["start"][i]
                     draw_scroll_arrows('^', '<')
                     draw_scroll_string(offset[i])
-                if (size[i] > offset[i] + win["size"][i]):
+                if (winmap_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])
+                    draw_scroll_string(winmap_size[i] - offset[i]
+                        - win["size"][i])
         for win in windows:
-            offset, size, winmap = win["func"]()
+            offset, winmap_size, winmap = win["func"]()
             draw_winmap()
             draw_scroll_hints()
 
@@ -190,6 +193,16 @@ def read_worldstate():
 read_worldstate.last_checked_mtime = -1
 
 
+def read_message_queue():
+    while (len(message_queue["messages"]) > 1
+        or (len(message_queue["messages"]) == 0
+            and not message_queue["open_end"])):
+        message = message_queue["messages"].pop(0)
+        if message[0:4] == "LOG ":
+            world_data["log"] += [message[4:]]
+            cursed_main.redraw = True
+
+
 def cursed_main(stdscr):
 
     def ping_test():
@@ -242,23 +255,41 @@ def cursed_main(stdscr):
         ping_test()
         read_into_message_queue()
         read_worldstate()
+        read_message_queue()
 
 
 def win_foo():
     winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
-    size = [4, 3]
+    winmap_size = [4, 3]
     offset = [0, 0]
-    return offset, size, winmap
+    return offset, winmap_size, winmap
 
 
 def win_info():
-    size = [1, 33]
     winmap = "T: " + str(world_data["turn"]) \
         + " H: " + str(world_data["lifepoints"]) \
         + " S: " + str(world_data["satiation"])
-    winmap = str(winmap).ljust(size[1])
+    winmap_size = [1, len(winmap)]
+    offset = [0, 0]
+    return offset, winmap_size, winmap
+
+
+def win_log():
+    win_size = next(win["size"] for win in windows if win["func"] == win_log)
     offset = [0, 0]
-    return offset, size, winmap
+    winmap = ""
+    number_of_lines = 0
+    for line in world_data["log"]:
+        number_of_lines += math.ceil(len(line) / win_size[1])
+        padding_size = win_size[1] - (len(line) % win_size[1])
+        winmap += line + (padding_size * " ")
+    if number_of_lines < win_size[0]:
+        winmap = (" " * win_size[1] * (win_size[0] - number_of_lines)) + winmap
+        number_of_lines = win_size[0]
+    elif number_of_lines > win_size[0]:
+        offset[0] = number_of_lines - win_size[0]
+    winmap_size = [number_of_lines, win_size[1]]
+    return offset, winmap_size, winmap
 
 
 def command_quit():
@@ -269,7 +300,7 @@ def command_quit():
 
 windows = [
     {"config": [1, 33], "func": win_info},
-    {"config": [-7, 33], "func": win_foo},
+    {"config": [-7, 33], "func": win_log},
     {"config": [4, 16], "func": win_foo},
     {"config": [4, 16], "func": win_foo},
     {"config": [0, -34], "func": win_foo}
@@ -288,6 +319,7 @@ message_queue = {
 }
 world_data = {
     "lifepoints": -1,
+    "log": [],
     "satiation": -1,
     "turn": -1
 }