##// END OF EJS Templates
run-tests: add --time option to log times for each test...
run-tests: add --time option to log times for each test --time also prints out the wall-clock time each test takes in descending order.

File last commit:

r17806:dc7010ed default
r17921:4ac9cf3d default
Show More
color.py
510 lines | 17.9 KiB | text/x-python | PythonLexer
Kevin Christen
Add colored output to status and qseries commands
r5787 # color.py color output for the status and qseries commands
#
# Copyright (C) 2007 Kevin Christen <kevin.christen@gmail.com>
#
Augie Fackler
color: Use the same GPL boilerplate as most hg files
r15771 # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Kevin Christen
Add colored output to status and qseries commands
r5787
Cédric Duval
extensions: improve the consistency of synopses...
r8894 '''colorize output from some commands
Kevin Christen
Add colored output to status and qseries commands
r5787
Martin Geisler
color: wrap lines in docstring
r13638 This extension modifies the status and resolve commands to add color
to their output to reflect file status, the qseries command to add
color to reflect patch status (applied, unapplied, missing), and to
diff-related commands to highlight additions, removals, diff headers,
and trailing whitespace.
Georg Brandl
diff colorization: finish highlighting trailing whitespace
r7457
Martin Geisler
color: word-wrap help texts at 70 characters
r7988 Other effects in addition to color, like bold and underlined text, are
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 also available. By default, the terminfo database is used to find the
terminal codes used to change color and effect. If terminfo is not
available, then effects are rendered with the ECMA-48 SGR control
Martin Geisler
color: don't mention internal function in docstring...
r13635 function (aka ANSI escape codes).
Kevin Christen
Add colored output to status and qseries commands
r5787
Brodie Rao
help: refer to user configuration file more consistently...
r12083 Default effects may be overridden from your configuration file::
Kevin Christen
Add colored output to status and qseries commands
r5787
Martin Geisler
color: use reST syntax for literal block
r9206 [color]
status.modified = blue bold underline red_background
status.added = green bold
status.removed = red bold blue_background
status.deleted = cyan bold underline
status.unknown = magenta bold underline
status.ignored = black bold
Kevin Christen
Add colored output to status and qseries commands
r5787
Martin Geisler
color: use reST syntax for literal block
r9206 # 'none' turns off all effects
status.clean = none
status.copied = none
Kevin Christen
Add colored output to status and qseries commands
r5787
Martin Geisler
color: use reST syntax for literal block
r9206 qseries.applied = blue bold underline
qseries.unapplied = black bold
qseries.missing = red bold
Brodie Rao
color: diff colorization...
r7456
Martin Geisler
color: use reST syntax for literal block
r9206 diff.diffline = bold
diff.extended = cyan bold
diff.file_a = red bold
diff.file_b = green bold
diff.hunk = magenta
diff.deleted = red
diff.inserted = green
diff.changed = white
diff.trailingwhitespace = bold red_background
David Soria Parra
color: Add support for bookmarks
r10046
Georg Brandl
color: colorize output of hg resolve -l
r10223 resolve.unresolved = red bold
resolve.resolved = green bold
David Soria Parra
color: Add support for bookmarks
r10046 bookmarks.current = green
Steve Borho
color: add support for Windows consoles...
r10870
Jeremy Whitlock
color: enable branches support...
r11969 branches.active = none
branches.closed = black bold
branches.current = green
branches.inactive = none
Marc Simpson
color: add styles for tags
r15048 tags.normal = green
tags.local = black bold
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 The available effects in terminfo mode are 'blink', 'bold', 'dim',
'inverse', 'invisible', 'italic', 'standout', and 'underline'; in
ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and
'underline'. How each is rendered depends on the terminal emulator.
Some may not be available for a given terminal type, and will be
silently ignored.
Brodie Rao
color: for the sake of "less -R", default to ansi in auto mode (issue2792)...
r14769 Note that on some systems, terminfo mode may cause problems when using
color with the pager extension and less -R. less with the -R option
will only display ECMA-48 color codes, and terminfo mode may sometimes
emit codes that less doesn't understand. You can work around this by
either using ansi mode (or auto mode), or by using less -r (which will
pass through all terminal control codes, not just color control
codes).
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 Because there are only eight standard colors, this module allows you
to define color names for other color slots which might be available
for your terminal type, assuming terminfo mode. For instance::
color.brightblue = 12
color.pink = 207
color.orange = 202
to set 'brightblue' to color slot 12 (useful for 16 color terminals
that have brighter colors defined in the upper eight) and, 'pink' and
'orange' to colors in 256-color xterm's default color cube. These
defined colors may then be used as any of the pre-defined eight,
including appending '_background' to set the background to that color.
Brodie Rao
color: for the sake of "less -R", default to ansi in auto mode (issue2792)...
r14769 By default, the color extension will use ANSI mode (or win32 mode on
Windows) if it detects a terminal. To override auto mode (to enable
terminfo mode, for example), set the following configuration option::
Steve Borho
color: add support for Windows consoles...
r10870
[color]
Brodie Rao
color: for the sake of "less -R", default to ansi in auto mode (issue2792)...
r14769 mode = terminfo
Steve Borho
color: add support for Windows consoles...
r10870
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will
disable color.
Kevin Christen
Add colored output to status and qseries commands
r5787 '''
timeless
remove unused imports
r14139 import os
Kevin Christen
Add colored output to status and qseries commands
r5787
Augie Fackler
color: accept usual boolean values as synonyms for always and never
r12089 from mercurial import commands, dispatch, extensions, ui as uimod, util
Kevin Christen
Add colored output to status and qseries commands
r5787 from mercurial.i18n import _
Augie Fackler
hgext: mark all first-party extensions as such
r16743 testedwith = 'internal'
Kevin Christen
Add colored output to status and qseries commands
r5787 # start and stop parameters for effects
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 _effects = {'none': 0, 'black': 30, 'red': 31, 'green': 32, 'yellow': 33,
'blue': 34, 'magenta': 35, 'cyan': 36, 'white': 37, 'bold': 1,
'italic': 3, 'underline': 4, 'inverse': 7,
'black_background': 40, 'red_background': 41,
'green_background': 42, 'yellow_background': 43,
'blue_background': 44, 'purple_background': 45,
'cyan_background': 46, 'white_background': 47}
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 def _terminfosetup(ui, mode):
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 '''Initialize terminfo data and the terminal if we're in terminfo mode.'''
global _terminfo_params
# If we failed to load curses, we go ahead and return.
if not _terminfo_params:
return
# Otherwise, see what the config file says.
if mode not in ('auto', 'terminfo'):
return
Patrick Mezard
color: code simplification
r13998 _terminfo_params.update((key[6:], (False, int(val)))
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 for key, val in ui.configitems('color')
Patrick Mezard
color: code simplification
r13998 if key.startswith('color.'))
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987
try:
curses.setupterm()
except curses.error, e:
_terminfo_params = {}
return
for key, (b, e) in _terminfo_params.items():
if not b:
continue
if not curses.tigetstr(e):
# Most terminals don't support dim, invis, etc, so don't be
# noisy and use ui.debug().
ui.debug("no terminfo entry for %s\n" % e)
del _terminfo_params[key]
if not curses.tigetstr('setaf') or not curses.tigetstr('setab'):
Danek Duvall
color: be silent when falling back to ECMA-48 mode if "auto" mode was desired...
r14758 # Only warn about missing terminfo entries if we explicitly asked for
# terminfo mode.
if mode == "terminfo":
ui.warn(_("no terminfo entry for setab/setaf: reverting to "
"ECMA-48 color\n"))
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 _terminfo_params = {}
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 def _modesetup(ui, opts):
global _terminfo_params
coloropt = opts['color']
auto = coloropt == 'auto'
always = not auto and util.parsebool(coloropt)
if not always and not auto:
return None
formatted = always or (os.environ.get('TERM') != 'dumb' and ui.formatted())
mode = ui.config('color', 'mode', 'auto')
realmode = mode
if mode == 'auto':
if os.name == 'nt' and 'TERM' not in os.environ:
# looks line a cmd.exe console, use win32 API or nothing
realmode = 'win32'
Brodie Rao
color: for the sake of "less -R", default to ansi in auto mode (issue2792)...
r14769 else:
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 realmode = 'ansi'
if realmode == 'win32':
Andrei Vermel
color.py - clear _terminfo_params in win32 mode
r14989 _terminfo_params = {}
Brodie Rao
color: fix TypeError with auto mode on win32 when colors aren't available (issue2871)...
r14768 if not w32effects:
if mode == 'win32':
# only warn if color.mode is explicitly set to win32
ui.warn(_('warning: failed to set color mode to %s\n') % mode)
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 return None
_effects.update(w32effects)
elif realmode == 'ansi':
_terminfo_params = {}
elif realmode == 'terminfo':
_terminfosetup(ui, mode)
if not _terminfo_params:
if mode == 'terminfo':
## FIXME Shouldn't we return None in this case too?
# only warn if color.mode is explicitly set to win32
ui.warn(_('warning: failed to set color mode to %s\n') % mode)
realmode = 'ansi'
else:
return None
if always or (auto and formatted):
return realmode
return None
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 try:
import curses
# Mapping from effect name to terminfo attribute name or color number.
# This will also force-load the curses module.
_terminfo_params = {'none': (True, 'sgr0'),
'standout': (True, 'smso'),
'underline': (True, 'smul'),
'reverse': (True, 'rev'),
'inverse': (True, 'rev'),
'blink': (True, 'blink'),
'dim': (True, 'dim'),
'bold': (True, 'bold'),
'invisible': (True, 'invis'),
'italic': (True, 'sitm'),
'black': (False, curses.COLOR_BLACK),
'red': (False, curses.COLOR_RED),
'green': (False, curses.COLOR_GREEN),
'yellow': (False, curses.COLOR_YELLOW),
'blue': (False, curses.COLOR_BLUE),
'magenta': (False, curses.COLOR_MAGENTA),
'cyan': (False, curses.COLOR_CYAN),
'white': (False, curses.COLOR_WHITE)}
except ImportError:
_terminfo_params = False
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 _styles = {'grep.match': 'red bold',
Idan Kamara
grep: colorize all fields...
r17806 'grep.linenumber': 'green',
'grep.rev': 'green',
'grep.change': 'green',
'grep.sep': 'cyan',
'grep.filename': 'magenta',
'grep.user': 'magenta',
'grep.date': 'magenta',
Matt Mackall
bookmarks: move color style to color
r13361 'bookmarks.current': 'green',
Jeremy Whitlock
color: enable branches support...
r11969 'branches.active': 'none',
'branches.closed': 'black bold',
'branches.current': 'green',
'branches.inactive': 'none',
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 'diff.changed': 'white',
'diff.deleted': 'red',
'diff.diffline': 'bold',
'diff.extended': 'cyan bold',
'diff.file_a': 'red bold',
'diff.file_b': 'green bold',
'diff.hunk': 'magenta',
'diff.inserted': 'green',
'diff.trailingwhitespace': 'bold red_background',
'diffstat.deleted': 'red',
'diffstat.inserted': 'green',
Martin Geisler
ui: label prompts, default to yellow prompts
r13774 'ui.prompt': 'yellow',
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 'log.changeset': 'yellow',
'resolve.resolved': 'green bold',
'resolve.unresolved': 'red bold',
'status.added': 'green bold',
'status.clean': 'none',
'status.copied': 'none',
'status.deleted': 'cyan bold underline',
'status.ignored': 'black bold',
'status.modified': 'blue bold',
'status.removed': 'red bold',
Marc Simpson
color: add styles for tags
r15048 'status.unknown': 'magenta bold underline',
'tags.normal': 'green',
'tags.local': 'black bold'}
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826
Kevin Christen
Add colored output to status and qseries commands
r5787
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 def _effect_str(effect):
'''Helper function for render_effects().'''
bg = False
if effect.endswith('_background'):
bg = True
effect = effect[:-11]
attr, val = _terminfo_params[effect]
if attr:
return curses.tigetstr(val)
elif bg:
return curses.tparm(curses.tigetstr('setab'), val)
else:
return curses.tparm(curses.tigetstr('setaf'), val)
Martin Geisler
color: use lists instead of tuples for effects
r8622 def render_effects(text, effects):
Kevin Christen
Add colored output to status and qseries commands
r5787 'Wrap text in commands to turn on each effect.'
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 if not text:
return text
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 if not _terminfo_params:
start = [str(_effects[e]) for e in ['none'] + effects.split()]
start = '\033[' + ';'.join(start) + 'm'
stop = '\033[' + str(_effects['none']) + 'm'
else:
start = ''.join(_effect_str(effect)
for effect in ['none'] + effects.split())
stop = _effect_str('none')
Brodie Rao
color: replace effect-specific reset control codes with general purpose one
r7459 return ''.join([start, text, stop])
Kevin Christen
Add colored output to status and qseries commands
r5787
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 def extstyles():
for name, ext in extensions.extensions():
_styles.update(getattr(ext, 'colortable', {}))
Brodie Rao
color: diff colorization...
r7456
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 def configstyles(ui):
for status, cfgeffects in ui.configitems('color'):
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 if '.' not in status or status.startswith('color.'):
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 continue
cfgeffects = ui.configlist('color', status)
if cfgeffects:
Greg Ward
color: don't blow up if configured with unknown color (just warn).
r8945 good = []
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 for e in cfgeffects:
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 if not _terminfo_params and e in _effects:
good.append(e)
elif e in _terminfo_params or e[:-11] in _terminfo_params:
Greg Ward
color: don't blow up if configured with unknown color (just warn).
r8945 good.append(e)
else:
ui.warn(_("ignoring unknown color/effect %r "
"(configured in color.%s)\n")
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 % (e, status))
_styles[status] = ' '.join(good)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 class colorui(uimod.ui):
def popbuffer(self, labeled=False):
if labeled:
return ''.join(self.label(a, label) for a, label
in self._buffers.pop())
return ''.join(a for a, label in self._buffers.pop())
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 _colormode = 'ansi'
def write(self, *args, **opts):
label = opts.get('label', '')
if self._buffers:
self._buffers[-1].extend([(str(a), label) for a in args])
elif self._colormode == 'win32':
for a in args:
Brodie Rao
color: pass write/write_err to win32print correctly (issue2312)
r11727 win32print(a, super(colorui, self).write, **opts)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 else:
return super(colorui, self).write(
*[self.label(str(a), label) for a in args], **opts)
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 def write_err(self, *args, **opts):
label = opts.get('label', '')
if self._colormode == 'win32':
for a in args:
Brodie Rao
color: pass write/write_err to win32print correctly (issue2312)
r11727 win32print(a, super(colorui, self).write_err, **opts)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 else:
Brodie Rao
color: call correct superclass method in write_err...
r11732 return super(colorui, self).write_err(
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 *[self.label(str(a), label) for a in args], **opts)
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 def label(self, msg, label):
effects = []
for l in label.split():
s = _styles.get(l, '')
if s:
effects.append(s)
Dan Villiom Podlaski Christiansen
color: fix using multiple effects
r14145 effects = ' '.join(effects)
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 if effects:
return '\n'.join([render_effects(s, effects)
for s in msg.split('\n')])
return msg
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826
def uisetup(ui):
Danek Duvall
color: add support for terminfo-based attributes and color...
r13987 global _terminfo_params
Steve Borho
color: respect HGPLAIN
r10871 if ui.plain():
return
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 def colorcmd(orig, ui_, opts, cmd, cmdfunc):
Peter Arrenbrecht
color: fix --color=always when output is piped...
r14495 mode = _modesetup(ui_, opts)
if mode:
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 colorui._colormode = mode
Idan Kamara
color: check if ui is already a subclass of colorui before wrapping it...
r14516 if not issubclass(ui_.__class__, colorui):
colorui.__bases__ = (ui_.__class__,)
ui_.__class__ = colorui
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 extstyles()
Brodie Rao
color/progress: subclass ui instead of using wrapfunction (issue2096)...
r11555 configstyles(ui_)
Brodie Rao
color: colorize based on output labels instead of parsing output...
r10826 return orig(ui_, opts, cmd, cmdfunc)
extensions.wrapfunction(dispatch, '_runcommand', colorcmd)
Brodie Rao
color: add global option in extsetup() instead of globally...
r12693 def extsetup(ui):
commands.globalopts.append(
('', 'color', 'auto',
Martin Geisler
color: give hint to translators about untranslated keywords
r12807 # i18n: 'always', 'auto', and 'never' are keywords and should
# not be translated
Brodie Rao
color: add global option in extsetup() instead of globally...
r12693 _("when to colorize (boolean, always, auto, or never)"),
_('TYPE')))
Steve Borho
color: add support for Windows consoles...
r10870
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641 if os.name != 'nt':
w32effects = None
else:
import re, ctypes
_kernel32 = ctypes.windll.kernel32
_WORD = ctypes.c_ushort
_INVALID_HANDLE_VALUE = -1
class _COORD(ctypes.Structure):
_fields_ = [('X', ctypes.c_short),
('Y', ctypes.c_short)]
class _SMALL_RECT(ctypes.Structure):
_fields_ = [('Left', ctypes.c_short),
('Top', ctypes.c_short),
('Right', ctypes.c_short),
('Bottom', ctypes.c_short)]
class _CONSOLE_SCREEN_BUFFER_INFO(ctypes.Structure):
_fields_ = [('dwSize', _COORD),
('dwCursorPosition', _COORD),
('wAttributes', _WORD),
('srWindow', _SMALL_RECT),
('dwMaximumWindowSize', _COORD)]
_STD_OUTPUT_HANDLE = 0xfffffff5L # (DWORD)-11
_STD_ERROR_HANDLE = 0xfffffff4L # (DWORD)-12
_FOREGROUND_BLUE = 0x0001
_FOREGROUND_GREEN = 0x0002
_FOREGROUND_RED = 0x0004
_FOREGROUND_INTENSITY = 0x0008
_BACKGROUND_BLUE = 0x0010
_BACKGROUND_GREEN = 0x0020
_BACKGROUND_RED = 0x0040
_BACKGROUND_INTENSITY = 0x0080
_COMMON_LVB_REVERSE_VIDEO = 0x4000
_COMMON_LVB_UNDERSCORE = 0x8000
Steve Borho
color: add support for Windows consoles...
r10870
# http://msdn.microsoft.com/en-us/library/ms682088%28VS.85%29.aspx
w32effects = {
Sune Foldager
color: add win32 support for non-black background...
r12277 'none': -1,
Steve Borho
color: add support for Windows consoles...
r10870 'black': 0,
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641 'red': _FOREGROUND_RED,
'green': _FOREGROUND_GREEN,
'yellow': _FOREGROUND_RED | _FOREGROUND_GREEN,
'blue': _FOREGROUND_BLUE,
'magenta': _FOREGROUND_BLUE | _FOREGROUND_RED,
'cyan': _FOREGROUND_BLUE | _FOREGROUND_GREEN,
'white': _FOREGROUND_RED | _FOREGROUND_GREEN | _FOREGROUND_BLUE,
'bold': _FOREGROUND_INTENSITY,
Sune Foldager
merge with stable
r12278 'black_background': 0x100, # unused value > 0x0f
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641 'red_background': _BACKGROUND_RED,
'green_background': _BACKGROUND_GREEN,
'yellow_background': _BACKGROUND_RED | _BACKGROUND_GREEN,
'blue_background': _BACKGROUND_BLUE,
'purple_background': _BACKGROUND_BLUE | _BACKGROUND_RED,
'cyan_background': _BACKGROUND_BLUE | _BACKGROUND_GREEN,
'white_background': (_BACKGROUND_RED | _BACKGROUND_GREEN |
_BACKGROUND_BLUE),
'bold_background': _BACKGROUND_INTENSITY,
'underline': _COMMON_LVB_UNDERSCORE, # double-byte charsets only
'inverse': _COMMON_LVB_REVERSE_VIDEO, # double-byte charsets only
Steve Borho
color: add support for Windows consoles...
r10870 }
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641 passthrough = set([_FOREGROUND_INTENSITY,
_BACKGROUND_INTENSITY,
_COMMON_LVB_UNDERSCORE,
_COMMON_LVB_REVERSE_VIDEO])
Sune Foldager
color: add win32 support for non-black background...
r12277
Adrian Buehlmann
color: port to using ctypes (issue2687)...
r13641 stdout = _kernel32.GetStdHandle(
_STD_OUTPUT_HANDLE) # don't close the handle returned
if stdout is None or stdout == _INVALID_HANDLE_VALUE:
w32effects = None
else:
csbi = _CONSOLE_SCREEN_BUFFER_INFO()
if not _kernel32.GetConsoleScreenBufferInfo(
stdout, ctypes.byref(csbi)):
# stdout may not support GetConsoleScreenBufferInfo()
# when called from subprocess or redirected
w32effects = None
else:
origattr = csbi.wAttributes
ansire = re.compile('\033\[([^m]*)m([^\033]*)(.*)',
re.MULTILINE | re.DOTALL)
Steve Borho
color: add support for Windows consoles...
r10870
def win32print(text, orig, **opts):
label = opts.get('label', '')
Sune Foldager
color: add win32 support for non-black background...
r12277 attr = origattr
def mapcolor(val, attr):
if val == -1:
return origattr
elif val in passthrough:
return attr | val
elif val > 0x0f:
return (val & 0x70) | (attr & 0x8f)
else:
return (val & 0x07) | (attr & 0xf8)
Steve Borho
color: add support for Windows consoles...
r10870
# determine console attributes based on labels
for l in label.split():
style = _styles.get(l, '')
for effect in style.split():
Sune Foldager
color: add win32 support for non-black background...
r12277 attr = mapcolor(w32effects[effect], attr)
Steve Borho
color: add support for Windows consoles...
r10870
# hack to ensure regexp finds data
if not text.startswith('\033['):
text = '\033[m' + text
# Look for ANSI-like codes embedded in text
m = re.match(ansire, text)
Idan Kamara
color: reset win32 console color in a finally block
r13919 try:
while m:
for sattr in m.group(1).split(';'):
if sattr:
attr = mapcolor(int(sattr), attr)
_kernel32.SetConsoleTextAttribute(stdout, attr)
orig(m.group(2), **opts)
m = re.match(ansire, m.group(3))
finally:
Mads Kiilerich
fix trivial spelling errors
r17424 # Explicitly reset original attributes
Idan Kamara
color: reset win32 console color in a finally block
r13919 _kernel32.SetConsoleTextAttribute(stdout, origattr)