=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/screen.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- src/usr.bin/less/screen.c 2014/04/25 13:38:21 1.17 +++ src/usr.bin/less/screen.c 2015/11/05 22:08:44 1.18 @@ -6,8 +6,11 @@ * * For more information, see the README file. */ +/* + * Modified for use with illumos. + * Copyright 2014 Garrett D'Amore + */ - /* * Routines which deal with the characteristics of the terminal. * Uses termcap to be as terminal-independent as possible. @@ -16,149 +19,15 @@ #include "less.h" #include "cmd.h" -#if MSDOS_COMPILER -#include "pckeys.h" -#if MSDOS_COMPILER==MSOFTC -#include -#else -#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC -#include -#if MSDOS_COMPILER==DJGPPC -#include -extern int fd0; -#endif -#else -#if MSDOS_COMPILER==WIN32C -#include -#endif -#endif -#endif -#include - -#else - -#if HAVE_SYS_IOCTL_H -#include -#endif - -#if HAVE_TERMIOS_H && HAVE_TERMIOS_FUNCS #include -#else -#if HAVE_TERMIO_H -#include -#else -#if HAVE_SGSTAT_H -#include -#else -#include -#endif -#endif -#endif +#include -#if HAVE_TERMCAP_H -#include -#endif -#ifdef _OSK -#include -#endif -#if OS2 -#include -#include "pckeys.h" -#endif -#if HAVE_SYS_STREAM_H -#include -#endif -#if HAVE_SYS_PTEM_H -#include -#endif - -#endif /* MSDOS_COMPILER */ - -/* - * Check for broken termios package that forces you to manually - * set the line discipline. - */ -#ifdef __ultrix__ -#define MUST_SET_LINE_DISCIPLINE 1 -#else -#define MUST_SET_LINE_DISCIPLINE 0 -#endif - -#if OS2 -#define DEFAULT_TERM "ansi" -static char *windowid; -#else #define DEFAULT_TERM "unknown" -#endif -#if MSDOS_COMPILER==MSOFTC -static int videopages; -static long msec_loops; -static int flash_created = 0; -#define SETCOLORS(fg,bg) { _settextcolor(fg); _setbkcolor(bg); } -#endif - -#if MSDOS_COMPILER==BORLANDC -static unsigned short *whitescreen; -static int flash_created = 0; -#endif -#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC -#define _settextposition(y,x) gotoxy(x,y) -#define _clearscreen(m) clrscr() -#define _outtext(s) cputs(s) -#define SETCOLORS(fg,bg) { textcolor(fg); textbackground(bg); } -extern int sc_height; -#endif - -#if MSDOS_COMPILER==WIN32C -struct keyRecord -{ - int ascii; - int scan; -} currentKey; - -static int keyCount = 0; -static WORD curr_attr; -static int pending_scancode = 0; -static WORD *whitescreen; - -static HANDLE con_out_save = INVALID_HANDLE_VALUE; /* previous console */ -static HANDLE con_out_ours = INVALID_HANDLE_VALUE; /* our own */ -HANDLE con_out = INVALID_HANDLE_VALUE; /* current console */ - -extern int quitting; -static void win32_init_term(); -static void win32_deinit_term(); - -#define FG_COLORS (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY) -#define BG_COLORS (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE | BACKGROUND_INTENSITY) -#define MAKEATTR(fg,bg) ((WORD)((fg)|((bg)<<4))) -#define SETCOLORS(fg,bg) { curr_attr = MAKEATTR(fg,bg); \ - if (SetConsoleTextAttribute(con_out, curr_attr) == 0) \ - error("SETCOLORS failed"); } -#endif - -#if MSDOS_COMPILER -public int nm_fg_color; /* Color of normal text */ -public int nm_bg_color; -public int bo_fg_color; /* Color of bold text */ -public int bo_bg_color; -public int ul_fg_color; /* Color of underlined text */ -public int ul_bg_color; -public int so_fg_color; /* Color of standout text */ -public int so_bg_color; -public int bl_fg_color; /* Color of blinking text */ -public int bl_bg_color; -static int sy_fg_color; /* Color of system text (before less) */ -static int sy_bg_color; - -#else - /* * Strings passed to tputs() to do various terminal functions. */ static char - *sc_pad, /* Pad string */ *sc_home, /* Cursor home */ *sc_addline, /* Add line, scroll down following lines */ *sc_lower_left, /* Cursor to last line, first column */ @@ -181,47 +50,31 @@ *sc_e_keypad, /* End keypad mode */ *sc_init, /* Startup terminal initialization */ *sc_deinit; /* Exit terminal de-initialization */ -#endif static int init_done = 0; -public int auto_wrap; /* Terminal does \r\n when write past margin */ -public int ignaw; /* Terminal ignores \n immediately after wrap */ -public int erase_char; /* The user's erase char */ -public int erase2_char; /* The user's other erase char */ -public int kill_char; /* The user's line-kill char */ -public int werase_char; /* The user's word-erase char */ -public int sc_width, sc_height; /* Height & width of screen */ -public int bo_s_width, bo_e_width; /* Printing width of boldface seq */ -public int ul_s_width, ul_e_width; /* Printing width of underline seq */ -public int so_s_width, so_e_width; /* Printing width of standout seq */ -public int bl_s_width, bl_e_width; /* Printing width of blink seq */ -public int above_mem, below_mem; /* Memory retained above/below screen */ -public int can_goto_line; /* Can move cursor to any line */ -public int clear_bg; /* Clear fills with background color */ -public int missing_cap = 0; /* Some capability is missing */ +int auto_wrap; /* Terminal does \r\n when write past margin */ +int ignaw; /* Terminal ignores \n immediately after wrap */ +int erase_char; /* The user's erase char */ +int erase2_char; /* The user's other erase char */ +int kill_char; /* The user's line-kill char */ +int werase_char; /* The user's word-erase char */ +int sc_width, sc_height; /* Height & width of screen */ +int bo_s_width, bo_e_width; /* Printing width of boldface seq */ +int ul_s_width, ul_e_width; /* Printing width of underline seq */ +int so_s_width, so_e_width; /* Printing width of standout seq */ +int bl_s_width, bl_e_width; /* Printing width of blink seq */ +int can_goto_line; /* Can move cursor to any line */ +int missing_cap = 0; /* Some capability is missing */ +static int above_mem; /* Memory retained above screen */ +static int below_mem; /* Memory retained below screen */ static int attrmode = AT_NORMAL; extern int binattr; -#if !MSDOS_COMPILER -static char *cheaper(); -static void tmodes(); -#endif +static char *cheaper(char *, char *, char *); +static void tmodes(char *, char *, char **, char **, char *, char *); -/* - * These two variables are sometimes defined in, - * and needed by, the termcap library. - */ -#if MUST_DEFINE_OSPEED -extern short ospeed; /* Terminal output baud rate */ -extern char PC; /* Pad character */ -#endif -#ifdef _OSK -short ospeed; -char PC_, *UP, *BC; -#endif - extern int quiet; /* If VERY_QUIET, use visual bell for bell */ extern int no_back_scroll; extern int swindow; @@ -233,115 +86,45 @@ extern int tty; extern int top_scroll; extern int oldbot; -#if HILITE_SEARCH extern int hilite_search; -#endif -extern char *tgetstr(); -extern char *tgoto(); - - /* * Change terminal to "raw mode", or restore to "normal" mode. - * "Raw mode" means + * "Raw mode" means * 1. An outstanding read will complete on receipt of a single keystroke. - * 2. Input is not echoed. + * 2. Input is not echoed. * 3. On output, \n is mapped to \r\n. * 4. \t is NOT expanded into spaces. * 5. Signal-causing characters such as ctrl-C (interrupt), * etc. are NOT disabled. * It doesn't matter whether an input \n is mapped to \r, or vice versa. */ - public void -raw_mode(on) - int on; +void +raw_mode(int on) { static int curr_on = 0; + struct termios s; + static struct termios save_term; + static int saved_term = 0; if (on == curr_on) return; erase2_char = '\b'; /* in case OS doesn't know about erase2 */ -#if HAVE_TERMIOS_H && HAVE_TERMIOS_FUNCS - { - struct termios s; - static struct termios save_term; - static int saved_term = 0; - if (on) - { + if (on) { /* * Get terminal modes. */ - tcgetattr(tty, &s); + (void) tcgetattr(tty, &s); /* * Save modes and set certain variables dependent on modes. */ - if (!saved_term) - { + if (!saved_term) { save_term = s; saved_term = 1; } -#if HAVE_OSPEED - switch (cfgetospeed(&s)) - { -#ifdef B0 - case B0: ospeed = 0; break; -#endif -#ifdef B50 - case B50: ospeed = 1; break; -#endif -#ifdef B75 - case B75: ospeed = 2; break; -#endif -#ifdef B110 - case B110: ospeed = 3; break; -#endif -#ifdef B134 - case B134: ospeed = 4; break; -#endif -#ifdef B150 - case B150: ospeed = 5; break; -#endif -#ifdef B200 - case B200: ospeed = 6; break; -#endif -#ifdef B300 - case B300: ospeed = 7; break; -#endif -#ifdef B600 - case B600: ospeed = 8; break; -#endif -#ifdef B1200 - case B1200: ospeed = 9; break; -#endif -#ifdef B1800 - case B1800: ospeed = 10; break; -#endif -#ifdef B2400 - case B2400: ospeed = 11; break; -#endif -#ifdef B4800 - case B4800: ospeed = 12; break; -#endif -#ifdef B9600 - case B9600: ospeed = 13; break; -#endif -#ifdef EXTA - case EXTA: ospeed = 14; break; -#endif -#ifdef EXTB - case EXTB: ospeed = 15; break; -#endif -#ifdef B57600 - case B57600: ospeed = 16; break; -#endif -#ifdef B115200 - case B115200: ospeed = 17; break; -#endif - default: ; - } -#endif + erase_char = s.c_cc[VERASE]; #ifdef VERASE2 erase2_char = s.c_cc[VERASE2]; @@ -349,65 +132,18 @@ kill_char = s.c_cc[VKILL]; #ifdef VWERASE werase_char = s.c_cc[VWERASE]; -#else - werase_char = CONTROL('W'); #endif /* * Set the modes to the way we want them. */ - s.c_lflag &= ~(0 -#ifdef ICANON - | ICANON -#endif -#ifdef ECHO - | ECHO -#endif -#ifdef ECHOE - | ECHOE -#endif -#ifdef ECHOK - | ECHOK -#endif -#if ECHONL - | ECHONL -#endif - ); + s.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHOK | ECHONL); - s.c_oflag |= (0 -#ifdef OXTABS - | OXTABS -#else -#ifdef TAB3 - | TAB3 -#else -#ifdef XTABS - | XTABS +#ifndef TAB3 +#define TAB3 0 /* Its a lie, but TAB3 isn't defined by POSIX. */ #endif -#endif -#endif -#ifdef OPOST - | OPOST -#endif -#ifdef ONLCR - | ONLCR -#endif - ); - - s.c_oflag &= ~(0 -#ifdef ONOEOT - | ONOEOT -#endif -#ifdef OCRNL - | OCRNL -#endif -#ifdef ONOCR - | ONOCR -#endif -#ifdef ONLRET - | ONLRET -#endif - ); + s.c_oflag |= (TAB3 | OPOST | ONLCR); + s.c_oflag &= ~(OCRNL | ONOCR | ONLRET); s.c_cc[VMIN] = 1; s.c_cc[VTIME] = 0; #ifdef VLNEXT @@ -416,393 +152,56 @@ #ifdef VDSUSP s.c_cc[VDSUSP] = 0; #endif -#if MUST_SET_LINE_DISCIPLINE + } else { /* - * System's termios is broken; need to explicitly - * request TERMIODISC line discipline. - */ - s.c_line = TERMIODISC; -#endif - } else - { - /* * Restore saved modes. */ s = save_term; } - tcsetattr(tty, TCSASOFT | TCSADRAIN, &s); -#if HAVE_FSYNC - fsync(tty); -#endif -#if MUST_SET_LINE_DISCIPLINE - if (!on) - { - /* - * Broken termios *ignores* any line discipline - * except TERMIODISC. A different old line discipline - * is therefore not restored, yet. Restore the old - * line discipline by hand. - */ - ioctl(tty, TIOCSETD, &save_term.c_line); - } -#endif - } -#else -#ifdef TCGETA - { - struct termio s; - static struct termio save_term; - static int saved_term = 0; - - if (on) - { - /* - * Get terminal modes. - */ - ioctl(tty, TCGETA, &s); - - /* - * Save modes and set certain variables dependent on modes. - */ - if (!saved_term) - { - save_term = s; - saved_term = 1; - } -#if HAVE_OSPEED - ospeed = s.c_cflag & CBAUD; -#endif - erase_char = s.c_cc[VERASE]; - kill_char = s.c_cc[VKILL]; -#ifdef VWERASE - werase_char = s.c_cc[VWERASE]; -#else - werase_char = CONTROL('W'); -#endif - - /* - * Set the modes to the way we want them. - */ - s.c_lflag &= ~(ICANON|ECHO|ECHOE|ECHOK|ECHONL); - s.c_oflag |= (OPOST|ONLCR|TAB3); - s.c_oflag &= ~(OCRNL|ONOCR|ONLRET); - s.c_cc[VMIN] = 1; - s.c_cc[VTIME] = 0; - } else - { - /* - * Restore saved modes. - */ - s = save_term; - } - ioctl(tty, TCSETAW, &s); - } -#else -#ifdef TIOCGETP - { - struct sgttyb s; - static struct sgttyb save_term; - static int saved_term = 0; - - if (on) - { - /* - * Get terminal modes. - */ - ioctl(tty, TIOCGETP, &s); - - /* - * Save modes and set certain variables dependent on modes. - */ - if (!saved_term) - { - save_term = s; - saved_term = 1; - } -#if HAVE_OSPEED - ospeed = s.sg_ospeed; -#endif - erase_char = s.sg_erase; - kill_char = s.sg_kill; - werase_char = CONTROL('W'); - - /* - * Set the modes to the way we want them. - */ - s.sg_flags |= CBREAK; - s.sg_flags &= ~(ECHO|XTABS); - } else - { - /* - * Restore saved modes. - */ - s = save_term; - } - ioctl(tty, TIOCSETN, &s); - } -#else -#ifdef _OSK - { - struct sgbuf s; - static struct sgbuf save_term; - static int saved_term = 0; - - if (on) - { - /* - * Get terminal modes. - */ - _gs_opt(tty, &s); - - /* - * Save modes and set certain variables dependent on modes. - */ - if (!saved_term) - { - save_term = s; - saved_term = 1; - } - erase_char = s.sg_bspch; - kill_char = s.sg_dlnch; - werase_char = CONTROL('W'); - - /* - * Set the modes to the way we want them. - */ - s.sg_echo = 0; - s.sg_eofch = 0; - s.sg_pause = 0; - s.sg_psch = 0; - } else - { - /* - * Restore saved modes. - */ - s = save_term; - } - _ss_opt(tty, &s); - } -#else - /* MS-DOS, Windows, or OS2 */ -#if OS2 - /* OS2 */ - LSIGNAL(SIGINT, SIG_IGN); -#endif - erase_char = '\b'; -#if MSDOS_COMPILER==DJGPPC - kill_char = CONTROL('U'); - /* - * So that when we shell out or run another program, its - * stdin is in cooked mode. We do not switch stdin to binary - * mode if fd0 is zero, since that means we were called before - * tty was reopened in open_getchr, in which case we would be - * changing the original stdin device outside less. - */ - if (fd0 != 0) - setmode(0, on ? O_BINARY : O_TEXT); -#else - kill_char = ESC; -#endif - werase_char = CONTROL('W'); -#endif -#endif -#endif -#endif + (void) tcsetattr(tty, TCSASOFT | TCSADRAIN, &s); + (void) fsync(tty); curr_on = on; } -#if !MSDOS_COMPILER /* * Some glue to prevent calling termcap functions if tgetent() failed. */ static int hardcopy; - static char * -ltget_env(capname) - char *capname; -{ - char name[16]; - char *s; - - s = lgetenv("LESS_TERMCAP_DEBUG"); - if (s != NULL && *s != '\0') - { - struct env { struct env *next; char *name; char *value; }; - static struct env *envs = NULL; - struct env *p; - size_t len; - for (p = envs; p != NULL; p = p->next) - if (strcmp(p->name, capname) == 0) - return p->value; - p = (struct env *) ecalloc(1, sizeof(struct env)); - p->name = save(capname); - len = strlen(capname) + 3; - p->value = (char *) ecalloc(len, sizeof(char)); - snprintf(p->value, len, "<%s>", capname); - p->next = envs; - envs = p; - return p->value; - } - strlcpy(name, "LESS_TERMCAP_", sizeof(name)); - strlcat(name, capname, sizeof(name)); - return (lgetenv(name)); -} - - static int -ltgetflag(capname) - char *capname; -{ - char *s; - - if ((s = ltget_env(capname)) != NULL) - return (*s != '\0' && *s != '0'); - if (hardcopy) - return (0); - return (tgetflag(capname)); -} - - static int -ltgetnum(capname) - char *capname; -{ - char *s; - - if ((s = ltget_env(capname)) != NULL) - return (atoi(s)); - if (hardcopy) - return (-1); - return (tgetnum(capname)); -} - - static char * -ltgetstr(capname, pp) - char *capname; - char **pp; -{ - char *s; - - if ((s = ltget_env(capname)) != NULL) - return (s); - if (hardcopy) - return (NULL); - return (tgetstr(capname, pp)); -} -#endif /* MSDOS_COMPILER */ - /* * Get size of the output screen. */ - public void -scrsize() +static void +scrsize(void) { - register char *s; + char *s; int sys_height; int sys_width; -#if !MSDOS_COMPILER int n; +#ifdef TIOCGWINSIZE + struct winsize w; #endif #define DEF_SC_WIDTH 80 -#if MSDOS_COMPILER -#define DEF_SC_HEIGHT 25 -#else #define DEF_SC_HEIGHT 24 -#endif - sys_width = sys_height = 0; -#if MSDOS_COMPILER==MSOFTC - { - struct videoconfig w; - _getvideoconfig(&w); - sys_height = w.numtextrows; - sys_width = w.numtextcols; +#ifdef TIOCGWINSIZE + if (ioctl(2, TIOCGWINSZ, &w) == 0) { + if (w.ws_row > 0) + sys_height = w.ws_row; + if (w.ws_col > 0) + sys_width = w.ws_col; } -#else -#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - { - struct text_info w; - gettextinfo(&w); - sys_height = w.screenheight; - sys_width = w.screenwidth; - } -#else -#if MSDOS_COMPILER==WIN32C - { - CONSOLE_SCREEN_BUFFER_INFO scr; - GetConsoleScreenBufferInfo(con_out, &scr); - sys_height = scr.srWindow.Bottom - scr.srWindow.Top + 1; - sys_width = scr.srWindow.Right - scr.srWindow.Left + 1; - } -#else -#if OS2 - { - int s[2]; - _scrsize(s); - sys_width = s[0]; - sys_height = s[1]; - /* - * When using terminal emulators for XFree86/OS2, the - * _scrsize function does not work well. - * Call the scrsize.exe program to get the window size. - */ - windowid = getenv("WINDOWID"); - if (windowid != NULL) - { - FILE *fd = popen("scrsize", "rt"); - if (fd != NULL) - { - int w, h; - fscanf(fd, "%i %i", &w, &h); - if (w > 0 && h > 0) - { - sys_width = w; - sys_height = h; - } - pclose(fd); - } - } - } -#else -#ifdef TIOCGWINSZ - { - struct winsize w; - if (ioctl(2, TIOCGWINSZ, &w) == 0) - { - if (w.ws_row > 0) - sys_height = w.ws_row; - if (w.ws_col > 0) - sys_width = w.ws_col; - } - } -#else -#ifdef WIOCGETD - { - struct uwdata w; - if (ioctl(2, WIOCGETD, &w) == 0) - { - if (w.uw_height > 0) - sys_height = w.uw_height / w.uw_vs; - if (w.uw_width > 0) - sys_width = w.uw_width / w.uw_hs; - } - } #endif -#endif -#endif -#endif -#endif -#endif if (sys_height > 0) sc_height = sys_height; else if ((s = lgetenv("LINES")) != NULL) sc_height = atoi(s); -#if !MSDOS_COMPILER - else if ((n = ltgetnum("li")) > 0) - sc_height = n; -#endif + else if (!hardcopy && (n = lines) > 0) + sc_height = n; if (sc_height <= 0) sc_height = DEF_SC_HEIGHT; @@ -810,239 +209,57 @@ sc_width = sys_width; else if ((s = lgetenv("COLUMNS")) != NULL) sc_width = atoi(s); -#if !MSDOS_COMPILER - else if ((n = ltgetnum("co")) > 0) - sc_width = n; -#endif + else if (!hardcopy && (n = columns) > 0) + sc_width = n; if (sc_width <= 0) sc_width = DEF_SC_WIDTH; } -#if MSDOS_COMPILER==MSOFTC /* - * Figure out how many empty loops it takes to delay a millisecond. - */ - static void -get_clock() -{ - clock_t start; - - /* - * Get synchronized at the start of a tick. - */ - start = clock(); - while (clock() == start) - ; - /* - * Now count loops till the next tick. - */ - start = clock(); - msec_loops = 0; - while (clock() == start) - msec_loops++; - /* - * Convert from (loops per clock) to (loops per millisecond). - */ - msec_loops *= CLOCKS_PER_SEC; - msec_loops /= 1000; -} - -/* - * Delay for a specified number of milliseconds. - */ - static void -dummy_func() -{ - static long delay_dummy = 0; - delay_dummy++; -} - - static void -delay(msec) - int msec; -{ - long i; - - while (msec-- > 0) - { - for (i = 0; i < msec_loops; i++) - { - /* - * Make it look like we're doing something here, - * so the optimizer doesn't remove the whole loop. - */ - dummy_func(); - } - } -} -#endif - -/* * Return the characters actually input by a "special" key. */ - public char * -special_key_str(key) - int key; +char * +special_key_str(int key) { - static char tbuf[40]; char *s; -#if MSDOS_COMPILER || OS2 - static char k_right[] = { '\340', PCK_RIGHT, 0 }; - static char k_left[] = { '\340', PCK_LEFT, 0 }; - static char k_ctl_right[] = { '\340', PCK_CTL_RIGHT, 0 }; - static char k_ctl_left[] = { '\340', PCK_CTL_LEFT, 0 }; - static char k_insert[] = { '\340', PCK_INSERT, 0 }; - static char k_delete[] = { '\340', PCK_DELETE, 0 }; - static char k_ctl_delete[] = { '\340', PCK_CTL_DELETE, 0 }; - static char k_ctl_backspace[] = { '\177', 0 }; - static char k_home[] = { '\340', PCK_HOME, 0 }; - static char k_end[] = { '\340', PCK_END, 0 }; - static char k_up[] = { '\340', PCK_UP, 0 }; - static char k_down[] = { '\340', PCK_DOWN, 0 }; - static char k_backtab[] = { '\340', PCK_SHIFT_TAB, 0 }; - static char k_pagedown[] = { '\340', PCK_PAGEDOWN, 0 }; - static char k_pageup[] = { '\340', PCK_PAGEUP, 0 }; - static char k_f1[] = { '\340', PCK_F1, 0 }; -#endif -#if !MSDOS_COMPILER - char *sp = tbuf; -#endif + static char ctrlk[] = { CONTROL('K'), 0 }; - switch (key) - { -#if OS2 - /* - * If windowid is not NULL, assume less is executed in - * the XFree86 environment. - */ + if (hardcopy) + return (NULL); + + switch (key) { case SK_RIGHT_ARROW: - s = windowid ? ltgetstr("kr", &sp) : k_right; + s = key_right; break; case SK_LEFT_ARROW: - s = windowid ? ltgetstr("kl", &sp) : k_left; + s = key_left; break; case SK_UP_ARROW: - s = windowid ? ltgetstr("ku", &sp) : k_up; + s = key_up; break; case SK_DOWN_ARROW: - s = windowid ? ltgetstr("kd", &sp) : k_down; + s = key_down; break; case SK_PAGE_UP: - s = windowid ? ltgetstr("kP", &sp) : k_pageup; + s = key_ppage; break; case SK_PAGE_DOWN: - s = windowid ? ltgetstr("kN", &sp) : k_pagedown; + s = key_npage; break; case SK_HOME: - s = windowid ? ltgetstr("kh", &sp) : k_home; + s = key_home; break; case SK_END: - s = windowid ? ltgetstr("@7", &sp) : k_end; + s = key_end; break; case SK_DELETE: - if (windowid) - { - s = ltgetstr("kD", &sp); - if (s == NULL) - { - tbuf[0] = '\177'; - tbuf[1] = '\0'; - s = tbuf; - } - } else - s = k_delete; - break; -#endif -#if MSDOS_COMPILER - case SK_RIGHT_ARROW: - s = k_right; - break; - case SK_LEFT_ARROW: - s = k_left; - break; - case SK_UP_ARROW: - s = k_up; - break; - case SK_DOWN_ARROW: - s = k_down; - break; - case SK_PAGE_UP: - s = k_pageup; - break; - case SK_PAGE_DOWN: - s = k_pagedown; - break; - case SK_HOME: - s = k_home; - break; - case SK_END: - s = k_end; - break; - case SK_DELETE: - s = k_delete; - break; -#endif -#if MSDOS_COMPILER || OS2 - case SK_INSERT: - s = k_insert; - break; - case SK_CTL_LEFT_ARROW: - s = k_ctl_left; - break; - case SK_CTL_RIGHT_ARROW: - s = k_ctl_right; - break; - case SK_CTL_BACKSPACE: - s = k_ctl_backspace; - break; - case SK_CTL_DELETE: - s = k_ctl_delete; - break; - case SK_F1: - s = k_f1; - break; - case SK_BACKTAB: - s = k_backtab; - break; -#else - case SK_RIGHT_ARROW: - s = ltgetstr("kr", &sp); - break; - case SK_LEFT_ARROW: - s = ltgetstr("kl", &sp); - break; - case SK_UP_ARROW: - s = ltgetstr("ku", &sp); - break; - case SK_DOWN_ARROW: - s = ltgetstr("kd", &sp); - break; - case SK_PAGE_UP: - s = ltgetstr("kP", &sp); - break; - case SK_PAGE_DOWN: - s = ltgetstr("kN", &sp); - break; - case SK_HOME: - s = ltgetstr("kh", &sp); - break; - case SK_END: - s = ltgetstr("@7", &sp); - break; - case SK_DELETE: - s = ltgetstr("kD", &sp); - if (s == NULL) - { - tbuf[0] = '\177'; - tbuf[1] = '\0'; - s = tbuf; + s = key_dc; + if (s == NULL) { + s = "\177\0"; } break; -#endif case SK_CONTROL_K: - tbuf[0] = CONTROL('K'); - tbuf[1] = '\0'; - s = tbuf; + s = ctrlk; break; default: return (NULL); @@ -1053,106 +270,24 @@ /* * Get terminal capabilities via termcap. */ - public void -get_term() +void +get_term(void) { -#if MSDOS_COMPILER - auto_wrap = 1; - ignaw = 0; - can_goto_line = 1; - clear_bg = 1; - /* - * Set up default colors. - * The xx_s_width and xx_e_width vars are already initialized to 0. - */ -#if MSDOS_COMPILER==MSOFTC - sy_bg_color = _getbkcolor(); - sy_fg_color = _gettextcolor(); - get_clock(); -#else -#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - { - struct text_info w; - gettextinfo(&w); - sy_bg_color = (w.attribute >> 4) & 0x0F; - sy_fg_color = (w.attribute >> 0) & 0x0F; - } -#else -#if MSDOS_COMPILER==WIN32C - { - DWORD nread; - CONSOLE_SCREEN_BUFFER_INFO scr; - - con_out_save = con_out = GetStdHandle(STD_OUTPUT_HANDLE); - /* - * Always open stdin in binary. Note this *must* be done - * before any file operations have been done on fd0. - */ - SET_BINARY(0); - GetConsoleScreenBufferInfo(con_out, &scr); - ReadConsoleOutputAttribute(con_out, &curr_attr, - 1, scr.dwCursorPosition, &nread); - sy_bg_color = (curr_attr & BG_COLORS) >> 4; /* normalize */ - sy_fg_color = curr_attr & FG_COLORS; - } -#endif -#endif -#endif - nm_fg_color = sy_fg_color; - nm_bg_color = sy_bg_color; - bo_fg_color = 11; - bo_bg_color = 0; - ul_fg_color = 9; - ul_bg_color = 0; - so_fg_color = 15; - so_bg_color = 9; - bl_fg_color = 15; - bl_bg_color = 0; - - /* - * Get size of the screen. - */ - scrsize(); - pos_init(); - - -#else /* !MSDOS_COMPILER */ - - char *sp; - register char *t1, *t2; + char *t1, *t2; char *term; - char termbuf[TERMBUF_SIZE]; - static char sbuf[TERMSBUF_SIZE]; - -#if OS2 /* - * Make sure the termcap database is available. - */ - sp = lgetenv("TERMCAP"); - if (sp == NULL || *sp == '\0') - { - char *termcap; - if ((sp = homefile("termcap.dat")) != NULL) - { - size_t len = strlen(sp) + 9; - termcap = (char *) ecalloc(len, sizeof(char)); - snprintf(termcap, len, "TERMCAP=%s", sp); - free(sp); - putenv(termcap); - } - } -#endif - /* * Find out what kind of terminal this is. */ - if ((term = lgetenv("TERM")) == NULL) - term = DEFAULT_TERM; + if ((term = lgetenv("TERM")) == NULL) + term = DEFAULT_TERM; hardcopy = 0; - if (tgetent(termbuf, term) != TGETENT_OK) - hardcopy = 1; - if (ltgetflag("hc")) + + if (setupterm(term, 1, NULL) < 0) { hardcopy = 1; + } + if (hard_copy == 1) + hardcopy = 1; /* * Get size of the screen. @@ -1160,11 +295,10 @@ scrsize(); pos_init(); - auto_wrap = ltgetflag("am"); - ignaw = ltgetflag("xn"); - above_mem = ltgetflag("da"); - below_mem = ltgetflag("db"); - clear_bg = ltgetflag("ut"); + auto_wrap = hardcopy ? 0 : auto_right_margin; + ignaw = hardcopy ? 0 : eat_newline_glitch; + above_mem = hardcopy ? 0 : memory_above; + below_mem = hardcopy ? 0 : memory_below; /* * Assumes termcap variable "sg" is the printing width of: @@ -1172,7 +306,7 @@ * the underline sequence, the end underline sequence, * the boldface sequence, and the end boldface sequence. */ - if ((so_s_width = ltgetnum("sg")) < 0) + if (hardcopy || (so_s_width = magic_cookie_glitch) < 0) so_s_width = 0; so_e_width = so_s_width; @@ -1180,110 +314,93 @@ ul_s_width = ul_e_width = so_s_width; bl_s_width = bl_e_width = so_s_width; -#if HILITE_SEARCH if (so_s_width > 0 || so_e_width > 0) /* * Disable highlighting by default on magic cookie terminals. * Turning on highlighting might change the displayed width * of a line, causing the display to get messed up. - * The user can turn it back on with -g, + * The user can turn it back on with -g, * but she won't like the results. */ hilite_search = 0; -#endif /* * Get various string-valued capabilities. */ - sp = sbuf; -#if HAVE_OSPEED - sc_pad = ltgetstr("pc", &sp); - if (sc_pad != NULL) - PC = *sc_pad; -#endif - - sc_s_keypad = ltgetstr("ks", &sp); - if (sc_s_keypad == NULL) + sc_s_keypad = keypad_xmit; + if (hardcopy || sc_s_keypad == NULL) sc_s_keypad = ""; - sc_e_keypad = ltgetstr("ke", &sp); - if (sc_e_keypad == NULL) + sc_e_keypad = keypad_local; + if (hardcopy || sc_e_keypad == NULL) sc_e_keypad = ""; - - sc_init = ltgetstr("ti", &sp); - if (sc_init == NULL) + + sc_init = enter_ca_mode; + if (hardcopy || sc_init == NULL) sc_init = ""; - sc_deinit= ltgetstr("te", &sp); - if (sc_deinit == NULL) + sc_deinit = exit_ca_mode; + if (hardcopy || sc_deinit == NULL) sc_deinit = ""; - sc_eol_clear = ltgetstr("ce", &sp); - if (sc_eol_clear == NULL || *sc_eol_clear == '\0') - { + sc_eol_clear = clr_eol; + if (hardcopy || sc_eol_clear == NULL || *sc_eol_clear == '\0') { missing_cap = 1; sc_eol_clear = ""; } - sc_eos_clear = ltgetstr("cd", &sp); - if (below_mem && (sc_eos_clear == NULL || *sc_eos_clear == '\0')) - { + sc_eos_clear = clr_eos; + if (below_mem && + (hardcopy || sc_eos_clear == NULL || *sc_eos_clear == '\0')) { missing_cap = 1; sc_eos_clear = ""; } - sc_clear = ltgetstr("cl", &sp); - if (sc_clear == NULL || *sc_clear == '\0') - { + sc_clear = clear_screen; + if (hardcopy || sc_clear == NULL || *sc_clear == '\0') { missing_cap = 1; sc_clear = "\n\n"; } - sc_move = ltgetstr("cm", &sp); - if (sc_move == NULL || *sc_move == '\0') - { + sc_move = cursor_address; + if (hardcopy || sc_move == NULL || *sc_move == '\0') { /* - * This is not an error here, because we don't + * This is not an error here, because we don't * always need sc_move. * We need it only if we don't have home or lower-left. */ sc_move = ""; can_goto_line = 0; - } else + } else { can_goto_line = 1; + } - tmodes("so", "se", &sc_s_in, &sc_s_out, "", "", &sp); - tmodes("us", "ue", &sc_u_in, &sc_u_out, sc_s_in, sc_s_out, &sp); - tmodes("md", "me", &sc_b_in, &sc_b_out, sc_s_in, sc_s_out, &sp); - tmodes("mb", "me", &sc_bl_in, &sc_bl_out, sc_s_in, sc_s_out, &sp); + tmodes(enter_standout_mode, exit_standout_mode, &sc_s_in, &sc_s_out, + "", ""); + tmodes(enter_underline_mode, exit_underline_mode, &sc_u_in, &sc_u_out, + sc_s_in, sc_s_out); + tmodes(enter_bold_mode, exit_attribute_mode, &sc_b_in, &sc_b_out, + sc_s_in, sc_s_out); + tmodes(enter_blink_mode, exit_attribute_mode, &sc_bl_in, &sc_bl_out, + sc_s_in, sc_s_out); - sc_visual_bell = ltgetstr("vb", &sp); - if (sc_visual_bell == NULL) + sc_visual_bell = flash_screen; + if (hardcopy || sc_visual_bell == NULL) sc_visual_bell = ""; - if (ltgetflag("bs")) - sc_backspace = "\b"; - else - { - sc_backspace = ltgetstr("bc", &sp); - if (sc_backspace == NULL || *sc_backspace == '\0') - sc_backspace = "\b"; - } + sc_backspace = "\b"; /* * Choose between using "ho" and "cm" ("home" and "cursor move") * to move the cursor to the upper left corner of the screen. */ - t1 = ltgetstr("ho", &sp); - if (t1 == NULL) + t1 = cursor_home; + if (hardcopy || t1 == NULL) t1 = ""; - if (*sc_move == '\0') + if (*sc_move == '\0') { t2 = ""; - else - { - strlcpy(sp, tgoto(sc_move, 0, 0), sbuf + sizeof(sbuf) - sp); - t2 = sp; - sp += strlen(sp) + 1; + } else { + t2 = estrdup(tparm(sc_move, 0, 0, 0, 0, 0, 0, 0, 0, 0)); } sc_home = cheaper(t1, t2, "|\b^"); @@ -1291,57 +408,46 @@ * Choose between using "ll" and "cm" ("lower left" and "cursor move") * to move the cursor to the lower left corner of the screen. */ - t1 = ltgetstr("ll", &sp); - if (t1 == NULL) + t1 = cursor_to_ll; + if (hardcopy || t1 == NULL) t1 = ""; - if (*sc_move == '\0') + if (*sc_move == '\0') { t2 = ""; - else - { - strlcpy(sp, tgoto(sc_move, 0, sc_height-1), - sbuf + sizeof(sbuf) - sp); - t2 = sp; - sp += strlen(sp) + 1; + } else { + t2 = estrdup(tparm(sc_move, sc_height-1, + 0, 0, 0, 0, 0, 0, 0, 0)); } sc_lower_left = cheaper(t1, t2, "\r"); /* * Get carriage return string. */ - sc_return = ltgetstr("cr", &sp); - if (sc_return == NULL) + sc_return = carriage_return; + if (hardcopy || sc_return == NULL) sc_return = "\r"; /* - * Choose between using "al" or "sr" ("add line" or "scroll reverse") + * Choose between using insert_line or scroll_reverse * to add a line at the top of the screen. */ - t1 = ltgetstr("al", &sp); - if (t1 == NULL) + t1 = insert_line; + if (hardcopy || t1 == NULL) t1 = ""; - t2 = ltgetstr("sr", &sp); - if (t2 == NULL) + t2 = scroll_reverse; + if (hardcopy || t2 == NULL) t2 = ""; -#if OS2 - if (*t1 == '\0' && *t2 == '\0') - sc_addline = ""; - else -#endif if (above_mem) sc_addline = t1; else sc_addline = cheaper(t1, t2, ""); - if (*sc_addline == '\0') - { + if (*sc_addline == '\0') { /* * Force repaint on any backward movement. */ no_back_scroll = 1; } -#endif /* MSDOS_COMPILER */ } -#if !MSDOS_COMPILER /* * Return the cost of displaying a termcap string. * We use the trick of calling tputs, but as a char printing function @@ -1351,36 +457,30 @@ */ static int costcount; -/*ARGSUSED*/ - static int -inc_costcount(c) - int c; +static int +inc_costcount(int c) { costcount++; return (c); } - static int -cost(t) - char *t; +static int +cost(char *t) { costcount = 0; - tputs(t, sc_height, inc_costcount); + (void) tputs(t, sc_height, inc_costcount); return (costcount); } /* * Return the "best" of the two given termcap strings. - * The best, if both exist, is the one with the lower + * The best, if both exist, is the one with the lower * cost (see cost() function). */ - static char * -cheaper(t1, t2, def) - char *t1, *t2; - char *def; +static char * +cheaper(char *t1, char *t2, char *def) { - if (*t1 == '\0' && *t2 == '\0') - { + if (*t1 == '\0' && *t2 == '\0') { missing_cap = 1; return (def); } @@ -1393,156 +493,50 @@ return (t2); } - static void -tmodes(incap, outcap, instr, outstr, def_instr, def_outstr, spp) - char *incap; - char *outcap; - char **instr; - char **outstr; - char *def_instr; - char *def_outstr; - char **spp; +static void +tmodes(char *incap, char *outcap, char **instr, char **outstr, + char *def_instr, char *def_outstr) { - *instr = ltgetstr(incap, spp); - if (*instr == NULL) - { + if (hardcopy) { + *instr = ""; + *outstr = ""; + return; + } + + *instr = incap; + *outstr = outcap; + + if (*instr == NULL) { /* Use defaults. */ *instr = def_instr; *outstr = def_outstr; return; } - *outstr = ltgetstr(outcap, spp); if (*outstr == NULL) - /* No specific out capability; use "me". */ - *outstr = ltgetstr("me", spp); + /* No specific out capability; use exit_attribute_mode. */ + *outstr = exit_attribute_mode; if (*outstr == NULL) - /* Don't even have "me"; use a null string. */ + /* Don't even have that, use an empty string */ *outstr = ""; } -#endif /* MSDOS_COMPILER */ - - /* - * Below are the functions which perform all the + * Below are the functions which perform all the * terminal-specific screen manipulation. */ - -#if MSDOS_COMPILER - -#if MSDOS_COMPILER==WIN32C - static void -_settextposition(int row, int col) -{ - COORD cpos; - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo(con_out, &csbi); - cpos.X = csbi.srWindow.Left + (col - 1); - cpos.Y = csbi.srWindow.Top + (row - 1); - SetConsoleCursorPosition(con_out, cpos); -} -#endif - /* - * Initialize the screen to the correct color at startup. - */ - static void -initcolor() -{ - SETCOLORS(nm_fg_color, nm_bg_color); -#if 0 - /* - * This clears the screen at startup. This is different from - * the behavior of other versions of less. Disable it for now. - */ - char *blanks; - int row; - int col; - - /* - * Create a complete, blank screen using "normal" colors. - */ - SETCOLORS(nm_fg_color, nm_bg_color); - blanks = (char *) ecalloc(width+1, sizeof(char)); - for (col = 0; col < sc_width; col++) - blanks[col] = ' '; - blanks[sc_width] = '\0'; - for (row = 0; row < sc_height; row++) - _outtext(blanks); - free(blanks); -#endif -} -#endif - -#if MSDOS_COMPILER==WIN32C - -/* - * Termcap-like init with a private win32 console. - */ - static void -win32_init_term() -{ - CONSOLE_SCREEN_BUFFER_INFO scr; - COORD size; - - if (con_out_save == INVALID_HANDLE_VALUE) - return; - - GetConsoleScreenBufferInfo(con_out_save, &scr); - - if (con_out_ours == INVALID_HANDLE_VALUE) - { - /* - * Create our own screen buffer, so that we - * may restore the original when done. - */ - con_out_ours = CreateConsoleScreenBuffer( - GENERIC_WRITE | GENERIC_READ, - FILE_SHARE_WRITE | FILE_SHARE_READ, - (LPSECURITY_ATTRIBUTES) NULL, - CONSOLE_TEXTMODE_BUFFER, - (LPVOID) NULL); - } - - size.X = scr.srWindow.Right - scr.srWindow.Left + 1; - size.Y = scr.srWindow.Bottom - scr.srWindow.Top + 1; - SetConsoleScreenBufferSize(con_out_ours, size); - SetConsoleActiveScreenBuffer(con_out_ours); - con_out = con_out_ours; -} - -/* - * Restore the startup console. - */ -static void -win32_deinit_term() -{ - if (con_out_save == INVALID_HANDLE_VALUE) - return; - if (quitting) - (void) CloseHandle(con_out_ours); - SetConsoleActiveScreenBuffer(con_out_save); - con_out = con_out_save; -} - -#endif - -/* * Initialize terminal */ - public void -init() +void +init(void) { -#if !MSDOS_COMPILER if (!no_init) - tputs(sc_init, sc_height, putchr); + (void) tputs(sc_init, sc_height, putchr); if (!no_keypad) - tputs(sc_s_keypad, sc_height, putchr); - if (top_scroll) - { + (void) tputs(sc_s_keypad, sc_height, putchr); + if (top_scroll) { int i; /* @@ -1552,511 +546,99 @@ * screen to ourself. */ for (i = 1; i < sc_height; i++) - putchr('\n'); + (void) putchr('\n'); } else line_left(); -#else -#if MSDOS_COMPILER==WIN32C - if (!no_init) - win32_init_term(); -#endif - initcolor(); - flush(); -#endif init_done = 1; } /* * Deinitialize terminal */ - public void -deinit() +void +deinit(void) { if (!init_done) return; -#if !MSDOS_COMPILER if (!no_keypad) - tputs(sc_e_keypad, sc_height, putchr); + (void) tputs(sc_e_keypad, sc_height, putchr); if (!no_init) - tputs(sc_deinit, sc_height, putchr); -#else - /* Restore system colors. */ - SETCOLORS(sy_fg_color, sy_bg_color); -#if MSDOS_COMPILER==WIN32C - if (!no_init) - win32_deinit_term(); -#else - /* Need clreol to make SETCOLORS take effect. */ - clreol(); -#endif -#endif + (void) tputs(sc_deinit, sc_height, putchr); init_done = 0; } /* * Home cursor (move to upper left corner of screen). */ - public void -home() +void +home(void) { -#if !MSDOS_COMPILER - tputs(sc_home, 1, putchr); -#else - flush(); - _settextposition(1,1); -#endif + (void) tputs(sc_home, 1, putchr); } /* * Add a blank line (called with cursor at home). * Should scroll the display down. */ - public void -add_line() +void +add_line(void) { -#if !MSDOS_COMPILER - tputs(sc_addline, sc_height, putchr); -#else - flush(); -#if MSDOS_COMPILER==MSOFTC - _scrolltextwindow(_GSCROLLDOWN); - _settextposition(1,1); -#else -#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - movetext(1,1, sc_width,sc_height-1, 1,2); - gotoxy(1,1); - clreol(); -#else -#if MSDOS_COMPILER==WIN32C - { - CHAR_INFO fillchar; - SMALL_RECT rcSrc, rcClip; - COORD new_org; - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo(con_out,&csbi); - - /* The clip rectangle is the entire visible screen. */ - rcClip.Left = csbi.srWindow.Left; - rcClip.Top = csbi.srWindow.Top; - rcClip.Right = csbi.srWindow.Right; - rcClip.Bottom = csbi.srWindow.Bottom; - - /* The source rectangle is the visible screen minus the last line. */ - rcSrc = rcClip; - rcSrc.Bottom--; - - /* Move the top left corner of the source window down one row. */ - new_org.X = rcSrc.Left; - new_org.Y = rcSrc.Top + 1; - - /* Fill the right character and attributes. */ - fillchar.Char.AsciiChar = ' '; - curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); - fillchar.Attributes = curr_attr; - ScrollConsoleScreenBuffer(con_out, &rcSrc, &rcClip, new_org, &fillchar); - _settextposition(1,1); - } -#endif -#endif -#endif -#endif + (void) tputs(sc_addline, sc_height, putchr); } -#if 0 /* - * Remove the n topmost lines and scroll everything below it in the - * window upward. This is needed to stop leaking the topmost line - * into the scrollback buffer when we go down-one-line (in WIN32). - */ - public void -remove_top(n) - int n; -{ -#if MSDOS_COMPILER==WIN32C - SMALL_RECT rcSrc, rcClip; - CHAR_INFO fillchar; - COORD new_org; - CONSOLE_SCREEN_BUFFER_INFO csbi; /* to get buffer info */ - - if (n >= sc_height - 1) - { - clear(); - home(); - return; - } - - flush(); - - GetConsoleScreenBufferInfo(con_out, &csbi); - - /* Get the extent of all-visible-rows-but-the-last. */ - rcSrc.Left = csbi.srWindow.Left; - rcSrc.Top = csbi.srWindow.Top + n; - rcSrc.Right = csbi.srWindow.Right; - rcSrc.Bottom = csbi.srWindow.Bottom; - - /* Get the clip rectangle. */ - rcClip.Left = rcSrc.Left; - rcClip.Top = csbi.srWindow.Top; - rcClip.Right = rcSrc.Right; - rcClip.Bottom = rcSrc.Bottom ; - - /* Move the source window up n rows. */ - new_org.X = rcSrc.Left; - new_org.Y = rcSrc.Top - n; - - /* Fill the right character and attributes. */ - fillchar.Char.AsciiChar = ' '; - curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); - fillchar.Attributes = curr_attr; - - ScrollConsoleScreenBuffer(con_out, &rcSrc, &rcClip, new_org, &fillchar); - - /* Position cursor on first blank line. */ - goto_line(sc_height - n - 1); -#endif -} -#endif - -#if MSDOS_COMPILER==WIN32C -/* - * Clear the screen. - */ - static void -win32_clear() -{ - /* - * This will clear only the currently visible rows of the NT - * console buffer, which means none of the precious scrollback - * rows are touched making for faster scrolling. Note that, if - * the window has fewer columns than the console buffer (i.e. - * there is a horizontal scrollbar as well), the entire width - * of the visible rows will be cleared. - */ - COORD topleft; - DWORD nchars; - DWORD winsz; - CONSOLE_SCREEN_BUFFER_INFO csbi; - - /* get the number of cells in the current buffer */ - GetConsoleScreenBufferInfo(con_out, &csbi); - winsz = csbi.dwSize.X * (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); - topleft.X = 0; - topleft.Y = csbi.srWindow.Top; - - curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); - FillConsoleOutputCharacter(con_out, ' ', winsz, topleft, &nchars); - FillConsoleOutputAttribute(con_out, curr_attr, winsz, topleft, &nchars); -} - -/* - * Remove the n topmost lines and scroll everything below it in the - * window upward. - */ - public void -win32_scroll_up(n) - int n; -{ - SMALL_RECT rcSrc, rcClip; - CHAR_INFO fillchar; - COORD topleft; - COORD new_org; - DWORD nchars; - DWORD size; - CONSOLE_SCREEN_BUFFER_INFO csbi; - - if (n <= 0) - return; - - if (n >= sc_height - 1) - { - win32_clear(); - _settextposition(1,1); - return; - } - - /* Get the extent of what will remain visible after scrolling. */ - GetConsoleScreenBufferInfo(con_out, &csbi); - rcSrc.Left = csbi.srWindow.Left; - rcSrc.Top = csbi.srWindow.Top + n; - rcSrc.Right = csbi.srWindow.Right; - rcSrc.Bottom = csbi.srWindow.Bottom; - - /* Get the clip rectangle. */ - rcClip.Left = rcSrc.Left; - rcClip.Top = csbi.srWindow.Top; - rcClip.Right = rcSrc.Right; - rcClip.Bottom = rcSrc.Bottom ; - - /* Move the source text to the top of the screen. */ - new_org.X = rcSrc.Left; - new_org.Y = rcClip.Top; - - /* Fill the right character and attributes. */ - fillchar.Char.AsciiChar = ' '; - fillchar.Attributes = MAKEATTR(nm_fg_color, nm_bg_color); - - /* Scroll the window. */ - SetConsoleTextAttribute(con_out, fillchar.Attributes); - ScrollConsoleScreenBuffer(con_out, &rcSrc, &rcClip, new_org, &fillchar); - - /* Clear remaining lines at bottom. */ - topleft.X = csbi.dwCursorPosition.X; - topleft.Y = rcSrc.Bottom - n; - size = (n * csbi.dwSize.X) + (rcSrc.Right - topleft.X); - FillConsoleOutputCharacter(con_out, ' ', size, topleft, - &nchars); - FillConsoleOutputAttribute(con_out, fillchar.Attributes, size, topleft, - &nchars); - SetConsoleTextAttribute(con_out, curr_attr); - - /* Move cursor n lines up from where it was. */ - csbi.dwCursorPosition.Y -= n; - SetConsoleCursorPosition(con_out, csbi.dwCursorPosition); -} -#endif - -/* * Move cursor to lower left corner of screen. */ - public void -lower_left() +void +lower_left(void) { -#if !MSDOS_COMPILER - tputs(sc_lower_left, 1, putchr); -#else - flush(); - _settextposition(sc_height, 1); -#endif + (void) tputs(sc_lower_left, 1, putchr); } /* * Move cursor to left position of current line. */ - public void -line_left() +void +line_left(void) { -#if !MSDOS_COMPILER - tputs(sc_return, 1, putchr); -#else - int row; - flush(); -#if MSDOS_COMPILER==WIN32C - { - CONSOLE_SCREEN_BUFFER_INFO scr; - GetConsoleScreenBufferInfo(con_out, &scr); - row = scr.dwCursorPosition.Y - scr.srWindow.Top + 1; - } -#else -#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - row = wherey(); -#else - { - struct rccoord tpos = _gettextposition(); - row = tpos.row; - } -#endif -#endif - _settextposition(row, 1); -#endif + (void) tputs(sc_return, 1, putchr); } /* - * Check if the console size has changed and reset internals - * (in lieu of SIGWINCH for WIN32). - */ - public void -check_winch() -{ -#if MSDOS_COMPILER==WIN32C - CONSOLE_SCREEN_BUFFER_INFO scr; - COORD size; - - if (con_out == INVALID_HANDLE_VALUE) - return; - - flush(); - GetConsoleScreenBufferInfo(con_out, &scr); - size.Y = scr.srWindow.Bottom - scr.srWindow.Top + 1; - size.X = scr.srWindow.Right - scr.srWindow.Left + 1; - if (size.Y != sc_height || size.X != sc_width) - { - sc_height = size.Y; - sc_width = size.X; - if (!no_init && con_out_ours == con_out) - SetConsoleScreenBufferSize(con_out, size); - pos_init(); - wscroll = (sc_height + 1) / 2; - screen_trashed = 1; - } -#endif -} - -/* * Goto a specific line on the screen. */ - public void -goto_line(slinenum) - int slinenum; +void +goto_line(int slinenum) { -#if !MSDOS_COMPILER - tputs(tgoto(sc_move, 0, slinenum), 1, putchr); -#else - flush(); - _settextposition(slinenum+1, 1); -#endif + (void) tputs(tparm(sc_move, slinenum, 0, 0, 0, 0, 0, 0, 0, 0), 1, + putchr); } -#if MSDOS_COMPILER==MSOFTC || MSDOS_COMPILER==BORLANDC /* - * Create an alternate screen which is all white. - * This screen is used to create a "flash" effect, by displaying it - * briefly and then switching back to the normal screen. - * {{ Yuck! There must be a better way to get a visual bell. }} - */ - static void -create_flash() -{ -#if MSDOS_COMPILER==MSOFTC - struct videoconfig w; - char *blanks; - int row, col; - - _getvideoconfig(&w); - videopages = w.numvideopages; - if (videopages < 2) - { - at_enter(AT_STANDOUT); - at_exit(); - } else - { - _setactivepage(1); - at_enter(AT_STANDOUT); - blanks = (char *) ecalloc(w.numtextcols, sizeof(char)); - for (col = 0; col < w.numtextcols; col++) - blanks[col] = ' '; - for (row = w.numtextrows; row > 0; row--) - _outmem(blanks, w.numtextcols); - _setactivepage(0); - _setvisualpage(0); - free(blanks); - at_exit(); - } -#else -#if MSDOS_COMPILER==BORLANDC - register int n; - - whitescreen = (unsigned short *) - malloc(sc_width * sc_height * sizeof(short)); - if (whitescreen == NULL) - return; - for (n = 0; n < sc_width * sc_height; n++) - whitescreen[n] = 0x7020; -#else -#if MSDOS_COMPILER==WIN32C - register int n; - - whitescreen = (WORD *) - malloc(sc_height * sc_width * sizeof(WORD)); - if (whitescreen == NULL) - return; - /* Invert the standard colors. */ - for (n = 0; n < sc_width * sc_height; n++) - whitescreen[n] = (WORD)((nm_fg_color << 4) | nm_bg_color); -#endif -#endif -#endif - flash_created = 1; -} -#endif /* MSDOS_COMPILER */ - -/* * Output the "visual bell", if there is one. */ - public void -vbell() +void +vbell(void) { -#if !MSDOS_COMPILER if (*sc_visual_bell == '\0') return; - tputs(sc_visual_bell, sc_height, putchr); -#else -#if MSDOS_COMPILER==DJGPPC - ScreenVisualBell(); -#else -#if MSDOS_COMPILER==MSOFTC - /* - * Create a flash screen on the second video page. - * Switch to that page, then switch back. - */ - if (!flash_created) - create_flash(); - if (videopages < 2) - return; - _setvisualpage(1); - delay(100); - _setvisualpage(0); -#else -#if MSDOS_COMPILER==BORLANDC - unsigned short *currscreen; - - /* - * Get a copy of the current screen. - * Display the flash screen. - * Then restore the old screen. - */ - if (!flash_created) - create_flash(); - if (whitescreen == NULL) - return; - currscreen = (unsigned short *) - malloc(sc_width * sc_height * sizeof(short)); - if (currscreen == NULL) return; - gettext(1, 1, sc_width, sc_height, currscreen); - puttext(1, 1, sc_width, sc_height, whitescreen); - delay(100); - puttext(1, 1, sc_width, sc_height, currscreen); - free(currscreen); -#else -#if MSDOS_COMPILER==WIN32C - /* paint screen with an inverse color */ - clear(); - - /* leave it displayed for 100 msec. */ - Sleep(100); - - /* restore with a redraw */ - repaint(); -#endif -#endif -#endif -#endif -#endif + (void) tputs(sc_visual_bell, sc_height, putchr); } /* * Make a noise. */ - static void -beep() +static void +beep(void) { -#if !MSDOS_COMPILER - putchr(CONTROL('G')); -#else -#if MSDOS_COMPILER==WIN32C - MessageBeep(0); -#else - write(STDOUT_FILENO, "\7", 1); -#endif -#endif + (void) putchr(CONTROL('G')); } /* * Ring the terminal bell. */ - public void -bell() +void +ring_bell(void) { if (quiet == VERY_QUIET) vbell(); @@ -2067,103 +649,41 @@ /* * Clear the screen. */ - public void -clear() +void +do_clear(void) { -#if !MSDOS_COMPILER - tputs(sc_clear, sc_height, putchr); -#else - flush(); -#if MSDOS_COMPILER==WIN32C - win32_clear(); -#else - _clearscreen(_GCLEARSCREEN); -#endif -#endif + (void) tputs(sc_clear, sc_height, putchr); } /* * Clear from the cursor to the end of the cursor's line. * {{ This must not move the cursor. }} */ - public void -clear_eol() +void +clear_eol(void) { -#if !MSDOS_COMPILER - tputs(sc_eol_clear, 1, putchr); -#else -#if MSDOS_COMPILER==MSOFTC - short top, left; - short bot, right; - struct rccoord tpos; - - flush(); - /* - * Save current state. - */ - tpos = _gettextposition(); - _gettextwindow(&top, &left, &bot, &right); - /* - * Set a temporary window to the current line, - * from the cursor's position to the right edge of the screen. - * Then clear that window. - */ - _settextwindow(tpos.row, tpos.col, tpos.row, sc_width); - _clearscreen(_GWINDOW); - /* - * Restore state. - */ - _settextwindow(top, left, bot, right); - _settextposition(tpos.row, tpos.col); -#else -#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - flush(); - clreol(); -#else -#if MSDOS_COMPILER==WIN32C - DWORD nchars; - COORD cpos; - CONSOLE_SCREEN_BUFFER_INFO scr; - - flush(); - memset(&scr, 0, sizeof(scr)); - GetConsoleScreenBufferInfo(con_out, &scr); - cpos.X = scr.dwCursorPosition.X; - cpos.Y = scr.dwCursorPosition.Y; - curr_attr = MAKEATTR(nm_fg_color, nm_bg_color); - FillConsoleOutputAttribute(con_out, curr_attr, - scr.dwSize.X - cpos.X, cpos, &nchars); - FillConsoleOutputCharacter(con_out, ' ', - scr.dwSize.X - cpos.X, cpos, &nchars); -#endif -#endif -#endif -#endif + (void) tputs(sc_eol_clear, 1, putchr); } /* * Clear the current line. * Clear the screen if there's off-screen memory below the display. */ - static void -clear_eol_bot() +static void +clear_eol_bot(void) { -#if MSDOS_COMPILER - clear_eol(); -#else if (below_mem) - tputs(sc_eos_clear, 1, putchr); + (void) tputs(sc_eos_clear, 1, putchr); else - tputs(sc_eol_clear, 1, putchr); -#endif + (void) tputs(sc_eol_clear, 1, putchr); } /* * Clear the bottom line of the display. * Leave the cursor at the beginning of the bottom line. */ - public void -clear_bot() +void +clear_bot(void) { /* * If we're in a non-normal attribute mode, temporarily exit @@ -2187,84 +707,54 @@ } } - public void -at_enter(attr) - int attr; +void +at_enter(int attr) { attr = apply_at_specials(attr); -#if !MSDOS_COMPILER /* The one with the most priority is last. */ if (attr & AT_UNDERLINE) - tputs(sc_u_in, 1, putchr); + (void) tputs(sc_u_in, 1, putchr); if (attr & AT_BOLD) - tputs(sc_b_in, 1, putchr); + (void) tputs(sc_b_in, 1, putchr); if (attr & AT_BLINK) - tputs(sc_bl_in, 1, putchr); + (void) tputs(sc_bl_in, 1, putchr); if (attr & AT_STANDOUT) - tputs(sc_s_in, 1, putchr); -#else - flush(); - /* The one with the most priority is first. */ - if (attr & AT_STANDOUT) - { - SETCOLORS(so_fg_color, so_bg_color); - } else if (attr & AT_BLINK) - { - SETCOLORS(bl_fg_color, bl_bg_color); - } - else if (attr & AT_BOLD) - { - SETCOLORS(bo_fg_color, bo_bg_color); - } - else if (attr & AT_UNDERLINE) - { - SETCOLORS(ul_fg_color, ul_bg_color); - } -#endif + (void) tputs(sc_s_in, 1, putchr); attrmode = attr; } - public void -at_exit() +void +at_exit(void) { -#if !MSDOS_COMPILER /* Undo things in the reverse order we did them. */ if (attrmode & AT_STANDOUT) - tputs(sc_s_out, 1, putchr); + (void) tputs(sc_s_out, 1, putchr); if (attrmode & AT_BLINK) - tputs(sc_bl_out, 1, putchr); + (void) tputs(sc_bl_out, 1, putchr); if (attrmode & AT_BOLD) - tputs(sc_b_out, 1, putchr); + (void) tputs(sc_b_out, 1, putchr); if (attrmode & AT_UNDERLINE) - tputs(sc_u_out, 1, putchr); -#else - flush(); - SETCOLORS(nm_fg_color, nm_bg_color); -#endif + (void) tputs(sc_u_out, 1, putchr); attrmode = AT_NORMAL; } - public void -at_switch(attr) - int attr; +void +at_switch(int attr) { int new_attrmode = apply_at_specials(attr); int ignore_modes = AT_ANSI; - if ((new_attrmode & ~ignore_modes) != (attrmode & ~ignore_modes)) - { + if ((new_attrmode & ~ignore_modes) != (attrmode & ~ignore_modes)) { at_exit(); at_enter(attr); } } - public int -is_at_equiv(attr1, attr2) - int attr1; - int attr2; +int +is_at_equiv(int attr1, int attr2) { attr1 = apply_at_specials(attr1); attr2 = apply_at_specials(attr2); @@ -2272,9 +762,8 @@ return (attr1 == attr2); } - public int -apply_at_specials(attr) - int attr; +int +apply_at_specials(int attr) { if (attr & AT_BINARY) attr |= binattr; @@ -2282,224 +771,14 @@ attr |= AT_STANDOUT; attr &= ~(AT_BINARY|AT_HILITE); - return attr; + return (attr); } -#if 0 /* No longer used */ /* - * Erase the character to the left of the cursor - * and move the cursor left. - */ - public void -backspace() -{ -#if !MSDOS_COMPILER - /* - * Erase the previous character by overstriking with a space. - */ - tputs(sc_backspace, 1, putchr); - putchr(' '); - tputs(sc_backspace, 1, putchr); -#else -#if MSDOS_COMPILER==MSOFTC - struct rccoord tpos; - - flush(); - tpos = _gettextposition(); - if (tpos.col <= 1) - return; - _settextposition(tpos.row, tpos.col-1); - _outtext(" "); - _settextposition(tpos.row, tpos.col-1); -#else -#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - cputs("\b"); -#else -#if MSDOS_COMPILER==WIN32C - COORD cpos; - DWORD cChars; - CONSOLE_SCREEN_BUFFER_INFO scr; - - flush(); - GetConsoleScreenBufferInfo(con_out, &scr); - cpos = scr.dwCursorPosition; - if (cpos.X <= 0) - return; - cpos.X--; - SetConsoleCursorPosition(con_out, cpos); - FillConsoleOutputCharacter(con_out, (TCHAR)' ', 1, cpos, &cChars); - SetConsoleCursorPosition(con_out, cpos); -#endif -#endif -#endif -#endif -} -#endif /* 0 */ - -/* * Output a plain backspace, without erasing the previous char. */ - public void -putbs() +void +putbs(void) { -#if !MSDOS_COMPILER - tputs(sc_backspace, 1, putchr); -#else - int row, col; - - flush(); - { -#if MSDOS_COMPILER==MSOFTC - struct rccoord tpos; - tpos = _gettextposition(); - row = tpos.row; - col = tpos.col; -#else -#if MSDOS_COMPILER==BORLANDC || MSDOS_COMPILER==DJGPPC - row = wherey(); - col = wherex(); -#else -#if MSDOS_COMPILER==WIN32C - CONSOLE_SCREEN_BUFFER_INFO scr; - GetConsoleScreenBufferInfo(con_out, &scr); - row = scr.dwCursorPosition.Y - scr.srWindow.Top + 1; - col = scr.dwCursorPosition.X - scr.srWindow.Left + 1; -#endif -#endif -#endif - } - if (col <= 1) - return; - _settextposition(row, col-1); -#endif /* MSDOS_COMPILER */ + (void) tputs(sc_backspace, 1, putchr); } - -#if MSDOS_COMPILER==WIN32C -/* - * Determine whether an input character is waiting to be read. - */ - static int -win32_kbhit(tty) - HANDLE tty; -{ - INPUT_RECORD ip; - DWORD read; - - if (keyCount > 0) - return (TRUE); - - currentKey.ascii = 0; - currentKey.scan = 0; - - /* - * Wait for a real key-down event, but - * ignore SHIFT and CONTROL key events. - */ - do - { - PeekConsoleInput(tty, &ip, 1, &read); - if (read == 0) - return (FALSE); - ReadConsoleInput(tty, &ip, 1, &read); - } while (ip.EventType != KEY_EVENT || - ip.Event.KeyEvent.bKeyDown != TRUE || - ip.Event.KeyEvent.wVirtualScanCode == 0 || - ip.Event.KeyEvent.wVirtualKeyCode == VK_SHIFT || - ip.Event.KeyEvent.wVirtualKeyCode == VK_CONTROL || - ip.Event.KeyEvent.wVirtualKeyCode == VK_MENU); - - currentKey.ascii = ip.Event.KeyEvent.uChar.AsciiChar; - currentKey.scan = ip.Event.KeyEvent.wVirtualScanCode; - keyCount = ip.Event.KeyEvent.wRepeatCount; - - if (ip.Event.KeyEvent.dwControlKeyState & - (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) - { - switch (currentKey.scan) - { - case PCK_ALT_E: /* letter 'E' */ - currentKey.ascii = 0; - break; - } - } else if (ip.Event.KeyEvent.dwControlKeyState & - (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) - { - switch (currentKey.scan) - { - case PCK_RIGHT: /* right arrow */ - currentKey.scan = PCK_CTL_RIGHT; - break; - case PCK_LEFT: /* left arrow */ - currentKey.scan = PCK_CTL_LEFT; - break; - case PCK_DELETE: /* delete */ - currentKey.scan = PCK_CTL_DELETE; - break; - } - } - return (TRUE); -} - -/* - * Read a character from the keyboard. - */ - public char -WIN32getch(tty) - int tty; -{ - int ascii; - - if (pending_scancode) - { - pending_scancode = 0; - return ((char)(currentKey.scan & 0x00FF)); - } - - while (win32_kbhit((HANDLE)tty) == FALSE) - { - Sleep(20); - if (ABORT_SIGS()) - return ('\003'); - continue; - } - keyCount --; - ascii = currentKey.ascii; - /* - * On PC's, the extended keys return a 2 byte sequence beginning - * with '00', so if the ascii code is 00, the next byte will be - * the lsb of the scan code. - */ - pending_scancode = (ascii == 0x00); - return ((char)ascii); -} -#endif - -#if MSDOS_COMPILER -/* - */ - public void -WIN32setcolors(fg, bg) - int fg; - int bg; -{ - SETCOLORS(fg, bg); -} - -/* - */ - public void -WIN32textout(text, len) - char *text; - int len; -{ -#if MSDOS_COMPILER==WIN32C - DWORD written; - WriteConsole(con_out, text, len, &written, NULL); -#else - char c = text[len]; - text[len] = '\0'; - cputs(text); - text[len] = c; -#endif -} -#endif