* Makefile.tpl (RANLIB): Define.

[deliverable/binutils-gdb.git] / readline / terminal.c

diff --git a/readline/terminal.c b/readline/terminal.c
index 627a3854392b9898d1f6949ca99ac8c68a335c54..ea3270e9683e02bfc54caa34b7922fc9f4c25eb6 100644 (file)
--- a/readline/terminal.c
+++ b/readline/terminal.c
@@ -7,7 +7,7 @@
 
    The GNU Readline Library is free software; you can redistribute it
    and/or modify it under the terms of the GNU General Public License
 
    The GNU Readline Library is free software; you can redistribute it
    and/or modify it under the terms of the GNU General Public License

-   as published by the Free Software Foundation; either version 1, or
+   as published by the Free Software Foundation; either version 2, or

    (at your option) any later version.
 
    The GNU Readline Library is distributed in the hope that it will be
    (at your option) any later version.
 
    The GNU Readline Library is distributed in the hope that it will be


@@ -18,7 +18,7 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,

-   675 Mass Ave, Cambridge, MA 02139, USA. */
+   59 Temple Place, Suite 330, Boston, MA 02111 USA. */

 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)


@@ -46,9 +46,7 @@
 #  include <locale.h>
 #endif
 
 #  include <locale.h>
 #endif
 

-#include <signal.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <setjmp.h>

 
 /* System-specific feature definitions and include files. */
 #include "rldefs.h"
 
 /* System-specific feature definitions and include files. */
 #include "rldefs.h"


@@ -57,8 +55,8 @@
 #  include <sys/ioctl.h>
 #endif /* GWINSZ_IN_SYS_IOCTL && !TIOCGWINSZ */
 
 #  include <sys/ioctl.h>
 #endif /* GWINSZ_IN_SYS_IOCTL && !TIOCGWINSZ */
 

-#if defined (__GO32__)
-#  include <pc.h>
+#ifdef __MSDOS__
+# include <pc.h>

 #endif
 
 #include "rltty.h"
 #endif
 
 #include "rltty.h"


@@ -68,21 +66,12 @@
 #include "readline.h"
 #include "history.h"
 
 #include "readline.h"
 #include "history.h"
 

-/* Variables and functions imported from readline.c */
-extern FILE *_rl_in_stream, *_rl_out_stream;
-extern int readline_echoing_p;
-extern int _rl_bell_preference;
-extern Keymap _rl_keymap;
+#include "rlprivate.h"
+#include "rlshell.h"
+#include "xmalloc.h"

 
 

-/* Functions imported from bind.c */
-extern void _rl_bind_if_unbound ();
-
-/* Functions imported from shell.c */
-extern void set_lines_and_columns ();
-extern char *get_env_value ();
-
-/* Functions imported from display.c */
-extern void _rl_redisplay_after_sigwinch ();
+#define CUSTOM_REDISPLAY_FUNC() (rl_redisplay_function != rl_redisplay)
+#define CUSTOM_INPUT_FUNC() (rl_getc_function != rl_getc)

 
 /* **************************************************************** */
 /*                                                                 */
 
 /* **************************************************************** */
 /*                                                                 */


@@ -90,13 +79,13 @@ extern void _rl_redisplay_after_sigwinch ();
 /*                                                                 */
 /* **************************************************************** */
 
 /*                                                                 */
 /* **************************************************************** */
 

-#ifndef __DJGPP__
+#ifndef __MSDOS__

 static char *term_buffer = (char *)NULL;
 static char *term_string_buffer = (char *)NULL;
 
 /* Non-zero means this terminal can't really do anything. */
 static int dumb_term;
 static char *term_buffer = (char *)NULL;
 static char *term_string_buffer = (char *)NULL;
 
 /* Non-zero means this terminal can't really do anything. */
 static int dumb_term;

-#endif
+#endif /* !__MSDOS__ */

 
 static int tcap_initialized;
 
 
 static int tcap_initialized;
 


@@ -108,27 +97,36 @@ char PC, *BC, *UP;
 #endif /* __linux__ */
 
 /* Some strings to control terminal actions.  These are output by tputs (). */
 #endif /* __linux__ */
 
 /* Some strings to control terminal actions.  These are output by tputs (). */

-char *term_goto, *term_clreol, *term_cr, *term_clrpag, *term_backspace;
-char *term_pc;
+char *_rl_term_clreol;
+char *_rl_term_clrpag;
+char *_rl_term_cr;
+char *_rl_term_backspace;
+char *_rl_term_goto;
+char *_rl_term_pc;

 
 /* Non-zero if we determine that the terminal can do character insertion. */
 
 /* Non-zero if we determine that the terminal can do character insertion. */

