bpo-37738: Fix curses addch(str, color_pair) (GH-15071)
Fix the implementation of curses addch(str, color_pair): pass the
color pair to setcchar(), instead of always passing 0 as the color
pair.
(cherry picked from commit 077af8c2c93dd71086e2c5e5ff1e634b6da8f214)
Co-authored-by: Victor Stinner <vstinner@redhat.com>
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 8fca7fc..819e1ee 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -176,6 +176,18 @@
/* 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
* or raise an exception as appropriate. These are exported using the
@@ -606,7 +618,7 @@
if (type == 2) {
funcname = "add_wch";
wstr[1] = L'\0';
- setcchar(&wcval, wstr, attr, 0, NULL);
+ setcchar(&wcval, wstr, attr, attr_to_color_pair(attr), NULL);
if (coordinates_group)
rtn = mvwadd_wch(self->win,y,x, &wcval);
else {
@@ -2621,7 +2633,7 @@
PyCursesInitialised;
PyCursesInitialisedColor;
- return PyLong_FromLong((long) (color_number << 8));
+ return PyLong_FromLong(color_pair_to_attr(color_number));
}
/*[clinic input]
@@ -3644,7 +3656,7 @@
PyCursesInitialised;
PyCursesInitialisedColor;
- return PyLong_FromLong((long) ((attr & A_COLOR) >> 8));
+ return PyLong_FromLong(attr_to_color_pair(attr));
}
/*[clinic input]