X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=client.py;h=7e9f18e9f50cb2f74c37ac1f6a8dd92473c22522;hb=31831b9e6147a89b20a97a52f4fe5e01acc283d0;hp=97e0588c018fa35873f9f211ca93526cbe83c906;hpb=4c633486d35862198e0ed6553ee52e43a0401a3b;p=plomrogue2-experiments
diff --git a/client.py b/client.py
index 97e0588..7e9f18e 100755
--- a/client.py
+++ b/client.py
@@ -6,6 +6,10 @@ import socket
import threading
+class ArgumentError(Exception):
+ pass
+
+
class UrwidSetup:
def __init__(self, socket):
@@ -32,7 +36,7 @@ class UrwidSetup:
"""
self.socket = socket
self.main_loop = urwid.MainLoop(self.setup_widgets())
- self.server_output = ['']
+ self.server_output = []
input_handler = getattr(self.InputHandler(self.reply_widget,
self.map_widget,
self.server_output),
@@ -44,19 +48,19 @@ class UrwidSetup:
"""Return container widget with all widgets we want on our screen.
Sets up an urwid.Pile inside a returned urwid.Filler; top to bottom:
- - an EditToSocket widget, prefixing self.socket input with 'SEND: '
- - self.reply_widget, a urwid.Text widget printing self.socket replies
+ - an EditToSocketWidget, prefixing self.socket input with 'SEND: '
- a 50-col wide urwid.Padding container for self.map_widget, which is
to print clipped map representations
+ - self.reply_widget, a urwid.Text widget printing self.socket replies
"""
- edit_widget = self.EditToSocket(self.socket, 'SEND: ')
+ edit_widget = self.EditToSocketWidget(self.socket, 'SEND: ')
self.reply_widget = urwid.Text('')
- self.map_widget = urwid.Text('', wrap='clip')
+ self.map_widget = self.MapWidget('', wrap='clip')
map_box = urwid.Padding(self.map_widget, width=50)
- widget_pile = urwid.Pile([edit_widget, self.reply_widget, map_box])
- return urwid.Filler(widget_pile)
+ widget_pile = urwid.Pile([edit_widget, map_box, self.reply_widget])
+ return urwid.Filler(widget_pile, valign='top')
- class EditToSocket(urwid.Edit):
+ class EditToSocketWidget(urwid.Edit):
"""Extends urwid.Edit with socket to send input on 'enter' to."""
def __init__(self, socket, *args, **kwargs):
@@ -70,6 +74,74 @@ class UrwidSetup:
plom_socket_io.send(self.socket, self.edit_text)
self.edit_text = ''
+ class MapWidget(urwid.Text):
+ """Stores/updates/draws game map."""
+ map_size = (5, 5)
+ terrain_map = ' ' * 25
+ position = (0, 0)
+
+ def draw_map(self):
+ """Draw map view from .map_size, .terrain_map, .position."""
+ whole_map = []
+ for c in self.terrain_map:
+ whole_map += [c]
+ pos_i = self.position[0] * (self.map_size[1] + 1) + self.position[1]
+ whole_map[pos_i] = '@'
+ self.set_text(''.join(whole_map))
+
+ def get_yx(self, yx_string):
+
+ def get_axis_position_from_argument(axis, token):
+ if len(token) < 3 or token[:2] != axis + ':' or \
+ not token[2:].isdigit():
+ raise ArgumentError('Bad arg for ' + axis + ' position.')
+ return int(token[2:])
+
+ tokens = yx_string.split(',')
+ if len(tokens) != 2:
+ raise ArgumentError('wrong number of ","-separated arguments')
+ y = get_axis_position_from_argument('Y', tokens[0])
+ x = get_axis_position_from_argument('X', tokens[1])
+ return (y, x)
+
+ def update_map_size(self, size_string):
+ """Set map size, redo self.terrain_map in new size, '?'-filled."""
+ new_map_size = self.get_yx(size_string)
+ if 0 in new_map_size:
+ raise ArgumentError('size value for either axis must be >0')
+ self.map_size = new_map_size
+ self.terrain_map = ''
+ for y in range(self.map_size[0]):
+ self.terrain_map += '?' * self.map_size[1] + '\n'
+ self.draw_map()
+
+ def update_terrain(self, terrain_map):
+ """Update self.terrain_map. Ensure size matching self.map_size."""
+ lines = terrain_map.split('\n')
+ if len(lines) != self.map_size[0]:
+ raise ArgumentError('wrong map height')
+ for line in lines:
+ if len(line) != self.map_size[1]:
+ raise ArgumentError('wrong map width')
+ self.terrain_map = terrain_map
+ self.draw_map()
+
+ def update_position(self, position_string):
+ """Update self.position, ensure it's within map bounds."""
+
+ def get_axis_position_from_argument(axis, token):
+ if len(token) < 3 or token[:2] != axis + ':' or \
+ not token[2:].isdigit():
+ raise ArgumentError('Bad arg for ' + axis + ' position.')
+ return int(token[2:])
+
+ new_position = self.get_yx(position_string)
+ if new_position[0] >= self.map_size[0] or \
+ new_position[1] >= self.map_size[1]:
+ raise ArgumentError('Position outside of map size bounds.')
+ self.position = new_position
+ self.draw_map()
+
class InputHandler:
"""Delivers data from other thread to widget via message_container.
@@ -96,29 +168,48 @@ class UrwidSetup:
self.message_container, and just pipe the trigger to inform us
about this.
- If the message delivered is 'BYE', quits Urbit.
+ If the message delivered is 'BYE', quits Urwid.
"""
- if self.message_container[0] == 'BYE':
+
+ def mapdraw_command(prefix, func):
+ n = len(prefix)
+ if len(msg) > n and msg[:n] == prefix:
+ m = getattr(self.widget2, func)
+ m(msg[n:])
+ return True
+ return False
+
+ msg = self.message_container[0]
+ if msg == 'BYE':
raise urwid.ExitMainLoop()
return
- self.widget1.set_text('SERVER: ' + self.message_container[0])
- self.widget2.set_text('loremipsumdolorsitamet '
- 'loremipsumdolorsitamet'
- 'loremipsumdolorsitamet '
- 'loremipsumdolorsitamet\n'
- 'loremipsumdolorsitamet '
- 'loremipsumdolorsitamet')
+ found_command = False
+ try:
+ found_command = (
+ mapdraw_command('TERRAIN\n', 'update_terrain') or
+ mapdraw_command('POSITION ', 'update_position') or
+ mapdraw_command('MAP_SIZE ', 'update_map_size'))
+ except ArgumentError as e:
+ self.widget1.set_text('BAD ARGUMENT: ' + msg + '\n' +
+ str(e))
+ else:
+ if not found_command:
+ self.widget1.set_text('UNKNOWN COMMAND: ' + msg)
+ del self.message_container[0]
def recv_loop(self):
"""Loop to receive messages from socket and deliver them to urwid.
- Writes finished messages from the socket to self.server_output[0],
- then sends a single b' ' through self.urwid_pipe_write_fd to trigger
- the urwid code to read from it.
+ Waits for self.server_output to become empty (this signals that the
+ input handler is finished / ready to receive new input), then writes
+ finished message from socket to self.server_output, then sends a single
+ b' ' through self.urwid_pipe_write_fd to trigger the input handler.
"""
import os
for msg in plom_socket_io.recv(self.socket):
- self.server_output[0] = msg
+ while len(self.server_output) > 0:
+ pass
+ self.server_output += [msg]
os.write(self.urwid_pipe_write_fd, b' ')
def run(self):