-int terminal_can_insert = 0;
+int _rl_terminal_can_insert = 0;

 
 /* How to insert characters. */
 
 /* How to insert characters. */

-char *term_im, *term_ei, *term_ic, *term_ip, *term_IC;
+char *_rl_term_im;
+char *_rl_term_ei;
+char *_rl_term_ic;
+char *_rl_term_ip;
+char *_rl_term_IC;

 
 /* How to delete characters. */
 
 /* How to delete characters. */

-char *term_dc, *term_DC;
+char *_rl_term_dc;
+char *_rl_term_DC;

 
 #if defined (HACK_TERMCAP_MOTION)
 
 #if defined (HACK_TERMCAP_MOTION)

-char *term_forward_char;
+char *_rl_term_forward_char;

 #endif  /* HACK_TERMCAP_MOTION */
 
 /* How to go up a line. */
 #endif  /* HACK_TERMCAP_MOTION */
 
 /* How to go up a line. */

-char *term_up;
+char *_rl_term_up;

 
 

-/* A visible bell, if the terminal can be made to flash the screen. */
-static char *visible_bell;
+/* A visible bell; char if the terminal can be made to flash the screen. */
+static char *_rl_visible_bell;

 
 /* Non-zero means the terminal can auto-wrap lines. */
 int _rl_term_autowrap;
 
 /* Non-zero means the terminal can auto-wrap lines. */
 int _rl_term_autowrap;


@@ -137,20 +135,36 @@ int _rl_term_autowrap;
 static int term_has_meta;
 
 /* The sequences to write to turn on and off the meta key, if this
 static int term_has_meta;
 
 /* The sequences to write to turn on and off the meta key, if this

-   terminal    has one. */
-static char *term_mm, *term_mo;
+   terminal has one. */
+static char *_rl_term_mm;
+static char *_rl_term_mo;

 
 /* The key sequences output by the arrow keys, if this terminal has any. */
 
 /* The key sequences output by the arrow keys, if this terminal has any. */

-static char *term_ku, *term_kd, *term_kr, *term_kl;
+static char *_rl_term_ku;
+static char *_rl_term_kd;
+static char *_rl_term_kr;
+static char *_rl_term_kl;

 
 /* How to initialize and reset the arrow keys, if this terminal has any. */
 
 /* How to initialize and reset the arrow keys, if this terminal has any. */

-static char *term_ks, *term_ke;
+static char *_rl_term_ks;
+static char *_rl_term_ke;

 
 /* The key sequences sent by the Home and End keys, if any. */
 
 /* The key sequences sent by the Home and End keys, if any. */

-static char *term_kh, *term_kH;
+static char *_rl_term_kh;
+static char *_rl_term_kH;
+static char *_rl_term_at7;     /* @7 */
+
+/* Insert key */
+static char *_rl_term_kI;
+
+/* Cursor control */
+static char *_rl_term_vs;      /* very visible */
+static char *_rl_term_ve;      /* normal */
+
+static void bind_termcap_arrow_keys PARAMS((Keymap));

 
 /* Variables that hold the screen dimensions, used by the display code. */
 
 /* Variables that hold the screen dimensions, used by the display code. */

-int screenwidth, screenheight, screenchars;
+int _rl_screenwidth, _rl_screenheight, _rl_screenchars;

 
 /* Non-zero means the user wants to enable the keypad. */
 int _rl_enable_keypad;
 
 /* Non-zero means the user wants to enable the keypad. */
 int _rl_enable_keypad;


@@ -158,6 +172,22 @@ int _rl_enable_keypad;
 /* Non-zero means the user wants to enable a meta key. */
 int _rl_enable_meta = 1;
 
 /* Non-zero means the user wants to enable a meta key. */
 int _rl_enable_meta = 1;
 

+#if defined (__EMX__)
+static void
+_emx_get_screensize (swp, shp)
+     int *swp, *shp;
+{
+  int sz[2];
+
+  _scrsize (sz);
+
+  if (swp)
+    *swp = sz[0];
+  if (shp)
+    *shp = sz[1];
+}
+#endif
+

 /* Get readline's idea of the screen size.  TTY is a file descriptor open
    to the terminal.  If IGNORE_ENV is true, we do not pay attention to the
    values of $LINES and $COLUMNS.  The tests for TERM_STRING_BUFFER being
 /* Get readline's idea of the screen size.  TTY is a file descriptor open
    to the terminal.  If IGNORE_ENV is true, we do not pay attention to the
    values of $LINES and $COLUMNS.  The tests for TERM_STRING_BUFFER being


@@ -170,100 +200,111 @@ _rl_get_screen_size (tty, ignore_env)
 #if defined (TIOCGWINSZ)
   struct winsize window_size;
 #endif /* TIOCGWINSZ */
 #if defined (TIOCGWINSZ)
   struct winsize window_size;
 #endif /* TIOCGWINSZ */

