ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.174 by root, Mon Dec 19 02:40:14 2005 UTC vs.
Revision 1.177 by root, Tue Dec 20 21:49:55 2005 UTC

… …
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 87
88#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89#define ROW(n) (save [LINENO (n)])
90
88/* 91/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 92 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 95 */
… …
116 119
117/* Fill part/all of a line with blanks. */ 120/* Fill part/all of a line with blanks. */
118void 121void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 122rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120{ 123{
124 if (!l.t)
125 {
126 lalloc (l);
127 col = 0;
128 width = ncol;
129 }
130
121 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 133
124 text_t *et = l.t + col; 134 text_t *et = l.t + col;
125 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
134/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
135/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
136void 146void
137rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
138{ 148{
139 if (!l.t)
140 lalloc (l);
141
142 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
143} 150}
144 151
145/* ------------------------------------------------------------------------- * 152/* ------------------------------------------------------------------------- *
146 * SCREEN INITIALISATION * 153 * SCREEN INITIALISATION *
… …
170 // we need at least two lines for wrapping to work correctly 177 // we need at least two lines for wrapping to work correctly
171 if (nrow + saveLines < 2) 178 if (nrow + saveLines < 2)
172 { 179 {
173 saveLines++; 180 saveLines++;
174 prev_nrow--; 181 prev_nrow--;
175 nscrolled++; 182 nsaved++;
176 } 183 }
177 184
178 want_refresh = 1; 185 want_refresh = 1;
179 186
180 int prev_total_rows = prev_nrow + saveLines; 187 int prev_total_rows = prev_nrow + saveLines;
181 int total_rows = nrow + saveLines; 188 total_rows = nrow + saveLines;
182 189
183 screen.tscroll = 0; 190 screen.tscroll = 0;
184 screen.bscroll = nrow - 1; 191 screen.bscroll = nrow - 1;
185 192
186 if (!save) 193 if (!save)
187 { 194 {
188 /* 195 /*
189 * first time called so just malloc everything: don't rely on realloc 196 * first time called so just malloc everything: don't rely on realloc
190 * Note: this is still needed so that all the scrollback lines are NULL 197 * Note: this is still needed so that all the scrollback lines are NULL
191 */ 198 */
192 nscrolled = 0; /* no saved lines */ 199 nsaved = 0; /* no saved lines */
193 term_start = 0; 200 term_start = 0;
194 nsaved = 0;
195 201
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 202 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 204
199 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 205 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
200 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
201 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 207 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
202 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 208 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
203 209
204 screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
205
206 scr_update_term ();
207
208 for (p = nrow; p--; ) 210 for (p = nrow; p--; )
209 { 211 {
210 scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 214 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
213 } 215 }
214 216
215 memset (charsets, 'B', sizeof (charsets)); 217 memset (charsets, 'B', sizeof (charsets));
… …
247 rxvt_salloc *old_ra; 249 rxvt_salloc *old_ra;
248 250
249 if (nrow < prev_nrow) 251 if (nrow < prev_nrow)
250 { 252 {
251 /* delete rows */ 253 /* delete rows */
252 k = min (nscrolled, prev_nrow - nrow); 254 k = min (nsaved, prev_nrow - nrow);
253 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO 255 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
254 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 256 scr_scroll_text (0, (int)prev_nrow - 1, k);
255 257
256 for (p = nrow; p < prev_nrow; p++) 258 for (p = nrow; p < prev_nrow; p++)
257 { 259 {
258 lfree (save[p + saveLines]); 260 lfree (ROW(p));
259 lfree (swap_save[p]); 261 lfree (swap_save[p]);
260 lfree (drawn[p]); 262 lfree (drawn[p]);
261 } 263 }
262 264
263 /* we have fewer rows so fix up cursor position */ 265 /* we have fewer rows so fix up cursor position */
… …
271 scr_reset_realloc (); /* realloc _first_ */ 273 scr_reset_realloc (); /* realloc _first_ */
272 274
273 int ocol = ncol; 275 int ocol = ncol;
274 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
275 277
276 k = min (nscrolled, nrow - prev_nrow); 278 k = min (nsaved, nrow - prev_nrow);
277 279
278 for (p = prev_total_rows; p < total_rows; p++) 280 for (p = prev_total_rows; p < total_rows; p++)
279 save[p].clear (); 281 save[p].clear ();
280 282
281 for (p = prev_total_rows; p < total_rows - k; p++) 283 for (p = prev_total_rows; p < total_rows - k; p++)
282 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE); 284 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
283
284 scr_update_term ();
285 285
286 for (p = prev_nrow; p < nrow; p++) 286 for (p = prev_nrow; p < nrow; p++)
287 { 287 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 } 290 }
291 291
292 if (k > 0) 292 if (k > 0)
293 { 293 {
294 scr_scroll_text (0, (int)nrow - 1, -k, 1); 294 scr_scroll_text (0, (int)nrow - 1, -k);
295 screen.cur.row += k; 295 screen.cur.row += k;
296 screen.s_cur.row += k; 296 screen.s_cur.row += k;
297 nscrolled -= k; 297 nsaved -= k;
298 } 298 }
299 299
300#ifdef DEBUG_STRICT 300#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 301 assert (screen.cur.row < nrow);
302#else /* drive with your eyes closed */ 302#else /* drive with your eyes closed */
… …
437} 437}
438 438
439void 439void
440rxvt_term::scr_reset_realloc () 440rxvt_term::scr_reset_realloc ()
441{ 441{
442 unsigned int total_rows = nrow + saveLines;
443
444 screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *));
445 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t)); 442 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
446 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t)); 443 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
444 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
447 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t)); 445 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
448 buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t));
449} 446}
450 447
451/* ------------------------------------------------------------------------- */ 448/* ------------------------------------------------------------------------- */
452/* 449/*
453 * Free everything. That way malloc debugging can find leakage. 450 * Free everything. That way malloc debugging can find leakage.
454 */ 451 */
455void 452void
456rxvt_term::scr_release () 453rxvt_term::scr_release ()
457{ 454{
458 unsigned int total_rows;
459
460 total_rows = nrow + saveLines;
461
462 delete talloc; talloc = 0; 455 delete talloc; talloc = 0;
463 delete ralloc; ralloc = 0; 456 delete ralloc; ralloc = 0;
464 457
465 free (screen.line);
466 free (save); 458 free (save);
467 free (swap_save); 459 free (swap_save);
468 free (drawn); 460 free (drawn);
469 free (buf); 461 free (buf);
470 free (tabs); 462 free (tabs);
… …
546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 538 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547 */ 539 */
548int 540int
549rxvt_term::scr_change_screen (int scrn) 541rxvt_term::scr_change_screen (int scrn)
550{ 542{
551 int i;
552#if NSCREENS
553 int offset;
554#endif
555
556 want_refresh = 1; 543 want_refresh = 1;
557
558 view_start = 0; 544 view_start = 0;
559 545
560 if (current_screen == scrn) 546 if (current_screen == scrn)
561 return scrn; 547 return scrn;
562 548
563 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
564 550
565 i = current_screen; current_screen = scrn; scrn = i; 551 SWAP_IT (scrn, current_screen, int);
566 552
567 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 553 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
568 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 554 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
569 MAX_IT (screen.cur.row, 0); 555 MAX_IT (screen.cur.row, 0);
570 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 556 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
… …
573 559
574#if NSCREENS 560#if NSCREENS
575 if (options & Opt_secondaryScreen) 561 if (options & Opt_secondaryScreen)
576 { 562 {
577 num_scr = 0; 563 num_scr = 0;
578 offset = saveLines;
579 564
580 for (i = prev_nrow; i--;) 565 for (int i = nrow; i--; )
581 SWAP_IT (*(screen.line[i]), swap_save[i], line_t); 566 SWAP_IT (ROW(i), swap_save[i], line_t);
582 567
583 SWAP_IT (screen.charset, swap.charset, int16_t); 568 SWAP_IT (screen.charset, swap.charset, int16_t);
584 SWAP_IT (screen.flags, swap.flags, int); 569 SWAP_IT (screen.flags, swap.flags, int);
585 screen.flags |= Screen_VisibleCursor; 570 screen.flags |= Screen_VisibleCursor;
586 swap.flags |= Screen_VisibleCursor; 571 swap.flags |= Screen_VisibleCursor;
587 } 572 }
588 else 573 else
589#endif 574#endif
590 if (options & Opt_secondaryScroll) 575 if (options & Opt_secondaryScroll)
591 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 576 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
592 577
593 return scrn; 578 return scrn;
594} 579}
595 580
596// clear WrapNext indicator, solidifying position on next line 581// clear WrapNext indicator, solidifying position on next line
… …
603 screen.flags &= ~Screen_WrapNext; 588 screen.flags &= ~Screen_WrapNext;
604 589
605 screen.cur.col = 0; 590 screen.cur.col = 0;
606 591
607 if (screen.cur.row == screen.bscroll) 592 if (screen.cur.row == screen.bscroll)
608 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 593 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
609 else if (screen.cur.row < nrow - 1) 594 else if (screen.cur.row < nrow - 1)
610 screen.cur.row++; 595 screen.cur.row++;
611} 596}
612 597
613/* ------------------------------------------------------------------------- */ 598/* ------------------------------------------------------------------------- */
… …
639 rstyle = DEFAULT_RSTYLE; 624 rstyle = DEFAULT_RSTYLE;
640 else 625 else
641 rstyle &= ~style; 626 rstyle &= ~style;
642 } 627 }
643 628
644// set screen.line pointers to the actual lines in the save buffer
645void
646rxvt_term::scr_update_term ()
647{
648 for (int i = nrow; i--; )
649 screen.line[i] = save + saveLines + i;
650}
651
652/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
653/* 630/*
654 * Scroll text between <row1> and <row2> inclusive, by <count> lines 631 * Scroll text between <row1> and <row2> inclusive, by <count> lines
655 * count positive ==> scroll up 632 * count positive ==> scroll up
656 * count negative ==> scroll down 633 * count negative ==> scroll down
657 * spec == 0 for normal routines
658 */ 634 */
659int 635int
660rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 636rxvt_term::scr_scroll_text (int row1, int row2, int count)
661{ 637{
662 int i, j;
663
664 if (count == 0 || (row1 > row2)) 638 if (count == 0 || (row1 > row2))
665 return 0; 639 return 0;
666 640
667 want_refresh = 1; 641 want_refresh = 1;
642 num_scr += count;
668 643
669 if (row1 == 0 && count > 0 644 if (count > 0
645 && row1 == 0
646 && row2 == nrow - 1
670 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 647 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
671 { 648 {
672 nscrolled += count; 649 nsaved = min (nsaved + count, saveLines);
650 term_start = (term_start + count) % total_rows;
673 651
674 if (nscrolled > saveLines) 652 if (selection.op && current_screen == selection.screen)
675 nscrolled = saveLines; 653 {
654 selection.beg.row -= count;
655 selection.end.row -= count;
656 selection.mark.row -= count;
676 657
658 selection_check (0);
659 }
660
661 for (int i = count; i--; )
662 scr_blank_screen_mem (ROW(row2 - i), rstyle);
663
677 if ((options & Opt_scrollWithBuffer) 664 if ((options & Opt_scrollWithBuffer)
678 && view_start != 0 665 && view_start != 0
679 && view_start != saveLines) 666 && view_start != saveLines)
680 scr_page (UP, count); 667 scr_page (UP, count);
681 } 668 }
682 else if (!spec) 669 else
683 row1 += saveLines; 670 {
684
685 row2 += saveLines;
686
687 if (selection.op && current_screen == selection.screen) 671 if (selection.op && current_screen == selection.screen)
688 { 672 {
689 i = selection.beg.row + saveLines; 673 int i = selection.beg.row;
690 j = selection.end.row + saveLines; 674 int j = selection.end.row;
691 675
692 if ((i < row1 && j > row1) 676 if ((i < row1 && j > row1)
693 || (i < row2 && j > row2) 677 || (i < row2 && j > row2)
694 || (i - count < row1 && i >= row1) 678 || (i - count < row1 && i >= row1)
695 || (i - count > row2 && i <= row2) 679 || (i - count > row2 && i <= row2)
696 || (j - count < row1 && j >= row1) 680 || (j - count < row1 && j >= row1)
697 || (j - count > row2 && j <= row2)) 681 || (j - count > row2 && j <= row2))
698 { 682 {
699 CLEAR_ALL_SELECTION (); 683 CLEAR_ALL_SELECTION ();
700 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 684 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
701 } 685 }
702 else if (j >= row1 && j <= row2) 686 else if (j >= row1 && j <= row2)
703 { 687 {
704 /* move selected region too */ 688 /* move selected region too */
705 selection.beg.row -= count; 689 selection.beg.row -= count;
706 selection.end.row -= count; 690 selection.end.row -= count;
707 selection.mark.row -= count; 691 selection.mark.row -= count;
692
693 selection_check (0);
694 }
695 }
696
697 // use a simple and robust scrolling algorithm, this
698 // part of scr_scroll_text is not time-critical.
699
700 int rows = row2 - row1 + 1;
701
702 for (int row = 0; row < rows; row++)
708 } 703 {
709 } 704 buf [row] = ROW(row1 + (row + count + rows) % rows);
710 705
711 selection_check (0); /* _after_ nscrolled update */ 706 if (!IN_RANGE_EXC (row + count, 0, rows))
712
713 num_scr += count;
714 j = count;
715
716 if (count < 0)
717 count = -count;
718
719 i = row2 - row1 + 1;
720 MIN_IT (count, i);
721
722 if (j > 0)
723 {
724 /* scroll up */
725
726 /* Copy lines that will get clobbered by the rotation */
727 memcpy (buf, save + row1, count * sizeof (line_t));
728
729 /* Rotate lines */
730 i = row2 - row1 - count + 1;
731 memmove (save + row1, save + row1 + count, i * sizeof (line_t));
732
733 j = row2 - count + 1, i = count;
734 }
735 else /* if (j < 0) */
736 {
737 /* scroll down */
738
739 /* Copy lines that will get clobbered by the rotation */
740 for (i = 0, j = row2; i < count; i++, j--)
741 buf[i] = save[j];
742
743 /* Rotate lines */
744 for (j = row2, i = j - count; i >= row1; i--, j--)
745 save[j] = save[i];
746
747 j = row1, i = count;
748 count = -count;
749 }
750
751 /* Resurrect lines */
752 memcpy (save + j, buf, i * sizeof (line_t));
753
754 scr_update_term ();
755
756 if (!spec) /* line length may not equal ncol */
757 for (; i--; j++)
758 scr_blank_screen_mem (save[j], rstyle); 707 scr_blank_screen_mem (buf [row], rstyle);
708 }
709
710 for (int row = 0; row < rows; row++)
711 ROW(row1 + row) = buf [row];
712 }
759 713
760 return count; 714 return count;
761} 715}
762 716
763/* ------------------------------------------------------------------------- */ 717/* ------------------------------------------------------------------------- */
… …
785 if ((nlines > 0) 739 if ((nlines > 0)
786 && (screen.tscroll == 0) 740 && (screen.tscroll == 0)
787 && (screen.bscroll == (nrow - 1))) 741 && (screen.bscroll == (nrow - 1)))
788 { 742 {
789 /* _at least_ this many lines need to be scrolled */ 743 /* _at least_ this many lines need to be scrolled */
790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 744 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
791 screen.cur.row -= nlines; 745 screen.cur.row -= nlines;
792 } 746 }
793 } 747 }
794 748
795#ifdef DEBUG_STRICT 749#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 750 assert (screen.cur.col < last_col);
797 assert ((screen.cur.row < nrow) 751 assert ((screen.cur.row < nrow)
798 && (screen.cur.row >= - (int32_t)nscrolled)); 752 && (screen.cur.row >= - (int32_t)nsaved));
799#else /* drive with your eyes closed */ 753#else /* drive with your eyes closed */
800 MIN_IT (screen.cur.col, last_col - 1); 754 MIN_IT (screen.cur.col, last_col - 1);
801 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 755 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)nscrolled); 756 MAX_IT (screen.cur.row, - (int32_t)nsaved);
803#endif 757#endif
804 row = screen.cur.row + saveLines; 758 row = screen.cur.row;
805 759
806 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 760 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 761
808 line_t *line = save + row; 762 line_t *line = &ROW(row);
809 763
810 while (str < strend) 764 while (str < strend)
811 { 765 {
812 c = *str++; 766 c = *str++;
813 767
… …
818 MAX_IT (line->l, screen.cur.col); 772 MAX_IT (line->l, screen.cur.col);
819 773
820 screen.flags &= ~Screen_WrapNext; 774 screen.flags &= ~Screen_WrapNext;
821 775
822 if (screen.cur.row == screen.bscroll) 776 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 777 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (nrow - 1)) 778 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines; 779 row = ++screen.cur.row;
826 780
827 line = save + row; /* _must_ refresh */ 781 line = &ROW(row); /* _must_ refresh */
828 continue; 782 continue;
829 } 783 }
830 else if (c == C0_CR) 784 else if (c == C0_CR)
831 { 785 {
832 if (!line->is_longer ()) /* XXX: think about this */ 786 if (!line->is_longer ()) /* XXX: think about this */
… …
859 { 813 {
860 line->set_is_longer (); 814 line->set_is_longer ();
861 815
862 scr_do_wrap (); 816 scr_do_wrap ();
863 817
864 row = screen.cur.row + saveLines; 818 row = screen.cur.row;
865 line = save + row; /* _must_ refresh */ 819 line = &ROW(row); /* _must_ refresh */
866 } 820 }
867 821
868 // some utf-8 decoders "decode" surrogate characters: let's fix this. 822 // some utf-8 decoders "decode" surrogate characters: let's fix this.
869 if (IN_RANGE (c, 0xd800, 0xdfff)) 823 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870 c = 0xfffd; 824 c = 0xfffd;
871 825
872 // rely on wcwidth to tell us the character width, at least for non-latin1 826 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth might return -1 827 // do wcwidth before further replacements, as wcwidth might return -1
874 // for the line drawing characters below as they might be invalid in the current 828 // for the line drawing characters below as they might be invalid in the current
… …
989 943
990 while (*tp == NOCHAR && tp > line->t) 944 while (*tp == NOCHAR && tp > line->t)
991 tp--, rp--; 945 tp--, rp--;
992 } 946 }
993 else if (screen.cur.row > 0 947 else if (screen.cur.row > 0
994 && save [screen.cur.row - 1 + saveLines].is_longer ()) 948 && ROW(screen.cur.row - 1).is_longer ())
995 { 949 {
996 line_t *line = save + (screen.cur.row - 1 + saveLines); 950 line_t *line = &ROW(screen.cur.row - 1);
997 951
998 tp = line->t + last_col - 1; 952 tp = line->t + last_col - 1;
999 rp = line->r + last_col - 1; 953 rp = line->r + last_col - 1;
1000 954
1001 while (*tp == NOCHAR && tp > line->t) 955 while (*tp == NOCHAR && tp > line->t)
… …
1068 1022
1069 if (count == 0) 1023 if (count == 0)
1070 return; 1024 return;
1071 else if (count > 0) 1025 else if (count > 0)
1072 { 1026 {
1073 int row = saveLines + screen.cur.row; 1027 int row = screen.cur.row;
1074 1028
1075 line_t &l = save[row]; 1029 line_t &l = ROW(row);
1076 rend_t base_rend = l.r[i]; 1030 rend_t base_rend = l.r[i];
1077 ht &= l.t[i] == ' '; 1031 ht &= l.t[i] == ' ';
1078 1032
1079 for (; ++i < ncol; ) 1033 for (; ++i < ncol; )
1080 if (tabs[i]) 1034 if (tabs[i])
… …
1141rxvt_term::scr_backindex () 1095rxvt_term::scr_backindex ()
1142{ 1096{
1143 if (screen.cur.col > 0) 1097 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1098 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1099 else
1146 {
1147 if (!save[screen.cur.row + saveLines].l)
1148 return; /* um, yeah? */
1149
1150 scr_insdel_chars (1, INSERT); 1100 scr_insdel_chars (1, INSERT);
1151 }
1152} 1101}
1153#endif 1102#endif
1154/* ------------------------------------------------------------------------- */ 1103/* ------------------------------------------------------------------------- */
1155/* 1104/*
1156 * Process DEC Forward Index 1105 * Process DEC Forward Index
… …
1166 1115
1167 if (screen.cur.col < ncol - 1) 1116 if (screen.cur.col < ncol - 1)
1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1117 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169 else 1118 else
1170 { 1119 {
1171 row = screen.cur.row + saveLines; 1120 row = screen.cur.row;
1172 1121
1173 if (!save[row].l)
1174 return; /* um, yeah? */
1175
1176 if (save[row].is_longer ()) //TODO//FIXME//LEN 1122 if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1177 save[row].l = ncol; 1123 ROW(row).l = ncol;
1178 1124
1179 scr_gotorc (0, 0, R_RELATIVE); 1125 scr_gotorc (0, 0, R_RELATIVE);
1180 scr_insdel_chars (1, DELETE); 1126 scr_insdel_chars (1, DELETE);
1181 scr_gotorc (0, ncol - 1, R_RELATIVE); 1127 scr_gotorc (0, ncol - 1, R_RELATIVE);
1182 } 1128 }
… …
1249 1195
1250 screen.flags &= ~Screen_WrapNext; 1196 screen.flags &= ~Screen_WrapNext;
1251 1197
1252 if ((screen.cur.row == screen.bscroll && direction == UP) 1198 if ((screen.cur.row == screen.bscroll && direction == UP)
1253 || (screen.cur.row == screen.tscroll && direction == DN)) 1199 || (screen.cur.row == screen.tscroll && direction == DN))
1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1200 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255 else 1201 else
1256 screen.cur.row += dirn; 1202 screen.cur.row += dirn;
1257 1203
1258 MAX_IT (screen.cur.row, 0); 1204 MAX_IT (screen.cur.row, 0);
1259 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 1205 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
… …
1275 want_refresh = 1; 1221 want_refresh = 1;
1276 ZERO_SCROLLBACK (); 1222 ZERO_SCROLLBACK ();
1277 1223
1278 selection_check (1); 1224 selection_check (1);
1279 1225
1280 row = saveLines + screen.cur.row; 1226 row = screen.cur.row;
1281 1227
1282 switch (mode) 1228 switch (mode)
1283 { 1229 {
1284 case 0: /* erase to end of line */ 1230 case 0: /* erase to end of line */
1285 col = screen.cur.col; 1231 col = screen.cur.col;
1286 num = ncol - col; 1232 num = ncol - col;
1287 MIN_IT (save[row].l, (int16_t)col); 1233 MIN_IT (ROW(row).l, (int16_t)col);
1288 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1234 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1289 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1235 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1290 CLEAR_SELECTION (); 1236 CLEAR_SELECTION ();
1291 break; 1237 break;
1292 case 1: /* erase to beginning of line */ 1238 case 1: /* erase to beginning of line */
… …
1297 CLEAR_SELECTION (); 1243 CLEAR_SELECTION ();
1298 break; 1244 break;
1299 case 2: /* erase whole line */ 1245 case 2: /* erase whole line */
1300 col = 0; 1246 col = 0;
1301 num = ncol; 1247 num = ncol;
1302 save[row].l = 0; 1248 ROW(row).l = 0;
1303 if (selection.beg.row <= screen.cur.row 1249 if (selection.beg.row <= screen.cur.row
1304 && selection.end.row >= screen.cur.row) 1250 && selection.end.row >= screen.cur.row)
1305 CLEAR_SELECTION (); 1251 CLEAR_SELECTION ();
1306 break; 1252 break;
1307 default: 1253 default:
1308 return; 1254 return;
1309 } 1255 }
1310 1256
1311 if (save[row].t)
1312 scr_blank_line (save[row], col, num, rstyle); 1257 scr_blank_line (ROW(row), col, num, rstyle);
1313 else
1314 scr_blank_screen_mem (save[row], rstyle);
1315} 1258}
1316 1259
1317/* ------------------------------------------------------------------------- */ 1260/* ------------------------------------------------------------------------- */
1318/* 1261/*
1319 * Erase part of whole of the screen 1262 * Erase part of whole of the screen
… …
1323 */ 1266 */
1324void 1267void
1325rxvt_term::scr_erase_screen (int mode) 1268rxvt_term::scr_erase_screen (int mode)
1326{ 1269{
1327 int num; 1270 int num;
1328 int32_t row, row_offset; 1271 int32_t row;
1329 rend_t ren; 1272 rend_t ren;
1330 XGCValues gcvalue; 1273 XGCValues gcvalue;
1331 1274
1332 want_refresh = 1; 1275 want_refresh = 1;
1333 ZERO_SCROLLBACK (); 1276 ZERO_SCROLLBACK ();
1334
1335 row_offset = (int32_t)saveLines;
1336 1277
1337 switch (mode) 1278 switch (mode)
1338 { 1279 {
1339 case 0: /* erase to end of screen */ 1280 case 0: /* erase to end of screen */
1340 selection_check (1); 1281 selection_check (1);
… …
1385 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1326 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1386 } 1327 }
1387 1328
1388 for (; num--; row++) 1329 for (; num--; row++)
1389 { 1330 {
1390 scr_blank_screen_mem (save[row + row_offset], rstyle); 1331 scr_blank_screen_mem (ROW (row), rstyle);
1391 save[row + row_offset].l = 0; 1332 ROW (row).l = 0;
1392 scr_blank_line (drawn[row], 0, ncol, ren); 1333 scr_blank_line (drawn[row], 0, ncol, ren);
1393 } 1334 }
1394} 1335}
1395 1336
1396#if ENABLE_FRILLS 1337#if ENABLE_FRILLS
… …
1398rxvt_term::scr_erase_savelines () 1339rxvt_term::scr_erase_savelines ()
1399{ 1340{
1400 want_refresh = 1; 1341 want_refresh = 1;
1401 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1402 1343
1403 nscrolled = 0; 1344 nsaved = 0;
1404} 1345}
1405#endif 1346#endif
1406 1347
1407/* ------------------------------------------------------------------------- */ 1348/* ------------------------------------------------------------------------- */
1408/* 1349/*
… …
1410 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1351 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1411 */ 1352 */
1412void 1353void
1413rxvt_term::scr_E () 1354rxvt_term::scr_E ()
1414{ 1355{
1415 int i, j, k;
1416 rend_t *r1, fs; 1356 rend_t fs;
1417 1357
1418 want_refresh = 1; 1358 want_refresh = 1;
1419 ZERO_SCROLLBACK (); 1359 ZERO_SCROLLBACK ();
1420 1360
1421 num_scr_allow = 0; 1361 num_scr_allow = 0;
1422 selection_check (3); 1362 selection_check (3);
1423 1363
1424 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1364 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1425 for (k = saveLines, i = nrow; i--; k++) 1365 for (int row = nrow; row--; )
1426 { 1366 {
1427 line_t &line = save[k]; 1367 line_t &line = ROW(row);
1428 1368
1429 fill_text (line.t, 'E', ncol); 1369 fill_text (line.t, 'E', ncol);
1370 rend_t *r1 = line.r;
1430 1371
1431 for (r1 = line.r, j = ncol; j--; ) 1372 for (int j = ncol; j--; )
1432 *r1++ = fs; 1373 *r1++ = fs;
1433 1374
1434 line.l = ncol; /* make the `E's selectable */ 1375 line.l = ncol; /* make the `E's selectable */
1435 } 1376 }
1436} 1377}
… …
1460 count = end; 1401 count = end;
1461 } 1402 }
1462 1403
1463 scr_do_wrap (); 1404 scr_do_wrap ();
1464 1405
1465 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1406 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1466} 1407}
1467 1408
1468/* ------------------------------------------------------------------------- */ 1409/* ------------------------------------------------------------------------- */
1469/* 1410/*
1470 * Insert/Delete <count> characters from the current position 1411 * Insert/Delete <count> characters from the current position
… …
1484 scr_do_wrap (); 1425 scr_do_wrap ();
1485 1426
1486 selection_check (1); 1427 selection_check (1);
1487 MIN_IT (count, (ncol - screen.cur.col)); 1428 MIN_IT (count, (ncol - screen.cur.col));
1488 1429
1489 row = screen.cur.row + saveLines; 1430 row = screen.cur.row;
1490 1431
1491 line_t *line = save + row; 1432 line_t *line = &ROW(row);
1492 1433
1493 switch (insdel) 1434 switch (insdel)
1494 { 1435 {
1495 case INSERT: 1436 case INSERT:
1496 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1437 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
… …
1517 selection.mark.col += count; /* XXX: yes? */ 1458 selection.mark.col += count; /* XXX: yes? */
1518 selection.end.col += count; 1459 selection.end.col += count;
1519 } 1460 }
1520 } 1461 }
1521 1462
1522 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1463 scr_blank_line (*line, screen.cur.col, count, rstyle);
1523 break; 1464 break;
1524 1465
1525 case ERASE: 1466 case ERASE:
1526 screen.cur.col += count; /* don't worry if > ncol */ 1467 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1468 selection_check (1);
1528 screen.cur.col -= count; 1469 screen.cur.col -= count;
1529 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1470 scr_blank_line (*line, screen.cur.col, count, rstyle);
1530 break; 1471 break;
1531 1472
1532 case DELETE: 1473 case DELETE:
1533 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1474 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1534 1475
… …
1541 scr_blank_line (*line, ncol - count, count, tr); 1482 scr_blank_line (*line, ncol - count, count, tr);
1542 1483
1543 if (line->is_longer ()) /* break line continuation */ 1484 if (line->is_longer ()) /* break line continuation */
1544 line->l = ncol; 1485 line->l = ncol;
1545 1486
1546 line->l -= count; 1487 line->l = max (line->l - count, 0);
1547 MAX_IT (line->l, 0);
1548 1488
1549 if (selection.op && current_screen == selection.screen 1489 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1490 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1491 {
1552 if (selection.end.row != screen.cur.row 1492 if (selection.end.row != screen.cur.row
… …
1879 1819
1880 oldviewstart = view_start; 1820 oldviewstart = view_start;
1881 1821
1882 if (y < len) 1822 if (y < len)
1883 { 1823 {
1884 p = (nrow + nscrolled) * (len - y) / len; 1824 p = (nrow + nsaved) * (len - y) / len;
1885 p -= (long) (nrow - 1); 1825 p -= (long) (nrow - 1);
1886 p = max (p, 0); 1826 p = max (p, 0);
1887 } 1827 }
1888 1828
1889 view_start = (unsigned int)min (p, nscrolled); 1829 view_start = (unsigned int)min (p, nsaved);
1890 1830
1891 return scr_changeview (oldviewstart); 1831 return scr_changeview (oldviewstart);
1892} 1832}
1893 1833
1894/* ------------------------------------------------------------------------- */ 1834/* ------------------------------------------------------------------------- */
… …
1905 oldviewstart = view_start; 1845 oldviewstart = view_start;
1906 1846
1907 if (direction == UP) 1847 if (direction == UP)
1908 { 1848 {
1909 n = view_start + nlines; 1849 n = view_start + nlines;
1910 view_start = min (n, nscrolled); 1850 view_start = min (n, nsaved);
1911 } 1851 }
1912 else 1852 else
1913 { 1853 {
1914 n = view_start - nlines; 1854 n = view_start - nlines;
1915 view_start = max (n, 0); 1855 view_start = max (n, 0);
… …
1959/* ARGSUSED */ 1899/* ARGSUSED */
1960void 1900void
1961rxvt_term::scr_printscreen (int fullhist) 1901rxvt_term::scr_printscreen (int fullhist)
1962{ 1902{
1963#ifdef PRINTPIPE 1903#ifdef PRINTPIPE
1964 int i, r1, nrows, row_offset; 1904 int nrows, row_start;
1965 FILE *fd; 1905 FILE *fd;
1966 1906
1967 if ((fd = popen_printer ()) == NULL) 1907 if ((fd = popen_printer ()) == NULL)
1968 return; 1908 return;
1969 1909
1970 nrows = nrow;
1971 row_offset = saveLines;
1972
1973 if (!fullhist) 1910 if (fullhist)
1974 row_offset -= view_start; 1911 {
1912 nrows = nrow + nsaved;
1913 row_start = -nsaved;
1914 }
1975 else 1915 else
1976 { 1916 {
1977 nrows += nscrolled; 1917 nrows = nrow;
1978 row_offset -= nscrolled; 1918 row_start = -view_start;
1979 } 1919 }
1980 1920
1981 wctomb (0, 0); 1921 wctomb (0, 0);
1982 1922
1983 for (r1 = 0; r1 < nrows; r1++) 1923 for (int r1 = 0; r1 < nrows; r1++)
1984 { 1924 {
1985 text_t *tp = save[r1 + row_offset].t; 1925 text_t *tp = ROW(r1).t;
1986 int len = save[r1 + row_offset].l; 1926 int len = ROW(r1).l;
1987 1927
1988 for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1928 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1989 { 1929 {
1990 char mb[MB_LEN_MAX]; 1930 char mb[MB_LEN_MAX];
1991 text_t t = *tp++; 1931 text_t t = *tp++;
1992 if (t == NOCHAR) 1932 if (t == NOCHAR)
1993 continue; 1933 continue;
… …
2039 * A: set up vars 1979 * A: set up vars
2040 */ 1980 */
2041 must_clear = 0; 1981 must_clear = 0;
2042 refresh_count = 0; 1982 refresh_count = 0;
2043 1983
2044 row_offset = saveLines - view_start; 1984 row_offset = term_start - view_start;
2045 1985
2046#if XPM_BACKGROUND 1986#if XPM_BACKGROUND
2047 must_clear |= bgPixmap.pixmap != None; 1987 must_clear |= bgPixmap.pixmap != None;
2048#endif 1988#endif
2049#if TRANSPARENT 1989#if TRANSPARENT
… …
2072 2012
2073 if (showcursor) 2013 if (showcursor)
2074 { 2014 {
2075 int col = screen.cur.col; 2015 int col = screen.cur.col;
2076 2016
2077 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 2017 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2078 col--; 2018 col--;
2079 2019
2080 crp = &screen.line[screen.cur.row]->r[col]; 2020 crp = &ROW(screen.cur.row).r[col];
2081 2021
2082 if (showcursor && focus) 2022 if (showcursor && focus)
2083 { 2023 {
2084 if (options & Opt_cursorUnderline) 2024 if (options & Opt_cursorUnderline)
2085 *crp ^= RS_Uline; 2025 *crp ^= RS_Uline;
… …
2153 * D: CopyArea pass - very useful for slower links 2093 * D: CopyArea pass - very useful for slower links
2154 * This has been deliberately kept simple. 2094 * This has been deliberately kept simple.
2155 */ 2095 */
2156 i = num_scr; 2096 i = num_scr;
2157 if (!display->is_local 2097 if (!display->is_local
2158 && refresh_type == FAST_REFRESH && num_scr_allow && i 2098 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2159 && abs (i) < nrow && !must_clear) 2099 && abs (num_scr) < nrow && !must_clear)
2160 { 2100 {
2161 int16_t nits; 2101 int16_t nits;
2162 int j; 2102 int j;
2163 int len, wlen; 2103 int len, wlen;
2164 2104
… …
2167 row = i > 0 ? 0 : j - 1; 2107 row = i > 0 ? 0 : j - 1;
2168 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2169 { 2109 {
2170 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2171 { 2111 {
2172 line_t s = save[row + row_offset]; 2112 line_t s = save[(row + row_offset) % total_rows];
2173 line_t d = drawn[row]; 2113 line_t d = drawn[row];
2174 line_t d2 = drawn[row + i]; 2114 line_t d2 = drawn[row + i];
2175 2115
2176 for (nits = 0, col = ncol; col--; ) 2116 for (nits = 0, col = ncol; col--; )
2177 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2117 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2215 /* 2155 /*
2216 * E: main pass across every character 2156 * E: main pass across every character
2217 */ 2157 */
2218 for (row = 0; row < nrow; row++) 2158 for (row = 0; row < nrow; row++)
2219 { 2159 {
2220 text_t *stp = save[row + row_offset].t; 2160 text_t *stp = save[(row + row_offset) % total_rows].t;
2221 rend_t *srp = save[row + row_offset].r; 2161 rend_t *srp = save[(row + row_offset) % total_rows].r;
2222 text_t *dtp = drawn[row].t; 2162 text_t *dtp = drawn[row].t;
2223 rend_t *drp = drawn[row].r; 2163 rend_t *drp = drawn[row].r;
2224 2164
2225 /* 2165 /*
2226 * E2: OK, now the real pass 2166 * E2: OK, now the real pass
… …
2437 else if (oldcursor.row >= 0) 2377 else if (oldcursor.row >= 0)
2438 { 2378 {
2439 int cursorwidth = 1; 2379 int cursorwidth = 1;
2440 int col = oldcursor.col; 2380 int col = oldcursor.col;
2441 2381
2442 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2382 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2443 col--; 2383 col--;
2444 2384
2445 while (col + cursorwidth < ncol 2385 while (col + cursorwidth < ncol
2446 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2386 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2447 cursorwidth++; 2387 cursorwidth++;
… …
2482} 2422}
2483 2423
2484void 2424void
2485rxvt_term::scr_remap_chars () 2425rxvt_term::scr_remap_chars ()
2486{ 2426{
2487 for (int i = nrow + saveLines; i--; ) 2427 for (int i = total_rows; i--; )
2488 scr_remap_chars (save[i]); 2428 scr_remap_chars (save[i]);
2489 2429
2490 for (int i = nrow; i--; ) 2430 for (int i = nrow; i--; )
2491 { 2431 {
2492 scr_remap_chars (drawn[i]); 2432 scr_remap_chars (drawn[i]);
… …
2540 2480
2541/* ------------------------------------------------------------------------- */ 2481/* ------------------------------------------------------------------------- */
2542void 2482void
2543rxvt_term::scr_reverse_selection () 2483rxvt_term::scr_reverse_selection ()
2544{ 2484{
2485 if (selection.op
2545 if (selection.op && current_screen == selection.screen) 2486 && current_screen == selection.screen
2487 && selection.end.row >= -view_start)
2546 { 2488 {
2547 int end_row = saveLines - view_start; 2489 int view_end = -view_start + nrow;
2548 int i = selection.beg.row + saveLines; 2490 int row, col;
2549 int col, row = selection.end.row + saveLines;
2550 rend_t *srp;
2551 2491
2552#if ENABLE_FRILLS 2492#if ENABLE_FRILLS
2553 if (selection.rect) 2493 if (selection.rect)
2554 { 2494 {
2555 end_row += nrow; 2495 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2556
2557 for (; i <= row && i <= end_row; i++)
2558 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) 2496 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2559 srp[col] ^= RS_RVid; 2497 srp[col] ^= RS_RVid;
2560 } 2498 }
2561 else 2499 else
2562#endif 2500#endif
2563 { 2501 {
2564 if (i >= end_row) 2502 if (selection.beg.row >= -view_start)
2503 {
2565 col = selection.beg.col; 2504 col = selection.beg.col;
2505 row = selection.beg.row;
2506 }
2566 else 2507 else
2567 { 2508 {
2568 col = 0; 2509 col = 0;
2569 i = end_row; 2510 row = view_start;
2570 } 2511 }
2571 2512
2572 end_row += nrow; 2513 for (; row < min (selection.end.row, view_end); row++, col = 0)
2573
2574 for (; i < row && i < end_row; i++, col = 0)
2575 for (srp = save[i].r; col < ncol; col++) 2514 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2576 srp[col] ^= RS_RVid; 2515 srp[col] ^= RS_RVid;
2577 2516
2578 if (i == row && i < end_row) 2517 if (row == selection.end.row)
2579 for (srp = save[i].r; col < selection.end.col; col++) 2518 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2580 srp[col] ^= RS_RVid; 2519 srp[col] ^= RS_RVid;
2581 } 2520 }
2582 } 2521 }
2583} 2522}
2584 2523
… …
2593{ 2532{
2594 int row, wrote; 2533 int row, wrote;
2595 unsigned int width, towrite; 2534 unsigned int width, towrite;
2596 char r1[] = "\n"; 2535 char r1[] = "\n";
2597 2536
2598 for (row = saveLines - nscrolled; 2537 for (row = saveLines - nsaved;
2599 row < saveLines + nrow - 1; row++) 2538 row < saveLines + nrow - 1; row++)
2600 { 2539 {
2601 width = save[row].l >= 0 ? save[row].l 2540 width = save[row].l >= 0 ? save[row].l
2602 : ncol; 2541 : ncol;
2603 for (towrite = width; towrite; towrite -= wrote) 2542 for (towrite = width; towrite; towrite -= wrote)
… …
2615#endif 2554#endif
2616 2555
2617/* ------------------------------------------------------------------------- * 2556/* ------------------------------------------------------------------------- *
2618 * CHARACTER SELECTION * 2557 * CHARACTER SELECTION *
2619 * ------------------------------------------------------------------------- */ 2558 * ------------------------------------------------------------------------- */
2620
2621/*
2622 * -nscrolled <= (selection row) <= nrow - 1
2623 */
2624void 2559void
2625rxvt_term::selection_check (int check_more) 2560rxvt_term::selection_check (int check_more)
2626{ 2561{
2627 row_col_t pos; 2562 row_col_t pos;
2628 2563
2629 if (!selection.op) 2564 if (!selection.op)
2630 return; 2565 return;
2631 2566
2632 pos.row = pos.col = 0; 2567 pos.row = pos.col = 0;
2633 if ((selection.beg.row < - (int32_t)nscrolled) 2568 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2634 || (selection.beg.row >= nrow) 2569 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2635 || (selection.mark.row < - (int32_t)nscrolled) 2570 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2636 || (selection.mark.row >= nrow)
2637 || (selection.end.row < - (int32_t)nscrolled)
2638 || (selection.end.row >= nrow)
2639 || (check_more == 1 2571 || (check_more == 1
2640 && current_screen == selection.screen 2572 && current_screen == selection.screen
2641 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2573 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2642 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2574 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2643 || (check_more == 2 2575 || (check_more == 2
… …
2949 * EXT: button 1 or 3 release 2881 * EXT: button 1 or 3 release
2950 */ 2882 */
2951void 2883void
2952rxvt_term::selection_make (Time tm) 2884rxvt_term::selection_make (Time tm)
2953{ 2885{
2954 int i, col, end_col, row, end_row; 2886 int i;
2955 wchar_t *new_selection_text; 2887 wchar_t *new_selection_text;
2956 text_t *t; 2888 text_t *t;
2957 2889
2958 switch (selection.op) 2890 switch (selection.op)
2959 { 2891 {
… …
2975 return; /* nothing selected, go away */ 2907 return; /* nothing selected, go away */
2976 2908
2977 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2909 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2910 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2979 2911
2980 col = selection.beg.col;
2981 row = selection.beg.row + saveLines;
2982 end_row = selection.end.row + saveLines;
2983 int ofs = 0; 2912 int ofs = 0;
2984 int extra = 0; 2913 int extra = 0;
2985 2914
2915 int col = selection.beg.col;
2916 int row = selection.beg.row;
2917
2918 int end_col;
2919
2986 for (; row <= end_row; row++, col = 0) 2920 for (; row <= selection.end.row; row++, col = 0)
2987 { 2921 {
2988#if ENABLE_FRILLS 2922#if ENABLE_FRILLS
2989 if (selection.rect) 2923 if (selection.rect)
2990 { 2924 {
2991 col = selection.beg.col; 2925 col = selection.beg.col;
2992 end_col = ncol + 1; 2926 end_col = ncol + 1;
2993 } 2927 }
2994 else 2928 else
2995#endif 2929#endif
2996 end_col = save[row].is_longer () ? ncol : save[row].l; //TODO//FIXME//LEN 2930 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2997 2931
2998 MAX_IT (col, 0); 2932 col = max (col, 0);
2999 2933
3000 if (row == end_row || selection.rect) 2934 if (row == selection.end.row || selection.rect)
3001 MIN_IT (end_col, selection.end.col); 2935 end_col = min (end_col, selection.end.col);
3002 2936
3003 t = save[row].t + col; 2937 t = ROW(row).t + col;
3004 for (; col < end_col; col++) 2938 for (; col < end_col; col++)
3005 { 2939 {
3006 if (*t == NOCHAR) 2940 if (*t == NOCHAR)
3007 t++; 2941 t++;
3008#if ENABLE_COMBINING 2942#if ENABLE_COMBINING
… …
3024#endif 2958#endif
3025 else 2959 else
3026 new_selection_text[ofs++] = *t++; 2960 new_selection_text[ofs++] = *t++;
3027 } 2961 }
3028 2962
3029 if (!save[row].is_longer () && row != end_row) 2963 if (!ROW(row).is_longer () && row != selection.end.row)
3030 new_selection_text[ofs++] = C0_LF; 2964 new_selection_text[ofs++] = C0_LF;
3031 } 2965 }
3032 2966
3033 if (end_col != selection.end.col) 2967 if (end_col != selection.end.col)
3034 new_selection_text[ofs++] = C0_LF; 2968 new_selection_text[ofs++] = C0_LF;
… …
3093 */ 3027 */
3094void 3028void
3095rxvt_term::selection_start_colrow (int col, int row) 3029rxvt_term::selection_start_colrow (int col, int row)
3096{ 3030{
3097 want_refresh = 1; 3031 want_refresh = 1;
3032
3033 selection.mark.row = row - view_start;
3098 selection.mark.col = col; 3034 selection.mark.col = col;
3099 selection.mark.row = row - view_start;
3100 3035
3101 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 3036 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1);
3102 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 3037 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1);
3103 MAX_IT (selection.mark.col, 0);
3104 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3105 3038
3106 while (selection.mark.col > 0 3039 while (selection.mark.col > 0
3107 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 3040 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3108 --selection.mark.col; 3041 --selection.mark.col;
3109 3042
3110 if (selection.op) 3043 if (selection.op)
3111 { /* clear the old selection */ 3044 { /* clear the old selection */
3112 selection.beg.row = selection.end.row = selection.mark.row; 3045 selection.beg.row = selection.end.row = selection.mark.row;
… …
3136 text_t *stp; 3069 text_t *stp;
3137 rend_t *srp; 3070 rend_t *srp;
3138 3071
3139 if (dirn == UP) 3072 if (dirn == UP)
3140 { 3073 {
3141 bound.row = saveLines - nscrolled - 1; 3074 bound.row = - nsaved - 1;
3142 bound.col = 0; 3075 bound.col = 0;
3143 dirnadd = -1; 3076 dirnadd = -1;
3144 } 3077 }
3145 else 3078 else
3146 { 3079 {
3147 bound.row = saveLines + nrow; 3080 bound.row = nrow;
3148 bound.col = ncol - 1; 3081 bound.col = ncol - 1;
3149 dirnadd = 1; 3082 dirnadd = 1;
3150 } 3083 }
3151 3084
3152 row = mark->row + saveLines; 3085 row = mark->row;
3153 col = mark->col; 3086 col = max (mark->col, 0);
3154 MAX_IT (col, 0); 3087
3155 /* find the edge of a word */ 3088 /* find the edge of a word */
3156 stp = save[row].t + col; w1 = DELIMIT_TEXT (*stp); 3089 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3157 srp = save[row].r + col; w2 = DELIMIT_REND (*srp); 3090 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3158 3091
3159 for (;;) 3092 for (;;)
3160 { 3093 {
3161 for (; col != bound.col; col += dirnadd) 3094 for (; col != bound.col; col += dirnadd)
3162 { 3095 {
… …
3172 break; 3105 break;
3173 } 3106 }
3174 3107
3175 if ((col == bound.col) && (row != bound.row)) 3108 if ((col == bound.col) && (row != bound.row))
3176 { 3109 {
3177 if (save[ (row - (dirn == UP ? 1 : 0))].is_longer ()) 3110 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3178 { 3111 {
3179 trow = row + dirnadd; 3112 trow = row + dirnadd;
3180 tcol = dirn == UP ? ncol - 1 : 0; 3113 tcol = dirn == UP ? ncol - 1 : 0;
3181 3114
3182 if (!save[trow].t) 3115 if (!ROW(trow).t)
3183 break; 3116 break;
3184 3117
3185 stp = save[trow].t + tcol; 3118 stp = ROW(trow).t + tcol;
3186 srp = save[trow].r + tcol; 3119 srp = ROW(trow).r + tcol;
3187 3120
3188 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3121 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3189 break; 3122 break;
3190 3123
3191 row = trow; 3124 row = trow;
… …
3199Old_Word_Selection_You_Die: 3132Old_Word_Selection_You_Die:
3200 if (dirn == DN) 3133 if (dirn == DN)
3201 col++; /* put us on one past the end */ 3134 col++; /* put us on one past the end */
3202 3135
3203 /* Poke the values back in */ 3136 /* Poke the values back in */
3204 ret->row = row - saveLines; 3137 ret->row = row;
3205 ret->col = col; 3138 ret->col = col;
3206} 3139}
3207 3140
3208/* ------------------------------------------------------------------------- */ 3141/* ------------------------------------------------------------------------- */
3209/* 3142/*
… …
3214 * flag == 2 ==> button 3 motion 3147 * flag == 2 ==> button 3 motion
3215 */ 3148 */
3216void 3149void
3217rxvt_term::selection_extend (int x, int y, int flag) 3150rxvt_term::selection_extend (int x, int y, int flag)
3218{ 3151{
3219 int col, row; 3152 int col = min (max (Pixel2Col (x), 0), nrow - 1);
3220 3153 int row = min (max (Pixel2Row (y), 0), ncol);
3221 col = Pixel2Col (x);
3222 row = Pixel2Row (y);
3223 MAX_IT (row, 0);
3224 MIN_IT (row, (int)nrow - 1);
3225 MAX_IT (col, 0);
3226 MIN_IT (col, (int)ncol);
3227 3154
3228 /* 3155 /*
3229 * If we're selecting characters (single click) then we must check first 3156 * If we're selecting characters (single click) then we must check first
3230 * if we are at the same place as the original mark. If we are then 3157 * if we are at the same place as the original mark. If we are then
3231 * select nothing. Otherwise, if we're to the right of the mark, you have to 3158 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3296 selection.beg.col = selection.end.col = selection.mark.col; 3223 selection.beg.col = selection.end.col = selection.mark.col;
3297 selection.beg.row = selection.end.row = selection.mark.row; 3224 selection.beg.row = selection.end.row = selection.mark.row;
3298 } 3225 }
3299 3226
3300 pos.col = col; 3227 pos.col = col;
3301 pos.row = row; 3228 pos.row = row - view_start;
3302
3303 pos.row -= view_start; /* adjust for scroll */
3304 3229
3305 /* 3230 /*
3306 * This is mainly xterm style selection with a couple of differences, mainly 3231 * This is mainly xterm style selection with a couple of differences, mainly
3307 * in the way button3 drag extension works. 3232 * in the way button3 drag extension works.
3308 * We're either doing: button1 drag; button3 press; or button3 drag 3233 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3367 } 3292 }
3368 } 3293 }
3369 3294
3370 if (selection.clicks == 1) 3295 if (selection.clicks == 1)
3371 { 3296 {
3372 if (selection.beg.col > save[selection.beg.row + saveLines].l //TODO//FIXME//LEN 3297 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3373 && !save[selection.beg.row + saveLines].is_longer () 3298 && !ROW(selection.beg.row).is_longer ()
3374#if ENABLE_FRILLS 3299#if ENABLE_FRILLS
3375 && !selection.rect 3300 && !selection.rect
3376#endif 3301#endif
3377 ) 3302 )
3378 selection.beg.col = ncol; 3303 selection.beg.col = ncol;
3379 3304
3380 if ( 3305 if (
3381 selection.end.col > save[selection.end.row + saveLines].l //TODO//FIXME//LEN 3306 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3382 && !save[selection.end.row + saveLines].is_longer () 3307 && !ROW(selection.end.row).is_longer ()
3383#if ENABLE_FRILLS 3308#if ENABLE_FRILLS
3384 && !selection.rect 3309 && !selection.rect
3385#endif 3310#endif
3386 ) 3311 )
3387 selection.end.col = ncol; 3312 selection.end.col = ncol;
… …
3401 { 3326 {
3402 selection_delimit_word (UP, &selection.beg, &selection.beg); 3327 selection_delimit_word (UP, &selection.beg, &selection.beg);
3403 3328
3404 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3329 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3405 { 3330 {
3406 if (!save[end_row + saveLines].is_longer ()) 3331 if (!ROW(end_row).is_longer ())
3407 { 3332 {
3408 selection.end.row = end_row; 3333 selection.end.row = end_row;
3409 selection.end.col = save[end_row + saveLines].l; 3334 selection.end.col = ROW(end_row).l;
3410 selection_remove_trailing_spaces (); 3335 selection_remove_trailing_spaces ();
3411 break; 3336 break;
3412 } 3337 }
3413 } 3338 }
3414 } 3339 }
… …
3421 selection.beg.col = 0; 3346 selection.beg.col = 0;
3422 selection.end.col = ncol; 3347 selection.end.col = ncol;
3423 3348
3424 // select a complete logical line 3349 // select a complete logical line
3425 while (selection.beg.row > -saveLines 3350 while (selection.beg.row > -saveLines
3426 && save[selection.beg.row - 1 + saveLines].is_longer ()) 3351 && ROW(selection.beg.row - 1).is_longer ())
3427 selection.beg.row--; 3352 selection.beg.row--;
3428 3353
3429 while (selection.end.row < nrow 3354 while (selection.end.row < nrow
3430 && save[selection.end.row + saveLines].is_longer ()) 3355 && ROW(selection.end.row).is_longer ())
3431 selection.end.row++; 3356 selection.end.row++;
3432 } 3357 }
3433 } 3358 }
3434 3359
3435 if (button3 && buttonpress) 3360 if (button3 && buttonpress)
… …
3460 text_t *stp; 3385 text_t *stp;
3461 3386
3462 end_col = selection.end.col; 3387 end_col = selection.end.col;
3463 end_row = selection.end.row; 3388 end_row = selection.end.row;
3464 3389
3465 for ( ; end_row >= selection.beg.row; ) 3390 for (; end_row >= selection.beg.row; )
3466 { 3391 {
3467 stp = save[end_row + saveLines].t; 3392 stp = ROW(end_row).t;
3468 3393
3469 while (--end_col >= 0) 3394 while (--end_col >= 0)
3470 { 3395 {
3471 if (stp[end_col] != ' ' 3396 if (stp[end_col] != ' '
3472 && stp[end_col] != '\t' 3397 && stp[end_col] != '\t'
3473 && stp[end_col] != NOCHAR) 3398 && stp[end_col] != NOCHAR)
3474 break; 3399 break;
3475 } 3400 }
3476 3401
3477 if (end_col >= 0 3402 if (end_col >= 0
3478 || !save[end_row - 1 + saveLines].is_longer ()) 3403 || !ROW(end_row - 1).is_longer ())
3479 { 3404 {
3480 selection.end.col = end_col + 1; 3405 selection.end.col = end_col + 1;
3481 selection.end.row = end_row; 3406 selection.end.row = end_row;
3482 break; 3407 break;
3483 } 3408 }
… …
3791rxvt_term::scr_swap_overlay () 3716rxvt_term::scr_swap_overlay ()
3792{ 3717{
3793 if (!ov_text) 3718 if (!ov_text)
3794 return; 3719 return;
3795 3720
3796 int row_offset = ov_y + saveLines - view_start;
3797
3798 // swap screen mem with overlay 3721 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3722 for (int y = ov_h; y--; )
3800 { 3723 {
3801 text_t *t1 = ov_text[y]; 3724 text_t *t1 = ov_text[y];
3802 rend_t *r1 = ov_rend[y]; 3725 rend_t *r1 = ov_rend[y];
3803 3726
3804 text_t *t2 = save[y + row_offset].t + ov_x; 3727 text_t *t2 = ROW(y - view_start).t + ov_x;
3805 rend_t *r2 = save[y + row_offset].r + ov_x; 3728 rend_t *r2 = ROW(y - view_start).r + ov_x;
3806 3729
3807 for (int x = ov_w; x--; ) 3730 for (int x = ov_w; x--; )
3808 { 3731 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3732 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3733 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3812 } 3735 }
3813} 3736}
3814 3737
3815#endif 3738#endif
3816/* ------------------------------------------------------------------------- */ 3739/* ------------------------------------------------------------------------- */
3740

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines