March 2016 - tor-commits - lists.torproject.org

[webwml/master] Deprecating old Tor Browser version
by gk＠torproject.org 20 Mar '16

20 Mar '16

commit 53fb0cbc45acc435d2aa1c06839d1b47f268a8a9 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Mar 20 07:28:59 2016 +0000 Deprecating old Tor Browser version --- projects/torbrowser/RecommendedTBBVersions | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index b18a5b6..d6b52f3 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,22 +1,12 @@ [ -"5.5.3", -"5.5.3-Linux", -"5.5.3-MacOS", -"5.5.3-Windows", "5.5.4", "5.5.4-Linux", "5.5.4-MacOS", "5.5.4-Windows", -"6.0a3", -"6.0a3-Linux", -"6.0a3-MacOS", -"6.0a3-Windows", "6.0a4", "6.0a4-Linux", "6.0a4-MacOS", "6.0a4-Windows", -"6.0a3-hardened", -"6.0a3-hardened-Linux", "6.0a4-hardened", "6.0a4-hardened-Linux" ]

1 0

[nyx/master] Fix menu stacktrace
by atagar＠torproject.org 20 Mar '16

20 Mar '16

commit c730a6c69fd972a3b760d3f9195db3a453b15aef Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 19 21:06:17 2016 -0700 Fix menu stacktrace Oops, turns out these attributes are still used after all by our menu. --- nyx/popups.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nyx/popups.py b/nyx/popups.py index 89fa26e..6190a09 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -24,7 +24,7 @@ UNRESOLVED_MSG = 'No consensus data available' ERROR_MSG = 'Unable to retrieve data' -def popup_window(height = -1, width = -1, below_static = True): +def popup_window(height = -1, width = -1, top = 0, left = 0, below_static = True): """ Provides a popup dialog you can use in a 'with' block... @@ -38,6 +38,8 @@ def popup_window(height = -1, width = -1, below_static = True): :param int height: maximum height of the popup :param int width: maximum width of the popup + :param int top: top position, relative to the sticky content + :param int left: left position from the screen :param bool below_static: positions popup below static content if True :returns: tuple of the form (subwindow, width, height) when used in a with block @@ -52,7 +54,7 @@ def popup_window(height = -1, width = -1, below_static = True): else: sticky_height = 0 - popup = nyx.panel.Panel('popup', top = sticky_height, height = height, width = width) + popup = nyx.panel.Panel('popup', top + sticky_height, left, height, width) popup.set_visible(True) # Redraws the popup to prepare a subwindow instance. If none is spawned then

1 0

[nyx/master] Drop Panel's set_height() and set_width()
by atagar＠torproject.org 20 Mar '16

20 Mar '16

commit 75661a9d109f73eeedd76f93b5c88e5f06990adb Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 19 17:08:32 2016 -0700 Drop Panel's set_height() and set_width() Couple unused resizing funcitons. --- nyx/panel/__init__.py | 48 +++++++----------------------------------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 77884ac..62ae709 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -246,18 +246,6 @@ class Panel(object): return self.height - def set_height(self, height): - """ - Changes the height used for subwindows. This uses all available space if -1. - - Arguments: - height - maximum height of panel (uses all available space if -1) - """ - - if self.height != height: - self.height = height - self.win = None - def get_width(self): """ Provides the width used for subwindows (-1 if it isn't limited). @@ -265,18 +253,6 @@ class Panel(object): return self.width - def set_width(self, width): - """ - Changes the width used for subwindows. This uses all available space if -1. - - Arguments: - width - maximum width of panel (uses all available space if -1) - """ - - if self.width != width: - self.width = width - self.win = None - def get_preferred_size(self): """ Provides the dimensions the subwindow would use when next redrawn, given @@ -566,7 +542,7 @@ class Panel(object): return user_input - def add_scroll_bar(self, top, bottom, size, draw_top = 0, draw_bottom = -1, draw_left = 0): + def add_scroll_bar(self, top, bottom, size, draw_top = 0): """ Draws a left justified scroll bar reflecting position within a vertical listing. This is shorted if necessary, and left undrawn if no space is @@ -585,24 +561,14 @@ class Panel(object): bottom - list index for the bottom-most visible element size - size of the list in which the listed elements are contained draw_top - starting row where the scroll bar should be drawn - draw_bottom - ending row where the scroll bar should end, -1 if it should - span to the bottom of the panel - draw_left - left offset at which to draw the scroll bar """ if (self.max_y - draw_top) < 2: return # not enough room - # sets draw_bottom to be the actual row on which the scrollbar should end - - if draw_bottom == -1: - draw_bottom = self.max_y - 1 - else: - draw_bottom = min(draw_bottom, self.max_y - 1) - # determines scrollbar dimensions - scrollbar_height = draw_bottom - draw_top + scrollbar_height = self.max_y - draw_top - 1 slider_top = scrollbar_height * top / size slider_size = scrollbar_height * (bottom - top) / size @@ -624,15 +590,15 @@ class Panel(object): for i in range(scrollbar_height): if i >= slider_top and i <= slider_top + slider_size: - self.addstr(i + draw_top, draw_left, ' ', HIGHLIGHT) + self.addstr(i + draw_top, 0, ' ', HIGHLIGHT) else: - self.addstr(i + draw_top, draw_left, ' ') + self.addstr(i + draw_top, 0, ' ') # draws box around the scroll bar - self.vline(draw_top, draw_left + 1, draw_bottom - 1) - self.addch(draw_bottom, draw_left + 1, curses.ACS_LRCORNER) - self.addch(draw_bottom, draw_left, curses.ACS_HLINE) + self.vline(draw_top, 1, self.max_y - 2) + self.addch(self.max_y - 1, 1, curses.ACS_LRCORNER) + self.addch(self.max_y - 1, 0, curses.ACS_HLINE) def _reset_subwindow(self): """

1 0

[nyx/master] Move CURSES_LOCK to nyx.curses
by atagar＠torproject.org 20 Mar '16

20 Mar '16

commit b18a2e48f63e2fb15107f2a818f5cc4c0e0688d7 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 16 09:52:38 2016 -0700 Move CURSES_LOCK to nyx.curses This belongs with the curses screen. Eventually all curses interactions will go through us so nobody outside this module will need the lock. --- nyx/curses.py | 5 +++++ nyx/panel/__init__.py | 10 ++-------- nyx/panel/graph.py | 2 +- nyx/panel/log.py | 2 +- nyx/popups.py | 8 ++++---- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 0b6e24a..97ad02a 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -66,6 +66,7 @@ if we want Windows support in the future too. from __future__ import absolute_import import curses +import threading import stem.util.conf import stem.util.enum @@ -73,7 +74,11 @@ import stem.util.system from nyx import msg, log +# Curses screen we've initialized and lock for interacting with it. Curses +# isn't thread safe and concurrency bugs produce especially sinister glitches. + CURSES_SCREEN = None +CURSES_LOCK = threading.RLock() # Text colors and attributes. These are *very* commonly used so including # shorter aliases (so they can be referenced as just GREEN or BOLD). diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 0394d55..287d756 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -7,7 +7,6 @@ import time import curses import curses.ascii import curses.textpad -from threading import RLock import nyx.curses import stem.util.log @@ -15,11 +14,6 @@ import stem.util.log from nyx.curses import HIGHLIGHT from stem.util import conf, str_tools -# global ui lock governing all panel instances (curses isn't thread save and -# concurrency bugs produce especially sinister glitches) - -CURSES_LOCK = RLock() - PASS = -1 __all__ = [ @@ -457,7 +451,7 @@ class Panel(object): self.max_y, self.max_x = subwin_max_y, subwin_max_x - if not CURSES_LOCK.acquire(False): + if not nyx.curses.CURSES_LOCK.acquire(False): return try: @@ -466,7 +460,7 @@ class Panel(object): self.draw(self.max_x, self.max_y) self.win.refresh() finally: - CURSES_LOCK.release() + nyx.curses.CURSES_LOCK.release() def hline(self, y, x, length, *attributes): """ diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 257716e..20a64c0 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -475,7 +475,7 @@ class GraphPanel(nyx.panel.Panel): control = nyx.controller.get_controller() - with nyx.panel.CURSES_LOCK: + with nyx.curses.CURSES_LOCK: try: while True: msg = 'press the down/up to resize the graph, and enter when done' diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 92e3f90..3ab53f3 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -239,7 +239,7 @@ class LogPanel(nyx.panel.Panel, threading.Thread): if key_press.match('c'): self.clear() elif key.match('f'): - with nyx.panel.CURSES_LOCK: + with nyx.curses.CURSES_LOCK: initial_selection = 1 if self._filter.selection() else 0 options = ['None'] + self._filter.latest_selections() + ['New...'] selection = nyx.popups.show_menu('Log Filter:', options, initial_selection) diff --git a/nyx/popups.py b/nyx/popups.py index 61273f3..f29c9c8 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -63,13 +63,13 @@ def popup_window(height = -1, width = -1, top = 0, left = 0, below_static = True popup.redraw(True) if popup.win is not None: - nyx.panel.CURSES_LOCK.acquire() + nyx.curses.CURSES_LOCK.acquire() return (popup, popup.max_x - 1, popup.max_y) else: return (None, 0, 0) def __exit__(self, exit_type, value, traceback): - nyx.panel.CURSES_LOCK.release() + nyx.curses.CURSES_LOCK.release() nyx.controller.get_controller().redraw(False) return _Popup() @@ -85,7 +85,7 @@ def input_prompt(msg, initial_value = ''): initial_value - initial value of the field """ - with nyx.panel.CURSES_LOCK: + with nyx.curses.CURSES_LOCK: control = nyx.controller.get_controller() msg_panel = control.get_panel('msg') msg_panel.set_message(msg) @@ -107,7 +107,7 @@ def show_msg(msg, max_wait = None, attr = HIGHLIGHT): attr - attributes with which to draw the message """ - with nyx.panel.CURSES_LOCK: + with nyx.curses.CURSES_LOCK: control = nyx.controller.get_controller() control.set_msg(msg, attr, True)

1 0

[nyx/master] Drop Panel's get_parent() method
by atagar＠torproject.org 20 Mar '16

20 Mar '16

commit 2cdee9afa60c8d72654a503a0975936b1e351add Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 16 10:22:34 2016 -0700 Drop Panel's get_parent() method Only used in one spot, and a weird one at that. I want to get rid of this attribute entirely but it's still used within the Panel itself. --- nyx/panel/__init__.py | 7 ------- nyx/panel/header.py | 11 +++++------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 287d756..176eea9 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -192,13 +192,6 @@ class Panel(object): self.title_visible = is_visible - def get_parent(self): - """ - Provides the parent used to create subwindows. - """ - - return self.parent - def set_visible(self, is_visible): """ Toggles if the panel is visible or not. diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 3ee0e84..51245ee 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -44,21 +44,19 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): self._vals = get_sampling() + self._last_width = 100 self._pause_condition = threading.Condition() self._halt = False # terminates thread if true self._reported_inactive = False tor_controller().add_status_listener(self.reset_listener) - def is_wide(self, width = None): + def is_wide(self): """ True if we should show two columns of information, False otherwise. """ - if width is None: - width = self.get_parent().getmaxyx()[1] - - return width >= MIN_DUAL_COL_WIDTH + return self._last_width >= MIN_DUAL_COL_WIDTH def get_height(self): """ @@ -127,7 +125,8 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): def draw(self, width, height): vals = self._vals # local reference to avoid concurrency concerns - is_wide = self.is_wide(width) + self._last_width = width + is_wide = self.is_wide() # space available for content

