public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: pty: Set console code page only if pseudo console is enabled.
Date: Tue, 14 Jan 2020 16:31:00 -0000	[thread overview]
Message-ID: <20200114163118.130568.qmail@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=50e2a63b04bdd018484605fbb954fd1bd5147fa0

commit 50e2a63b04bdd018484605fbb954fd1bd5147fa0
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Fri Jan 10 20:47:12 2020 +0900

    Cygwin: pty: Set console code page only if pseudo console is enabled.
    
    - Input UTF-8 chars are garbled in ConEmu with cygwin connector if
      the environment does not support pseudo console. This patch fixes
      the issue.

Diff:
---
 winsup/cygwin/fhandler_tty.cc | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 983e058..fff5beb 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -2626,15 +2626,18 @@ fhandler_pty_slave::setup_locale (void)
   LCID lcid = get_langinfo (locale, charset);
 
   /* Set console code page form locale */
-  UINT code_page;
-  if (lcid == 0 || lcid == (LCID) -1)
-    code_page = 20127; /* ASCII */
-  else if (!GetLocaleInfo (lcid,
-			   LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER,
-			   (char *) &code_page, sizeof (code_page)))
-    code_page = 20127; /* ASCII */
-  SetConsoleCP (code_page);
-  SetConsoleOutputCP (code_page);
+  if (get_pseudo_console ())
+    {
+      UINT code_page;
+      if (lcid == 0 || lcid == (LCID) -1)
+	code_page = 20127; /* ASCII */
+      else if (!GetLocaleInfo (lcid,
+			       LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER,
+			       (char *) &code_page, sizeof (code_page)))
+	code_page = 20127; /* ASCII */
+      SetConsoleCP (code_page);
+      SetConsoleOutputCP (code_page);
+    }
 
   /* Set terminal code page from locale */
   /* This code is borrowed from mintty: charset.c */


                 reply	other threads:[~2020-01-14 16:31 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200114163118.130568.qmail@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).