[BACK]Return to kill.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / readline

Diff for /embedaddon/readline/kill.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2014/07/30 08:16:45 version 1.1.1.2, 2021/03/17 01:01:01
Line 1 Line 1
 /* kill.c -- kill ring management. */  /* kill.c -- kill ring management. */
   
/* Copyright (C) 1994 Free Software Foundation, Inc./* Copyright (C) 1994-2020 Free Software Foundation, Inc.
   
    This file is part of the GNU Readline Library (Readline), a library     This file is part of the GNU Readline Library (Readline), a library
    for reading lines of text with interactive input and history editing.           for reading lines of text with interactive input and history editing.      
Line 78  static int rl_yank_nth_arg_internal PARAMS((int, int,  Line 78  static int rl_yank_nth_arg_internal PARAMS((int, int, 
 /* How to say that you only want to save a certain amount  /* How to say that you only want to save a certain amount
    of kill material. */     of kill material. */
 int  int
rl_set_retained_kills (num)rl_set_retained_kills (int num)
     int num; 
 {  {
   return 0;    return 0;
 }  }
Line 89  rl_set_retained_kills (num) Line 88  rl_set_retained_kills (num)
    non-zero, and the last command was a kill, the text is appended to the     non-zero, and the last command was a kill, the text is appended to the
    current kill ring slot, otherwise prepended. */     current kill ring slot, otherwise prepended. */
 static int  static int
