Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions Lib/test/test_curses.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,13 +332,10 @@ def test_output_character(self):
stdscr.move(2, 0)
stdscr.echochar(v)
self.assertEqual(self._read_char(2, 0), c)
# insch() round-trips a byte only where its code point equals
# the byte value (Latin-1): on a wide build ncurses winsch
# stores a printable byte directly as a code point instead of
# decoding it through the locale.
if ord(c) < 0x100:
stdscr.insch(1, 0, v)
self.assertEqual(self._read_char(1, 0), c)
# insch() decodes the byte through the locale like addch(), so
# it round-trips the same character.
stdscr.insch(1, 0, v)
self.assertEqual(self._read_char(1, 0), c)

# The same characters supplied as a str. Unlike the int path above, a
# str is stored as a wide-character cell on a wide build, so every
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
On a wide :mod:`curses` build, :meth:`curses.window.insch` now inserts a
non-ASCII byte as the character it encodes in the window's encoding,
consistently with :meth:`~curses.window.addch`, instead of its code point.
21 changes: 21 additions & 0 deletions Modules/_cursesmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -1704,6 +1704,27 @@ _curses_window_insch_impl(PyCursesWindowObject *self, int group_left_1,
if (!PyCurses_ConvertToChtype(self, ch, &ch_))
return NULL;

#ifdef HAVE_NCURSESW
/* winsch() does not locale-decode a byte above 127 on a wide build,
unlike waddch(), so decode it here and insert it as a wide character. */
chtype cch = ch_ & A_CHARTEXT;
if (cch > 127) {
wint_t wc = btowc((int)cch);
if (wc != WEOF) {
cchar_t wch;
wchar_t wstr[2] = { (wchar_t)wc, L'\0' };
attr_t cattr = (attr_t)((ch_ | (attr_t)attr) & ~(chtype)A_CHARTEXT);
setcchar(&wch, wstr, cattr, PAIR_NUMBER(cattr), NULL);
if (!group_left_1) {
rtn = wins_wch(self->win, &wch);
}
else {
rtn = mvwins_wch(self->win, y, x, &wch);
}
return PyCursesCheckERR(rtn, "insch");
}
}
#endif
if (!group_left_1) {
rtn = winsch(self->win, ch_ | (attr_t)attr);
}
Expand Down
Loading