diff options
author | Matthias Clasen <mclasen@redhat.com> | 2019-01-24 22:53:13 -0500 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2019-01-25 12:03:47 +0000 |
commit | c9430b15f82b5d9f425ca7f98b791b58f36a25cb (patch) | |
tree | fe5eb0e85114c2ea98ac518d833d0d9c16e17121 | |
parent | a0d579bb9b819f538332e607658285924f2d3097 (diff) | |
download | flatpak-c9430b15f82b5d9f425ca7f98b791b58f36a25cb.tar.gz |
cli transaction: Use raw mode
We don't want line editing to interfere with our
formatting, so we turn on raw mode while we do
fancy progress reporting. We use raw mode at the
same times as we hide the cursor.
This should prevent partial Escape sequences from
showing up in the output.
Closes: #2638
Approved by: alexlarsson
-rw-r--r-- | app/flatpak-cli-transaction.c | 6 | ||||
-rw-r--r-- | app/flatpak-main.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/flatpak-cli-transaction.c b/app/flatpak-cli-transaction.c index fb4718d0..eb19dcab 100644 --- a/app/flatpak-cli-transaction.c +++ b/app/flatpak-cli-transaction.c @@ -994,6 +994,7 @@ transaction_ready (FlatpakTransaction *transaction) if (flatpak_fancy_output ()) { flatpak_hide_cursor (); + flatpak_enable_raw_mode (); redraw (self); } @@ -1082,7 +1083,10 @@ flatpak_cli_transaction_run (FlatpakTransaction *transaction, res = FLATPAK_TRANSACTION_CLASS (flatpak_cli_transaction_parent_class)->run (transaction, cancellable, error); if (flatpak_fancy_output ()) - flatpak_show_cursor (); + { + flatpak_disable_raw_mode (); + flatpak_show_cursor (); + } if (res && self->n_ops > 0) { diff --git a/app/flatpak-main.c b/app/flatpak-main.c index 51eee841..34e5b4b5 100644 --- a/app/flatpak-main.c +++ b/app/flatpak-main.c @@ -696,7 +696,8 @@ complete (int argc, static void handle_sigterm (int signum) { - flatpak_show_cursor (); + flatpak_disable_raw_mode (); + flatpak_show_cursor (); _exit (1); } |