diff --git a/src/conio/curs_cio.c b/src/conio/curs_cio.c index dc3e912e5f2373a0488c3be42da295dd6313d3ac..1e10b71dd5f2fd614473b90af6bca06b76b037e4 100644 --- a/src/conio/curs_cio.c +++ b/src/conio/curs_cio.c @@ -54,7 +54,7 @@ short curses_color(short color) return(0); } -int curs_puttext(int sx, int sy, int ex, int ey, unsigned char *fill) +int curs_puttext(int sx, int sy, int ex, int ey, void *fillbuf) { int x,y; int fillpos=0; @@ -63,7 +63,9 @@ int curs_puttext(int sx, int sy, int ex, int ey, unsigned char *fill) unsigned char orig_attr; int oldx, oldy; struct text_info ti; + unsigned char *fill; + fill=fillbuf; gettextinfo(&ti); if( sx < 1 @@ -98,7 +100,7 @@ int curs_puttext(int sx, int sy, int ex, int ey, unsigned char *fill) return(1); } -int curs_gettext(int sx, int sy, int ex, int ey, unsigned char *fill) +int curs_gettext(int sx, int sy, int ex, int ey, void *fillbuf) { int x,y; int fillpos=0; @@ -109,7 +111,9 @@ int curs_gettext(int sx, int sy, int ex, int ey, unsigned char *fill) unsigned char thischar; int ext_char; struct text_info ti; + unsigned char *fill; + fill=fillbuf; gettextinfo(&ti); if( sx < 1 @@ -361,7 +365,7 @@ int curs_gettext(int sx, int sy, int ex, int ey, unsigned char *fill) return(1); } -void curs_textattr(unsigned char attr) +void curs_textattr(int attr) { chtype attrs=A_NORMAL; int colour; @@ -670,7 +674,7 @@ void curs_setcursortype(int type) { refresh(); } -int curs_putch(unsigned char c) +int curs_putch(int c) { struct text_info ti; int ret; diff --git a/src/conio/curs_cio.h b/src/conio/curs_cio.h index 50b2249baa3437e099ba35e1a9878188a3097464..894bb49cc4f6397ec7af560466c44be326cff383 100644 --- a/src/conio/curs_cio.h +++ b/src/conio/curs_cio.h @@ -10,15 +10,15 @@ extern "C" { #endif short curses_color(short color); -int curs_puttext(int sx, int sy, int ex, int ey, unsigned char *fill); -int curs_gettext(int sx, int sy, int ex, int ey, unsigned char *fill); -void curs_textattr(unsigned char attr); +int curs_puttext(int sx, int sy, int ex, int ey, void *fill); +int curs_gettext(int sx, int sy, int ex, int ey, void *fill); +void curs_textattr(int attr); int curs_kbhit(void); void curs_delay(long msec); int curs_wherey(void); int curs_wherex(void); int _putch(unsigned char ch, BOOL refresh_now); -int curs_putch(unsigned char ch); +int curs_putch(int ch); void curs_gotoxy(int x, int y); int curs_initciolib(long inmode); void curs_gettextinfo(struct text_info *info);