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.215 by root, Sun Jan 8 06:35:23 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 {
… …
643 selection.op = SELECTION_CLEAR; 641 selection.op = SELECTION_CLEAR;
644 } 642 }
645 } 643 }
646 644
647 for (int i = count; i--; ) 645 for (int i = count; i--; )
648 {
649 ROW(row2 - i).l = 0;
650 scr_blank_screen_mem (ROW(row2 - i), rstyle); 646 scr_blank_screen_mem (ROW(row2 - i), rstyle);
651 }
652 647
653 if (OPTION (Opt_scrollWithBuffer) 648 if (OPTION (Opt_scrollWithBuffer)
654 && view_start != 0 649 && view_start != 0
655 && view_start != saveLines) 650 && view_start != saveLines)
656 scr_page (UP, count); 651 scr_page (UP, count);
… …
705/* ------------------------------------------------------------------------- */ 700/* ------------------------------------------------------------------------- */
706/* 701/*
707 * Add text given in <str> of length <len> to screen struct 702 * Add text given in <str> of length <len> to screen struct
708 */ 703 */
709void 704void
710rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 705rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
711{ 706{
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 wchar_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 (minlines > 0)
725 { 719 {
726 nlines += screen.cur.row - screen.bscroll; 720 minlines += screen.cur.row - screen.bscroll;
721
727 if (nlines > 0 722 if (minlines > 0
728 && screen.tscroll == 0 723 && screen.tscroll == 0
729 && screen.bscroll == (nrow - 1)) 724 && screen.bscroll == nrow - 1)
730 { 725 {
731 /* _at least_ this many lines need to be scrolled */ 726 /* _at least_ this many lines need to be scrolled */
732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 727 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
733 screen.cur.row -= nlines; 728 screen.cur.row -= minlines;
734 } 729 }
735 } 730 }
736 731
737#ifdef DEBUG_STRICT 732#ifdef DEBUG_STRICT
738 assert (screen.cur.col < last_col); 733 assert (screen.cur.col < ncol);
739 assert (screen.cur.row < nrow 734 assert (screen.cur.row < nrow
740 && screen.cur.row >= -nsaved); 735 && screen.cur.row >= -nsaved);
741#endif 736#endif
742 int row = screen.cur.row; 737 int row = screen.cur.row;
743 738
… …
745 740
746 line_t *line = &ROW(row); 741 line_t *line = &ROW(row);
747 742
748 while (str < strend) 743 while (str < strend)
749 { 744 {
750 c = *str++; 745 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
751 746
752 if (c < 0x20) 747 if (c < 0x20)
753 if (c == C0_LF) 748 if (c == C0_LF)
754 { 749 {
755 if (!line->is_longer ()) /* XXX: think about this */
756 max_it (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
757 751
758 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
759 753
760 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
761 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
765 line = &ROW(row); /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
766 continue; 760 continue;
767 } 761 }
768 else if (c == C0_CR) 762 else if (c == C0_CR)
769 { 763 {
770 if (!line->is_longer ()) /* XXX: think about this */
771 max_it (line->l, screen.cur.col); 764 max_it (line->l, screen.cur.col);
772 765
773 screen.flags &= ~Screen_WrapNext; 766 screen.flags &= ~Screen_WrapNext;
774 screen.cur.col = 0; 767 screen.cur.col = 0;
775 continue; 768 continue;
776 } 769 }
… …
793 CLEAR_SELECTION (); 786 CLEAR_SELECTION ();
794 } 787 }
795 788
796 if (screen.flags & Screen_WrapNext) 789 if (screen.flags & Screen_WrapNext)
797 { 790 {
791 max_it (line->l, ncol);
798 line->set_is_longer (); 792 line->is_longer (1);
799 793
800 scr_do_wrap (); 794 scr_do_wrap ();
801 795
802 row = screen.cur.row; 796 row = screen.cur.row;
803 line = &ROW(row); /* _must_ refresh */ 797 line = &ROW(row); /* _must_ refresh */
… …
811 // do wcwidth before further replacements, as wcwidth might return -1 805 // 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 806 // for the line drawing characters below as they might be invalid in the current
813 // locale. 807 // locale.
814 int width = c < 0x100 ? 1 : wcwidth (c); 808 int width = c < 0x100 ? 1 : wcwidth (c);
815 809
816 if (charsets[screen.charset] == '0') // DEC SPECIAL 810 if (charsets [screen.charset] == '0') // DEC SPECIAL
817 { 811 {
818 // vt100 special graphics and line drawing 812 // vt100 special graphics and line drawing
819 // 5f-7e standard vt100 813 // 5f-7e standard vt100
820 // 40-5e rxvt extension for extra curses acs chars 814 // 40-5e rxvt extension for extra curses acs chars
821 static uint16_t vt100_0[62] = { // 41 .. 7e 815 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 } 867 }
874 868
875 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
876 870
877 // if the character doesn't fit into the remaining columns... 871 // if the character doesn't fit into the remaining columns...
878 if (screen.cur.col > last_col - width && last_col >= width) 872 if (screen.cur.col > ncol - width && ncol >= width)
879 { 873 {
880 // ...output spaces 874 // ...output spaces
881 c = ' '; 875 c = ' ';
882 // and try the same character next loop iteration 876 // and try the same character next loop iteration
883 --str; 877 --str;
884 } 878 }
885 879
880 line->touch ();
881
886 do 882 do
887 { 883 {
888 line->t[screen.cur.col] = c; 884 line->t[screen.cur.col] = c;
889 line->r[screen.cur.col] = rend; 885 line->r[screen.cur.col] = rend;
890 886
891 if (screen.cur.col < last_col - 1) 887 if (screen.cur.col < ncol - 1)
892 screen.cur.col++; 888 screen.cur.col++;
893 else 889 else
894 { 890 {
895 line->l = last_col; 891 line->l = ncol;
896 if (screen.flags & Screen_Autowrap) 892 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 893 screen.flags |= Screen_WrapNext;
898 break; 894 break;
899 } 895 }
900 896
… …
902 } 898 }
903 while (--width > 0); 899 while (--width > 0);
904 900
905 // pad with spaces when overwriting wide character with smaller one 901 // pad with spaces when overwriting wide character with smaller one
906 if (!width) 902 if (!width)
903 {
904 line->touch ();
905
907 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++)
908 { 907 {
909 line->t[c] = ' '; 908 line->t[c] = ' ';
910 line->r[c] = rend; 909 line->r[c] = rend;
911 } 910 }
911 }
912 } 912 }
913 else // width == 0 913 else // width == 0
914 { 914 {
915#if ENABLE_COMBINING 915#if ENABLE_COMBINING
916 // handle combining characters 916 // handle combining characters
917 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
918 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
919 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
920 line_t *linep;
920 text_t *tp; 921 text_t *tp;
921 rend_t *rp; 922 rend_t *rp;
922 923
923 if (screen.cur.col > 0) 924 if (screen.cur.col > 0)
924 { 925 {
926 linep = line;
925 tp = line->t + screen.cur.col - 1; 927 tp = line->t + screen.cur.col - 1;
926 rp = line->r + screen.cur.col - 1; 928 rp = line->r + screen.cur.col - 1;
927
928 while (*tp == NOCHAR && tp > line->t)
929 tp--, rp--;
930 } 929 }
931 else if (screen.cur.row > 0 930 else if (screen.cur.row > 0
932 && ROW(screen.cur.row - 1).is_longer ()) 931 && ROW(screen.cur.row - 1).is_longer ())
933 { 932 {
934 line_t *line = &ROW(screen.cur.row - 1); 933 linep = &ROW(screen.cur.row - 1);
935
936 tp = line->t + last_col - 1; 934 tp = line->t + ncol - 1;
937 rp = line->r + last_col - 1; 935 rp = line->r + ncol - 1;
938
939 while (*tp == NOCHAR && tp > line->t)
940 tp--, rp--;
941 } 936 }
942 else 937 else
943 continue; 938 continue;
939
940 linep->touch ();
941
942 while (*tp == NOCHAR && tp > linep->t)
943 tp--, rp--;
944 944
945 // first try to find a precomposed character 945 // first try to find a precomposed character
946 unicode_t n = rxvt_compose (*tp, c); 946 unicode_t n = rxvt_compose (*tp, c);
947 if (n == NOCHAR) 947 if (n == NOCHAR)
948 n = rxvt_composite.compose (*tp, c); 948 n = rxvt_composite.compose (*tp, c);
… …
951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
952#endif 952#endif
953 } 953 }
954 } 954 }
955 955
956 if (!line->is_longer ()) /* XXX: think about this */
957 max_it (line->l, screen.cur.col); 956 max_it (line->l, screen.cur.col);
958 957
959#ifdef DEBUG_STRICT 958#ifdef DEBUG_STRICT
960 assert (screen.cur.row >= 0); 959 assert (screen.cur.row >= 0);
961#endif 960#endif
962} 961}
… …
1012 1011
1013 for (; ++i < ncol; ) 1012 for (; ++i < ncol; )
1014 if (tabs[i]) 1013 if (tabs[i])
1015 { 1014 {
1016 x = i; 1015 x = i;
1016
1017 if (!--count) 1017 if (!--count)
1018 break; 1018 break;
1019 } 1019 }
1020 else 1020 else
1021 ht &= l.t[i] == ' ' 1021 ht &= l.t[i] == ' '
… …
1028 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1029 if (ht && OPTION (Opt_pastableTabs))
1030 { 1030 {
1031 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1032 1032
1033 if (!l.is_longer ()) /* XXX: think about this */ 1033 l.touch (x);
1034 max_it (l.l, x);
1035 1034
1036 i = screen.cur.col; 1035 i = screen.cur.col;
1037 1036
1038 l.t[i] = '\t'; 1037 l.t[i] = '\t';
1039 l.r[i] = base_rend; 1038 l.r[i] = base_rend;
… …
1093{ 1092{
1094 if (screen.cur.col < ncol - 1) 1093 if (screen.cur.col < ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1095 else
1097 { 1096 {
1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1097 line_t &l = ROW(screen.cur.row);
1099 ROW(screen.cur.row).l = ncol; 1098
1099 l.touch ();
1100 l.is_longer (0);
1100 1101
1101 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1102 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1103 scr_gotorc (0, ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1104 } 1105 }
… …
1195 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1196 1197
1197 selection_check (1); 1198 selection_check (1);
1198 1199
1199 line_t &line = ROW(screen.cur.row); 1200 line_t &line = ROW(screen.cur.row);
1201
1202 line.touch ();
1203 line.is_longer (0);
1200 1204
1201 switch (mode) 1205 switch (mode)
1202 { 1206 {
1203 case 0: /* erase to end of line */ 1207 case 0: /* erase to end of line */
1204 col = screen.cur.col; 1208 col = screen.cur.col;
… …
1299 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1303 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1300 } 1304 }
1301 1305
1302 for (; num--; row++) 1306 for (; num--; row++)
1303 { 1307 {
1304 ROW (row).l = 0;
1305 scr_blank_screen_mem (ROW (row), rstyle); 1308 scr_blank_screen_mem (ROW(row), rstyle);
1306 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1309 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1307 } 1310 }
1308} 1311}
1309 1312
1310#if ENABLE_FRILLS 1313#if ENABLE_FRILLS
… …
1343 rend_t *r1 = line.r; 1346 rend_t *r1 = line.r;
1344 1347
1345 for (int j = ncol; j--; ) 1348 for (int j = ncol; j--; )
1346 *r1++ = fs; 1349 *r1++ = fs;
1347 1350
1348 line.l = ncol; /* make the `E's selectable */ 1351 line.is_longer (0);
1352 line.touch (ncol);
1349 } 1353 }
1350} 1354}
1351 1355
1352/* ------------------------------------------------------------------------- */ 1356/* ------------------------------------------------------------------------- */
1353/* 1357/*
… …
1401 min_it (count, ncol - screen.cur.col); 1405 min_it (count, ncol - screen.cur.col);
1402 1406
1403 row = screen.cur.row; 1407 row = screen.cur.row;
1404 1408
1405 line_t *line = &ROW(row); 1409 line_t *line = &ROW(row);
1410
1411 line->touch ();
1412 line->is_longer (0);
1406 1413
1407 switch (insdel) 1414 switch (insdel)
1408 { 1415 {
1409 case INSERT: 1416 case INSERT:
1410 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1417 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1411 { 1418 {
1412 line->t[col] = line->t[col - count]; 1419 line->t[col] = line->t[col - count];
1413 line->r[col] = line->r[col - count]; 1420 line->r[col] = line->r[col - count];
1414 } 1421 }
1415 1422
1416 if (!line->is_longer ()) 1423 line->l = min (line->l + count, ncol);
1417 {
1418 line->l += count;
1419 min_it (line->l, ncol);
1420 }
1421 1424
1422 if (selection.op && current_screen == selection.screen 1425 if (selection.op && current_screen == selection.screen
1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1426 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1424 { 1427 {
1425 if (selection.end.row != screen.cur.row 1428 if (selection.end.row != screen.cur.row
… …
1438 1441
1439 case ERASE: 1442 case ERASE:
1440 screen.cur.col += count; /* don't worry if > ncol */ 1443 screen.cur.col += count; /* don't worry if > ncol */
1441 selection_check (1); 1444 selection_check (1);
1442 screen.cur.col -= count; 1445 screen.cur.col -= count;
1446
1447 line->l = max (line->l - count, 0);
1443 scr_blank_line (*line, screen.cur.col, count, rstyle); 1448 scr_blank_line (*line, screen.cur.col, count, rstyle);
1444 break; 1449 break;
1445 1450
1446 case DELETE: 1451 case DELETE:
1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1452 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1450 { 1455 {
1451 line->t[col] = line->t[col + count]; 1456 line->t[col] = line->t[col + count];
1452 line->r[col] = line->r[col + count]; 1457 line->r[col] = line->r[col + count];
1453 } 1458 }
1454 1459
1460 line->l = max (line->l - count, 0);
1455 scr_blank_line (*line, ncol - count, count, tr); 1461 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 1462
1462 if (selection.op && current_screen == selection.screen 1463 if (selection.op && current_screen == selection.screen
1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1464 { 1465 {
1465 if (selection.end.row != screen.cur.row 1466 if (selection.end.row != screen.cur.row
… …
1577rxvt_term::scr_set_tab (int mode) 1578rxvt_term::scr_set_tab (int mode)
1578{ 1579{
1579 if (mode < 0) 1580 if (mode < 0)
1580 memset (tabs, 0, ncol * sizeof (char)); 1581 memset (tabs, 0, ncol * sizeof (char));
1581 else if (screen.cur.col < ncol) 1582 else if (screen.cur.col < ncol)
1582 tabs[screen.cur.col] = (mode ? 1 : 0); 1583 tabs [screen.cur.col] = !!mode;
1583} 1584}
1584 1585
1585/* ------------------------------------------------------------------------- */ 1586/* ------------------------------------------------------------------------- */
1586/* 1587/*
1587 * Set reverse/normal video 1588 * Set reverse/normal video
… …
1634 * Set font style 1635 * Set font style
1635 */ 1636 */
1636void 1637void
1637rxvt_term::set_font_style () 1638rxvt_term::set_font_style ()
1638{ 1639{
1640#if 0
1639 switch (charsets[screen.charset]) 1641 switch (charsets [screen.charset])
1640 { 1642 {
1641 case '0': /* DEC Special Character & Line Drawing Set */ 1643 case '0': /* DEC Special Character & Line Drawing Set */
1642 break; 1644 break;
1643 case 'A': /* United Kingdom (UK) */ 1645 case 'A': /* United Kingdom (UK) */
1644 break; 1646 break;
… …
1651 case 'C': /* Finnish character set */ 1653 case 'C': /* Finnish character set */
1652 break; 1654 break;
1653 case 'K': /* German character set */ 1655 case 'K': /* German character set */
1654 break; 1656 break;
1655 } 1657 }
1658#endif
1656} 1659}
1657 1660
1658/* ------------------------------------------------------------------------- */ 1661/* ------------------------------------------------------------------------- */
1659/* 1662/*
1660 * Choose a font 1663 * Choose a font
… …
1825} 1828}
1826 1829
1827int 1830int
1828rxvt_term::scr_changeview (unsigned int oldviewstart) 1831rxvt_term::scr_changeview (unsigned int oldviewstart)
1829{ 1832{
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831
1832 if (view_start != oldviewstart) 1833 if (view_start != oldviewstart)
1833 { 1834 {
1835 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1836
1834 want_refresh = 1; 1837 want_refresh = 1;
1835 num_scr -= (view_start - oldviewstart); 1838 num_scr -= (view_start - oldviewstart);
1836 } 1839 }
1837 1840
1838 return (int) (view_start - oldviewstart); 1841 return (int)view_start - (int)oldviewstart;
1839} 1842}
1840 1843
1841/* ------------------------------------------------------------------------- */ 1844/* ------------------------------------------------------------------------- */
1842void 1845void
1843rxvt_term::scr_bell () 1846rxvt_term::scr_bell ()
… …
2047 oldcursor.col = screen.cur.col; 2050 oldcursor.col = screen.cur.col;
2048 } 2051 }
2049 } 2052 }
2050 } 2053 }
2051 2054
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2053#if ENABLE_OVERLAY 2056#if ENABLE_OVERLAY
2054 scr_swap_overlay (); 2057 scr_swap_overlay ();
2055#endif 2058#endif
2056 2059
2057#ifndef NO_SLOW_LINK_SUPPORT 2060#ifndef NO_SLOW_LINK_SUPPORT
… …
2107 if (wlen < len) 2110 if (wlen < len)
2108 ::swap (wlen, len); 2111 ::swap (wlen, len);
2109 2112
2110 XCopyArea (display->display, vt, vt, 2113 XCopyArea (display->display, vt, vt,
2111 gc, 0, Row2Pixel (len + i), 2114 gc, 0, Row2Pixel (len + i),
2112 (unsigned int)TermWin_TotalWidth (), 2115 (unsigned int)this->width,
2113 (unsigned int)Height2Pixel (wlen - len + 1), 2116 (unsigned int)Height2Pixel (wlen - len + 1),
2114 0, Row2Pixel (len)); 2117 0, Row2Pixel (len));
2115 len = -1; 2118 len = -1;
2116 } 2119 }
2117 } 2120 }
… …
2320 } /* for (row....) */ 2323 } /* for (row....) */
2321 2324
2322#if ENABLE_OVERLAY 2325#if ENABLE_OVERLAY
2323 scr_swap_overlay (); 2326 scr_swap_overlay ();
2324#endif 2327#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2328 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2326 2329
2327 /* 2330 /*
2328 * G: cleanup cursor and display outline cursor if necessary 2331 * G: cleanup cursor and display outline cursor if necessary
2329 */ 2332 */
2330 if (showcursor) 2333 if (showcursor)
… …
2377 num_scr = 0; 2380 num_scr = 0;
2378 num_scr_allow = 1; 2381 num_scr_allow = 1;
2379} 2382}
2380 2383
2381void 2384void
2382rxvt_term::scr_remap_chars (const line_t &l) 2385rxvt_term::scr_remap_chars (line_t &l)
2383{ 2386{
2384 if (!l.t) 2387 if (!l.t)
2385 return; 2388 return;
2389
2390 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2386 2391
2387 for (int i = ncol; i--; ) 2392 for (int i = ncol; i--; )
2388 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2393 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2389} 2394}
2390 2395
… …
2564/* ------------------------------------------------------------------------- */ 2569/* ------------------------------------------------------------------------- */
2565/* 2570/*
2566 * Paste a selection direct to the command fd 2571 * Paste a selection direct to the command fd
2567 */ 2572 */
2568void 2573void
2569rxvt_term::paste (unsigned char *data, unsigned int len) 2574rxvt_term::paste (char *data, unsigned int len)
2570{ 2575{
2571 /* convert normal newline chars into common keyboard Return key sequence */ 2576 /* convert normal newline chars into common keyboard Return key sequence */
2572 for (unsigned int i = 0; i < len; i++) 2577 for (unsigned int i = 0; i < len; i++)
2573 if (data[i] == C0_LF) 2578 if (data[i] == C0_LF)
2574 data[i] = C0_CR; 2579 data[i] = C0_CR;
… …
2718 { 2723 {
2719 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2724 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2720 char *s = rxvt_wcstombs (w); 2725 char *s = rxvt_wcstombs (w);
2721 free (w); 2726 free (w);
2722 // TODO: strlen == only the first element will be converted. well... 2727 // TODO: strlen == only the first element will be converted. well...
2723 paste ((unsigned char *)s, strlen (s)); 2728 paste (s, strlen (s));
2724 free (s); 2729 free (s);
2725 } 2730 }
2726 else 2731 else
2727#endif 2732#endif
2728 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2733 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2729 && cl) 2734 && cl)
2730 { 2735 {
2731 for (int i = 0; i < cr; i++) 2736 for (int i = 0; i < cr; i++)
2732 paste ((unsigned char *)cl[i], strlen (cl[i])); 2737 paste (cl[i], strlen (cl[i]));
2733 2738
2734 XFreeStringList (cl); 2739 XFreeStringList (cl);
2735 } 2740 }
2736 else 2741 else
2737 paste (ct.value, ct.nitems); // paste raw 2742 paste ((char *)ct.value, ct.nitems); // paste raw
2738 2743
2739bailout: 2744bailout:
2740 XFree (ct.value); 2745 XFree (ct.value);
2741 2746
2742 if (selection_wait == Sel_normal) 2747 if (selection_wait == Sel_normal)
… …
2780 return; /* outside window */ 2785 return; /* outside window */
2781 2786
2782 if (selection.text) 2787 if (selection.text)
2783 { /* internal selection */ 2788 { /* internal selection */
2784 char *str = rxvt_wcstombs (selection.text, selection.len); 2789 char *str = rxvt_wcstombs (selection.text, selection.len);
2785 paste ((unsigned char *)str, strlen (str)); 2790 paste (str, strlen (str));
2786 free (str); 2791 free (str);
2787 return; 2792 return;
2788 } 2793 }
2789 else 2794 else
2790 { 2795 {
… …
2882 selection.op = SELECTION_DONE; 2887 selection.op = SELECTION_DONE;
2883 2888
2884 if (selection.clicks == 4) 2889 if (selection.clicks == 4)
2885 return; /* nothing selected, go away */ 2890 return; /* nothing selected, go away */
2886 2891
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2892 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return; 2893 return;
2889 2894
2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2895 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2891 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2896 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2892 2897
… …
2906 col = selection.beg.col; 2911 col = selection.beg.col;
2907 end_col = ncol + 1; 2912 end_col = ncol + 1;
2908 } 2913 }
2909 else 2914 else
2910#endif 2915#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2916 end_col = ROW(row).l;
2912 2917
2913 col = max (col, 0); 2918 col = max (col, 0);
2914 2919
2915 if (row == selection.end.row 2920 if (row == selection.end.row
2916#if ENABLE_FRILLS 2921#if ENABLE_FRILLS
… …
2918#endif 2923#endif
2919 ) 2924 )
2920 min_it (end_col, selection.end.col); 2925 min_it (end_col, selection.end.col);
2921 2926
2922 t = ROW(row).t + col; 2927 t = ROW(row).t + col;
2928
2923 for (; col < end_col; col++) 2929 for (; col < end_col; col++)
2924 { 2930 {
2925 if (*t == NOCHAR) 2931 if (*t == NOCHAR)
2926 t++; 2932 t++;
2927#if ENABLE_COMBINING 2933#if ENABLE_COMBINING
… …
2976 2982
2977 // we usually allocate much more than necessary, so realloc it smaller again 2983 // we usually allocate much more than necessary, so realloc it smaller again
2978 selection.len = ofs; 2984 selection.len = ofs;
2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2985 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2980 2986
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 2987 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return; 2988 return;
2983 2989
2984 selection_grab (tm); 2990 selection_grab (tm);
2985} 2991}
2986 2992
… …
3136 } 3142 }
3137 } 3143 }
3138 break; 3144 break;
3139 } 3145 }
3140 3146
3141Old_Word_Selection_You_Die:
3142 if (dirn == DN) 3147 if (dirn == DN)
3143 col++; /* put us on one past the end */ 3148 col++; /* put us on one past the end */
3144 3149
3145 /* Poke the values back in */ 3150 /* Poke the values back in */
3146 ret->row = row; 3151 ret->row = row;
… …
3323 else if (selection.clicks == 2) 3328 else if (selection.clicks == 2)
3324 { 3329 {
3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3330 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3326 selection.end.col--; 3331 selection.end.col--;
3327 3332
3333 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3334 {
3328 selection_delimit_word (UP, &selection.beg, &selection.beg); 3335 selection_delimit_word (UP, &selection.beg, &selection.beg);
3329 selection_delimit_word (DN, &selection.end, &selection.end); 3336 selection_delimit_word (DN, &selection.end, &selection.end);
3337 }
3330 } 3338 }
3331 else if (selection.clicks == 3) 3339 else if (selection.clicks == 3)
3332 { 3340 {
3333#if ENABLE_FRILLS 3341#if ENABLE_FRILLS
3334 if (OPTION (Opt_tripleclickwords)) 3342 if (OPTION (Opt_tripleclickwords))

Diff Legend

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