aboutsummaryrefslogtreecommitdiff
path: root/ncurses/base/lib_addch.c
diff options
context:
space:
mode:
Diffstat (limited to 'ncurses/base/lib_addch.c')
-rw-r--r--ncurses/base/lib_addch.c80
1 files changed, 30 insertions, 50 deletions
diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index 515ebaf0b8fc..20a97a01a011 100644
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2006,2008 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 *
@@ -36,7 +36,7 @@
#include <curses.priv.h>
#include <ctype.h>
-MODULE_ID("$Id: lib_addch.c,v 1.124 2010/04/24 22:41:05 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.113 2008/08/16 19:20:04 tom Exp $")
static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
@@ -77,6 +77,12 @@ render_char(WINDOW *win, NCURSES_CH_T ch)
if ((pair = GET_WINDOW_PAIR(win)) == 0)
pair = GetPair(win->_nc_bkgd);
}
+#if 0
+ if (pair > 255) {
+ NCURSES_CH_T fixme = ch;
+ SetPair(fixme, pair);
+ }
+#endif
AddAttr(ch, (a & COLOR_MASK(AttrOf(ch))));
SetPair(ch, pair);
}
@@ -125,7 +131,7 @@ newline_forces_scroll(WINDOW *win, NCURSES_SIZE_T * ypos)
*ypos = win->_regbottom;
result = TRUE;
} else {
- *ypos = (NCURSES_SIZE_T) (*ypos + 1);
+ *ypos += 1;
}
return result;
}
@@ -170,8 +176,8 @@ fill_cells(WINDOW *win, int count)
if (waddch_literal(win, blank) == ERR)
break;
}
- win->_curx = (NCURSES_SIZE_T) save_x;
- win->_cury = (NCURSES_SIZE_T) save_y;
+ win->_curx = save_x;
+ win->_cury = save_y;
}
#endif
@@ -207,9 +213,9 @@ _nc_build_wch(WINDOW *win, ARG_CH_T ch)
buffer[WINDOW_EXT(win, addch_used)] = (char) CharOf(CHDEREF(ch));
WINDOW_EXT(win, addch_used) += 1;
buffer[WINDOW_EXT(win, addch_used)] = '\0';
- if ((len = (int) mbrtowc(&result,
- buffer,
- WINDOW_EXT(win, addch_used), &state)) > 0) {
+ if ((len = mbrtowc(&result,
+ buffer,
+ WINDOW_EXT(win, addch_used), &state)) > 0) {
attr_t attrs = AttrOf(CHDEREF(ch));
if_EXT_COLORS(int pair = GetPair(CHDEREF(ch)));
SetChar(CHDEREF(ch), result, attrs);
@@ -254,37 +260,20 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
/*
* Build up multibyte characters until we have a wide-character.
*/
-#if NCURSES_SP_FUNCS
-#define DeriveSP() SCREEN *sp = _nc_screen_of(win);
-#else
-#define DeriveSP() /*nothing */
-#endif
if_WIDEC({
- DeriveSP();
if (WINDOW_EXT(win, addch_used) != 0 || !Charable(ch)) {
int len = _nc_build_wch(win, CHREF(ch));
if (len >= -1) {
- attr_t attr = AttrOf(ch);
-
- /* handle EILSEQ (i.e., when len >= -1) */
- if (len == -1 && is8bits(CharOf(ch))) {
- int rc = OK;
- const char *s = NCURSES_SP_NAME(unctrl)
- (NCURSES_SP_ARGx (chtype) CharOf(ch));
-
- if (s[1] != '\0') {
- while (*s != '\0') {
- rc = waddch(win, UChar(*s) | attr);
- if (rc != OK)
- break;
- ++s;
- }
- return rc;
+ /* handle EILSEQ */
+ if (is8bits(CharOf(ch))) {
+ const char *s = unctrl((chtype) CharOf(ch));
+ if (s[1] != 0) {
+ return waddstr(win, s);
}
}
if (len == -1)
- return waddch(win, ' ' | attr);
+ return waddch(win, ' ');
} else {
return OK;
}
@@ -338,7 +327,6 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
return ERR;
x = win->_curx;
y = win->_cury;
- line = win->_line + y;
}
/*
* Check for cells which are orphaned by adding this character, set
@@ -396,7 +384,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
if (x > win->_maxx) {
return wrap_to_next_line(win);
}
- win->_curx = (NCURSES_SIZE_T) x;
+ win->_curx = x;
return OK;
}
@@ -405,12 +393,9 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
/* the workhorse function -- add a character to the given window */
{
NCURSES_SIZE_T x, y;
- chtype t = (chtype) CharOf(ch);
-#if USE_WIDEC_SUPPORT || NCURSES_SP_FUNCS || USE_REENTRANT
- SCREEN *sp = _nc_screen_of(win);
-#endif
- const char *s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx t);
- int tabsize = 8;
+ chtype t = CharOf(ch);
+ const char *s = unctrl(t);
+
/*
* If we are using the alternate character set, forget about locale.
* Otherwise, if unctrl() returns a single-character or the locale
@@ -419,14 +404,14 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
if ((AttrOf(ch) & A_ALTCHARSET)
|| (
#if USE_WIDEC_SUPPORT
- (sp != 0 && sp->_legacy_coding) &&
+ (SP != 0 && SP->_legacy_coding) &&
#endif
s[1] == 0
)
|| (
isprint(t)
#if USE_WIDEC_SUPPORT
- || ((sp == 0 || !sp->_legacy_coding) &&
+ || ((SP == 0 || !SP->_legacy_coding) &&
(WINDOW_EXT(win, addch_used)
|| !_nc_is_charable(CharOf(ch))))
#endif
@@ -442,12 +427,8 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
switch (t) {
case '\t':
-#if USE_REENTRANT
- tabsize = *ptrTabsize(sp);
-#else
- tabsize = TABSIZE;
-#endif
- x = (NCURSES_SIZE_T) (x + (tabsize - (x % tabsize)));
+ x += (TABSIZE - (x % TABSIZE));
+
/*
* Space-fill the tab on the bottom line so that we'll get the
* "correct" cursor position.
@@ -533,7 +514,7 @@ waddch(WINDOW *win, const chtype ch)
NCURSES_CH_T wch;
SetChar2(wch, ch);
- TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("waddch(%p, %s)"), (void *) win,
+ TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("waddch(%p, %s)"), win,
_tracechtype(ch)));
if (win && (waddch_nosync(win, wch) != ERR)) {
@@ -552,8 +533,7 @@ wechochar(WINDOW *win, const chtype ch)
NCURSES_CH_T wch;
SetChar2(wch, ch);
- TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wechochar(%p, %s)"),
- (void *) win,
+ TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_CALLED("wechochar(%p, %s)"), win,
_tracechtype(ch)));
if (win && (waddch_nosync(win, wch) != ERR)) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 08:14:48 +0000