aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Elliott <tle@holymonkey.com>2015-08-19 13:07:39 -0700
committerTimothy Elliott <tle@holymonkey.com>2015-08-19 13:07:39 -0700
commitfb4af4eb786e5f062c00dc8105f2e2812d66c289 (patch)
tree04554c4ab0cf02eb96f20875a1e69f6ae6d2aa6a
parentb8db81969d772c06042778ac4760902330bce7d2 (diff)
downloadmitmproxy-fb4af4eb786e5f062c00dc8105f2e2812d66c289.tar.gz
mitmproxy-fb4af4eb786e5f062c00dc8105f2e2812d66c289.tar.bz2
mitmproxy-fb4af4eb786e5f062c00dc8105f2e2812d66c289.zip
console: add command line flag to disable mouse interaction
Adds the --no-mouse command line option to disable the mouse. Fixes #685
-rw-r--r--libmproxy/cmdline.py5
-rw-r--r--libmproxy/console/__init__.py5
-rw-r--r--libmproxy/main.py1
3 files changed, 9 insertions, 2 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py
index d033fb76..6125bfbf 100644
--- a/libmproxy/cmdline.py
+++ b/libmproxy/cmdline.py
@@ -608,6 +608,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 4dd6fdb1..abf3fb9c 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)