emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

less: how many different kinds of status line we need, three?!

Browse Source 
small fixes. [prev commit also added control char filtering
on input (e.g. regexp input, filename input for 'E' etc)]
This commit is contained in:
Denis Vlasenko 2006-12-21 13:26:54 +00:00
parent e865e81d34
commit e147a72173
1 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
miscutils/less.c
View File

@ -263,73 +263,70 @@ static void m_status_print(void)
{ {
int percentage; int percentage;
if (!line_pos) { printf(HIGHLIGHT"%s", filename);
if (num_files > 1) { if (num_files > 1)
printf(HIGHLIGHT"%s (file %i of %i) lines %i-%i/%i ", printf(" (file %i of %i)", current_file, num_files);
filename, current_file, num_files, printf(" lines %i-%i/%i ",
line_pos + 1, line_pos + height - 1, num_flines + 1); line_pos + 1, line_pos + height - 1,
} else { num_flines + 1);
printf(HIGHLIGHT"%s lines %i-%i/%i ",
filename, line_pos + 1, line_pos + height - 1,
num_flines + 1);
}
} else {
printf(HIGHLIGHT" %s lines %i-%i/%i ", filename,
line_pos + 1, line_pos + height - 1, num_flines + 1);
}
if (line_pos >= num_flines - height + 2) { if (line_pos >= num_flines - height + 2) {
printf("(END) "NORMAL); printf("(END) "NORMAL);
if (num_files > 1 && current_file != num_files) if (num_files > 1 && current_file != num_files)
printf(HIGHLIGHT"- Next: %s"NORMAL, files[current_file]); printf(HIGHLIGHT"- Next: %s "NORMAL, files[current_file]);
} else { return;
percentage = calc_percent();
printf("%i%% "NORMAL, percentage);
} }
percentage = calc_percent();
printf("%i%% "NORMAL, percentage);
} }
#if 0
/* Print a status line if -m was specified */ /* Print a status line if -m was specified */
static void medium_status_print(void) static void medium_status_print(void)
{ {
int percentage; int percentage;
percentage = calc_percent();
percentage = calc_percent();
if (!line_pos) if (!line_pos)
printf(HIGHLIGHT"%s %i%%"NORMAL, filename, percentage); printf(HIGHLIGHT"%s %i%% "NORMAL, filename, percentage);
else if (line_pos == num_flines - height + 2) else if (line_pos >= num_flines - height + 2)
print_hilite("(END)"); print_hilite("(END) ");
else else
printf(HIGHLIGHT"%i%%"NORMAL, percentage); printf(HIGHLIGHT"%i%% "NORMAL, percentage);
} }
#endif #endif
#endif
/* Print the status line */ /* Print the status line */
static void status_print(void) static void status_print(void)
{ {
const char *p;
/* Change the status if flags have been set */ /* Change the status if flags have been set */
#if ENABLE_FEATURE_LESS_FLAGS #if ENABLE_FEATURE_LESS_FLAGS
if (option_mask32 & FLAG_M) if (option_mask32 & (FLAG_M|FLAG_m)) {
m_status_print(); m_status_print();
else if (option_mask32 & FLAG_m) return;
medium_status_print();
/* No flags set */
else {
#endif
if (!line_pos) {
print_hilite(filename);
if (num_files > 1)
printf(HIGHLIGHT"(file %i of %i)"NORMAL,
current_file, num_files);
} else if (line_pos == num_flines - height + 2) {
print_hilite("(END) ");
if (num_files > 1 && current_file != num_files)
printf(HIGHLIGHT"- Next: %s"NORMAL, files[current_file]);
} else {
putchar(':');
}
#if ENABLE_FEATURE_LESS_FLAGS
} }
//if (option_mask32 & FLAG_m) {
// medium_status_print();
// return;
//}
/* No flags set */
#endif #endif
if (line_pos && line_pos < num_flines - height + 2) {
putchar(':');
return;
}
p = "(END) ";
if (!line_pos)
p = filename;
if (num_files > 1) {
printf(HIGHLIGHT"%s (file %i of %i) "NORMAL,
p, current_file, num_files);
return;
}
print_hilite(p);
} }
static char controls[] = static char controls[] =
@ -554,7 +551,7 @@ static void examine_file(void)
current_file = num_files + 1; current_file = num_files + 1;
num_files++; */ num_files++; */
files[0] = filename; files[0] = filename;
current_file = 1; num_files = current_file = 1;
reinitialise(); reinitialise();
} }