tor-commits

tor-commits@lists.torproject.org

1 participants
212477 discussions

[arm/master] Replaced namedtuples with MenuItem instances, fixed left arrow key on
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit cf4ae8454debdf8a9ace9a4f4cc3e4536152d1dd Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun May 29 15:32:34 2011 +0500 Replaced namedtuples with MenuItem instances, fixed left arrow key on top level menu. The MenuItem class is added replacing LeafEntry and ParentEntry namedtuples. Replaced "entry" with "item" and defined the constant TOPLEVEL to improve readability. The scrolling calculations in _moveTopLevelLeft contained a bug, menus with large number of top items did not scroll to the end. Fixed by adding a check to see if we're "spilling" to left of first entry. --- src/cli/menu.py | 98 +++++++++++++++++++++++++------------------------- src/util/menuItem.py | 34 +++++++++++++++++ 2 files changed, 83 insertions(+), 49 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index bedb98e..71b56a4 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -3,34 +3,32 @@ A drop-down menu for sending actions to panels. """ import curses -from collections import namedtuple import cli.controller import popups -from util import log, panel, uiTools +from util import log, panel, uiTools, menuItem -LeafEntry = namedtuple('LeafEntry', ['title', 'callback']) -ParentEntry = namedtuple('ParentEntry', ['title', 'children']) +TOPLEVEL = 0 class Menu(): """Displays a popup menu and sends keys to appropriate panels""" - def __init__(self, entry=None): - DEFAULT_ROOT = ParentEntry(title="Root", children=( - LeafEntry(title="File" , callback=self._callbackDefault), - LeafEntry(title="Logs" , callback=self._callbackDefault), - LeafEntry(title="View" , callback=self._callbackDefault), - LeafEntry(title="Graph" , callback=self._callbackDefault), - LeafEntry(title="Connections" , callback=self._callbackDefault), - LeafEntry(title="Configuration" , callback=self._callbackDefault))) + def __init__(self, item=None): + DEFAULT_ROOT = menuItem.MenuItem(label="Root", children=( + menuItem.MenuItem(label="File" , callback=self._callbackDefault), + menuItem.MenuItem(label="Logs" , callback=self._callbackDefault), + menuItem.MenuItem(label="View" , callback=self._callbackDefault), + menuItem.MenuItem(label="Graph" , callback=self._callbackDefault), + menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), + menuItem.MenuItem(label="Configuration" , callback=self._callbackDefault))) self._first = [0] self._selection = [0] - if entry and isinstance(entry, ParentEntry): - self._rootEntry = entry + if item and item.isParent(): + self._rootItem = item else: - self._rootEntry = DEFAULT_ROOT + self._rootItem = DEFAULT_ROOT def showMenu(self): popup, width, height = popups.init(height=3) @@ -61,73 +59,75 @@ class Menu(): popups.finalize() def _calculateTopLevelWidths(self, width): - titles = [menuItem.title for menuItem in self._rootEntry.children] + labels = [menuItem.getLabel() for menuItem in self._rootItem.getChildren()] - # width per title is set according to the longest title - titlewidth = max(map(len, titles)) + 2 + # width per label is set according to the longest label + labelwidth = max(map(len, labels)) + 2 - # total number of titles that can be printed in current width - printable = min(width / titlewidth - 1, len(self._rootEntry.children)) + # total number of labels that can be printed in current width + printable = min(width / labelwidth - 1, self._rootItem.getChildrenCount()) - return (titlewidth, printable) + return (labelwidth, printable) def _moveTopLevelRight(self, width): _, printable = self._calculateTopLevelWidths(width) - if self._selection[0] < printable - 1: - self._selection[0] = self._selection[0] + 1 + if self._selection[TOPLEVEL] < printable - 1: + self._selection[TOPLEVEL] = self._selection[TOPLEVEL] + 1 else: - self._selection[0] = 0 - if printable < len(self._rootEntry.children): - self._first[0] = (self._first[0] + printable) % len(self._rootEntry.children) + self._selection[TOPLEVEL] = 0 + if printable < self._rootItem.getChildrenCount(): + self._first[TOPLEVEL] = (self._first[TOPLEVEL] + printable) % self._rootItem.getChildrenCount() - if self._first[0] + self._selection[0] == len(self._rootEntry.children): - self._first[0] = 0 - self._selection[0] = 0 + if self._first[TOPLEVEL] + self._selection[TOPLEVEL] == self._rootItem.getChildrenCount(): + self._first[TOPLEVEL] = 0 + self._selection[TOPLEVEL] = 0 def _moveTopLevelLeft(self, width): _, printable = self._calculateTopLevelWidths(width) - if self._selection[0] > 0: - self._selection[0] = self._selection[0] - 1 + if self._selection[TOPLEVEL] > 0: + self._selection[TOPLEVEL] = self._selection[TOPLEVEL] - 1 else: - self._first[0] = abs(self._first[0] - printable) % len(self._rootEntry.children) - self._selection[0] = len(self._rootEntry.children) - self._first[0] - 1 + if self._first[TOPLEVEL] == 0: + self._first[TOPLEVEL] = (self._rootItem.getChildrenCount() / printable) * printable + else: + self._first[TOPLEVEL] = abs(self._first[TOPLEVEL] - printable) % self._rootItem.getChildrenCount() + self._selection[TOPLEVEL] = self._rootItem.getChildrenCount() - self._first[TOPLEVEL] - 1 - if self._selection[0] > printable: - self._selection[0] = printable - 1 + if self._selection[TOPLEVEL] > printable: + self._selection[TOPLEVEL] = printable - 1 def _drawTopLevel(self, popup, width, height): - titlewidth, printable = self._calculateTopLevelWidths(width) - children = self._rootEntry.children[self._first[0]:self._first[0] + printable] + labelwidth, printable = self._calculateTopLevelWidths(width) + children = self._rootItem.getChildren()[self._first[TOPLEVEL]:self._first[TOPLEVEL] + printable] top = 1 left = 1 - for (index, entry) in enumerate(children): - titleformat = curses.A_STANDOUT if index == self._selection[0] else curses.A_NORMAL + for (index, item) in enumerate(children): + labelformat = curses.A_STANDOUT if index == self._selection[TOPLEVEL] else curses.A_NORMAL popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - popup.addstr(top, left, entry.title.center(titlewidth), titleformat) - left = left + titlewidth + popup.addstr(top, left, item.getLabel().center(labelwidth), labelformat) + left = left + labelwidth popup.addch(top, left, curses.ACS_VLINE) left = left + 1 def _handleEvent(self): - entry = self._rootEntry + item = self._rootItem sums = [sum(values) for values in zip(self._first, self._selection)] for index in sums: - if isinstance(entry, ParentEntry): - entry = entry.children[index] + if item.isParent(): + item = item.getChildren()[index] else: break - log.log(log.ERR, "first: %d" % self._first[0]) - if isinstance(entry, LeafEntry): - entry.callback(entry) + if item.isLeaf(): + item.select() - def _callbackDefault(self, entry): - log.log(log.NOTICE, "%s selected" % entry.title) + def _callbackDefault(self, item): + log.log(log.NOTICE, "%s selected" % item.getLabel()) diff --git a/src/util/menuItem.py b/src/util/menuItem.py new file mode 100644 index 0000000..4800a0f --- /dev/null +++ b/src/util/menuItem.py @@ -0,0 +1,34 @@ +""" +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=[], parent=None): + self._label = label + self._callback = callback + self._children = children + self._parent = parent + + def getLabel(self): + return self._label + + def isLeaf(self): + return self._children == [] + + def isParent(self): + return self._children != [] + + def getChildren(self): + return self._children + + def getParent(self): + return self._parent + + def getChildrenCount(self): + return len(self._children) + + def select(self): + self._callback(self) +

