public inbox for cygwin-patches@cygwin.com
 help / color / mirror / Atom feed
* [PATCH] Cygwin: pty: Reflect tty settings to pseudo console mode.
@ 2021-02-18  9:05 Takashi Yano
  2021-02-19 17:05 ` Corinna Vinschen
  0 siblings, 1 reply; 2+ messages in thread
From: Takashi Yano @ 2021-02-18  9:05 UTC (permalink / raw)
  To: cygwin-patches

- With this patch, tty setting such as echo, icanon, isig and onlcr
  are reflected to pseudo console mode.
---
 winsup/cygwin/fhandler_tty.cc | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 5afede859..e4c35ea41 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -3261,6 +3261,33 @@ skip_create:
   if (get_ttyp ()->previous_output_code_page)
     SetConsoleOutputCP (get_ttyp ()->previous_output_code_page);
 
+  do
+    {
+      termios &t = get_ttyp ()->ti;
+      DWORD mode;
+      /* Set input mode */
+      GetConsoleMode (hpConIn, &mode);
+      mode &= ~(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
+      if (t.c_lflag & ECHO)
+	mode |= ENABLE_ECHO_INPUT;
+      if (t.c_lflag & ICANON)
+	mode |= ENABLE_LINE_INPUT;
+      if (mode & ENABLE_ECHO_INPUT && !(mode & ENABLE_LINE_INPUT))
+	/* This is illegal, so turn off the echo here, and fake it
+	   when we read the characters */
+	mode &= ~ENABLE_ECHO_INPUT;
+      if ((t.c_lflag & ISIG) && !(t.c_iflag & IGNBRK))
+	mode |= ENABLE_PROCESSED_INPUT;
+      SetConsoleMode (hpConIn, mode);
+      /* Set output mode */
+      GetConsoleMode (hpConOut, &mode);
+      mode &= ~DISABLE_NEWLINE_AUTO_RETURN;
+      if (!(t.c_oflag & OPOST) || !(t.c_oflag & ONLCR))
+	mode |= DISABLE_NEWLINE_AUTO_RETURN;
+      SetConsoleMode (hpConOut, mode);
+    }
+  while (false);
+
   return true;
 
 cleanup_pcon_in:
-- 
2.30.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Cygwin: pty: Reflect tty settings to pseudo console mode.
  2021-02-18  9:05 [PATCH] Cygwin: pty: Reflect tty settings to pseudo console mode Takashi Yano
@ 2021-02-19 17:05 ` Corinna Vinschen
  0 siblings, 0 replies; 2+ messages in thread
From: Corinna Vinschen @ 2021-02-19 17:05 UTC (permalink / raw)
  To: cygwin-patches

On Feb 18 18:05, Takashi Yano via Cygwin-patches wrote:
> - With this patch, tty setting such as echo, icanon, isig and onlcr
>   are reflected to pseudo console mode.
> ---
>  winsup/cygwin/fhandler_tty.cc | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
> 
> diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
> index 5afede859..e4c35ea41 100644
> --- a/winsup/cygwin/fhandler_tty.cc
> +++ b/winsup/cygwin/fhandler_tty.cc
> @@ -3261,6 +3261,33 @@ skip_create:
>    if (get_ttyp ()->previous_output_code_page)
>      SetConsoleOutputCP (get_ttyp ()->previous_output_code_page);
>  
> +  do
> +    {
> +      termios &t = get_ttyp ()->ti;
> +      DWORD mode;
> +      /* Set input mode */
> +      GetConsoleMode (hpConIn, &mode);
> +      mode &= ~(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
> +      if (t.c_lflag & ECHO)
> +	mode |= ENABLE_ECHO_INPUT;
> +      if (t.c_lflag & ICANON)
> +	mode |= ENABLE_LINE_INPUT;
> +      if (mode & ENABLE_ECHO_INPUT && !(mode & ENABLE_LINE_INPUT))
> +	/* This is illegal, so turn off the echo here, and fake it
> +	   when we read the characters */
> +	mode &= ~ENABLE_ECHO_INPUT;
> +      if ((t.c_lflag & ISIG) && !(t.c_iflag & IGNBRK))
> +	mode |= ENABLE_PROCESSED_INPUT;
> +      SetConsoleMode (hpConIn, mode);
> +      /* Set output mode */
> +      GetConsoleMode (hpConOut, &mode);
> +      mode &= ~DISABLE_NEWLINE_AUTO_RETURN;
> +      if (!(t.c_oflag & OPOST) || !(t.c_oflag & ONLCR))
> +	mode |= DISABLE_NEWLINE_AUTO_RETURN;
> +      SetConsoleMode (hpConOut, mode);
> +    }
> +  while (false);
> +
>    return true;
>  
>  cleanup_pcon_in:
> -- 
> 2.30.0

Pushed.


Thanks,
Corinna

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-02-19 17:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-18  9:05 [PATCH] Cygwin: pty: Reflect tty settings to pseudo console mode Takashi Yano
2021-02-19 17:05 ` 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).