From b2615144de8ab4985d4b21fb8db29ddf0b6c9625 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Sun, 20 Jan 2019 04:32:48 +0100 Subject: [PATCH] Improve client. --- client.py | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/client.py b/client.py index e02de21..6ff9c5a 100755 --- a/client.py +++ b/client.py @@ -103,10 +103,19 @@ class WidgetManager: self.map_widget = urwid.Text('', wrap='clip') self.turn_widget = urwid.Text('') self.log_widget = urwid.Text('') - map_box = urwid.Padding(self.map_widget, width=50) - widget_pile = urwid.Pile([edit_widget, map_box, self.turn_widget, - self.log_widget]) - self.top = urwid.Filler(widget_pile, valign='top') + + edit_map = urwid.AttrMap(edit_widget, 'foo') + turn_map = urwid.AttrMap(self.turn_widget, 'bar') + log_map = urwid.AttrMap(self.log_widget, 'baz') + widget_pile = urwid.Pile([edit_map, + urwid.Divider(), + turn_map, + urwid.Divider(), + log_map]) + widget_columns = urwid.Columns([(20, widget_pile), self.map_widget], + dividechars=1) + + self.top = urwid.Filler(widget_columns, valign='top') def draw_map(self): """Draw map view from .game.map_.terrain, .game.things.""" @@ -120,7 +129,18 @@ class WidgetManager: """Redraw all non-edit widgets.""" self.turn_widget.set_text('TURN: ' + str(self.game.world.turn)) self.log_widget.set_text(self.game.log_text) - self.map_widget.set_text(self.draw_map()) + map_lines = self.draw_map() + new_map_text = [] + for char in map_lines: + if char == '.': + new_map_text += [('foo', char)] + elif char in {'x', 'X', '#'}: + new_map_text += [('bar', char)] + elif char in {'@', 'm'}: + new_map_text += [('baz', char)] + else: + new_map_text += [char] + self.map_widget.set_text(new_map_text) class EditToSocketWidget(urwid.Edit): """Extends urwid.Edit with socket to send input on 'enter' to.""" @@ -166,7 +186,10 @@ class PlomRogueClient: self.socket = socket self.widget_manager = WidgetManager(self.socket, self.game) self.server_output = [] - self.urwid_loop = urwid.MainLoop(self.widget_manager.top) + palette = [('foo', 'white', 'dark red'), + ('bar', 'white', 'dark blue'), + ('baz', 'white', 'dark green')] + self.urwid_loop = urwid.MainLoop(self.widget_manager.top, palette) self.urwid_pipe_write_fd = self.urwid_loop.watch_pipe(self. handle_input) self.recv_loop_thread = threading.Thread(target=self.recv_loop) -- 2.30.2