martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix display of ambiguous-width characters on MS-Windows terminal

Browse Source 
* src/w32console.c (syms_of_ntterm) <w32--terminal-is-conhost>:
New variable.
(initialize_w32_display): Set 'w32--terminal-is-conhost' non-nil
when running on ConHost.

* lisp/international/characters.el (use-cjk-char-width-table):
When Emacs runs on MS-Windows Terminal, behave as if
'cjk-ambiguous-chars-are-wide' were nil even in CJK locales.
(Bug#79298)
This commit is contained in:
Eli Zaretskii
2026-04-11 14:49:47 +03:00
parent adfa1e969f
commit 1eb7218f90
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/international/characters.el
View File

@@ -1711,11 +1711,18 @@ the value of the variable with `setq'."
(car code-range) (cdr code-range)))))
(optimize-char-table table)
(set-char-table-parent table char-width-table)
(let ((tbl (make-char-table nil)))
(let ((tbl (make-char-table nil))
(ambiguous-is-wide
(and cjk-ambiguous-chars-are-wide
;; MS-Windows Terminal forces all ambiguous
;; characters to be narrow, even in CJK locales.
(not (and (boundp 'w32--terminal-is-conhost)
(null w32--terminal-is-conhost))))))
(map-char-table
(lambda (range _val)
(set-char-table-range tbl range
(if cjk-ambiguous-chars-are-wide 2 1)))
(set-char-table-range
tbl range
(if ambiguous-is-wide 2 1)))
ambiguous-width-chars)
(optimize-char-table tbl)
(set-char-table-parent tbl table)

18
src/w32console.c
View File

@@ -59,12 +59,13 @@ static WORD w32_face_attributes (struct frame *f, int face_id);
static int w32con_write_vt_seq (const char *);
static void turn_on_face (struct frame *, int face_id);
static void turn_off_face (struct frame *, int face_id);
static COORD w32con_get_cursor_coords ();
static COORD w32con_get_cursor_coords (void);
static COORD cursor_coords;
static HANDLE prev_screen, cur_screen;
static WORD char_attr_normal;
static DWORD prev_console_mode;
static DWORD prev_output_mode;
static int bg_normal;
static int fg_normal;
@@ -121,7 +122,7 @@ w32con_write_vt_seq (const char *seq)
}
static COORD
w32con_get_cursor_coords ()
w32con_get_cursor_coords (void)
{
CONSOLE_SCREEN_BUFFER_INFO info;
GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &info);
@@ -1005,6 +1006,13 @@ initialize_w32_display (struct terminal *term, int *width, int *height)
GetConsoleCursorInfo (prev_screen, &prev_console_cursor);
#endif
/* Record whether we are on ConHost or Windows Terminal. */
const DWORD virt_mode_flags
= (ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
GetConsoleMode (cur_screen, &prev_output_mode);
w32__terminal_is_conhost =
(prev_output_mode & virt_mode_flags) != virt_mode_flags;
/* Respect setting of LINES and COLUMNS environment variables. */
{
char * lines = getenv ("LINES");
@@ -1204,6 +1212,12 @@ may be preferable when working directly at the console with a large
scroll-back buffer. */);
w32_use_full_screen_buffer = 0;
DEFVAR_BOOL ("w32--terminal-is-conhost",
w32__terminal_is_conhost,
doc: /* Non-nil means Emacs text-mode terminal is MS-Windows ConHost.
If nil, Emacs is displaying text-mode frames on the Windows Terminal. */);
w32__terminal_is_conhost = 0;
defsubr (&Sset_screen_color);
defsubr (&Sget_screen_color);
defsubr (&Sw32_use_virtual_terminal);