ahamilton/eris
1
0
Fork 0
Code Releases Activity

Coding style.

Browse source
This commit is contained in:
Andrew Hamilton 2016-01-27 19:14:39 +00:00
parent 95070853ac
commit 8b25e6e89a
1 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

51
vigil
View file

@ -545,9 +545,9 @@ class Help:
def exit_help(self): def exit_help(self):
self.screen._is_help_visible = False self.screen._is_help_visible = False
def on_keypressed(self): def on_input_event(self, event):
try: try:
action = self.key_map[sys.stdin.read(1)] action = self.key_map[event]
except KeyError: except KeyError:
pass pass
else: else:
@ -727,23 +727,21 @@ class Screen:
self._summary._cursor_position = new_position self._summary._cursor_position = new_position
self._appearance_changed_event.set() self._appearance_changed_event.set()
def on_keypressed(self, urwid_screen): def on_input_event(self, event):
if self._is_help_visible: if self._is_help_visible:
self._help_widget.on_keypressed() self._help_widget.on_input_event(event)
self._appearance_changed_event.set() self._appearance_changed_event.set()
return return
events = urwid_screen.get_input() if type(event) == tuple:
for event in events: self.on_mouse_event(event)
if type(event) == tuple: return
self.on_mouse_event(event) try:
continue action = self._key_map[event]
try: except KeyError:
action = self._key_map[event] pass
except KeyError: else:
pass action(self)
else: self._appearance_changed_event.set()
action(self)
self._appearance_changed_event.set()
_STATUS_BAR = _highlight_chars( _STATUS_BAR = _highlight_chars(
" *help *quit *d,*c,*j,*k:navigate *turn *log *edit *next *pause" " *help *quit *d,*c,*j,*k:navigate *turn *log *edit *next *pause"
@ -913,9 +911,9 @@ def main(root_path, is_being_tested=False):
log = screen._log log = screen._log
log._appearance_changed_event = appearance_changed_event log._appearance_changed_event = appearance_changed_event
summary.sync_with_filesystem() summary.sync_with_filesystem()
log.log_message("Program started.") log.log_message("Program started.")
jobs_added_event.set() jobs_added_event.set()
def on_filesystem_change(): def on_filesystem_change():
log.log_message("Filesystem changed.") log.log_message("Filesystem changed.")
summary.sync_with_filesystem() summary.sync_with_filesystem()
@ -942,6 +940,10 @@ def main(root_path, is_being_tested=False):
try: try:
threading.Thread(target=start_runners, daemon=True).start() threading.Thread(target=start_runners, daemon=True).start()
def on_input(urwid_screen):
for event in urwid_screen.get_input():
screen.on_input_event(event)
def on_window_resize(n, frame): def on_window_resize(n, frame):
appearance_changed_event.set() appearance_changed_event.set()
appearance_changed_event.set() appearance_changed_event.set()
@ -950,17 +952,16 @@ def main(root_path, is_being_tested=False):
daemon=True) daemon=True)
with terminal.hidden_cursor(): with terminal.hidden_cursor():
with terminal.urwid_screen() as urwid_screen: with terminal.urwid_screen() as urwid_screen:
loop.add_reader(sys.stdin, screen.on_keypressed, 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)
try: with contextlib.suppress(KeyboardInterrupt):
loop.run_forever() loop.run_forever()
except KeyboardInterrupt: log.log_command("Exiting...")
log.log_command("Exiting...") time.sleep(0.05)
time.sleep(0.05) _UPDATE_THREAD_STOPPED = True
_UPDATE_THREAD_STOPPED = True appearance_changed_event.set()
appearance_changed_event.set() update_display_thread.join()
update_display_thread.join()
log.log_message("Program stopped.") log.log_message("Program stopped.")
for runner in runners: for runner in runners:
runner.pause() runner.pause()