diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 03:24:05 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-30 03:24:05 +0200 |
| commit | 08655cb9567f502ec79799499968c57125d9a205 (patch) | |
| tree | 6a993b5299ca7d4ce06372c674efdac635c4d2cd /libmproxy | |
| parent | 21e7f420d2870d89ebc05181c1fca674d80e4e7c (diff) | |
| parent | 9389c186ba6e76ba87e238c0e6b86749da6a67c7 (diff) | |
| download | mitmproxy-08655cb9567f502ec79799499968c57125d9a205.tar.gz mitmproxy-08655cb9567f502ec79799499968c57125d9a205.tar.bz2 mitmproxy-08655cb9567f502ec79799499968c57125d9a205.zip | |
Merge remote-tracking branch 'origin/master' into proxy-refactor-cb
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/cmdline.py | 5 | ||||
| -rw-r--r-- | libmproxy/console/__init__.py | 5 | ||||
| -rw-r--r-- | libmproxy/main.py | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index 55377af2..7f6f69ef 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -650,6 +650,11 @@ def mitmproxy(): action="store_true", dest="eventlog", help="Show event log." ) + parser.add_argument( + "--no-mouse", + action="store_true", dest="no_mouse", + help="Disable mouse interaction." + ) group = parser.add_argument_group( "Filters", "See help in mitmproxy for filter expression syntax." diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 3d20947b..2133f97f 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -154,7 +154,8 @@ class Options(object): "wfile", "nopop", "palette", - "palette_transparent" + "palette_transparent", + "no_mouse" ] def __init__(self, **kwargs): @@ -455,12 +456,12 @@ class ConsoleMaster(flow.FlowMaster): def run(self): self.ui = urwid.raw_display.Screen() - self.ui.set_mouse_tracking() self.ui.set_terminal_properties(256) self.set_palette(self.palette) self.loop = urwid.MainLoop( urwid.SolidFill("x"), screen = self.ui, + handle_mouse = not self.options.no_mouse, ) self.server.start_slave( diff --git a/libmproxy/main.py b/libmproxy/main.py index faef8c82..23cb487c 100644 --- a/libmproxy/main.py +++ b/libmproxy/main.py @@ -55,6 +55,7 @@ def mitmproxy(args=None): # pragma: nocover console_options.eventlog = options.eventlog console_options.intercept = options.intercept console_options.limit = options.limit + console_options.no_mouse = options.no_mouse server = get_server(console_options.no_server, proxy_config) |