import threading
+class ArgumentError(Exception):
+ pass
+
+
class UrwidSetup:
def __init__(self, socket):
self.server_output = []
input_handler = getattr(self.InputHandler(self.reply_widget,
self.map_widget,
+ self.turn_widget,
self.server_output),
'handle_input')
self.urwid_pipe_write_fd = self.main_loop.watch_pipe(input_handler)
Sets up an urwid.Pile inside a returned urwid.Filler; top to bottom:
- an EditToSocketWidget, prefixing self.socket input with 'SEND: '
- - self.reply_widget, a urwid.Text widget printing self.socket replies
- 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.EditToSocketWidget(self.socket, 'SEND: ')
- self.reply_widget = urwid.Text('')
self.map_widget = self.MapWidget('', wrap='clip')
+ self.turn_widget = self.TurnWidget('')
+ self.reply_widget = self.LogWidget('')
map_box = urwid.Padding(self.map_widget, width=50)
- widget_pile = urwid.Pile([edit_widget, self.reply_widget, map_box])
+ widget_pile = urwid.Pile([edit_widget, map_box, self.turn_widget,
+ self.reply_widget])
return urwid.Filler(widget_pile, valign='top')
class EditToSocketWidget(urwid.Edit):
plom_socket_io.send(self.socket, self.edit_text)
self.edit_text = ''
+ class TurnWidget(urwid.Text):
+ """Displays turn number."""
+
+ def set_turn(self, turn_string):
+ turn_string = turn_string.strip()
+ if not turn_string.isdigit():
+ raise ArgumentError('Argument must be non-negative integer.')
+ self.set_text('TURN: ' + turn_string)
+
+ class LogWidget(urwid.Text):
+ """Displays client log, newest message on top."""
+
+ def add(self, text):
+ """Add text plus newline to (top of) log."""
+ self.set_text(text + '\n' + self.text)
+
class MapWidget(urwid.Text):
"""Stores/updates/draws game map."""
+ map_size = (5, 5)
terrain_map = ' ' * 25
- position = [0,0]
+ position = (0, 0)
+ things = []
+
+ class Thing:
+ def __init__(self, position, symbol):
+ self.position = position
+ self.symbol = symbol
def draw_map(self):
- """Draw map view from .terrain_map, .position."""
+ """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] * (5 + 1) + self.position[1]
- whole_map[pos_i] = '@'
+ for t in self.things:
+ pos_i = t.position[0] * (self.map_size[1] + 1) + t.position[1]
+ whole_map[pos_i] = t.symbol
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."""
+ """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_y(self, position_y_string):
- """Update self.position[0]."""
- self.position[0] = int(position_y_string)
+ def update_things(self, thing_description):
+ """Append thing of thing_description to self.things."""
+ thing_types = {'human': '@', 'monster': 'M'}
+ tokens = thing_description.split()
+ if len(tokens) != 2:
+ raise ArgumentError('Wrong number of tokens.')
+ yx = self.get_yx(tokens[1])
+ if yx[0] >= self.map_size[0] or yx[1] >= self.map_size[1]:
+ raise ArgumentError('Position outside of map size bounds.')
+ type_token = tokens[0]
+ prefix = 'TYPE:'
+ type_ = '?'
+ if len(type_token) <= len(prefix) or \
+ type_token[:len(prefix)] != prefix:
+ raise ArgumentError('Invalid type token.')
+ type_ = type_token[len(prefix):]
+ if type_ not in thing_types:
+ raise ArgumentError('Unknown thing type.')
+ self.things += [self.Thing(yx, thing_types[type_])]
self.draw_map()
- def update_position_x(self, position_x_string):
- """Update self.position[1]."""
- self.position[1] = int(position_x_string)
- self.draw_map()
+ def clear_things(self, _):
+ self.things = []
class InputHandler:
"""Delivers data from other thread to widget via message_container.
urwid-external thread.
"""
- def __init__(self, widget1, widget2, message_container):
- self.widget1 = widget1
- self.widget2 = widget2
+ def __init__(self, log_widget, map_widget, turn_widget,
+ message_container):
+ self.log_widget = log_widget
+ self.map_widget = map_widget
+ self.turn_widget = turn_widget
self.message_container = message_container
def handle_input(self, trigger):
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.
"""
+
+ def mapdraw_command(prefix, func):
+ n = len(prefix)
+ if len(msg) > n and msg[:n] == prefix:
+ m = getattr(self.map_widget, func)
+ m(msg[n:])
+ return True
+ return False
+
+ def turndraw_command(prefix, func):
+ n = len(prefix)
+ if len(msg) > n and msg[:n] == prefix:
+ m = getattr(self.turn_widget, func)
+ m(msg[n:])
+ return True
+ return False
+
msg = self.message_container[0]
if msg == 'BYE':
raise urwid.ExitMainLoop()
return
- if len(msg) > 8 and msg[:8] == 'TERRAIN ':
- self.widget2.update_terrain(msg[8:])
- elif len(msg) > 11 and msg[:11] == 'POSITION_Y ':
- self.widget2.update_position_y(msg[11:])
- elif len(msg) > 11 and msg[:11] == 'POSITION_X ':
- self.widget2.update_position_x(msg[11:])
+ found_command = False
+ try:
+ found_command = turndraw_command('NEW_TURN ', 'set_turn') or (
+ mapdraw_command('NEW_TURN ', 'clear_things') or
+ mapdraw_command('TERRAIN\n', 'update_terrain') or
+ mapdraw_command('THING ', 'update_things') or
+ mapdraw_command('MAP_SIZE ', 'update_map_size'))
+ except ArgumentError as e:
+ self.log_widget.add('ARGUMENT ERROR: ' + msg + '\n' + str(e))
else:
- self.widget1.set_text('SERVER: ' + msg)
+ if not found_command:
+ self.log_widget.add('UNHANDLED INPUT: ' + msg)
del self.message_container[0]
def recv_loop(self):
projects / plomrogue2-experiments / blobdiff