*/
#include <curses.priv.h>
-#include <term.h>
#include <ctype.h>
-MODULE_ID("$Id: lib_mvcur.c,v 1.117 2009/04/26 00:15:22 tom Exp $")
+#ifndef CUR
+#define CUR SP_TERMTYPE
+#endif
+
+MODULE_ID("$Id: lib_mvcur.c,v 1.120 2009/05/10 00:52:29 tom Exp $")
#define WANT_CHAR(sp, y, x) (sp)->_newscr->_line[y].text[x] /* desired state */
#define BAUDRATE(sp) cur_term->_baudrate /* bits per second */
normalized_cost(NCURSES_SP_DCLx const char *const cap, int affcnt)
/* compute the effective character-count for an operation (round up) */
{
- int cost = _nc_msec_cost(cap, affcnt);
+ int cost = NCURSES_SP_NAME(_nc_msec_cost) (NCURSES_SP_ARGx cap, affcnt);
if (cost != INFINITY)
cost = (cost + SP_PARM->_char_padding - 1) / SP_PARM->_char_padding;
return cost;
/* Set the scroll-region to a known state (the default) */
{
if (change_scroll_region) {
- TPUTS_TRACE("change_scroll_region");
- putp(TPARM_2(change_scroll_region, 0, screen_lines(CURRENT_SCREEN) - 1));
+ NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
+ "change_scroll_region",
+ TPARM_2(change_scroll_region,
+ 0, screen_lines(SP_PARM) - 1));
}
}
{
/* initialize screen for cursor access */
if (enter_ca_mode) {
- TPUTS_TRACE("enter_ca_mode");
- putp(enter_ca_mode);
+ NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
+ "enter_ca_mode",
+ enter_ca_mode);
}
/*
if (SP_PARM->_cursor != -1) {
int cursor = SP_PARM->_cursor;
SP_PARM->_cursor = -1;
- curs_set(cursor);
+ NCURSES_SP_NAME(curs_set) (NCURSES_SP_ARGx cursor);
}
}
NCURSES_SP_NAME(_nc_mvcur_init) (NCURSES_SP_DCL0)
/* initialize the cost structure */
{
- if (isatty(fileno(SP_PARM->_ofp)))
+ if (SP_PARM->_ofp && isatty(fileno(SP_PARM->_ofp)))
SP_PARM->_char_padding = ((BAUDBYTE * 1000 * 10)
/ (BAUDRATE(SP_PARM) > 0
? BAUDRATE(SP_PARM)
SP_PARM->_cup_ch_cost = NormalizedCost(
TPARM_2(SP_PARM->_address_cursor,
- 23, 23), 1);
+ 23, 23),
+ 1);
SP_PARM->_hpa_ch_cost = NormalizedCost(TPARM_1(column_address, 23), 1);
SP_PARM->_cuf_ch_cost = NormalizedCost(TPARM_1(parm_right_cursor, 23), 1);
SP_PARM->_inline_cost = min(SP_PARM->_cup_ch_cost,
* SCREEN's _endwin to TRUE at window initialization time and let this be
* called by doupdate's return-from-shellout code.
*/
- _nc_mvcur_resume();
+ NCURSES_SP_NAME(_nc_mvcur_resume) (NCURSES_SP_ARG);
}
#if NCURSES_SP_FUNCS
/* set cursor to normal mode */
if (SP_PARM->_cursor != -1) {
int cursor = SP_PARM->_cursor;
- curs_set(1);
+ NCURSES_SP_NAME(curs_set) (NCURSES_SP_ARGx 1);
SP_PARM->_cursor = cursor;
}
if (exit_ca_mode) {
- TPUTS_TRACE("exit_ca_mode");
- putp(exit_ca_mode);
+ NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
+ "exit_ca_mode",
+ exit_ca_mode);
}
/*
* Reset terminal's tab counter. There's a long-time bug that
* escape sequences that reset things as column positions.
* Utter a \r to reset this invisibly.
*/
- _nc_outch('\r');
+ NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\r');
}
#if NCURSES_SP_FUNCS
/* tactic #1: use local movement */
if (yold != -1 && xold != -1
&& ((newcost = relative_move(NCURSES_SP_ARGx
- NullResult, yold, xold, ynew, xnew,
- ovw)) != INFINITY)
+ NullResult,
+ yold, xold,
+ ynew, xnew, ovw)) != INFINITY)
&& newcost < usecost) {
tactic = 1;
usecost = newcost;
/* tactic #2: use carriage-return + local movement */
if (yold != -1 && carriage_return
&& ((newcost = relative_move(NCURSES_SP_ARGx
- NullResult, yold, 0, ynew, xnew, ovw))
- != INFINITY)
+ NullResult,
+ yold, 0,
+ ynew, xnew, ovw)) != INFINITY)
&& SP_PARM->_cr_cost + newcost < usecost) {
tactic = 2;
usecost = SP_PARM->_cr_cost + newcost;
/* tactic #3: use home-cursor + local movement */
if (cursor_home
&& ((newcost = relative_move(NCURSES_SP_ARGx
- NullResult, 0, 0, ynew, xnew, ovw)) != INFINITY)
+ NullResult,
+ 0, 0,
+ ynew, xnew, ovw)) != INFINITY)
&& SP_PARM->_home_cost + newcost < usecost) {
tactic = 3;
usecost = SP_PARM->_home_cost + newcost;
if (cursor_to_ll
&& ((newcost = relative_move(NCURSES_SP_ARGx
NullResult,
- screen_lines(SP_PARM) - 1, 0, ynew,
- xnew, ovw)) != INFINITY)
+ screen_lines(SP_PARM) - 1, 0,
+ ynew, xnew, ovw)) != INFINITY)
&& SP_PARM->_ll_cost + newcost < usecost) {
tactic = 4;
usecost = SP_PARM->_ll_cost + newcost;
t5_cr_cost = (xold > 0 ? SP_PARM->_cr_cost : 0);
if (auto_left_margin && !eat_newline_glitch
&& yold > 0 && cursor_left
- && ((newcost = relative_move(NCURSES_SP_ARGx NullResult,
- yold - 1,
- screen_columns(SP_PARM) - 1,
- ynew,
- xnew,
- ovw)) != INFINITY)
+ && ((newcost = relative_move(NCURSES_SP_ARGx
+ NullResult,
+ yold - 1, screen_columns(SP_PARM) - 1,
+ ynew, xnew, ovw)) != INFINITY)
&& t5_cr_cost + SP_PARM->_cub1_cost + newcost < usecost) {
tactic = 5;
usecost = t5_cr_cost + SP_PARM->_cub1_cost + newcost;
switch (tactic) {
case 1:
(void) relative_move(NCURSES_SP_ARGx
- &result, yold, xold,
+ &result,
+ yold, xold,
ynew, xnew, ovw);
break;
case 2:
(void) _nc_safe_strcpy(&result, carriage_return);
(void) relative_move(NCURSES_SP_ARGx
- &result, yold, 0,
+ &result,
+ yold, 0,
ynew, xnew, ovw);
break;
case 3:
break;
case 4:
(void) _nc_safe_strcpy(&result, cursor_to_ll);
- (void) relative_move(NCURSES_SP_ARGx &result,
+ (void) relative_move(NCURSES_SP_ARGx
+ &result,
screen_lines(SP_PARM) - 1, 0,
ynew, xnew, ovw);
break;
if (xold > 0)
(void) _nc_safe_strcat(&result, carriage_return);
(void) _nc_safe_strcat(&result, cursor_left);
- (void) relative_move(NCURSES_SP_ARGx &result,
+ (void) relative_move(NCURSES_SP_ARGx
+ &result,
yold - 1, screen_columns(SP_PARM) - 1,
ynew, xnew, ovw);
break;
if (usecost != INFINITY) {
TPUTS_TRACE("mvcur");
- tputs(buffer, 1, _nc_outch);
+ NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
+ buffer, 1, NCURSES_SP_NAME(_nc_outch));
SP_PARM->_cursrow = ynew;
SP_PARM->_curscol = xnew;
return (OK);
TR(TRACE_CHARPUT, ("turning off (%#lx) %s before move",
(unsigned long) AttrOf(oldattr),
_traceattr(AttrOf(oldattr))));
- (void) VIDATTR(A_NORMAL, 0);
+ (void) VIDATTR(SP_PARM, A_NORMAL, 0);
}
if (xold >= screen_columns(SP_PARM)) {
if (l > 0) {
if (carriage_return) {
- TPUTS_TRACE("carriage_return");
- putp(carriage_return);
+ NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
+ "carriage_return",
+ carriage_return);
} else
- _nc_outch('\r');
+ NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\r');
xold = 0;
while (l > 0) {
if (newline) {
- TPUTS_TRACE("newline");
- putp(newline);
+ NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx
+ "newline",
+ newline);
} else
- _nc_outch('\n');
+ NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\n');
l--;
}
}
TR(TRACE_CHARPUT, ("turning on (%#lx) %s after move",
(unsigned long) AttrOf(oldattr),
_traceattr(AttrOf(oldattr))));
- (void) VIDATTR(AttrOf(oldattr), GetPair(oldattr));
+ (void) VIDATTR(SP_PARM, AttrOf(oldattr), GetPair(oldattr));
}
}
returnCode(code);
projects / ncurses.git / blobdiff