From 7f5051d76662838103666492a33505e0801c1ee7 Mon Sep 17 00:00:00 2001
From: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Mon, 2 Mar 2020 10:12:54 +0900
Subject: [PATCH] Cygwin: console: Revise the code to fix tab position.

- This patch fixes the issue that the cursor position is broken if
  window size is changed while executing vim, less etc.
---
 winsup/cygwin/fhandler_console.cc | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 64e12b832..7c97a7868 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -417,19 +417,10 @@ fhandler_console::set_cursor_maybe ()
 void
 fhandler_console::fix_tab_position (void)
 {
-  char buf[2048] = {0,};
-  /* Save cursor position */
-  __small_sprintf (buf+strlen (buf), "\0337");
-  /* Clear all horizontal tabs */
-  __small_sprintf (buf+strlen (buf), "\033[3g");
-  /* Set horizontal tabs */
-  for (int col=8; col<con.dwWinSize.X; col+=8)
-    __small_sprintf (buf+strlen (buf), "\033[%d;%dH\033H", 1, col+1);
-  /* Restore cursor position */
-  __small_sprintf (buf+strlen (buf), "\0338");
+  /* Re-setting ENABLE_VIRTUAL_TERMINAL_PROCESSING
+     fixes the tab position. */
+  request_xterm_mode_output (false);
   request_xterm_mode_output (true);
-  DWORD dwLen;
-  WriteConsole (get_output_handle (), buf, strlen (buf), &dwLen, 0);
 }
 
 bool