/****************************************************************************
- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
#define CUR SP_TERMTYPE
#endif
-MODULE_ID("$Id: lib_mvcur.c,v 1.131 2013/01/12 22:21:29 tom Exp $")
+MODULE_ID("$Id: lib_mvcur.c,v 1.135 2014/04/26 18:47:20 juergen Exp $")
#define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x] /* desired state */
NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0)
/* initialize the cost structure */
{
- if (SP_PARM->_ofp && isatty(fileno(SP_PARM->_ofp))) {
+ if (SP_PARM->_ofp && NC_ISATTY(fileno(SP_PARM->_ofp))) {
SP_PARM->_char_padding = ((BAUDBYTE * 1000 * 10)
/ (BAUDRATE(SP_PARM) > 0
? BAUDRATE(SP_PARM)
*/
static NCURSES_INLINE int
-onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, int ovw)
+onscreen_mvcur(NCURSES_SP_DCLx
+ int yold, int xold,
+ int ynew, int xnew, int ovw,
+ NCURSES_SP_OUTC myOutCh)
/* onscreen move from (yold, xold) to (ynew, xnew) */
{
string_desc result;
if (usecost != INFINITY) {
TPUTS_TRACE("mvcur");
NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
- buffer, 1, NCURSES_SP_NAME(_nc_outch));
+ buffer, 1, myOutCh);
SP_PARM->_cursrow = ynew;
SP_PARM->_curscol = xnew;
return (OK);
_nc_real_mvcur(NCURSES_SP_DCLx
int yold, int xold,
int ynew, int xnew,
- NCURSES_SP_OUTC myOutCh)
+ NCURSES_SP_OUTC myOutCh,
+ int ovw)
{
NCURSES_CH_T oldattr;
int code;
if (l > 0) {
if (carriage_return) {
NCURSES_PUTP2("carriage_return", carriage_return);
- } else
- NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\r');
+ } else {
+ myOutCh(NCURSES_SP_ARGx '\r');
+ }
xold = 0;
while (l > 0) {
if (newline) {
NCURSES_PUTP2("newline", newline);
- } else
- NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\n');
+ } else {
+ myOutCh(NCURSES_SP_ARGx '\n');
+ }
l--;
}
}
ynew = screen_lines(SP_PARM) - 1;
/* destination location is on screen now */
- code = onscreen_mvcur(NCURSES_SP_ARGx yold, xold, ynew, xnew, TRUE);
+ code = onscreen_mvcur(NCURSES_SP_ARGx yold, xold, ynew, xnew, ovw, myOutCh);
/*
* Restore attributes if we disabled them before moving.
int ynew, int xnew)
{
return _nc_real_mvcur(NCURSES_SP_ARGx yold, xold, ynew, xnew,
- NCURSES_SP_NAME(_nc_outch));
+ NCURSES_SP_NAME(_nc_outch),
+ TRUE);
}
#if NCURSES_SP_FUNCS
return _nc_real_mvcur(NCURSES_SP_ARGx
yold, xold,
ynew, xnew,
- NCURSES_SP_NAME(_nc_outch));
+ NCURSES_SP_NAME(_nc_outch),
+ TRUE);
}
#else /* !USE_TERM_DRIVER */
return _nc_real_mvcur(NCURSES_SP_ARGx
yold, xold,
ynew, xnew,
- NCURSES_SP_NAME(_nc_putchar));
+ NCURSES_SP_NAME(_nc_putchar),
+ FALSE);
}
#if NCURSES_SP_FUNCS
baudrate();
_nc_mvcur_init();
- NC_BUFFERED(FALSE);
(void) puts("The mvcur tester. Type ? for help");