/*
** Copyright (C) 1997 Free Software Foundation, Inc.
-**
+**
** This file is part of TACK.
-**
+**
** TACK is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation; either version 2, or (at your option)
** any later version.
-**
+**
** TACK is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
-**
+**
** You should have received a copy of the GNU General Public License
** along with TACK; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
+** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+** Boston, MA 02110-1301, USA
*/
#include <tack.h>
#include <time.h>
#include <tic.h>
-MODULE_ID("$Id: edit.c,v 1.3 1999/06/16 00:43:43 tom Exp $")
+MODULE_ID("$Id: edit.c,v 1.11 2006/06/24 21:22:42 tom Exp $")
/*
* Terminfo edit features
};
static char change_pad_text[MAX_CHANGES][80];
-struct test_list change_pad_list[MAX_CHANGES] = {
+static struct test_list change_pad_list[MAX_CHANGES] = {
{MENU_LAST, 0, 0, 0, 0, 0, 0}
};
build_change_menu, change_pad_list, 0, 0, 0
};
-extern struct test_results *pads[STRCOUNT]; /* save pad results here */
-
static TERMTYPE original_term; /* terminal type description */
static char flag_boolean[BOOLCOUNT]; /* flags for booleans */
static char flag_numerics[NUMCOUNT]; /* flags for numerics */
-static char flag_strings[STRCOUNT]; /* flags for strings */
+static char *flag_strings; /* flags for strings */
+static int *label_strings;
static int xon_index; /* Subscript for (xon) */
-int xon_shadow;
+static int xon_shadow;
static int start_display; /* the display has just started */
static int display_lines; /* number of lines displayed */
+static void
+alloc_arrays(void)
+{
+ if (flag_strings == 0) {
+ label_strings = (int *)calloc(MAX_STRINGS, sizeof(int));
+ flag_strings = (char *)calloc(MAX_STRINGS, sizeof(char));
+ }
+}
+
/*
** send_info_string(str)
**
-** Return the terminfo string prefixed by the correct seperator
+** Return the terminfo string prefixed by the correct separator
*/
static void
send_info_string(
send_info_string(buf, ch);
}
}
- for (i = 0; i < STRCOUNT; i++) {
+ for (i = 0; i < MAX_STRINGS; i++) {
if (CUR Strings[i]) {
- sprintf(buf, "%s=%s", strnames[i],
+ sprintf(buf, "%s=%s", STR_NAME(i),
print_expand(CUR Strings[i]));
send_info_string(buf, ch);
}
/*
** save_info_string(str, fp)
**
-** Write the terminfo string prefixed by the correct seperator
+** Write the terminfo string prefixed by the correct separator
*/
static void
save_info_string(
save_info_string(buf, fp);
}
}
- for (i = 0; i < STRCOUNT; i++) {
+ for (i = 0; i < MAX_STRINGS; i++) {
if (CUR Strings[i]) {
- sprintf(buf, "%s=%s", strnames[i],
+ sprintf(buf, "%s=%s", STR_NAME(i),
_nc_tic_expand(CUR Strings[i], TRUE, TRUE));
save_info_string(buf, fp);
}
switch (nt->nte_type) {
case STRING:
_nc_reset_input((FILE *) 0, buf);
- _nc_trans_string(tmp);
+ _nc_trans_string(tmp, tmp + sizeof(tmp));
s = (char *)malloc(strlen(tmp) + 1);
strcpy(s, tmp);
CUR Strings[nt->nte_index] = s;
int i;
if (value) {
- for (i = 0; i < STRCOUNT; i++) {
+ for (i = 0; i < MAX_STRINGS; i++) {
if (CUR Strings[i] == value) {
return i;
}
ptextln(temp);
}
}
- for (i = 0; i < STRCOUNT; i++) {
+ for (i = 0; i < MAX_STRINGS; i++) {
a = original_term.Strings[i] ? original_term.Strings[i] : "";
b = CUR Strings[i] ? CUR Strings[i] : "";
if (strcmp(a, b)) {
header = 0;
}
strcpy(abuf, _nc_tic_expand(a, TRUE, TRUE));
- sprintf(temp, "%30s %6s %s", abuf, strnames[i],
+ sprintf(temp, "%30s %6s %s", abuf, STR_NAME(i),
_nc_tic_expand(b, TRUE, TRUE));
putln(temp);
}
return TRUE;
}
}
- for (i = 0; i < STRCOUNT; i++) {
+ for (i = 0; i < MAX_STRINGS; i++) {
a = original_term.Strings[i] ? original_term.Strings[i] : "";
b = CUR Strings[i] ? CUR Strings[i] : "";
if (strcmp(a, b)) {
{
struct name_table_entry const *nt;
+ alloc_arrays();
if ((nt = _nc_find_entry(name, _nc_info_hash_table))) {
switch (nt->nte_type) {
case BOOLEAN:
**
** Scan the name list and get the names.
** Enter each name into the can-test data base.
-** <space> ( and ) may be used as seperators.
+** <space> ( and ) may be used as separators.
*/
void
can_test(
const char *s,
int flags)
{
- int ch, i, j;
+ int ch, j;
char name[32];
if (s) {
- for (i = j = 0; (name[j] = ch = *s); s++) {
+ for (j = 0; (name[j] = ch = *s); s++) {
if (ch == ' ' || ch == ')' || ch == '(') {
if (j) {
name[j] = '\0';
** cap_index(name-list, index-list)
**
** Scan the name list and return a list of indexes.
-** <space> ( and ) may be used as seperators.
+** <space> ( and ) may be used as separators.
** This list is terminated with -1.
*/
void
int *inx)
{
struct name_table_entry const *nt;
- int ch, i, j;
+ int ch, j;
char name[32];
if (s) {
- for (i = j = 0; ; s++) {
+ for (j = 0; ; s++) {
name[j] = ch = *s;
if (ch == ' ' || ch == ')' || ch == '(' || ch == 0) {
if (j) {
**
** Scan the name list and see if the cap is in the list.
** Return TRUE if we find an exact match.
-** <space> ( and ) may be used as seperators.
+** <space> ( and ) may be used as separators.
*/
int
cap_match(
{
int i, j, nc, flag;
const char *s;
- const char *nx[BOOLCOUNT + NUMCOUNT + STRCOUNT];
+ const char **nx = malloc(BOOLCOUNT + NUMCOUNT + MAX_STRINGS);
+ alloc_arrays();
flag = t->flags & 255;
nc = 0;
for (i = 0; i < BOOLCOUNT; i++) {
nx[nc++] = numnames[i];
}
}
- for (i = 0; i < STRCOUNT; i++) {
+ for (i = 0; i < MAX_STRINGS; i++) {
if (flag_strings[i] & flag) {
- nx[nc++] = strnames[i];
+ nx[nc++] = STR_NAME(i);
}
}
/* sort */
}
put_newlines(1);
*ch = REQUEST_PROMPT;
+ free (nx);
}
/*
{
int i;
+ alloc_arrays();
ptextln("Caps that are defined but cannot be tested:");
for (i = 0; i < BOOLCOUNT; i++) {
if (flag_boolean[i] == 0 && CUR Booleans[i]) {
ptext(temp);
}
}
- for (i = 0; i < STRCOUNT; i++) {
+ for (i = 0; i < MAX_STRINGS; i++) {
if (flag_strings[i] == 0 && CUR Strings[i]) {
- sprintf(temp, "%s ", strnames[i]);
+ sprintf(temp, "%s ", STR_NAME(i));
ptext(temp);
}
}
int i, j, lc;
char *lab;
struct name_table_entry const *nt;
- int label_strings[STRCOUNT];
+
+ alloc_arrays();
_nc_copy_termtype(&original_term, &cur_term->type);
for (i = 0; i < BOOLCOUNT; i++) {
original_term.Numbers[i] = CUR Numbers[i];
}
/* scan for labels */
- for (i = lc = 0; i < STRCOUNT; i++) {
+ for (i = lc = 0; i < MAX_STRINGS; i++) {
original_term.Strings[i] = CUR Strings[i];
- if (strncmp(strnames[i], "lf", 2) == 0) {
+ if (strncmp(STR_NAME(i), "lf", 2) == 0) {
flag_strings[i] |= FLAG_LABEL;
if (CUR Strings[i]) {
label_strings[lc++] = i;
}
}
/* scan for function keys */
- for (i = 0; i < STRCOUNT; i++) {
- if ((strnames[i][0] == 'k') && strcmp(strnames[i], "kmous")) {
+ for (i = 0; i < MAX_STRINGS; i++) {
+ const char *this_name = STR_NAME(i);
+ if ((this_name[0] == 'k') && strcmp(this_name, "kmous")) {
flag_strings[i] |= FLAG_FUNCTION_KEY;
lab = (char *) 0;
for (j = 0; j < lc; j++) {
- if (!strcmp(&strnames[i][1],
- &strnames[label_strings[j]][1])) {
+ if (!strcmp(this_name,
+ STR_NAME(label_strings[j]))) {
lab = CUR Strings[label_strings[j]];
break;
}
}
- enter_key(strnames[i], CUR Strings[i], lab);
+ enter_key(this_name, CUR Strings[i], lab);
}
}
/* Lookup the translated strings */
xon_index = nt->nte_index;
}
xon_shadow = xon_xoff;
+ free(label_strings);
}
/*
} else {
x = tx_index[i];
current_string = tx_cap[i];
- strcpy(pad, strnames[x]);
+ strcpy(pad, STR_NAME(x));
}
if (!current_string) {
ptextln("That string is not currently defined. Please enter a new value, including the padding delay:");
read_string(buf, sizeof(buf));
_nc_reset_input((FILE *) 0, buf);
- _nc_trans_string(pad);
+ _nc_trans_string(pad, pad + sizeof(pad));
t = (char *)malloc(strlen(pad) + 1);
strcpy(t, pad);
CUR Strings[x] = t;
- sprintf(temp, "new string value %s", strnames[x]);
+ sprintf(temp, "new string value %s", STR_NAME(x));
ptextln(temp);
ptextln(expand(t));
return;
putln(buf);
ptextln("Enter new pad. 0 for no pad. CR for no change.");
read_string(buf, 32);
- if (buf[0] == '\0' || (buf[1] == '\0' && isalpha(buf[0]))) {
+ if (buf[0] == '\0' || (buf[1] == '\0' && isalpha(UChar(buf[0])))) {
*chp = buf[0];
return;
}
s = _nc_tic_expand(tx_cap[i], TRUE, TRUE);
s[40] = '\0';
sprintf(change_pad_text[j], "%c) (%s) %s",
- 'a' + j, strnames[k], s);
+ 'a' + j, STR_NAME(k), s);
change_pad_list[j].flags = i;
change_pad_list[j].lines_needed = 4;
change_pad_list[j].menu_entry = change_pad_text[j];
projects / ncurses.git / blobdiff