Mirrors/tg
2
0
Fork 0
mirror of https://github.com/paul-nameless/tg synced 2024-11-22 11:53:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix colors

Browse source
This commit is contained in:
Paul Nameless 2020-05-05 12:44:47 +08:00
parent e819a90cb9
commit 6f171f5b9a
1 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
tg/views/__init__.py
View file

@ -5,6 +5,7 @@ import re
from datetime import datetime
from utils import num
from colors import cyan, blue, white, normal, reverse, magenta, get_color
log = logging.getLogger(__name__)
@ -26,20 +27,6 @@ class View:
curses.start_color()
curses.use_default_colors()
# default
curses.init_pair(1, -1, -1)
curses.init_pair(2, curses.COLOR_CYAN, -1)
curses.init_pair(3, curses.COLOR_BLUE, -1)
curses.init_pair(4, curses.COLOR_MAGENTA, -1)
curses.init_pair(5, curses.COLOR_YELLOW, -1)
curses.init_pair(6, curses.COLOR_BLACK, -1)
# selection
curses.init_pair(7, -1, curses.COLOR_BLACK)
curses.init_pair(8, curses.COLOR_CYAN, curses.COLOR_BLACK)
curses.init_pair(9, curses.COLOR_BLUE, curses.COLOR_BLACK)
curses.init_pair(10, curses.COLOR_MAGENTA, curses.COLOR_BLACK)
self.stdscr = stdscr
self.chats = ChatView(stdscr)
self.msgs = MsgView(stdscr)
@ -173,16 +160,16 @@ class ChatView:
# if len(msg) < self.w:
# msg += ' ' * (self.w - len(msg) - 1)
colors = [(cyan, -1), (blue, -1), (white, -1), (magenta, -1)]
mode = normal
if i == current:
colors = [8, 9, 7, 10]
else:
colors = [2, 3, 1, 4]
mode = reverse
offset = 0
j = 0
# for color, e in zip(colors, msg.split(' ', maxsplit=3)):
for color, e in zip(colors, [" " + date, title]):
attr = curses.color_pair(color)
attr = mode | get_color(*color)
if offset > self.w:
break
j += 1
@ -194,7 +181,8 @@ class ChatView:
if offset >= self.w:
continue
attr = curses.color_pair(colors[-2])
attr = get_color(*colors[-2]) | mode
msg = last_msg[: self.w - offset - 1]
# msg = msg[:self.w-1]
@ -204,17 +192,11 @@ class ChatView:
self.win.addstr(i, offset, msg, attr)
if unread:
attr = curses.color_pair(colors[-1])
attr = get_color(*colors[-1]) | mode
unread = " " + str(unread) + " "
self.win.addstr(i, self.w - len(unread) - 1, unread, attr)
# if i == current:
# # attr = curses.A_REVERSE | curses.color_pair(1)
# attr = curses.A_REVERSE
# self.win.addstr(i, 0, msg, attr)
# continue
# self.win.addstr(i, 0, msg)
self.win.refresh()
@ -265,19 +247,20 @@ class MsgView:
# log.warning('Reched end of lines')
break
colors = [(cyan, -1), (blue, -1), (white, -1)]
mode = normal
if i == current:
colors = [7, 8, 9, 7]
else:
colors = [1, 2, 3, 1]
mode = reverse
offset = 0
j = 0
for color, e in zip(colors, s.split(" ", maxsplit=3)):
attr = curses.color_pair(color)
for color, e in zip(colors, [" " + dt, " " + user_id, msg]):
if not e.strip():
continue
attr = get_color(*color) | mode
j += 1
if j < 4:
e = e + " "
# log.info('####: %s', (e, offset, count))
self.win.addstr(count, offset, e, attr)
offset += len(e)