aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-03-20 11:00:24 +1300
committerAldo Cortesi <aldo@nullcube.com>2015-03-20 11:00:24 +1300
commit558e0a41c25ed927a3bd3244e82e50f2c1ec9f1c (patch)
treec1f90725b209fa9960a5adacc6a4397d5441b104
parent560e44c637e4f1fcbeba1305fc1eb39e3d796013 (diff)
downloadmitmproxy-558e0a41c25ed927a3bd3244e82e50f2c1ec9f1c.tar.gz
mitmproxy-558e0a41c25ed927a3bd3244e82e50f2c1ec9f1c.tar.bz2
mitmproxy-558e0a41c25ed927a3bd3244e82e50f2c1ec9f1c.zip
Fix general prompt input.
-rw-r--r--libmproxy/console/__init__.py3
-rw-r--r--libmproxy/console/common.py8
2 files changed, 11 insertions, 0 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index 013c8003..5ff8e8d7 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -555,6 +555,9 @@ class ConsoleMaster(flow.FlowMaster):
self.prompt_execute(k)
elif k == "enter":
self.prompt_execute()
+ else:
+ if common.is_keypress(k):
+ self.view.keypress(self.loop.screen_size, k)
else:
k = self.view.keypress(self.loop.screen_size, k)
if k:
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index 3a708c7c..90204d79 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -31,6 +31,14 @@ METHOD_OPTIONS = [
]
+def is_keypress(k):
+ """
+ Is this input event a keypress?
+ """
+ if isinstance(k, basestring):
+ return True
+
+
def highlight_key(s, k):
l = []
parts = s.split(k, 1)