* [PATCH] Cygwin: pty: Disable ResizePseudoConsole() if stdout is redirected.
@ 2020-10-27 8:26 Takashi Yano
2020-10-27 9:27 ` Corinna Vinschen
0 siblings, 1 reply; 2+ messages in thread
From: Takashi Yano @ 2020-10-27 8:26 UTC (permalink / raw)
To: cygwin-patches
- Calling ResizePseudoConsole() generates some escape sequences.
Due to this behaviour, if the output of non-cygwin app is piped
to less, screen is sometimes distorted when the screen is resized.
With this patch, ResizePseudoConsole() is not called if stdout is
redirected.
---
winsup/cygwin/fhandler_tty.cc | 8 ++++++--
winsup/cygwin/tty.cc | 1 +
winsup/cygwin/tty.h | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index c5a081ebd..600de085c 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1511,7 +1511,7 @@ fhandler_pty_common::resize_pseudo_console (struct winsize *ws)
size.X = ws->ws_col;
size.Y = ws->ws_row;
pinfo p (get_ttyp ()->pcon_pid);
- if (p)
+ if (p && !get_ttyp ()->do_not_resize_pcon)
{
HPCON_INTERNAL hpcon_local;
HANDLE pcon_owner =
@@ -2489,7 +2489,10 @@ fhandler_pty_slave::setup_pseudoconsole (STARTUPINFOEXW *si, bool nopcon)
si->StartupInfo.hStdInput = fh0->get_handle ();
fhandler_base *fh1 = ::cygheap->fdtab[1];
if (fh1 && fh1->get_device () != get_device ())
- si->StartupInfo.hStdOutput = fh1->get_output_handle ();
+ {
+ get_ttyp ()->do_not_resize_pcon = true;
+ si->StartupInfo.hStdOutput = fh1->get_output_handle ();
+ }
fhandler_base *fh2 = ::cygheap->fdtab[2];
if (fh2 && fh2->get_device () != get_device ())
si->StartupInfo.hStdError = fh2->get_output_handle ();
@@ -2535,6 +2538,7 @@ fhandler_pty_slave::close_pseudoconsole (void)
get_ttyp ()->switch_to_pcon_in = false;
get_ttyp ()->pcon_pid = 0;
get_ttyp ()->pcon_start = false;
+ get_ttyp ()->do_not_resize_pcon = false;
}
}
diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc
index 7e3b88b0b..d4b8d7651 100644
--- a/winsup/cygwin/tty.cc
+++ b/winsup/cygwin/tty.cc
@@ -245,6 +245,7 @@ tty::init ()
pcon_cap_checked = false;
has_csi6n = false;
has_set_title = false;
+ do_not_resize_pcon = false;
}
HANDLE
diff --git a/winsup/cygwin/tty.h b/winsup/cygwin/tty.h
index 4e9199dba..2c1ac7f5d 100644
--- a/winsup/cygwin/tty.h
+++ b/winsup/cygwin/tty.h
@@ -104,6 +104,7 @@ private:
bool pcon_cap_checked;
bool has_csi6n;
bool has_set_title;
+ bool do_not_resize_pcon;
public:
HANDLE from_master () const { return _from_master; }
--
2.29.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Cygwin: pty: Disable ResizePseudoConsole() if stdout is redirected.
2020-10-27 8:26 [PATCH] Cygwin: pty: Disable ResizePseudoConsole() if stdout is redirected Takashi Yano
@ 2020-10-27 9:27 ` Corinna Vinschen
0 siblings, 0 replies; 2+ messages in thread
From: Corinna Vinschen @ 2020-10-27 9:27 UTC (permalink / raw)
To: cygwin-patches
On Oct 27 17:26, Takashi Yano via Cygwin-patches wrote:
> - Calling ResizePseudoConsole() generates some escape sequences.
> Due to this behaviour, if the output of non-cygwin app is piped
> to less, screen is sometimes distorted when the screen is resized.
> With this patch, ResizePseudoConsole() is not called if stdout is
> redirected.
> ---
> winsup/cygwin/fhandler_tty.cc | 8 ++++++--
> winsup/cygwin/tty.cc | 1 +
> winsup/cygwin/tty.h | 1 +
> 3 files changed, 8 insertions(+), 2 deletions(-)
Pushed.
Thanks,
Corinna
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-27 9:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-27 8:26 [PATCH] Cygwin: pty: Disable ResizePseudoConsole() if stdout is redirected Takashi Yano
2020-10-27 9:27 ` Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).