Mercurial > hg > crecord
changeset 68:2710e45e7435
Don't assume a black background.
author | Nicholas Riley <njriley@illinois.edu> |
---|---|
date | Tue, 13 Jul 2010 15:48:30 -0400 |
parents | 0e26a397af52 |
children | d341cb82bdaf |
files | crecord/chunk_selector.py |
diffstat | 1 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/crecord/chunk_selector.py +++ b/crecord/chunk_selector.py @@ -438,9 +438,9 @@ colorPair = self.colorPairNames[pairName] else: if fgColor is None: - fgColor = curses.COLOR_WHITE + fgColor = -1 if bgColor is None: - bgColor = curses.COLOR_BLACK + bgColor = -1 if self.colorPairs.has_key((fgColor,bgColor)): colorPair = self.colorPairs[(fgColor,bgColor)] else: @@ -780,9 +780,9 @@ colorPair = self.colorPairNames[name] else: if fgColor is None: - fgColor = curses.COLOR_WHITE + fgColor = -1 if bgColor is None: - bgColor = curses.COLOR_BLACK + bgColor = -1 if self.colorPairs.has_key((fgColor,bgColor)): colorPair = self.colorPairs[(fgColor,bgColor)] else: @@ -909,12 +909,15 @@ self.stdscr = stdscr self.yScreenSize, self.xScreenSize = self.stdscr.getmaxyx() + curses.start_color() + curses.use_default_colors() + # available colors: black, blue, cyan, green, magenta, white, yellow # init_pair(color_id, foreground_color, background_color) - self.initColorPair(curses.COLOR_WHITE, curses.COLOR_BLACK, name="normal") - self.initColorPair(curses.COLOR_WHITE, curses.COLOR_RED, name="selected") - self.initColorPair(curses.COLOR_RED, curses.COLOR_BLACK, name="deletion") - self.initColorPair(curses.COLOR_GREEN, curses.COLOR_BLACK, name="addition") + self.initColorPair(None, None, name="normal") + self.initColorPair(curses.COLOR_WHITE, curses.COLOR_MAGENTA, name="selected") + self.initColorPair(curses.COLOR_RED, None, name="deletion") + self.initColorPair(curses.COLOR_GREEN, None, name="addition") self.initColorPair(curses.COLOR_WHITE, curses.COLOR_BLUE, name="legend") # newwin([height, width,] begin_y, begin_x) self.statuswin = curses.newwin(self.numStatusLines,0,0,0)