diff options
| author | Alexis Hildebrandt <afh@surryhill.net> | 2012-06-30 07:37:38 +0200 |
|---|---|---|
| committer | Alexis Hildebrandt <afh@surryhill.net> | 2012-07-01 08:48:30 +0200 |
| commit | e41c84335dc16df2334d737e1c4234c5b29ff603 (patch) | |
| tree | 01a4d8a71b54d17d54e325d99b58d703f11d1091 /libmproxy/console | |
| parent | 9fd4c3783426f554758808f50f79a52fef22e8ce (diff) | |
| download | mitmproxy-e41c84335dc16df2334d737e1c4234c5b29ff603.tar.gz mitmproxy-e41c84335dc16df2334d737e1c4234c5b29ff603.tar.bz2 mitmproxy-e41c84335dc16df2334d737e1c4234c5b29ff603.zip | |
Add --palette option to select color palette
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/__init__.py | 7 | ||||
| -rw-r--r-- | libmproxy/console/palettes.py | 19 |
2 files changed, 15 insertions, 11 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 2e28b6cf..2fef5beb 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -335,6 +335,7 @@ class Options(object): "verbosity", "wfile", "nopop", + "palette", ] def __init__(self, **kwargs): for k, v in kwargs.items(): @@ -358,7 +359,7 @@ class ConsoleMaster(flow.FlowMaster): self.replacehooks.add(*i) self.flow_list_walker = None - self.set_palette() + self.set_palette(options.palette) r = self.set_intercept(options.intercept) if r: @@ -504,8 +505,8 @@ class ConsoleMaster(flow.FlowMaster): self.ui.start() os.unlink(name) - def set_palette(self): - self.palette = palettes.dark + def set_palette(self, name): + self.palette = palettes.palettes[name] def run(self): self.currentflow = None diff --git a/libmproxy/console/palettes.py b/libmproxy/console/palettes.py index 39d49dd4..6e0ef7fe 100644 --- a/libmproxy/console/palettes.py +++ b/libmproxy/console/palettes.py @@ -13,9 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +palettes = { # Default palette for dark background -dark = [ + 'dark': [ # name, foreground, background, mono, foreground_high, background_high # For details on the meaning of the elements refer to # http://excess.org/urwid/reference.html#Screen-register_palette @@ -61,10 +62,10 @@ dark = [ ('focusfield_error', 'dark red', 'light gray'), ('field_error', 'dark red', 'black'), ('editfield', 'black', 'light cyan'), -] + ], # Palette for light background -light = [ + 'light': [ ('body', 'black', 'dark cyan'), ('foot', 'dark gray', 'default'), ('title', 'white,bold', 'light blue',), @@ -106,13 +107,13 @@ light = [ ('focusfield_error', 'dark red', 'light gray'), ('field_error', 'dark red', 'black'), ('editfield', 'black', 'light cyan'), -] + ], # Palettes for terminals that use the Solarized precision colors # (http://ethanschoonover.com/solarized#the-values) # For dark backgrounds -solarized_dark = [ + 'solarized_dark': [ ('body', 'dark cyan', 'default'), ('foot', 'dark gray', 'default'), ('title', 'white,bold', 'default',), @@ -155,10 +156,10 @@ solarized_dark = [ ('focusfield_error', 'dark red', 'light gray'), ('field_error', 'dark red', 'black'), ('editfield', 'black', 'light gray'), -] + ], # For light backgrounds -solarized_light = [ + 'solarized_light': [ ('body', 'dark cyan', 'default'), ('foot', 'dark gray', 'default'), ('title', 'white,bold', 'light cyan',), @@ -201,4 +202,6 @@ solarized_light = [ ('focusfield_error', 'dark red', 'light gray'), ('field_error', 'dark red', 'black'), ('editfield', 'white', 'light cyan'), -] + ], + +} |