- tor-commits - lists.torproject.org

[arm/release] fix: Reverting one of the map changes
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 3ec4ad0a4be48b6674b7107fbc30ca8894b45d13 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 4 21:37:57 2011 -0700 fix: Reverting one of the map changes Mistakenly thought map could call object methods (oops). This caused a crash with most popups. --- src/cli/popups.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/popups.py b/src/cli/popups.py index 4bb519d..8061c8f 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -26,7 +26,7 @@ def init(height = -1, width = -1, top = 0, left = 0, belowStatic = True): control = cli.controller.getController() if belowStatic: - stickyHeight = sum(map(getHeight, control.getStickyPanels())) + stickyHeight = sum([stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()]) else: stickyHeight = 0 popup = panel.Panel(control.getScreen(), "popup", top + stickyHeight, left, height, width)

1 0

[arm/release] Fixed file mode.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit d4a7db902d187810b3ce2b3ba247dbd2760eeeef Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 5 21:13:49 2011 +0500 Fixed file mode. --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py old mode 100755 new mode 100644

1 0

[arm/release] Adding cagraph to gitignore
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit b69b57080cebf0f313f3971c06489bb182d890da Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 10 18:38:22 2011 -0700 Adding cagraph to gitignore --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 6377435..d72262b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.pyc src/TorCtl/ +src/cagraph/ *.swp

1 0