1 0

[nyx/master] Move paused attribute handling out of Panel
by atagar＠torproject.org 20 Mar '16

20 Mar '16

commit 5484afb38e2ab7475c22b5194ba3dccefbadea22 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 19 16:15:10 2016 -0700 Move paused attribute handling out of Panel This is simpler and less error prone when done by the panels. Actually, the graph panel was the only spot still using these helpers so easy thing to remove. :P --- nyx/panel/__init__.py | 69 --------------------------------------------------- nyx/panel/graph.py | 42 ++++++++++++++++++------------- 2 files changed, 25 insertions(+), 86 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index c47ac59..77884ac 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -2,7 +2,6 @@ Panels consisting the nyx interface. """ -import copy import time import curses import curses.ascii @@ -142,13 +141,7 @@ class Panel(object): self.visible = False self.title_visible = True - # Attributes for pausing. The pause_attr contains variables our get_attr - # method is tracking, and the pause buffer has copies of the values from - # when we were last unpaused (unused unless we're paused). - self.paused = False - self.pause_attr = [] - self.pause_buffer = {} self.pause_time = -1 self.top = top @@ -207,56 +200,6 @@ class Panel(object): return self.paused - def set_pause_attr(self, attr): - """ - Configures the panel to track the given attribute so that get_attr provides - the value when it was last unpaused (or its current value if we're - currently unpaused). For instance... - - > self.set_pause_attr('myVar') - > self.myVar = 5 - > self.myVar = 6 # self.get_attr('myVar') -> 6 - > self.set_paused(True) - > self.myVar = 7 # self.get_attr('myVar') -> 6 - > self.set_paused(False) - > self.myVar = 7 # self.get_attr('myVar') -> 7 - - Arguments: - attr - parameter to be tracked for get_attr - """ - - self.pause_attr.append(attr) - self.pause_buffer[attr] = self.copy_attr(attr) - - def get_attr(self, attr): - """ - Provides the value of the given attribute when we were last unpaused. If - we're currently unpaused then this is the current value. If untracked this - returns None. - - Arguments: - attr - local variable to be returned - """ - - if attr not in self.pause_attr: - return None - elif self.paused: - return self.pause_buffer[attr] - else: - return self.__dict__.get(attr) - - def copy_attr(self, attr): - """ - Provides a duplicate of the given configuration value, suitable for the - pause buffer. - - Arguments: - attr - parameter to be provided back - """ - - current_value = self.__dict__.get(attr) - return copy.copy(current_value) - def set_paused(self, is_pause): """ Toggles if the panel is paused or not. This causes the panel to be redrawn @@ -264,8 +207,6 @@ class Panel(object): important when pausing since otherwise the panel's display could change when redrawn for other reasons. - This returns True if the panel's pause state was changed, False otherwise. - Arguments: is_pause - freezes the state of the pause attributes if true, makes them editable otherwise @@ -276,17 +217,7 @@ class Panel(object): self.pause_time = time.time() self.paused = is_pause - - if is_pause: - # copies tracked attributes so we know what they were before pausing - - for attr in self.pause_attr: - self.pause_buffer[attr] = self.copy_attr(attr) - self.redraw(True) - return True - else: - return False def get_pause_time(self): """ diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 20a6110..b325dd1 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -390,21 +390,21 @@ class GraphPanel(nyx.panel.Panel): self._graph_height = CONFIG['features.graph.height'] self._accounting_stats = None + self._accounting_stats_paused = None self._stats = { GraphStat.BANDWIDTH: BandwidthStats(), GraphStat.SYSTEM_RESOURCES: ResourceStats(), } + self._stats_paused = None + if CONFIG['features.panels.show.connection']: self._stats[GraphStat.CONNECTIONS] = ConnectionStats() elif self._displayed_stat == GraphStat.CONNECTIONS: log.warn("The connection graph is unavailble when you set 'features.panels.show.connection false'.") self._displayed_stat = GraphStat.BANDWIDTH - self.set_pause_attr('_stats') - self.set_pause_attr('_accounting_stats') - controller = tor_controller() controller.add_event_listener(self._update_accounting, EventType.BW) controller.add_event_listener(self._update_stats, EventType.BW) @@ -455,8 +455,9 @@ class GraphPanel(nyx.panel.Panel): return 0 height = DEFAULT_CONTENT_HEIGHT + self._graph_height + accounting_stats = self._accounting_stats if self.is_paused() else self._accounting_stats_paused - if self.displayed_stat == GraphStat.BANDWIDTH and self._accounting_stats: + if self.displayed_stat == GraphStat.BANDWIDTH and accounting_stats: height += 3 return height @@ -544,11 +545,23 @@ class GraphPanel(nyx.panel.Panel): ('i', 'graph update interval', self.update_interval), ] + def set_paused(self, is_pause): + if is_pause: + self._accounting_stats_paused = copy.copy(self._accounting_stats) + self._stats_paused = dict([(key, type(self._stats[key])(self._stats[key])) for key in self._stats]) + + nyx.panel.Panel.set_paused(self, is_pause) + def draw(self, width, height): if not self.displayed_stat: return - stat = self.get_attr('_stats')[self.displayed_stat] + if not self.is_paused(): + stat = self._stats[self.displayed_stat] + accounting_stats = self._accounting_stats + else: + stat = self._stats_paused[self.displayed_stat] + accounting_stats = self._accounting_stats_paused attr = DrawAttributes( stat = type(stat)(stat), # clone the GraphCategory @@ -556,7 +569,7 @@ class GraphPanel(nyx.panel.Panel): subgraph_width = min(width / 2, CONFIG['features.graph.max_width']), interval = self.update_interval, bounds_type = self.bounds_type, - accounting = self.get_attr('_accounting_stats'), + accounting = accounting_stats, right_to_left = CONFIG['features.graph.right_to_left'], ) @@ -723,12 +736,6 @@ class GraphPanel(nyx.panel.Panel): self.addstr(y, 0, 'Accounting:', BOLD) self.addstr(y, 12, 'Connection Closed...') - def copy_attr(self, attr): - if attr == '_stats': - return dict([(key, type(self._stats[key])(self._stats[key])) for key in self._stats]) - else: - return nyx.panel.Panel.copy_attr(self, attr) - def _update_accounting(self, event): if not CONFIG['features.graph.bw.accounting.show']: self._accounting_stats = None @@ -736,18 +743,19 @@ class GraphPanel(nyx.panel.Panel): old_accounting_stats = self._accounting_stats self._accounting_stats = tor_controller().get_accounting_stats(None) - # if we either added or removed accounting info then redraw the whole - # screen to account for resizing + if not self.is_paused(): + # if we either added or removed accounting info then redraw the whole + # screen to account for resizing - if bool(old_accounting_stats) != bool(self._accounting_stats): - nyx.controller.get_controller().redraw() + if bool(old_accounting_stats) != bool(self._accounting_stats): + nyx.controller.get_controller().redraw() def _update_stats(self, event): for stat in self._stats.values(): stat.bandwidth_event(event) if self.displayed_stat: - param = self.get_attr('_stats')[self.displayed_stat] + param = self._stats[self.displayed_stat] update_rate = INTERVAL_SECONDS[self.update_interval] if param.primary.tick % update_rate == 0:

1 0

[nyx/master] Move raw curses usage behind raw_screen()
by atagar＠torproject.org 20 Mar '16

20 Mar '16

commit 5d9c3dde6315b1ceb9ba9017823ea036501b909c Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Mar 17 09:53:18 2016 -0700 Move raw curses usage behind raw_screen() Providing a function for raw access to the curses screen rather than passing a reference around. This is an intermediate step since we want to abstract this all away but for now better to have them go through nyx.curses to get this. --- nyx/controller.py | 46 +++++++++++++++++----------------------------- nyx/curses.py | 35 ++++++++++++++++++++++++++++++++--- nyx/panel/__init__.py | 14 ++++++++------ nyx/panel/config.py | 4 ++-- nyx/panel/connection.py | 4 ++-- nyx/panel/graph.py | 4 ++-- nyx/panel/header.py | 4 ++-- nyx/panel/log.py | 4 ++-- nyx/panel/torrc.py | 4 ++-- nyx/popups.py | 2 +- 10 files changed, 70 insertions(+), 51 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 602c85e..32f4db5 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -63,8 +63,8 @@ class LabelPanel(nyx.panel.Panel): Panel that just displays a single line of text. """ - def __init__(self, stdscr): - nyx.panel.Panel.__init__(self, stdscr, 'msg', 0, height=1) + def __init__(self): + nyx.panel.Panel.__init__(self, 'msg', 0, height=1) self.msg_text = '' self.msg_attr = NORMAL @@ -92,41 +92,36 @@ class Controller: Tracks the global state of the interface """ - def __init__(self, stdscr): + def __init__(self): """ Creates a new controller instance. Panel lists are ordered as they appear, top to bottom on the page. - - Arguments: - stdscr - curses window """ - self._screen = stdscr - self._sticky_panels = [ - nyx.panel.header.HeaderPanel(stdscr), - LabelPanel(stdscr), + nyx.panel.header.HeaderPanel(), + LabelPanel(), ] self._page_panels, first_page_panels = [], [] if CONFIG['features.panels.show.graph']: - first_page_panels.append(nyx.panel.graph.GraphPanel(stdscr)) + first_page_panels.append(nyx.panel.graph.GraphPanel()) if CONFIG['features.panels.show.log']: - first_page_panels.append(nyx.panel.log.LogPanel(stdscr)) + first_page_panels.append(nyx.panel.log.LogPanel()) if first_page_panels: self._page_panels.append(first_page_panels) if CONFIG['features.panels.show.connection']: - self._page_panels.append([nyx.panel.connection.ConnectionPanel(stdscr)]) + self._page_panels.append([nyx.panel.connection.ConnectionPanel()]) if CONFIG['features.panels.show.config']: - self._page_panels.append([nyx.panel.config.ConfigPanel(stdscr)]) + self._page_panels.append([nyx.panel.config.ConfigPanel()]) if CONFIG['features.panels.show.torrc']: - self._page_panels.append([nyx.panel.torrc.TorrcPanel(stdscr)]) + self._page_panels.append([nyx.panel.torrc.TorrcPanel()]) self.quit_signal = False self._page = 0 @@ -135,13 +130,6 @@ class Controller: self._last_drawn = 0 self.set_msg() # initializes our control message - def get_screen(self): - """ - Provides our curses window. - """ - - return self._screen - def get_page_count(self): """ Provides the number of pages the interface has. This may be zero if all @@ -306,7 +294,8 @@ class Controller: # https://trac.torproject.org/projects/tor/ticket/2830#comment:9 if force: - self._screen.clear() + with nyx.curses.raw_screen() as stdscr: + stdscr.clear() for panel_impl in display_panels: panel_impl.redraw(force) @@ -365,17 +354,14 @@ class Controller: return halt_thread -def start_nyx(stdscr): +def start_nyx(): """ Main draw loop context. - - Arguments: - stdscr - curses window """ global NYX_CONTROLLER - NYX_CONTROLLER = Controller(stdscr) + NYX_CONTROLLER = Controller() control = get_controller() if not CONFIG['features.acsSupport']: @@ -411,7 +397,9 @@ def start_nyx(stdscr): # redraws the interface if it's needed control.redraw(False) - stdscr.refresh() + + with nyx.curses.raw_screen() as stdscr: + stdscr.refresh() # wait for user keyboard input until timeout, unless an override was set diff --git a/nyx/curses.py b/nyx/curses.py index 97ad02a..4d9571b 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -9,6 +9,7 @@ if we want Windows support in the future too. :: start - initializes curses with the given function + raw_screen - provides direct access to the curses screen key_input - get keypress by user curses_attr - curses encoded text attribute @@ -139,8 +140,7 @@ CONFIG = stem.util.conf.config_dict('nyx', { def start(function, transparent_background = False, cursor = True): """ - Starts a curses interface, delegating to the given function. The function - should accept a single argument for the curses screen. + Starts a curses interface, delegating to the given function. :param funtion: function to invoke when curses starts :param bool transparent_background: allows background transparency @@ -164,11 +164,40 @@ def start(function, transparent_background = False, cursor = True): except curses.error: pass - function(stdscr) + function() curses.wrapper(_wrapper) +def raw_screen(): + """ + Provides the curses screen. This can only be called after + :func:`~nyx.curses.start`, and is used as follows... + + :: + + with nyx.curses.raw_screen() as stdscr: + ... work with curses... + + In the future this will never be called directly. This is just an + intermediate function as we migrate. + """ + + class _Wrapper(object): + def __enter__(self): + # TODO: We should be wrapping this with CURSES_LOCK.acquire/release(), + # but doing so seems to be causing frequent terminal gliches when + # shutting down. Strange since this should be strictly safer. Oh well - + # something to dig into later. + + return CURSES_SCREEN + + def __exit__(self, exit_type, value, traceback): + pass + + return _Wrapper() + + def key_input(input_timeout = None): """ Gets a key press from the user. diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 176eea9..bab0cc7 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -122,12 +122,11 @@ class Panel(object): redraw(). """ - def __init__(self, parent, name, top, left = 0, height = -1, width = -1): + def __init__(self, name, top, left = 0, height = -1, width = -1): """ Creates a durable wrapper for a curses subwindow in the given parent. Arguments: - parent - parent curses window name - identifier for the panel top - positioning of top within parent left - positioning of the left edge within the parent @@ -140,7 +139,6 @@ class Panel(object): # might chose their height based on its parent's current width). self.panel_name = name - self.parent = parent self.visible = False self.title_visible = True @@ -358,7 +356,9 @@ class Panel(object): returns a tuple of (height, width). """ - new_height, new_width = self.parent.getmaxyx() + with nyx.curses.raw_screen() as stdscr: + new_height, new_width = stdscr.getmaxyx() + set_height, set_width = self.get_height(), self.get_width() new_height = max(0, new_height - self.top) new_width = max(0, new_width - self.left) @@ -601,7 +601,8 @@ class Panel(object): display_width = self.get_preferred_size()[1] - input_subwindow = self.parent.subwin(1, display_width - x, self.top + y, self.left + x) + with nyx.curses.raw_screen() as stdscr: + input_subwindow = stdscr.subwin(1, display_width - x, self.top + y, self.left + x) # blanks the field's area, filling it with the font in case it's hilighting @@ -744,7 +745,8 @@ class Panel(object): # would mean far more complicated code and no more selective refreshing) if recreate: - self.win = self.parent.subwin(new_height, new_width, self.top, self.left) + with nyx.curses.raw_screen() as stdscr: + self.win = stdscr.subwin(new_height, new_width, self.top, self.left) # note: doing this log before setting win produces an infinite loop stem.util.log.debug("recreating panel '%s' with the dimensions of %i/%i" % (self.get_name(), new_height, new_width)) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 5b8a636..fc6dad1 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -118,8 +118,8 @@ class ConfigPanel(nyx.panel.Panel): Editor for tor's configuration. """ - def __init__(self, stdscr): - nyx.panel.Panel.__init__(self, stdscr, 'configuration', 0) + def __init__(self): + nyx.panel.Panel.__init__(self, 'configuration', 0) self._contents = [] self._scroller = nyx.curses.CursorScroller() diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index e3124d9..09efafb 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -259,8 +259,8 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): the current consensus and other data sources. """ - def __init__(self, stdscr): - nyx.panel.Panel.__init__(self, stdscr, 'connections', 0) + def __init__(self): + nyx.panel.Panel.__init__(self, 'connections', 0) threading.Thread.__init__(self) self.setDaemon(True) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 20a64c0..e4a0ce7 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -381,8 +381,8 @@ class GraphPanel(nyx.panel.Panel): Panel displaying graphical information of GraphCategory instances. """ - def __init__(self, stdscr): - nyx.panel.Panel.__init__(self, stdscr, 'graph', 0) + def __init__(self): + nyx.panel.Panel.__init__(self, 'graph', 0) self._displayed_stat = None if CONFIG['features.graph.type'] == 'none' else CONFIG['features.graph.type'] self._update_interval = CONFIG['features.graph.interval'] diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 51245ee..c3bba36 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -37,8 +37,8 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): Top area containing tor settings and system information. """ - def __init__(self, stdscr): - nyx.panel.Panel.__init__(self, stdscr, 'header', 0) + def __init__(self): + nyx.panel.Panel.__init__(self, 'header', 0) threading.Thread.__init__(self) self.setDaemon(True) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 3ab53f3..d6e00de 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -64,8 +64,8 @@ class LogPanel(nyx.panel.Panel, threading.Thread): from tor's log file if it exists. """ - def __init__(self, stdscr): - nyx.panel.Panel.__init__(self, stdscr, 'log', 0) + def __init__(self): + nyx.panel.Panel.__init__(self, 'log', 0) threading.Thread.__init__(self) self.setDaemon(True) diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 033fd94..f52b6fb 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -20,8 +20,8 @@ class TorrcPanel(panel.Panel): area. """ - def __init__(self, stdscr): - panel.Panel.__init__(self, stdscr, 'torrc', 0) + def __init__(self): + panel.Panel.__init__(self, 'torrc', 0) self._scroller = nyx.curses.Scroller() self._show_line_numbers = True # shows left aligned line numbers diff --git a/nyx/popups.py b/nyx/popups.py index f29c9c8..6190a09 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -54,7 +54,7 @@ def popup_window(height = -1, width = -1, top = 0, left = 0, below_static = True else: sticky_height = 0 - popup = nyx.panel.Panel(control.get_screen(), 'popup', top + sticky_height, left, height, width) + popup = nyx.panel.Panel('popup', top + sticky_height, left, height, width) popup.set_visible(True) # Redraws the popup to prepare a subwindow instance. If none is spawned then

1 0

[nyx/master] Fix log panel's ability to pause
by atagar＠torproject.org 20 Mar '16

20 Mar '16

commit 78355ab3700aa86eeae14e56b75368a082677362 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Mar 19 15:41:55 2016 -0700 Fix log panel's ability to pause When paused the log panel didn't actually freeze its content. To do this implementing clone method for our LogGroup. --- nyx/controller.py | 2 +- nyx/log.py | 32 ++++++++++++++++++++++++-------- nyx/panel/__init__.py | 9 +++------ nyx/panel/config.py | 2 +- nyx/panel/connection.py | 2 +- nyx/panel/graph.py | 2 +- nyx/panel/header.py | 2 +- nyx/panel/log.py | 13 +++++++++---- nyx/popups.py | 6 ++---- 9 files changed, 43 insertions(+), 27 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 32f4db5..e469358 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -64,7 +64,7 @@ class LabelPanel(nyx.panel.Panel): """ def __init__(self): - nyx.panel.Panel.__init__(self, 'msg', 0, height=1) + nyx.panel.Panel.__init__(self, 'msg', height = 1) self.msg_text = '' self.msg_attr = NORMAL diff --git a/nyx/log.py b/nyx/log.py index 642e97c..aeae399 100644 --- a/nyx/log.py +++ b/nyx/log.py @@ -19,11 +19,13 @@ runlevels. LogGroup - thread safe, deduplicated grouping of events |- add - adds an event to the group - +- pop - removes and returns an event + |- pop - removes and returns an event + +- clone - deep copy of this LogGroup LogEntry - individual log event |- is_duplicate_of - checks if a duplicate message of another LogEntry - +- day_count - number of days since this even occured + |- day_count - number of days since this even occured + +- clone - deep copy of this LogEntry LogFileOutput - writes log events to a file +- write - persist a given message @@ -33,7 +35,7 @@ runlevels. |- selection - current regex filter |- latest_selections - past regex selections |- match - checks if a LogEntry matches this filter - +- clone - deep clone of this LogFilters + +- clone - deep copy of this LogFilters """ import collections @@ -261,6 +263,12 @@ class LogGroup(object): if last_entry.is_duplicate: last_entry.duplicates.pop() + def clone(self): + with self._lock: + copy = LogGroup(self._max_size, self._group_by_day) + copy._entries = [entry.clone() for entry in self._entries] + return copy + def __len__(self): with self._lock: return len(self._entries) @@ -285,7 +293,7 @@ class LogEntry(object): :var bool is_duplicate: true if this matches other messages in the group and isn't the first - :var list duplicates: messages that are identical to thsi one + :var list duplicates: messages that are identical to this one """ def __init__(self, timestamp, type, message): @@ -340,6 +348,13 @@ class LogEntry(object): return day_count(self.timestamp) + def clone(self): + copy = LogEntry(self.timestamp, self.type, self.message) + copy.is_duplicate = self.is_duplicate + copy.duplicates = None if self.duplicates is None else list(self.duplicates) + + return copy + def __eq__(self, other): if isinstance(other, LogEntry): return hash(self) == hash(other) @@ -431,10 +446,11 @@ class LogFilters(object): def clone(self): with self._lock: - clone = LogFilters(max_filters = self._max_filters) - clone._selected = self._selected - clone._past_filters = self._past_filters - return clone + copy = LogFilters(max_filters = self._max_filters) + copy._selected = self._selected + copy._past_filters = self._past_filters + + return copy def trace(msg, **attr): diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index bab0cc7..c47ac59 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -122,7 +122,7 @@ class Panel(object): redraw(). """ - def __init__(self, name, top, left = 0, height = -1, width = -1): + def __init__(self, name, top = 0, left = 0, height = -1, width = -1): """ Creates a durable wrapper for a curses subwindow in the given parent. @@ -257,7 +257,7 @@ class Panel(object): current_value = self.__dict__.get(attr) return copy.copy(current_value) - def set_paused(self, is_pause, suppress_redraw = False): + def set_paused(self, is_pause): """ Toggles if the panel is paused or not. This causes the panel to be redrawn when toggling is pause state unless told to do otherwise. This is @@ -269,7 +269,6 @@ class Panel(object): Arguments: is_pause - freezes the state of the pause attributes if true, makes them editable otherwise - suppress_redraw - if true then this will never redraw the panel """ if is_pause != self.paused: @@ -284,9 +283,7 @@ class Panel(object): for attr in self.pause_attr: self.pause_buffer[attr] = self.copy_attr(attr) - if not suppress_redraw: - self.redraw(True) - + self.redraw(True) return True else: return False diff --git a/nyx/panel/config.py b/nyx/panel/config.py index fc6dad1..765345a 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -119,7 +119,7 @@ class ConfigPanel(nyx.panel.Panel): """ def __init__(self): - nyx.panel.Panel.__init__(self, 'configuration', 0) + nyx.panel.Panel.__init__(self, 'configuration') self._contents = [] self._scroller = nyx.curses.CursorScroller() diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 09efafb..3d571ec 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -260,7 +260,7 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): """ def __init__(self): - nyx.panel.Panel.__init__(self, 'connections', 0) + nyx.panel.Panel.__init__(self, 'connections') threading.Thread.__init__(self) self.setDaemon(True) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index e4a0ce7..20a6110 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -382,7 +382,7 @@ class GraphPanel(nyx.panel.Panel): """ def __init__(self): - nyx.panel.Panel.__init__(self, 'graph', 0) + nyx.panel.Panel.__init__(self, 'graph') self._displayed_stat = None if CONFIG['features.graph.type'] == 'none' else CONFIG['features.graph.type'] self._update_interval = CONFIG['features.graph.interval'] diff --git a/nyx/panel/header.py b/nyx/panel/header.py index c3bba36..0c7aa1b 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -38,7 +38,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): """ def __init__(self): - nyx.panel.Panel.__init__(self, 'header', 0) + nyx.panel.Panel.__init__(self, 'header') threading.Thread.__init__(self) self.setDaemon(True) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index d6e00de..159469a 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -65,19 +65,18 @@ class LogPanel(nyx.panel.Panel, threading.Thread): """ def __init__(self): - nyx.panel.Panel.__init__(self, 'log', 0) + nyx.panel.Panel.__init__(self, 'log') threading.Thread.__init__(self) self.setDaemon(True) logged_events = nyx.arguments.expand_events(CONFIG['startup.events']) self._event_log = nyx.log.LogGroup(CONFIG['cache.log_panel.size'], group_by_day = True) + self._event_log_paused = None self._event_types = nyx.log.listen_for_events(self._register_tor_event, logged_events) self._log_file = nyx.log.LogFileOutput(CONFIG['features.logFile']) self._filter = nyx.log.LogFilters(initial_filters = CONFIG['features.log.regex']) self._show_duplicates = CONFIG['features.log.showDuplicateEntries'] - self.set_pause_attr('_event_log') - self._scroller = nyx.curses.Scroller() self._halt = False # terminates thread if true self._pause_condition = threading.Condition() @@ -271,10 +270,16 @@ class LogPanel(nyx.panel.Panel, threading.Thread): ('c', 'clear event log', None), ] + def set_paused(self, is_pause): + if is_pause: + self._event_log_paused = self._event_log.clone() + + nyx.panel.Panel.set_paused(self, is_pause) + def draw(self, width, height): scroll = self._scroller.location(self._last_content_height, height) - event_log = list(self.get_attr('_event_log')) + event_log = list(self._event_log_paused if self.is_paused() else self._event_log) event_filter = self._filter.clone() event_types = list(self._event_types) last_content_height = self._last_content_height diff --git a/nyx/popups.py b/nyx/popups.py index 6190a09..89fa26e 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -24,7 +24,7 @@ UNRESOLVED_MSG = 'No consensus data available' ERROR_MSG = 'Unable to retrieve data' -def popup_window(height = -1, width = -1, top = 0, left = 0, below_static = True): +def popup_window(height = -1, width = -1, below_static = True): """ Provides a popup dialog you can use in a 'with' block... @@ -38,8 +38,6 @@ def popup_window(height = -1, width = -1, top = 0, left = 0, below_static = True :param int height: maximum height of the popup :param int width: maximum width of the popup - :param int top: top position, relative to the sticky content - :param int left: left position from the screen :param bool below_static: positions popup below static content if True :returns: tuple of the form (subwindow, width, height) when used in a with block @@ -54,7 +52,7 @@ def popup_window(height = -1, width = -1, top = 0, left = 0, below_static = True else: sticky_height = 0 - popup = nyx.panel.Panel('popup', top + sticky_height, left, height, width) + popup = nyx.panel.Panel('popup', top = sticky_height, height = height, width = width) popup.set_visible(True) # Redraws the popup to prepare a subwindow instance. If none is spawned then

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 20 Mar '16

20 Mar '16

commit ac7a37e4634c41c5ffe1ed2f1b4e7f7d0a98bf5e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 19 23:46:50 2016 +0000 Update translations for tor-messenger-ircproperties_completed --- pt_BR/irc.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/irc.properties b/pt_BR/irc.properties index e39cdaa..eeab9d8 100644 --- a/pt_BR/irc.properties +++ b/pt_BR/irc.properties @@ -13,7 +13,7 @@ irc.usernameHint=pseudônimo # disconnected because of an error. connection.error.lost=Perda de conexão com o servidor connection.error.timeOut=A conexão expirou -connection.error.invalidUsername=%S não é um nome válido de usuário +connection.error.invalidUsername=%S é um nome de usuário interdito connection.error.invalidPassword=Senha de servidor inválida connection.error.passwordRequired=Senha requerida @@ -28,9 +28,9 @@ joinChat.password=_Senha options.server=Servidor options.port=Porta options.ssl=Use SSL -options.encoding=Definir caractere +options.encoding=Conjunto de caracteres options.quitMessage=Abandonar a mensagem -options.partMessage=Partilhar a mensagem +options.partMessage=Dividir a mensagem options.showServerTab=Mostrar as mensagens do servidor options.alternateNicks=Alternar pseudônimos

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 20 Mar '16

20 Mar '16

commit 00617565b3b10bd2bbcc153dc78bf27ffc702f3d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 19 23:46:46 2016 +0000 Update translations for tor-messenger-ircproperties --- pt_BR/irc.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/irc.properties b/pt_BR/irc.properties index e39cdaa..eeab9d8 100644 --- a/pt_BR/irc.properties +++ b/pt_BR/irc.properties @@ -13,7 +13,7 @@ irc.usernameHint=pseudônimo # disconnected because of an error. connection.error.lost=Perda de conexão com o servidor connection.error.timeOut=A conexão expirou -connection.error.invalidUsername=%S não é um nome válido de usuário +connection.error.invalidUsername=%S é um nome de usuário interdito connection.error.invalidPassword=Senha de servidor inválida connection.error.passwordRequired=Senha requerida @@ -28,9 +28,9 @@ joinChat.password=_Senha options.server=Servidor options.port=Porta options.ssl=Use SSL -options.encoding=Definir caractere +options.encoding=Conjunto de caracteres options.quitMessage=Abandonar a mensagem -options.partMessage=Partilhar a mensagem +options.partMessage=Dividir a mensagem options.showServerTab=Mostrar as mensagens do servidor options.alternateNicks=Alternar pseudônimos

1 0