bpo-46000: Improve NetBSD curses compatibility (GH-29947)

0-wiz-0 · web-flow · commit 2fb797e93c6b · 2021-12-10T11:41:47.000+02:00
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
@@ -1230,8 +1230,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
`@@ -1230,8 +1230,8 @@ PyCursesWindow_ChgAt(PyCursesWindowObject self, PyObject args)`
`1230`	`1230`	`return NULL;`
`1231`	`1231`	`}`
`1232`	`1232`
`1233`		`- color = (short)((attr >> 8) & 0xff);`
`1234`		`- attr = attr - (color << 8);`
	`1233`	`+ color = (short) PAIR_NUMBER(attr);`
	`1234`	`+ attr = attr & A_ATTRIBUTES;`
`1235`	`1235`
`1236`	`1236`	`if (use_xy) {`
`1237`	`1237`	`rtn = mvwchgat(self->win,y,x,num,attr,color,NULL);`