January 2014 - tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 8e9904fc78d3ed2c60d0e07b5ae2573d4fb0a53c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:45:18 2014 +0000 Update translations for vidalia_alpha --- km/vidalia_km.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/km/vidalia_km.po b/km/vidalia_km.po index d3adcd5..3779bad 100644 --- a/km/vidalia_km.po +++ b/km/vidalia_km.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2014-01-23 09:40+0000\n" +"PO-Revision-Date: 2014-01-27 03:41+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -400,7 +400,7 @@ msgstr "" msgctxt "Circuit" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "CircuitItem" msgid "<Path Empty>" @@ -1633,7 +1633,7 @@ msgstr "" msgctxt "LogEvent" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "LogTreeItem" msgid "Debug" @@ -1657,7 +1657,7 @@ msgstr "" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "MainWindow" msgid "Start Tor" @@ -2176,7 +2176,7 @@ msgstr "" msgctxt "MessageLog" msgid "Clear" -msgstr "" +msgstr "សម្អាត" msgctxt "MessageLog" msgid "Clear all messages from the Message Log (Ctrl+E)" @@ -2483,7 +2483,7 @@ msgstr "" msgctxt "NetViewer" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "NetViewer" msgid "Full Screen" @@ -2829,7 +2829,7 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "RouterInfoDialog" msgid "Relay Details" @@ -3556,7 +3556,7 @@ msgstr "" msgctxt "Stream" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "TorControl" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 96e8a8baf6d63eaccb7a80512b08ffa0f8b26995 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:45:12 2014 +0000 Update translations for vidalia --- km/qt_km.po | 4 ++-- km/vidalia_km.po | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/km/qt_km.po b/km/qt_km.po index fb15f59..759a2ff 100644 --- a/km/qt_km.po +++ b/km/qt_km.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2014-01-22 03:30+0000\n" +"PO-Revision-Date: 2014-01-27 03:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -309,7 +309,7 @@ msgstr "" #: qfileiconprovider.cpp:412 msgctxt "QFileDialog" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" #: qfiledialog.cpp:439 msgctxt "QFileDialog" diff --git a/km/vidalia_km.po b/km/vidalia_km.po index 1c7a14d..9f22ff1 100755 --- a/km/vidalia_km.po +++ b/km/vidalia_km.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2014-01-22 09:40+0000\n" +"PO-Revision-Date: 2014-01-27 03:41+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -373,7 +373,7 @@ msgstr "" msgctxt "Circuit" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "CircuitItem" msgid "<Path Empty>" @@ -1601,7 +1601,7 @@ msgstr "" msgctxt "LogEvent" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "LogTreeItem" msgid "Debug" @@ -1625,7 +1625,7 @@ msgstr "" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "MainWindow" msgid "Start Tor" @@ -2217,7 +2217,7 @@ msgstr "" msgctxt "MessageLog" msgid "Clear" -msgstr "" +msgstr "សម្អាត" msgctxt "MessageLog" msgid "Clear all messages from the Message Log (Ctrl+E)" @@ -2536,7 +2536,7 @@ msgstr "" msgctxt "NetViewer" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "NetViewer" msgid "Full Screen" @@ -2752,7 +2752,7 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "RouterInfoDialog" msgid "Relay Details" @@ -3489,7 +3489,7 @@ msgstr "" msgctxt "Stream" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]"

1 0

[stem/master] Resetting NEWNYM counter when wiping cache
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit 9f3bd3f6a9c1b3155efe123ad9390c5365d76192 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 26 19:21:59 2014 -0800 Resetting NEWNYM counter when wiping cache If we attach to a new (or maybe previous) tor instance then we shouldn't carry over the timestamp we last issued a NEWNYM signal. --- stem/control.py | 1 + 1 file changed, 1 insertion(+) diff --git a/stem/control.py b/stem/control.py index 22a1962..0b611f5 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1833,6 +1833,7 @@ class Controller(BaseController): with self._cache_lock: self._request_cache = {} + self._last_newnym = 0.0 self._geoip_failure_count = 0 def load_conf(self, configtext):

1 0

