empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wrap long lines in version's list of customized tables

Browse source 
Factor the wrapping print out of show_opts() into prwrap().  Use it
in show_custom().
This commit is contained in:
Markus Armbruster 2008-04-10 22:01:25 +02:00
parent 16b811d4ac
commit afb642b38d
1 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/lib/commands/vers.c
View file

@ -47,6 +47,7 @@
static void show_custom(void);
static void show_opts(int val);
static char *prwrap(char *, char *, int *);
int
vers(void)
@ -243,15 +244,14 @@ vers(void)
static void
show_custom(void)
{
char *sep = "\nCustomized in this game:\n ";
int i;
char *sep;
int col, i;
/* TODO wrap long lines */
sep = "\nCustomized in this game:\n\t";
col = 0;
for (i = 0; i < EF_MAX; i++) {
if (ef_flags(i) & EFF_CUSTOM) {
pr("%s%s", sep, ef_nameof(i));
sep = ", ";
}
if (ef_flags(i) & EFF_CUSTOM)
sep = prwrap(sep, ef_nameof(i), &col);
}
if (*sep == ',')
pr("\nCheck \"show\" for details.\n");
@ -260,11 +260,11 @@ show_custom(void)
static void
show_opts(int val)
{
int col;
char *sep;
int col;
struct keymatch *kp;
sep = "";
sep = "\t";
col = 0;
for (kp = configkeys; kp->km_key; kp++) {
if (!(kp->km_flags & KM_OPTION))
@ -273,13 +273,21 @@ show_opts(int val)
continue;
if (!*(int *)kp->km_data != !val)
continue;
col += strlen(sep) + strlen(kp->km_key);
if (col > 70) {
pr(",\n ");
sep = "";
col = strlen(kp->km_key);
sep = prwrap(sep, kp->km_key, &col);
}
pr("%s%s", sep, kp->km_key);
}
static char *
prwrap(char *sep, char *it, int *col)
{
size_t len = strlen(it);
if (*col != 0 && *col + len > 70) {
sep = ",\n\t";
*col = 0;
}
pr("%s%s", sep, it);
sep = ", ";
}
*col += len + 2;
return sep;
}