-#if defined (__EMX__)
-  int sz[2];
-#endif

 
 #if defined (TIOCGWINSZ)
   if (ioctl (tty, TIOCGWINSZ, &window_size) == 0)
     {
 
 #if defined (TIOCGWINSZ)
   if (ioctl (tty, TIOCGWINSZ, &window_size) == 0)
     {

-      screenwidth = (int) window_size.ws_col;
-      screenheight = (int) window_size.ws_row;
+      _rl_screenwidth = (int) window_size.ws_col;
+      _rl_screenheight = (int) window_size.ws_row;

     }
 #endif /* TIOCGWINSZ */
 
 #if defined (__EMX__)
     }
 #endif /* TIOCGWINSZ */
 
 #if defined (__EMX__)

-  _scrsize (sz);
-  screenwidth = sz[0];
-  screenheight = sz[1];
+  _emx_get_screensize (&_rl_screenwidth, &_rl_screenheight);

 #endif
 
   /* Environment variable COLUMNS overrides setting of "co" if IGNORE_ENV
      is unset. */
 #endif
 
   /* Environment variable COLUMNS overrides setting of "co" if IGNORE_ENV
      is unset. */

-  if (screenwidth <= 0)
+  if (_rl_screenwidth <= 0)

     {
     {

-      if (ignore_env == 0 && (ss = get_env_value ("COLUMNS")))
-       screenwidth = atoi (ss);
+      if (ignore_env == 0 && (ss = sh_get_env_value ("COLUMNS")))
+       _rl_screenwidth = atoi (ss);

 
 

-#if defined(__DJGPP__)
-      tty = tty;
-      if (screenwidth <= 0)
-       screenwidth = ScreenCols ();
-#else
-      if (screenwidth <= 0 && term_string_buffer)
-       screenwidth = tgetnum ("co");
+#if !defined (__DJGPP__)
+      if (_rl_screenwidth <= 0 && term_string_buffer)
+       _rl_screenwidth = tgetnum ("co");

 #endif
     }
 
   /* Environment variable LINES overrides setting of "li" if IGNORE_ENV
      is unset. */
 #endif
     }
 
   /* Environment variable LINES overrides setting of "li" if IGNORE_ENV
      is unset. */

-  if (screenheight <= 0)
+  if (_rl_screenheight <= 0)

     {
     {

-      if (ignore_env == 0 && (ss = get_env_value ("LINES")))
-       screenheight = atoi (ss);
+      if (ignore_env == 0 && (ss = sh_get_env_value ("LINES")))
+       _rl_screenheight = atoi (ss);

 
 

-#if defined(__DJGPP__)
-      if (screenheight <= 0)
-       screenheight = ScreenRows ();
-#else
-      if (screenheight <= 0 && term_string_buffer)
-       screenheight = tgetnum ("li");
+#if !defined (__DJGPP__)
+      if (_rl_screenheight <= 0 && term_string_buffer)
+       _rl_screenheight = tgetnum ("li");

 #endif
     }
 
   /* If all else fails, default to 80x24 terminal. */
 #endif
     }
 
   /* If all else fails, default to 80x24 terminal. */

-  if (screenwidth <= 1)
-    screenwidth = 80;
+  if (_rl_screenwidth <= 1)
+    _rl_screenwidth = 80;

 
 

-  if (screenheight <= 0)
-    screenheight = 24;
+  if (_rl_screenheight <= 0)
+    _rl_screenheight = 24;

 
   /* If we're being compiled as part of bash, set the environment
      variables $LINES and $COLUMNS to new values.  Otherwise, just
      do a pair of putenv () or setenv () calls. */
 
   /* If we're being compiled as part of bash, set the environment
      variables $LINES and $COLUMNS to new values.  Otherwise, just
      do a pair of putenv () or setenv () calls. */

-  set_lines_and_columns (screenheight, screenwidth);
+  sh_set_lines_and_columns (_rl_screenheight, _rl_screenwidth);

 
 