_rl_copy_to_kill_ring (text, append)_rl_copy_to_kill_ring (char *text, int append)
     char *text; 
     int append; 
 {  {
   char *old, *new;    char *old, *new;
   int slot;    int slot;
   
   /* First, find the slot to work with. */    /* First, find the slot to work with. */
  if (_rl_last_command_was_kill == 0)  if (_rl_last_command_was_kill == 0 || rl_kill_ring == 0)
     {      {
       /* Get a new slot.  */        /* Get a new slot.  */
       if (rl_kill_ring == 0)        if (rl_kill_ring == 0)
Line 122  _rl_copy_to_kill_ring (text, append) Line 119  _rl_copy_to_kill_ring (text, append)
           else            else
             {              {
               slot = rl_kill_ring_length += 1;                slot = rl_kill_ring_length += 1;
              rl_kill_ring = (char **)xrealloc (rl_kill_ring, slot * sizeof (char *));              rl_kill_ring = (char **)xrealloc (rl_kill_ring, (slot + 1) * sizeof (char *));
             }              }
           rl_kill_ring[--slot] = (char *)NULL;            rl_kill_ring[--slot] = (char *)NULL;
         }          }
Line 131  _rl_copy_to_kill_ring (text, append) Line 128  _rl_copy_to_kill_ring (text, append)
     slot = rl_kill_ring_length - 1;      slot = rl_kill_ring_length - 1;
   
   /* If the last command was a kill, prepend or append. */    /* If the last command was a kill, prepend or append. */
  if (_rl_last_command_was_kill && rl_editing_mode != vi_mode)  if (_rl_last_command_was_kill && rl_kill_ring[slot] && rl_editing_mode != vi_mode)
     {      {
       old = rl_kill_ring[slot];        old = rl_kill_ring[slot];
       new = (char *)xmalloc (1 + strlen (old) + strlen (text));        new = (char *)xmalloc (1 + strlen (old) + strlen (text));
Line 163  _rl_copy_to_kill_ring (text, append) Line 160  _rl_copy_to_kill_ring (text, append)
    last command was not a kill command, then a new slot is made for     last command was not a kill command, then a new slot is made for
    this kill. */     this kill. */
 int  int
rl_kill_text (from, to)rl_kill_text (int from, int to)
     int from, to; 
 {  {
   char *text;    char *text;
   
Line 198  rl_kill_text (from, to) Line 194  rl_kill_text (from, to)
   
 /* Delete the word at point, saving the text in the kill ring. */  /* Delete the word at point, saving the text in the kill ring. */
 int  int
rl_kill_word (count, key)rl_kill_word (int count, int key)
     int count, key; 
 {  {
   int orig_point;    int orig_point;
   
Line 222  rl_kill_word (count, key) Line 217  rl_kill_word (count, key)
   
 /* Rubout the word before point, placing it on the kill ring. */  /* Rubout the word before point, placing it on the kill ring. */
 int  int
rl_backward_kill_word (count, ignore)rl_backward_kill_word (int count, int key)
     int count, ignore; 
 {  {
   int orig_point;    int orig_point;
   
   if (count < 0)    if (count < 0)
    return (rl_kill_word (-count, ignore));    return (rl_kill_word (-count, key));
   else    else
     {      {
       orig_point = rl_point;        orig_point = rl_point;
      rl_backward_word (count, ignore);      rl_backward_word (count, key);
   
       if (rl_point != orig_point)        if (rl_point != orig_point)
         rl_kill_text (orig_point, rl_point);          rl_kill_text (orig_point, rl_point);
Line 246  rl_backward_kill_word (count, ignore) Line 240  rl_backward_kill_word (count, ignore)
 /* Kill from here to the end of the line.  If DIRECTION is negative, kill  /* Kill from here to the end of the line.  If DIRECTION is negative, kill
    back to the line start instead. */     back to the line start instead. */
 int  int
rl_kill_line (direction, ignore)rl_kill_line (int direction, int key)
     int direction, ignore; 
 {  {
   int orig_point;    int orig_point;
   
   if (direction < 0)    if (direction < 0)
    return (rl_backward_kill_line (1, ignore));    return (rl_backward_kill_line (1, key));
   else    else
     {      {
       orig_point = rl_point;        orig_point = rl_point;
      rl_end_of_line (1, ignore);      rl_end_of_line (1, key);
       if (orig_point != rl_point)        if (orig_point != rl_point)
         rl_kill_text (orig_point, rl_point);          rl_kill_text (orig_point, rl_point);
       rl_point = orig_point;        rl_point = orig_point;
Line 269  rl_kill_line (direction, ignore) Line 262  rl_kill_line (direction, ignore)
 /* Kill backwards to the start of the line.  If DIRECTION is negative, kill  /* Kill backwards to the start of the line.  If DIRECTION is negative, kill
    forwards to the line end instead. */     forwards to the line end instead. */
 int  int
rl_backward_kill_line (direction, ignore)rl_backward_kill_line (int direction, int key)
     int direction, ignore; 
 {  {
   int orig_point;    int orig_point;
   
   if (direction < 0)    if (direction < 0)
    return (rl_kill_line (1, ignore));    return (rl_kill_line (1, key));
   else    else
     {      {
      if (!rl_point)      if (rl_point == 0)
         rl_ding ();          rl_ding ();
       else        else
         {          {
           orig_point = rl_point;            orig_point = rl_point;
          rl_beg_of_line (1, ignore);          rl_beg_of_line (1, key);
           if (rl_point != orig_point)            if (rl_point != orig_point)
             rl_kill_text (orig_point, rl_point);              rl_kill_text (orig_point, rl_point);
           if (rl_editing_mode == emacs_mode)            if (rl_editing_mode == emacs_mode)
Line 295  rl_backward_kill_line (direction, ignore) Line 287  rl_backward_kill_line (direction, ignore)
   
 /* Kill the whole line, no matter where point is. */  /* Kill the whole line, no matter where point is. */
 int  int
rl_kill_full_line (count, ignore)rl_kill_full_line (int count, int key)
     int count, ignore; 
 {  {
   rl_begin_undo_group ();    rl_begin_undo_group ();
   rl_point = 0;    rl_point = 0;
Line 313  rl_kill_full_line (count, ignore) Line 304  rl_kill_full_line (count, ignore)
 /* This does what C-w does in Unix.  We can't prevent people from  /* This does what C-w does in Unix.  We can't prevent people from
    using behaviour that they expect. */     using behaviour that they expect. */
 int  int
rl_unix_word_rubout (count, key)rl_unix_word_rubout (int count, int key)
     int count, key; 
 {  {
   int orig_point;    int orig_point;
   
Line 332  rl_unix_word_rubout (count, key) Line 322  rl_unix_word_rubout (count, key)
             rl_point--;              rl_point--;
   
           while (rl_point && (whitespace (rl_line_buffer[rl_point - 1]) == 0))            while (rl_point && (whitespace (rl_line_buffer[rl_point - 1]) == 0))
            rl_point--;            rl_point--;         /* XXX - multibyte? */
         }          }
   
       rl_kill_text (orig_point, rl_point);        rl_kill_text (orig_point, rl_point);
Line 346  rl_unix_word_rubout (count, key) Line 336  rl_unix_word_rubout (count, key)
 /* This deletes one filename component in a Unix pathname.  That is, it  /* This deletes one filename component in a Unix pathname.  That is, it
    deletes backward to directory separator (`/') or whitespace.  */     deletes backward to directory separator (`/') or whitespace.  */
 int  int
rl_unix_filename_rubout (count, key)rl_unix_filename_rubout (int count, int key)
     int count, key; 
 {  {
   int orig_point, c;    int orig_point, c;
   
Line 370  rl_unix_filename_rubout (count, key) Line 359  rl_unix_filename_rubout (count, key)
   
           while (rl_point && (whitespace (c) == 0) && c != '/')            while (rl_point && (whitespace (c) == 0) && c != '/')
             {              {
              rl_point--;              rl_point--;       /* XXX - multibyte? */
               c = rl_line_buffer[rl_point - 1];                c = rl_line_buffer[rl_point - 1];
             }              }
         }          }
Line 390  rl_unix_filename_rubout (count, key) Line 379  rl_unix_filename_rubout (count, key)
    into the line at all, and if you aren't, then you know what you are     into the line at all, and if you aren't, then you know what you are
    doing. */     doing. */
 int  int
rl_unix_line_discard (count, key)rl_unix_line_discard (int count, int key)
     int count, key; 
 {  {
   if (rl_point == 0)    if (rl_point == 0)
     rl_ding ();      rl_ding ();
Line 408  rl_unix_line_discard (count, key) Line 396  rl_unix_line_discard (count, key)
 /* Copy the text in the `region' to the kill ring.  If DELETE is non-zero,  /* Copy the text in the `region' to the kill ring.  If DELETE is non-zero,
    delete the text from the line as well. */     delete the text from the line as well. */
 static int  static int
region_kill_internal (delete)region_kill_internal (int delete)
     int delete; 
 {  {
   char *text;    char *text;
   
Line 421  region_kill_internal (delete) Line 408  region_kill_internal (delete)
       _rl_copy_to_kill_ring (text, rl_point < rl_mark);        _rl_copy_to_kill_ring (text, rl_point < rl_mark);
     }      }
   
     _rl_fix_point (1);
   _rl_last_command_was_kill++;    _rl_last_command_was_kill++;
   return 0;    return 0;
 }  }
   
 /* Copy the text in the region to the kill ring. */  /* Copy the text in the region to the kill ring. */
 int  int
rl_copy_region_to_kill (count, ignore)rl_copy_region_to_kill (int count, int key)
     int count, ignore; 
 {  {
   return (region_kill_internal (0));    return (region_kill_internal (0));
 }  }
   
 /* Kill the text between the point and mark. */  /* Kill the text between the point and mark. */
 int  int
rl_kill_region (count, ignore)rl_kill_region (int count, int key)
     int count, ignore; 
 {  {
   int r, npoint;    int r, npoint;
   
   npoint = (rl_point < rl_mark) ? rl_point : rl_mark;    npoint = (rl_point < rl_mark) ? rl_point : rl_mark;
   r = region_kill_internal (1);    r = region_kill_internal (1);
   _rl_fix_point (1);  
   rl_point = npoint;    rl_point = npoint;
     _rl_fix_point (1);
   return r;    return r;
 }  }
   
 /* Copy COUNT words to the kill ring.  DIR says which direction we look  /* Copy COUNT words to the kill ring.  DIR says which direction we look
    to find the words. */     to find the words. */
 static int  static int
_rl_copy_word_as_kill (count, dir)_rl_copy_word_as_kill (int count, int dir)
     int count, dir; 
 {  {
   int om, op, r;    int om, op, r;
   
Line 479  _rl_copy_word_as_kill (count, dir) Line 464  _rl_copy_word_as_kill (count, dir)
 }  }
   
 int  int
rl_copy_forward_word (count, key)rl_copy_forward_word (int count, int key)
     int count, key; 
 {  {
   if (count < 0)    if (count < 0)
     return (rl_copy_backward_word (-count, key));      return (rl_copy_backward_word (-count, key));
Line 489  rl_copy_forward_word (count, key) Line 473  rl_copy_forward_word (count, key)
 }  }
   
 int  int
rl_copy_backward_word (count, key)rl_copy_backward_word (int count, int key)
     int count, key; 
 {  {
   if (count < 0)    if (count < 0)
     return (rl_copy_forward_word (-count, key));      return (rl_copy_forward_word (-count, key));
Line 500  rl_copy_backward_word (count, key) Line 483  rl_copy_backward_word (count, key)
       
 /* Yank back the last killed text.  This ignores arguments. */  /* Yank back the last killed text.  This ignores arguments. */
 int  int
rl_yank (count, ignore)rl_yank (int count, int key)
     int count, ignore; 
 {  {
   if (rl_kill_ring == 0)    if (rl_kill_ring == 0)
     {      {
       _rl_abort_internal ();        _rl_abort_internal ();
      return -1;      return 1;
     }      }
   
   _rl_set_mark_at_pos (rl_point);    _rl_set_mark_at_pos (rl_point);
Line 519  rl_yank (count, ignore) Line 501  rl_yank (count, ignore)
    delete that text from the line, rotate the index down, and     delete that text from the line, rotate the index down, and
    yank back some other text. */     yank back some other text. */
 int  int
rl_yank_pop (count, key)rl_yank_pop (int count, int key)
     int count, key; 
 {  {
   int l, n;    int l, n;
   
Line 528  rl_yank_pop (count, key) Line 509  rl_yank_pop (count, key)
       !rl_kill_ring)        !rl_kill_ring)
     {      {
       _rl_abort_internal ();        _rl_abort_internal ();
      return -1;      return 1;
     }      }
   
   l = strlen (rl_kill_ring[rl_kill_index]);    l = strlen (rl_kill_ring[rl_kill_index]);
Line 546  rl_yank_pop (count, key) Line 527  rl_yank_pop (count, key)
   else    else
     {      {
       _rl_abort_internal ();        _rl_abort_internal ();
      return -1;      return 1;
     }      }
 }  }
   
   #if defined (VI_MODE)
   int
   rl_vi_yank_pop (int count, int key)
   {
     int l, n;
   
     if (((rl_last_func != rl_vi_yank_pop) && (rl_last_func != rl_vi_put)) ||
         !rl_kill_ring)
       {
         _rl_abort_internal ();
         return 1;
       }
   
     l = strlen (rl_kill_ring[rl_kill_index]);
     n = rl_point - l;
     if (n >= 0 && STREQN (rl_line_buffer + n, rl_kill_ring[rl_kill_index], l))
       {
         rl_delete_text (n, rl_point);
         rl_point = n;
         rl_kill_index--;
         if (rl_kill_index < 0)
           rl_kill_index = rl_kill_ring_length - 1;
         rl_vi_put (1, 'p');
         return 0;
       }
     else
       {
         _rl_abort_internal ();
         return 1;
       }
   }
   #endif /* VI_MODE */
   
 /* Yank the COUNTh argument from the previous history line, skipping  /* Yank the COUNTh argument from the previous history line, skipping
    HISTORY_SKIP lines before looking for the `previous line'. */     HISTORY_SKIP lines before looking for the `previous line'. */
 static int  static int
rl_yank_nth_arg_internal (count, ignore, history_skip)rl_yank_nth_arg_internal (int count, int key, int history_skip)
     int count, ignore, history_skip; 
 {  {
   register HIST_ENTRY *entry;    register HIST_ENTRY *entry;
   char *arg;    char *arg;
Line 575  rl_yank_nth_arg_internal (count, ignore, history_skip) Line 588  rl_yank_nth_arg_internal (count, ignore, history_skip)
   if (entry == 0)    if (entry == 0)
     {      {
       rl_ding ();        rl_ding ();
      return -1;      return 1;
     }      }
   
   arg = history_arg_extract (count, count, entry->line);    arg = history_arg_extract (count, count, entry->line);
Line 583  rl_yank_nth_arg_internal (count, ignore, history_skip) Line 596  rl_yank_nth_arg_internal (count, ignore, history_skip)
     {      {
       rl_ding ();        rl_ding ();
       FREE (arg);        FREE (arg);
      return -1;      return 1;
     }      }
   
   rl_begin_undo_group ();    rl_begin_undo_group ();
Line 593  rl_yank_nth_arg_internal (count, ignore, history_skip) Line 606  rl_yank_nth_arg_internal (count, ignore, history_skip)
 #if defined (VI_MODE)  #if defined (VI_MODE)
   /* Vi mode always inserts a space before yanking the argument, and it    /* Vi mode always inserts a space before yanking the argument, and it
      inserts it right *after* rl_point. */       inserts it right *after* rl_point. */
  if (rl_editing_mode == vi_mode)  if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap)
     {      {
      rl_vi_append_mode (1, ignore);      rl_vi_append_mode (1, key);
       rl_insert_text (" ");        rl_insert_text (" ");
     }      }
 #endif /* VI_MODE */  #endif /* VI_MODE */
Line 609  rl_yank_nth_arg_internal (count, ignore, history_skip) Line 622  rl_yank_nth_arg_internal (count, ignore, history_skip)
   
 /* Yank the COUNTth argument from the previous history line. */  /* Yank the COUNTth argument from the previous history line. */
 int  int
rl_yank_nth_arg (count, ignore)rl_yank_nth_arg (int count, int key)
     int count, ignore; 
 {  {
  return (rl_yank_nth_arg_internal (count, ignore, 0));  return (rl_yank_nth_arg_internal (count, key, 0));
 }  }
   
 /* Yank the last argument from the previous history line.  This `knows'  /* Yank the last argument from the previous history line.  This `knows'
    how rl_yank_nth_arg treats a count of `$'.  With an argument, this     how rl_yank_nth_arg treats a count of `$'.  With an argument, this
    behaves the same as rl_yank_nth_arg. */     behaves the same as rl_yank_nth_arg. */
 int  int
rl_yank_last_arg (count, key)rl_yank_last_arg (int count, int key)
     int count, key; 
 {  {
   static int history_skip = 0;    static int history_skip = 0;
   static int explicit_arg_p = 0;    static int explicit_arg_p = 0;
Line 656  rl_yank_last_arg (count, key) Line 667  rl_yank_last_arg (count, key)
   return retval;    return retval;
 }  }
   
/* A special paste command for users of Cygnus's cygwin32. *//* Having read the special escape sequence denoting the beginning of a
#if defined (__CYGWIN__)   `bracketed paste' sequence, read the rest of the pasted input until the
    closing sequence and return the pasted text. */
 char *
 _rl_bracketed_text (size_t *lenp)
 {
   int c;
   size_t len, cap;
   char *buf;
 
   len = 0;
   buf = xmalloc (cap = 64);
   buf[0] = '\0';
 
   RL_SETSTATE (RL_STATE_MOREINPUT);
   while ((c = rl_read_key ()) >= 0)
     {
       if (RL_ISSTATE (RL_STATE_MACRODEF))
         _rl_add_macro_char (c);
 
       if (c == '\r')            /* XXX */
         c = '\n';
 
       if (len == cap)
         buf = xrealloc (buf, cap *= 2);
 
       buf[len++] = c;
       if (len >= BRACK_PASTE_SLEN && c == BRACK_PASTE_LAST &&
           STREQN (buf + len - BRACK_PASTE_SLEN, BRACK_PASTE_SUFF, BRACK_PASTE_SLEN))
         {
           len -= BRACK_PASTE_SLEN;
           break;
         }
     }
   RL_UNSETSTATE (RL_STATE_MOREINPUT);
 
   if (c >= 0)
     {
       if (len == cap)
         buf = xrealloc (buf, cap + 1);
       buf[len] = '\0';
     }
 
   if (lenp)
     *lenp = len;
   return (buf);
 }
 
 /* Having read the special escape sequence denoting the beginning of a
    `bracketed paste' sequence, read the rest of the pasted input until the
    closing sequence and insert the pasted text as a single unit without
    interpretation. Temporarily highlight the inserted text. */
 int
 rl_bracketed_paste_begin (int count, int key)
 {
   int retval, c;
   size_t len, cap;
   char *buf;
 
   buf = _rl_bracketed_text (&len);
   rl_mark = rl_point;
   retval = rl_insert_text (buf) == len ? 0 : 1;
   if (_rl_enable_active_region)
     rl_activate_mark ();
 
   xfree (buf);
   return (retval);
 }
 
 int
 _rl_read_bracketed_paste_prefix (int c)
 {
   char pbuf[BRACK_PASTE_SLEN+1], *pbpref;
   int key, ind, j;
 
   pbpref = BRACK_PASTE_PREF;            /* XXX - debugging */
   if (c != pbpref[0])
     return (0);
   pbuf[ind = 0] = c;
   while (ind < BRACK_PASTE_SLEN-1 &&
          (RL_ISSTATE (RL_STATE_INPUTPENDING|RL_STATE_MACROINPUT) == 0) &&
          _rl_pushed_input_available () == 0 &&
          _rl_input_queued (0))
     {
       key = rl_read_key ();             /* XXX - for now */
       if (key < 0)
         break;
       pbuf[++ind] = key;
       if (pbuf[ind] != pbpref[ind])
         break;
     }
 
   if (ind < BRACK_PASTE_SLEN-1)         /* read incomplete sequence */
     {
       while (ind >= 0)
         _rl_unget_char (pbuf[ind--]);
       return (key < 0 ? key : 0);
     }
   return (key < 0 ? key : 1);
 }
 
 /* Get a character from wherever we read input, handling input in bracketed
    paste mode. If we don't have or use bracketed paste mode, this can be
    used in place of rl_read_key(). */
 int
 _rl_bracketed_read_key ()
 {
   int c, r;
   char *pbuf;
   size_t pblen;
 
   RL_SETSTATE(RL_STATE_MOREINPUT);
   c = rl_read_key ();
   RL_UNSETSTATE(RL_STATE_MOREINPUT);
 
   if (c < 0)
     return -1;
 
   /* read pasted data with bracketed-paste mode enabled. */
   if (_rl_enable_bracketed_paste && c == ESC && (r = _rl_read_bracketed_paste_prefix (c)) == 1)
     {
       pbuf = _rl_bracketed_text (&pblen);
       if (pblen == 0)
         {
           xfree (pbuf);
           return 0;             /* XXX */
         }
       c = (unsigned char)pbuf[0];
       if (pblen > 1)
         {
           while (--pblen > 0)
             _rl_unget_char ((unsigned char)pbuf[pblen]);
         }
       xfree (pbuf);
     }
 
   return c;
 }
 
 /* Get a character from wherever we read input, handling input in bracketed
    paste mode. If we don't have or use bracketed paste mode, this can be
    used in place of rl_read_key(). */
 int
 _rl_bracketed_read_mbstring (char *mb, int mlen)
 {
   int c, r;
 
   c = _rl_bracketed_read_key ();
   if (c < 0)
     return -1;
 
 #if defined (HANDLE_MULTIBYTE)
   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
     c = _rl_read_mbstring (c, mb, mlen);
   else
 #endif
     mb[0] = c;
   mb[mlen] = '\0';              /* just in case */
 
   return c;
 }
 
 /* A special paste command for Windows users. */
 #if defined (_WIN32)
 #include <windows.h>  #include <windows.h>
   
 int  int
rl_paste_from_clipboard (count, key)rl_paste_from_clipboard (int count, int key)
     int count, key; 
 {  {
   char *data, *ptr;    char *data, *ptr;
   int len;    int len;
Line 691  rl_paste_from_clipboard (count, key) Line 863  rl_paste_from_clipboard (count, key)
     }      }
   return (0);    return (0);
 }  }
#endif /* __CYGWIN__ */#endif /* _WIN32 */
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>