[stem/master] Adding controller methods to check NEWNYM availability
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit c510c1b01599781b249f12c06062082309ea5f0e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 26 19:15:51 2014 -0800 Adding controller methods to check NEWNYM availability Adding a couple methods to check if tor will respect a NEWNYM signal or not. This only works if signals are only sent through stem. --- docs/change_log.rst | 1 + stem/control.py | 38 +++++++++++++++++++++++++++++++++++++- test/integ/control/controller.py | 17 +++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index fa8b638..ab52e5f 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -41,6 +41,7 @@ The following are only available within stem's `git repository * **Controller** + * Added :func:`~stem.control.Controller.is_newnym_available` and :func:`~stem.control.Controller.get_newnym_wait` methods to the :class:`~stem.control.Controller` * Added the id attribute to the :class:`~stem.response.events.ORConnEvent` (:spec:`6f2919a`) * Added `support for CONN_BW events <api/response.html#stem.response.events.ConnectionBandwidthEvent>`_ (:spec:`6f2919a`) * Added `support for CIRC_BW events <api/response.html#stem.response.events.CircuitBandwidthEvent>`_ (:spec:`6f2919a`) diff --git a/stem/control.py b/stem/control.py index adfc56f..22a1962 100644 --- a/stem/control.py +++ b/stem/control.py @@ -64,6 +64,8 @@ providing its own for interacting at a higher level. |- close_stream - close a stream | |- signal - sends a signal to the tor client + |- is_newnym_available - true if tor would presently accept a NEWNYM signal + |- get_newnym_wait - seconds until tor would accept a NEWNYM signal |- is_geoip_unavailable - true if we've discovered our geoip db to be unavailable +- map_address - maps one address to another such that connections to the original are replaced with the other @@ -679,6 +681,7 @@ class Controller(BaseController): self._is_caching_enabled = True self._request_cache = {} + self._last_newnym = 0.0 self._cache_lock = threading.RLock() @@ -688,6 +691,7 @@ class Controller(BaseController): self._event_listeners_lock = threading.RLock() # number of sequential 'GETINFO ip-to-country/*' lookups that have failed + self._geoip_failure_count = 0 self._enabled_features = [] @@ -2258,12 +2262,44 @@ class Controller(BaseController): response = self.msg("SIGNAL %s" % signal) stem.response.convert("SINGLELINE", response) - if not response.is_ok(): + if response.is_ok(): + if signal == stem.Signal.NEWNYM: + self._last_newnym = time.time() + else: if response.code == "552": raise stem.InvalidArguments(response.code, response.message, [signal]) raise stem.ProtocolError("SIGNAL response contained unrecognized status code: %s" % response.code) + def is_newnym_available(self): + """ + Indicates if tor would presently accept a NEWNYM signal. This can only + account for signals sent via this controller. + + .. versionadded:: 1.2.0 + + :returns: **True** if tor would presently accept a NEWNYM signal, **False** + otherwise + """ + + if self.is_alive(): + return self.get_newnym_wait() == 0.0 + else: + return False + + def get_newnym_wait(self): + """ + Provides the number of seconds until a NEWNYM signal would be respected. + This can only account for signals sent via this controller. + + .. versionadded:: 1.2.0 + + :returns: **float** for the number of seconds until tor would respect + another NEWNYM signal + """ + + return max(0.0, self._last_newnym + 10 - time.time()) + def is_geoip_unavailable(self): """ Provides **True** if we've concluded hat our geoip database is unavailable, diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 1c0e468..d034853 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -654,6 +654,23 @@ class TestController(unittest.TestCase): # invalid signals self.assertRaises(stem.InvalidArguments, controller.signal, "FOOBAR") + def test_newnym_availability(self): + """ + Test the is_newnym_available and get_newnym_wait methods. + """ + + if test.runner.require_control(self): + return + + with test.runner.get_runner().get_tor_controller() as controller: + self.assertEqual(True, controller.is_newnym_available()) + self.assertEqual(0.0, controller.get_newnym_wait()) + + controller.signal(stem.Signal.NEWNYM) + + self.assertEqual(False, controller.is_newnym_available()) + self.assertTrue(controller.get_newnym_wait() > 9.0) + def test_extendcircuit(self): if test.runner.require_control(self): return

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 1b24dbee787509d4cba0ddbd880a095e3351e93f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:16:11 2014 +0000 Update translations for mat-gui --- km.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/km.po b/km.po index eb07d24..3120ac4 100644 --- a/km.po +++ b/km.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-01-27 02:46+0000\n" +"PO-Revision-Date: 2014-01-27 03:15+0000\n" "Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "ឯកសារដែលគាំទ្រ" #: mat-gui:157 msgid "No metadata found" -msgstr "" +msgstr "រកមិនឃើញទិន្នន័យមេតា" #: mat-gui:158 mat-gui:398 mat-gui:420 msgid "Clean" @@ -49,15 +49,15 @@ msgstr "មិនល្អ" #: mat-gui:165 #, python-format msgid "%s's metadata" -msgstr "" +msgstr "ទិន្នន័យមេតារបស់ %s" #: mat-gui:176 msgid "Trash your meta, keep your data" -msgstr "" +msgstr "លុបមេតា រក្សាទិន្នន័យរបស់អ្នក" #: mat-gui:181 msgid "Website" -msgstr "" +msgstr "តំបន់បណ្ដាញ" #: mat-gui:207 data/mat.ui:107 msgid "Preferences" @@ -65,23 +65,23 @@ msgstr "ចំណូលចិត្ត" #: mat-gui:220 msgid "Reduce PDF quality" -msgstr "" +msgstr "បន្ថយគុណភាព PDF" #: mat-gui:223 msgid "Reduce the produced PDF size and quality" -msgstr "" +msgstr "បន្ថយគុណភាព និងទំហំ PDF ដែលបានបង្កើត" #: mat-gui:226 msgid "Add unsupported file to archives" -msgstr "" +msgstr "បន្ថែមឯកសារដែលមិនគាំទ្រទៅកាន់ប័ណ្ណសារ" #: mat-gui:229 msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "" +msgstr "បន្ថែមឯកសារដែលមិនគាំទ្រ (និងមិនមែនអនាមិក) ទៅកាន់ប័ណ្ណសារលទ្ធផល" #: mat-gui:268 msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" #: mat-gui:310 msgid "Not-supported" @@ -127,16 +127,16 @@ msgstr "" #: mat-gui:394 #, python-format msgid "Checking %s" -msgstr "" +msgstr "កំពុងពិនិត្យ %s" #: mat-gui:409 #, python-format msgid "Cleaning %s" -msgstr "" +msgstr "កំពុងសម្អាត %s" #: data/mat.ui:63 msgid "_File" -msgstr "" +msgstr "ឯកសារ" #: data/mat.ui:99 msgid "_Edit"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 280da502c2ae0bd85fc7ba99d5ed0d5583b1e2cc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:15:56 2014 +0000 Update translations for https_everywhere --- km/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km/https-everywhere.dtd b/km/https-everywhere.dtd index f6869ee..ce1456a 100644 --- a/km/https-everywhere.dtd +++ b/km/https-everywhere.dtd @@ -25,7 +25,7 @@ <!ENTITY https-everywhere.prefs.notes "សម្គាល់"> <!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?"> <!ENTITY https-everywhere.prefs.enabled "បានបើក"> -<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)"> +<!ENTITY https-everywhere.prefs.ruleset_howto "អ្នកអាចស្វែងរកពីរបៀបសរសេរ rulesets ផ្ទាល់ខ្លួនរបស់អ្នក (ដើម្បីបន្ថែមការគាំទ្រសម្រាប់តំបន់បណ្ដាញផ្សេងៗ)"> <!ENTITY https-everywhere.prefs.here_link "ទីនេះ"> <!ENTITY https-everywhere.prefs.toggle "បិទ/បើក"> <!ENTITY https-everywhere.prefs.reset_default "កំណត់ឡើងវិញទៅលំនាំដើម">

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 4e9fb3abbb0a5d9fb6c77eb519acd0a484f3826e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 02:46:11 2014 +0000 Update translations for mat-gui --- km.po | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/km.po b/km.po index 5073edb..eb07d24 100644 --- a/km.po +++ b/km.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# soksophea <sksophea(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-01-22 04:40+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-01-27 02:46+0000\n" +"Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,19 +20,19 @@ msgstr "" #: mat-gui:61 mat-gui:403 mat-gui:422 msgid "Ready" -msgstr "" +msgstr "រួចរាល់" #: mat-gui:128 msgid "Choose files" -msgstr "" +msgstr "ជ្រើសឯកសារ" #: mat-gui:135 msgid "All files" -msgstr "" +msgstr "ឯកសារទាំងអស់" #: mat-gui:142 msgid "Supported files" -msgstr "" +msgstr "ឯកសារដែលគាំទ្រ" #: mat-gui:157 msgid "No metadata found" @@ -39,11 +40,11 @@ msgstr "" #: mat-gui:158 mat-gui:398 mat-gui:420 msgid "Clean" -msgstr "" +msgstr "សម្អាត" #: mat-gui:160 mat-gui:400 msgid "Dirty" -msgstr "" +msgstr "មិនល្អ" #: mat-gui:165 #, python-format @@ -60,7 +61,7 @@ msgstr "" #: mat-gui:207 data/mat.ui:107 msgid "Preferences" -msgstr "" +msgstr "ចំណូលចិត្ត" #: mat-gui:220 msgid "Reduce PDF quality" @@ -84,7 +85,7 @@ msgstr "" #: mat-gui:310 msgid "Not-supported" -msgstr "" +msgstr "មិនគាំទ្រ" #: mat-gui:324 msgid "Harmless fileformat" @@ -155,15 +156,15 @@ msgstr "" #: data/mat.ui:214 msgid "Add" -msgstr "" +msgstr "បន្ថែម" #: data/mat.ui:240 msgid "Check" -msgstr "" +msgstr "ពិនិត្យ" #: data/mat.ui:309 msgid "State" -msgstr "" +msgstr "សភាព" #: data/mat.ui:347 data/mat.ui:499 msgid "Metadata" @@ -179,7 +180,7 @@ msgstr "" #: data/mat.ui:452 msgid "Supported formats" -msgstr "" +msgstr "ទ្រង់ទ្រាយដែលគាំទ្រ" #: data/mat.ui:486 msgid "Support"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 59a8f0dde1f67f6ad56b51592a8a9bd20aaef26b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 02:45:57 2014 +0000 Update translations for https_everywhere --- km/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km/https-everywhere.dtd b/km/https-everywhere.dtd index f009004..f6869ee 100644 --- a/km/https-everywhere.dtd +++ b/km/https-everywhere.dtd @@ -1,6 +1,6 @@ <!ENTITY https-everywhere.about.title "អំពី HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> +<!ENTITY https-everywhere.about.ext_description "អ៊ិនគ្រីបតំបន់បណ្ដាញ! ប្រើសុវត្ថិភាព HTTPS នៅលើបណ្ដាញជាច្រើន។"> <!ENTITY https-everywhere.about.version "កំណែ"> <!ENTITY https-everywhere.about.created_by "បានបង្កើតដោយ"> <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 134cec88eb4635767a878414e5922c2722617115 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 02:45:07 2014 +0000 Update translations for orbot --- values-km/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/values-km/strings.xml b/values-km/strings.xml index 6010cbd..5238f2b 100644 --- a/values-km/strings.xml +++ b/values-km/strings.xml @@ -3,6 +3,7 @@ <string name="menu_info">Help</string> <string name="menu_start">ចាប់ផ្ដើម</string> <string name="button_help">Help</string> + <string name="menu_verify">ពិនិត្យ</string> <string name="menu_exit">ចាកចេញ</string> <string name="btn_cancel">Cancel</string>

