summaryrefslogtreecommitdiff
path: root/src/text_buffer.py
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2012-05-20 13:43:53 +0200
committerFlorent Le Coz <louiz@louiz.org>2012-05-20 13:43:53 +0200
commit65c2d3dc8891eae4307375eef4b79d13ac793e46 (patch)
tree98359af6c6d9809585b52dcc1aadf083fa590412 /src/text_buffer.py
parent0f0efb7ada6ad60f88360bc6a8feb3607fcabd3c (diff)
parent51c788ad96703d215942499ffefe6fdc98326b6b (diff)
downloadpoezio-65c2d3dc8891eae4307375eef4b79d13ac793e46.tar.gz
poezio-65c2d3dc8891eae4307375eef4b79d13ac793e46.tar.bz2
poezio-65c2d3dc8891eae4307375eef4b79d13ac793e46.tar.xz
poezio-65c2d3dc8891eae4307375eef4b79d13ac793e46.zip
Merge branch 'master' of https://git.louiz.org/poezio
Diffstat (limited to 'src/text_buffer.py')
-rw-r--r--src/text_buffer.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/text_buffer.py b/src/text_buffer.py
index 9b717882..b615e96c 100644
--- a/src/text_buffer.py
+++ b/src/text_buffer.py
@@ -35,7 +35,7 @@ class TextBuffer(object):
def add_window(self, win):
self.windows.append(win)
- def add_message(self, txt, time=None, nickname=None, nick_color=None, history=None, user=None):
+ def add_message(self, txt, time=None, nickname=None, nick_color=None, history=None, user=None, highlight=False):
time = time or datetime.now()
if txt.startswith('/me '):
if nick_color:
@@ -45,7 +45,7 @@ class TextBuffer(object):
else:
color = None
# TODO: display the bg color too.
- txt = ("\x19%(info_col)s}* \x19%(col)s}" % {'col':color or 5, 'info_col':get_theme().COLOR_INFORMATION_TEXT[0]})+ nickname + ' \x19%(info_col)s}' % {'info_col':get_theme().COLOR_INFORMATION_TEXT[0]} + txt[4:]
+ txt = '\x19%(info_col)s}* \x19%(col)s}%(nick)s \x19%(info_col)s}%(msg)s' % {'info_col':get_theme().COLOR_ME_MESSAGE[0], 'col': color or 5, 'nick': nickname, 'msg': txt[4:]}
nickname = None
msg = Message(txt='%s\x19o'%(txt.replace('\t', ' '),), nick_color=nick_color,
time=time, str_time=time.strftime("%Y-%m-%d %H:%M:%S")\
@@ -57,7 +57,7 @@ class TextBuffer(object):
ret_val = None
for window in self.windows: # make the associated windows
# build the lines from the new message
- nb = window.build_new_message(msg, history=history)
+ nb = window.build_new_message(msg, history=history, highlight=highlight)
if ret_val is None:
ret_val = nb
if window.pos != 0: