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.210 by root, Thu Jan 5 21:21:49 2006 UTC

… …
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;
… …
290 { 292 {
291 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT 294#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 295 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif 296#endif
295
296 int plines = 1; 297 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 299
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300 { 301 {
… …
318 // re-assemble the full line by destination lines 319 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++) 320 for (int qrow = q; qlines--; qrow++)
320 { 321 {
321 qline = row_buf + qrow; 322 qline = row_buf + qrow;
322 lalloc (*qline); 323 lalloc (*qline);
324 qline->l = ncol;
323 qline->set_is_longer (); 325 qline->is_longer (1);
324 326
325 int qcol = 0; 327 int qcol = 0;
326 328
327 // fill a single destination line 329 // fill a single destination line
328 while (lofs < llen && qcol < ncol) 330 while (lofs < llen && qcol < ncol)
… …
353 qcol += len; 355 qcol += len;
354 } 356 }
355 } 357 }
356 358
357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 359 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 360 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); 361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
366 } 362 }
367 while (p != pend && q > 0); 363 while (p != pend && q > 0);
368 364
369 term_start = total_rows - nrow; 365 term_start = total_rows - nrow;
370 nsaved = term_start - q; 366 nsaved = term_start - q;
371 367
372 // make sure all terminal lines exist 368 // make sure all terminal lines exist
373 while (nsaved < 0) 369 while (nsaved < 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 370 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
375
376 } 371 }
377 else 372 else
378 { 373 {
379 // if no scrollback exists (yet), wing, instead of wrap 374 // if no scrollback exists (yet), wing, instead of wrap
380 375
… …
712 if (len <= 0) /* sanity */ 707 if (len <= 0) /* sanity */
713 return; 708 return;
714 709
715 unsigned char checksel; 710 unsigned char checksel;
716 unicode_t c; 711 unicode_t c;
717 int last_col; 712 int ncol = this->ncol;
718 const unicode_t *strend = str + len; 713 const unicode_t *strend = str + len;
719 714
720 want_refresh = 1; 715 want_refresh = 1;
721 ZERO_SCROLLBACK (); 716 ZERO_SCROLLBACK ();
722 last_col = ncol;
723 717
724 if (nlines > 0) 718 if (nlines > 0)
725 { 719 {
726 nlines += screen.cur.row - screen.bscroll; 720 nlines += screen.cur.row - screen.bscroll;
727 721
728 if (nlines > 0 722 if (nlines > 0
729 && screen.tscroll == 0 723 && screen.tscroll == 0
730 && screen.bscroll == (nrow - 1)) 724 && screen.bscroll == nrow - 1)
731 { 725 {
732 /* _at least_ this many lines need to be scrolled */ 726 /* _at least_ this many lines need to be scrolled */
733 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 727 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
734 screen.cur.row -= nlines; 728 screen.cur.row -= nlines;
735 } 729 }
736 } 730 }
737 731
738#ifdef DEBUG_STRICT 732#ifdef DEBUG_STRICT
739 assert (screen.cur.col < last_col); 733 assert (screen.cur.col < ncol);
740 assert (screen.cur.row < nrow 734 assert (screen.cur.row < nrow
741 && screen.cur.row >= -nsaved); 735 && screen.cur.row >= -nsaved);
742#endif 736#endif
743 int row = screen.cur.row; 737 int row = screen.cur.row;
744 738
… …
751 c = *str++; 745 c = *str++;
752 746
753 if (c < 0x20) 747 if (c < 0x20)
754 if (c == C0_LF) 748 if (c == C0_LF)
755 { 749 {
756 if (!line->is_longer ()) /* XXX: think about this */
757 max_it (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
758 751
759 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
760 753
761 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
762 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
766 line = &ROW(row); /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
767 continue; 760 continue;
768 } 761 }
769 else if (c == C0_CR) 762 else if (c == C0_CR)
770 { 763 {
771 if (!line->is_longer ()) /* XXX: think about this */
772 max_it (line->l, screen.cur.col); 764 max_it (line->l, screen.cur.col);
773 765
774 screen.flags &= ~Screen_WrapNext; 766 screen.flags &= ~Screen_WrapNext;
775 screen.cur.col = 0; 767 screen.cur.col = 0;
776 continue; 768 continue;
777 } 769 }
… …
794 CLEAR_SELECTION (); 786 CLEAR_SELECTION ();
795 } 787 }
796 788
797 if (screen.flags & Screen_WrapNext) 789 if (screen.flags & Screen_WrapNext)
798 { 790 {
791 max_it (line->l, ncol);
799 line->set_is_longer (); 792 line->is_longer (1);
800 793
801 scr_do_wrap (); 794 scr_do_wrap ();
802 795
803 row = screen.cur.row; 796 row = screen.cur.row;
804 line = &ROW(row); /* _must_ refresh */ 797 line = &ROW(row); /* _must_ refresh */
… …
812 // do wcwidth before further replacements, as wcwidth might return -1 805 // 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 806 // for the line drawing characters below as they might be invalid in the current
814 // locale. 807 // locale.
815 int width = c < 0x100 ? 1 : wcwidth (c); 808 int width = c < 0x100 ? 1 : wcwidth (c);
816 809
817 if (charsets[screen.charset] == '0') // DEC SPECIAL 810 if (charsets [screen.charset] == '0') // DEC SPECIAL
818 { 811 {
819 // vt100 special graphics and line drawing 812 // vt100 special graphics and line drawing
820 // 5f-7e standard vt100 813 // 5f-7e standard vt100
821 // 40-5e rxvt extension for extra curses acs chars 814 // 40-5e rxvt extension for extra curses acs chars
822 static uint16_t vt100_0[62] = { // 41 .. 7e 815 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
874 } 867 }
875 868
876 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
877 870
878 // if the character doesn't fit into the remaining columns... 871 // if the character doesn't fit into the remaining columns...
879 if (screen.cur.col > last_col - width && last_col >= width) 872 if (screen.cur.col > ncol - width && ncol >= width)
880 { 873 {
881 // ...output spaces 874 // ...output spaces
882 c = ' '; 875 c = ' ';
883 // and try the same character next loop iteration 876 // and try the same character next loop iteration
884 --str; 877 --str;
885 } 878 }
886 879
880 line->touch ();
881
887 do 882 do
888 { 883 {
889 line->t[screen.cur.col] = c; 884 line->t[screen.cur.col] = c;
890 line->r[screen.cur.col] = rend; 885 line->r[screen.cur.col] = rend;
891 886
892 if (screen.cur.col < last_col - 1) 887 if (screen.cur.col < ncol - 1)
893 screen.cur.col++; 888 screen.cur.col++;
894 else 889 else
895 { 890 {
896 line->l = last_col; 891 line->l = ncol;
897 if (screen.flags & Screen_Autowrap) 892 if (screen.flags & Screen_Autowrap)
898 screen.flags |= Screen_WrapNext; 893 screen.flags |= Screen_WrapNext;
899 break; 894 break;
900 } 895 }
901 896
… …
903 } 898 }
904 while (--width > 0); 899 while (--width > 0);
905 900
906 // pad with spaces when overwriting wide character with smaller one 901 // pad with spaces when overwriting wide character with smaller one
907 if (!width) 902 if (!width)
903 {
904 line->touch ();
905
908 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 906 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
909 { 907 {
910 line->t[c] = ' '; 908 line->t[c] = ' ';
911 line->r[c] = rend; 909 line->r[c] = rend;
912 } 910 }
911 }
913 } 912 }
914 else // width == 0 913 else // width == 0
915 { 914 {
916#if ENABLE_COMBINING 915#if ENABLE_COMBINING
917 // handle combining characters 916 // handle combining characters
918 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
919 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
920 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
920 line_t *linep;
921 text_t *tp; 921 text_t *tp;
922 rend_t *rp; 922 rend_t *rp;
923 923
924 if (screen.cur.col > 0) 924 if (screen.cur.col > 0)
925 { 925 {
926 linep = line;
926 tp = line->t + screen.cur.col - 1; 927 tp = line->t + screen.cur.col - 1;
927 rp = line->r + screen.cur.col - 1; 928 rp = line->r + screen.cur.col - 1;
928
929 while (*tp == NOCHAR && tp > line->t)
930 tp--, rp--;
931 } 929 }
932 else if (screen.cur.row > 0 930 else if (screen.cur.row > 0
933 && ROW(screen.cur.row - 1).is_longer ()) 931 && ROW(screen.cur.row - 1).is_longer ())
934 { 932 {
935 line_t *line = &ROW(screen.cur.row - 1); 933 linep = &ROW(screen.cur.row - 1);
936
937 tp = line->t + last_col - 1; 934 tp = line->t + ncol - 1;
938 rp = line->r + last_col - 1; 935 rp = line->r + ncol - 1;
939
940 while (*tp == NOCHAR && tp > line->t)
941 tp--, rp--;
942 } 936 }
943 else 937 else
944 continue; 938 continue;
939
940 linep->touch ();
941
942 while (*tp == NOCHAR && tp > linep->t)
943 tp--, rp--;
945 944
946 // first try to find a precomposed character 945 // first try to find a precomposed character
947 unicode_t n = rxvt_compose (*tp, c); 946 unicode_t n = rxvt_compose (*tp, c);
948 if (n == NOCHAR) 947 if (n == NOCHAR)
949 n = rxvt_composite.compose (*tp, c); 948 n = rxvt_composite.compose (*tp, c);
… …
952 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
953#endif 952#endif
954 } 953 }
955 } 954 }
956 955
957 if (!line->is_longer ()) /* XXX: think about this */
958 max_it (line->l, screen.cur.col); 956 max_it (line->l, screen.cur.col);
959 957
960#ifdef DEBUG_STRICT 958#ifdef DEBUG_STRICT
961 assert (screen.cur.row >= 0); 959 assert (screen.cur.row >= 0);
962#endif 960#endif
963} 961}
… …
1013 1011
1014 for (; ++i < ncol; ) 1012 for (; ++i < ncol; )
1015 if (tabs[i]) 1013 if (tabs[i])
1016 { 1014 {
1017 x = i; 1015 x = i;
1016
1018 if (!--count) 1017 if (!--count)
1019 break; 1018 break;
1020 } 1019 }
1021 else 1020 else
1022 ht &= l.t[i] == ' ' 1021 ht &= l.t[i] == ' '
… …
1029 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1030 if (ht && OPTION (Opt_pastableTabs)) 1029 if (ht && OPTION (Opt_pastableTabs))
1031 { 1030 {
1032 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1033 1032
1034 if (!l.is_longer ()) /* XXX: think about this */ 1033 l.touch (x);
1035 max_it (l.l, x);
1036 1034
1037 i = screen.cur.col; 1035 i = screen.cur.col;
1038 1036
1039 l.t[i] = '\t'; 1037 l.t[i] = '\t';
1040 l.r[i] = base_rend; 1038 l.r[i] = base_rend;
… …
1094{ 1092{
1095 if (screen.cur.col < ncol - 1) 1093 if (screen.cur.col < ncol - 1)
1096 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1097 else 1095 else
1098 { 1096 {
1099 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1097 line_t &l = ROW(screen.cur.row);
1100 ROW(screen.cur.row).l = ncol; 1098
1099 l.touch ();
1100 l.is_longer (0);
1101 1101
1102 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1103 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1104 scr_gotorc (0, ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1105 } 1105 }
… …
1196 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1197 1197
1198 selection_check (1); 1198 selection_check (1);
1199 1199
1200 line_t &line = ROW(screen.cur.row); 1200 line_t &line = ROW(screen.cur.row);
1201
1202 line.touch ();
1203 line.is_longer (0);
1201 1204
1202 switch (mode) 1205 switch (mode)
1203 { 1206 {
1204 case 0: /* erase to end of line */ 1207 case 0: /* erase to end of line */
1205 col = screen.cur.col; 1208 col = screen.cur.col;
… …
1300 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1303 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1301 } 1304 }
1302 1305
1303 for (; num--; row++) 1306 for (; num--; row++)
1304 { 1307 {
1305 ROW (row).l = 0; 1308 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1306 scr_blank_screen_mem (ROW (row), rstyle); 1311 scr_blank_screen_mem (l, rstyle);
1307 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1312 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1308 } 1313 }
1309} 1314}
1310 1315
1311#if ENABLE_FRILLS 1316#if ENABLE_FRILLS
… …
1344 rend_t *r1 = line.r; 1349 rend_t *r1 = line.r;
1345 1350
1346 for (int j = ncol; j--; ) 1351 for (int j = ncol; j--; )
1347 *r1++ = fs; 1352 *r1++ = fs;
1348 1353
1349 line.l = ncol; /* make the `E's selectable */ 1354 line.is_longer (0);
1355 line.touch (ncol);
1350 } 1356 }
1351} 1357}
1352 1358
1353/* ------------------------------------------------------------------------- */ 1359/* ------------------------------------------------------------------------- */
1354/* 1360/*
… …
1402 min_it (count, ncol - screen.cur.col); 1408 min_it (count, ncol - screen.cur.col);
1403 1409
1404 row = screen.cur.row; 1410 row = screen.cur.row;
1405 1411
1406 line_t *line = &ROW(row); 1412 line_t *line = &ROW(row);
1413
1414 line->touch ();
1415 line->is_longer (0);
1407 1416
1408 switch (insdel) 1417 switch (insdel)
1409 { 1418 {
1410 case INSERT: 1419 case INSERT:
1411 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1420 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1412 { 1421 {
1413 line->t[col] = line->t[col - count]; 1422 line->t[col] = line->t[col - count];
1414 line->r[col] = line->r[col - count]; 1423 line->r[col] = line->r[col - count];
1415 } 1424 }
1416 1425
1417 if (!line->is_longer ()) 1426 line->l = min (line->l + count, ncol);
1418 {
1419 line->l += count;
1420 min_it (line->l, ncol);
1421 }
1422 1427
1423 if (selection.op && current_screen == selection.screen 1428 if (selection.op && current_screen == selection.screen
1424 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1429 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1425 { 1430 {
1426 if (selection.end.row != screen.cur.row 1431 if (selection.end.row != screen.cur.row
… …
1439 1444
1440 case ERASE: 1445 case ERASE:
1441 screen.cur.col += count; /* don't worry if > ncol */ 1446 screen.cur.col += count; /* don't worry if > ncol */
1442 selection_check (1); 1447 selection_check (1);
1443 screen.cur.col -= count; 1448 screen.cur.col -= count;
1449
1450 line->l = max (line->l - count, 0);
1444 scr_blank_line (*line, screen.cur.col, count, rstyle); 1451 scr_blank_line (*line, screen.cur.col, count, rstyle);
1445 break; 1452 break;
1446 1453
1447 case DELETE: 1454 case DELETE:
1448 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1455 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1451 { 1458 {
1452 line->t[col] = line->t[col + count]; 1459 line->t[col] = line->t[col + count];
1453 line->r[col] = line->r[col + count]; 1460 line->r[col] = line->r[col + count];
1454 } 1461 }
1455 1462
1463 line->l = max (line->l - count, 0);
1456 scr_blank_line (*line, ncol - count, count, tr); 1464 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 1465
1463 if (selection.op && current_screen == selection.screen 1466 if (selection.op && current_screen == selection.screen
1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1465 { 1468 {
1466 if (selection.end.row != screen.cur.row 1469 if (selection.end.row != screen.cur.row
… …
1578rxvt_term::scr_set_tab (int mode) 1581rxvt_term::scr_set_tab (int mode)
1579{ 1582{
1580 if (mode < 0) 1583 if (mode < 0)
1581 memset (tabs, 0, ncol * sizeof (char)); 1584 memset (tabs, 0, ncol * sizeof (char));
1582 else if (screen.cur.col < ncol) 1585 else if (screen.cur.col < ncol)
1583 tabs[screen.cur.col] = (mode ? 1 : 0); 1586 tabs [screen.cur.col] = !!mode;
1584} 1587}
1585 1588
1586/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1587/* 1590/*
1588 * Set reverse/normal video 1591 * Set reverse/normal video
… …
1635 * Set font style 1638 * Set font style
1636 */ 1639 */
1637void 1640void
1638rxvt_term::set_font_style () 1641rxvt_term::set_font_style ()
1639{ 1642{
1643#if 0
1640 switch (charsets[screen.charset]) 1644 switch (charsets [screen.charset])
1641 { 1645 {
1642 case '0': /* DEC Special Character & Line Drawing Set */ 1646 case '0': /* DEC Special Character & Line Drawing Set */
1643 break; 1647 break;
1644 case 'A': /* United Kingdom (UK) */ 1648 case 'A': /* United Kingdom (UK) */
1645 break; 1649 break;
… …
1652 case 'C': /* Finnish character set */ 1656 case 'C': /* Finnish character set */
1653 break; 1657 break;
1654 case 'K': /* German character set */ 1658 case 'K': /* German character set */
1655 break; 1659 break;
1656 } 1660 }
1661#endif
1657} 1662}
1658 1663
1659/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
1660/* 1665/*
1661 * Choose a font 1666 * Choose a font
… …
1826} 1831}
1827 1832
1828int 1833int
1829rxvt_term::scr_changeview (unsigned int oldviewstart) 1834rxvt_term::scr_changeview (unsigned int oldviewstart)
1830{ 1835{
1831 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1832
1833 if (view_start != oldviewstart) 1836 if (view_start != oldviewstart)
1834 { 1837 {
1838 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839
1835 want_refresh = 1; 1840 want_refresh = 1;
1836 num_scr -= (view_start - oldviewstart); 1841 num_scr -= (view_start - oldviewstart);
1837 } 1842 }
1838 1843
1839 return (int) (view_start - oldviewstart); 1844 return (int)view_start - (int)oldviewstart;
1840} 1845}
1841 1846
1842/* ------------------------------------------------------------------------- */ 1847/* ------------------------------------------------------------------------- */
1843void 1848void
1844rxvt_term::scr_bell () 1849rxvt_term::scr_bell ()
… …
2378 num_scr = 0; 2383 num_scr = 0;
2379 num_scr_allow = 1; 2384 num_scr_allow = 1;
2380} 2385}
2381 2386
2382void 2387void
2383rxvt_term::scr_remap_chars (const line_t &l) 2388rxvt_term::scr_remap_chars (line_t &l)
2384{ 2389{
2385 if (!l.t) 2390 if (!l.t)
2386 return; 2391 return;
2392
2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant
2387 2394
2388 for (int i = ncol; i--; ) 2395 for (int i = ncol; i--; )
2389 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2396 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2390} 2397}
2391 2398
… …
2907 col = selection.beg.col; 2914 col = selection.beg.col;
2908 end_col = ncol + 1; 2915 end_col = ncol + 1;
2909 } 2916 }
2910 else 2917 else
2911#endif 2918#endif
2912 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2919 end_col = ROW(row).l;
2913 2920
2914 col = max (col, 0); 2921 col = max (col, 0);
2915 2922
2916 if (row == selection.end.row 2923 if (row == selection.end.row
2917#if ENABLE_FRILLS 2924#if ENABLE_FRILLS
… …
2919#endif 2926#endif
2920 ) 2927 )
2921 min_it (end_col, selection.end.col); 2928 min_it (end_col, selection.end.col);
2922 2929
2923 t = ROW(row).t + col; 2930 t = ROW(row).t + col;
2931
2924 for (; col < end_col; col++) 2932 for (; col < end_col; col++)
2925 { 2933 {
2926 if (*t == NOCHAR) 2934 if (*t == NOCHAR)
2927 t++; 2935 t++;
2928#if ENABLE_COMBINING 2936#if ENABLE_COMBINING

Diff Legend

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