1 0

[arm/master] Moving glyph demoing to its own executable
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit 7b93874508050223d5ed36b67b889f1cbdfaa432 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 25 13:59:25 2014 -0800 Moving glyph demoing to its own executable Our curses glyph demo is a handly tool for curses development, but there's no reason for it to be part of our ui_tools. It's a script to demo curses' capabilities and only ever meant to be a reference during development. --- arm/demo_glyphs.py | 66 +++++++++++++++++++++++++++++++++++++++++++++++ arm/util/ui_tools.py | 69 +++----------------------------------------------- 2 files changed, 69 insertions(+), 66 deletions(-) diff --git a/arm/demo_glyphs.py b/arm/demo_glyphs.py new file mode 100755 index 0000000..7781139 --- /dev/null +++ b/arm/demo_glyphs.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python +# Copyright 2014, Damian Johnson and The Tor Project +# See LICENSE for licensing information + +""" +Displays all ACS options with their corresponding representation. These are +undocumented in the pydocs. For more information see the following man page: + +http://www.mkssoftware.com/docs/man5/terminfo.5.asp +""" + +import curses + + +def main(): + try: + curses.wrapper(_show_glyphs) + except KeyboardInterrupt: + pass # quit + + +def _show_glyphs(stdscr): + """ + Renders a chart with the ACS glyphs. + """ + + try: + curses.use_default_colors() # allow semi-transparent backgrounds + except curses.error: + pass + + try: + curses.curs_set(0) # attempt to make the cursor invisible + except curses.error: + pass + + height, width = stdscr.getmaxyx() + columns = width / 30 + + if columns == 0: + return # not wide enough to show anything + + # mapping of keycodes to their ACS option names (for instance, ACS_LTEE) + + acs_options = dict((v, k) for (k, v) in curses.__dict__.items() if k.startswith('ACS_')) + + stdscr.addstr(0, 0, 'Curses Glyphs:', curses.A_STANDOUT) + x, y = 0, 2 + + for keycode in sorted(acs_options.keys()): + stdscr.addstr(y, x * 30, '%s (%i)' % (acs_options[keycode], keycode)) + stdscr.addch(y, (x * 30) + 25, keycode) + + x += 1 + + if x >= columns: + x, y = 0, y + 1 + + if y >= height: + break + + stdscr.getch() # quit on keyboard input + + +if __name__ == '__main__': + main() diff --git a/arm/util/ui_tools.py b/arm/util/ui_tools.py index 7a1a601..1d90001 100644 --- a/arm/util/ui_tools.py +++ b/arm/util/ui_tools.py @@ -13,6 +13,7 @@ from curses.ascii import isprint from stem.util import conf, enum, log, system # colors curses can handle + COLOR_LIST = { "red": curses.COLOR_RED, "green": curses.COLOR_GREEN, @@ -25,10 +26,12 @@ COLOR_LIST = { } # boolean for if we have color support enabled, None not yet determined + COLOR_IS_SUPPORTED = None # mappings for get_color() - this uses the default terminal color scheme if # color support is unavailable + COLOR_ATTR_INITIALIZED = False COLOR_ATTR = dict([(color, 0) for color in COLOR_LIST]) @@ -51,72 +54,6 @@ CONFIG = conf.config_dict("arm", { }, conf_handler) -def demo_glyphs(): - """ - Displays all ACS options with their corresponding representation. These are - undocumented in the pydocs. For more information see the following man page: - http://www.mkssoftware.com/docs/man5/terminfo.5.asp - """ - - try: - curses.wrapper(_show_glyphs) - except KeyboardInterrupt: - pass # quit - - -def _show_glyphs(stdscr): - """ - Renders a chart with the ACS glyphs. - """ - - # allows things like semi-transparent backgrounds - - try: - curses.use_default_colors() - except curses.error: - pass - - # attempts to make the cursor invisible - - try: - curses.curs_set(0) - except curses.error: - pass - - acs_options = [item for item in curses.__dict__.items() if item[0].startswith("ACS_")] - acs_options.sort(key=lambda i: (i[1])) # order by character codes - - # displays a chart with all the glyphs and their representations - - height, width = stdscr.getmaxyx() - - if width < 30: - return # not enough room to show a column - - columns = width / 30 - - # display title - - stdscr.addstr(0, 0, "Curses Glyphs:", curses.A_STANDOUT) - - x, y = 0, 1 - - while acs_options: - name, keycode = acs_options.pop(0) - stdscr.addstr(y, x * 30, "%s (%i)" % (name, keycode)) - stdscr.addch(y, (x * 30) + 25, keycode) - - x += 1 - - if x >= columns: - x, y = 0, y + 1 - - if y >= height: - break - - stdscr.getch() # quit on keyboard input - - def get_printable(line, keep_newlines = True): """ Provides the line back with non-printable characters stripped.

1 0