Deleted Added
sdiff udiff text old ( 58314 ) new ( 75409 )
full compact
1/* $FreeBSD: head/contrib/libreadline/display.c 58314 2000-03-19 22:00:57Z ache $ */
2/* display.c -- readline redisplay facility. */
3
4/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
5
6 This file is part of the GNU Readline Library, a library for
7 reading lines of text with interactive input and history editing.
8
9 The GNU Readline Library is free software; you can redistribute it

--- 45 unchanged lines hidden (view full) ---

55#include "rlprivate.h"
56#include "xmalloc.h"
57
58#if !defined (strchr) && !defined (__STDC__)
59extern char *strchr (), *strrchr ();
60#endif /* !strchr && !__STDC__ */
61
62#if defined (HACK_TERMCAP_MOTION)
63extern char *term_forward_char;
64#endif
65
66static void update_line __P((char *, char *, int, int, int, int));
67static void space_to_eol __P((int));
68static void delete_chars __P((int));
69static void insert_some_chars __P((char *, int));
70static void cr __P((void));
71

--- 27 unchanged lines hidden (view full) ---

99 just drew into be the one which reflects the current contents of the
100 screen, and place the cursor where it belongs.
101
102 Commands that want to can fix the display themselves, and then let
103 this function know that the display has been fixed by setting the
104 RL_DISPLAY_FIXED variable. This is good for efficiency. */
105
106/* Application-specific redisplay function. */
107VFunction *rl_redisplay_function = rl_redisplay;
108
109/* Global variables declared here. */
110/* What YOU turn on when you have handled all redisplay yourself. */
111int rl_display_fixed = 0;
112
113int _rl_suppress_redisplay = 0;
114
115/* The stuff that gets printed out before the actual text of the line.

--- 22 unchanged lines hidden (view full) ---

138static char msg_buf[128];
139
140/* Non-zero forces the redisplay even if we thought it was unnecessary. */
141static int forced_display;
142
143/* Default and initial buffer size. Can grow. */
144static int line_size = 1024;
145
146static char *local_prompt, *local_prompt_prefix;
147static int visible_length, prefix_length;
148
149/* The number of invisible characters in the line currently being
150 displayed on the screen. */
151static int visible_wrap_offset;
152
153/* static so it can be shared between rl_redisplay and update_line */
154static int wrap_offset;
155
156/* The index of the last invisible_character in the prompt string. */
157static int last_invisible;
158
159/* The length (buffer offset) of the first line of the last (possibly
160 multi-line) buffer displayed on the screen. */
161static int visible_first_line_len;
162
163/* Expand the prompt string S and return the number of visible
164 characters in *LP, if LP is not null. This is currently more-or-less
165 a placeholder for expansion. LIP, if non-null is a place to store the
166 index of the last invisible character in the returned string. */
167
168/* Current implementation:
169 \001 (^A) start non-visible characters
170 \002 (^B) end non-visible characters
171 all characters except \001 and \002 (following a \001) are copied to
172 the returned string; all characters except those between \001 and
173 \002 are assumed to be `visible'. */
174
175static char *
176expand_prompt (pmt, lp, lip)
177 char *pmt;
178 int *lp, *lip;
179{
180 char *r, *ret, *p;
181 int l, rl, last, ignoring;
182
183 /* Short-circuit if we can. */
184 if (strchr (pmt, RL_PROMPT_START_IGNORE) == 0)
185 {
186 r = savestring (pmt);
187 if (lp)
188 *lp = strlen (r);
189 return r;
190 }
191
192 l = strlen (pmt);
193 r = ret = xmalloc (l + 1);
194
195 for (rl = ignoring = last = 0, p = pmt; p && *p; p++)
196 {
197 /* This code strips the invisible character string markers
198 RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE */
199 if (*p == RL_PROMPT_START_IGNORE)
200 {
201 ignoring++;
202 continue;
203 }
204 else if (ignoring && *p == RL_PROMPT_END_IGNORE)
205 {
206 ignoring = 0;
207 last = r - ret - 1;
208 continue;
209 }
210 else
211 {
212 *r++ = *p;
213 if (!ignoring)
214 rl++;
215 }
216 }
217
218 *r = '\0';
219 if (lp)
220 *lp = rl;
221 if (lip)
222 *lip = last;
223 return ret;
224}
225
226/* Just strip out RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE from
227 PMT and return the rest of PMT. */
228char *
229_rl_strip_prompt (pmt)
230 char *pmt;
231{
232 char *ret;
233
234 ret = expand_prompt (pmt, (int *)NULL, (int *)NULL);
235 return ret;
236}
237
238/*
239 * Expand the prompt string into the various display components, if
240 * necessary.
241 *
242 * local_prompt = expanded last line of string in rl_display_prompt
243 * (portion after the final newline)
244 * local_prompt_prefix = portion before last newline of rl_display_prompt,
245 * expanded via expand_prompt
246 * visible_length = number of visible characters in local_prompt
247 * prefix_length = number of visible characters in local_prompt_prefix
248 *
249 * This function is called once per call to readline(). It may also be
250 * called arbitrarily to expand the primary prompt.
251 *
252 * The return value is the number of visible characters on the last line
253 * of the (possibly multi-line) prompt.
254 */
255int
256rl_expand_prompt (prompt)
257 char *prompt;
258{
259 char *p, *t;
260 int c;
261
262 /* Clear out any saved values. */
263 if (local_prompt)
264 free (local_prompt);
265 if (local_prompt_prefix)
266 free (local_prompt_prefix);
267 local_prompt = local_prompt_prefix = (char *)0;
268 last_invisible = visible_length = 0;
269
270 if (prompt == 0 || *prompt == 0)
271 return (0);
272
273 p = strrchr (prompt, '\n');
274 if (!p)
275 {
276 /* The prompt is only one line. */
277 local_prompt = expand_prompt (prompt, &visible_length, &last_invisible);
278 local_prompt_prefix = (char *)0;
279 return (visible_length);
280 }
281 else
282 {
283 /* The prompt spans multiple lines. */
284 t = ++p;
285 local_prompt = expand_prompt (p, &visible_length, &last_invisible);
286 c = *t; *t = '\0';
287 /* The portion of the prompt string up to and including the
288 final newline is now null-terminated. */
289 local_prompt_prefix = expand_prompt (prompt, &prefix_length, (int *)NULL);
290 *t = c;
291 return (prefix_length);
292 }
293}
294
295/* Initialize the VISIBLE_LINE and INVISIBLE_LINE arrays, and their associated
296 arrays of line break markers. MINSIZE is the minimum size of VISIBLE_LINE
297 and INVISIBLE_LINE; if it is greater than LINE_SIZE, LINE_SIZE is
298 increased. If the lines have already been allocated, this ensures that
299 they can hold at least MINSIZE characters. */