-  if (!_rl_term_autowrap)
-    screenwidth--;
+  if (_rl_term_autowrap == 0)
+    _rl_screenwidth--;

 
 

-  screenchars = screenwidth * screenheight;
+  _rl_screenchars = _rl_screenwidth * _rl_screenheight;

 }
 
 void
 _rl_set_screen_size (rows, cols)
      int rows, cols;
 {
 }
 
 void
 _rl_set_screen_size (rows, cols)
      int rows, cols;
 {

-  screenheight = rows;
-  screenwidth = cols;
+  if (rows == 0 || cols == 0)
+    return;
+
+  _rl_screenheight = rows;
+  _rl_screenwidth = cols;

 
   if (_rl_term_autowrap == 0)
 
   if (_rl_term_autowrap == 0)

-    screenwidth--;
+    _rl_screenwidth--;

 
 

-  screenchars = screenwidth * screenheight;
+  _rl_screenchars = _rl_screenwidth * _rl_screenheight;

 }
 
 }
 

+void
+rl_set_screen_size (rows, cols)
+     int rows, cols;
+{
+  _rl_set_screen_size (rows, cols);
+}
+
+void
+rl_get_screen_size (rows, cols)
+     int *rows, *cols;
+{
+  if (rows)
+    *rows = _rl_screenheight;
+  if (cols)
+    *cols = _rl_screenwidth;
+}
+     

 void
 rl_resize_terminal ()
 {
   if (readline_echoing_p)
     {
       _rl_get_screen_size (fileno (rl_instream), 1);
 void
 rl_resize_terminal ()
 {
   if (readline_echoing_p)
     {
       _rl_get_screen_size (fileno (rl_instream), 1);

-      _rl_redisplay_after_sigwinch ();
+      if (CUSTOM_REDISPLAY_FUNC ())
+       rl_forced_update_display ();
+      else
+       _rl_redisplay_after_sigwinch ();

     }
 }
 
 struct _tc_string {
     }
 }
 
 struct _tc_string {

-     char *tc_var;
+     const char *tc_var;

      char **tc_value;
 };
 
      char **tc_value;
 };
 