[arm/release] Mapped menu items to respective actions.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 2a6916e1fbcc6fc6a60563e969d0ddc448ece1fd Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue May 31 14:02:49 2011 +0500 Mapped menu items to respective actions. There are three kinds of menu items: * The ones which are directly mapped to a panel action via Menu._callbackPressKey() * "State-ful" menu items which are enabled/disabled depending on their panel's states. These are taken care of via the Menu._callbackGetEnabled() and Menu._callbackSet() methods. For example, the "Duplicates" submenu in "Logs" changes its state depending on log.showDuplicates. * View menu items, which change controller state. Supported via Menu._callbackView() Launching a panel action switches view to that panel, e.g., if we're on configuration panel and graph bounds are changed the controller is traversed through pages until one with graph panel is found. Otherwise, an error is logged. File->Exit and Configuration->Reset Tor items are unimplemented as of yet. Possible approaches include factoring out a handleKey() in controller or duplicating the same code in callbacks. --- src/cli/menu.py | 198 +++++++++++++++++++++++++++++++++++--------------- src/util/menuItem.py | 11 +++- 2 files changed, 149 insertions(+), 60 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 5a51797..9aadf8d 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -6,6 +6,8 @@ import curses import cli.controller import popups + +from cli.graphing.graphPanel import Bounds as GraphBounds from util import log, panel, uiTools, menuItem PARENTLEVEL, TOPLEVEL = (-1, 0) @@ -15,70 +17,78 @@ class Menu(): def __init__(self, item=None): DEFAULT_ROOT = menuItem.MenuItem(label="Root", children=( - menuItem.MenuItem(label="File" , children=( - menuItem.MenuItem(label="Exit" , callback=self._callbackDefault),)), - menuItem.MenuItem(label="Logs" , children=( - menuItem.MenuItem(label="Events" , callback=self._callbackDefault), - menuItem.MenuItem(label="Clear" , callback=self._callbackDefault), - menuItem.MenuItem(label="Save" , callback=self._callbackDefault), - menuItem.MenuItem(label="Filter" , callback=self._callbackDefault), - menuItem.MenuItem(label="Duplicates" , children=( - menuItem.MenuItem(label="Hidden" , callback=self._callbackDefault), - menuItem.MenuItem(label="Visible" , callback=self._callbackDefault),)) - )), - menuItem.MenuItem(label="View" , children=( - menuItem.MenuItem(label="Graph" , callback=self._callbackDefault), - menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), - menuItem.MenuItem(label="Configuration" , callback=self._callbackDefault), - menuItem.MenuItem(label="Configuration File" , callback=self._callbackDefault),)), - menuItem.MenuItem(label="Graph" , children=( - menuItem.MenuItem(label="Stats" , children=( - menuItem.MenuItem(label="Bandwidth" , callback=self._callbackDefault), - menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), - menuItem.MenuItem(label="Resources" , callback=self._callbackDefault), - )), - menuItem.MenuItem(label="Size" , children=( - menuItem.MenuItem(label="Increase" , callback=self._callbackDefault), - menuItem.MenuItem(label="Decrease" , callback=self._callbackDefault), - )), - menuItem.MenuItem(label="Update Interval" , children=( - menuItem.MenuItem(label="Each second" , callback=self._callbackDefault), - menuItem.MenuItem(label="5 seconds" , callback=self._callbackDefault), - menuItem.MenuItem(label="30 seconds" , callback=self._callbackDefault), - menuItem.MenuItem(label="1 minute" , callback=self._callbackDefault), - menuItem.MenuItem(label="30 minutes" , callback=self._callbackDefault), - menuItem.MenuItem(label="Hourly" , callback=self._callbackDefault), - menuItem.MenuItem(label="Daily" , callback=self._callbackDefault), + menuItem.MenuItem(label="File", children=( + menuItem.MenuItem(label="Exit", + callback=self._callbackDefault),)), + menuItem.MenuItem(label="Logs", children=( + menuItem.MenuItem(label="Events", + callback=lambda item: self._callbackPressKey('log', ord('e'))), + menuItem.MenuItem(label="Clear", + callback=lambda item: self._callbackPressKey('log', ord('c'))), + menuItem.MenuItem(label="Save", + callback=lambda item: self._callbackPressKey('log', ord('a'))), + menuItem.MenuItem(label="Filter", + callback=lambda item: self._callbackPressKey('log', ord('f'))), + menuItem.MenuItem(label="Duplicates", children=( + menuItem.MenuItem(label="Hidden", + callback=lambda item: self._callbackSet('log', 'showDuplicates', False, ord('u')), + enabled=lambda: self._getItemEnabled('log', 'showDuplicates', False)), + menuItem.MenuItem(label="Visible", + callback=lambda item: self._callbackSet('log', 'showDuplicates', True, ord('u')), + enabled=lambda: self._getItemEnabled('log', 'showDuplicates', True)), + )))), + menuItem.MenuItem(label="View", children=( + menuItem.MenuItem(label="Graph", + callback=lambda item: self._callbackView('graph')), + menuItem.MenuItem(label="Connections", + callback=lambda item: self._callbackView('conn')), + menuItem.MenuItem(label="Configuration", + callback=lambda item: self._callbackView('configState')), + menuItem.MenuItem(label="Configuration File", + callback=lambda item: self._callbackView('configFile')),)), + menuItem.MenuItem(label="Graph", children=( + menuItem.MenuItem(label="Stats", + callback=lambda item: self._callbackPressKey('graph', ord('s'))), + menuItem.MenuItem(label="Size", children=( + menuItem.MenuItem(label="Increase", + callback=lambda item: self._callbackPressKey('graph', ord('m'))), + menuItem.MenuItem(label="Decrease", + callback=lambda item: self._callbackPressKey('graph', ord('n'))), )), - menuItem.MenuItem(label="Bounds" , children=( - menuItem.MenuItem(label="Local Max" , callback=self._callbackDefault), - menuItem.MenuItem(label="Global Max" , callback=self._callbackDefault), - menuItem.MenuItem(label="Tight" , callback=self._callbackDefault), + menuItem.MenuItem(label="Update Interval", + callback=lambda item: self._callbackPressKey('graph', ord('i'))), + menuItem.MenuItem(label="Bounds", children=( + menuItem.MenuItem(label="Local Max", + callback=lambda item: self._callbackSet('graph', 'bounds', GraphBounds.LOCAL_MAX, ord('b')), + enabled=lambda: self._getItemEnabled('graph', 'bounds', GraphBounds.LOCAL_MAX)), + menuItem.MenuItem(label="Global Max", + callback=lambda item: self._callbackSet('graph', 'bounds', GraphBounds.GLOBAL_MAX, ord('b')), + enabled=lambda: self._getItemEnabled('graph', 'bounds', GraphBounds.GLOBAL_MAX)), + menuItem.MenuItem(label="Tight", + callback=lambda item: self._callbackSet('graph', 'bounds', GraphBounds.TIGHT, ord('b')), + enabled=lambda: self._getItemEnabled('graph', 'bounds', GraphBounds.TIGHT)), )),)), - menuItem.MenuItem(label="Connections" , children=( - menuItem.MenuItem(label="Identity" , children=( - menuItem.MenuItem(label="IP" , callback=self._callbackDefault), - menuItem.MenuItem(label="Fingerprints" , callback=self._callbackDefault), - menuItem.MenuItem(label="Nicknames" , callback=self._callbackDefault), + menuItem.MenuItem(label="Connections", children=( + menuItem.MenuItem(label="Identity", + callback=lambda item: self._callbackPressKey('conn', ord('l'))), + menuItem.MenuItem(label="Resolver", + callback=lambda item: self._callbackPressKey('conn', ord('u'))), + menuItem.MenuItem(label="Sort Order", + callback=lambda item: self._callbackPressKey('conn', ord('s'))), )), - menuItem.MenuItem(label="Resolver" , children=( - menuItem.MenuItem(label="auto" , callback=self._callbackDefault), - menuItem.MenuItem(label="proc" , callback=self._callbackDefault), - menuItem.MenuItem(label="netstat" , callback=self._callbackDefault), - menuItem.MenuItem(label="ss" , callback=self._callbackDefault), - menuItem.MenuItem(label="lsof" , callback=self._callbackDefault), - menuItem.MenuItem(label="sockstat" , callback=self._callbackDefault), - menuItem.MenuItem(label="sockstat (bsd)" , callback=self._callbackDefault), - menuItem.MenuItem(label="procstat (bsd)" , callback=self._callbackDefault), - )), - menuItem.MenuItem(label="Sort Order" , callback=self._callbackDefault),)), menuItem.MenuItem(label="Configuration" , children=( - menuItem.MenuItem(label="Comments" , children=( - menuItem.MenuItem(label="Hidden" , callback=self._callbackDefault), - menuItem.MenuItem(label="Visible" , callback=self._callbackDefault), + menuItem.MenuItem(label="Comments", children=( + menuItem.MenuItem(label="Hidden", + callback=lambda item: self._callbackSet('configFile', 'stripComments', True, ord('s')), + enabled=lambda: self._getItemEnabled('configFile', 'stripComments', True)), + menuItem.MenuItem(label="Visible", + callback=lambda item: self._callbackSet('configFile', 'stripComments', False, ord('s')), + enabled=lambda: self._getItemEnabled('configFile', 'stripComments', False)), )), - menuItem.MenuItem(label="Reload" , callback=self._callbackDefault), - menuItem.MenuItem(label="Reset Tor" , callback=self._callbackDefault),)) + menuItem.MenuItem(label="Reload", + callback=lambda item: self._callbackPressKey('configFile', ord('r'))), + menuItem.MenuItem(label="Reset Tor", + callback=self._callbackDefault),)) )) self._first = [0] @@ -111,6 +121,8 @@ class Menu(): elif key == curses.KEY_DOWN: self._showNLevel() break + elif key == 27: + break elif uiTools.isSelectionKey(key): self._handleEvent() break @@ -238,6 +250,9 @@ class Menu(): popup, width, height = popups.init(height=printable+2, width=labelwidth+2, top=2, left=left) + while self._getCurrentItem().isEnabled() == False: + self._moveNLevelDown(height) + if popup.win: try: while True: @@ -258,6 +273,10 @@ class Menu(): elif key == curses.KEY_RIGHT: self._showNLevel() break + elif key == 27: + self._first.pop() + self._selection.pop() + break elif uiTools.isSelectionKey(key): self._handleEvent() self._first.pop() @@ -277,6 +296,9 @@ class Menu(): for (index, item) in enumerate(children): labelformat = curses.A_STANDOUT if index == self._selection[PARENTLEVEL] else curses.A_NORMAL + if not item.isEnabled(): + labelformat = labelformat | uiTools.getColor('yellow') + popup.addstr(top, left, item.getLabel(), labelformat) top = top + 1 @@ -295,6 +317,9 @@ class Menu(): self._first[PARENTLEVEL] = 0 self._selection[PARENTLEVEL] = 0 + while self._getCurrentItem().isEnabled() == False: + self._moveNLevelDown(height) + def _moveNLevelUp(self, height): printable = self._calculateNLevelHeights(level=PARENTLEVEL) parent = self._getCurrentItem(level=PARENTLEVEL) @@ -311,6 +336,9 @@ class Menu(): if self._selection[PARENTLEVEL] > printable: self._selection[PARENTLEVEL] = printable - 1 + while self._getCurrentItem().isEnabled() == False: + self._moveNLevelUp(height) + def _handleEvent(self): item = self._getCurrentItem() @@ -322,3 +350,55 @@ class Menu(): def _callbackDefault(self, item): log.log(log.NOTICE, "%s selected" % item.getLabel()) + def _callbackView(self, panelname): + control = cli.controller.getController() + + start = control.getPage() + panels = control.getDisplayPanels(includeSticky=False) + panelnames = [panel.getName() for panel in panels] + while not panelname in panelnames: + control.nextPage() + panels = control.getDisplayPanels(includeSticky=False) + panelnames = [panel.getName() for panel in panels] + + if control.getPage() == start: + log.log(log.ERR, "Panel %s not found" % panelname) + break + + def _getItemEnabled(self, panel, attr, value): + control = cli.controller.getController() + if control: + panel = control.getPanel(panel) + + if panel: + return getattr(panel, attr, None) != value + + return False + + def _callbackSet(self, panel, attr, value, key=None): + self._callbackView(panel) + + control = cli.controller.getController() + panel = control.getPanel(panel) + + panelattr = getattr(panel, attr, None) + + if panelattr != None: + if hasattr(panelattr, '__call__'): + panelattr(value) + elif panelattr != value and key != None: + start = panelattr + while panelattr != value: + panel.handleKey(key) + panelattr = getattr(panel, attr, None) + if panelattr == start: + log.log(log.ERR, "Could not set %s.%s" % (panel, attr)) + break + + def _callbackPressKey(self, panel, key): + self._callbackView(panel) + + control = cli.controller.getController() + panel = control.getPanel(panel) + panel.handleKey(key) + diff --git a/src/util/menuItem.py b/src/util/menuItem.py index 3dbf922..6868db6 100644 --- a/src/util/menuItem.py +++ b/src/util/menuItem.py @@ -5,10 +5,11 @@ Menu Item class, used by the drop-down menus class MenuItem(): """Contains title, callback handler and possible children""" - def __init__(self, label=None, callback=None, children=[]): + def __init__(self, label=None, callback=None, children=[], enabled=None): self._label = label self._callback = callback self._children = children + self._enabled = enabled def getLabel(self): return self._label @@ -19,6 +20,14 @@ class MenuItem(): def isParent(self): return self._children != [] + def isEnabled(self): + if self._enabled == None: + return True + elif hasattr(self._enabled, '__call__'): + return self._enabled() + else: + return self._enabled + def getChildren(self): return self._children

1 0

[arm/release] Minor readability improvements.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 69de93464909606a930451a626fbe54fc50ca387 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 1 16:13:26 2011 +0500 Minor readability improvements. --- src/cli/menu.py | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 9aadf8d..da45309 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -119,7 +119,7 @@ class Menu(): elif key == curses.KEY_LEFT: self._moveTopLevelLeft(width) elif key == curses.KEY_DOWN: - self._showNLevel() + self._cascadeNLevel() break elif key == 27: break @@ -130,6 +130,14 @@ class Menu(): finally: popups.finalize() + def _appendLevel(self): + self._first.append(0) + self._selection.append(0) + + def _removeLevel(self): + self._first.pop() + self._selection.pop() + def _getCurrentTopLevelItem(self): index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] return self._rootItem.getChildren()[index] @@ -233,15 +241,14 @@ class Menu(): popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - def _showNLevel(self): - self._first.append(0) - self._selection.append(0) - - parent = self._getCurrentItem(level=PARENTLEVEL) + def _cascadeNLevel(self): + parent = self._getCurrentItem() if parent.isLeaf(): return + self._appendLevel() + labelwidth = self._calculateNLevelWidths(level=PARENTLEVEL) printable = self._calculateNLevelHeights(level=PARENTLEVEL) @@ -271,16 +278,14 @@ class Menu(): elif key == curses.KEY_UP: self._moveNLevelUp(height) elif key == curses.KEY_RIGHT: - self._showNLevel() + self._cascadeNLevel() break elif key == 27: - self._first.pop() - self._selection.pop() + self._removeLevel() break elif uiTools.isSelectionKey(key): self._handleEvent() - self._first.pop() - self._selection.pop() + self._removeLevel() break finally: @@ -345,7 +350,7 @@ class Menu(): if item.isLeaf(): item.select() else: - self._showNLevel() + self._cascadeNLevel() def _callbackDefault(self, item): log.log(log.NOTICE, "%s selected" % item.getLabel())

1 0

[arm/release] Next top-level item is dropped down in case right/left arrow keys
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 5ffd3b0506cc6acb618456ae276dd0238c1e3936 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 1 17:06:27 2011 +0500 Next top-level item is dropped down in case right/left arrow keys are pressed on leaf submenus. In order to let the controller redraw before next top-level item is dropped down, "menu keys" are calculated and returned back to the controller. The controller overrides its key so that menu is redrawn, redraws all other panels and sends back the "menu keys" to the new menu instance. This maintains the illusion of top-level drop-down moving right/left while screen is cleared and redrawn once in between. --- src/cli/controller.py | 6 +++++- src/cli/menu.py | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 25c3051..d073312 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -477,6 +477,8 @@ def drawTorMonitor(stdscr, startTime): # main draw loop overrideKey = None # uses this rather than waiting on user input isUnresponsive = False # flag for heartbeat responsiveness check + + menuKeys = [] while True: displayPanels = control.getDisplayPanels() @@ -514,7 +516,9 @@ def drawTorMonitor(stdscr, startTime): control.setPaused(not control.isPaused()) elif key == ord('m') or key == ord('M'): menu = cli.menu.Menu() - menu.showMenu() + menuKeys = menu.showMenu(keys=menuKeys) + if menuKeys != []: + overrideKey = ord('m') elif key == ord('q') or key == ord('Q'): # provides prompt to confirm that arm should exit if CONFIG["features.confirmQuit"]: diff --git a/src/cli/menu.py b/src/cli/menu.py index da45309..29b6f82 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -99,7 +99,10 @@ class Menu(): else: self._rootItem = DEFAULT_ROOT - def showMenu(self): + def showMenu(self, keys=[]): + keys.reverse() + returnkeys = [] + popup, width, height = popups.init(height=3) if popup: try: @@ -112,14 +115,18 @@ class Menu(): popup.win.refresh() control = cli.controller.getController() - key = control.getScreen().getch() + + if keys == []: + key = control.getScreen().getch() + else: + key = keys.pop() if key == curses.KEY_RIGHT: self._moveTopLevelRight(width) elif key == curses.KEY_LEFT: self._moveTopLevelLeft(width) elif key == curses.KEY_DOWN: - self._cascadeNLevel() + cascaded, returnkeys = self._cascadeNLevel() break elif key == 27: break @@ -130,6 +137,8 @@ class Menu(): finally: popups.finalize() + return returnkeys + def _appendLevel(self): self._first.append(0) self._selection.append(0) @@ -245,7 +254,7 @@ class Menu(): parent = self._getCurrentItem() if parent.isLeaf(): - return + return (False, []) self._appendLevel() @@ -261,6 +270,7 @@ class Menu(): self._moveNLevelDown(height) if popup.win: + returnkeys = [] try: while True: popup.win.erase() @@ -278,7 +288,19 @@ class Menu(): elif key == curses.KEY_UP: self._moveNLevelUp(height) elif key == curses.KEY_RIGHT: - self._cascadeNLevel() + cascaded, returnkeys = self._cascadeNLevel() + if cascaded == False: + index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] + 1 + for i in range(index): + returnkeys.append(curses.KEY_RIGHT) + returnkeys.append(curses.KEY_DOWN) + break + elif key == curses.KEY_LEFT: + index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] - 1 + index = index % self._rootItem.getChildrenCount() + for i in range(index): + returnkeys.append(curses.KEY_RIGHT) + returnkeys.append(curses.KEY_DOWN) break elif key == 27: self._removeLevel() @@ -291,6 +313,10 @@ class Menu(): finally: popups.finalize() + return (True, returnkeys) + + return (False, []) + def _drawNLevel(self, popup, width, height): printable = self._calculateNLevelHeights(level=PARENTLEVEL) parent = self._getCurrentItem(level=PARENTLEVEL)

1 0

[arm/release] Controller page isn't changed in case the required panel isn't currently
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit a2937170af8f17ff048cccc1093776f174467352 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 1 17:12:35 2011 +0500 Controller page isn't changed in case the required panel isn't currently being displayed. --- src/cli/menu.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 29b6f82..beceb01 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -407,8 +407,6 @@ class Menu(): return False def _callbackSet(self, panel, attr, value, key=None): - self._callbackView(panel) - control = cli.controller.getController() panel = control.getPanel(panel) @@ -427,8 +425,6 @@ class Menu(): break def _callbackPressKey(self, panel, key): - self._callbackView(panel) - control = cli.controller.getController() panel = control.getPanel(panel) panel.handleKey(key)

1 0

[arm/release] Added support for File->Exit and Configuation->Reset Tor.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 62f118867dca5848d798bc2747a87b517bf81db9 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jun 2 15:28:07 2011 +0500 Added support for File->Exit and Configuation->Reset Tor. Event handlers can return a key which shall be carried all the way back to the controller which can use it for the next override in case it's recognized. Exit and Reset Tor return 'q' and 'x' keys respectively. cli.__all__ is updated to include menu module. --- src/cli/__init__.py | 2 +- src/cli/controller.py | 5 ++++- src/cli/menu.py | 15 +++++++++++---- src/util/menuItem.py | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/cli/__init__.py b/src/cli/__init__.py index 1564f68..81fabeb 100644 --- a/src/cli/__init__.py +++ b/src/cli/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "popups", "torrcPanel"] +__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "menu", "popups", "torrcPanel"] diff --git a/src/cli/controller.py b/src/cli/controller.py index d073312..bb258c3 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -518,7 +518,10 @@ def drawTorMonitor(stdscr, startTime): menu = cli.menu.Menu() menuKeys = menu.showMenu(keys=menuKeys) if menuKeys != []: - overrideKey = ord('m') + for key in (ord('m'), ord('q'), ord('x')): + if key in menuKeys: + menuKeys.remove(key) + overrideKey = key elif key == ord('q') or key == ord('Q'): # provides prompt to confirm that arm should exit if CONFIG["features.confirmQuit"]: diff --git a/src/cli/menu.py b/src/cli/menu.py index beceb01..47e8d09 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -19,7 +19,7 @@ class Menu(): DEFAULT_ROOT = menuItem.MenuItem(label="Root", children=( menuItem.MenuItem(label="File", children=( menuItem.MenuItem(label="Exit", - callback=self._callbackDefault),)), + callback=lambda item: self._callbackReturnKey(ord('q'))),)), menuItem.MenuItem(label="Logs", children=( menuItem.MenuItem(label="Events", callback=lambda item: self._callbackPressKey('log', ord('e'))), @@ -88,7 +88,7 @@ class Menu(): menuItem.MenuItem(label="Reload", callback=lambda item: self._callbackPressKey('configFile', ord('r'))), menuItem.MenuItem(label="Reset Tor", - callback=self._callbackDefault),)) + callback=lambda item: self._callbackReturnKey(ord('x'))),)) )) self._first = [0] @@ -291,6 +291,7 @@ class Menu(): cascaded, returnkeys = self._cascadeNLevel() if cascaded == False: index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] + 1 + returnkeys.append(ord('m')) for i in range(index): returnkeys.append(curses.KEY_RIGHT) returnkeys.append(curses.KEY_DOWN) @@ -298,6 +299,7 @@ class Menu(): elif key == curses.KEY_LEFT: index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] - 1 index = index % self._rootItem.getChildrenCount() + returnkeys.append(ord('m')) for i in range(index): returnkeys.append(curses.KEY_RIGHT) returnkeys.append(curses.KEY_DOWN) @@ -306,7 +308,9 @@ class Menu(): self._removeLevel() break elif uiTools.isSelectionKey(key): - self._handleEvent() + returnkey = self._handleEvent() + if returnkey: + returnkeys.append(returnkey) self._removeLevel() break @@ -374,7 +378,7 @@ class Menu(): item = self._getCurrentItem() if item.isLeaf(): - item.select() + return item.select() else: self._cascadeNLevel() @@ -429,3 +433,6 @@ class Menu(): panel = control.getPanel(panel) panel.handleKey(key) + def _callbackReturnKey(self, key): + return key + diff --git a/src/util/menuItem.py b/src/util/menuItem.py index 6868db6..b48c433 100644 --- a/src/util/menuItem.py +++ b/src/util/menuItem.py @@ -35,5 +35,5 @@ class MenuItem(): return len(self._children) def select(self): - self._callback(self) + return self._callback(self)

1 0

[arm/release] Minor api, formatting, and documentation changes
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit b5c7dca851bb7f1e13c90bd667136398fa89ce01 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 31 20:50:03 2011 -0700 Minor api, formatting, and documentation changes Revising some of the merged changes for the menus. --- src/cli/controller.py | 10 +++------- src/cli/popups.py | 15 +++++---------- src/util/menuItem.py | 22 ++++++++++++---------- src/util/panel.py | 25 +++++++++++++++++-------- 4 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index bb258c3..fcbaed5 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -7,6 +7,7 @@ import time import curses import threading +import cli.menu import cli.popups import cli.headerPanel import cli.logPanel @@ -17,7 +18,6 @@ import cli.graphing.bandwidthStats import cli.graphing.connStats import cli.graphing.resourceStats import cli.connections.connPanel -import cli.menu from util import connections, conf, enum, log, panel, sysTools, torConfig, torTools @@ -77,9 +77,6 @@ def initController(stdscr, startTime): # fourth page: torrc pagePanels.append([cli.torrcPanel.TorrcPanel(stdscr, cli.torrcPanel.Config.TORRC, config)]) - # top menu - menu = cli.menu.Menu() - # initializes the controller ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels) @@ -110,7 +107,7 @@ class LabelPanel(panel.Panel): """ def __init__(self, stdscr): - panel.Panel.__init__(self, stdscr, "msg", 0, 1) + panel.Panel.__init__(self, stdscr, "msg", 0, height=1) self.msgText = "" self.msgAttr = curses.A_NORMAL @@ -144,7 +141,6 @@ class Controller: stdscr - curses window stickyPanels - panels shown at the top of each page pagePanels - list of pages, each being a list of the panels on it - menu - popup drop-down menu """ self._screen = stdscr @@ -304,7 +300,7 @@ class Controller: if attr == None: if not self._isPaused: - msg = "page %i / %i - m: menu, q: quit, p: pause, h: page help" % (self._page + 1, len(self._pagePanels)) + msg = "page %i / %i - m: menu, p: pause, h: page help, q: quit" % (self._page + 1, len(self._pagePanels)) attr = curses.A_NORMAL else: msg = "Paused" diff --git a/src/cli/popups.py b/src/cli/popups.py index b3eb105..0e50aa1 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -8,7 +8,7 @@ import cli.controller from util import panel, uiTools -def init(height = -1, width = -1, top = -1, left = -1): +def init(height = -1, width = -1, top = 0, left = 0): """ Preparation for displaying a popup. This creates a popup with a valid subwindow instance. If that's successful then the curses lock is acquired @@ -19,19 +19,14 @@ def init(height = -1, width = -1, top = -1, left = -1): Arguments: height - maximum height of the popup width - maximum width of the popup + top - top position, relative to the sticky content + left - left position from the screen """ control = cli.controller.getController() - topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) - leftSize = 0 - - if top != -1: - topSize = topSize + top - if left != -1: - leftSize = left + stickyHeight = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) - popup = panel.Panel(control.getScreen(), "popup", topSize, height, width) - popup.setLeft(leftSize) + popup = panel.Panel(control.getScreen(), "popup", top + stickyHeight, left, height, width) popup.setVisible(True) # Redraws the popup to prepare a subwindow instance. If none is spawned then diff --git a/src/util/menuItem.py b/src/util/menuItem.py index b48c433..277c78a 100644 --- a/src/util/menuItem.py +++ b/src/util/menuItem.py @@ -1,25 +1,27 @@ """ -Menu Item class, used by the drop-down menus +Menu Item class, used by the drop-down menus. """ class MenuItem(): - """Contains title, callback handler and possible children""" - + """ + Contains title, callback handler and possible children. + """ + def __init__(self, label=None, callback=None, children=[], enabled=None): self._label = label self._callback = callback self._children = children self._enabled = enabled - + def getLabel(self): return self._label - + def isLeaf(self): return self._children == [] - + def isParent(self): return self._children != [] - + def isEnabled(self): if self._enabled == None: return True @@ -27,13 +29,13 @@ class MenuItem(): return self._enabled() else: return self._enabled - + def getChildren(self): return self._children - + def getChildrenCount(self): return len(self._children) - + def select(self): return self._callback(self) diff --git a/src/util/panel.py b/src/util/panel.py index 4fc2158..93b44c2 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -43,7 +43,7 @@ class Panel(): redraw(). """ - def __init__(self, parent, name, top, height=-1, width=-1): + def __init__(self, parent, name, top, left=0, height=-1, width=-1): """ Creates a durable wrapper for a curses subwindow in the given parent. @@ -51,6 +51,7 @@ class Panel(): parent - parent curses window name - identifier for the panel top - positioning of top within parent + left - positioning of the left edge within the parent height - maximum height of panel (uses all available space if -1) width - maximum width of panel (uses all available space if -1) """ @@ -74,7 +75,7 @@ class Panel(): self.pauseTime = -1 self.top = top - self.left = 0 + self.left = left self.height = height self.width = width @@ -256,25 +257,33 @@ class Panel(): self.top = top self.win = None - def getHeight(self): + def getLeft(self): """ - Provides the height used for subwindows (-1 if it isn't limited). + Provides the left position where this subwindow is placed within its + parent. """ - return self.height - + return self.left + def setLeft(self, left): """ - Changes the position where subwindows are placed within its parent. + Changes the left position where this subwindow is placed within its parent. Arguments: - top - positioning of top within parent + left - positioning of top within parent """ if self.left != left: self.left = left self.win = None + def getHeight(self): + """ + Provides the height used for subwindows (-1 if it isn't limited). + """ + + return self.height + def setHeight(self, height): """ Changes the height used for subwindows. This uses all available space if -1.

1 0

[arm/release] Merging krkhan's menus work
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit ccd77c1e77c30265a6d36732697854cf6afc069b Merge: 32c6f17 62f1188 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 2 08:59:45 2011 -0700 Merging krkhan's menus work src/cli/__init__.py | 2 +- src/cli/controller.py | 17 ++- src/cli/menu.py | 438 +++++++++++++++++++++++++++++++++++++++++++++++++ src/cli/popups.py | 9 +- src/util/menuItem.py | 39 +++++ src/util/panel.py | 18 ++- 6 files changed, 518 insertions(+), 5 deletions(-)

1 0