/****************************************************************************
- * Copyright (c) 2016 Free Software Foundation, Inc. *
+ * Copyright 2018-2019,2020 Thomas E. Dickey *
+ * Copyright 2016,2017 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 *
* authorization. *
****************************************************************************/
/*
- * $Id: list_keys.c,v 1.17 2016/09/10 21:24:44 tom Exp $
+ * $Id: list_keys.c,v 1.26 2020/02/02 23:34:34 tom Exp $
*
* Author: Thomas E Dickey
*
show_key(const char *name, bool show)
{
int width = 0;
- char buffer[10];
- NCURSES_CONST char *value = tigetstr(name);
+ NCURSES_CONST char *value = tigetstr((NCURSES_CONST char *) name);
if (show && t_opt)
fputc('"', stdout);
if (value != 0 && value != (char *) -1) {
while (*value != 0) {
+ char buffer[10];
int ch = UChar(*value++);
switch (ch) {
case '\177':
}
static bool
-valid_key(const char *name, TERMINAL ** terms, int count)
+valid_key(const char *name, TERMINAL **terms, int count)
{
bool result = FALSE;
if (*name == 'k') {
static void
draw_line(int width)
{
- int j;
if (!t_opt) {
+ int j;
for (j = 0; j < width; ++j) {
printf("-");
}
static const char *
modified_key(const char *name)
{
- static char result[80];
- char buffer[sizeof(result)];
+ static char result[100];
+ char buffer[sizeof(result) - 10];
int value;
char chr;
static const char *modifiers[][2] =
map &= ~6;
map |= (bit1 << 1) | (bit2 >> 1);
_nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
- "%sF%d", modifiers[map][f_opt], 1 + key);
+ "%sF%d", modifiers[map][(unsigned) f_opt], 1 + key);
} else if (sscanf(name, "k%[A-Z]%d%c", buffer, &value, &chr) == 2 &&
(value > 1 &&
value <= 8) &&
!strcmp(buffer, "NXT") ||
!strcmp(buffer, "PRV"))) {
_nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
- "%sk%s", modifiers[value - 1][f_opt], buffer);
+ "%sk%s", modifiers[value - 1][(unsigned) f_opt], buffer);
} else if (sscanf(name, "k%[A-Z]%c", buffer, &chr) == 1 &&
(!strcmp(buffer, "UP") ||
!strcmp(buffer, "DN"))) {
_nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
- "%sk%s", modifiers[1][f_opt], buffer);
+ "%sk%s", modifiers[1][(unsigned) f_opt], buffer);
} else {
*result = '\0';
}
}
static void
-list_keys(TERMINAL ** terms, int count)
+list_keys(TERMINAL **terms, int count)
{
int j, k;
int widths0 = 0;
}
#if NCURSES_XNAMES
if (x_opt) {
- TERMTYPE *term;
for (k = 0; k < count; ++k) {
+ TERMTYPE *term;
set_curterm(terms[k]);
- term = &(cur_term->type);
+ term = (TERMTYPE *) cur_term;
total += (size_t) (NUM_STRINGS(term) - STRCOUNT);
}
}
Type(j) = ktOther;
if (sscanf(strnames[j], "kf%d", &k) == 1) {
Type(j) = ktFunction;
- } else if (!strncmp(strnames[j], "kcu", 3)) {
+ } else if (!(strncmp) (strnames[j], "kcu", 3)) {
Type(j) = ktCursor;
}
Name(j) = strnames[j];
}
#if NCURSES_XNAMES
if (x_opt) {
- TERMTYPE *term;
int m, n;
+
for (k = 0; k < count; ++k) {
+ TERMTYPE *term;
+
set_curterm(terms[k]);
- term = &(cur_term->type);
+ term = (TERMTYPE *) cur_term;
for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
bool found = FALSE;
const char *estr = ExtStrname(term, (int) n, strnames);
list_keys(terms, 1);
}
+ free(terms);
+
ExitProgram(EXIT_SUCCESS);
}