Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3923 from sarthak212/commonkeybinding

Browse Source 
Add common options to keybinding console
This commit is contained in:
Thomas Kriechbaumer 2020-04-11 14:10:43 +02:00 committed by GitHub
commit ce50e8e52d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mitmproxy/tools/console/defaultkeys.py
View File

@ -1,14 +1,14 @@
def map(km):
km.add(":", "console.command ", ["global"], "Command prompt")
km.add(":", "console.command ", ["commonkey", "global"], "Command prompt")
km.add("?", "console.view.help", ["global"], "View help")
km.add("B", "browser.start", ["global"], "Start an attached browser")
km.add("C", "console.view.commands", ["global"], "View commands")
km.add("K", "console.view.keybindings", ["global"], "View key bindings")
km.add("O", "console.view.options", ["global"], "View options")
km.add("E", "console.view.eventlog", ["global"], "View event log")
km.add("O", "console.view.options", ["commonkey", "global"], "View options")
km.add("E", "console.view.eventlog", ["commonkey", "global"], "View event log")
km.add("Q", "console.exit", ["global"], "Exit immediately")
km.add("q", "console.view.pop", ["global"], "Exit the current view")
km.add("q", "console.view.pop", ["commonkey", "global"], "Exit the current view")
km.add("-", "console.layout.cycle", ["global"], "Cycle to next layout")
km.add("shift tab", "console.panes.next", ["global"], "Focus next layout pane")
km.add("ctrl right", "console.panes.next", ["global"], "Focus next layout pane")
@ -20,8 +20,8 @@ def map(km):
km.add("j", "console.nav.down", ["global"], "Down")
km.add("l", "console.nav.right", ["global"], "Right")
km.add("h", "console.nav.left", ["global"], "Left")
km.add("tab", "console.nav.next", ["global"], "Next")
km.add("enter", "console.nav.select", ["global"], "Select")
km.add("tab", "console.nav.next", ["commonkey", "global"], "Next")
km.add("enter", "console.nav.select", ["commonkey", "global"], "Select")
km.add("space", "console.nav.pagedown", ["global"], "Page down")
km.add("ctrl f", "console.nav.pagedown", ["global"], "Page down")
km.add("ctrl b", "console.nav.pageup", ["global"], "Page up")

2
mitmproxy/tools/console/flowview.py
View File

@ -126,7 +126,7 @@ class FlowDetails(tabs.Tabs):
self.master.log.debug(error)
# Give hint that you have to tab for the response.
if description == "No content" and isinstance(message, http.HTTPRequest):
description = "No request content (press tab to view response)"
description = "No request content"
# If the users has a wide terminal, he gets fewer lines; this should not be an issue.
chars_per_line = 80

14
mitmproxy/tools/console/help.py
View File

@ -51,10 +51,22 @@ class HelpView(tabs.Tabs, layoutwidget.LayoutWidget):
text = [
urwid.Text(
[
("title", "Common Keybindings")
]
)
]
text.extend(self.format_keys(self.master.keymap.list("commonkey")))
text.append(
urwid.Text(
[
"\n",
("title", "Keybindings for this view")
]
)
]
)
if self.helpctx:
text.extend(self.format_keys(self.master.keymap.list(self.helpctx)))

1
mitmproxy/tools/console/keymap.py
View File

@ -18,6 +18,7 @@ class KeyBindingError(Exception):
Contexts = {
"chooser",
"commands",
"commonkey",
"dataviewer",
"eventlog",
"flowlist",