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

Adjust the terminal height for any overlap, so that no lines

Browse Source 
get lost off the top
 -Erik
This commit is contained in:
Eric Andersen 2001-02-22 00:22:46 +00:00
parent 54006bce25
commit be30a6b8b0
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
more.c
View File

@ -71,6 +71,7 @@ extern int more_main(int argc, char **argv)
int please_display_more_prompt = 0; int please_display_more_prompt = 0;
struct stat st; struct stat st;
FILE *file; FILE *file;
int len;
#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS #if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS
struct winsize win = { 0, 0, 0, 0 }; struct winsize win = { 0, 0, 0, 0 };
@ -112,12 +113,12 @@ extern int more_main(int argc, char **argv)
(void) signal(SIGTERM, gotsig); (void) signal(SIGTERM, gotsig);
#endif #endif
len = 0;
while ((c = getc(file)) != EOF) { while ((c = getc(file)) != EOF) {
if (please_display_more_prompt) {
int len = 0;
please_display_more_prompt = 0; if (please_display_more_prompt) {
lines = 0; lines = 0;
please_display_more_prompt = 0;
len = printf("--More-- "); len = printf("--More-- ");
if (file != stdin) { if (file != stdin) {
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
@ -160,7 +161,7 @@ extern int more_main(int argc, char **argv)
putc('\b', stdout); putc('\b', stdout);
fflush(stdout); fflush(stdout);
#endif #endif
len=0;
} }
/* /*
@ -183,14 +184,24 @@ extern int more_main(int argc, char **argv)
please_display_more_prompt = 1; please_display_more_prompt = 1;
break; break;
} }
if (++lines == terminal_height) /* Adjust the terminal height for any overlap, so that
* no lines get lost off the top. */
if (len) {
div_t result = div( len, terminal_width);
if (result.quot)
terminal_height-=(result.quot-1);
}
if (++lines == terminal_height) {
please_display_more_prompt = 1; please_display_more_prompt = 1;
}
len=0;
} }
/* /*
* If we just read a newline from the file being 'mored' and any * If we just read a newline from the file being 'mored' and any
* key other than a return is hit, scroll by one page * key other than a return is hit, scroll by one page
*/ */
putc(c, stdout); putc(c, stdout);
len++;
} }
fclose(file); fclose(file);
fflush(stdout); fflush(stdout);

21
util-linux/more.c
View File

@ -71,6 +71,7 @@ extern int more_main(int argc, char **argv)
int please_display_more_prompt = 0; int please_display_more_prompt = 0;
struct stat st; struct stat st;
FILE *file; FILE *file;
int len;
#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS #if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS
struct winsize win = { 0, 0, 0, 0 }; struct winsize win = { 0, 0, 0, 0 };
@ -112,12 +113,12 @@ extern int more_main(int argc, char **argv)
(void) signal(SIGTERM, gotsig); (void) signal(SIGTERM, gotsig);
#endif #endif
len = 0;
while ((c = getc(file)) != EOF) { while ((c = getc(file)) != EOF) {
if (please_display_more_prompt) {
int len = 0;
please_display_more_prompt = 0; if (please_display_more_prompt) {
lines = 0; lines = 0;
please_display_more_prompt = 0;
len = printf("--More-- "); len = printf("--More-- ");
if (file != stdin) { if (file != stdin) {
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
@ -160,7 +161,7 @@ extern int more_main(int argc, char **argv)
putc('\b', stdout); putc('\b', stdout);
fflush(stdout); fflush(stdout);
#endif #endif
len=0;
} }
/* /*
@ -183,14 +184,24 @@ extern int more_main(int argc, char **argv)
please_display_more_prompt = 1; please_display_more_prompt = 1;
break; break;
} }
if (++lines == terminal_height) /* Adjust the terminal height for any overlap, so that
* no lines get lost off the top. */
if (len) {
div_t result = div( len, terminal_width);
if (result.quot)
terminal_height-=(result.quot-1);
}
if (++lines == terminal_height) {
please_display_more_prompt = 1; please_display_more_prompt = 1;
}
len=0;
} }
/* /*
* If we just read a newline from the file being 'mored' and any * If we just read a newline from the file being 'mored' and any
* key other than a return is hit, scroll by one page * key other than a return is hit, scroll by one page
*/ */
putc(c, stdout); putc(c, stdout);
len++;
} }
fclose(file); fclose(file);
fflush(stdout); fflush(stdout);