--- lbbs/src/screen.c 2005/03/19 13:34:20 1.9 +++ lbbs/src/screen.c 2005/03/20 17:37:14 1.11 @@ -82,23 +82,23 @@ press_any_key () } void -set_input_echo(int echo) +set_input_echo (int echo) { char temp[256]; if (echo) - { - outc ('\x83'); // ASCII code 131 - iflush (); - } + { + outc ('\x83'); // ASCII code 131 + iflush (); + } else - { + { // outc ('\x85'); // ASCII code 133 - prints ("\xff\xfb\x01\xff\xfb\x03"); - iflush (); - igetch (); - igetch (); - } + prints ("\xff\xfb\x01\xff\xfb\x03"); + iflush (); + igetch (); + igetch (); + } } int @@ -114,7 +114,7 @@ str_input (char *buffer, int buffer_leng if (c == CR) break; if (c == LF) - continue; + continue; if (c == BACKSPACE) { if (offset > 0) @@ -169,25 +169,26 @@ display_file (const char *filename) FILE *fin; int i; - if ((fin = fopen (filename, "r")) != NULL) - { - while (fgets (buffer, 255, fin)) - { - i = strlen (buffer); - if (buffer[i - 1] == '\n' && buffer[i - 2] != '\r') - { - buffer[i - 1] = '\r'; - buffer[i] = '\n'; - buffer[i + 1] = '\0'; - } - prints (buffer); - iflush (); - } - fclose(fin); - return 0; - } - - return -1; + if ((fin = fopen (filename, "r")) == NULL) + { + return -1; + } + + while (fgets (buffer, 255, fin)) + { + i = strlen (buffer); + if (buffer[i - 1] == '\n' && buffer[i - 2] != '\r') + { + buffer[i - 1] = '\r'; + buffer[i] = '\n'; + buffer[i + 1] = '\0'; + } + prints (buffer); + iflush (); + } + fclose (fin); + + return 0; } int @@ -195,7 +196,7 @@ display_file_ex (const char *filename, i { char buffer[260], temp[256]; int i, ch, input_ok; - long int line, c_line_begin = 0, c_line_total=0; + long int line, c_line_begin = 0, c_line_total = 0; long int f_line, f_size, f_offset; FILE *fin; struct stat f_stat; @@ -214,7 +215,7 @@ display_file_ex (const char *filename, i f_size = f_stat.st_size; while (fgets (buffer, 255, fin)) - c_line_total ++; + c_line_total++; rewind (fin); while (fgets (buffer, 255, fin)) @@ -226,7 +227,7 @@ display_file_ex (const char *filename, i moveto (screen_lines, 0); prints ("\033[1;44;32m下面还有喔 (%d%%)\033[33m │ 结束 ← │ ↑/↓/PgUp/PgDn 移动 │ ? 辅助说明 │ \033[m", - (f_offset-strlen(buffer)) * 100 / f_size); + (f_offset - strlen (buffer)) * 100 / f_size); iflush (); input_ok = 0; @@ -282,8 +283,10 @@ display_file_ex (const char *filename, i case Ctrl ('F'): case KEY_SPACE: c_line_begin += (screen_lines - begin_line - 1); - if (c_line_begin + (screen_lines - begin_line) > c_line_total) - c_line_begin = c_line_total - (screen_lines - begin_line); + if (c_line_begin + (screen_lines - begin_line) > + c_line_total) + c_line_begin = + c_line_total - (screen_lines - begin_line); rewind (fin); for (f_line = 0; f_line < c_line_begin; f_line++) { @@ -338,9 +341,9 @@ display_file_ex (const char *filename, i line++; } if (wait) - ch = press_any_key(); + ch = press_any_key (); else - ch = 0; + ch = 0; exit: fclose (fin);