Merge branch 'master' of https://github.com/mitmproxy/mitmproxy

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":

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()

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(