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.205 by root, Tue Jan 3 04:18:47 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;
730
727 if (nlines > 0 731 if (minlines > 0
728 && screen.tscroll == 0 732 && screen.tscroll == 0
729 && screen.bscroll == (nrow - 1)) 733 && screen.bscroll == nrow - 1)
730 { 734 {
731 /* _at least_ this many lines need to be scrolled */ 735 /* _at least_ this many lines need to be scrolled */
732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 736 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
733 screen.cur.row -= nlines; 737 screen.cur.row -= minlines;
734 } 738 }
735 } 739 }
736 740
737#ifdef DEBUG_STRICT 741#ifdef DEBUG_STRICT
738 assert (screen.cur.col < last_col); 742 assert (screen.cur.col < ncol);
739 assert (screen.cur.row < nrow 743 assert (screen.cur.row < nrow
740 && screen.cur.row >= -nsaved); 744 && screen.cur.row >= -nsaved);
741#endif 745#endif
742 int row = screen.cur.row; 746 int row = screen.cur.row;
743 747
… …
745 749
746 line_t *line = &ROW(row); 750 line_t *line = &ROW(row);
747 751
748 while (str < strend) 752 while (str < strend)
749 { 753 {
750 c = *str++; 754 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
751 755
752 if (c < 0x20) 756 if (c < 0x20)
753 if (c == C0_LF) 757 if (c == C0_LF)
754 { 758 {
755 if (!line->is_longer ()) /* XXX: think about this */
756 max_it (line->l, screen.cur.col); 759 max_it (line->l, screen.cur.col);
757 760
758 screen.flags &= ~Screen_WrapNext; 761 screen.flags &= ~Screen_WrapNext;
759 762
760 if (screen.cur.row == screen.bscroll) 763 if (screen.cur.row == screen.bscroll)
761 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 764 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
765 line = &ROW(row); /* _must_ refresh */ 768 line = &ROW(row); /* _must_ refresh */
766 continue; 769 continue;
767 } 770 }
768 else if (c == C0_CR) 771 else if (c == C0_CR)
769 { 772 {
770 if (!line->is_longer ()) /* XXX: think about this */
771 max_it (line->l, screen.cur.col); 773 max_it (line->l, screen.cur.col);
772 774
773 screen.flags &= ~Screen_WrapNext; 775 screen.flags &= ~Screen_WrapNext;
774 screen.cur.col = 0; 776 screen.cur.col = 0;
775 continue; 777 continue;
776 } 778 }
… …
793 CLEAR_SELECTION (); 795 CLEAR_SELECTION ();
794 } 796 }
795 797
796 if (screen.flags & Screen_WrapNext) 798 if (screen.flags & Screen_WrapNext)
797 { 799 {
800 max_it (line->l, ncol);
798 line->set_is_longer (); 801 line->is_longer (1);
799 802
800 scr_do_wrap (); 803 scr_do_wrap ();
801 804
802 row = screen.cur.row; 805 row = screen.cur.row;
803 line = &ROW(row); /* _must_ refresh */ 806 line = &ROW(row); /* _must_ refresh */
… …
811 // do wcwidth before further replacements, as wcwidth might return -1 814 // do wcwidth before further replacements, as wcwidth might return -1
812 // 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
813 // locale. 816 // locale.
814 int width = c < 0x100 ? 1 : wcwidth (c); 817 int width = c < 0x100 ? 1 : wcwidth (c);
815 818
816 if (charsets[screen.charset] == '0') // DEC SPECIAL 819 if (charsets [screen.charset] == '0') // DEC SPECIAL
817 { 820 {
818 // vt100 special graphics and line drawing 821 // vt100 special graphics and line drawing
819 // 5f-7e standard vt100 822 // 5f-7e standard vt100
820 // 40-5e rxvt extension for extra curses acs chars 823 // 40-5e rxvt extension for extra curses acs chars
821 static uint16_t vt100_0[62] = { // 41 .. 7e 824 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 } 876 }
874 877
875 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 878 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
876 879
877 // if the character doesn't fit into the remaining columns... 880 // if the character doesn't fit into the remaining columns...
878 if (screen.cur.col > last_col - width && last_col >= width) 881 if (screen.cur.col > ncol - width && ncol >= width)
879 { 882 {
880 // ...output spaces 883 // ...output spaces
881 c = ' '; 884 c = ' ';
882 // and try the same character next loop iteration 885 // and try the same character next loop iteration
883 --str; 886 --str;
884 } 887 }
885 888
889 line->touch ();
890
886 do 891 do
887 { 892 {
888 line->t[screen.cur.col] = c; 893 line->t[screen.cur.col] = c;
889 line->r[screen.cur.col] = rend; 894 line->r[screen.cur.col] = rend;
890 895
891 if (screen.cur.col < last_col - 1) 896 if (screen.cur.col < ncol - 1)
892 screen.cur.col++; 897 screen.cur.col++;
893 else 898 else
894 { 899 {
895 line->l = last_col; 900 line->l = ncol;
896 if (screen.flags & Screen_Autowrap) 901 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 902 screen.flags |= Screen_WrapNext;
898 break; 903 break;
899 } 904 }
900 905
… …
902 } 907 }
903 while (--width > 0); 908 while (--width > 0);
904 909
905 // pad with spaces when overwriting wide character with smaller one 910 // pad with spaces when overwriting wide character with smaller one
906 if (!width) 911 if (!width)
912 {
913 line->touch ();
914
907 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++)
908 { 916 {
909 line->t[c] = ' '; 917 line->t[c] = ' ';
910 line->r[c] = rend; 918 line->r[c] = rend;
911 } 919 }
920 }
912 } 921 }
913 else // width == 0 922 else // width == 0
914 { 923 {
915#if ENABLE_COMBINING 924#if ENABLE_COMBINING
916 // handle combining characters 925 // handle combining characters
917 // we just tag the accent on the previous on-screen character. 926 // we just tag the accent on the previous on-screen character.
918 // this is arguably not correct, but also arguably not wrong. 927 // this is arguably not correct, but also arguably not wrong.
919 // we don't handle double-width characters nicely yet. 928 // we don't handle double-width characters nicely yet.
929 line_t *linep;
920 text_t *tp; 930 text_t *tp;
921 rend_t *rp; 931 rend_t *rp;
922 932
923 if (screen.cur.col > 0) 933 if (screen.cur.col > 0)
924 { 934 {
935 linep = line;
925 tp = line->t + screen.cur.col - 1; 936 tp = line->t + screen.cur.col - 1;
926 rp = line->r + screen.cur.col - 1; 937 rp = line->r + screen.cur.col - 1;
927
928 while (*tp == NOCHAR && tp > line->t)
929 tp--, rp--;
930 } 938 }
931 else if (screen.cur.row > 0 939 else if (screen.cur.row > 0
932 && ROW(screen.cur.row - 1).is_longer ()) 940 && ROW(screen.cur.row - 1).is_longer ())
933 { 941 {
934 line_t *line = &ROW(screen.cur.row - 1); 942 linep = &ROW(screen.cur.row - 1);
935
936 tp = line->t + last_col - 1; 943 tp = line->t + ncol - 1;
937 rp = line->r + last_col - 1; 944 rp = line->r + ncol - 1;
938
939 while (*tp == NOCHAR && tp > line->t)
940 tp--, rp--;
941 } 945 }
942 else 946 else
943 continue; 947 continue;
948
949 linep->touch ();
950
951 while (*tp == NOCHAR && tp > linep->t)
952 tp--, rp--;
944 953
945 // first try to find a precomposed character 954 // first try to find a precomposed character
946 unicode_t n = rxvt_compose (*tp, c); 955 unicode_t n = rxvt_compose (*tp, c);
947 if (n == NOCHAR) 956 if (n == NOCHAR)
948 n = rxvt_composite.compose (*tp, c); 957 n = rxvt_composite.compose (*tp, c);
… …
951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 960 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
952#endif 961#endif
953 } 962 }
954 } 963 }
955 964
956 if (!line->is_longer ()) /* XXX: think about this */
957 max_it (line->l, screen.cur.col); 965 max_it (line->l, screen.cur.col);
958 966
959#ifdef DEBUG_STRICT 967#ifdef DEBUG_STRICT
960 assert (screen.cur.row >= 0); 968 assert (screen.cur.row >= 0);
961#endif 969#endif
962} 970}
… …
1012 1020
1013 for (; ++i < ncol; ) 1021 for (; ++i < ncol; )
1014 if (tabs[i]) 1022 if (tabs[i])
1015 { 1023 {
1016 x = i; 1024 x = i;
1025
1017 if (!--count) 1026 if (!--count)
1018 break; 1027 break;
1019 } 1028 }
1020 else 1029 else
1021 ht &= l.t[i] == ' ' 1030 ht &= l.t[i] == ' '
… …
1028 // buffer so they can be selected and pasted. 1037 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1038 if (ht && OPTION (Opt_pastableTabs))
1030 { 1039 {
1031 base_rend = SET_FONT (base_rend, 0); 1040 base_rend = SET_FONT (base_rend, 0);
1032 1041
1033 if (!l.is_longer ()) /* XXX: think about this */ 1042 l.touch (x);
1034 max_it (l.l, x);
1035 1043
1036 i = screen.cur.col; 1044 i = screen.cur.col;
1037 1045
1038 l.t[i] = '\t'; 1046 l.t[i] = '\t';
1039 l.r[i] = base_rend; 1047 l.r[i] = base_rend;
… …
1093{ 1101{
1094 if (screen.cur.col < ncol - 1) 1102 if (screen.cur.col < ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1104 else
1097 { 1105 {
1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1106 line_t &l = ROW(screen.cur.row);
1099 ROW(screen.cur.row).l = ncol; 1107
1108 l.touch ();
1109 l.is_longer (0);
1100 1110
1101 scr_gotorc (0, 0, R_RELATIVE); 1111 scr_gotorc (0, 0, R_RELATIVE);
1102 scr_insdel_chars (1, DELETE); 1112 scr_insdel_chars (1, DELETE);
1103 scr_gotorc (0, ncol - 1, R_RELATIVE); 1113 scr_gotorc (0, ncol - 1, R_RELATIVE);
1104 } 1114 }
… …
1195 ZERO_SCROLLBACK (); 1205 ZERO_SCROLLBACK ();
1196 1206
1197 selection_check (1); 1207 selection_check (1);
1198 1208
1199 line_t &line = ROW(screen.cur.row); 1209 line_t &line = ROW(screen.cur.row);
1210
1211 line.touch ();
1212 line.is_longer (0);
1200 1213
1201 switch (mode) 1214 switch (mode)
1202 { 1215 {
1203 case 0: /* erase to end of line */ 1216 case 0: /* erase to end of line */
1204 col = screen.cur.col; 1217 col = screen.cur.col;
… …
1299 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1300 } 1313 }
1301 1314
1302 for (; num--; row++) 1315 for (; num--; row++)
1303 { 1316 {
1304 ROW (row).l = 0;
1305 scr_blank_screen_mem (ROW (row), rstyle); 1317 scr_blank_screen_mem (ROW(row), rstyle);
1306 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1318 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1307 } 1319 }
1308} 1320}
1309 1321
1310#if ENABLE_FRILLS 1322#if ENABLE_FRILLS
… …
1343 rend_t *r1 = line.r; 1355 rend_t *r1 = line.r;
1344 1356
1345 for (int j = ncol; j--; ) 1357 for (int j = ncol; j--; )
1346 *r1++ = fs; 1358 *r1++ = fs;
1347 1359
1348 line.l = ncol; /* make the `E's selectable */ 1360 line.is_longer (0);
1361 line.touch (ncol);
1349 } 1362 }
1350} 1363}
1351 1364
1352/* ------------------------------------------------------------------------- */ 1365/* ------------------------------------------------------------------------- */
1353/* 1366/*
… …
1401 min_it (count, ncol - screen.cur.col); 1414 min_it (count, ncol - screen.cur.col);
1402 1415
1403 row = screen.cur.row; 1416 row = screen.cur.row;
1404 1417
1405 line_t *line = &ROW(row); 1418 line_t *line = &ROW(row);
1419
1420 line->touch ();
1421 line->is_longer (0);
1406 1422
1407 switch (insdel) 1423 switch (insdel)
1408 { 1424 {
1409 case INSERT: 1425 case INSERT:
1410 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1426 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1411 { 1427 {
1412 line->t[col] = line->t[col - count]; 1428 line->t[col] = line->t[col - count];
1413 line->r[col] = line->r[col - count]; 1429 line->r[col] = line->r[col - count];
1414 } 1430 }
1415 1431
1416 if (!line->is_longer ()) 1432 line->l = min (line->l + count, ncol);
1417 {
1418 line->l += count;
1419 min_it (line->l, ncol);
1420 }
1421 1433
1422 if (selection.op && current_screen == selection.screen 1434 if (selection.op && current_screen == selection.screen
1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1435 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1424 { 1436 {
1425 if (selection.end.row != screen.cur.row 1437 if (selection.end.row != screen.cur.row
… …
1438 1450
1439 case ERASE: 1451 case ERASE:
1440 screen.cur.col += count; /* don't worry if > ncol */ 1452 screen.cur.col += count; /* don't worry if > ncol */
1441 selection_check (1); 1453 selection_check (1);
1442 screen.cur.col -= count; 1454 screen.cur.col -= count;
1455
1456 line->l = max (line->l - count, 0);
1443 scr_blank_line (*line, screen.cur.col, count, rstyle); 1457 scr_blank_line (*line, screen.cur.col, count, rstyle);
1444 break; 1458 break;
1445 1459
1446 case DELETE: 1460 case DELETE:
1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1461 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1450 { 1464 {
1451 line->t[col] = line->t[col + count]; 1465 line->t[col] = line->t[col + count];
1452 line->r[col] = line->r[col + count]; 1466 line->r[col] = line->r[col + count];
1453 } 1467 }
1454 1468
1469 line->l = max (line->l - count, 0);
1455 scr_blank_line (*line, ncol - count, count, tr); 1470 scr_blank_line (*line, ncol - count, count, tr);
1456
1457 if (line->is_longer ()) /* break line continuation */
1458 line->l = ncol;
1459
1460 line->l = max (line->l - count, 0);
1461 1471
1462 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1464 { 1474 {
1465 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
… …
1577rxvt_term::scr_set_tab (int mode) 1587rxvt_term::scr_set_tab (int mode)
1578{ 1588{
1579 if (mode < 0) 1589 if (mode < 0)
1580 memset (tabs, 0, ncol * sizeof (char)); 1590 memset (tabs, 0, ncol * sizeof (char));
1581 else if (screen.cur.col < ncol) 1591 else if (screen.cur.col < ncol)
1582 tabs[screen.cur.col] = (mode ? 1 : 0); 1592 tabs [screen.cur.col] = !!mode;
1583} 1593}
1584 1594
1585/* ------------------------------------------------------------------------- */ 1595/* ------------------------------------------------------------------------- */
1586/* 1596/*
1587 * Set reverse/normal video 1597 * Set reverse/normal video
… …
1634 * Set font style 1644 * Set font style
1635 */ 1645 */
1636void 1646void
1637rxvt_term::set_font_style () 1647rxvt_term::set_font_style ()
1638{ 1648{
1649#if 0
1639 switch (charsets[screen.charset]) 1650 switch (charsets [screen.charset])
1640 { 1651 {
1641 case '0': /* DEC Special Character & Line Drawing Set */ 1652 case '0': /* DEC Special Character & Line Drawing Set */
1642 break; 1653 break;
1643 case 'A': /* United Kingdom (UK) */ 1654 case 'A': /* United Kingdom (UK) */
1644 break; 1655 break;
… …
1651 case 'C': /* Finnish character set */ 1662 case 'C': /* Finnish character set */
1652 break; 1663 break;
1653 case 'K': /* German character set */ 1664 case 'K': /* German character set */
1654 break; 1665 break;
1655 } 1666 }
1667#endif
1656} 1668}
1657 1669
1658/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
1659/* 1671/*
1660 * Choose a font 1672 * Choose a font
… …
1825} 1837}
1826 1838
1827int 1839int
1828rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (unsigned int oldviewstart)
1829{ 1841{
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831
1832 if (view_start != oldviewstart) 1842 if (view_start != oldviewstart)
1833 { 1843 {
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1845
1834 want_refresh = 1; 1846 want_refresh = 1;
1835 num_scr -= (view_start - oldviewstart); 1847 num_scr -= (view_start - oldviewstart);
1836 } 1848 }
1837 1849
1838 return (int) (view_start - oldviewstart); 1850 return (int)view_start - (int)oldviewstart;
1839} 1851}
1840 1852
1841/* ------------------------------------------------------------------------- */ 1853/* ------------------------------------------------------------------------- */
1842void 1854void
1843rxvt_term::scr_bell () 1855rxvt_term::scr_bell ()
… …
2047 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2048 } 2060 }
2049 } 2061 }
2050 } 2062 }
2051 2063
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2053#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2054 scr_swap_overlay (); 2066 scr_swap_overlay ();
2055#endif 2067#endif
2056 2068
2057#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2107 if (wlen < len) 2119 if (wlen < len)
2108 ::swap (wlen, len); 2120 ::swap (wlen, len);
2109 2121
2110 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2111 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2112 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2113 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2114 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2115 len = -1; 2127 len = -1;
2116 } 2128 }
2117 } 2129 }
… …
2320 } /* for (row....) */ 2332 } /* for (row....) */
2321 2333
2322#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2323 scr_swap_overlay (); 2335 scr_swap_overlay ();
2324#endif 2336#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2326 2338
2327 /* 2339 /*
2328 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2329 */ 2341 */
2330 if (showcursor) 2342 if (showcursor)
… …
2377 num_scr = 0; 2389 num_scr = 0;
2378 num_scr_allow = 1; 2390 num_scr_allow = 1;
2379} 2391}
2380 2392
2381void 2393void
2382rxvt_term::scr_remap_chars (const line_t &l) 2394rxvt_term::scr_remap_chars (line_t &l)
2383{ 2395{
2384 if (!l.t) 2396 if (!l.t)
2385 return; 2397 return;
2398
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2386 2400
2387 for (int i = ncol; i--; ) 2401 for (int i = ncol; i--; )
2388 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]));
2389} 2403}
2390 2404
… …
2564/* ------------------------------------------------------------------------- */ 2578/* ------------------------------------------------------------------------- */
2565/* 2579/*
2566 * Paste a selection direct to the command fd 2580 * Paste a selection direct to the command fd
2567 */ 2581 */
2568void 2582void
2569rxvt_term::paste (unsigned char *data, unsigned int len) 2583rxvt_term::paste (char *data, unsigned int len)
2570{ 2584{
2571 /* convert normal newline chars into common keyboard Return key sequence */ 2585 /* convert normal newline chars into common keyboard Return key sequence */
2572 for (unsigned int i = 0; i < len; i++) 2586 for (unsigned int i = 0; i < len; i++)
2573 if (data[i] == C0_LF) 2587 if (data[i] == C0_LF)
2574 data[i] = C0_CR; 2588 data[i] = C0_CR;
… …
2718 { 2732 {
2719 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2733 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2720 char *s = rxvt_wcstombs (w); 2734 char *s = rxvt_wcstombs (w);
2721 free (w); 2735 free (w);
2722 // TODO: strlen == only the first element will be converted. well... 2736 // TODO: strlen == only the first element will be converted. well...
2723 paste ((unsigned char *)s, strlen (s)); 2737 paste (s, strlen (s));
2724 free (s); 2738 free (s);
2725 } 2739 }
2726 else 2740 else
2727#endif 2741#endif
2728 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2742 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2729 && cl) 2743 && cl)
2730 { 2744 {
2731 for (int i = 0; i < cr; i++) 2745 for (int i = 0; i < cr; i++)
2732 paste ((unsigned char *)cl[i], strlen (cl[i])); 2746 paste (cl[i], strlen (cl[i]));
2733 2747
2734 XFreeStringList (cl); 2748 XFreeStringList (cl);
2735 } 2749 }
2736 else 2750 else
2737 paste (ct.value, ct.nitems); // paste raw 2751 paste ((char *)ct.value, ct.nitems); // paste raw
2738 2752
2739bailout: 2753bailout:
2740 XFree (ct.value); 2754 XFree (ct.value);
2741 2755
2742 if (selection_wait == Sel_normal) 2756 if (selection_wait == Sel_normal)
… …
2780 return; /* outside window */ 2794 return; /* outside window */
2781 2795
2782 if (selection.text) 2796 if (selection.text)
2783 { /* internal selection */ 2797 { /* internal selection */
2784 char *str = rxvt_wcstombs (selection.text, selection.len); 2798 char *str = rxvt_wcstombs (selection.text, selection.len);
2785 paste ((unsigned char *)str, strlen (str)); 2799 paste (str, strlen (str));
2786 free (str); 2800 free (str);
2787 return; 2801 return;
2788 } 2802 }
2789 else 2803 else
2790 { 2804 {
… …
2882 selection.op = SELECTION_DONE; 2896 selection.op = SELECTION_DONE;
2883 2897
2884 if (selection.clicks == 4) 2898 if (selection.clicks == 4)
2885 return; /* nothing selected, go away */ 2899 return; /* nothing selected, go away */
2886 2900
2887 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)))
2888 return; 2902 return;
2889 2903
2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2904 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2891 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));
2892 2906
… …
2906 col = selection.beg.col; 2920 col = selection.beg.col;
2907 end_col = ncol + 1; 2921 end_col = ncol + 1;
2908 } 2922 }
2909 else 2923 else
2910#endif 2924#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2925 end_col = ROW(row).l;
2912 2926
2913 col = max (col, 0); 2927 col = max (col, 0);
2914 2928
2915 if (row == selection.end.row 2929 if (row == selection.end.row
2916#if ENABLE_FRILLS 2930#if ENABLE_FRILLS
… …
2918#endif 2932#endif
2919 ) 2933 )
2920 min_it (end_col, selection.end.col); 2934 min_it (end_col, selection.end.col);
2921 2935
2922 t = ROW(row).t + col; 2936 t = ROW(row).t + col;
2937
2923 for (; col < end_col; col++) 2938 for (; col < end_col; col++)
2924 { 2939 {
2925 if (*t == NOCHAR) 2940 if (*t == NOCHAR)
2926 t++; 2941 t++;
2927#if ENABLE_COMBINING 2942#if ENABLE_COMBINING
… …
2976 2991
2977 // 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
2978 selection.len = ofs; 2993 selection.len = ofs;
2979 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));
2980 2995
2981 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)))
2982 return; 2997 return;
2983 2998
2984 selection_grab (tm); 2999 selection_grab (tm);
2985} 3000}
2986 3001
… …
3136 } 3151 }
3137 } 3152 }
3138 break; 3153 break;
3139 } 3154 }
3140 3155
3141Old_Word_Selection_You_Die:
3142 if (dirn == DN) 3156 if (dirn == DN)
3143 col++; /* put us on one past the end */ 3157 col++; /* put us on one past the end */
3144 3158
3145 /* Poke the values back in */ 3159 /* Poke the values back in */
3146 ret->row = row; 3160 ret->row = row;
… …
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
3342 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3343 {
3328 selection_delimit_word (UP, &selection.beg, &selection.beg); 3344 selection_delimit_word (UP, &selection.beg, &selection.beg);
3329 selection_delimit_word (DN, &selection.end, &selection.end); 3345 selection_delimit_word (DN, &selection.end, &selection.end);
3346 }
3330 } 3347 }
3331 else if (selection.clicks == 3) 3348 else if (selection.clicks == 3)
3332 { 3349 {
3333#if ENABLE_FRILLS 3350#if ENABLE_FRILLS
3334 if (OPTION (Opt_tripleclickwords)) 3351 if (OPTION (Opt_tripleclickwords))

Diff Legend

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