Fri, 24 Jul 2015 04:24:38 +0300
Apply Leonard's patch for fixing the colors:
The colors were broken again.
* isprint for some reason returned true when the given byte is higher than 255.
The char cast of the byte was then printed which resulted in odd characters
popping up. Black appeared as ^@ which is NULL in caret notation.
* After that, the colors were all messed up because the RLINE enum didn't take
in account the color swapping.
So instead of messing up the enum order/number I went for a new "range-like"
method.
* After fixing all of that, I noticed the Interface::render_colorline had a
broken loop since the VS2010 commits.
This made the lines not print entierely and messed up the colors etc.
/* Public Domain Curses */ #include <curspriv.h> RCSID("$Id: inchstr.c,v 1.34 2008/07/13 16:08:18 wmcbrine Exp $") /*man-start************************************************************** Name: inchstr Synopsis: int inchstr(chtype *ch); int inchnstr(chtype *ch, int n); int winchstr(WINDOW *win, chtype *ch); int winchnstr(WINDOW *win, chtype *ch, int n); int mvinchstr(int y, int x, chtype *ch); int mvinchnstr(int y, int x, chtype *ch, int n); int mvwinchstr(WINDOW *, int y, int x, chtype *ch); int mvwinchnstr(WINDOW *, int y, int x, chtype *ch, int n); int in_wchstr(cchar_t *wch); int in_wchnstr(cchar_t *wch, int n); int win_wchstr(WINDOW *win, cchar_t *wch); int win_wchnstr(WINDOW *win, cchar_t *wch, int n); int mvin_wchstr(int y, int x, cchar_t *wch); int mvin_wchnstr(int y, int x, cchar_t *wch, int n); int mvwin_wchstr(WINDOW *win, int y, int x, cchar_t *wch); int mvwin_wchnstr(WINDOW *win, int y, int x, cchar_t *wch, int n); Description: These routines read a chtype or cchar_t string from the window, starting at the current or specified position, and ending at the right margin, or after n elements, whichever is less. Return Value: All functions return the number of elements read, or ERR on error. Portability X/Open BSD SYS V inchstr Y - 4.0 winchstr Y - 4.0 mvinchstr Y - 4.0 mvwinchstr Y - 4.0 inchnstr Y - 4.0 winchnstr Y - 4.0 mvinchnstr Y - 4.0 mvwinchnstr Y - 4.0 in_wchstr Y win_wchstr Y mvin_wchstr Y mvwin_wchstr Y in_wchnstr Y win_wchnstr Y mvin_wchnstr Y mvwin_wchnstr Y **man-end****************************************************************/ int winchnstr(WINDOW *win, chtype *ch, int n) { chtype *src; int i; PDC_LOG(("winchnstr() - called\n")); if (!win || !ch || n < 0) return ERR; if ((win->_curx + n) > win->_maxx) n = win->_maxx - win->_curx; src = win->_y[win->_cury] + win->_curx; for (i = 0; i < n; i++) *ch++ = *src++; *ch = (chtype)0; return OK; } int inchstr(chtype *ch) { PDC_LOG(("inchstr() - called\n")); return winchnstr(stdscr, ch, stdscr->_maxx - stdscr->_curx); } int winchstr(WINDOW *win, chtype *ch) { PDC_LOG(("winchstr() - called\n")); return winchnstr(win, ch, win->_maxx - win->_curx); } int mvinchstr(int y, int x, chtype *ch) { PDC_LOG(("mvinchstr() - called: y %d x %d\n", y, x)); if (move(y, x) == ERR) return ERR; return winchnstr(stdscr, ch, stdscr->_maxx - stdscr->_curx); } int mvwinchstr(WINDOW *win, int y, int x, chtype *ch) { PDC_LOG(("mvwinchstr() - called:\n")); if (wmove(win, y, x) == ERR) return ERR; return winchnstr(win, ch, win->_maxx - win->_curx); } int inchnstr(chtype *ch, int n) { PDC_LOG(("inchnstr() - called\n")); return winchnstr(stdscr, ch, n); } int mvinchnstr(int y, int x, chtype *ch, int n) { PDC_LOG(("mvinchnstr() - called: y %d x %d n %d\n", y, x, n)); if (move(y, x) == ERR) return ERR; return winchnstr(stdscr, ch, n); } int mvwinchnstr(WINDOW *win, int y, int x, chtype *ch, int n) { PDC_LOG(("mvwinchnstr() - called: y %d x %d n %d \n", y, x, n)); if (wmove(win, y, x) == ERR) return ERR; return winchnstr(win, ch, n); } #ifdef PDC_WIDE int win_wchnstr(WINDOW *win, cchar_t *wch, int n) { PDC_LOG(("win_wchnstr() - called\n")); return winchnstr(win, wch, n); } int in_wchstr(cchar_t *wch) { PDC_LOG(("in_wchstr() - called\n")); return win_wchnstr(stdscr, wch, stdscr->_maxx - stdscr->_curx); } int win_wchstr(WINDOW *win, cchar_t *wch) { PDC_LOG(("win_wchstr() - called\n")); return win_wchnstr(win, wch, win->_maxx - win->_curx); } int mvin_wchstr(int y, int x, cchar_t *wch) { PDC_LOG(("mvin_wchstr() - called: y %d x %d\n", y, x)); if (move(y, x) == ERR) return ERR; return win_wchnstr(stdscr, wch, stdscr->_maxx - stdscr->_curx); } int mvwin_wchstr(WINDOW *win, int y, int x, cchar_t *wch) { PDC_LOG(("mvwin_wchstr() - called:\n")); if (wmove(win, y, x) == ERR) return ERR; return win_wchnstr(win, wch, win->_maxx - win->_curx); } int in_wchnstr(cchar_t *wch, int n) { PDC_LOG(("in_wchnstr() - called\n")); return win_wchnstr(stdscr, wch, n); } int mvin_wchnstr(int y, int x, cchar_t *wch, int n) { PDC_LOG(("mvin_wchnstr() - called: y %d x %d n %d\n", y, x, n)); if (move(y, x) == ERR) return ERR; return win_wchnstr(stdscr, wch, n); } int mvwin_wchnstr(WINDOW *win, int y, int x, cchar_t *wch, int n) { PDC_LOG(("mvwinchnstr() - called: y %d x %d n %d \n", y, x, n)); if (wmove(win, y, x) == ERR) return ERR; return win_wchnstr(win, wch, n); } #endif