#include <parametrized.h>
#include <transform.h>
-MODULE_ID("$Id: tic.c,v 1.266 2019/02/10 02:25:46 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.281 2019/11/09 18:51:36 tom Exp $")
#define STDIN_NAME "<stdin>"
while ((ch = *t++) != 0) {
*d++ = (char) ch;
if (ch == '\\') {
- *d++ = *t++;
+ if ((*d++ = *t++) == '\0')
+ break;
} else if ((ch == '%')
&& (*t == L_BRACE)) {
char *v = 0;
if (!quiet) {
(void) fseek(tmp_fp, qp->cstart, SEEK_SET);
while (j-- > 0) {
- if (infodump)
- (void) putchar(fgetc(tmp_fp));
- else
- put_translate(fgetc(tmp_fp));
+ int ch = fgetc(tmp_fp);
+ if (ch == EOF || ferror(tmp_fp)) {
+ break;
+ } else if (infodump) {
+ (void) putchar(ch);
+ } else {
+ put_translate(ch);
+ }
}
}
static void
check_acs(TERMTYPE2 *tp)
{
+ int vt100_smacs = 0;
+ int vt100_rmacs = 0;
+ int vt100_enacs = 0;
+
+ /*
+ * ena_acs is not always necessary, but if it is present, the enter/exit
+ * capabilities should be.
+ */
+ ANDMISSING(ena_acs, enter_alt_charset_mode);
+ ANDMISSING(ena_acs, exit_alt_charset_mode);
+ PAIRED(exit_alt_charset_mode, exit_alt_charset_mode);
+
+ /*
+ * vt100-like is frequently used, but perhaps ena_acs is missing, etc.
+ */
+ if (VALID_STRING(enter_alt_charset_mode)) {
+ vt100_smacs = (!strcmp("\033(0", enter_alt_charset_mode)
+ ? 2
+ : (!strcmp("\016", enter_alt_charset_mode)
+ ? 1
+ : 0));
+ }
+ if (VALID_STRING(exit_alt_charset_mode)) {
+ vt100_rmacs = (!strcmp("\033(B", exit_alt_charset_mode)
+ ? 2
+ : (!strcmp("\017", exit_alt_charset_mode)
+ ? 1
+ : 0));
+ }
+ if (VALID_STRING(ena_acs)) {
+ vt100_enacs = (!strcmp("\033(B\033)0", ena_acs)
+ ? 2
+ : 0);
+ }
+ if (vt100_rmacs && vt100_smacs && (vt100_rmacs != vt100_smacs)) {
+ _nc_warning("rmacs/smacs are inconsistent");
+ }
+ if ((vt100_rmacs == 2) && (vt100_smacs == 2) && vt100_enacs) {
+ _nc_warning("rmacs/smacs make enacs redundant");
+ }
+ if ((vt100_rmacs == 1) && (vt100_smacs == 1) && !vt100_enacs) {
+ _nc_warning("VT100-style rmacs/smacs require enacs");
+ }
+
if (VALID_STRING(acs_chars)) {
const char *boxes = "lmkjtuvwqxn";
char mapped[256];
static void
check_colors(TERMTYPE2 *tp)
{
+ char *value;
+
if ((max_colors > 0) != (max_pairs > 0)
|| ((max_colors > max_pairs) && (initialize_pair == 0)))
_nc_warning("inconsistent values for max_colors (%d) and max_pairs (%d)",
_nc_warning("expected ccc because initc is given");
}
}
+ value = tigetstr("RGB");
+ if (VALID_STRING(value)) {
+ int r, g, b;
+ char bad;
+ int code = sscanf(value, "%d/%d/%d%c", &r, &g, &b, &bad);
+ if (code != 3 || r <= 0 || g <= 0 || b <= 0) {
+ _nc_warning("unexpected value for RGB capability: %s", value);
+ }
+ }
}
static int
#endif
}
+#if NCURSES_XNAMES
static bool
uses_SGR_39_49(const char *value)
{
static void
check_screen(TERMTYPE2 *tp)
{
-#if NCURSES_XNAMES
if (_nc_user_definable) {
int have_XT = tigetflag("XT");
int have_XM = tigetflag("XM");
}
}
}
-#endif
}
+#else
+#define check_screen(tp) /* nothing */
+#endif
/*
* Returns the expected number of parameters for the given capability.
return result;
}
-typedef struct {
- const char *name;
- int n_type;
- int n_parms;
-} USERCAPS;
-
/*
- * These are user-capabilities that happen to be used in ncurses' terminal
+ * Check for user-capabilities that happen to be used in ncurses' terminal
* database.
*/
-static USERCAPS *
+#if NCURSES_XNAMES
+static struct user_table_entry const *
lookup_user_capability(const char *name)
{
- /* *INDENT-OFF* */
-#define DATA(name,type,parms) { name, type, parms }
- static USERCAPS table[] = {
- DATA( "AX", BOOLEAN, 0 ),
- DATA( "Cr", STRING, 0 ),
- DATA( "Cs", STRING, 1 ),
- DATA( "E0", STRING, 0 ),
- DATA( "E3", STRING, 0 ),
- DATA( "G0", BOOLEAN, 0 ),
- DATA( "Ms", STRING, 2 ),
- DATA( "RGB", BOOLEAN, 0 ), /* FIXME can be number or string */
- DATA( "S0", STRING, 1 ),
- DATA( "Se", STRING, 0 ),
- DATA( "Smulx", STRING, 1 ),
- DATA( "Ss", STRING, 1 ),
- DATA( "TS", STRING, 0 ),
- DATA( "U8", NUMBER, 0 ),
- DATA( "XM", STRING, 1 ),
- DATA( "XT", BOOLEAN, 0 ),
- DATA( "grbom", STRING, 0 ),
- DATA( "gsbom", STRING, 0 ),
- DATA( "rmxx", STRING, 0 ),
- DATA( "smxx", STRING, 0 ),
- DATA( "xm", STRING, 9 ),
- };
-#undef DATA
- /* *INDENT-ON* */
-
- size_t n;
- USERCAPS *result = 0;
+ struct user_table_entry const *result = 0;
if (*name != 'k') {
- for (n = 0; n < SIZEOF(table); ++n) {
- if (!strcmp(name, table[n].name)) {
- result = &table[n];
- break;
- }
- }
+ result = _nc_find_user_entry(name);
}
return result;
}
+#endif
/*
* If a given name is likely to be a user-capability, return the number of
(name[1] >= '0' && name[1] <= '9') &&
name[2] == '\0') {
result = (name[1] == '6') ? 2 : 0;
- } else if (using_extensions) {
- USERCAPS *p = lookup_user_capability(name);
+ }
+#if NCURSES_XNAMES
+ else if (using_extensions) {
+ struct user_table_entry const *p = lookup_user_capability(name);
if (p != 0) {
- result = p->n_parms;
+ result = (int) p->ute_argc;
}
}
+#endif
return result;
}
s++;
}
+#if NCURSES_XNAMES
if (extended) {
int check = is_user_capability(name);
- if (check != actual) {
+ if (check != actual && (check >= 0 && actual >= 0)) {
_nc_warning("extended %s capability has %d parameters, expected %d",
name, actual, check);
} else if (debug_level > 1) {
}
expected = actual;
}
+#else
+ (void) extended;
+#endif
if (params[0]) {
_nc_warning("%s refers to parameter 0 (%%p0), which is not allowed", name);
analyzed = popcount;
}
if (actual != analyzed && expected != analyzed) {
+#if NCURSES_XNAMES
int user_cap = is_user_capability(name);
if ((user_cap == analyzed) && using_extensions) {
; /* ignore */
} else if (user_cap >= 0) {
_nc_warning("tparm will use %d parameters for %s, expected %d",
analyzed, name, user_cap);
- } else {
+ } else
+#endif
+ {
_nc_warning("tparm analyzed %d parameters for %s, expected %d",
analyzed, name, actual);
}
check_infotocap(TERMTYPE2 *tp, int i, const char *value)
{
const char *name = ExtStrname(tp, i, strnames);
- int params = (((i < (int) SIZEOF(parametrized)) &&
- (i < STRCOUNT))
+ int params = ((i < (int) SIZEOF(parametrized))
? parametrized[i]
: ((*value == 'k')
? 0
char *tc_value;
bool embedded;
+ assert(SIZEOF(parametrized) == STRCOUNT);
if ((ti_value = _nc_tic_expand(value, TRUE, to_char)) == ABSENT_STRING) {
_nc_warning("tic-expansion of %s failed", name);
} else if ((tc_value = _nc_infotocap(name, ti_value, params)) == ABSENT_STRING) {
}
}
+#if NCURSES_XNAMES
static int
standard_type(const char *name)
{
static void
check_user_capability_type(const char *name, int actual)
{
- USERCAPS *p = lookup_user_capability(name);
- if (p != 0) {
- if (p->n_type != actual)
- _nc_warning("expected %s to be %s, but actually %s",
- name,
- name_of_type(p->n_type),
- name_of_type(actual)
- );
- } else {
+ if (lookup_user_capability(name) == 0) {
int expected = standard_type(name);
if (expected >= 0) {
_nc_warning("expected %s to be %s, but actually %s",
name,
- name_of_type(p->n_type),
+ name_of_type(actual),
name_of_type(expected)
);
} else if (*name != 'k') {
}
}
}
+#endif
/* other sanity-checks (things that we don't want in the normal
* logic that reads a terminfo entry)
check_printer(tp);
check_screen(tp);
+ /*
+ * These are probably both or none.
+ */
+ PAIRED(parm_index, parm_rindex);
+ PAIRED(parm_ich, parm_dch);
+
/*
* These may be mismatched because the terminal description relies on
* restoring the cursor visibility by resetting it.
* ncurses handles it.
*/
if ((PRESENT(enter_insert_mode) || PRESENT(exit_insert_mode))
- && PRESENT(parm_ich)) {
+ && PRESENT(insert_character)) {
_nc_warning("non-curses applications may be confused by ich1 with smir/rmir");
}