diff options
Diffstat (limited to 'lib/libncurses/lib_overlay.c')
| -rw-r--r-- | lib/libncurses/lib_overlay.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libncurses/lib_overlay.c b/lib/libncurses/lib_overlay.c index 62bb2f162c90..19e58f31f96d 100644 --- a/lib/libncurses/lib_overlay.c +++ b/lib/libncurses/lib_overlay.c @@ -13,11 +13,11 @@ #include "curses.priv.h" static void overlap(WINDOW *s, WINDOW *d, int flag) -{ +{ int sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol; T(("overlap : sby %d, sbx %d, smy %d, smx %d, dby %d, dbx %d, dmy %d, dmx %d", - s->_begy, s->_begx, s->_maxy, s->_maxx, + s->_begy, s->_begx, s->_maxy, s->_maxx, d->_begy, d->_begx, d->_maxy, d->_maxx)); sminrow = max(s->_begy, d->_begy) - s->_begy; smincol = max(s->_begx, d->_begx) - s->_begx; @@ -61,16 +61,16 @@ int overwrite(WINDOW *win1, WINDOW *win2) return OK; } -int copywin(WINDOW *src, WINDOW *dst, +int copywin(WINDOW *src, WINDOW *dst, int sminrow, int smincol, - int dminrow, int dmincol, int dmaxrow, int dmaxcol, + int dminrow, int dmincol, int dmaxrow, int dmaxcol, int over) { int sx, sy, dx, dy; T(("copywin(%x, %x, %d, %d, %d, %d, %d, %d, %d)", src, dst, sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol, over)); - + /* make sure rectangle exists in source */ if ((sminrow + dmaxrow - dminrow) > (src->_maxy + 1) || (smincol + dmaxcol - dmincol) > (src->_maxx + 1)) { @@ -91,13 +91,13 @@ int sx, sy, dx, dy; dst->_lastchar[dy] = dmincol; for (dx = dmincol, sx = smincol; dx <= dmaxcol; sx++, dx++) { if (over == TRUE ) { - if (((src->_line[sy][sx] & A_CHARTEXT) != ' ') && (dst->_line[dy][dx] != src->_line[sy][sx])) { + if (((src->_line[sy][sx] & A_CHARTEXT) != ' ') && (dst->_line[dy][dx] != src->_line[sy][sx])) { dst->_line[dy][dx] = src->_line[sy][sx]; dst->_lastchar[dy] = dx; } else dst->_firstchar[dy]++; } else { - if (dst->_line[dy][dx] != src->_line[sy][sx]) { + if (dst->_line[dy][dx] != src->_line[sy][sx]) { dst->_line[dy][dx] = src->_line[sy][sx]; dst->_lastchar[dy] = dx; } else |