ahamilton/eris
1
0
Fork 0
Code Releases Activity

Coding style.

Browse source 
Moved urwid_screen from terminal.py to vigil.py, because it didn't really belong in
terminal.py.
This commit is contained in:
Andrew Hamilton 2016-02-18 23:08:36 +00:00
parent fbf02da50f
commit 033dcf5e9a
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
terminal.py
View file

@ -8,9 +8,6 @@ import curses
import os import os
import sys import sys
import urwid
import urwid.raw_display
curses.setupterm(os.environ.get("TERM", "unknown"), sys.stdout.fileno()) curses.setupterm(os.environ.get("TERM", "unknown"), sys.stdout.fileno())
@ -96,14 +93,3 @@ def console_title(title):
yield yield
finally: finally:
sys.stdout.write(restore) sys.stdout.write(restore)
@contextlib.contextmanager
def urwid_screen():
screen = urwid.raw_display.Screen()
screen.set_mouse_tracking(True)
screen.start()
try:
yield screen
finally:
screen.stop()

19
vigil
View file

@ -70,6 +70,8 @@ import traceback
import docopt import docopt
import pyinotify import pyinotify
import urwid
import urwid.raw_display
import fill3 import fill3
import sandbox_fs import sandbox_fs
@ -898,6 +900,17 @@ def _add_watch_manager_to_mainloop(root_path, mainloop, on_filesystem_change,
return watch_manager_fd return watch_manager_fd
@contextlib.contextmanager
def _urwid_screen():
screen = urwid.raw_display.Screen()
screen.set_mouse_tracking(True)
screen.start()
try:
yield screen
finally:
screen.stop()
_UPDATE_THREAD_STOPPED = False _UPDATE_THREAD_STOPPED = False
@ -983,7 +996,7 @@ def main(root_path, worker_count=multiprocessing.cpu_count()*2,
target=_update_screen, args=(screen, appearance_changed_event), target=_update_screen, args=(screen, appearance_changed_event),
daemon=True) daemon=True)
with terminal.hidden_cursor(): with terminal.hidden_cursor():
with terminal.urwid_screen() as urwid_screen: with _urwid_screen() as urwid_screen:
loop.add_reader(sys.stdin, on_input, urwid_screen) loop.add_reader(sys.stdin, on_input, urwid_screen)
update_display_thread.start() update_display_thread.start()
signal.signal(signal.SIGWINCH, on_window_resize) signal.signal(signal.SIGWINCH, on_window_resize)
@ -1036,7 +1049,7 @@ def _manage_cache(root_path):
open(timestamp_path, "w").close() open(timestamp_path, "w").close()
def check_arguments(): def _check_arguments():
arguments = docopt.docopt(__doc__.replace("*", ""), help=False) arguments = docopt.docopt(__doc__.replace("*", ""), help=False)
if arguments["--help"]: if arguments["--help"]:
print(_get_help_text()) print(_get_help_text())
@ -1064,7 +1077,7 @@ def check_arguments():
if __name__ == "__main__": if __name__ == "__main__":
root_path, worker_count, is_sandboxed, editor_command = check_arguments() root_path, worker_count, is_sandboxed, editor_command = _check_arguments()
subprocess.call(["sudo", "-p", "Vigil uses sudo... " subprocess.call(["sudo", "-p", "Vigil uses sudo... "
"[sudo] password for %u: ", "true"]) "[sudo] password for %u: ", "true"])
with terminal.console_title("vigil: " + os.path.basename(root_path)): with terminal.console_title("vigil: " + os.path.basename(root_path)):