Skip to content
Snippets Groups Projects
Commit b0c87a8e authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Use getcchar() so we can still use the NetBSD native curses

parent 56b4d817
No related branches found
No related tags found
No related merge requests found
Pipeline #5484 passed
...@@ -425,7 +425,15 @@ int curs_vmem_gettext(int sx, int sy, int ex, int ey, struct vmem_cell *fill) ...@@ -425,7 +425,15 @@ int curs_vmem_gettext(int sx, int sy, int ex, int ey, struct vmem_cell *fill)
int fillpos=0; int fillpos=0;
unsigned char attrib; unsigned char attrib;
unsigned char colour; unsigned char colour;
short cpair;
int oldx, oldy; int oldx, oldy;
#ifdef CURSES_CCHAR_MAX
wchar_t allchars[CURSES_CCHAR_MAX];
#else
#ifdef CCHARW_MAX
wchar_t allchars[CCHARW_MAX];
#endif
#endif
unsigned char thischar; unsigned char thischar;
int ext_char; int ext_char;
struct text_info ti; struct text_info ti;
...@@ -457,8 +465,8 @@ int curs_vmem_gettext(int sx, int sy, int ex, int ey, struct vmem_cell *fill) ...@@ -457,8 +465,8 @@ int curs_vmem_gettext(int sx, int sy, int ex, int ey, struct vmem_cell *fill)
for(x=sx-1;x<=ex-1;x++) for(x=sx-1;x<=ex-1;x++)
{ {
mvin_wch(y, x, &cchar); mvin_wch(y, x, &cchar);
attr = cchar.attr; getcchar(&cchar, allchars, &attr, &cpair, NULL);
thischar = ext_char = cchar.chars[0]; thischar = ext_char = allchars[0];
if(attr&WA_REVERSE) { if(attr&WA_REVERSE) {
thischar=(thischar)-'A'+1; thischar=(thischar)-'A'+1;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment