diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-11-01 18:39:55 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-11-01 18:39:55 +0100 |
| commit | 1bf34e6f4509c0a37c9633c400a0faed0cb94151 (patch) | |
| tree | 333b300664475d8ba1b3ca880b07aa0a37b77617 /libmproxy | |
| parent | 978eb17d6699f14055f6f4373f0a106dc41b9d5d (diff) | |
| parent | 5e90459569dfefc94e046187901a0b47e7663742 (diff) | |
| download | mitmproxy-1bf34e6f4509c0a37c9633c400a0faed0cb94151.tar.gz mitmproxy-1bf34e6f4509c0a37c9633c400a0faed0cb94151.tar.bz2 mitmproxy-1bf34e6f4509c0a37c9633c400a0faed0cb94151.zip | |
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/common.py | 4 | ||||
| -rw-r--r-- | libmproxy/console/flowview.py | 4 | ||||
| -rw-r--r-- | libmproxy/console/help.py | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index 48cb0f87..1a72fa2a 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -96,6 +96,10 @@ def format_keyvals(lst, key="key", val="text", indent=0): def shortcuts(k): if k == " ": k = "page down" + elif k == "ctrl f": + k = "page down" + elif k == "ctrl b": + k = "page up" elif k == "j": k = "down" elif k == "k": diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index 5271db4f..4304afb5 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -519,10 +519,10 @@ class FlowView(tabs.Tabs): self._w.keypress(size, key) elif key == "a": self.flow.accept_intercept(self.master) - self.master.view_flow(self.flow) + signals.flow_change.send(self, flow = self.flow) elif key == "A": self.master.accept_all() - self.master.view_flow(self.flow) + signals.flow_change.send(self, flow = self.flow) elif key == "d": if self.state.flow_count() == 1: self.master.view_flowlist() diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py index ba87348d..74748030 100644 --- a/libmproxy/console/help.py +++ b/libmproxy/console/help.py @@ -31,6 +31,7 @@ class HelpView(urwid.ListBox): ("g, G", "go to beginning, end"), ("space", "page down"), ("pg up/down", "page up/down"), + ("ctrl+b/ctrl+f", "page up/down"), ("arrows", "up, down, left, right"), ] text.extend( |