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.209 by root, Thu Jan 5 01:04:10 2006 UTC vs.
Revision 1.232 by root, Sun Jan 15 16:59:54 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch ();
130
129 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
131 133
132 text_t *et = l.t + col; 134 text_t *et = l.t + col;
133 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
143/* 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 */
144void 146void
145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
146{ 148{
147 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
148} 153}
149 154
150/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
151 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
152 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
174 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
175 { 180 {
176 //TODO//FIXME 181 //TODO//FIXME
177 saveLines++; 182 saveLines++;
178 prev_nrow--; 183 prev_nrow--;
179 nsaved++; 184 top_row--;
180 } 185 }
181 186
182 want_refresh = 1; 187 want_refresh = 1;
183 188
184 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
189 194
190 if (!row_buf) 195 if (!row_buf)
191 { 196 {
192 /* 197 /*
193 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 199 */
196 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
197 term_start = 0; 201 term_start = 0;
198 202
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 205
202 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
203 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 209
207 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
208 { 211 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
255 } 258 }
256 } 259 }
257#endif 260#endif
258 261
259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262 264
263 for (int row = min (nrow, prev_nrow); row--; ) 265 for (int row = min (nrow, prev_nrow); row--; )
264 { 266 {
265 lresize (drawn_buf[row]); 267 lresize (drawn_buf[row]);
… …
270 { 272 {
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 } 275 }
274 276
277 line_t *old_buf = row_buf;
275 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
276 279
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
280 283
281 if (nsaved) 284 if (top_row)
282 { 285 {
283 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
285 288
286 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
… …
290 { 293 {
291 p = MOD (p - 1, prev_total_rows); 294 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT 295#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif 297#endif
295
296 int plines = 1; 298 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 299 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 300
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300 { 302 {
… …
318 // re-assemble the full line by destination lines 320 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++) 321 for (int qrow = q; qlines--; qrow++)
320 { 322 {
321 qline = row_buf + qrow; 323 qline = row_buf + qrow;
322 lalloc (*qline); 324 lalloc (*qline);
325 qline->l = ncol;
323 qline->set_is_longer (); 326 qline->is_longer (1);
324 327
325 int qcol = 0; 328 int qcol = 0;
326 329
327 // fill a single destination line 330 // fill a single destination line
328 while (lofs < llen && qcol < ncol) 331 while (lofs < llen && qcol < ncol)
… …
353 qcol += len; 356 qcol += len;
354 } 357 }
355 } 358 }
356 359
357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 361 qline->is_longer (0);
359 if (qline->l < 0)
360 {
361 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
362 qline->l = 0;
363 }
364#endif
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
366 } 363 }
367 while (p != pend && q > 0); 364 while (p != pend && q > 0);
368 365
369 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
370 nsaved = term_start - q; 367 top_row = q - term_start;
371 368
372 // make sure all terminal lines exist 369 // make sure all terminal lines exist
373 while (nsaved < 0) 370 while (top_row > 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375
376 } 372 }
377 else 373 else
378 { 374 {
379 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
380 376
… …
394 390
395 term_start = 0; 391 term_start = 0;
396 } 392 }
397 393
398#ifdef DEBUG_STRICT //TODO: remove 394#ifdef DEBUG_STRICT //TODO: remove
399 for (int i = -nsaved; i < nrow; i++) 395 for (int i = top_row; i < nrow; i++)
400 assert (ROW (i).t); 396 assert (ROW (i).t);
401#endif 397#endif
402 398
403 free (old_buf); 399 free (old_buf);
404 delete old_ta; 400 delete old_ta;
… …
419 for (int col = ncol; col--; ) 415 for (int col = ncol; col--; )
420 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
421 417
422 tt_winch (); 418 tt_winch ();
423 419
424 PERL_INVOKE ((this, HOOK_RESET, DT_END)); 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
425} 421}
426 422
427/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
428/* 424/*
429 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
435 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
436 432
437 free (row_buf); 433 free (row_buf);
438 free (swap_buf); 434 free (swap_buf);
439 free (drawn_buf); 435 free (drawn_buf);
440 free (temp_buf);
441 free (tabs); 436 free (tabs);
442 437
443 row_buf = 0; // signal that we freed all the arrays 438 row_buf = 0; // signal that we freed all the arrays
444} 439}
445 440
… …
577 * Change the colour for following text 572 * Change the colour for following text
578 */ 573 */
579void 574void
580rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
581{ 576{
582 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
583 color = fgbg; 578 color = fgbg;
584 579
585 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
586 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
587 else 582 else
… …
618 want_refresh = 1; 613 want_refresh = 1;
619 num_scr += count; 614 num_scr += count;
620 615
621 if (count > 0 616 if (count > 0
622 && row1 == 0 617 && row1 == 0
623 && row2 == nrow - 1
624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
625 { 619 {
626 nsaved = min (nsaved + count, saveLines); 620 top_row = max (top_row - count, -saveLines);
627 621
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
629 623
624 // scroll everything up 'count' lines
630 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
631 626
627 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count);
630 l.touch ();
631 l.is_longer (0);
632 }
633
634 // erase newly scorlled-in lines
635 for (int i = count; i; --i )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
632 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
633 { 661 {
634 selection.beg.row -= count; 662 selection.beg.row -= count;
635 selection.end.row -= count; 663 selection.end.row -= count;
636 selection.mark.row -= count; 664 selection.mark.row -= count;
637 665
638 if (selection.beg.row < -nsaved 666 if (selection.beg.row < top_row
639 || selection.end.row < -nsaved 667 || selection.end.row < top_row
640 || selection.mark.row < -nsaved) 668 || selection.mark.row < top_row)
641 { 669 {
642 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
643 selection.op = SELECTION_CLEAR; 671 selection.op = SELECTION_CLEAR;
644 } 672 }
645 } 673 }
646 674
647 for (int i = count; i--; ) 675 // finally move the view window, if desired
648 {
649 ROW(row2 - i).l = 0;
650 scr_blank_screen_mem (ROW(row2 - i), rstyle);
651 }
652
653 if (OPTION (Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
654 && view_start != 0 677 && view_start != 0
655 && view_start != saveLines) 678 && view_start != -saveLines)
656 scr_page (UP, count); 679 scr_page (UP, count);
657 } 680 }
658 else 681 else
659 { 682 {
660 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
… …
685 708
686 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
687 710
688 min_it (count, rows); 711 min_it (count, rows);
689 712
713 line_t *temp_buf = row_buf + total_rows;
714
690 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
691 { 716 {
692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
693 718
694 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
705/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
706/* 731/*
707 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
708 */ 733 */
709void 734void
710rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 735rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
711{ 736{
712 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
713 return; 738 return;
714 739
715 unsigned char checksel; 740 unsigned char checksel;
716 unicode_t c; 741 unicode_t c;
717 int last_col; 742 int ncol = this->ncol;
718 const unicode_t *strend = str + len; 743 const wchar_t *strend = str + len;
719 744
720 want_refresh = 1; 745 want_refresh = 1;
721 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
722 last_col = ncol;
723 747
724 if (nlines > 0) 748 if (minlines > 0)
725 { 749 {
726 nlines += screen.cur.row - screen.bscroll; 750 minlines += screen.cur.row - screen.bscroll;
727 751
728 if (nlines > 0 752 if (minlines > 0
729 && screen.tscroll == 0 753 && screen.tscroll == 0
730 && screen.bscroll == (nrow - 1)) 754 && screen.bscroll == nrow - 1)
731 { 755 {
732 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
733 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
734 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
735 } 759 }
736 } 760 }
737 761
738#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
739 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
740 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
741 && screen.cur.row >= -nsaved); 765 && screen.cur.row >= top_row);
742#endif 766#endif
743 int row = screen.cur.row; 767 int row = screen.cur.row;
744 768
745 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
746 770
747 line_t *line = &ROW(row); 771 line_t *line = &ROW(row);
748 772
749 while (str < strend) 773 while (str < strend)
750 { 774 {
751 c = *str++; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
752 776
753 if (c < 0x20) 777 if (c < 0x20)
754 if (c == C0_LF) 778 if (c == C0_LF)
755 { 779 {
756 if (!line->is_longer ()) /* XXX: think about this */
757 max_it (line->l, screen.cur.col); 780 max_it (line->l, screen.cur.col);
758 781
759 screen.flags &= ~Screen_WrapNext; 782 screen.flags &= ~Screen_WrapNext;
760 783
761 if (screen.cur.row == screen.bscroll) 784 if (screen.cur.row == screen.bscroll)
762 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
766 line = &ROW(row); /* _must_ refresh */ 789 line = &ROW(row); /* _must_ refresh */
767 continue; 790 continue;
768 } 791 }
769 else if (c == C0_CR) 792 else if (c == C0_CR)
770 { 793 {
771 if (!line->is_longer ()) /* XXX: think about this */
772 max_it (line->l, screen.cur.col); 794 max_it (line->l, screen.cur.col);
773 795
774 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
775 screen.cur.col = 0; 797 screen.cur.col = 0;
776 continue; 798 continue;
777 } 799 }
… …
794 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
795 } 817 }
796 818
797 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
798 { 820 {
821 max_it (line->l, ncol);
799 line->set_is_longer (); 822 line->is_longer (1);
800 823
801 scr_do_wrap (); 824 scr_do_wrap ();
802 825
803 row = screen.cur.row; 826 row = screen.cur.row;
804 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
… …
812 // do wcwidth before further replacements, as wcwidth might return -1 835 // do wcwidth before further replacements, as wcwidth might return -1
813 // for the line drawing characters below as they might be invalid in the current 836 // for the line drawing characters below as they might be invalid in the current
814 // locale. 837 // locale.
815 int width = c < 0x100 ? 1 : wcwidth (c); 838 int width = c < 0x100 ? 1 : wcwidth (c);
816 839
817 if (charsets[screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
818 { 841 {
819 // vt100 special graphics and line drawing 842 // vt100 special graphics and line drawing
820 // 5f-7e standard vt100 843 // 5f-7e standard vt100
821 // 40-5e rxvt extension for extra curses acs chars 844 // 40-5e rxvt extension for extra curses acs chars
822 static uint16_t vt100_0[62] = { // 41 .. 7e 845 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
874 } 897 }
875 898
876 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
877 900
878 // if the character doesn't fit into the remaining columns... 901 // if the character doesn't fit into the remaining columns...
879 if (screen.cur.col > last_col - width && last_col >= width) 902 if (screen.cur.col > ncol - width && ncol >= width)
880 { 903 {
881 // ...output spaces 904 // ...output spaces
882 c = ' '; 905 c = ' ';
883 // and try the same character next loop iteration 906 // and try the same character next loop iteration
884 --str; 907 --str;
885 } 908 }
886 909
910 line->touch ();
911
887 do 912 do
888 { 913 {
889 line->t[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
890 line->r[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
891 916
892 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
893 screen.cur.col++; 918 screen.cur.col++;
894 else 919 else
895 { 920 {
896 line->l = last_col; 921 line->l = ncol;
897 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
898 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
899 break; 924 break;
900 } 925 }
901 926
… …
903 } 928 }
904 while (--width > 0); 929 while (--width > 0);
905 930
906 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
907 if (!width) 932 if (!width)
933 {
934 line->touch ();
935
908 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 936 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
909 { 937 {
910 line->t[c] = ' '; 938 line->t[c] = ' ';
911 line->r[c] = rend; 939 line->r[c] = rend;
912 } 940 }
941 }
913 } 942 }
914 else // width == 0 943 else // width == 0
915 { 944 {
916#if ENABLE_COMBINING 945#if ENABLE_COMBINING
917 // handle combining characters 946 // handle combining characters
918 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
919 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
920 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
921 text_t *tp; 951 text_t *tp;
922 rend_t *rp; 952 rend_t *rp;
923 953
924 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
925 { 955 {
956 linep = line;
926 tp = line->t + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
927 rp = line->r + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
928
929 while (*tp == NOCHAR && tp > line->t)
930 tp--, rp--;
931 } 959 }
932 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
933 && ROW(screen.cur.row - 1).is_longer ()) 961 && ROW(screen.cur.row - 1).is_longer ())
934 { 962 {
935 line_t *line = &ROW(screen.cur.row - 1); 963 linep = &ROW(screen.cur.row - 1);
936
937 tp = line->t + last_col - 1; 964 tp = line->t + ncol - 1;
938 rp = line->r + last_col - 1; 965 rp = line->r + ncol - 1;
939
940 while (*tp == NOCHAR && tp > line->t)
941 tp--, rp--;
942 } 966 }
943 else 967 else
944 continue; 968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
945 974
946 // first try to find a precomposed character 975 // first try to find a precomposed character
947 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
948 if (n == NOCHAR) 977 if (n == NOCHAR)
949 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
… …
952 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
953#endif 982#endif
954 } 983 }
955 } 984 }
956 985
957 if (!line->is_longer ()) /* XXX: think about this */
958 max_it (line->l, screen.cur.col); 986 max_it (line->l, screen.cur.col);
959 987
960#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
961 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
962#endif 990#endif
963} 991}
… …
1013 1041
1014 for (; ++i < ncol; ) 1042 for (; ++i < ncol; )
1015 if (tabs[i]) 1043 if (tabs[i])
1016 { 1044 {
1017 x = i; 1045 x = i;
1046
1018 if (!--count) 1047 if (!--count)
1019 break; 1048 break;
1020 } 1049 }
1021 else 1050 else
1022 ht &= l.t[i] == ' ' 1051 ht &= l.t[i] == ' '
… …
1029 // buffer so they can be selected and pasted. 1058 // buffer so they can be selected and pasted.
1030 if (ht && OPTION (Opt_pastableTabs)) 1059 if (ht && OPTION (Opt_pastableTabs))
1031 { 1060 {
1032 base_rend = SET_FONT (base_rend, 0); 1061 base_rend = SET_FONT (base_rend, 0);
1033 1062
1034 if (!l.is_longer ()) /* XXX: think about this */ 1063 l.touch (x);
1035 max_it (l.l, x);
1036 1064
1037 i = screen.cur.col; 1065 i = screen.cur.col;
1038 1066
1039 l.t[i] = '\t'; 1067 l.t[i] = '\t';
1040 l.r[i] = base_rend; 1068 l.r[i] = base_rend;
… …
1094{ 1122{
1095 if (screen.cur.col < ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1096 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1097 else 1125 else
1098 { 1126 {
1099 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1127 line_t &l = ROW(screen.cur.row);
1100 ROW(screen.cur.row).l = ncol; 1128
1129 l.touch ();
1130 l.is_longer (0);
1101 1131
1102 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1103 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1104 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1105 } 1135 }
… …
1196 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1197 1227
1198 selection_check (1); 1228 selection_check (1);
1199 1229
1200 line_t &line = ROW(screen.cur.row); 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1201 1234
1202 switch (mode) 1235 switch (mode)
1203 { 1236 {
1204 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1205 col = screen.cur.col; 1238 col = screen.cur.col;
… …
1300 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1301 } 1334 }
1302 1335
1303 for (; num--; row++) 1336 for (; num--; row++)
1304 { 1337 {
1305 ROW (row).l = 0;
1306 scr_blank_screen_mem (ROW (row), rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1307 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1308 } 1340 }
1309} 1341}
1310 1342
1311#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
… …
1313rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1314{ 1346{
1315 want_refresh = 1; 1347 want_refresh = 1;
1316 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1317 1349
1318 nsaved = 0; 1350 top_row = 0;
1319} 1351}
1320#endif 1352#endif
1321 1353
1322/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1323/* 1355/*
… …
1344 rend_t *r1 = line.r; 1376 rend_t *r1 = line.r;
1345 1377
1346 for (int j = ncol; j--; ) 1378 for (int j = ncol; j--; )
1347 *r1++ = fs; 1379 *r1++ = fs;
1348 1380
1349 line.l = ncol; /* make the `E's selectable */ 1381 line.is_longer (0);
1382 line.touch (ncol);
1350 } 1383 }
1351} 1384}
1352 1385
1353/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1354/* 1387/*
… …
1402 min_it (count, ncol - screen.cur.col); 1435 min_it (count, ncol - screen.cur.col);
1403 1436
1404 row = screen.cur.row; 1437 row = screen.cur.row;
1405 1438
1406 line_t *line = &ROW(row); 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1407 1443
1408 switch (insdel) 1444 switch (insdel)
1409 { 1445 {
1410 case INSERT: 1446 case INSERT:
1411 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1412 { 1448 {
1413 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1414 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1415 } 1451 }
1416 1452
1417 if (!line->is_longer ()) 1453 line->l = min (line->l + count, ncol);
1418 {
1419 line->l += count;
1420 min_it (line->l, ncol);
1421 }
1422 1454
1423 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1424 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1425 { 1457 {
1426 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1439 1471
1440 case ERASE: 1472 case ERASE:
1441 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1442 selection_check (1); 1474 selection_check (1);
1443 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1444 scr_blank_line (*line, screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1445 break; 1479 break;
1446 1480
1447 case DELETE: 1481 case DELETE:
1448 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1451 { 1485 {
1452 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1453 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1454 } 1488 }
1455 1489
1490 line->l = max (line->l - count, 0);
1456 scr_blank_line (*line, ncol - count, count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1457
1458 if (line->is_longer ()) /* break line continuation */
1459 line->l = ncol;
1460
1461 line->l = max (line->l - count, 0);
1462 1492
1463 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1465 { 1495 {
1466 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1578rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1579{ 1609{
1580 if (mode < 0) 1610 if (mode < 0)
1581 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1582 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1583 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1584} 1614}
1585 1615
1586/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1587/* 1617/*
1588 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1635 * Set font style 1665 * Set font style
1636 */ 1666 */
1637void 1667void
1638rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1639{ 1669{
1670#if 0
1640 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1641 { 1672 {
1642 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1643 break; 1674 break;
1644 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1645 break; 1676 break;
… …
1652 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1653 break; 1684 break;
1654 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1655 break; 1686 break;
1656 } 1687 }
1688#endif
1657} 1689}
1658 1690
1659/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1660/* 1692/*
1661 * Choose a font 1693 * Choose a font
… …
1776/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1777/* 1809/*
1778 * Move the display so that the line represented by scrollbar value Y is at 1810 * Move the display so that the line represented by scrollbar value Y is at
1779 * the top of the screen 1811 * the top of the screen
1780 */ 1812 */
1781int 1813void
1782rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1783{ 1815{
1784 long p = 0; 1816 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1785 unsigned int oldviewstart;
1786
1787 oldviewstart = view_start;
1788
1789 if (y < len)
1790 {
1791 p = (nrow + nsaved) * (len - y) / len;
1792 p -= (long) (nrow - 1);
1793 p = max (p, 0);
1794 }
1795
1796 view_start = (unsigned int)min (p, nsaved);
1797
1798 return scr_changeview (oldviewstart);
1799} 1817}
1800 1818
1801/* ------------------------------------------------------------------------- */ 1819/* ------------------------------------------------------------------------- */
1802/* 1820/*
1803 * Page the screen up/down nlines 1821 * Page the screen up/down nlines
1804 * direction should be UP or DN 1822 * direction should be UP or DN
1805 */ 1823 */
1806int 1824bool
1807rxvt_term::scr_page (enum page_dirn direction, int nlines) 1825rxvt_term::scr_page (enum page_dirn direction, int nlines)
1808{ 1826{
1809 int n; 1827 int new_view_start =
1810 unsigned int oldviewstart;
1811
1812 oldviewstart = view_start;
1813
1814 if (direction == UP)
1815 {
1816 n = view_start + nlines;
1817 view_start = min (n, nsaved);
1818 }
1819 else
1820 {
1821 n = view_start - nlines; 1828 direction == UP ? view_start - nlines
1822 view_start = max (n, 0); 1829 : view_start + nlines;
1823 }
1824 1830
1825 return scr_changeview (oldviewstart); 1831 return scr_changeview (new_view_start);
1826} 1832}
1827 1833
1828int 1834bool
1829rxvt_term::scr_changeview (unsigned int oldviewstart) 1835rxvt_term::scr_changeview (int new_view_start)
1830{ 1836{
1837 clamp_it (new_view_start, top_row, 0);
1838
1839 if (new_view_start == view_start)
1840 return false;
1841
1842 num_scr += new_view_start - view_start;
1843 view_start = new_view_start;
1831 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1832
1833 if (view_start != oldviewstart)
1834 {
1835 want_refresh = 1; 1845 want_refresh = 1;
1836 num_scr -= (view_start - oldviewstart);
1837 }
1838 1846
1839 return (int) (view_start - oldviewstart); 1847 return true;
1840} 1848}
1841 1849
1842/* ------------------------------------------------------------------------- */ 1850/* ------------------------------------------------------------------------- */
1843void 1851void
1844rxvt_term::scr_bell () 1852rxvt_term::scr_bell ()
… …
1853# endif 1861# endif
1854 1862
1855 if (OPTION (Opt_visualBell)) 1863 if (OPTION (Opt_visualBell))
1856 { 1864 {
1857 scr_rvideo_mode (!rvideo); /* refresh also done */ 1865 scr_rvideo_mode (!rvideo); /* refresh also done */
1866 display->flush ();
1858 rxvt_usleep (VISUAL_BELL_DURATION); 1867 rxvt_usleep (VISUAL_BELL_DURATION);
1859 scr_rvideo_mode (!rvideo); /* refresh also done */ 1868 scr_rvideo_mode (!rvideo); /* refresh also done */
1860 } 1869 }
1861 else 1870 else
1862 XBell (display->display, 0); 1871 XBell (display->display, 0);
… …
1876 if ((fd = popen_printer ()) == NULL) 1885 if ((fd = popen_printer ()) == NULL)
1877 return; 1886 return;
1878 1887
1879 if (fullhist) 1888 if (fullhist)
1880 { 1889 {
1881 nrows = nrow + nsaved; 1890 nrows = nrow - top_row;
1882 row_start = -nsaved; 1891 row_start = top_row;
1883 } 1892 }
1884 else 1893 else
1885 { 1894 {
1886 nrows = nrow; 1895 nrows = nrow;
1887 row_start = -view_start; 1896 row_start = view_start;
1888 } 1897 }
1889 1898
1890 wctomb (0, 0); 1899 wctomb (0, 0);
1891 1900
1892 for (int r1 = 0; r1 < nrows; r1++) 1901 for (int r1 = 0; r1 < nrows; r1++)
… …
2020 2029
2021 /* make sure no outline cursor is left around */ 2030 /* make sure no outline cursor is left around */
2022 setoldcursor = 0; 2031 setoldcursor = 0;
2023 if (ocrow != -1) 2032 if (ocrow != -1)
2024 { 2033 {
2025 if (screen.cur.row + view_start != ocrow 2034 if (screen.cur.row - view_start != ocrow
2026 || screen.cur.col != oldcursor.col) 2035 || screen.cur.col != oldcursor.col)
2027 { 2036 {
2028 if (ocrow < nrow 2037 if (ocrow < nrow
2029 && oldcursor.col < ncol) 2038 && oldcursor.col < ncol)
2030 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2039 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2038 else if (!focus) 2047 else if (!focus)
2039 setoldcursor = 1; 2048 setoldcursor = 1;
2040 2049
2041 if (setoldcursor) 2050 if (setoldcursor)
2042 { 2051 {
2043 if (screen.cur.row + view_start >= nrow) 2052 if (screen.cur.row - view_start >= nrow)
2044 oldcursor.row = -1; 2053 oldcursor.row = -1;
2045 else 2054 else
2046 { 2055 {
2047 oldcursor.row = screen.cur.row + view_start; 2056 oldcursor.row = screen.cur.row - view_start;
2048 oldcursor.col = screen.cur.col; 2057 oldcursor.col = screen.cur.col;
2049 } 2058 }
2050 } 2059 }
2051 } 2060 }
2052 2061
2053 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2062 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2054#if ENABLE_OVERLAY 2063#if ENABLE_OVERLAY
2055 scr_swap_overlay (); 2064 scr_swap_overlay ();
2056#endif 2065#endif
2057 2066
2058#ifndef NO_SLOW_LINK_SUPPORT 2067#ifndef NO_SLOW_LINK_SUPPORT
… …
2074 row = i > 0 ? 0 : j - 1; 2083 row = i > 0 ? 0 : j - 1;
2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2084 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2076 { 2085 {
2077 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2086 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2078 { 2087 {
2079 line_t s = ROW(row - view_start); 2088 line_t s = ROW(view_start + row);
2080 line_t d = drawn_buf[row]; 2089 line_t d = drawn_buf[row];
2081 line_t d2 = drawn_buf[row + i]; 2090 line_t d2 = drawn_buf[row + i];
2082 2091
2083 for (nits = 0, col = ncol; col--; ) 2092 for (nits = 0, col = ncol; col--; )
2084 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2093 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2122 /* 2131 /*
2123 * E: main pass across every character 2132 * E: main pass across every character
2124 */ 2133 */
2125 for (row = 0; row < nrow; row++) 2134 for (row = 0; row < nrow; row++)
2126 { 2135 {
2127 text_t *stp = ROW(row - view_start).t; 2136 text_t *stp = ROW(view_start + row).t;
2128 rend_t *srp = ROW(row - view_start).r; 2137 rend_t *srp = ROW(view_start + row).r;
2129 text_t *dtp = drawn_buf[row].t; 2138 text_t *dtp = drawn_buf[row].t;
2130 rend_t *drp = drawn_buf[row].r; 2139 rend_t *drp = drawn_buf[row].r;
2131 2140
2132 /* 2141 /*
2133 * E2: OK, now the real pass 2142 * E2: OK, now the real pass
… …
2321 } /* for (row....) */ 2330 } /* for (row....) */
2322 2331
2323#if ENABLE_OVERLAY 2332#if ENABLE_OVERLAY
2324 scr_swap_overlay (); 2333 scr_swap_overlay ();
2325#endif 2334#endif
2326 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2335 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2327 2336
2328 /* 2337 /*
2329 * G: cleanup cursor and display outline cursor if necessary 2338 * G: cleanup cursor and display outline cursor if necessary
2330 */ 2339 */
2331 if (showcursor) 2340 if (showcursor)
… …
2370 /* 2379 /*
2371 * H: cleanup selection 2380 * H: cleanup selection
2372 */ 2381 */
2373 scr_reverse_selection (); 2382 scr_reverse_selection ();
2374 2383
2375 if (refresh_type & SMOOTH_REFRESH)
2376 XFlush (display->display);
2377
2378 num_scr = 0; 2384 num_scr = 0;
2379 num_scr_allow = 1; 2385 num_scr_allow = 1;
2380} 2386}
2381 2387
2382void 2388void
2383rxvt_term::scr_remap_chars (const line_t &l) 2389rxvt_term::scr_remap_chars (line_t &l)
2384{ 2390{
2385 if (!l.t) 2391 if (!l.t)
2386 return; 2392 return;
2393
2394 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2387 2395
2388 for (int i = ncol; i--; ) 2396 for (int i = ncol; i--; )
2389 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2397 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2390} 2398}
2391 2399
… …
2444 2452
2445 if (really) 2453 if (really)
2446 XClearWindow (display->display, vt); 2454 XClearWindow (display->display, vt);
2447} 2455}
2448 2456
2457void
2458rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2459{
2460 int view_end = view_start + nrow;
2461 int row, col;
2462
2463 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2464 {
2465 text_t *stp = ROW(row).t;
2466 rend_t *srp = ROW(row).r;
2467
2468 for (col = beg_col; col < end_col; col++)
2469 srp[col] ^= rstyle1;
2470
2471 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2472 srp[col] ^= rstyle2;
2473
2474 if (++col < end_col)
2475 srp[col] ^= rstyle2;
2476 }
2477}
2478
2479void
2480rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2481{
2482 int view_end = view_start + nrow;
2483 int row, col;
2484
2485 if (beg_row >= view_start)
2486 {
2487 col = beg_col;
2488 row = beg_row;
2489 }
2490 else
2491 {
2492 col = 0;
2493 row = view_start;
2494 }
2495
2496 for (; row < min (end_row, view_end); row++, col = 0)
2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2498 srp[col] ^= rstyle;
2499
2500 if (row == end_row)
2501 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2502 srp[col] ^= rstyle;
2503}
2504
2449/* ------------------------------------------------------------------------- */ 2505/* ------------------------------------------------------------------------- */
2450void 2506void
2451rxvt_term::scr_reverse_selection () 2507rxvt_term::scr_reverse_selection ()
2452{ 2508{
2453 if (selection.op 2509 if (selection.op
2454 && current_screen == selection.screen 2510 && current_screen == selection.screen
2455 && selection.end.row >= -view_start) 2511 && selection.end.row >= view_start)
2456 { 2512 {
2457 int view_end = -view_start + nrow;
2458 int row, col;
2459
2460#if ENABLE_FRILLS 2513#if ENABLE_FRILLS
2461 if (selection.rect) 2514 if (selection.rect)
2462 { 2515 scr_xor_rect (selection.beg.row, selection.beg.col,
2463 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2516 selection.end.row, selection.end.col,
2464 { 2517 RS_RVid, RS_RVid | RS_Uline);
2465 text_t *stp = ROW(row).t;
2466 rend_t *srp = ROW(row).r;
2467
2468 for (col = selection.beg.col; col < selection.end.col; col++)
2469 srp[col] ^= RS_RVid;
2470
2471 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2472 srp[col] ^= RS_RVid | RS_Uline;
2473
2474 if (++col < selection.end.col)
2475 srp[col] ^= RS_RVid | RS_Uline;
2476 }
2477 }
2478 else 2518 else
2479#endif 2519#endif
2480 { 2520 scr_xor_span (selection.beg.row, selection.beg.col,
2481 if (selection.beg.row >= -view_start) 2521 selection.end.row, selection.end.col,
2482 { 2522 RS_RVid);
2483 col = selection.beg.col;
2484 row = selection.beg.row;
2485 }
2486 else
2487 {
2488 col = 0;
2489 row = -view_start;
2490 }
2491
2492 for (; row < min (selection.end.row, view_end); row++, col = 0)
2493 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2494 srp[col] ^= RS_RVid;
2495
2496 if (row == selection.end.row)
2497 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2498 srp[col] ^= RS_RVid;
2499 }
2500 } 2523 }
2501} 2524}
2502 2525
2503/* ------------------------------------------------------------------------- */ 2526/* ------------------------------------------------------------------------- */
2504/* 2527/*
… …
2542 2565
2543 if (!selection.op) 2566 if (!selection.op)
2544 return; 2567 return;
2545 2568
2546 pos.row = pos.col = 0; 2569 pos.row = pos.col = 0;
2547 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2570 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2548 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2571 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2549 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2572 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2550 || (check_more == 1 2573 || (check_more == 1
2551 && current_screen == selection.screen 2574 && current_screen == selection.screen
2552 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2575 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2553 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2576 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2554 || (check_more == 2 2577 || (check_more == 2
… …
2883 selection.op = SELECTION_DONE; 2906 selection.op = SELECTION_DONE;
2884 2907
2885 if (selection.clicks == 4) 2908 if (selection.clicks == 4)
2886 return; /* nothing selected, go away */ 2909 return; /* nothing selected, go away */
2887 2910
2888 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2911 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2889 return; 2912 return;
2890 2913
2891 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2914 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2892 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2915 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2893 2916
… …
2907 col = selection.beg.col; 2930 col = selection.beg.col;
2908 end_col = ncol + 1; 2931 end_col = ncol + 1;
2909 } 2932 }
2910 else 2933 else
2911#endif 2934#endif
2912 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2935 end_col = ROW(row).l;
2913 2936
2914 col = max (col, 0); 2937 col = max (col, 0);
2915 2938
2916 if (row == selection.end.row 2939 if (row == selection.end.row
2917#if ENABLE_FRILLS 2940#if ENABLE_FRILLS
… …
2919#endif 2942#endif
2920 ) 2943 )
2921 min_it (end_col, selection.end.col); 2944 min_it (end_col, selection.end.col);
2922 2945
2923 t = ROW(row).t + col; 2946 t = ROW(row).t + col;
2947
2924 for (; col < end_col; col++) 2948 for (; col < end_col; col++)
2925 { 2949 {
2926 if (*t == NOCHAR) 2950 if (*t == NOCHAR)
2927 t++; 2951 t++;
2928#if ENABLE_COMBINING 2952#if ENABLE_COMBINING
… …
2977 3001
2978 // we usually allocate much more than necessary, so realloc it smaller again 3002 // we usually allocate much more than necessary, so realloc it smaller again
2979 selection.len = ofs; 3003 selection.len = ofs;
2980 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3004 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2981 3005
2982 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 3006 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2983 return; 3007 return;
2984 3008
2985 selection_grab (tm); 3009 selection_grab (tm);
2986} 3010}
2987 3011
… …
2995 { 3019 {
2996 display->set_selection_owner (this); 3020 display->set_selection_owner (this);
2997 return true; 3021 return true;
2998 } 3022 }
2999 else 3023 else
3024 {
3025 selection_clear ();
3000 return false; 3026 return false;
3027 }
3001 3028
3002#if 0 3029#if 0
3003 XTextProperty ct; 3030 XTextProperty ct;
3004 3031
3005 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3032 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3019rxvt_term::selection_click (int clicks, int x, int y) 3046rxvt_term::selection_click (int clicks, int x, int y)
3020{ 3047{
3021 clicks = ((clicks - 1) % 3) + 1; 3048 clicks = ((clicks - 1) % 3) + 1;
3022 selection.clicks = clicks; /* save clicks so extend will work */ 3049 selection.clicks = clicks; /* save clicks so extend will work */
3023 3050
3051 if (clicks == 2 && !selection.rect
3052 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3053 {
3054 MEvent.clicks = 1; // what a mess
3055 selection.screen = current_screen;
3056 selection.op = SELECTION_CONT;
3057 return;
3058 }
3059
3024 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3060 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3025 3061
3026 if (clicks == 2 || clicks == 3) 3062 if (clicks == 2 || clicks == 3)
3027 selection_extend_colrow (selection.mark.col, 3063 selection_extend_colrow (selection.mark.col,
3028 selection.mark.row + view_start, 3064 selection.mark.row - view_start,
3029 0, /* button 3 */ 3065 0, /* button 3 */
3030 1, /* button press */ 3066 1, /* button press */
3031 0); /* click change */ 3067 0); /* click change */
3032} 3068}
3033 3069
… …
3038void 3074void
3039rxvt_term::selection_start_colrow (int col, int row) 3075rxvt_term::selection_start_colrow (int col, int row)
3040{ 3076{
3041 want_refresh = 1; 3077 want_refresh = 1;
3042 3078
3043 selection.mark.row = row - view_start; 3079 selection.mark.row = row + view_start;
3044 selection.mark.col = col; 3080 selection.mark.col = col;
3045 3081
3046 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3082 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3047 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3083 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3048 3084
3049 while (selection.mark.col > 0 3085 while (selection.mark.col > 0
3050 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3086 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3051 --selection.mark.col; 3087 --selection.mark.col;
… …
3079 text_t *stp; 3115 text_t *stp;
3080 rend_t *srp; 3116 rend_t *srp;
3081 3117
3082 if (dirn == UP) 3118 if (dirn == UP)
3083 { 3119 {
3084 bound.row = - nsaved - 1; 3120 bound.row = top_row - 1;
3085 bound.col = 0; 3121 bound.col = 0;
3086 dirnadd = -1; 3122 dirnadd = -1;
3087 } 3123 }
3088 else 3124 else
3089 { 3125 {
… …
3167 * select nothing. Otherwise, if we're to the right of the mark, you have to 3203 * select nothing. Otherwise, if we're to the right of the mark, you have to
3168 * be _past_ a character for it to be selected. 3204 * be _past_ a character for it to be selected.
3169 */ 3205 */
3170 if (((selection.clicks % 3) == 1) && !flag 3206 if (((selection.clicks % 3) == 1) && !flag
3171 && (col == selection.mark.col 3207 && (col == selection.mark.col
3172 && (row == selection.mark.row + view_start))) 3208 && (row == selection.mark.row - view_start)))
3173 { 3209 {
3174 /* select nothing */ 3210 /* select nothing */
3175 selection.beg.row = selection.end.row = 0; 3211 selection.beg.row = selection.end.row = 0;
3176 selection.beg.col = selection.end.col = 0; 3212 selection.beg.col = selection.end.col = 0;
3177 selection.clicks = 4; 3213 selection.clicks = 4;
… …
3232 selection.beg.col = selection.end.col = selection.mark.col; 3268 selection.beg.col = selection.end.col = selection.mark.col;
3233 selection.beg.row = selection.end.row = selection.mark.row; 3269 selection.beg.row = selection.end.row = selection.mark.row;
3234 } 3270 }
3235 3271
3236 pos.col = col; 3272 pos.col = col;
3237 pos.row = row - view_start; 3273 pos.row = view_start + row;
3238 3274
3239 /* 3275 /*
3240 * This is mainly xterm style selection with a couple of differences, mainly 3276 * This is mainly xterm style selection with a couple of differences, mainly
3241 * in the way button3 drag extension works. 3277 * in the way button3 drag extension works.
3242 * We're either doing: button1 drag; button3 press; or button3 drag 3278 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3323 else if (selection.clicks == 2) 3359 else if (selection.clicks == 2)
3324 { 3360 {
3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3361 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3326 selection.end.col--; 3362 selection.end.col--;
3327 3363
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3330 selection_delimit_word (UP, &selection.beg, &selection.beg); 3364 selection_delimit_word (UP, &selection.beg, &selection.beg);
3331 selection_delimit_word (DN, &selection.end, &selection.end); 3365 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3333 } 3366 }
3334 else if (selection.clicks == 3) 3367 else if (selection.clicks == 3)
3335 { 3368 {
3336#if ENABLE_FRILLS 3369#if ENABLE_FRILLS
3337 if (OPTION (Opt_tripleclickwords)) 3370 if (OPTION (Opt_tripleclickwords))
… …
3730 for (int y = ov_h; y--; ) 3763 for (int y = ov_h; y--; )
3731 { 3764 {
3732 text_t *t1 = ov_text[y]; 3765 text_t *t1 = ov_text[y];
3733 rend_t *r1 = ov_rend[y]; 3766 rend_t *r1 = ov_rend[y];
3734 3767
3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3768 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3736 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3769 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3737 3770
3738 for (int x = ov_w; x--; ) 3771 for (int x = ov_w; x--; )
3739 { 3772 {
3740 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3773 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3774 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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