8000 [3.8] bpo-37738: Fix curses addch(str, color_pair) (GH-15071) by miss-islington · Pull Request #15272 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.8] bpo-37738: Fix curses addch(str, color_pair) (GH-15071) #15272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 14, 2019
Merged

[3.8] bpo-37738: Fix curses addch(str, color_pair) (GH-15071) #15272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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 077af8c)

Co-authored-by: Victor Stinner <vstinner@redhat.com>
  • Loading branch information
@vstinner @miss-islington
vstinner authored and miss-islington committed Aug 14, 2019
commit 566717cf1847f32abcbf76cc1150f0d9d65f738f
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2019-08-01-17-11-16.bpo-37738.A3WWcT.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 15 additions & 3 deletions Modules/_cursesmodule.c
View file
Open in desktop
D964
Original file line number Diff line numberDiff line change
Expand Up @@ -176,6 +176,18 @@ static char *screen_encoding = NULL;

/* 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
Expand Down Expand Up @@ -606,7 +618,7 @@ _curses_window_addch_impl(PyCursesWindowObject *self, int group_left_1,
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 {
Expand Down Expand Up @@ -2621,7 +2633,7 @@ _curses_color_pair_impl(PyObject *module, short color_number)
PyCursesInitialised;
PyCursesInitialisedColor;

return PyLong_FromLong((long) (color_number << 8));
return PyLong_FromLong(color_pair_to_attr(color_number));
}

/*[clinic input]
Expand Down Expand Up @@ -3644,7 +3656,7 @@ _curses_pair_number_impl(PyObject *module, int attr)
PyCursesInitialised;
PyCursesInitialisedColor;

return PyLong_FromLong((long) ((attr & A_COLOR) >> 8));
return PyLong_FromLong(attr_to_color_pair(attr));
}

/*[clinic input]
Expand Down
0