1 0

[arm/master] fix: minor tweaks to the readme summary wording
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 32c6f177144f634cd19ae1fb12ebbe268466470d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 30 09:25:58 2011 -0700 fix: minor tweaks to the readme summary wording --- README | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 456aba1..b20ec1c 100644 --- a/README +++ b/README @@ -4,13 +4,13 @@ All code under the GPL v3 (http://www.gnu.org/licenses/gpl.html) Project page: www.atagar.com/arm Description: -Command line application for monitoring Tor relays, providing real time status +Command line application for monitoring Tor, providing real time status information such as the current configuration, bandwidth usage, message log, connections, etc. This uses a curses interface much like 'top' does for system usage. The application is intended for command-line aficionados, ssh -connections, and anyone stuck with a tty terminal for checking their relay's -status. Releases should be stable so if you manage to make it crash (or have a -feature request) then please let me know! +connections, and anyone with a tty terminal for checking their relay's status. +Releases should be stable so if you manage to make it crash (or have a feature +request) then please let me know! The project was originally proposed in 2008 by Jacob and Karsten: http://archives.seul.org/or/dev/Jan-2008/msg00005.html

1 0

[arm/master] Added drop-down second level menus.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit fbd07955c5376457a5a9ecc4e778dd4a9f97deb9 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon May 30 01:33:22 2011 +0500 Added drop-down second level menus. Second level menus can now be brought down using the arrow key. Popup init is modified to support top and left gaps, setLeft() is added to Panel for left padding. Constructor arguments for Panel are left unchanged so that existing panel-using code isn't broken. --- src/cli/menu.py | 154 +++++++++++++++++++++++++++++++++++++++++++++++++---- src/cli/popups.py | 9 +++- src/util/panel.py | 18 ++++++- 3 files changed, 168 insertions(+), 13 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 71b56a4..69538e0 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -8,19 +8,40 @@ import cli.controller import popups from util import log, panel, uiTools, menuItem -TOPLEVEL = 0 +TOPLEVEL, SECONDLEVEL = range(2) class Menu(): """Displays a popup menu and sends keys to appropriate panels""" def __init__(self, item=None): DEFAULT_ROOT = menuItem.MenuItem(label="Root", children=( - menuItem.MenuItem(label="File" , callback=self._callbackDefault), - menuItem.MenuItem(label="Logs" , callback=self._callbackDefault), - menuItem.MenuItem(label="View" , callback=self._callbackDefault), - menuItem.MenuItem(label="Graph" , callback=self._callbackDefault), - menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), - menuItem.MenuItem(label="Configuration" , 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=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" , 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" , callback=self._callbackDefault), + menuItem.MenuItem(label="Size" , callback=self._callbackDefault), + menuItem.MenuItem(label="Update Interval" , callback=self._callbackDefault), + menuItem.MenuItem(label="Bounds" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Connections" , children=( + menuItem.MenuItem(label="Identity" , callback=self._callbackDefault), + menuItem.MenuItem(label="Resolver" , callback=self._callbackDefault), + menuItem.MenuItem(label="Sort Order" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Configuration" , children=( + menuItem.MenuItem(label="Comments" , callback=self._callbackDefault), + menuItem.MenuItem(label="Reload" , callback=self._callbackDefault), + menuItem.MenuItem(label="Reset Tor" , callback=self._callbackDefault),)) + )) self._first = [0] self._selection = [0] @@ -51,6 +72,10 @@ class Menu(): elif key == curses.KEY_LEFT: if len(self._selection) == 1: self._moveTopLevelLeft(width) + elif key == curses.KEY_DOWN: + if len(self._selection) == 1: + self._dropSecondLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() break @@ -58,17 +83,42 @@ class Menu(): finally: popups.finalize() - def _calculateTopLevelWidths(self, width): + def _getCurrentTopLevelItem(self): + index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] + return self._rootItem.getChildren()[index] + + def _calculateTopLevelWidths(self, width=0): labels = [menuItem.getLabel() for menuItem in self._rootItem.getChildren()] # width per label is set according to the longest label labelwidth = max(map(len, labels)) + 2 - # total number of labels that can be printed in current width + # total number of labels that can be printed in supplied width printable = min(width / labelwidth - 1, self._rootItem.getChildrenCount()) return (labelwidth, printable) + def _calculateSecondLevelWidths(self): + parent = self._getCurrentTopLevelItem() + + labels = [menuItem.getLabel() for menuItem in parent.getChildren()] + + labelwidth = max(map(len, labels)) + + return labelwidth + + def _calculateSecondLevelHeights(self, height=0): + control = cli.controller.getController() + height, _ = control.getScreen().getmaxyx() + topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) + height = height - topSize + + parent = self._getCurrentTopLevelItem() + + printable = min(height - 4, parent.getChildrenCount()) + + return printable if printable else parent.getChildrenCount() + def _moveTopLevelRight(self, width): _, printable = self._calculateTopLevelWidths(width) @@ -90,7 +140,7 @@ class Menu(): self._selection[TOPLEVEL] = self._selection[TOPLEVEL] - 1 else: if self._first[TOPLEVEL] == 0: - self._first[TOPLEVEL] = (self._rootItem.getChildrenCount() / printable) * printable + self._first[TOPLEVEL] = ((self._rootItem.getChildrenCount() / printable) * printable) % self._rootItem.getChildrenCount() else: self._first[TOPLEVEL] = abs(self._first[TOPLEVEL] - printable) % self._rootItem.getChildrenCount() self._selection[TOPLEVEL] = self._rootItem.getChildrenCount() - self._first[TOPLEVEL] - 1 @@ -115,6 +165,90 @@ class Menu(): popup.addch(top, left, curses.ACS_VLINE) left = left + 1 + def _dropSecondLevel(self): + self._first.append(0) + self._selection.append(0) + + labelwidth = self._calculateSecondLevelWidths() + printable = self._calculateSecondLevelHeights() + + toplabelwidth, _ = self._calculateTopLevelWidths() + left = (toplabelwidth + 2) * self._selection[TOPLEVEL] + + popup, width, height = popups.init(height=printable+2, width=labelwidth+2, top=2, left=left) + + if popup.win: + try: + while True: + popup.win.erase() + popup.win.box() + + self._drawSecondLevel(popup, width, height) + + popup.win.refresh() + + control = cli.controller.getController() + key = control.getScreen().getch() + + if key == curses.KEY_DOWN: + self._moveSecondLevelDown(height) + elif key == curses.KEY_UP: + self._moveSecondLevelUp(height) + elif uiTools.isSelectionKey(key): + self._handleEvent() + self._first.pop() + self._selection.pop() + break + + finally: + popups.finalize() + + def _drawSecondLevel(self, popup, width, height): + printable = self._calculateSecondLevelHeights() + parent = self._getCurrentTopLevelItem() + children = parent.getChildren()[self._first[SECONDLEVEL]:self._first[SECONDLEVEL] + printable] + + toplabelwidth, _ = self._calculateTopLevelWidths(width) + + top = 1 + left = 1 + for (index, item) in enumerate(children): + labelformat = curses.A_STANDOUT if index == self._selection[SECONDLEVEL] else curses.A_NORMAL + + popup.addstr(top, left, item.getLabel(), labelformat) + top = top + 1 + + def _moveSecondLevelDown(self, height): + printable = self._calculateSecondLevelHeights() + parent = self._getCurrentTopLevelItem() + + if self._selection[SECONDLEVEL] < printable - 1: + self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] + 1 + else: + self._selection[SECONDLEVEL] = 0 + if printable < parent.getChildrenCount(): + self._first[SECONDLEVEL] = (self._first[SECONDLEVEL] + printable) % parent.getChildrenCount() + + if self._first[SECONDLEVEL] + self._selection[SECONDLEVEL] == parent.getChildrenCount(): + self._first[SECONDLEVEL] = 0 + self._selection[SECONDLEVEL] = 0 + + def _moveSecondLevelUp(self, height): + printable = self._calculateSecondLevelHeights() + parent = self._getCurrentTopLevelItem() + + if self._selection[SECONDLEVEL] > 0: + self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] - 1 + else: + if self._first[SECONDLEVEL] == 0: + self._first[SECONDLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() + else: + self._first[SECONDLEVEL] = abs(self._first[SECONDLEVEL] - printable) % parent.getChildrenCount() + self._selection[SECONDLEVEL] = parent.getChildrenCount() - self._first[SECONDLEVEL] - 1 + + if self._selection[SECONDLEVEL] > printable: + self._selection[SECONDLEVEL] = printable - 1 + def _handleEvent(self): item = self._rootItem sums = [sum(values) for values in zip(self._first, self._selection)] diff --git a/src/cli/popups.py b/src/cli/popups.py index 7ed5302..b3eb105 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): +def init(height = -1, width = -1, top = -1, left = -1): """ Preparation for displaying a popup. This creates a popup with a valid subwindow instance. If that's successful then the curses lock is acquired @@ -23,8 +23,15 @@ def init(height = -1, width = -1): 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 popup = panel.Panel(control.getScreen(), "popup", topSize, height, width) + popup.setLeft(leftSize) popup.setVisible(True) # Redraws the popup to prepare a subwindow instance. If none is spawned then diff --git a/src/util/panel.py b/src/util/panel.py index a104a07..4fc2158 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -74,6 +74,7 @@ class Panel(): self.pauseTime = -1 self.top = top + self.left = 0 self.height = height self.width = width @@ -261,6 +262,18 @@ class Panel(): """ return self.height + + def setLeft(self, left): + """ + Changes the position where subwindows are placed within its parent. + + Arguments: + top - positioning of top within parent + """ + + if self.left != left: + self.left = left + self.win = None def setHeight(self, height): """ @@ -303,6 +316,7 @@ class Panel(): newHeight, newWidth = self.parent.getmaxyx() setHeight, setWidth = self.getHeight(), self.getWidth() newHeight = max(0, newHeight - self.top) + newWidth = max(0, newWidth - self.left) if setHeight != -1: newHeight = min(newHeight, setHeight) if setWidth != -1: newWidth = min(newWidth, setWidth) return (newHeight, newWidth) @@ -569,7 +583,7 @@ class Panel(): # temporary subwindow for user input displayWidth = self.getPreferredSize()[1] - inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top, x) + inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top, self.left + x) # prepopulates the initial text if initialText: inputSubwindow.addstr(0, 0, initialText) @@ -682,7 +696,7 @@ class Panel(): # would mean far more complicated code and no more selective refreshing) if recreate: - self.win = self.parent.subwin(newHeight, newWidth, self.top, 0) + self.win = self.parent.subwin(newHeight, newWidth, self.top, self.left) # note: doing this log before setting win produces an infinite loop msg = "recreating panel '%s' with the dimensions of %i/%i" % (self.getName(), newHeight, newWidth)

1 0

[arm/master] Mapped menu items to respective actions.
by atagar＠torproject.org 04 Jun '11

04 Jun '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/master] Added support for multiple menu levels.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 46a1023c71f395c62a37a30c13e14db7b851640a Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue May 31 02:31:23 2011 +0500 Added support for multiple menu levels. Once the menus have "dropped-down", handling of subsequent "levels" followed the same logical steps. Therefore *SecondLevel() methods have been replaced by *NLevel() equivalents. If a parent item is selected using any of the selection keys, its children are brought up instead of doing nothing. --- src/cli/menu.py | 192 +++++++++++++++++++++++++++++++++++--------------- src/util/menuItem.py | 6 +-- 2 files changed, 136 insertions(+), 62 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 69538e0..8ce97c4 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -8,7 +8,7 @@ import cli.controller import popups from util import log, panel, uiTools, menuItem -TOPLEVEL, SECONDLEVEL = range(2) +PARENTLEVEL, TOPLEVEL = (-1, 0) class Menu(): """Displays a popup menu and sends keys to appropriate panels""" @@ -22,23 +22,61 @@ class Menu(): 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" , 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" , callback=self._callbackDefault), - menuItem.MenuItem(label="Size" , callback=self._callbackDefault), - menuItem.MenuItem(label="Update Interval" , callback=self._callbackDefault), - menuItem.MenuItem(label="Bounds" , callback=self._callbackDefault),)), + 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="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="Connections" , children=( - menuItem.MenuItem(label="Identity" , callback=self._callbackDefault), - menuItem.MenuItem(label="Resolver" , callback=self._callbackDefault), + 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="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" , callback=self._callbackDefault), + menuItem.MenuItem(label="Comments" , children=( + menuItem.MenuItem(label="Hidden" , callback=self._callbackDefault), + menuItem.MenuItem(label="Visible" , callback=self._callbackDefault), + )), menuItem.MenuItem(label="Reload" , callback=self._callbackDefault), menuItem.MenuItem(label="Reset Tor" , callback=self._callbackDefault),)) )) @@ -67,15 +105,12 @@ class Menu(): key = control.getScreen().getch() if key == curses.KEY_RIGHT: - if len(self._selection) == 1: - self._moveTopLevelRight(width) + self._moveTopLevelRight(width) elif key == curses.KEY_LEFT: - if len(self._selection) == 1: - self._moveTopLevelLeft(width) + self._moveTopLevelLeft(width) elif key == curses.KEY_DOWN: - if len(self._selection) == 1: - self._dropSecondLevel() - break + self._showNLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() break @@ -87,6 +122,21 @@ class Menu(): index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] return self._rootItem.getChildren()[index] + def _getCurrentItem(self, level=0): + item = self._rootItem + if level == 0: + sums = [sum(values) for values in zip(self._first, self._selection)] + else: + sums = [sum(values) for values in zip(self._first[:level], self._selection[:level])] + + for index in sums: + if item.isParent(): + item = item.getChildren()[index] + else: + break + + return item + def _calculateTopLevelWidths(self, width=0): labels = [menuItem.getLabel() for menuItem in self._rootItem.getChildren()] @@ -119,6 +169,33 @@ class Menu(): return printable if printable else parent.getChildrenCount() + def _calculateNLevelWidths(self, level=0): + parent = self._getCurrentItem(level) + + if parent.isLeaf(): + return 0 + + labels = [menuItem.getLabel() for menuItem in parent.getChildren()] + + labelwidth = max(map(len, labels)) + + return labelwidth + + def _calculateNLevelHeights(self, height=0, level=0): + control = cli.controller.getController() + height, _ = control.getScreen().getmaxyx() + topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) + height = height - topSize + + parent = self._getCurrentItem(level) + + if parent.isLeaf(): + return 0 + + printable = min(height - 4, parent.getChildrenCount()) + + return printable if printable else parent.getChildrenCount() + def _moveTopLevelRight(self, width): _, printable = self._calculateTopLevelWidths(width) @@ -165,12 +242,17 @@ class Menu(): popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - def _dropSecondLevel(self): + def _showNLevel(self): self._first.append(0) self._selection.append(0) - labelwidth = self._calculateSecondLevelWidths() - printable = self._calculateSecondLevelHeights() + parent = self._getCurrentItem(level=PARENTLEVEL) + + if parent.isLeaf(): + return + + labelwidth = self._calculateNLevelWidths(level=PARENTLEVEL) + printable = self._calculateNLevelHeights(level=PARENTLEVEL) toplabelwidth, _ = self._calculateTopLevelWidths() left = (toplabelwidth + 2) * self._selection[TOPLEVEL] @@ -183,7 +265,7 @@ class Menu(): popup.win.erase() popup.win.box() - self._drawSecondLevel(popup, width, height) + self._drawNLevel(popup, width, height) popup.win.refresh() @@ -191,9 +273,12 @@ class Menu(): key = control.getScreen().getch() if key == curses.KEY_DOWN: - self._moveSecondLevelDown(height) + self._moveNLevelDown(height) elif key == curses.KEY_UP: - self._moveSecondLevelUp(height) + self._moveNLevelUp(height) + elif key == curses.KEY_RIGHT: + self._showNLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() self._first.pop() @@ -203,64 +288,57 @@ class Menu(): finally: popups.finalize() - def _drawSecondLevel(self, popup, width, height): - printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() - children = parent.getChildren()[self._first[SECONDLEVEL]:self._first[SECONDLEVEL] + printable] - - toplabelwidth, _ = self._calculateTopLevelWidths(width) + def _drawNLevel(self, popup, width, height): + printable = self._calculateNLevelHeights(level=PARENTLEVEL) + parent = self._getCurrentItem(level=PARENTLEVEL) + children = parent.getChildren()[self._first[PARENTLEVEL]:self._first[PARENTLEVEL] + printable] top = 1 left = 1 for (index, item) in enumerate(children): - labelformat = curses.A_STANDOUT if index == self._selection[SECONDLEVEL] else curses.A_NORMAL + labelformat = curses.A_STANDOUT if index == self._selection[PARENTLEVEL] else curses.A_NORMAL popup.addstr(top, left, item.getLabel(), labelformat) top = top + 1 - def _moveSecondLevelDown(self, height): - printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() + def _moveNLevelDown(self, height): + printable = self._calculateNLevelHeights(level=PARENTLEVEL) + parent = self._getCurrentItem(level=PARENTLEVEL) - if self._selection[SECONDLEVEL] < printable - 1: - self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] + 1 + if self._selection[PARENTLEVEL] < printable - 1: + self._selection[PARENTLEVEL] = self._selection[PARENTLEVEL] + 1 else: - self._selection[SECONDLEVEL] = 0 + self._selection[PARENTLEVEL] = 0 if printable < parent.getChildrenCount(): - self._first[SECONDLEVEL] = (self._first[SECONDLEVEL] + printable) % parent.getChildrenCount() + self._first[PARENTLEVEL] = (self._first[PARENTLEVEL] + printable) % parent.getChildrenCount() - if self._first[SECONDLEVEL] + self._selection[SECONDLEVEL] == parent.getChildrenCount(): - self._first[SECONDLEVEL] = 0 - self._selection[SECONDLEVEL] = 0 + if self._first[PARENTLEVEL] + self._selection[PARENTLEVEL] == parent.getChildrenCount(): + self._first[PARENTLEVEL] = 0 + self._selection[PARENTLEVEL] = 0 - def _moveSecondLevelUp(self, height): + def _moveNLevelUp(self, height): printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() + parent = self._getCurrentItem(level=PARENTLEVEL) - if self._selection[SECONDLEVEL] > 0: - self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] - 1 + if self._selection[PARENTLEVEL] > 0: + self._selection[PARENTLEVEL] = self._selection[PARENTLEVEL] - 1 else: - if self._first[SECONDLEVEL] == 0: - self._first[SECONDLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() + if self._first[PARENTLEVEL] == 0: + self._first[PARENTLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() else: - self._first[SECONDLEVEL] = abs(self._first[SECONDLEVEL] - printable) % parent.getChildrenCount() - self._selection[SECONDLEVEL] = parent.getChildrenCount() - self._first[SECONDLEVEL] - 1 + self._first[PARENTLEVEL] = abs(self._first[PARENTLEVEL] - printable) % parent.getChildrenCount() + self._selection[PARENTLEVEL] = parent.getChildrenCount() - self._first[PARENTLEVEL] - 1 - if self._selection[SECONDLEVEL] > printable: - self._selection[SECONDLEVEL] = printable - 1 + if self._selection[PARENTLEVEL] > printable: + self._selection[PARENTLEVEL] = printable - 1 def _handleEvent(self): - item = self._rootItem - sums = [sum(values) for values in zip(self._first, self._selection)] - - for index in sums: - if item.isParent(): - item = item.getChildren()[index] - else: - break + item = self._getCurrentItem() if item.isLeaf(): item.select() + else: + self._showNLevel() def _callbackDefault(self, item): log.log(log.NOTICE, "%s selected" % item.getLabel()) diff --git a/src/util/menuItem.py b/src/util/menuItem.py index 4800a0f..3dbf922 100644 --- a/src/util/menuItem.py +++ b/src/util/menuItem.py @@ -5,11 +5,10 @@ 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=[], parent=None): + def __init__(self, label=None, callback=None, children=[]): self._label = label self._callback = callback self._children = children - self._parent = parent def getLabel(self): return self._label @@ -23,9 +22,6 @@ class MenuItem(): def getChildren(self): return self._children - def getParent(self): - return self._parent - def getChildrenCount(self): return len(self._children)

1 0

[arm/master] fix: Remove calculateSecondLevel*() methods.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit f7375855453621fed4919021853bdab5ec017fd6 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue May 31 02:38:07 2011 +0500 fix: Remove calculateSecondLevel*() methods. --- src/cli/menu.py | 23 +---------------------- 1 files changed, 1 insertions(+), 22 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 8ce97c4..5a51797 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -148,27 +148,6 @@ class Menu(): return (labelwidth, printable) - def _calculateSecondLevelWidths(self): - parent = self._getCurrentTopLevelItem() - - labels = [menuItem.getLabel() for menuItem in parent.getChildren()] - - labelwidth = max(map(len, labels)) - - return labelwidth - - def _calculateSecondLevelHeights(self, height=0): - control = cli.controller.getController() - height, _ = control.getScreen().getmaxyx() - topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) - height = height - topSize - - parent = self._getCurrentTopLevelItem() - - printable = min(height - 4, parent.getChildrenCount()) - - return printable if printable else parent.getChildrenCount() - def _calculateNLevelWidths(self, level=0): parent = self._getCurrentItem(level) @@ -317,7 +296,7 @@ class Menu(): self._selection[PARENTLEVEL] = 0 def _moveNLevelUp(self, height): - printable = self._calculateSecondLevelHeights() + printable = self._calculateNLevelHeights(level=PARENTLEVEL) parent = self._getCurrentItem(level=PARENTLEVEL) if self._selection[PARENTLEVEL] > 0:

1 0

[arm/master] Minor readability improvements.
by atagar＠torproject.org 04 Jun '11

04 Jun '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/master] Next top-level item is dropped down in case right/left arrow keys
by atagar＠torproject.org 04 Jun '11

04 Jun '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/master] Controller page isn't changed in case the required panel isn't currently
by atagar＠torproject.org 04 Jun '11

04 Jun '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/master] fix: installation wasn't adding uninstall script
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 8b8b4230ce305d8aadc4eebc36b4bd9506bd096f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 26 07:02:37 2011 -0700 fix: installation wasn't adding uninstall script The uninstall wasn't among the set of non-python resources copied into /usr/share/arm during installation. --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index cb0069f..cdda907 100644 --- a/setup.py +++ b/setup.py @@ -90,7 +90,7 @@ setup(name='arm', data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]), (docPath, ["armrc.sample"]), - ("/usr/share/arm", ["src/settings.cfg"])], + ("/usr/share/arm", ["src/settings.cfg", "src/uninstall"])], ) # Cleans up the temporary compressed man page.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits