From 8b38eeecac84d241afbc3b6dbca1265e064b01bb Mon Sep 17 00:00:00 2001 From: rr- Date: Fri, 4 Jan 2019 00:56:55 +0100 Subject: [PATCH] ui/curses: remove flickering --- pqcli/ui/curses/views/choose_character_view.py | 2 +- pqcli/ui/curses/views/confirm_view.py | 2 +- pqcli/ui/curses/views/game_view/__init__.py | 5 ++++- pqcli/ui/curses/views/game_view/equipment_window.py | 2 +- pqcli/ui/curses/views/game_view/progress_bar_window.py | 6 +++--- pqcli/ui/curses/views/game_view/spell_book_window.py | 2 +- pqcli/ui/curses/views/roster_view.py | 2 +- pqcli/ui/curses/widgets/base.py | 2 +- pqcli/ui/curses/widgets/label.py | 2 +- pqcli/ui/curses/widgets/progress_bar.py | 2 +- pqcli/ui/curses/widgets/scrollable.py | 6 +++--- 11 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pqcli/ui/curses/views/choose_character_view.py b/pqcli/ui/curses/views/choose_character_view.py index ac0d5db..47ada67 100644 --- a/pqcli/ui/curses/views/choose_character_view.py +++ b/pqcli/ui/curses/views/choose_character_view.py @@ -38,7 +38,7 @@ class ChooseCharacterView(BaseView): def start(self) -> None: scr_height, scr_width = self.screen.getmaxyx() self.screen.erase() - self.screen.refresh() + self.screen.noutrefresh() self.main_menu = Menu( header=self.title, diff --git a/pqcli/ui/curses/views/confirm_view.py b/pqcli/ui/curses/views/confirm_view.py index 3d7f8cc..97c5714 100644 --- a/pqcli/ui/curses/views/confirm_view.py +++ b/pqcli/ui/curses/views/confirm_view.py @@ -30,7 +30,7 @@ class ConfirmView(BaseView): def start(self) -> None: scr_height, scr_width = self.screen.getmaxyx() self.screen.erase() - self.screen.refresh() + self.screen.noutrefresh() self.main_menu = Menu( header=self.title, diff --git a/pqcli/ui/curses/views/game_view/__init__.py b/pqcli/ui/curses/views/game_view/__init__.py index 821167d..58e589e 100644 --- a/pqcli/ui/curses/views/game_view/__init__.py +++ b/pqcli/ui/curses/views/game_view/__init__.py @@ -81,6 +81,8 @@ class GameView(BaseView): else: super().keypress(key) + curses.doupdate() + def start(self) -> None: scr_height, scr_width = self.screen.getmaxyx() col1_width = int(scr_width * 0.3) @@ -88,7 +90,7 @@ class GameView(BaseView): col2_width = scr_width - col1_width - col3_width self.screen.erase() - self.screen.refresh() + self.screen.noutrefresh() self._big_win = curses.newwin(scr_height, scr_width) self._col1_win = self._big_win.derwin(scr_height - 2, col1_width, 0, 0) @@ -199,6 +201,7 @@ class GameView(BaseView): self._last_tick = datetime.datetime.now() if self._args.use_saves: self._roster.save_periodically() + curses.doupdate() @property def focused(self) -> Widget: diff --git a/pqcli/ui/curses/views/game_view/equipment_window.py b/pqcli/ui/curses/views/game_view/equipment_window.py index e748c51..e891b58 100644 --- a/pqcli/ui/curses/views/game_view/equipment_window.py +++ b/pqcli/ui/curses/views/game_view/equipment_window.py @@ -53,5 +53,5 @@ class EquipmentWindow(Focusable, WindowWrapper): x = max(0, (self.getmaxyx()[1] - len(text)) // 2) self._win.addnstr(0, x, text, min(len(text), self.getmaxyx()[1])) - self._win.refresh() + self._win.noutrefresh() self._data_table.render() diff --git a/pqcli/ui/curses/views/game_view/progress_bar_window.py b/pqcli/ui/curses/views/game_view/progress_bar_window.py index 50bfeb1..ebab7e3 100644 --- a/pqcli/ui/curses/views/game_view/progress_bar_window.py +++ b/pqcli/ui/curses/views/game_view/progress_bar_window.py @@ -74,7 +74,7 @@ class ProgressBarWindow(WindowWrapper): self._progress_bar_win.standend() self._progress_bar.set_position(self._cur_pos, self._max_pos) - self._progress_bar_win.refresh() + self._progress_bar_win.noutrefresh() class DataTableProgressBarWindow(ProgressBarWindow): @@ -109,7 +109,7 @@ class DataTableProgressBarWindow(ProgressBarWindow): 0, x, self._title, min(len(self._title), self.getmaxyx()[1]) ) - self._win.refresh() + self._win.noutrefresh() self._data_table.render() def _render(self) -> None: @@ -140,7 +140,7 @@ class ListBoxProgressBarWindow(ProgressBarWindow): 0, x, self._title, min(len(self._title), self.getmaxyx()[1]) ) - self._win.refresh() + self._win.noutrefresh() self._list_box.render() def _render(self) -> None: diff --git a/pqcli/ui/curses/views/game_view/spell_book_window.py b/pqcli/ui/curses/views/game_view/spell_book_window.py index 29d0c7b..4237ee0 100644 --- a/pqcli/ui/curses/views/game_view/spell_book_window.py +++ b/pqcli/ui/curses/views/game_view/spell_book_window.py @@ -55,5 +55,5 @@ class SpellBookWindow(Focusable, WindowWrapper): x = max(0, (self.getmaxyx()[1] - len(text)) // 2) self._win.addnstr(0, x, text, min(len(text), self.getmaxyx()[1])) - self._win.refresh() + self._win.noutrefresh() self._data_table.render() diff --git a/pqcli/ui/curses/views/roster_view.py b/pqcli/ui/curses/views/roster_view.py index 35927c4..ad94562 100644 --- a/pqcli/ui/curses/views/roster_view.py +++ b/pqcli/ui/curses/views/roster_view.py @@ -48,7 +48,7 @@ class RosterView(BaseView): def start(self) -> None: scr_height, scr_width = self.screen.getmaxyx() self.screen.erase() - self.screen.refresh() + self.screen.noutrefresh() self.main_menu = Menu( header=LOGO, diff --git a/pqcli/ui/curses/widgets/base.py b/pqcli/ui/curses/widgets/base.py index 9a1937c..7310d76 100644 --- a/pqcli/ui/curses/widgets/base.py +++ b/pqcli/ui/curses/widgets/base.py @@ -22,7 +22,7 @@ class WindowWrapper(Widget): else: try: self._win = parent.derwin(h, w, y, x) - self._win.refresh() + self._win.noutrefresh() except curses.error: self._win = None diff --git a/pqcli/ui/curses/widgets/label.py b/pqcli/ui/curses/widgets/label.py index c00f2aa..f821d08 100644 --- a/pqcli/ui/curses/widgets/label.py +++ b/pqcli/ui/curses/widgets/label.py @@ -7,4 +7,4 @@ class Label(WindowWrapper): return self._win.erase() self._win.addnstr(text, min(len(text), self.getmaxyx()[1] - 1)) - self._win.refresh() + self._win.noutrefresh() diff --git a/pqcli/ui/curses/widgets/progress_bar.py b/pqcli/ui/curses/widgets/progress_bar.py index 5cb9b0a..d173bb3 100644 --- a/pqcli/ui/curses/widgets/progress_bar.py +++ b/pqcli/ui/curses/widgets/progress_bar.py @@ -16,4 +16,4 @@ class ProgressBar(WindowWrapper): self._win.chgat(0, 0, curses.A_REVERSE) if x < self.getmaxyx()[1]: self._win.chgat(0, x, curses.A_NORMAL) - self._win.refresh() + self._win.noutrefresh() diff --git a/pqcli/ui/curses/widgets/scrollable.py b/pqcli/ui/curses/widgets/scrollable.py index e833fd0..b7083d1 100644 --- a/pqcli/ui/curses/widgets/scrollable.py +++ b/pqcli/ui/curses/widgets/scrollable.py @@ -54,15 +54,15 @@ class Scrollable(WindowWrapper): win_y2 = int(y2 * h // len(self._items)) for win_y in range(win_y1, win_y2): self._win.chgat(win_y, 0, curses.A_REVERSE) - self._win.refresh() + self._win.noutrefresh() self._render_impl(h, w - 1) - self._pad.refresh( + self._pad.noutrefresh( self._scroll_y, 0, y, x, y + h - 1, x + w - 2 ) else: self._render_impl(h, w) - self._pad.refresh( + self._pad.noutrefresh( self._scroll_y, 0, y, x, y + h - 1, x + w - 1 )