mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-07 17:57:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-37738: Fix curses addch(str, color_pair) (GH-15071)

Browse source 
Fix the implementation of curses addch(str, color_pair): pass the
color pair to setcchar(), instead of always passing 0 as the color
pair.
This commit is contained in:
Victor Stinner 2019-08-14 12:31:43 +02:00 • committed by GitHub
parent 7e479c8221
commit 077af8c2c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Library/2019-08-01-17-11-16.bpo-37738.A3WWcT.rst Normal file
View file

@ -0,0 +1,2 @@
Fix the implementation of curses ``addch(str, color_pair)``: pass the color
pair to ``setcchar()``, instead of always passing 0 as the color pair.

18
Modules/_cursesmodule.c
View file

@ -176,6 +176,18 @@ static char *screen_encoding = NULL;
/* Utility Functions */ /* Utility Functions */
static inline int
color_pair_to_attr(short color_number)
{
return ((int)color_number << 8);
}
static inline short
attr_to_color_pair(int attr)
{
return (short)((attr & A_COLOR) >> 8);
}
/* /*
* Check the return code from a curses function and return None * Check the return code from a curses function and return None
* or raise an exception as appropriate. These are exported using the * or raise an exception as appropriate. These are exported using the
@ -606,7 +618,7 @@ _curses_window_addch_impl(PyCursesWindowObject *self, int group_left_1,
if (type == 2) { if (type == 2) {
funcname = "add_wch"; funcname = "add_wch";
wstr[1] = L'\0'; wstr[1] = L'\0';
setcchar(&wcval, wstr, attr, 0, NULL); setcchar(&wcval, wstr, attr, attr_to_color_pair(attr), NULL);
if (coordinates_group) if (coordinates_group)
rtn = mvwadd_wch(self->win,y,x, &wcval); rtn = mvwadd_wch(self->win,y,x, &wcval);
else { else {
@ -2621,7 +2633,7 @@ _curses_color_pair_impl(PyObject *module, short color_number)
PyCursesInitialised; PyCursesInitialised;
PyCursesInitialisedColor; PyCursesInitialisedColor;
return PyLong_FromLong((long) (color_number << 8)); return PyLong_FromLong(color_pair_to_attr(color_number));
} }
/*[clinic input] /*[clinic input]
@ -3644,7 +3656,7 @@ _curses_pair_number_impl(PyObject *module, int attr)
PyCursesInitialised; PyCursesInitialised;
PyCursesInitialisedColor; PyCursesInitialisedColor;
return PyLong_FromLong((long) ((attr & A_COLOR) >> 8)); return PyLong_FromLong(attr_to_color_pair(attr));
} }
/*[clinic input] /*[clinic input]