bpo-46000: Improve NetBSD curses compatibility (pythonGH-29947) (pythonGH-30023)

miss-islington · 0-wiz-0 · web-flow · commit 040f9f9c48f4 · 2021-12-10T13:21:19.000+02:00
(cherry picked from commit 2fb797e) Co-authored-by: Thomas Klausner <tk@giga.or.at>
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-12-07-11-42-44.bpo-46000.v_ru3k.rst b/Misc/NEWS.d/next/Core and Builtins/2021-12-07-11-42-44.bpo-46000.v_ru3k.rst
@@ -0,0 +1 @@
+Improve compatibility of the :mod:`curses` module with NetBSD curses.
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
@@ -1077,8 +1077,8 @@ PyCursesWindow_ChgAt(PyCursesWindowObject *self, PyObject *args)
         return NULL;
     }
 
-    color = (short)((attr >> 8) & 0xff);
-    attr = attr - (color << 8);
+    color = (short) PAIR_NUMBER(attr);
+    attr = attr & A_ATTRIBUTES;
 
     if (use_xy) {
         rtn = mvwchgat(self->win,y,x,num,attr,color,NULL);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Improve compatibility of the :mod:`curses` module with NetBSD curses.
Original file line number	Diff line number	Diff line change
`@@ -1077,8 +1077,8 @@ PyCursesWindow_ChgAt(PyCursesWindowObject self, PyObject args)`
`1077`	`1077`	`return NULL;`
`1078`	`1078`	`}`
`1079`	`1079`
`1080`		`- color = (short)((attr >> 8) & 0xff);`
`1081`		`- attr = attr - (color << 8);`
	`1080`	`+ color = (short) PAIR_NUMBER(attr);`
	`1081`	`+ attr = attr & A_ATTRIBUTES;`
`1082`	`1082`
`1083`	`1083`	`if (use_xy) {`
`1084`	`1084`	`rtn = mvwchgat(self->win,y,x,num,attr,color,NULL);`