/* vi_mode.c -- A vi emulation mode for Bash.
Derived from code written by Jeff Sparkes (jsparkes@bnr.ca). */
-/* Copyright (C) 1988, 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
- This file is part of the GNU Readline Library (the Library), a set of
- routines for providing Emacs style line input to programs that ask
- for it.
+ This file is part of the GNU Readline Library, a library for
+ reading lines of text with interactive input and history editing.
- The 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 (at your option)
- any later version.
+ 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 2, or
+ (at your option) any later version.
- The Library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ The GNU Readline Library is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
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. */
-\f
+ 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+#define READLINE_LIBRARY
+
/* **************************************************************** */
/* */
/* VI Emulation Mode */
/* */
/* **************************************************************** */
+#include "rlconf.h"
+
#if defined (VI_MODE)
-#include <stdio.h>
+#if defined (HAVE_CONFIG_H)
+# include <config.h>
+#endif
+
+#include <sys/types.h>
-#if defined (__GNUC__)
-# define alloca __builtin_alloca
+#if defined (HAVE_STDLIB_H)
+# include <stdlib.h>
#else
-# if defined (sparc) || defined (HAVE_ALLOCA_H)
-# include <alloca.h>
-# endif
+# include "ansi_stdlib.h"
+#endif /* HAVE_STDLIB_H */
+
+#if defined (HAVE_UNISTD_H)
+# include <unistd.h>
#endif
+#include <stdio.h>
+
/* Some standard library routines. */
+#include "rldefs.h"
#include "readline.h"
#include "history.h"
-#ifndef digit
-#define digit(c) ((c) >= '0' && (c) <= '9')
-#endif
+#include "rlprivate.h"
+#include "xmalloc.h"
-#ifndef isletter
-#define isletter(c) (((c) >= 'A' && (c) <= 'Z') || ((c) >= 'a' && (c) <= 'z'))
+#ifndef _rl_digit_p
+#define _rl_digit_p(c) ((c) >= '0' && (c) <= '9')
#endif
-#ifndef digit_value
-#define digit_value(c) ((c) - '0')
+#ifndef _rl_digit_value
+#define _rl_digit_value(c) ((c) - '0')
#endif
#ifndef member
-#define member(c, s) ((c) ? index ((s), (c)) : 0)
+#define member(c, s) ((c) ? (char *)strchr ((s), (c)) != (char *)NULL : 0)
#endif
#ifndef isident
-#define isident(c) ((isletter(c) || digit(c) || c == '_'))
+#define isident(c) ((_rl_pure_alphabetic (c) || _rl_digit_p (c) || c == '_'))
#endif
#ifndef exchange
-#define exchange(x, y) {int temp = x; x = y; y = temp;}
+#define exchange(x, y) do {int temp = x; x = y; y = temp;} while (0)
#endif
-/* Variables imported from readline.c */
-extern int rl_point, rl_end, rl_mark, rl_done;
-extern FILE *rl_instream;
-extern int rl_line_buffer_len, rl_explicit_arg, rl_numeric_arg;
-extern Keymap keymap;
-extern char *rl_prompt;
-extern char *rl_line_buffer;
-extern int rl_arg_sign;
-
-extern char *xmalloc (), *xrealloc ();
-extern void rl_extend_line_buffer ();
-
-/* Last string searched for from `/' or `?'. */
-static char *vi_last_search = (char *)NULL;
-static int vi_histpos;
-
/* Non-zero means enter insertion mode. */
-int vi_doing_insert = 0;
+static int _rl_vi_doing_insert;
-/* String inserted into the line by rl_vi_comment (). */
-char *rl_vi_comment_begin = (char *)NULL;
-
-/* *** UNCLEAN *** */
/* Command keys which do movement for xxx_to commands. */
static char *vi_motion = " hl^$0ftFt;,%wbeWBE|";
/* Keymap used for vi replace characters. Created dynamically since
rarely used. */
-static Keymap vi_replace_map = (Keymap)NULL;
+static Keymap vi_replace_map;
/* The number of characters inserted in the last replace operation. */
-static int vi_replace_count = 0;
+static int vi_replace_count;
-/* Yank the nth arg from the previous line into this line at point. */
-rl_vi_yank_arg (count)
+/* If non-zero, we have text inserted after a c[motion] command that put
+ us implicitly into insert mode. Some people want this text to be
+ attached to the command so that it is `redoable' with `.'. */
+static int vi_continued_command;
+static char *vi_insert_buffer;
+static int vi_insert_buffer_size;
+
+static int _rl_vi_last_command = 'i'; /* default `.' puts you in insert mode */
+static int _rl_vi_last_repeat = 1;
+static int _rl_vi_last_arg_sign = 1;
+static int _rl_vi_last_motion;
+static int _rl_vi_last_search_char;
+static int _rl_vi_last_replacement;
+
+static int _rl_vi_last_key_before_insert;
+
+static int vi_redoing;
+
+/* Text modification commands. These are the `redoable' commands. */
+static char *vi_textmod = "_*\\AaIiCcDdPpYyRrSsXx~";
+
+/* Arrays for the saved marks. */
+static int vi_mark_chars[27];
+
+static int rl_digit_loop1 __P((void));
+
+void
+_rl_vi_initialize_line ()
+{
+ register int i;
+
+ for (i = 0; i < sizeof (vi_mark_chars) / sizeof (int); i++)
+ vi_mark_chars[i] = -1;
+}
+
+void
+_rl_vi_reset_last ()
+{
+ _rl_vi_last_command = 'i';
+ _rl_vi_last_repeat = 1;
+ _rl_vi_last_arg_sign = 1;
+ _rl_vi_last_motion = 0;
+}
+
+void
+_rl_vi_set_last (key, repeat, sign)
+ int key, repeat, sign;
+{
+ _rl_vi_last_command = key;
+ _rl_vi_last_repeat = repeat;
+ _rl_vi_last_arg_sign = sign;
+}
+
+/* Is the command C a VI mode text modification command? */
+int
+_rl_vi_textmod_command (c)
+ int c;
+{
+ return (member (c, vi_textmod));
+}
+
+static void
+_rl_vi_stuff_insert (count)
int count;
+{
+ rl_begin_undo_group ();
+ while (count--)
+ rl_insert_text (vi_insert_buffer);
+ rl_end_undo_group ();
+}
+
+/* Bound to `.'. Called from command mode, so we know that we have to
+ redo a text modification command. The default for _rl_vi_last_command
+ puts you back into insert mode. */
+int
+rl_vi_redo (count, c)
+ int count, c;
+{
+ if (!rl_explicit_arg)
+ {
+ rl_numeric_arg = _rl_vi_last_repeat;
+ rl_arg_sign = _rl_vi_last_arg_sign;
+ }
+
+ vi_redoing = 1;
+ /* If we're redoing an insert with `i', stuff in the inserted text
+ and do not go into insertion mode. */
+ if (_rl_vi_last_command == 'i' && vi_insert_buffer && *vi_insert_buffer)
+ {
+ _rl_vi_stuff_insert (count);
+ /* And back up point over the last character inserted. */
+ if (rl_point > 0)
+ rl_point--;
+ }
+ else
+ _rl_dispatch (_rl_vi_last_command, _rl_keymap);
+ vi_redoing = 0;
+
+ return (0);
+}
+
+/* A placeholder for further expansion. */
+int
+rl_vi_undo (count, key)
+ int count, key;
+{
+ return (rl_undo_command (count, key));
+}
+
+/* Yank the nth arg from the previous line into this line at point. */
+int
+rl_vi_yank_arg (count, key)
+ int count, key;
{
/* Readline thinks that the first word on a line is the 0th, while vi
thinks the first word on a line is the 1st. Compensate. */
rl_yank_nth_arg (count - 1, 0);
else
rl_yank_nth_arg ('$', 0);
+
+ return (0);
}
/* With an argument, move back that many history lines, else move to the
beginning of history. */
+int
rl_vi_fetch_history (count, c)
int count, c;
{
- extern int rl_explicit_arg;
- int current = where_history ();
+ int wanted;
/* Giving an argument of n means we want the nth command in the history
file. The command number is interpreted the same way that the bash
output of `history'. */
if (rl_explicit_arg)
{
- int wanted = history_base + current - count;
+ wanted = history_base + where_history () - count;
if (wanted <= 0)
rl_beginning_of_history (0, 0);
else
- rl_get_previous_history (wanted);
+ rl_get_previous_history (wanted, c);
}
else
rl_beginning_of_history (count, 0);
+ return (0);
}
/* Search again for the last thing searched for. */
-rl_vi_search_again (ignore, key)
- int ignore, key;
+int
+rl_vi_search_again (count, key)
+ int count, key;
{
switch (key)
{
case 'n':
- rl_vi_dosearch (vi_last_search, -1);
+ rl_noninc_reverse_search_again (count, key);
break;
case 'N':
- rl_vi_dosearch (vi_last_search, 1);
+ rl_noninc_forward_search_again (count, key);
break;
}
+ return (0);
}
/* Do a vi style search. */
+int
rl_vi_search (count, key)
int count, key;
{
- int dir, c, save_pos;
- char *p;
-
switch (key)
{
case '?':
- dir = 1;
+ rl_noninc_forward_search (count, key);
break;
case '/':
- dir = -1;
+ rl_noninc_reverse_search (count, key);
break;
default:
ding ();
- return;
- }
-
- vi_histpos = where_history ();
- maybe_save_line ();
- save_pos = rl_point;
-
- /* Reuse the line input buffer to read the search string. */
- rl_line_buffer[0] = 0;
- rl_end = rl_point = 0;
- p = (char *)alloca (2 + (rl_prompt ? strlen (rl_prompt) : 0));
-
- sprintf (p, "%s%c", rl_prompt ? rl_prompt : "", key);
-
- rl_message (p, 0, 0);
-
- while (c = rl_read_key ())
- {
- switch (c)
- {
- case CTRL('H'):
- case RUBOUT:
- if (rl_point == 0)
- {
- maybe_unsave_line ();
- rl_clear_message ();
- rl_point = save_pos;
- return;
- }
-
- case CTRL('W'):
- case CTRL('U'):
- rl_dispatch (c, keymap);
- break;
-
- case ESC:
- case RETURN:
- case NEWLINE:
- goto dosearch;
- break;
-
- case CTRL('C'):
- maybe_unsave_line ();
- rl_clear_message ();
- rl_point = 0;
- ding ();
- return;
-
- default:
- rl_insert (1, c);
- break;
- }
- rl_redisplay ();
- }
- dosearch:
- if (vi_last_search)
- free (vi_last_search);
-
- vi_last_search = savestring (rl_line_buffer);
- rl_vi_dosearch (rl_line_buffer, dir);
-}
-
-/* Search for STRING in the history list. DIR is < 0 for searching
- backwards. POS is an absolute index into the history list at
- which point to begin searching. If the first character of STRING
- is `^', the string must match a prefix of a history line, otherwise
- a full substring match is performed. */
-static int
-vi_history_search_pos (string, dir, pos)
- char *string;
- int dir, pos;
-{
- int ret, old = where_history ();
-
- history_set_pos (pos);
-
- if (*string == '^')
- ret = history_search_prefix (string + 1, dir);
- else
- ret = history_search (string, dir);
-
- if (ret == -1)
- {
- history_set_pos (old);
- return (-1);
- }
-
- ret = where_history ();
- history_set_pos (old);
- return ret;
-}
-
-rl_vi_dosearch (string, dir)
- char *string;
- int dir;
-{
- int old, save = vi_histpos;
- HIST_ENTRY *h;
-
- if (string == 0 || *string == 0 || vi_histpos < 0)
- {
- ding ();
- return;
- }
-
- if ((save = vi_history_search_pos (string, dir, vi_histpos + dir)) == -1)
- {
- maybe_unsave_line ();
- rl_clear_message ();
- rl_point = 0;
- ding ();
- return;
+ break;
}
-
- vi_histpos = save;
-
- old = where_history ();
- history_set_pos (vi_histpos);
- h = current_history ();
- history_set_pos (old);
-
- {
- int line_len = strlen (h->line);
-
- if (line_len >= rl_line_buffer_len)
- rl_extend_line_buffer (line_len);
- strcpy (rl_line_buffer, h->line);
- }
-
- rl_undo_list = (UNDO_LIST *)h->data;
- rl_end = strlen (rl_line_buffer);
- rl_point = 0;
- rl_clear_message ();
+ return (0);
}
/* Completion, from vi's point of view. */
+int
rl_vi_complete (ignore, key)
int ignore, key;
{
rl_complete_internal (TAB); /* Standard Readline completion. */
else
rl_complete (0, key);
+
+ if (key == '*' || key == '\\')
+ {
+ _rl_vi_set_last (key, 1, rl_arg_sign);
+ rl_vi_insertion_mode (1, key);
+ }
+ return (0);
+}
+
+/* Tilde expansion for vi mode. */
+int
+rl_vi_tilde_expand (ignore, key)
+ int ignore, key;
+{
+ rl_tilde_expand (0, key);
+ _rl_vi_set_last (key, 1, rl_arg_sign); /* XXX */
+ rl_vi_insertion_mode (1, key);
+ return (0);
}
/* Previous word in vi mode. */
+int
rl_vi_prev_word (count, key)
int count, key;
{
if (count < 0)
- {
- rl_vi_next_word (-count, key);
- return;
- }
+ return (rl_vi_next_word (-count, key));
if (rl_point == 0)
{
ding ();
- return;
+ return (0);
}
- if (uppercase_p (key))
- rl_vi_bWord (count);
+ if (_rl_uppercase_p (key))
+ rl_vi_bWord (count, key);
else
- rl_vi_bword (count);
+ rl_vi_bword (count, key);
+
+ return (0);
}
/* Next word in vi mode. */
+int
rl_vi_next_word (count, key)
- int count;
+ int count, key;
{
if (count < 0)
- {
- rl_vi_prev_word (-count, key);
- return;
- }
+ return (rl_vi_prev_word (-count, key));
if (rl_point >= (rl_end - 1))
{
ding ();
- return;
+ return (0);
}
- if (uppercase_p (key))
- rl_vi_fWord (count);
+ if (_rl_uppercase_p (key))
+ rl_vi_fWord (count, key);
else
- rl_vi_fword (count);
+ rl_vi_fword (count, key);
+ return (0);
}
/* Move to the end of the ?next? word. */
+int
rl_vi_end_word (count, key)
int count, key;
{
if (count < 0)
{
ding ();
- return;
+ return -1;
}
- if (uppercase_p (key))
- rl_vi_eWord (count);
+ if (_rl_uppercase_p (key))
+ rl_vi_eWord (count, key);
else
- rl_vi_eword (count);
+ rl_vi_eword (count, key);
+ return (0);
}
/* Move forward a word the way that 'W' does. */
-rl_vi_fWord (count)
- int count;
+int
+rl_vi_fWord (count, ignore)
+ int count, ignore;
{
while (count-- && rl_point < (rl_end - 1))
{
while (whitespace (rl_line_buffer[rl_point]) && rl_point < rl_end)
rl_point++;
}
+ return (0);
}
-rl_vi_bWord (count)
- int count;
+int
+rl_vi_bWord (count, ignore)
+ int count, ignore;
{
while (count-- && rl_point > 0)
{
rl_point++;
}
}
+ return (0);
}
-rl_vi_eWord (count)
- int count;
+int
+rl_vi_eWord (count, ignore)
+ int count, ignore;
{
while (count-- && rl_point < (rl_end - 1))
{
rl_point--;
}
}
+ return (0);
}
-rl_vi_fword (count)
- int count;
+int
+rl_vi_fword (count, ignore)
+ int count, ignore;
{
while (count-- && rl_point < (rl_end - 1))
{
while (whitespace (rl_line_buffer[rl_point]) && rl_point < rl_end)
rl_point++;
}
+ return (0);
}
-rl_vi_bword (count)
- int count;
+int
+rl_vi_bword (count, ignore)
+ int count, ignore;
{
while (count-- && rl_point > 0)
{
rl_point++;
}
}
+ return (0);
}
-rl_vi_eword (count)
- int count;
+int
+rl_vi_eword (count, ignore)
+ int count, ignore;
{
while (count-- && rl_point < rl_end - 1)
{
}
rl_point--;
}
+ return (0);
}
-rl_vi_insert_beg ()
+int
+rl_vi_insert_beg (count, key)
+ int count, key;
{
- rl_beg_of_line ();
- rl_vi_insertion_mode ();
- return 0;
+ rl_beg_of_line (1, key);
+ rl_vi_insertion_mode (1, key);
+ return (0);
}
-rl_vi_append_mode ()
+int
+rl_vi_append_mode (count, key)
+ int count, key;
{
if (rl_point < rl_end)
- rl_point += 1;
- rl_vi_insertion_mode ();
- return 0;
+ rl_point++;
+ rl_vi_insertion_mode (1, key);
+ return (0);
}
-rl_vi_append_eol ()
+int
+rl_vi_append_eol (count, key)
+ int count, key;
{
- rl_end_of_line ();
- rl_vi_append_mode ();
- return 0;
+ rl_end_of_line (1, key);
+ rl_vi_append_mode (1, key);
+ return (0);
}
/* What to do in the case of C-d. */
+int
rl_vi_eof_maybe (count, c)
int count, c;
{
- rl_newline (1, '\n');
+ return (rl_newline (1, '\n'));
}
/* Insertion mode stuff. */
/* Switching from one mode to the other really just involves
switching keymaps. */
-rl_vi_insertion_mode ()
+int
+rl_vi_insertion_mode (count, key)
+ int count, key;
{
- keymap = vi_insertion_keymap;
+ _rl_keymap = vi_insertion_keymap;
+ _rl_vi_last_key_before_insert = key;
+ return (0);
}
-rl_vi_movement_mode ()
+static void
+_rl_vi_save_insert (up)
+ UNDO_LIST *up;
{
- if (rl_point > 0)
- rl_backward (1);
+ int len, start, end;
- keymap = vi_movement_keymap;
- vi_done_inserting ();
-}
+ if (up == 0)
+ {
+ if (vi_insert_buffer_size >= 1)
+ vi_insert_buffer[0] = '\0';
+ return;
+ }
-vi_done_inserting ()
+ start = up->start;
+ end = up->end;
+ len = end - start + 1;
+ if (len >= vi_insert_buffer_size)
+ {
+ vi_insert_buffer_size += (len + 32) - (len % 32);
+ vi_insert_buffer = xrealloc (vi_insert_buffer, vi_insert_buffer_size);
+ }
+ strncpy (vi_insert_buffer, rl_line_buffer + start, len - 1);
+ vi_insert_buffer[len-1] = '\0';
+}
+
+void
+_rl_vi_done_inserting ()
{
- if (vi_doing_insert)
+ if (_rl_vi_doing_insert)
{
rl_end_undo_group ();
- vi_doing_insert = 0;
+ /* Now, the text between rl_undo_list->next->start and
+ rl_undo_list->next->end is what was inserted while in insert
+ mode. It gets copied to VI_INSERT_BUFFER because it depends
+ on absolute indices into the line which may change (though they
+ probably will not). */
+ _rl_vi_doing_insert = 0;
+ _rl_vi_save_insert (rl_undo_list->next);
+ vi_continued_command = 1;
}
+ else
+ {
+ if (_rl_vi_last_key_before_insert == 'i' && rl_undo_list)
+ _rl_vi_save_insert (rl_undo_list);
+ /* XXX - Other keys probably need to be checked. */
+ else if (_rl_vi_last_key_before_insert == 'C')
+ rl_end_undo_group ();
+ while (_rl_undo_group_level > 0)
+ rl_end_undo_group ();
+ vi_continued_command = 0;
+ }
+}
+
+int
+rl_vi_movement_mode (count, key)
+ int count, key;
+{
+ if (rl_point > 0)
+ rl_backward (1, key);
+
+ _rl_keymap = vi_movement_keymap;
+ _rl_vi_done_inserting ();
+ return (0);
}
+int
rl_vi_arg_digit (count, c)
int count, c;
{
if (c == '0' && rl_numeric_arg == 1 && !rl_explicit_arg)
- rl_beg_of_line ();
+ return (rl_beg_of_line (1, c));
else
- rl_digit_argument (count, c);
+ return (rl_digit_argument (count, c));
}
+int
rl_vi_change_case (count, ignore)
int count, ignore;
{
/* Don't try this on an empty line. */
if (rl_point >= rl_end)
- return;
+ return (0);
while (count-- && rl_point < rl_end)
{
- if (uppercase_p (rl_line_buffer[rl_point]))
- c = to_lower (rl_line_buffer[rl_point]);
- else if (lowercase_p (rl_line_buffer[rl_point]))
- c = to_upper (rl_line_buffer[rl_point]);
+ if (_rl_uppercase_p (rl_line_buffer[rl_point]))
+ c = _rl_to_lower (rl_line_buffer[rl_point]);
+ else if (_rl_lowercase_p (rl_line_buffer[rl_point]))
+ c = _rl_to_upper (rl_line_buffer[rl_point]);
+ else
+ {
+ /* Just skip over characters neither upper nor lower case. */
+ rl_forward (1, c);
+ continue;
+ }
/* Vi is kind of strange here. */
if (c)
rl_vi_check ();
}
else
- rl_forward (1);
+ rl_forward (1, c);
}
+ return (0);
}
+int
rl_vi_put (count, key)
int count, key;
{
- if (!uppercase_p (key) && (rl_point + 1 <= rl_end))
+ if (!_rl_uppercase_p (key) && (rl_point + 1 <= rl_end))
rl_point++;
- rl_yank ();
- rl_backward (1);
+ rl_yank (1, key);
+ rl_backward (1, key);
+ return (0);
}
+int
rl_vi_check ()
{
if (rl_point && rl_point == rl_end)
rl_point--;
+ return (0);
}
-rl_vi_column (count)
+int
+rl_vi_column (count, key)
+ int count, key;
{
if (count > rl_end)
- rl_end_of_line ();
+ rl_end_of_line (1, key);
else
rl_point = count - 1;
+ return (0);
}
int
int key, *nextkey;
{
int c, save;
- int old_end, added_blank;
-
- added_blank = 0;
+ int old_end;
rl_mark = rl_point;
c = rl_read_key ();
if (!member (c, vi_motion))
{
- if (digit (c))
+ if (_rl_digit_p (c))
{
save = rl_numeric_arg;
- rl_numeric_arg = digit_value (c);
+ rl_numeric_arg = _rl_digit_value (c);
rl_digit_loop1 ();
rl_numeric_arg *= save;
c = rl_read_key (); /* real command */
*nextkey = c;
}
- else if ((key == 'd' && c == 'd') ||
- (key == 'y' && c == 'y') ||
- (key == 'c' && c == 'c'))
+ else if (key == c && (key == 'd' || key == 'y' || key == 'c'))
{
rl_mark = rl_end;
- rl_beg_of_line ();
+ rl_beg_of_line (1, c);
+ _rl_vi_last_motion = c;
return (0);
}
else
return (-1);
}
+ _rl_vi_last_motion = c;
+
/* Append a blank character temporarily so that the motion routines
work right at the end of the line. */
old_end = rl_end;
- rl_line_buffer[rl_end++] = ' '; /* This looks pretty bogus to me??? */
+ rl_line_buffer[rl_end++] = ' ';
rl_line_buffer[rl_end] = '\0';
- added_blank++;
- rl_dispatch (c, keymap);
+ _rl_dispatch (c, _rl_keymap);
/* Remove the blank that we added. */
rl_end = old_end;
rl_line_buffer[rl_end] = '\0';
if (rl_point > rl_end)
- rl_point = rl_end - 1;
+ rl_point = rl_end;
/* No change in position means the command failed. */
if (rl_mark == rl_point)
/* rl_vi_f[wW]ord () leaves the cursor on the first character of the next
word. If we are not at the end of the line, and we are on a
non-whitespace character, move back one (presumably to whitespace). */
- if ((c == 'w' || c == 'W') && (rl_point < rl_end) &&
+ if ((_rl_to_upper (c) == 'W') && rl_point < rl_end && rl_point > rl_mark &&
!whitespace (rl_line_buffer[rl_point]))
rl_point--;
/* If cw or cW, back up to the end of a word, so the behaviour of ce
- or cE is the actual result. Brute-force, no subtlety. Do the same
- thing for dw or dW. */
- if (key == 'c' && (to_upper (c) == 'W'))
+ or cE is the actual result. Brute-force, no subtlety. */
+ if (key == 'c' && rl_point >= rl_mark && (_rl_to_upper (c) == 'W'))
{
- while (rl_point && whitespace (rl_line_buffer[rl_point]))
+ /* Don't move farther back than where we started. */
+ while (rl_point > rl_mark && whitespace (rl_line_buffer[rl_point]))
rl_point--;
+
+ /* Posix.2 says that if cw or cW moves the cursor towards the end of
+ the line, the character under the cursor should be deleted. */
+ if (rl_point == rl_mark)
+ rl_point++;
+ else
+ {
+ /* Move past the end of the word so that the kill doesn't
+ remove the last letter of the previous word. Only do this
+ if we are not at the end of the line. */
+ if (rl_point >= 0 && rl_point < (rl_end - 1) && !whitespace (rl_line_buffer[rl_point]))
+ rl_point++;
+ }
}
if (rl_mark < rl_point)
/* A simplified loop for vi. Don't dispatch key at end.
Don't recognize minus sign? */
+static int
rl_digit_loop1 ()
{
int key, c;
rl_message ("(arg: %d) ", rl_arg_sign * rl_numeric_arg, 0);
key = c = rl_read_key ();
- if (keymap[c].type == ISFUNC &&
- keymap[c].function == rl_universal_argument)
+ if (_rl_keymap[c].type == ISFUNC &&
+ _rl_keymap[c].function == rl_universal_argument)
{
rl_numeric_arg *= 4;
continue;
}
c = UNMETA (c);
- if (numeric (c))
+ if (_rl_digit_p (c))
{
if (rl_explicit_arg)
- rl_numeric_arg = (rl_numeric_arg * 10) + digit_value (c);
+ rl_numeric_arg = (rl_numeric_arg * 10) + _rl_digit_value (c);
else
- rl_numeric_arg = digit_value (c);
+ rl_numeric_arg = _rl_digit_value (c);
rl_explicit_arg = 1;
}
else
break;
}
}
+ return (0);
}
+int
rl_vi_delete_to (count, key)
int count, key;
{
int c;
- if (uppercase_p (key))
+ if (_rl_uppercase_p (key))
rl_stuff_char ('$');
+ else if (vi_redoing)
+ rl_stuff_char (_rl_vi_last_motion);
if (rl_vi_domove (key, &c))
{
ding ();
- return;
+ return -1;
}
- if ((c != 'l') && (c != '|') && (c != 'h') && rl_mark < rl_end)
+ /* These are the motion commands that do not require adjusting the
+ mark. */
+ if ((strchr (" l|h^0bB", c) == 0) && (rl_mark < rl_end))
rl_mark++;
rl_kill_text (rl_point, rl_mark);
+ return (0);
}
+int
rl_vi_change_to (count, key)
int count, key;
{
- int c;
+ int c, start_pos;
- if (uppercase_p (key))
+ if (_rl_uppercase_p (key))
rl_stuff_char ('$');
+ else if (vi_redoing)
+ rl_stuff_char (_rl_vi_last_motion);
+
+ start_pos = rl_point;
if (rl_vi_domove (key, &c))
{
ding ();
- return;
+ return -1;
}
- if ((c != 'l') && (c != '|') && (c != 'h') && rl_mark < rl_end)
+ /* These are the motion commands that do not require adjusting the
+ mark. c[wW] are handled by special-case code in rl_vi_domove(),
+ and already leave the mark at the correct location. */
+ if ((strchr (" l|hwW^0bB", c) == 0) && (rl_mark < rl_end))
rl_mark++;
- rl_begin_undo_group ();
- vi_doing_insert = 1;
- rl_kill_text (rl_point, rl_mark);
- rl_vi_insertion_mode ();
+ /* The cursor never moves with c[wW]. */
+ if ((_rl_to_upper (c) == 'W') && rl_point < start_pos)
+ rl_point = start_pos;
+
+ if (vi_redoing)
+ {
+ if (vi_insert_buffer && *vi_insert_buffer)
+ rl_begin_undo_group ();
+ rl_delete_text (rl_point, rl_mark);
+ if (vi_insert_buffer && *vi_insert_buffer)
+ {
+ rl_insert_text (vi_insert_buffer);
+ rl_end_undo_group ();
+ }
+ }
+ else
+ {
+ rl_begin_undo_group (); /* to make the `u' command work */
+ rl_kill_text (rl_point, rl_mark);
+ /* `C' does not save the text inserted for undoing or redoing. */
+ if (_rl_uppercase_p (key) == 0)
+ _rl_vi_doing_insert = 1;
+ _rl_vi_set_last (key, count, rl_arg_sign);
+ rl_vi_insertion_mode (1, key);
+ }
+
+ return (0);
}
+int
rl_vi_yank_to (count, key)
int count, key;
{
int c, save = rl_point;
- if (uppercase_p (key))
+ if (_rl_uppercase_p (key))
rl_stuff_char ('$');
if (rl_vi_domove (key, &c))
{
ding ();
- return;
+ return -1;
}
- if ((c != 'l') && (c != '|') && (c != 'h') && rl_mark < rl_end)
+ /* These are the motion commands that do not require adjusting the
+ mark. */
+ if ((strchr (" l|h^0%bB", c) == 0) && (rl_mark < rl_end))
rl_mark++;
rl_begin_undo_group ();
rl_end_undo_group ();
rl_do_undo ();
rl_point = save;
+
+ return (0);
}
-rl_vi_delete (count)
+int
+rl_vi_delete (count, key)
+ int count, key;
{
int end;
if (rl_end == 0)
{
ding ();
- return;
+ return -1;
}
end = rl_point + count;
rl_kill_text (rl_point, end);
if (rl_point > 0 && rl_point == rl_end)
- rl_backward (1);
-}
-
-/* Turn the current line into a comment in shell history.
- A K*rn shell style function. */
-rl_vi_comment ()
-{
- rl_beg_of_line ();
-
- if (rl_vi_comment_begin != (char *)NULL)
- rl_insert_text (rl_vi_comment_begin);
- else
- rl_insert_text (": "); /* Default. */
-
- rl_redisplay ();
- rl_newline (1, '\010');
-}
-
-rl_vi_first_print ()
-{
- rl_back_to_indent ();
+ rl_backward (1, key);
+ return (0);
}
-rl_back_to_indent (ignore1, ignore2)
- int ignore1, ignore2;
+int
+rl_vi_back_to_indent (count, key)
+ int count, key;
{
- rl_beg_of_line ();
+ rl_beg_of_line (1, key);
while (rl_point < rl_end && whitespace (rl_line_buffer[rl_point]))
rl_point++;
+ return (0);
}
-/* NOTE: it is necessary that opposite directions are inverses */
-#define FTO 1 /* forward to */
-#define BTO -1 /* backward to */
-#define FFIND 2 /* forward find */
-#define BFIND -2 /* backward find */
+int
+rl_vi_first_print (count, key)
+ int count, key;
+{
+ return (rl_vi_back_to_indent (1, key));
+}
+int
rl_vi_char_search (count, key)
int count, key;
{
static char target;
static int orig_dir, dir;
- int pos;
if (key == ';' || key == ',')
- dir = (key == ';' ? orig_dir : -orig_dir);
+ dir = key == ';' ? orig_dir : -orig_dir;
else
{
- target = rl_getc (rl_instream);
+ if (vi_redoing)
+ target = _rl_vi_last_search_char;
+ else
+ _rl_vi_last_search_char = target = (*rl_getc_function) (rl_instream);
switch (key)
{
}
}
- pos = rl_point;
-
- while (count--)
- {
- if (dir < 0)
- {
- if (pos == 0)
- {
- ding ();
- return;
- }
-
- pos--;
- do
- {
- if (rl_line_buffer[pos] == target)
- {
- if (dir == BTO)
- rl_point = pos + 1;
- else
- rl_point = pos;
- break;
- }
- }
- while (pos--);
-
- if (pos < 0)
- {
- ding ();
- return;
- }
- }
- else
- { /* dir > 0 */
- if (pos >= rl_end)
- {
- ding ();
- return;
- }
-
- pos++;
- do
- {
- if (rl_line_buffer[pos] == target)
- {
- if (dir == FTO)
- rl_point = pos - 1;
- else
- rl_point = pos;
- break;
- }
- }
- while (++pos < rl_end);
-
- if (pos >= (rl_end - 1))
- {
- ding ();
- return;
- }
- }
- }
+ return (_rl_char_search_internal (count, dir, target));
}
/* Match brackets */
-rl_vi_match ()
+int
+rl_vi_match (ignore, key)
+ int ignore, key;
{
int count = 1, brack, pos;
{
while ((brack = rl_vi_bracktype (rl_line_buffer[rl_point])) == 0 &&
rl_point < rl_end - 1)
- rl_forward (1);
+ rl_forward (1, key);
if (brack <= 0)
{
rl_point = pos;
ding ();
- return;
+ return -1;
}
}
else
{
ding ();
- return;
+ return -1;
}
}
}
else
{
ding ();
- return;
+ return -1;
}
}
}
rl_point = pos;
+ return (0);
}
int
}
}
+int
rl_vi_change_char (count, key)
int count, key;
{
int c;
- c = rl_getc (rl_instream);
+ if (vi_redoing)
+ c = _rl_vi_last_replacement;
+ else
+ _rl_vi_last_replacement = c = (*rl_getc_function) (rl_instream);
if (c == '\033' || c == CTRL ('C'))
- return;
+ return -1;
while (count-- && rl_point < rl_end)
{
rl_delete (1, c);
rl_insert (1, c);
if (count == 0)
- rl_backward (1);
+ rl_backward (1, c);
rl_end_undo_group ();
}
+ return (0);
}
+int
rl_vi_subst (count, key)
int count, key;
{
rl_begin_undo_group ();
- vi_doing_insert = 1;
- if (uppercase_p (key))
+ if (_rl_uppercase_p (key))
{
- rl_beg_of_line ();
- rl_kill_line (1);
+ rl_beg_of_line (1, key);
+ rl_kill_line (1, key);
}
else
- rl_delete (count, key);
+ rl_delete_text (rl_point, rl_point+count);
+
+ rl_end_undo_group ();
+
+ _rl_vi_set_last (key, count, rl_arg_sign);
- rl_vi_insertion_mode ();
+ if (vi_redoing)
+ {
+ int o = _rl_doing_an_undo;
+
+ _rl_doing_an_undo = 1;
+ if (vi_insert_buffer && *vi_insert_buffer)
+ rl_insert_text (vi_insert_buffer);
+ _rl_doing_an_undo = o;
+ }
+ else
+ {
+ rl_begin_undo_group ();
+ _rl_vi_doing_insert = 1;
+ rl_vi_insertion_mode (1, key);
+ }
+
+ return (0);
}
+int
rl_vi_overstrike (count, key)
int count, key;
{
int i;
- if (vi_doing_insert == 0)
+ if (_rl_vi_doing_insert == 0)
{
- vi_doing_insert = 1;
+ _rl_vi_doing_insert = 1;
rl_begin_undo_group ();
}
rl_end_undo_group ();
}
+ return (0);
}
-rl_vi_overstrike_delete (count)
- int count;
+int
+rl_vi_overstrike_delete (count, key)
+ int count, key;
{
int i, s;
vi_replace_count--;
if (rl_point == s)
- rl_backward (1);
+ rl_backward (1, key);
}
- if (vi_replace_count == 0 && vi_doing_insert)
+ if (vi_replace_count == 0 && _rl_vi_doing_insert)
{
rl_end_undo_group ();
rl_do_undo ();
- vi_doing_insert = 0;
+ _rl_vi_doing_insert = 0;
}
+ return (0);
}
+int
rl_vi_replace (count, key)
int count, key;
{
{
vi_replace_map = rl_make_bare_keymap ();
- for (i = ' '; i < 127; i++)
+ for (i = ' '; i < KEYMAP_SIZE; i++)
vi_replace_map[i].function = rl_vi_overstrike;
vi_replace_map[RUBOUT].function = rl_vi_overstrike_delete;
vi_replace_map[CTRL ('H')].function = rl_vi_overstrike_delete;
}
- keymap = vi_replace_map;
+ _rl_keymap = vi_replace_map;
+ return (0);
}
-/*
- * Try to complete the word we are standing on or the word that ends with
- * the previous character. A space matches everything.
- * Word delimiters are space and ;.
- */
+#if 0
+/* Try to complete the word we are standing on or the word that ends with
+ the previous character. A space matches everything. Word delimiters are
+ space and ;. */
+int
rl_vi_possible_completions()
{
int save_pos = rl_point;
- if (!index (" ;", rl_line_buffer[rl_point]))
+ if (rl_line_buffer[rl_point] != ' ' && rl_line_buffer[rl_point] != ';')
{
- while (!index(" ;", rl_line_buffer[++rl_point]))
- ;
+ while (rl_point < rl_end && rl_line_buffer[rl_point] != ' ' &&
+ rl_line_buffer[rl_point] != ';')
+ rl_point++;
}
- else if (rl_line_buffer[rl_point-1] == ';')
+ else if (rl_line_buffer[rl_point - 1] == ';')
{
ding ();
return (0);
return (0);
}
+#endif
+
+/* Functions to save and restore marks. */
+int
+rl_vi_set_mark (count, key)
+ int count, key;
+{
+ int ch;
+
+ ch = rl_read_key ();
+ if (_rl_lowercase_p (ch) == 0)
+ {
+ ding ();
+ return -1;
+ }
+ ch -= 'a';
+ vi_mark_chars[ch] = rl_point;
+ return 0;
+}
+
+int
+rl_vi_goto_mark (count, key)
+ int count, key;
+{
+ int ch;
+
+ ch = rl_read_key ();
+ if (ch == '`')
+ {
+ rl_point = rl_mark;
+ return 0;
+ }
+ else if (_rl_lowercase_p (ch) == 0)
+ {
+ ding ();
+ return -1;
+ }
+
+ ch -= 'a';
+ if (vi_mark_chars[ch] == -1)
+ {
+ ding ();
+ return -1;
+ }
+ rl_point = vi_mark_chars[ch];
+ return 0;
+}
#endif /* VI_MODE */
projects / deliverable / binutils-gdb.git / blobdiff