@@ -271,32 +312,36 @@ struct _tc_string {
    search algorithm to something smarter. */
 static struct _tc_string tc_strings[] =
 {
    search algorithm to something smarter. */
 static struct _tc_string tc_strings[] =
 {

-  "DC", &term_DC,
-  "IC", &term_IC,
-  "ce", &term_clreol,
-  "cl", &term_clrpag,
-  "cr", &term_cr,
-  "dc", &term_dc,
-  "ei", &term_ei,
-  "ic", &term_ic,
-  "im", &term_im,
-  "kd", &term_kd,
-  "kh", &term_kh,      /* home */
-  "kH", &term_kH,      /* end */
-  "kl", &term_kl,
-  "kr", &term_kr,
-  "ku", &term_ku,
-  "ks", &term_ks,
-  "ke", &term_ke,
-  "le", &term_backspace,
-  "mm", &term_mm,
-  "mo", &term_mo,
+  { "@7", &_rl_term_at7 },
+  { "DC", &_rl_term_DC },
+  { "IC", &_rl_term_IC },
+  { "ce", &_rl_term_clreol },
+  { "cl", &_rl_term_clrpag },
+  { "cr", &_rl_term_cr },
+  { "dc", &_rl_term_dc },
+  { "ei", &_rl_term_ei },
+  { "ic", &_rl_term_ic },
+  { "im", &_rl_term_im },
+  { "kH", &_rl_term_kH },      /* home down ?? */
+  { "kI", &_rl_term_kI },      /* insert */
+  { "kd", &_rl_term_kd },
+  { "ke", &_rl_term_ke },      /* end keypad mode */
+  { "kh", &_rl_term_kh },      /* home */
+  { "kl", &_rl_term_kl },
+  { "kr", &_rl_term_kr },
+  { "ks", &_rl_term_ks },      /* start keypad mode */
+  { "ku", &_rl_term_ku },
+  { "le", &_rl_term_backspace },
+  { "mm", &_rl_term_mm },
+  { "mo", &_rl_term_mo },

 #if defined (HACK_TERMCAP_MOTION)
 #if defined (HACK_TERMCAP_MOTION)

-  "nd", &term_forward_char,
+  { "nd", &_rl_term_forward_char },

 #endif
 #endif

-  "pc", &term_pc,
-  "up", &term_up,
-  "vb", &visible_bell,
+  { "pc", &_rl_term_pc },
+  { "up", &_rl_term_up },
+  { "vb", &_rl_visible_bell },
+  { "vs", &_rl_term_vs },
+  { "ve", &_rl_term_ve },

 };
 
 #define NUM_TC_STRINGS (sizeof (tc_strings) / sizeof (struct _tc_string))
 };
 
 #define NUM_TC_STRINGS (sizeof (tc_strings) / sizeof (struct _tc_string))


@@ -307,77 +352,109 @@ static void
 get_term_capabilities (bp)
      char **bp;
 {
 get_term_capabilities (bp)
      char **bp;
 {

-#if defined(__DJGPP__)
-  bp = bp;
-#else
+#if !defined (__DJGPP__)       /* XXX - doesn't DJGPP have a termcap library? */

   register int i;
 
   for (i = 0; i < NUM_TC_STRINGS; i++)
   register int i;
 
   for (i = 0; i < NUM_TC_STRINGS; i++)

+#  ifdef __LCC__
+    *(tc_strings[i].tc_value) = tgetstr ((char *)tc_strings[i].tc_var, bp);
+#  else

     *(tc_strings[i].tc_value) = tgetstr (tc_strings[i].tc_var, bp);
     *(tc_strings[i].tc_value) = tgetstr (tc_strings[i].tc_var, bp);

+#  endif

 #endif
   tcap_initialized = 1;
 }
 
 int
 _rl_init_terminal_io (terminal_name)
 #endif
   tcap_initialized = 1;
 }
 
 int
 _rl_init_terminal_io (terminal_name)

-     char *terminal_name;
+     const char *terminal_name;

 {
 {

-#if defined (__GO32__)
-  terminal_name = terminal_name;
-  screenwidth = screenheight = 0;
-  _rl_get_screen_size (rl_instream ? fileno (rl_instream) : 0, 0);
+  const char *term;
+  char *buffer;
+  int tty, tgetent_ret;

 
 

-  term_cr = "\r";
+  term = terminal_name ? terminal_name : sh_get_env_value ("TERM");
+  _rl_term_clrpag = _rl_term_cr = _rl_term_clreol = (char *)NULL;
+  tty = rl_instream ? fileno (rl_instream) : 0;
+  _rl_screenwidth = _rl_screenheight = 0;
+
+  if (term == 0)
+    term = "dumb";
+
+#ifdef __MSDOS__

   term_im = term_ei = term_ic = term_IC = (char *)NULL;
   term_up = term_dc = term_DC = visible_bell = (char *)NULL;
   term_im = term_ei = term_ic = term_IC = (char *)NULL;
   term_up = term_dc = term_DC = visible_bell = (char *)NULL;

-
-  /* Does the __GO32__ have a meta key?  I don't know. */
-  term_has_meta = 0;
+  term_ku = term_kd = term_kl = term_kr = (char *)NULL;

   term_mm = term_mo = (char *)NULL;
   term_mm = term_mo = (char *)NULL;

+  terminal_can_insert = term_has_meta = _rl_term_autowrap = 0;
+  term_cr = "\r";

 
 

-  /* It probably has arrow keys, but I don't know what they are. */
-  term_ku = term_kd = term_kr = term_kl = (char *)NULL;
-
-#if defined (HACK_TERMCAP_MOTION)
-  term_forward_char = (char *)NULL;
-#endif /* HACK_TERMCAP_MOTION */
-  terminal_can_insert = _rl_term_autowrap = 0;
-  return 0;
-#else /* !__GO32__ */
-
-  char *term, *buffer;
-  int tty;
-  Keymap xkeymap;
+  _rl_get_screen_size (tty, 0);
+#else  /* !__MSDOS__ */
+  /* I've separated this out for later work on not calling tgetent at all
+     if the calling application has supplied a custom redisplay function,
+     (and possibly if the application has supplied a custom input function). */
+  if (CUSTOM_REDISPLAY_FUNC())
+    {
+      tgetent_ret = -1;
+    }
+  else
+    {
+      if (term_string_buffer == 0)
+       term_string_buffer = (char *)xmalloc(2032);

 
 

-  term = terminal_name ? terminal_name : get_env_value ("TERM");
+      if (term_buffer == 0)
+       term_buffer = (char *)xmalloc(4080);

 
 

-  if (term_string_buffer == 0)
-    term_string_buffer = xmalloc (2032);
+      buffer = term_string_buffer;

 
 

-  if (term_buffer == 0)
-    term_buffer = xmalloc (4080);
+      tgetent_ret = tgetent (term_buffer, term);
+    }

 
 

-  buffer = term_string_buffer;
+  if (tgetent_ret <= 0)
+    {
+      FREE (term_string_buffer);
+      FREE (term_buffer);
+      buffer = term_buffer = term_string_buffer = (char *)NULL;

 
 

-  term_clrpag = term_cr = term_clreol = (char *)NULL;
+      _rl_term_autowrap = 0;   /* used by _rl_get_screen_size */

 
 

-  if (term == 0)
-    term = "dumb";
+#if defined (__EMX__)
+      _emx_get_screensize (&_rl_screenwidth, &_rl_screenheight);
+      _rl_screenwidth--;
+#else /* !__EMX__ */
+      _rl_get_screen_size (tty, 0);
+#endif /* !__EMX__ */
+
+      /* Defaults. */
+      if (_rl_screenwidth <= 0 || _rl_screenheight <= 0)
+        {
+         _rl_screenwidth = 79;
+         _rl_screenheight = 24;
+        }

 
 

-  if (tgetent (term_buffer, term) <= 0)
-    {
-      dumb_term = 1;
-      screenwidth = 79;
-      screenheight = 24;
-      screenchars = 79 * 24;
-      term_cr = "\r";
-      term_im = term_ei = term_ic = term_IC = (char *)NULL;
-      term_up = term_dc = term_DC = visible_bell = (char *)NULL;
-      term_ku = term_kd = term_kl = term_kr = (char *)NULL;
+      /* Everything below here is used by the redisplay code (tputs). */
+      _rl_screenchars = _rl_screenwidth * _rl_screenheight;
+      _rl_term_cr = "\r";
+      _rl_term_im = _rl_term_ei = _rl_term_ic = _rl_term_IC = (char *)NULL;
+      _rl_term_up = _rl_term_dc = _rl_term_DC = _rl_visible_bell = (char *)NULL;
+      _rl_term_ku = _rl_term_kd = _rl_term_kl = _rl_term_kr = (char *)NULL;
+      _rl_term_kh = _rl_term_kH = _rl_term_kI = (char *)NULL;
+      _rl_term_ks = _rl_term_ke = _rl_term_at7 = (char *)NULL;
+      _rl_term_mm = _rl_term_mo = (char *)NULL;
+      _rl_term_ve = _rl_term_vs = (char *)NULL;

 #if defined (HACK_TERMCAP_MOTION)
       term_forward_char = (char *)NULL;
 #endif
 #if defined (HACK_TERMCAP_MOTION)
       term_forward_char = (char *)NULL;
 #endif

-      terminal_can_insert = 0;
+      _rl_terminal_can_insert = term_has_meta = 0;
+
+      /* Reasonable defaults for tgoto().  Readline currently only uses
+         tgoto if _rl_term_IC or _rl_term_DC is defined, but just in case we
+         change that later... */
+      PC = '\0';
+      BC = _rl_term_backspace = "\b";
+      UP = _rl_term_up;
+

       return 0;
     }
 
       return 0;
     }
 


@@ -385,16 +462,12 @@ _rl_init_terminal_io (terminal_name)
 
   /* Set up the variables that the termcap library expects the application
      to provide. */
 
   /* Set up the variables that the termcap library expects the application
      to provide. */

-  PC = term_pc ? *term_pc : 0;
-  BC = term_backspace;
-  UP = term_up;
-
-  if (!term_cr)
-    term_cr = "\r";
+  PC = _rl_term_pc ? *_rl_term_pc : 0;
+  BC = _rl_term_backspace;
+  UP = _rl_term_up;

 
 

-  tty = rl_instream ? fileno (rl_instream) : 0;
-
-  screenwidth = screenheight = 0;
+  if (!_rl_term_cr)
+    _rl_term_cr = "\r";

 
   _rl_term_autowrap = tgetflag ("am") && tgetflag ("xn");
 
 
   _rl_term_autowrap = tgetflag ("am") && tgetflag ("xn");
 


@@ -404,47 +477,53 @@ _rl_init_terminal_io (terminal_name)
       character insertion if *any one of* the capabilities `IC',
       `im', `ic' or `ip' is provided."  But we can't do anything if
       only `ip' is provided, so... */
       character insertion if *any one of* the capabilities `IC',
       `im', `ic' or `ip' is provided."  But we can't do anything if
       only `ip' is provided, so... */

-  terminal_can_insert = (term_IC || term_im || term_ic);
+  _rl_terminal_can_insert = (_rl_term_IC || _rl_term_im || _rl_term_ic);

 
   /* Check to see if this terminal has a meta key and clear the capability
      variables if there is none. */
   term_has_meta = (tgetflag ("km") || tgetflag ("MT"));
   if (!term_has_meta)
 
   /* Check to see if this terminal has a meta key and clear the capability
      variables if there is none. */
   term_has_meta = (tgetflag ("km") || tgetflag ("MT"));
   if (!term_has_meta)

-    term_mm = term_mo = (char *)NULL;
+    _rl_term_mm = _rl_term_mo = (char *)NULL;
+
+#endif /* !__MSDOS__ */

 
   /* Attempt to find and bind the arrow keys.  Do not override already
      bound keys in an overzealous attempt, however. */
 
   /* Attempt to find and bind the arrow keys.  Do not override already
      bound keys in an overzealous attempt, however. */

-  xkeymap = _rl_keymap;
-
-  _rl_keymap = emacs_standard_keymap;
-  _rl_bind_if_unbound (term_ku, rl_get_previous_history);
-  _rl_bind_if_unbound (term_kd, rl_get_next_history);
-  _rl_bind_if_unbound (term_kr, rl_forward);
-  _rl_bind_if_unbound (term_kl, rl_backward);

 
 

-  _rl_bind_if_unbound (term_kh, rl_beg_of_line);       /* Home */
-  _rl_bind_if_unbound (term_kH, rl_end_of_line);       /* End */
+  bind_termcap_arrow_keys (emacs_standard_keymap);

 
 #if defined (VI_MODE)
 
 #if defined (VI_MODE)

-  _rl_keymap = vi_movement_keymap;
-  _rl_bind_if_unbound (term_ku, rl_get_previous_history);
-  _rl_bind_if_unbound (term_kd, rl_get_next_history);
-  _rl_bind_if_unbound (term_kr, rl_forward);
-  _rl_bind_if_unbound (term_kl, rl_backward);
-
-  _rl_bind_if_unbound (term_kh, rl_beg_of_line);       /* Home */
-  _rl_bind_if_unbound (term_kH, rl_end_of_line);       /* End */
+  bind_termcap_arrow_keys (vi_movement_keymap);
+  bind_termcap_arrow_keys (vi_insertion_keymap);

 #endif /* VI_MODE */
 
 #endif /* VI_MODE */
 

-  _rl_keymap = xkeymap;
-
-#endif /* !__GO32__ */

   return 0;
 }
 
   return 0;
 }
 

+/* Bind the arrow key sequences from the termcap description in MAP. */
+static void
+bind_termcap_arrow_keys (map)
+     Keymap map;
+{
+  Keymap xkeymap;
+
+  xkeymap = _rl_keymap;
+  _rl_keymap = map;
+
+  _rl_bind_if_unbound (_rl_term_ku, rl_get_previous_history);
+  _rl_bind_if_unbound (_rl_term_kd, rl_get_next_history);
+  _rl_bind_if_unbound (_rl_term_kr, rl_forward);
+  _rl_bind_if_unbound (_rl_term_kl, rl_backward);
+
+  _rl_bind_if_unbound (_rl_term_kh, rl_beg_of_line);   /* Home */
+  _rl_bind_if_unbound (_rl_term_at7, rl_end_of_line);  /* End */
+
+  _rl_keymap = xkeymap;
+}
+

 char *
 rl_get_termcap (cap)
 char *
 rl_get_termcap (cap)

-     char *cap;
+     const char *cap;

 {
   register int i;
 
 {
   register int i;
 


@@ -462,7 +541,7 @@ rl_get_termcap (cap)
    has changed. */
 int
 rl_reset_terminal (terminal_name)
    has changed. */
 int
 rl_reset_terminal (terminal_name)

-     char *terminal_name;
+     const char *terminal_name;

 {
   _rl_init_terminal_io (terminal_name);
   return 0;
 {
   _rl_init_terminal_io (terminal_name);
   return 0;


@@ -484,10 +563,11 @@ _rl_output_character_function (c)
   return putc (c, _rl_out_stream);
 }
 #endif /* !_MINIX */
   return putc (c, _rl_out_stream);
 }
 #endif /* !_MINIX */

+

 /* Write COUNT characters from STRING to the output stream. */
 void
 _rl_output_some_chars (string, count)
 /* Write COUNT characters from STRING to the output stream. */
 void
 _rl_output_some_chars (string, count)

-     char *string;
+     const char *string;

      int count;
 {
   fwrite (string, 1, count, _rl_out_stream);
      int count;
 {
   fwrite (string, 1, count, _rl_out_stream);


@@ -500,12 +580,12 @@ _rl_backspace (count)
 {
   register int i;
 
 {
   register int i;
 

-#if !defined (__GO32__)
-  if (term_backspace)
+#ifndef __MSDOS__
+  if (_rl_term_backspace)

     for (i = 0; i < count; i++)
     for (i = 0; i < count; i++)

-      tputs (term_backspace, 1, _rl_output_character_function);
+      tputs (_rl_term_backspace, 1, _rl_output_character_function);

   else
   else

-#endif /* !__GO32__ */
+#endif

     for (i = 0; i < count; i++)
       putc ('\b', _rl_out_stream);
   return 0;
     for (i = 0; i < count; i++)
       putc ('\b', _rl_out_stream);
   return 0;


@@ -513,11 +593,11 @@ _rl_backspace (count)
 
 /* Move to the start of the next line. */
 int
 
 /* Move to the start of the next line. */
 int

-crlf ()
+rl_crlf ()

 {
 #if defined (NEW_TTY_DRIVER)
 {
 #if defined (NEW_TTY_DRIVER)

-  if (term_cr)
-    tputs (term_cr, 1, _rl_output_character_function);
+  if (_rl_term_cr)
+    tputs (_rl_term_cr, 1, _rl_output_character_function);

 #endif /* NEW_TTY_DRIVER */
   putc ('\n', _rl_out_stream);
   return 0;
 #endif /* NEW_TTY_DRIVER */
   putc ('\n', _rl_out_stream);
   return 0;


@@ -525,7 +605,7 @@ crlf ()
 
 /* Ring the terminal bell. */
 int
 
 /* Ring the terminal bell. */
 int

-ding ()
+rl_ding ()

 {
   if (readline_echoing_p)
     {
 {
   if (readline_echoing_p)
     {


@@ -535,13 +615,13 @@ ding ()
        default:
          break;
        case VISIBLE_BELL:
        default:
          break;
        case VISIBLE_BELL:

-#if defined (__GO32__)
+#ifdef __MSDOS__

          ScreenVisualBell ();
          break;
 #else
          ScreenVisualBell ();
          break;
 #else

-         if (visible_bell)
+         if (_rl_visible_bell)

            {
            {

-             tputs (visible_bell, 1, _rl_output_character_function);
+             tputs (_rl_visible_bell, 1, _rl_output_character_function);

              break;
            }
 #endif
              break;
            }
 #endif


@@ -565,9 +645,9 @@ ding ()
 void
 _rl_enable_meta_key ()
 {
 void
 _rl_enable_meta_key ()
 {

-#if !defined(__DJGPP__)
-  if (term_has_meta && term_mm)
-    tputs (term_mm, 1, _rl_output_character_function);
+#if !defined (__DJGPP__)
+  if (term_has_meta && _rl_term_mm)
+    tputs (_rl_term_mm, 1, _rl_output_character_function);

 #endif
 }
 
 #endif
 }
 


@@ -575,12 +655,36 @@ void
 _rl_control_keypad (on)
      int on;
 {
 _rl_control_keypad (on)
      int on;
 {

-#if defined(__DJGPP__)
-  on = on;
-#else
-  if (on && term_ks)
-    tputs (term_ks, 1, _rl_output_character_function);
-  else if (!on && term_ke)
-    tputs (term_ke, 1, _rl_output_character_function);
+#if !defined (__DJGPP__)
+  if (on && _rl_term_ks)
+    tputs (_rl_term_ks, 1, _rl_output_character_function);
+  else if (!on && _rl_term_ke)
+    tputs (_rl_term_ke, 1, _rl_output_character_function);

 #endif
 }
 #endif
 }

+
+/* **************************************************************** */
+/*                                                                 */
+/*                     Controlling the Cursor                      */
+/*                                                                 */
+/* **************************************************************** */
+
+/* Set the cursor appropriately depending on IM, which is one of the
+   insert modes (insert or overwrite).  Insert mode gets the normal
+   cursor.  Overwrite mode gets a very visible cursor.  Only does
+   anything if we have both capabilities. */
+void
+_rl_set_cursor (im, force)
+     int im, force;
+{
+  if (_rl_term_ve && _rl_term_vs)
+    {
+      if (force || im != rl_insert_mode)
+       {
+         if (im == RL_IM_OVERWRITE)
+           tputs (_rl_term_vs, 1, _rl_output_character_function);
+         else
+           tputs (_rl_term_ve, 1, _rl_output_character_function);
+       }
+    }
+}