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.220 by root, Mon Jan 9 23:18:49 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 * ------------------------------------------------------------------------- */
… …
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 nsaved = 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 - nsaved , prev_total_rows);
279 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
280 283
… …
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 nsaved = term_start - q;
371 368
372 // make sure all terminal lines exist 369 // make sure all terminal lines exist
373 while (nsaved < 0) 370 while (nsaved < 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (-++nsaved), 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
… …
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
… …
623 && row2 == nrow - 1 618 && row2 == nrow - 1
624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
625 { 620 {
626 nsaved = min (nsaved + count, saveLines); 621 nsaved = min (nsaved + count, saveLines);
627 622
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
629 624
630 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
631 626
632 if (selection.op && current_screen == selection.screen) 627 if (selection.op && current_screen == selection.screen)
633 { 628 {
… …
644 } 639 }
645 } 640 }
646 641
647 for (int i = count; i--; ) 642 for (int i = count; i--; )
648 { 643 {
649 ROW(row2 - i).l = 0; 644 // basically thi is a slightly optimized scr_blank_screen_mem
650 scr_blank_screen_mem (ROW(row2 - i), rstyle); 645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
651 } 652 }
652 653
653 if (OPTION (Opt_scrollWithBuffer) 654 if (OPTION (Opt_scrollWithBuffer)
654 && view_start != 0 655 && view_start != 0
655 && view_start != saveLines) 656 && view_start != saveLines)
… …
685 686
686 int rows = row2 - row1 + 1; 687 int rows = row2 - row1 + 1;
687 688
688 min_it (count, rows); 689 min_it (count, rows);
689 690
691 line_t *temp_buf = row_buf + total_rows;
692
690 for (int row = 0; row < rows; row++) 693 for (int row = 0; row < rows; row++)
691 { 694 {
692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 695 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
693 696
694 if (!IN_RANGE_EXC (row + count, 0, rows)) 697 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
705/* ------------------------------------------------------------------------- */ 708/* ------------------------------------------------------------------------- */
706/* 709/*
707 * Add text given in <str> of length <len> to screen struct 710 * Add text given in <str> of length <len> to screen struct
708 */ 711 */
709void 712void
710rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
711{ 714{
712 if (len <= 0) /* sanity */ 715 if (len <= 0) /* sanity */
713 return; 716 return;
714 717
715 unsigned char checksel; 718 unsigned char checksel;
716 unicode_t c; 719 unicode_t c;
717 int last_col; 720 int ncol = this->ncol;
718 const unicode_t *strend = str + len; 721 const wchar_t *strend = str + len;
719 722
720 want_refresh = 1; 723 want_refresh = 1;
721 ZERO_SCROLLBACK (); 724 ZERO_SCROLLBACK ();
722 last_col = ncol;
723 725
724 if (nlines > 0) 726 if (minlines > 0)
725 { 727 {
726 nlines += screen.cur.row - screen.bscroll; 728 minlines += screen.cur.row - screen.bscroll;
727 729
728 if (nlines > 0 730 if (minlines > 0
729 && screen.tscroll == 0 731 && screen.tscroll == 0
730 && screen.bscroll == (nrow - 1)) 732 && screen.bscroll == nrow - 1)
731 { 733 {
732 /* _at least_ this many lines need to be scrolled */ 734 /* _at least_ this many lines need to be scrolled */
733 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 735 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
734 screen.cur.row -= nlines; 736 screen.cur.row -= minlines;
735 } 737 }
736 } 738 }
737 739
738#ifdef DEBUG_STRICT 740#ifdef DEBUG_STRICT
739 assert (screen.cur.col < last_col); 741 assert (screen.cur.col < ncol);
740 assert (screen.cur.row < nrow 742 assert (screen.cur.row < nrow
741 && screen.cur.row >= -nsaved); 743 && screen.cur.row >= -nsaved);
742#endif 744#endif
743 int row = screen.cur.row; 745 int row = screen.cur.row;
744 746
… …
746 748
747 line_t *line = &ROW(row); 749 line_t *line = &ROW(row);
748 750
749 while (str < strend) 751 while (str < strend)
750 { 752 {
751 c = *str++; 753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
752 754
753 if (c < 0x20) 755 if (c < 0x20)
754 if (c == C0_LF) 756 if (c == C0_LF)
755 { 757 {
756 if (!line->is_longer ()) /* XXX: think about this */
757 max_it (line->l, screen.cur.col); 758 max_it (line->l, screen.cur.col);
758 759
759 screen.flags &= ~Screen_WrapNext; 760 screen.flags &= ~Screen_WrapNext;
760 761
761 if (screen.cur.row == screen.bscroll) 762 if (screen.cur.row == screen.bscroll)
762 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 763 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
766 line = &ROW(row); /* _must_ refresh */ 767 line = &ROW(row); /* _must_ refresh */
767 continue; 768 continue;
768 } 769 }
769 else if (c == C0_CR) 770 else if (c == C0_CR)
770 { 771 {
771 if (!line->is_longer ()) /* XXX: think about this */
772 max_it (line->l, screen.cur.col); 772 max_it (line->l, screen.cur.col);
773 773
774 screen.flags &= ~Screen_WrapNext; 774 screen.flags &= ~Screen_WrapNext;
775 screen.cur.col = 0; 775 screen.cur.col = 0;
776 continue; 776 continue;
777 } 777 }
… …
794 CLEAR_SELECTION (); 794 CLEAR_SELECTION ();
795 } 795 }
796 796
797 if (screen.flags & Screen_WrapNext) 797 if (screen.flags & Screen_WrapNext)
798 { 798 {
799 max_it (line->l, ncol);
799 line->set_is_longer (); 800 line->is_longer (1);
800 801
801 scr_do_wrap (); 802 scr_do_wrap ();
802 803
803 row = screen.cur.row; 804 row = screen.cur.row;
804 line = &ROW(row); /* _must_ refresh */ 805 line = &ROW(row); /* _must_ refresh */
… …
812 // do wcwidth before further replacements, as wcwidth might return -1 813 // 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 814 // for the line drawing characters below as they might be invalid in the current
814 // locale. 815 // locale.
815 int width = c < 0x100 ? 1 : wcwidth (c); 816 int width = c < 0x100 ? 1 : wcwidth (c);
816 817
817 if (charsets[screen.charset] == '0') // DEC SPECIAL 818 if (charsets [screen.charset] == '0') // DEC SPECIAL
818 { 819 {
819 // vt100 special graphics and line drawing 820 // vt100 special graphics and line drawing
820 // 5f-7e standard vt100 821 // 5f-7e standard vt100
821 // 40-5e rxvt extension for extra curses acs chars 822 // 40-5e rxvt extension for extra curses acs chars
822 static uint16_t vt100_0[62] = { // 41 .. 7e 823 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
874 } 875 }
875 876
876 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 877 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
877 878
878 // if the character doesn't fit into the remaining columns... 879 // if the character doesn't fit into the remaining columns...
879 if (screen.cur.col > last_col - width && last_col >= width) 880 if (screen.cur.col > ncol - width && ncol >= width)
880 { 881 {
881 // ...output spaces 882 // ...output spaces
882 c = ' '; 883 c = ' ';
883 // and try the same character next loop iteration 884 // and try the same character next loop iteration
884 --str; 885 --str;
885 } 886 }
886 887
888 line->touch ();
889
887 do 890 do
888 { 891 {
889 line->t[screen.cur.col] = c; 892 line->t[screen.cur.col] = c;
890 line->r[screen.cur.col] = rend; 893 line->r[screen.cur.col] = rend;
891 894
892 if (screen.cur.col < last_col - 1) 895 if (screen.cur.col < ncol - 1)
893 screen.cur.col++; 896 screen.cur.col++;
894 else 897 else
895 { 898 {
896 line->l = last_col; 899 line->l = ncol;
897 if (screen.flags & Screen_Autowrap) 900 if (screen.flags & Screen_Autowrap)
898 screen.flags |= Screen_WrapNext; 901 screen.flags |= Screen_WrapNext;
899 break; 902 break;
900 } 903 }
901 904
… …
903 } 906 }
904 while (--width > 0); 907 while (--width > 0);
905 908
906 // pad with spaces when overwriting wide character with smaller one 909 // pad with spaces when overwriting wide character with smaller one
907 if (!width) 910 if (!width)
911 {
912 line->touch ();
913
908 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
909 { 915 {
910 line->t[c] = ' '; 916 line->t[c] = ' ';
911 line->r[c] = rend; 917 line->r[c] = rend;
912 } 918 }
919 }
913 } 920 }
914 else // width == 0 921 else // width == 0
915 { 922 {
916#if ENABLE_COMBINING 923#if ENABLE_COMBINING
917 // handle combining characters 924 // handle combining characters
918 // we just tag the accent on the previous on-screen character. 925 // we just tag the accent on the previous on-screen character.
919 // this is arguably not correct, but also arguably not wrong. 926 // this is arguably not correct, but also arguably not wrong.
920 // we don't handle double-width characters nicely yet. 927 // we don't handle double-width characters nicely yet.
928 line_t *linep;
921 text_t *tp; 929 text_t *tp;
922 rend_t *rp; 930 rend_t *rp;
923 931
924 if (screen.cur.col > 0) 932 if (screen.cur.col > 0)
925 { 933 {
934 linep = line;
926 tp = line->t + screen.cur.col - 1; 935 tp = line->t + screen.cur.col - 1;
927 rp = line->r + screen.cur.col - 1; 936 rp = line->r + screen.cur.col - 1;
928
929 while (*tp == NOCHAR && tp > line->t)
930 tp--, rp--;
931 } 937 }
932 else if (screen.cur.row > 0 938 else if (screen.cur.row > 0
933 && ROW(screen.cur.row - 1).is_longer ()) 939 && ROW(screen.cur.row - 1).is_longer ())
934 { 940 {
935 line_t *line = &ROW(screen.cur.row - 1); 941 linep = &ROW(screen.cur.row - 1);
936
937 tp = line->t + last_col - 1; 942 tp = line->t + ncol - 1;
938 rp = line->r + last_col - 1; 943 rp = line->r + ncol - 1;
939
940 while (*tp == NOCHAR && tp > line->t)
941 tp--, rp--;
942 } 944 }
943 else 945 else
944 continue; 946 continue;
947
948 linep->touch ();
949
950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
945 952
946 // first try to find a precomposed character 953 // first try to find a precomposed character
947 unicode_t n = rxvt_compose (*tp, c); 954 unicode_t n = rxvt_compose (*tp, c);
948 if (n == NOCHAR) 955 if (n == NOCHAR)
949 n = rxvt_composite.compose (*tp, c); 956 n = rxvt_composite.compose (*tp, c);
… …
952 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
953#endif 960#endif
954 } 961 }
955 } 962 }
956 963
957 if (!line->is_longer ()) /* XXX: think about this */
958 max_it (line->l, screen.cur.col); 964 max_it (line->l, screen.cur.col);
959 965
960#ifdef DEBUG_STRICT 966#ifdef DEBUG_STRICT
961 assert (screen.cur.row >= 0); 967 assert (screen.cur.row >= 0);
962#endif 968#endif
963} 969}
… …
1013 1019
1014 for (; ++i < ncol; ) 1020 for (; ++i < ncol; )
1015 if (tabs[i]) 1021 if (tabs[i])
1016 { 1022 {
1017 x = i; 1023 x = i;
1024
1018 if (!--count) 1025 if (!--count)
1019 break; 1026 break;
1020 } 1027 }
1021 else 1028 else
1022 ht &= l.t[i] == ' ' 1029 ht &= l.t[i] == ' '
… …
1029 // buffer so they can be selected and pasted. 1036 // buffer so they can be selected and pasted.
1030 if (ht && OPTION (Opt_pastableTabs)) 1037 if (ht && OPTION (Opt_pastableTabs))
1031 { 1038 {
1032 base_rend = SET_FONT (base_rend, 0); 1039 base_rend = SET_FONT (base_rend, 0);
1033 1040
1034 if (!l.is_longer ()) /* XXX: think about this */ 1041 l.touch (x);
1035 max_it (l.l, x);
1036 1042
1037 i = screen.cur.col; 1043 i = screen.cur.col;
1038 1044
1039 l.t[i] = '\t'; 1045 l.t[i] = '\t';
1040 l.r[i] = base_rend; 1046 l.r[i] = base_rend;
… …
1094{ 1100{
1095 if (screen.cur.col < ncol - 1) 1101 if (screen.cur.col < ncol - 1)
1096 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1097 else 1103 else
1098 { 1104 {
1099 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1105 line_t &l = ROW(screen.cur.row);
1100 ROW(screen.cur.row).l = ncol; 1106
1107 l.touch ();
1108 l.is_longer (0);
1101 1109
1102 scr_gotorc (0, 0, R_RELATIVE); 1110 scr_gotorc (0, 0, R_RELATIVE);
1103 scr_insdel_chars (1, DELETE); 1111 scr_insdel_chars (1, DELETE);
1104 scr_gotorc (0, ncol - 1, R_RELATIVE); 1112 scr_gotorc (0, ncol - 1, R_RELATIVE);
1105 } 1113 }
… …
1196 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1197 1205
1198 selection_check (1); 1206 selection_check (1);
1199 1207
1200 line_t &line = ROW(screen.cur.row); 1208 line_t &line = ROW(screen.cur.row);
1209
1210 line.touch ();
1211 line.is_longer (0);
1201 1212
1202 switch (mode) 1213 switch (mode)
1203 { 1214 {
1204 case 0: /* erase to end of line */ 1215 case 0: /* erase to end of line */
1205 col = screen.cur.col; 1216 col = screen.cur.col;
… …
1300 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1311 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1301 } 1312 }
1302 1313
1303 for (; num--; row++) 1314 for (; num--; row++)
1304 { 1315 {
1305 ROW (row).l = 0;
1306 scr_blank_screen_mem (ROW (row), rstyle); 1316 scr_blank_screen_mem (ROW(row), rstyle);
1307 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1317 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1308 } 1318 }
1309} 1319}
1310 1320
1311#if ENABLE_FRILLS 1321#if ENABLE_FRILLS
… …
1344 rend_t *r1 = line.r; 1354 rend_t *r1 = line.r;
1345 1355
1346 for (int j = ncol; j--; ) 1356 for (int j = ncol; j--; )
1347 *r1++ = fs; 1357 *r1++ = fs;
1348 1358
1349 line.l = ncol; /* make the `E's selectable */ 1359 line.is_longer (0);
1360 line.touch (ncol);
1350 } 1361 }
1351} 1362}
1352 1363
1353/* ------------------------------------------------------------------------- */ 1364/* ------------------------------------------------------------------------- */
1354/* 1365/*
… …
1402 min_it (count, ncol - screen.cur.col); 1413 min_it (count, ncol - screen.cur.col);
1403 1414
1404 row = screen.cur.row; 1415 row = screen.cur.row;
1405 1416
1406 line_t *line = &ROW(row); 1417 line_t *line = &ROW(row);
1418
1419 line->touch ();
1420 line->is_longer (0);
1407 1421
1408 switch (insdel) 1422 switch (insdel)
1409 { 1423 {
1410 case INSERT: 1424 case INSERT:
1411 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1412 { 1426 {
1413 line->t[col] = line->t[col - count]; 1427 line->t[col] = line->t[col - count];
1414 line->r[col] = line->r[col - count]; 1428 line->r[col] = line->r[col - count];
1415 } 1429 }
1416 1430
1417 if (!line->is_longer ()) 1431 line->l = min (line->l + count, ncol);
1418 {
1419 line->l += count;
1420 min_it (line->l, ncol);
1421 }
1422 1432
1423 if (selection.op && current_screen == selection.screen 1433 if (selection.op && current_screen == selection.screen
1424 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1425 { 1435 {
1426 if (selection.end.row != screen.cur.row 1436 if (selection.end.row != screen.cur.row
… …
1439 1449
1440 case ERASE: 1450 case ERASE:
1441 screen.cur.col += count; /* don't worry if > ncol */ 1451 screen.cur.col += count; /* don't worry if > ncol */
1442 selection_check (1); 1452 selection_check (1);
1443 screen.cur.col -= count; 1453 screen.cur.col -= count;
1454
1455 line->l = max (line->l - count, 0);
1444 scr_blank_line (*line, screen.cur.col, count, rstyle); 1456 scr_blank_line (*line, screen.cur.col, count, rstyle);
1445 break; 1457 break;
1446 1458
1447 case DELETE: 1459 case DELETE:
1448 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1451 { 1463 {
1452 line->t[col] = line->t[col + count]; 1464 line->t[col] = line->t[col + count];
1453 line->r[col] = line->r[col + count]; 1465 line->r[col] = line->r[col + count];
1454 } 1466 }
1455 1467
1468 line->l = max (line->l - count, 0);
1456 scr_blank_line (*line, ncol - count, count, tr); 1469 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 1470
1463 if (selection.op && current_screen == selection.screen 1471 if (selection.op && current_screen == selection.screen
1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1465 { 1473 {
1466 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
… …
1578rxvt_term::scr_set_tab (int mode) 1586rxvt_term::scr_set_tab (int mode)
1579{ 1587{
1580 if (mode < 0) 1588 if (mode < 0)
1581 memset (tabs, 0, ncol * sizeof (char)); 1589 memset (tabs, 0, ncol * sizeof (char));
1582 else if (screen.cur.col < ncol) 1590 else if (screen.cur.col < ncol)
1583 tabs[screen.cur.col] = (mode ? 1 : 0); 1591 tabs [screen.cur.col] = !!mode;
1584} 1592}
1585 1593
1586/* ------------------------------------------------------------------------- */ 1594/* ------------------------------------------------------------------------- */
1587/* 1595/*
1588 * Set reverse/normal video 1596 * Set reverse/normal video
… …
1635 * Set font style 1643 * Set font style
1636 */ 1644 */
1637void 1645void
1638rxvt_term::set_font_style () 1646rxvt_term::set_font_style ()
1639{ 1647{
1648#if 0
1640 switch (charsets[screen.charset]) 1649 switch (charsets [screen.charset])
1641 { 1650 {
1642 case '0': /* DEC Special Character & Line Drawing Set */ 1651 case '0': /* DEC Special Character & Line Drawing Set */
1643 break; 1652 break;
1644 case 'A': /* United Kingdom (UK) */ 1653 case 'A': /* United Kingdom (UK) */
1645 break; 1654 break;
… …
1652 case 'C': /* Finnish character set */ 1661 case 'C': /* Finnish character set */
1653 break; 1662 break;
1654 case 'K': /* German character set */ 1663 case 'K': /* German character set */
1655 break; 1664 break;
1656 } 1665 }
1666#endif
1657} 1667}
1658 1668
1659/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
1660/* 1670/*
1661 * Choose a font 1671 * Choose a font
… …
1826} 1836}
1827 1837
1828int 1838int
1829rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1830{ 1840{
1831 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1832
1833 if (view_start != oldviewstart) 1841 if (view_start != oldviewstart)
1834 { 1842 {
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844
1835 want_refresh = 1; 1845 want_refresh = 1;
1836 num_scr -= (view_start - oldviewstart); 1846 num_scr -= (view_start - oldviewstart);
1837 } 1847 }
1838 1848
1839 return (int) (view_start - oldviewstart); 1849 return (int)view_start - (int)oldviewstart;
1840} 1850}
1841 1851
1842/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1843void 1853void
1844rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
… …
1853# endif 1863# endif
1854 1864
1855 if (OPTION (Opt_visualBell)) 1865 if (OPTION (Opt_visualBell))
1856 { 1866 {
1857 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
1858 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1859 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1860 } 1871 }
1861 else 1872 else
1862 XBell (display->display, 0); 1873 XBell (display->display, 0);
… …
2048 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2049 } 2060 }
2050 } 2061 }
2051 } 2062 }
2052 2063
2053 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2054#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2055 scr_swap_overlay (); 2066 scr_swap_overlay ();
2056#endif 2067#endif
2057 2068
2058#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2321 } /* for (row....) */ 2332 } /* for (row....) */
2322 2333
2323#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2324 scr_swap_overlay (); 2335 scr_swap_overlay ();
2325#endif 2336#endif
2326 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2327 2338
2328 /* 2339 /*
2329 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2330 */ 2341 */
2331 if (showcursor) 2342 if (showcursor)
… …
2378 num_scr = 0; 2389 num_scr = 0;
2379 num_scr_allow = 1; 2390 num_scr_allow = 1;
2380} 2391}
2381 2392
2382void 2393void
2383rxvt_term::scr_remap_chars (const line_t &l) 2394rxvt_term::scr_remap_chars (line_t &l)
2384{ 2395{
2385 if (!l.t) 2396 if (!l.t)
2386 return; 2397 return;
2398
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2387 2400
2388 for (int i = ncol; i--; ) 2401 for (int i = ncol; i--; )
2389 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2390} 2403}
2391 2404
… …
2444 2457
2445 if (really) 2458 if (really)
2446 XClearWindow (display->display, vt); 2459 XClearWindow (display->display, vt);
2447} 2460}
2448 2461
2462void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2464{
2465 int view_end = -view_start + nrow;
2466 int row, col;
2467
2468 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++)
2469 {
2470 text_t *stp = ROW(row).t;
2471 rend_t *srp = ROW(row).r;
2472
2473 for (col = beg_col; col < end_col; col++)
2474 srp[col] ^= rstyle1;
2475
2476 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2477 srp[col] ^= rstyle2;
2478
2479 if (++col < end_col)
2480 srp[col] ^= rstyle2;
2481 }
2482}
2483
2484void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2486{
2487 int view_end = -view_start + nrow;
2488 int row, col;
2489
2490 if (beg_row >= -view_start)
2491 {
2492 col = beg_col;
2493 row = beg_row;
2494 }
2495 else
2496 {
2497 col = 0;
2498 row = -view_start;
2499 }
2500
2501 for (; row < min (end_row, view_end); row++, col = 0)
2502 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2503 srp[col] ^= rstyle;
2504
2505 if (row == end_row)
2506 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2507 srp[col] ^= rstyle;
2508}
2509
2449/* ------------------------------------------------------------------------- */ 2510/* ------------------------------------------------------------------------- */
2450void 2511void
2451rxvt_term::scr_reverse_selection () 2512rxvt_term::scr_reverse_selection ()
2452{ 2513{
2453 if (selection.op 2514 if (selection.op
2454 && current_screen == selection.screen 2515 && current_screen == selection.screen
2455 && selection.end.row >= -view_start) 2516 && selection.end.row >= -view_start)
2456 { 2517 {
2457 int view_end = -view_start + nrow;
2458 int row, col;
2459
2460#if ENABLE_FRILLS 2518#if ENABLE_FRILLS
2461 if (selection.rect) 2519 if (selection.rect)
2462 { 2520 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++) 2521 selection.end.row, selection.end.col,
2464 { 2522 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 2523 else
2479#endif 2524#endif
2480 { 2525 scr_xor_span (selection.beg.row, selection.beg.col,
2481 if (selection.beg.row >= -view_start) 2526 selection.end.row, selection.end.col,
2482 { 2527 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 } 2528 }
2501} 2529}
2502 2530
2503/* ------------------------------------------------------------------------- */ 2531/* ------------------------------------------------------------------------- */
2504/* 2532/*
… …
2883 selection.op = SELECTION_DONE; 2911 selection.op = SELECTION_DONE;
2884 2912
2885 if (selection.clicks == 4) 2913 if (selection.clicks == 4)
2886 return; /* nothing selected, go away */ 2914 return; /* nothing selected, go away */
2887 2915
2888 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2916 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2889 return; 2917 return;
2890 2918
2891 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2919 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2892 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2920 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2893 2921
… …
2907 col = selection.beg.col; 2935 col = selection.beg.col;
2908 end_col = ncol + 1; 2936 end_col = ncol + 1;
2909 } 2937 }
2910 else 2938 else
2911#endif 2939#endif
2912 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2940 end_col = ROW(row).l;
2913 2941
2914 col = max (col, 0); 2942 col = max (col, 0);
2915 2943
2916 if (row == selection.end.row 2944 if (row == selection.end.row
2917#if ENABLE_FRILLS 2945#if ENABLE_FRILLS
… …
2919#endif 2947#endif
2920 ) 2948 )
2921 min_it (end_col, selection.end.col); 2949 min_it (end_col, selection.end.col);
2922 2950
2923 t = ROW(row).t + col; 2951 t = ROW(row).t + col;
2952
2924 for (; col < end_col; col++) 2953 for (; col < end_col; col++)
2925 { 2954 {
2926 if (*t == NOCHAR) 2955 if (*t == NOCHAR)
2927 t++; 2956 t++;
2928#if ENABLE_COMBINING 2957#if ENABLE_COMBINING
… …
2977 3006
2978 // we usually allocate much more than necessary, so realloc it smaller again 3007 // we usually allocate much more than necessary, so realloc it smaller again
2979 selection.len = ofs; 3008 selection.len = ofs;
2980 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3009 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2981 3010
2982 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 3011 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2983 return; 3012 return;
2984 3013
2985 selection_grab (tm); 3014 selection_grab (tm);
2986} 3015}
2987 3016
… …
3323 else if (selection.clicks == 2) 3352 else if (selection.clicks == 2)
3324 { 3353 {
3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3354 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3326 selection.end.col--; 3355 selection.end.col--;
3327 3356
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) 3357 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 { 3358 {
3330 selection_delimit_word (UP, &selection.beg, &selection.beg); 3359 selection_delimit_word (UP, &selection.beg, &selection.beg);
3331 selection_delimit_word (DN, &selection.end, &selection.end); 3360 selection_delimit_word (DN, &selection.end, &selection.end);
3332 } 3361 }
3333 } 3362 }

Diff Legend

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