# endif
}
+/* Why is NeXT excluded here (and not in os_unixx.h)? */
+#if defined(ECHOE) && defined(ICANON) && (defined(HAVE_TERMIO_H) || defined(HAVE_TERMIOS_H)) && !defined(__NeXT__)
+# define NEW_TTY_SYSTEM
+#endif
+
/*
* Write s[len] to the screen.
*/
{
static int first = TRUE;
- /* Why is NeXT excluded here (and not in os_unixx.h)? */
-#if defined(ECHOE) && defined(ICANON) && (defined(HAVE_TERMIO_H) || defined(HAVE_TERMIOS_H)) && !defined(__NeXT__)
- /*
- * for "new" tty systems
- */
+#ifdef NEW_TTY_SYSTEM
# ifdef HAVE_TERMIOS_H
static struct termios told;
struct termios tnew;
# endif
#else
-
/*
* for "old" tty systems
*/
void
get_stty(void)
{
- char_u buf[2];
- char_u *p;
+ ttyinfo_T info;
+ char_u buf[2];
+ char_u *p;
- /* Why is NeXT excluded here (and not in os_unixx.h)? */
-#if defined(ECHOE) && defined(ICANON) && (defined(HAVE_TERMIO_H) || defined(HAVE_TERMIOS_H)) && !defined(__NeXT__)
- /* for "new" tty systems */
+ if (get_tty_info(read_cmd_fd, &info) == OK)
+ {
+ intr_char = info.interrupt;
+ buf[0] = info.backspace;
+ buf[1] = NUL;
+ add_termcode((char_u *)"kb", buf, FALSE);
+
+ /* If <BS> and <DEL> are now the same, redefine <DEL>. */
+ p = find_termcode((char_u *)"kD");
+ if (p != NULL && p[0] == buf[0] && p[1] == buf[1])
+ do_fixdel(NULL);
+ }
+}
+
+/*
+ * Obtain the characters that Backspace and Enter produce on "fd".
+ * Returns OK or FAIL.
+ */
+ int
+get_tty_info(int fd, ttyinfo_T *info)
+{
+#ifdef NEW_TTY_SYSTEM
# ifdef HAVE_TERMIOS_H
struct termios keys;
# else
struct termio keys;
# endif
+ if (
# if defined(HAVE_TERMIOS_H)
- if (tcgetattr(read_cmd_fd, &keys) != -1)
+ tcgetattr(fd, &keys) != -1
# else
- if (ioctl(read_cmd_fd, TCGETA, &keys) != -1)
+ ioctl(fd, TCGETA, &keys) != -1
# endif
+ )
{
- buf[0] = keys.c_cc[VERASE];
- intr_char = keys.c_cc[VINTR];
+ info->backspace = keys.c_cc[VERASE];
+ info->interrupt = keys.c_cc[VINTR];
+ if (keys.c_iflag & ICRNL)
+ info->enter = NL;
+ else
+ info->enter = CAR;
+ if (keys.c_oflag & ONLCR)
+ info->nl_does_cr = TRUE;
+ else
+ info->nl_does_cr = FALSE;
+ return OK;
+ }
#else
/* for "old" tty systems */
struct sgttyb keys;
- if (ioctl(read_cmd_fd, TIOCGETP, &keys) != -1)
+ if (ioctl(fd, TIOCGETP, &keys) != -1)
{
- buf[0] = keys.sg_erase;
- intr_char = keys.sg_kill;
-#endif
- buf[1] = NUL;
- add_termcode((char_u *)"kb", buf, FALSE);
-
- /*
- * If <BS> and <DEL> are now the same, redefine <DEL>.
- */
- p = find_termcode((char_u *)"kD");
- if (p != NULL && p[0] == buf[0] && p[1] == buf[1])
- do_fixdel(NULL);
+ info->backspace = keys.sg_erase;
+ info->interrupt = keys.sg_kill;
+ info->enter = CAR;
+ info->nl_does_cr = TRUE;
+ return OK;
}
-#if 0
- } /* to keep cindent happy */
#endif
+ return FAIL;
}
#endif /* VMS */
* in tl_scrollback are no longer used.
*
* TODO:
- * - To set BS correctly, check get_stty(); Pass the fd of the pty.
- * For the GUI fill termios with default values, perhaps like pangoterm:
- * http://bazaar.launchpad.net/~leonerd/pangoterm/trunk/view/head:/main.c#L134
- * Also get the NL behavior from there.
- * - do not store terminal window in viminfo. Or prefix term:// ?
* - add a character in :ls output
* - add 't' to mode()
* - use win_del_lines() to make scroll-up efficient.
* - add test for giving error for invalid 'termsize' value.
* - support minimal size when 'termsize' is "rows*cols".
* - support minimal size when 'termsize' is empty?
- * - implement "term" for job_start(): more job options when starting a
- * terminal. Allow:
+ * - implement job options when starting a terminal. Allow:
* "in_io", "in_top", "in_bot", "in_name", "in_buf"
"out_io", "out_name", "out_buf", "out_modifiable", "out_msg"
"err_io", "err_name", "err_buf", "err_modifiable", "err_msg"
* Test: "cat" reading from a file or buffer
* "ls" writing stdout to a file or buffer
* shell writing stderr to a file or buffer
+ * - For the GUI fill termios with default values, perhaps like pangoterm:
+ * http://bazaar.launchpad.net/~leonerd/pangoterm/trunk/view/head:/main.c#L134
* - support ":term NONE" to open a terminal with a pty but not running a job
* in it. The pty can be passed to gdb to run the executable in.
* - if the job in the terminal does not support the mouse, we can use the
static void term_report_winsize(term_T *term, int rows, int cols);
static void term_free_vterm(term_T *term);
+/* The characters that we know (or assume) that the terminal expects for the
+ * backspace and enter keys. */
+static int term_backspace_char = BS;
+static int term_enter_char = CAR;
+static int term_nl_does_cr = FALSE;
+
+
/**************************************
* 1. Generic code for all systems.
*/
size_t done;
size_t len_now;
- for (done = 0; done < len; done += len_now)
- {
- for (p = msg + done; p < msg + len; )
- {
- if (*p == NL)
- break;
- p += utf_ptr2len_len(p, (int)(len - (p - msg)));
- }
- len_now = p - msg - done;
- vterm_input_write(vterm, (char *)msg + done, len_now);
- if (p < msg + len && *p == NL)
+ if (term_nl_does_cr)
+ vterm_input_write(vterm, (char *)msg, len);
+ else
+ /* need to convert NL to CR-NL */
+ for (done = 0; done < len; done += len_now)
{
- /* Convert NL to CR-NL, that appears to work best. */
- vterm_input_write(vterm, "\r\n", 2);
- ++len_now;
+ for (p = msg + done; p < msg + len; )
+ {
+ if (*p == NL)
+ break;
+ p += utf_ptr2len_len(p, (int)(len - (p - msg)));
+ }
+ len_now = p - msg - done;
+ vterm_input_write(vterm, (char *)msg + done, len_now);
+ if (p < msg + len && *p == NL)
+ {
+ vterm_input_write(vterm, "\r\n", 2);
+ ++len_now;
+ }
}
- }
/* this invokes the damage callbacks */
vterm_screen_flush_damage(vterm_obtain_screen(vterm));
switch (c)
{
- case CAR: key = VTERM_KEY_ENTER; break;
+ case CAR: c = term_enter_char; break;
+ /* don't use VTERM_KEY_BACKSPACE, it always
+ * becomes 0x7f DEL */
+ case K_BS: c = term_backspace_char; break;
+
case ESC: key = VTERM_KEY_ESCAPE; break;
- /* VTERM_KEY_BACKSPACE becomes 0x7f DEL */
- case K_BS: c = BS; break;
case K_DEL: key = VTERM_KEY_DEL; break;
case K_DOWN: key = VTERM_KEY_DOWN; break;
case K_S_DOWN: mod = VTERM_MOD_SHIFT;
position_cursor(curwin, &curbuf->b_term->tl_cursor_pos);
may_set_cursor_props(curbuf->b_term);
+#ifdef UNIX
+ {
+ int fd = curbuf->b_term->tl_job->jv_channel->ch_part[PART_IN].ch_fd;
+
+ if (isatty(fd))
+ {
+ ttyinfo_T info;
+
+ /* Get the current backspace and enter characters of the pty. */
+ if (get_tty_info(fd, &info) == OK)
+ {
+ term_backspace_char = info.backspace;
+ term_enter_char = info.enter;
+ term_nl_does_cr = info.nl_does_cr;
+ }
+ }
+ }
+#endif
+
for (;;)
{
/* TODO: skip screen update when handling a sequence of keys. */
projects / vim / commitdiff