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.216 by root, Mon Jan 9 18:51:19 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 * ------------------------------------------------------------------------- */
… …
290 { 295 {
291 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif 299#endif
295
296 int plines = 1; 300 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 301 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 302
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300 { 304 {
… …
318 // re-assemble the full line by destination lines 322 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
320 { 324 {
321 qline = row_buf + qrow; 325 qline = row_buf + qrow;
322 lalloc (*qline); 326 lalloc (*qline);
327 qline->l = ncol;
323 qline->set_is_longer (); 328 qline->is_longer (1);
324 329
325 int qcol = 0; 330 int qcol = 0;
326 331
327 // fill a single destination line 332 // fill a single destination line
328 while (lofs < llen && qcol < ncol) 333 while (lofs < llen && qcol < ncol)
… …
353 qcol += len; 358 qcol += len;
354 } 359 }
355 } 360 }
356 361
357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 362 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 363 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); 364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
366 } 365 }
367 while (p != pend && q > 0); 366 while (p != pend && q > 0);
368 367
369 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
370 nsaved = term_start - q; 369 nsaved = term_start - q;
371 370
372 // make sure all terminal lines exist 371 // make sure all terminal lines exist
373 while (nsaved < 0) 372 while (nsaved < 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
375
376 } 374 }
377 else 375 else
378 { 376 {
379 // if no scrollback exists (yet), wing, instead of wrap 377 // if no scrollback exists (yet), wing, instead of wrap
380 378
… …
419 for (int col = ncol; col--; ) 417 for (int col = ncol; col--; )
420 tabs [col] = col % TABSIZE == 0; 418 tabs [col] = col % TABSIZE == 0;
421 419
422 tt_winch (); 420 tt_winch ();
423 421
424 PERL_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
425} 423}
426 424
427/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
428/* 426/*
429 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
… …
623 && row2 == nrow - 1 621 && row2 == nrow - 1
624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
625 { 623 {
626 nsaved = min (nsaved + count, saveLines); 624 nsaved = min (nsaved + count, saveLines);
627 625
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
629 627
630 term_start = (term_start + count) % total_rows; 628 term_start = (term_start + count) % total_rows;
631 629
632 if (selection.op && current_screen == selection.screen) 630 if (selection.op && current_screen == selection.screen)
633 { 631 {
… …
644 } 642 }
645 } 643 }
646 644
647 for (int i = count; i--; ) 645 for (int i = count; i--; )
648 { 646 {
649 ROW(row2 - i).l = 0; 647 // basically thi is a slightly optimized scr_blank_screen_mem
650 scr_blank_screen_mem (ROW(row2 - i), rstyle); 648 // it is worth the effort on slower machines
649 line_t &l = ROW(row2 - i);
650
651 scr_blank_line (l, 0, l.l, rstyle);
652
653 l.l = 0;
654 l.f = 0;
651 } 655 }
652 656
653 if (OPTION (Opt_scrollWithBuffer) 657 if (OPTION (Opt_scrollWithBuffer)
654 && view_start != 0 658 && view_start != 0
655 && view_start != saveLines) 659 && view_start != saveLines)
… …
705/* ------------------------------------------------------------------------- */ 709/* ------------------------------------------------------------------------- */
706/* 710/*
707 * Add text given in <str> of length <len> to screen struct 711 * Add text given in <str> of length <len> to screen struct
708 */ 712 */
709void 713void
710rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 714rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
711{ 715{
712 if (len <= 0) /* sanity */ 716 if (len <= 0) /* sanity */
713 return; 717 return;
714 718
715 unsigned char checksel; 719 unsigned char checksel;
716 unicode_t c; 720 unicode_t c;
717 int last_col; 721 int ncol = this->ncol;
718 const unicode_t *strend = str + len; 722 const wchar_t *strend = str + len;
719 723
720 want_refresh = 1; 724 want_refresh = 1;
721 ZERO_SCROLLBACK (); 725 ZERO_SCROLLBACK ();
722 last_col = ncol;
723 726
724 if (nlines > 0) 727 if (minlines > 0)
725 { 728 {
726 nlines += screen.cur.row - screen.bscroll; 729 minlines += screen.cur.row - screen.bscroll;
727 730
728 if (nlines > 0 731 if (minlines > 0
729 && screen.tscroll == 0 732 && screen.tscroll == 0
730 && screen.bscroll == (nrow - 1)) 733 && screen.bscroll == nrow - 1)
731 { 734 {
732 /* _at least_ this many lines need to be scrolled */ 735 /* _at least_ this many lines need to be scrolled */
733 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 736 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
734 screen.cur.row -= nlines; 737 screen.cur.row -= minlines;
735 } 738 }
736 } 739 }
737 740
738#ifdef DEBUG_STRICT 741#ifdef DEBUG_STRICT
739 assert (screen.cur.col < last_col); 742 assert (screen.cur.col < ncol);
740 assert (screen.cur.row < nrow 743 assert (screen.cur.row < nrow
741 && screen.cur.row >= -nsaved); 744 && screen.cur.row >= -nsaved);
742#endif 745#endif
743 int row = screen.cur.row; 746 int row = screen.cur.row;
744 747
… …
746 749
747 line_t *line = &ROW(row); 750 line_t *line = &ROW(row);
748 751
749 while (str < strend) 752 while (str < strend)
750 { 753 {
751 c = *str++; 754 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
752 755
753 if (c < 0x20) 756 if (c < 0x20)
754 if (c == C0_LF) 757 if (c == C0_LF)
755 { 758 {
756 if (!line->is_longer ()) /* XXX: think about this */
757 max_it (line->l, screen.cur.col); 759 max_it (line->l, screen.cur.col);
758 760
759 screen.flags &= ~Screen_WrapNext; 761 screen.flags &= ~Screen_WrapNext;
760 762
761 if (screen.cur.row == screen.bscroll) 763 if (screen.cur.row == screen.bscroll)
762 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 764 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
766 line = &ROW(row); /* _must_ refresh */ 768 line = &ROW(row); /* _must_ refresh */
767 continue; 769 continue;
768 } 770 }
769 else if (c == C0_CR) 771 else if (c == C0_CR)
770 { 772 {
771 if (!line->is_longer ()) /* XXX: think about this */
772 max_it (line->l, screen.cur.col); 773 max_it (line->l, screen.cur.col);
773 774
774 screen.flags &= ~Screen_WrapNext; 775 screen.flags &= ~Screen_WrapNext;
775 screen.cur.col = 0; 776 screen.cur.col = 0;
776 continue; 777 continue;
777 } 778 }
… …
794 CLEAR_SELECTION (); 795 CLEAR_SELECTION ();
795 } 796 }
796 797
797 if (screen.flags & Screen_WrapNext) 798 if (screen.flags & Screen_WrapNext)
798 { 799 {
800 max_it (line->l, ncol);
799 line->set_is_longer (); 801 line->is_longer (1);
800 802
801 scr_do_wrap (); 803 scr_do_wrap ();
802 804
803 row = screen.cur.row; 805 row = screen.cur.row;
804 line = &ROW(row); /* _must_ refresh */ 806 line = &ROW(row); /* _must_ refresh */
… …
812 // do wcwidth before further replacements, as wcwidth might return -1 814 // 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 815 // for the line drawing characters below as they might be invalid in the current
814 // locale. 816 // locale.
815 int width = c < 0x100 ? 1 : wcwidth (c); 817 int width = c < 0x100 ? 1 : wcwidth (c);
816 818
817 if (charsets[screen.charset] == '0') // DEC SPECIAL 819 if (charsets [screen.charset] == '0') // DEC SPECIAL
818 { 820 {
819 // vt100 special graphics and line drawing 821 // vt100 special graphics and line drawing
820 // 5f-7e standard vt100 822 // 5f-7e standard vt100
821 // 40-5e rxvt extension for extra curses acs chars 823 // 40-5e rxvt extension for extra curses acs chars
822 static uint16_t vt100_0[62] = { // 41 .. 7e 824 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
874 } 876 }
875 877
876 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 878 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
877 879
878 // if the character doesn't fit into the remaining columns... 880 // if the character doesn't fit into the remaining columns...
879 if (screen.cur.col > last_col - width && last_col >= width) 881 if (screen.cur.col > ncol - width && ncol >= width)
880 { 882 {
881 // ...output spaces 883 // ...output spaces
882 c = ' '; 884 c = ' ';
883 // and try the same character next loop iteration 885 // and try the same character next loop iteration
884 --str; 886 --str;
885 } 887 }
886 888
889 line->touch ();
890
887 do 891 do
888 { 892 {
889 line->t[screen.cur.col] = c; 893 line->t[screen.cur.col] = c;
890 line->r[screen.cur.col] = rend; 894 line->r[screen.cur.col] = rend;
891 895
892 if (screen.cur.col < last_col - 1) 896 if (screen.cur.col < ncol - 1)
893 screen.cur.col++; 897 screen.cur.col++;
894 else 898 else
895 { 899 {
896 line->l = last_col; 900 line->l = ncol;
897 if (screen.flags & Screen_Autowrap) 901 if (screen.flags & Screen_Autowrap)
898 screen.flags |= Screen_WrapNext; 902 screen.flags |= Screen_WrapNext;
899 break; 903 break;
900 } 904 }
901 905
… …
903 } 907 }
904 while (--width > 0); 908 while (--width > 0);
905 909
906 // pad with spaces when overwriting wide character with smaller one 910 // pad with spaces when overwriting wide character with smaller one
907 if (!width) 911 if (!width)
912 {
913 line->touch ();
914
908 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 915 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
909 { 916 {
910 line->t[c] = ' '; 917 line->t[c] = ' ';
911 line->r[c] = rend; 918 line->r[c] = rend;
912 } 919 }
920 }
913 } 921 }
914 else // width == 0 922 else // width == 0
915 { 923 {
916#if ENABLE_COMBINING 924#if ENABLE_COMBINING
917 // handle combining characters 925 // handle combining characters
918 // we just tag the accent on the previous on-screen character. 926 // we just tag the accent on the previous on-screen character.
919 // this is arguably not correct, but also arguably not wrong. 927 // this is arguably not correct, but also arguably not wrong.
920 // we don't handle double-width characters nicely yet. 928 // we don't handle double-width characters nicely yet.
929 line_t *linep;
921 text_t *tp; 930 text_t *tp;
922 rend_t *rp; 931 rend_t *rp;
923 932
924 if (screen.cur.col > 0) 933 if (screen.cur.col > 0)
925 { 934 {
935 linep = line;
926 tp = line->t + screen.cur.col - 1; 936 tp = line->t + screen.cur.col - 1;
927 rp = line->r + screen.cur.col - 1; 937 rp = line->r + screen.cur.col - 1;
928
929 while (*tp == NOCHAR && tp > line->t)
930 tp--, rp--;
931 } 938 }
932 else if (screen.cur.row > 0 939 else if (screen.cur.row > 0
933 && ROW(screen.cur.row - 1).is_longer ()) 940 && ROW(screen.cur.row - 1).is_longer ())
934 { 941 {
935 line_t *line = &ROW(screen.cur.row - 1); 942 linep = &ROW(screen.cur.row - 1);
936
937 tp = line->t + last_col - 1; 943 tp = line->t + ncol - 1;
938 rp = line->r + last_col - 1; 944 rp = line->r + ncol - 1;
939
940 while (*tp == NOCHAR && tp > line->t)
941 tp--, rp--;
942 } 945 }
943 else 946 else
944 continue; 947 continue;
948
949 linep->touch ();
950
951 while (*tp == NOCHAR && tp > linep->t)
952 tp--, rp--;
945 953
946 // first try to find a precomposed character 954 // first try to find a precomposed character
947 unicode_t n = rxvt_compose (*tp, c); 955 unicode_t n = rxvt_compose (*tp, c);
948 if (n == NOCHAR) 956 if (n == NOCHAR)
949 n = rxvt_composite.compose (*tp, c); 957 n = rxvt_composite.compose (*tp, c);
… …
952 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 960 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
953#endif 961#endif
954 } 962 }
955 } 963 }
956 964
957 if (!line->is_longer ()) /* XXX: think about this */
958 max_it (line->l, screen.cur.col); 965 max_it (line->l, screen.cur.col);
959 966
960#ifdef DEBUG_STRICT 967#ifdef DEBUG_STRICT
961 assert (screen.cur.row >= 0); 968 assert (screen.cur.row >= 0);
962#endif 969#endif
963} 970}
… …
1013 1020
1014 for (; ++i < ncol; ) 1021 for (; ++i < ncol; )
1015 if (tabs[i]) 1022 if (tabs[i])
1016 { 1023 {
1017 x = i; 1024 x = i;
1025
1018 if (!--count) 1026 if (!--count)
1019 break; 1027 break;
1020 } 1028 }
1021 else 1029 else
1022 ht &= l.t[i] == ' ' 1030 ht &= l.t[i] == ' '
… …
1029 // buffer so they can be selected and pasted. 1037 // buffer so they can be selected and pasted.
1030 if (ht && OPTION (Opt_pastableTabs)) 1038 if (ht && OPTION (Opt_pastableTabs))
1031 { 1039 {
1032 base_rend = SET_FONT (base_rend, 0); 1040 base_rend = SET_FONT (base_rend, 0);
1033 1041
1034 if (!l.is_longer ()) /* XXX: think about this */ 1042 l.touch (x);
1035 max_it (l.l, x);
1036 1043
1037 i = screen.cur.col; 1044 i = screen.cur.col;
1038 1045
1039 l.t[i] = '\t'; 1046 l.t[i] = '\t';
1040 l.r[i] = base_rend; 1047 l.r[i] = base_rend;
… …
1094{ 1101{
1095 if (screen.cur.col < ncol - 1) 1102 if (screen.cur.col < ncol - 1)
1096 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1097 else 1104 else
1098 { 1105 {
1099 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1106 line_t &l = ROW(screen.cur.row);
1100 ROW(screen.cur.row).l = ncol; 1107
1108 l.touch ();
1109 l.is_longer (0);
1101 1110
1102 scr_gotorc (0, 0, R_RELATIVE); 1111 scr_gotorc (0, 0, R_RELATIVE);
1103 scr_insdel_chars (1, DELETE); 1112 scr_insdel_chars (1, DELETE);
1104 scr_gotorc (0, ncol - 1, R_RELATIVE); 1113 scr_gotorc (0, ncol - 1, R_RELATIVE);
1105 } 1114 }
… …
1196 ZERO_SCROLLBACK (); 1205 ZERO_SCROLLBACK ();
1197 1206
1198 selection_check (1); 1207 selection_check (1);
1199 1208
1200 line_t &line = ROW(screen.cur.row); 1209 line_t &line = ROW(screen.cur.row);
1210
1211 line.touch ();
1212 line.is_longer (0);
1201 1213
1202 switch (mode) 1214 switch (mode)
1203 { 1215 {
1204 case 0: /* erase to end of line */ 1216 case 0: /* erase to end of line */
1205 col = screen.cur.col; 1217 col = screen.cur.col;
… …
1300 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1301 } 1313 }
1302 1314
1303 for (; num--; row++) 1315 for (; num--; row++)
1304 { 1316 {
1305 ROW (row).l = 0;
1306 scr_blank_screen_mem (ROW (row), rstyle); 1317 scr_blank_screen_mem (ROW(row), rstyle);
1307 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1318 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1308 } 1319 }
1309} 1320}
1310 1321
1311#if ENABLE_FRILLS 1322#if ENABLE_FRILLS
… …
1344 rend_t *r1 = line.r; 1355 rend_t *r1 = line.r;
1345 1356
1346 for (int j = ncol; j--; ) 1357 for (int j = ncol; j--; )
1347 *r1++ = fs; 1358 *r1++ = fs;
1348 1359
1349 line.l = ncol; /* make the `E's selectable */ 1360 line.is_longer (0);
1361 line.touch (ncol);
1350 } 1362 }
1351} 1363}
1352 1364
1353/* ------------------------------------------------------------------------- */ 1365/* ------------------------------------------------------------------------- */
1354/* 1366/*
… …
1402 min_it (count, ncol - screen.cur.col); 1414 min_it (count, ncol - screen.cur.col);
1403 1415
1404 row = screen.cur.row; 1416 row = screen.cur.row;
1405 1417
1406 line_t *line = &ROW(row); 1418 line_t *line = &ROW(row);
1419
1420 line->touch ();
1421 line->is_longer (0);
1407 1422
1408 switch (insdel) 1423 switch (insdel)
1409 { 1424 {
1410 case INSERT: 1425 case INSERT:
1411 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1426 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1412 { 1427 {
1413 line->t[col] = line->t[col - count]; 1428 line->t[col] = line->t[col - count];
1414 line->r[col] = line->r[col - count]; 1429 line->r[col] = line->r[col - count];
1415 } 1430 }
1416 1431
1417 if (!line->is_longer ()) 1432 line->l = min (line->l + count, ncol);
1418 {
1419 line->l += count;
1420 min_it (line->l, ncol);
1421 }
1422 1433
1423 if (selection.op && current_screen == selection.screen 1434 if (selection.op && current_screen == selection.screen
1424 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1435 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1425 { 1436 {
1426 if (selection.end.row != screen.cur.row 1437 if (selection.end.row != screen.cur.row
… …
1439 1450
1440 case ERASE: 1451 case ERASE:
1441 screen.cur.col += count; /* don't worry if > ncol */ 1452 screen.cur.col += count; /* don't worry if > ncol */
1442 selection_check (1); 1453 selection_check (1);
1443 screen.cur.col -= count; 1454 screen.cur.col -= count;
1455
1456 line->l = max (line->l - count, 0);
1444 scr_blank_line (*line, screen.cur.col, count, rstyle); 1457 scr_blank_line (*line, screen.cur.col, count, rstyle);
1445 break; 1458 break;
1446 1459
1447 case DELETE: 1460 case DELETE:
1448 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1461 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1451 { 1464 {
1452 line->t[col] = line->t[col + count]; 1465 line->t[col] = line->t[col + count];
1453 line->r[col] = line->r[col + count]; 1466 line->r[col] = line->r[col + count];
1454 } 1467 }
1455 1468
1469 line->l = max (line->l - count, 0);
1456 scr_blank_line (*line, ncol - count, count, tr); 1470 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 1471
1463 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1465 { 1474 {
1466 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
… …
1578rxvt_term::scr_set_tab (int mode) 1587rxvt_term::scr_set_tab (int mode)
1579{ 1588{
1580 if (mode < 0) 1589 if (mode < 0)
1581 memset (tabs, 0, ncol * sizeof (char)); 1590 memset (tabs, 0, ncol * sizeof (char));
1582 else if (screen.cur.col < ncol) 1591 else if (screen.cur.col < ncol)
1583 tabs[screen.cur.col] = (mode ? 1 : 0); 1592 tabs [screen.cur.col] = !!mode;
1584} 1593}
1585 1594
1586/* ------------------------------------------------------------------------- */ 1595/* ------------------------------------------------------------------------- */
1587/* 1596/*
1588 * Set reverse/normal video 1597 * Set reverse/normal video
… …
1635 * Set font style 1644 * Set font style
1636 */ 1645 */
1637void 1646void
1638rxvt_term::set_font_style () 1647rxvt_term::set_font_style ()
1639{ 1648{
1649#if 0
1640 switch (charsets[screen.charset]) 1650 switch (charsets [screen.charset])
1641 { 1651 {
1642 case '0': /* DEC Special Character & Line Drawing Set */ 1652 case '0': /* DEC Special Character & Line Drawing Set */
1643 break; 1653 break;
1644 case 'A': /* United Kingdom (UK) */ 1654 case 'A': /* United Kingdom (UK) */
1645 break; 1655 break;
… …
1652 case 'C': /* Finnish character set */ 1662 case 'C': /* Finnish character set */
1653 break; 1663 break;
1654 case 'K': /* German character set */ 1664 case 'K': /* German character set */
1655 break; 1665 break;
1656 } 1666 }
1667#endif
1657} 1668}
1658 1669
1659/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
1660/* 1671/*
1661 * Choose a font 1672 * Choose a font
… …
1826} 1837}
1827 1838
1828int 1839int
1829rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (unsigned int oldviewstart)
1830{ 1841{
1831 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1832
1833 if (view_start != oldviewstart) 1842 if (view_start != oldviewstart)
1834 { 1843 {
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1845
1835 want_refresh = 1; 1846 want_refresh = 1;
1836 num_scr -= (view_start - oldviewstart); 1847 num_scr -= (view_start - oldviewstart);
1837 } 1848 }
1838 1849
1839 return (int) (view_start - oldviewstart); 1850 return (int)view_start - (int)oldviewstart;
1840} 1851}
1841 1852
1842/* ------------------------------------------------------------------------- */ 1853/* ------------------------------------------------------------------------- */
1843void 1854void
1844rxvt_term::scr_bell () 1855rxvt_term::scr_bell ()
… …
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
… …
2883 selection.op = SELECTION_DONE; 2896 selection.op = SELECTION_DONE;
2884 2897
2885 if (selection.clicks == 4) 2898 if (selection.clicks == 4)
2886 return; /* nothing selected, go away */ 2899 return; /* nothing selected, go away */
2887 2900
2888 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2901 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2889 return; 2902 return;
2890 2903
2891 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2904 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2892 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2905 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2893 2906
… …
2907 col = selection.beg.col; 2920 col = selection.beg.col;
2908 end_col = ncol + 1; 2921 end_col = ncol + 1;
2909 } 2922 }
2910 else 2923 else
2911#endif 2924#endif
2912 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2925 end_col = ROW(row).l;
2913 2926
2914 col = max (col, 0); 2927 col = max (col, 0);
2915 2928
2916 if (row == selection.end.row 2929 if (row == selection.end.row
2917#if ENABLE_FRILLS 2930#if ENABLE_FRILLS
… …
2919#endif 2932#endif
2920 ) 2933 )
2921 min_it (end_col, selection.end.col); 2934 min_it (end_col, selection.end.col);
2922 2935
2923 t = ROW(row).t + col; 2936 t = ROW(row).t + col;
2937
2924 for (; col < end_col; col++) 2938 for (; col < end_col; col++)
2925 { 2939 {
2926 if (*t == NOCHAR) 2940 if (*t == NOCHAR)
2927 t++; 2941 t++;
2928#if ENABLE_COMBINING 2942#if ENABLE_COMBINING
… …
2977 2991
2978 // we usually allocate much more than necessary, so realloc it smaller again 2992 // we usually allocate much more than necessary, so realloc it smaller again
2979 selection.len = ofs; 2993 selection.len = ofs;
2980 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2994 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2981 2995
2982 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 2996 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2983 return; 2997 return;
2984 2998
2985 selection_grab (tm); 2999 selection_grab (tm);
2986} 3000}
2987 3001
… …
3323 else if (selection.clicks == 2) 3337 else if (selection.clicks == 2)
3324 { 3338 {
3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3339 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3326 selection.end.col--; 3340 selection.end.col--;
3327 3341
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) 3342 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 { 3343 {
3330 selection_delimit_word (UP, &selection.beg, &selection.beg); 3344 selection_delimit_word (UP, &selection.beg, &selection.beg);
3331 selection_delimit_word (DN, &selection.end, &selection.end); 3345 selection_delimit_word (DN, &selection.end, &selection.end);
3332 } 3346 }
3333 } 3347 }

Diff Legend

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