--- 95 unchanged lines hidden (view full) ---

395 line_size = (temp + 1024) - (temp % 1024);
396 visible_line = xrealloc (visible_line, line_size);
397 line = invisible_line = xrealloc (invisible_line, line_size);
398 }
399 strncpy (line + out, local_prompt, local_len);
400 out += local_len;
401 }
402 line[out] = '\0';
403 wrap_offset = local_len - visible_length;
404 }
405 else
406 {
407 int pmtlen;
408 prompt_this_line = strrchr (rl_display_prompt, '\n');
409 if (!prompt_this_line)
410 prompt_this_line = rl_display_prompt;
411 else

--- 16 unchanged lines hidden (view full) ---

428 {
429 line_size = (temp + 1024) - (temp % 1024);
430 visible_line = xrealloc (visible_line, line_size);
431 line = invisible_line = xrealloc (invisible_line, line_size);
432 }
433 strncpy (line + out, prompt_this_line, pmtlen);
434 out += pmtlen;
435 line[out] = '\0';
436 wrap_offset = 0;
437 }
438
439#define CHECK_INV_LBREAKS() \
440 do { \
441 if (newlines >= (inv_lbsize - 2)) \
442 { \
443 inv_lbsize *= 2; \
444 inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
445 } \
446 } while (0)
447
448#define CHECK_LPOS() \
449 do { \
450 lpos++; \
451 if (lpos >= screenwidth) \
452 { \
453 if (newlines >= (inv_lbsize - 2)) \
454 { \
455 inv_lbsize *= 2; \
456 inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
457 } \
458 inv_lbreaks[++newlines] = out; \
459 lpos = 0; \
460 } \
461 } while (0)
462
463 /* inv_lbreaks[i] is where line i starts in the buffer. */
464 inv_lbreaks[newlines = 0] = 0;
465 lpos = out - wrap_offset;
466
467 /* XXX - what if lpos is already >= screenwidth before we start drawing the
468 contents of the command line? */
469 while (lpos >= screenwidth)
470 {
471 /* XXX - possible fix from Darin Johnson <darin@acuson.com> for prompt
472 string with invisible characters that is longer than the screen
473 width. XXX - this doesn't work right if invisible characters have
474 to be put on the second screen line -- it adds too much (the number
475 of invisible chars after the screenwidth). */
476 temp = ((newlines + 1) * screenwidth) + ((newlines == 0) ? wrap_offset : 0);
477
478 inv_lbreaks[++newlines] = temp;
479 lpos -= screenwidth;
480 }
481
482 lb_linenum = 0;
483 for (in = 0; in < rl_end; in++)
484 {
485 c = (unsigned char)rl_line_buffer[in];
486
487 if (out + 8 >= line_size) /* XXX - 8 for \t */
488 {
489 line_size *= 2;

--- 9 unchanged lines hidden (view full) ---

499 }
500
501 if (META_CHAR (c))
502 {
503 if (_rl_output_meta_chars == 0)
504 {
505 sprintf (line + out, "\\%o", c);
506
507 if (lpos + 4 >= screenwidth)
508 {
509 temp = screenwidth - lpos;
510 CHECK_INV_LBREAKS ();
511 inv_lbreaks[++newlines] = out + temp;
512 lpos = 4 - temp;
513 }
514 else
515 lpos += 4;
516
517 out += 4;
518 }
519 else
520 {
521 line[out++] = c;
522 CHECK_LPOS();
523 }
524 }
525#if defined (DISPLAY_TABS)
526 else if (c == '\t')
527 {
528 register int temp, newout;
529
530#if 0
531 newout = (out | (int)7) + 1;
532#else
533 newout = out + 8 - lpos % 8;
534#endif
535 temp = newout - out;
536 if (lpos + temp >= screenwidth)
537 {
538 register int temp2;
539 temp2 = screenwidth - lpos;
540 CHECK_INV_LBREAKS ();
541 inv_lbreaks[++newlines] = out + temp2;
542 lpos = temp - temp2;
543 while (out < newout)
544 line[out++] = ' ';
545 }
546 else
547 {
548 while (out < newout)
549 line[out++] = ' ';
550 lpos += temp;
551 }
552 }
553#endif
554 else if (c == '\n' && _rl_horizontal_scroll_mode == 0 && term_up && *term_up)
555 {
556 line[out++] = '\0'; /* XXX - sentinel */
557 CHECK_INV_LBREAKS ();
558 inv_lbreaks[++newlines] = out;
559 lpos = 0;
560 }
561 else if (CTRL_CHAR (c) || c == RUBOUT)
562 {

--- 15 unchanged lines hidden (view full) ---

578 lb_linenum = newlines;
579 }
580
581 inv_botlin = lb_botlin = newlines;
582 CHECK_INV_LBREAKS ();
583 inv_lbreaks[newlines+1] = out;
584 cursor_linenum = lb_linenum;
585
586 /* C_POS == position in buffer where cursor should be placed. */
587
588 /* PWP: now is when things get a bit hairy. The visible and invisible
589 line buffers are really multiple lines, which would wrap every
590 (screenwidth - 1) characters. Go through each in turn, finding
591 the changed region and updating it. The line order is top to bottom. */
592
593 /* If we can move the cursor up and down, then use multiple lines,
594 otherwise, let long lines display in a single terminal line, and
595 horizontally scroll it. */
596
597 if (_rl_horizontal_scroll_mode == 0 && term_up && *term_up)
598 {
599 int nleft, pos, changed_screen_line;
600
601 if (!rl_display_fixed || forced_display)
602 {
603 forced_display = 0;
604
605 /* If we have more than a screenful of material to display, then
606 only display a screenful. We should display the last screen,
607 not the first. */
608 if (out >= screenchars)
609 out = screenchars - 1;
610
611 /* The first line is at character position 0 in the buffer. The
612 second and subsequent lines start at inv_lbreaks[N], offset by
613 OFFSET (which has already been calculated above). */
614
615#define W_OFFSET(line, offset) ((line) == 0 ? offset : 0)
616#define VIS_LLEN(l) ((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] - vis_lbreaks[l]))
617#define INV_LLEN(l) (inv_lbreaks[l+1] - inv_lbreaks[l])

--- 13 unchanged lines hidden (view full) ---

631 implies that we completely overwrite the old visible line)
632 and the new line is shorter than the old. Make sure we are
633 at the end of the new line before clearing. */
634 if (linenum == 0 &&
635 inv_botlin == 0 && _rl_last_c_pos == out &&
636 (wrap_offset > visible_wrap_offset) &&
637 (_rl_last_c_pos < visible_first_line_len))
638 {
639 nleft = screenwidth + wrap_offset - _rl_last_c_pos;
640 if (nleft)
641 _rl_clear_to_eol (nleft);
642 }
643
644 /* Since the new first line is now visible, save its length. */
645 if (linenum == 0)
646 visible_first_line_len = (inv_botlin > 0) ? inv_lbreaks[1] : out - wrap_offset;
647 }

--- 4 unchanged lines hidden (view full) ---

652 {
653 char *tt;
654 for (; linenum <= _rl_vis_botlin; linenum++)
655 {
656 tt = VIS_CHARS (linenum);
657 _rl_move_vert (linenum);
658 _rl_move_cursor_relative (0, tt);
659 _rl_clear_to_eol
660 ((linenum == _rl_vis_botlin) ? strlen (tt) : screenwidth);
661 }
662 }
663 _rl_vis_botlin = inv_botlin;
664
665 /* CHANGED_SCREEN_LINE is set to 1 if we have moved to a
666 different screen line during this redisplay. */
667 changed_screen_line = _rl_last_v_pos != cursor_linenum;
668 if (changed_screen_line)
669 {
670 _rl_move_vert (cursor_linenum);
671 /* If we moved up to the line with the prompt using term_up,
672 the physical cursor position on the screen stays the same,
673 but the buffer position needs to be adjusted to account
674 for invisible characters. */
675 if (cursor_linenum == 0 && wrap_offset)
676 _rl_last_c_pos += wrap_offset;
677 }
678
679 /* We have to reprint the prompt if it contains invisible
680 characters, since it's not generally OK to just reprint
681 the characters from the current cursor position. But we
682 only need to reprint it if the cursor is before the last
683 invisible character in the prompt string. */
684 nleft = visible_length + wrap_offset;
685 if (cursor_linenum == 0 && wrap_offset > 0 && _rl_last_c_pos > 0 &&
686 _rl_last_c_pos <= last_invisible && local_prompt)
687 {
688#if defined (__MSDOS__)
689 putc ('\r', rl_outstream);
690#else
691 if (term_cr)
692 tputs (term_cr, 1, _rl_output_character_function);
693#endif
694 _rl_output_some_chars (local_prompt, nleft);
695 _rl_last_c_pos = nleft;
696 }
697
698 /* Where on that line? And where does that line start
699 in the buffer? */
700 pos = inv_lbreaks[cursor_linenum];

--- 22 unchanged lines hidden (view full) ---

723 /* Always at top line. */
724 _rl_last_v_pos = 0;
725
726 /* Compute where in the buffer the displayed line should start. This
727 will be LMARGIN. */
728
729 /* The number of characters that will be displayed before the cursor. */
730 ndisp = c_pos - wrap_offset;
731 nleft = visible_length + wrap_offset;
732 /* Where the new cursor position will be on the screen. This can be
733 longer than SCREENWIDTH; if it is, lmargin will be adjusted. */
734 phys_c_pos = c_pos - (last_lmargin ? last_lmargin : wrap_offset);
735 t = screenwidth / 3;
736
737 /* If the number of characters had already exceeded the screenwidth,
738 last_lmargin will be > 0. */
739
740 /* If the number of characters to be displayed is more than the screen
741 width, compute the starting offset so that the cursor is about
742 two-thirds of the way across the screen. */
743 if (phys_c_pos > screenwidth - 2)
744 {
745 lmargin = c_pos - (2 * t);
746 if (lmargin < 0)
747 lmargin = 0;
748 /* If the left margin would be in the middle of a prompt with
749 invisible characters, don't display the prompt at all. */
750 if (wrap_offset && lmargin > 0 && lmargin < nleft)
751 lmargin = nleft;
752 }
753 else if (ndisp < screenwidth - 2) /* XXX - was -1 */
754 lmargin = 0;
755 else if (phys_c_pos < 1)
756 {
757 /* If we are moving back towards the beginning of the line and
758 the last margin is no longer correct, compute a new one. */
759 lmargin = ((c_pos - 1) / t) * t; /* XXX */
760 if (wrap_offset && lmargin > 0 && lmargin < nleft)
761 lmargin = nleft;

--- 5 unchanged lines hidden (view full) ---

767 in the display line, indicate this with a special character. */
768 if (lmargin > 0)
769 line[lmargin] = '<';
770
771 /* If SCREENWIDTH characters starting at LMARGIN do not encompass
772 the whole line, indicate that with a special character at the
773 right edge of the screen. If LMARGIN is 0, we need to take the
774 wrap offset into account. */
775 t = lmargin + M_OFFSET (lmargin, wrap_offset) + screenwidth;
776 if (t < out)
777 line[t - 1] = '>';
778
779 if (!rl_display_fixed || forced_display || lmargin != last_lmargin)
780 {
781 forced_display = 0;
782 update_line (&visible_line[last_lmargin],
783 &invisible_line[lmargin],
784 0,
785 screenwidth + visible_wrap_offset,
786 screenwidth + (lmargin ? 0 : wrap_offset),
787 0);
788
789 /* If the visible new line is shorter than the old, but the number
790 of invisible characters is greater, and we are at the end of
791 the new line, we need to clear to eol. */
792 t = _rl_last_c_pos - M_OFFSET (lmargin, wrap_offset);
793 if ((M_OFFSET (lmargin, wrap_offset) > visible_wrap_offset) &&
794 (_rl_last_c_pos == out) &&
795 t < visible_first_line_len)
796 {
797 nleft = screenwidth - t;
798 _rl_clear_to_eol (nleft);
799 }
800 visible_first_line_len = out - lmargin - M_OFFSET (lmargin, wrap_offset);
801 if (visible_first_line_len > screenwidth)
802 visible_first_line_len = screenwidth;
803
804 _rl_move_cursor_relative (c_pos - lmargin, &invisible_line[lmargin]);
805 last_lmargin = lmargin;
806 }
807 }
808 fflush (rl_outstream);
809
810 /* Swap visible and non-visible lines. */
811 {
812 char *temp = visible_line;
813 int *itemp = vis_lbreaks, ntemp = vis_lbsize;
814
815 visible_line = invisible_line;
816 invisible_line = temp;
817
818 vis_lbreaks = inv_lbreaks;
819 inv_lbreaks = itemp;
820
821 vis_lbsize = inv_lbsize;
822 inv_lbsize = ntemp;
823
824 rl_display_fixed = 0;

--- 33 unchanged lines hidden (view full) ---

858 int current_invis_chars;
859
860 /* If we're at the right edge of a terminal that supports xn, we're
861 ready to wrap around, so do so. This fixes problems with knowing
862 the exact cursor position and cut-and-paste with certain terminal
863 emulators. In this calculation, TEMP is the physical screen
864 position of the cursor. */
865 temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
866 if (temp == screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode
867 && _rl_last_v_pos == current_line - 1)
868 {
869 if (new[0])
870 putc (new[0], rl_outstream);
871 else
872 putc (' ', rl_outstream);
873 _rl_last_c_pos = 1; /* XXX */
874 _rl_last_v_pos++;

--- 60 unchanged lines hidden (view full) ---

935 This is not an efficiency hack -- there is a problem with redrawing
936 portions of the prompt string if they contain terminal escape
937 sequences (like drawing the `unbold' sequence without a corresponding
938 `bold') that manifests itself on certain terminals. */
939
940 lendiff = local_prompt ? strlen (local_prompt) : 0;
941 od = ofd - old; /* index of first difference in visible line */
942 if (current_line == 0 && !_rl_horizontal_scroll_mode &&
943 term_cr && lendiff > visible_length && _rl_last_c_pos > 0 &&
944 od > lendiff && _rl_last_c_pos < last_invisible)
945 {
946#if defined (__MSDOS__)
947 putc ('\r', rl_outstream);
948#else
949 tputs (term_cr, 1, _rl_output_character_function);
950#endif
951 _rl_output_some_chars (local_prompt, lendiff);
952 _rl_last_c_pos = lendiff;
953 }
954
955 _rl_move_cursor_relative (od, old);
956
957 /* if (len (new) > len (old)) */

--- 11 unchanged lines hidden (view full) ---

969 if (lendiff > 0)
970 {
971 /* Non-zero if we're increasing the number of lines. */
972 int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
973 /* Sometimes it is cheaper to print the characters rather than
974 use the terminal's capabilities. If we're growing the number
975 of lines, make sure we actually cause the new line to wrap
976 around on auto-wrapping terminals. */
977 if (terminal_can_insert && ((2 * temp) >= lendiff || term_IC) && (!_rl_term_autowrap || !gl))
978 {
979 /* If lendiff > visible_length and _rl_last_c_pos == 0 and
980 _rl_horizontal_scroll_mode == 1, inserting the characters with
981 term_IC or term_ic will screw up the screen because of the
982 invisible characters. We need to just draw them. */
983 if (*ols && (!_rl_horizontal_scroll_mode || _rl_last_c_pos > 0 ||
984 lendiff <= visible_length || !current_invis_chars))
985 {
986 insert_some_chars (nfd, lendiff);
987 _rl_last_c_pos += lendiff;
988 }
989 else if (*ols == 0)
990 {
991 /* At the end of a line the characters do not have to
992 be "inserted". They can just be placed on the screen. */

--- 24 unchanged lines hidden (view full) ---

1017 /* cannot insert chars, write to EOL */
1018 _rl_output_some_chars (nfd, temp);
1019 _rl_last_c_pos += temp;
1020 }
1021 }
1022 else /* Delete characters from line. */
1023 {
1024 /* If possible and inexpensive to use terminal deletion, then do so. */
1025 if (term_dc && (2 * temp) >= -lendiff)
1026 {
1027 /* If all we're doing is erasing the invisible characters in the
1028 prompt string, don't bother. It screws up the assumptions
1029 about what's on the screen. */
1030 if (_rl_horizontal_scroll_mode && _rl_last_c_pos == 0 &&
1031 -lendiff == visible_wrap_offset)
1032 lendiff = 0;
1033

--- 68 unchanged lines hidden (view full) ---

1102 prompt_last_line = rl_prompt;
1103
1104 l = strlen (prompt_last_line);
1105 _rl_last_c_pos = l;
1106
1107 /* Dissect prompt_last_line into screen lines. Note that here we have
1108 to use the real screenwidth. Readline's notion of screenwidth might be
1109 one less, see terminal.c. */
1110 real_screenwidth = screenwidth + (_rl_term_autowrap ? 0 : 1);
1111 _rl_last_v_pos = l / real_screenwidth;
1112 /* If the prompt length is a multiple of real_screenwidth, we don't know
1113 whether the cursor is at the end of the last line, or already at the
1114 beginning of the next line. Output a newline just to be safe. */
1115 if (l > 0 && (l % real_screenwidth) == 0)
1116 _rl_output_some_chars ("\n", 1);
1117 last_lmargin = 0;
1118

--- 28 unchanged lines hidden (view full) ---

1147}
1148
1149/* Move the cursor from _rl_last_c_pos to NEW, which are buffer indices.
1150 DATA is the contents of the screen line of interest; i.e., where
1151 the movement is being done. */
1152void
1153_rl_move_cursor_relative (new, data)
1154 int new;
1155 char *data;
1156{
1157 register int i;
1158
1159 /* If we don't have to do anything, then return. */
1160 if (_rl_last_c_pos == new) return;
1161
1162 /* It may be faster to output a CR, and then move forwards instead
1163 of moving backwards. */
1164 /* i == current physical cursor position. */
1165 i = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
1166 if (new == 0 || CR_FASTER (new, _rl_last_c_pos) ||
1167 (_rl_term_autowrap && i == screenwidth))
1168 {
1169#if defined (__MSDOS__)
1170 putc ('\r', rl_outstream);
1171#else
1172 tputs (term_cr, 1, _rl_output_character_function);
1173#endif /* !__MSDOS__ */
1174 _rl_last_c_pos = 0;
1175 }
1176
1177 if (_rl_last_c_pos < new)
1178 {
1179 /* Move the cursor forward. We do it by printing the command
1180 to move the cursor forward if there is one, else print that
1181 portion of the output buffer again. Which is cheaper? */
1182
1183 /* The above comment is left here for posterity. It is faster
1184 to print one character (non-control) than to print a control
1185 sequence telling the terminal to move forward one character.
1186 That kind of control is for people who don't know what the
1187 data is underneath the cursor. */
1188#if defined (HACK_TERMCAP_MOTION)
1189 if (term_forward_char)
1190 for (i = _rl_last_c_pos; i < new; i++)
1191 tputs (term_forward_char, 1, _rl_output_character_function);
1192 else
1193 for (i = _rl_last_c_pos; i < new; i++)
1194 putc (data[i], rl_outstream);
1195#else
1196 for (i = _rl_last_c_pos; i < new; i++)
1197 putc (data[i], rl_outstream);
1198#endif /* HACK_TERMCAP_MOTION */
1199 }

--- 4 unchanged lines hidden (view full) ---

1204
1205/* PWP: move the cursor up or down. */
1206void
1207_rl_move_vert (to)
1208 int to;
1209{
1210 register int delta, i;
1211
1212 if (_rl_last_v_pos == to || to > screenheight)
1213 return;
1214
1215 if ((delta = to - _rl_last_v_pos) > 0)
1216 {
1217 for (i = 0; i < delta; i++)
1218 putc ('\n', rl_outstream);
1219#if defined (__MSDOS__)
1220 putc ('\r', rl_outstream);
1221#else
1222 tputs (term_cr, 1, _rl_output_character_function);
1223#endif
1224 _rl_last_c_pos = 0;
1225 }
1226 else
1227 { /* delta < 0 */
1228 if (term_up && *term_up)
1229 for (i = 0; i < -delta; i++)
1230 tputs (term_up, 1, _rl_output_character_function);
1231 }
1232
1233 _rl_last_v_pos = to; /* Now TO is here */
1234}
1235
1236/* Physically print C on rl_outstream. This is for functions which know
1237 how to optimize the display. Return the number of characters output. */
1238int

--- 117 unchanged lines hidden (view full) ---

1356static int saved_last_invisible;
1357static int saved_visible_length;
1358
1359void
1360rl_save_prompt ()
1361{
1362 saved_local_prompt = local_prompt;
1363 saved_local_prefix = local_prompt_prefix;
1364 saved_last_invisible = last_invisible;
1365 saved_visible_length = visible_length;
1366
1367 local_prompt = local_prompt_prefix = (char *)0;
1368 last_invisible = visible_length = 0;
1369}
1370
1371void
1372rl_restore_prompt ()
1373{
1374 if (local_prompt)
1375 free (local_prompt);
1376 if (local_prompt_prefix)
1377 free (local_prompt_prefix);
1378
1379 local_prompt = saved_local_prompt;
1380 local_prompt_prefix = saved_local_prefix;
1381 last_invisible = saved_last_invisible;
1382 visible_length = saved_visible_length;
1383}
1384
1385char *
1386_rl_make_prompt_for_search (pchar)
1387 int pchar;
1388{
1389 int len;
1390 char *pmt;

--- 13 unchanged lines hidden (view full) ---

1404 {
1405 len = *saved_local_prompt ? strlen (saved_local_prompt) : 0;
1406 pmt = xmalloc (len + 2);
1407 if (len)
1408 strcpy (pmt, saved_local_prompt);
1409 pmt[len] = pchar;
1410 pmt[len+1] = '\0';
1411 local_prompt = savestring (pmt);
1412 last_invisible = saved_last_invisible;
1413 visible_length = saved_visible_length + 1;
1414 }
1415 return pmt;
1416}
1417
1418/* Quick redisplay hack when erasing characters at the end of the line. */
1419void
1420_rl_erase_at_end_of_line (l)
1421 int l;

--- 10 unchanged lines hidden (view full) ---

1432}
1433
1434/* Clear to the end of the line. COUNT is the minimum
1435 number of character spaces to clear, */
1436void
1437_rl_clear_to_eol (count)
1438 int count;
1439{
1440 if (term_clreol)
1441 tputs (term_clreol, 1, _rl_output_character_function);
1442 else if (count)
1443 space_to_eol (count);
1444}
1445
1446/* Clear to the end of the line using spaces. COUNT is the minimum
1447 number of character spaces to clear, */
1448static void
1449space_to_eol (count)

--- 5 unchanged lines hidden (view full) ---

1455 putc (' ', rl_outstream);
1456
1457 _rl_last_c_pos += count;
1458}
1459
1460void
1461_rl_clear_screen ()
1462{
1463 if (term_clrpag)
1464 tputs (term_clrpag, 1, _rl_output_character_function);
1465 else
1466 crlf ();
1467}
1468
1469/* Insert COUNT characters from STRING to the output stream. */
1470static void
1471insert_some_chars (string, count)
1472 char *string;
1473 int count;
1474{
1475 /* If IC is defined, then we do not have to "enter" insert mode. */
1476 if (term_IC)
1477 {
1478 char *buffer;
1479 buffer = tgoto (term_IC, 0, count);
1480 tputs (buffer, 1, _rl_output_character_function);
1481 _rl_output_some_chars (string, count);
1482 }
1483 else
1484 {
1485 register int i;
1486
1487 /* If we have to turn on insert-mode, then do so. */
1488 if (term_im && *term_im)
1489 tputs (term_im, 1, _rl_output_character_function);
1490
1491 /* If there is a special command for inserting characters, then
1492 use that first to open up the space. */
1493 if (term_ic && *term_ic)
1494 {
1495 for (i = count; i--; )
1496 tputs (term_ic, 1, _rl_output_character_function);
1497 }
1498
1499 /* Print the text. */
1500 _rl_output_some_chars (string, count);
1501
1502 /* If there is a string to turn off insert mode, we had best use
1503 it now. */
1504 if (term_ei && *term_ei)
1505 tputs (term_ei, 1, _rl_output_character_function);
1506 }
1507}
1508
1509/* Delete COUNT characters from the display line. */
1510static void
1511delete_chars (count)
1512 int count;
1513{
1514 if (count > screenwidth) /* XXX */
1515 return;
1516
1517 if (term_DC && *term_DC)
1518 {
1519 char *buffer;
1520 buffer = tgoto (term_DC, count, count);
1521 tputs (buffer, count, _rl_output_character_function);
1522 }
1523 else
1524 {
1525 if (term_dc && *term_dc)
1526 while (count--)
1527 tputs (term_dc, 1, _rl_output_character_function);
1528 }
1529}
1530
1531void
1532_rl_update_final ()
1533{
1534 int full_lines;
1535
1536 full_lines = 0;
1537 /* If the cursor is the only thing on an otherwise-blank last line,
1538 compensate so we don't print an extra CRLF. */
1539 if (_rl_vis_botlin && _rl_last_c_pos == 0 &&
1540 visible_line[vis_lbreaks[_rl_vis_botlin]] == 0)
1541 {
1542 _rl_vis_botlin--;
1543 full_lines = 1;
1544 }
1545 _rl_move_vert (_rl_vis_botlin);
1546 /* If we've wrapped lines, remove the final xterm line-wrap flag. */
1547 if (full_lines && _rl_term_autowrap && (VIS_LLEN(_rl_vis_botlin) == screenwidth))
1548 {
1549 char *last_line;
1550#if 0
1551 last_line = &visible_line[inv_lbreaks[_rl_vis_botlin]];
1552#else
1553 last_line = &visible_line[vis_lbreaks[_rl_vis_botlin]];
1554#endif
1555 _rl_move_cursor_relative (screenwidth - 1, last_line);
1556 _rl_clear_to_eol (0);
1557 putc (last_line[screenwidth - 1], rl_outstream);
1558 }
1559 _rl_vis_botlin = 0;
1560 crlf ();
1561 fflush (rl_outstream);
1562 rl_display_fixed++;
1563}
1564
1565/* Move to the start of the current line. */
1566static void
1567cr ()
1568{
1569 if (term_cr)
1570 {
1571#if defined (__MSDOS__)
1572 putc ('\r', rl_outstream);
1573#else
1574 tputs (term_cr, 1, _rl_output_character_function);
1575#endif
1576 _rl_last_c_pos = 0;
1577 }
1578}
1579
1580/* Redraw the last line of a multi-line prompt that may possibly contain
1581 terminal escape sequences. Called with the cursor at column 0 of the
1582 line to draw the prompt on. */
1583static void
1584redraw_prompt (t)
1585 char *t;
1586{
1587 char *oldp, *oldl, *oldlprefix;
1588 int oldlen, oldlast, oldplen;
1589
1590 /* Geez, I should make this a struct. */
1591 oldp = rl_display_prompt;
1592 oldl = local_prompt;
1593 oldlprefix = local_prompt_prefix;
1594 oldlen = visible_length;
1595 oldplen = prefix_length;
1596 oldlast = last_invisible;
1597
1598 rl_display_prompt = t;
1599 local_prompt = expand_prompt (t, &visible_length, &last_invisible);
1600 local_prompt_prefix = (char *)NULL;
1601 rl_forced_update_display ();
1602
1603 rl_display_prompt = oldp;
1604 local_prompt = oldl;
1605 local_prompt_prefix = oldlprefix;
1606 visible_length = oldlen;
1607 prefix_length = oldplen;
1608 last_invisible = oldlast;
1609}
1610
1611/* Redisplay the current line after a SIGWINCH is received. */
1612void
1613_rl_redisplay_after_sigwinch ()
1614{
1615 char *t;
1616
1617 /* Clear the current line and put the cursor at column 0. Make sure
1618 the right thing happens if we have wrapped to a new screen line. */
1619 if (term_cr)
1620 {
1621#if defined (__MSDOS__)
1622 putc ('\r', rl_outstream);
1623#else
1624 tputs (term_cr, 1, _rl_output_character_function);
1625#endif
1626 _rl_last_c_pos = 0;
1627#if defined (__MSDOS__)
1628 space_to_eol (screenwidth);
1629 putc ('\r', rl_outstream);
1630#else
1631 if (term_clreol)
1632 tputs (term_clreol, 1, _rl_output_character_function);
1633 else
1634 {
1635 space_to_eol (screenwidth);
1636 tputs (term_cr, 1, _rl_output_character_function);
1637 }
1638#endif
1639 if (_rl_last_v_pos > 0)
1640 _rl_move_vert (0);
1641 }
1642 else
1643 crlf ();
1644
1645 /* Redraw only the last line of a multi-line prompt. */
1646 t = strrchr (rl_display_prompt, '\n');
1647 if (t)
1648 redraw_prompt (++t);
1649 else
1650 rl_forced_update_display ();
1651}

--- 24 unchanged lines hidden (view full) ---

1676int
1677_rl_current_display_line ()
1678{
1679 int ret, nleft;
1680
1681 /* Find out whether or not there might be invisible characters in the
1682 editing buffer. */
1683 if (rl_display_prompt == rl_prompt)
1684 nleft = _rl_last_c_pos - screenwidth - rl_visible_prompt_length;
1685 else
1686 nleft = _rl_last_c_pos - screenwidth;
1687
1688 if (nleft > 0)
1689 ret = 1 + nleft / screenwidth;
1690 else
1691 ret = 0;
1692
1693 return ret;
1694}