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.192 by root, Thu Dec 22 19:25:58 2005 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.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142/* 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 */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
289 { 295 {
290 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif 299#endif
294
295 int plines = 1; 300 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 301 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 302
298 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 ())
299 { 304 {
… …
317 // re-assemble the full line by destination lines 322 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
319 { 324 {
320 qline = row_buf + qrow; 325 qline = row_buf + qrow;
321 lalloc (*qline); 326 lalloc (*qline);
327 qline->l = ncol;
322 qline->set_is_longer (); 328 qline->is_longer (1);
323 329
324 int qcol = 0; 330 int qcol = 0;
325 331
326 // fill a single destination line 332 // fill a single destination line
327 while (lofs < llen && qcol < ncol) 333 while (lofs < llen && qcol < ncol)
… …
351 lofs += len; 357 lofs += len;
352 qcol += len; 358 qcol += len;
353 } 359 }
354 } 360 }
355 361
356 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 362 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
363 qline->is_longer (0);
357 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
358 } 365 }
359 while (p != pend && q > 0); 366 while (p != pend && q > 0);
360 367
361 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
362 nsaved = term_start - q; 369 nsaved = term_start - q;
363 370
364 // make sure all terminal lines exist 371 // make sure all terminal lines exist
365 while (nsaved < 0) 372 while (nsaved < 0)
366 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
367
368 } 374 }
369 else 375 else
370 { 376 {
371 // if no scrollback exists (yet), wing, instead of wrap 377 // if no scrollback exists (yet), wing, instead of wrap
372 378
… …
385 } 391 }
386 392
387 term_start = 0; 393 term_start = 0;
388 } 394 }
389 395
390#ifdef DEBUG_STRICT 396#ifdef DEBUG_STRICT //TODO: remove
391 for (int i = -nsaved; i < nrow; i++) 397 for (int i = -nsaved; i < nrow; i++)
392 assert (ROW (i).t); 398 assert (ROW (i).t);
393#endif 399#endif
394 400
395 free (old_buf); 401 free (old_buf);
… …
410 416
411 for (int col = ncol; col--; ) 417 for (int col = ncol; col--; )
412 tabs [col] = col % TABSIZE == 0; 418 tabs [col] = col % TABSIZE == 0;
413 419
414 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
415} 423}
416 424
417/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
418/* 426/*
419 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
… …
523 531
524 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
525 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
526 534
527#if NSCREENS 535#if NSCREENS
528 if (options & Opt_secondaryScreen) 536 if (OPTION (Opt_secondaryScreen))
529 { 537 {
530 num_scr = 0; 538 num_scr = 0;
531 539
532 for (int i = prev_nrow; i--; ) 540 for (int i = prev_nrow; i--; )
533 ::swap (ROW(i), swap_buf [i]); 541 ::swap (ROW(i), swap_buf [i]);
… …
537 screen.flags |= Screen_VisibleCursor; 545 screen.flags |= Screen_VisibleCursor;
538 swap.flags |= Screen_VisibleCursor; 546 swap.flags |= Screen_VisibleCursor;
539 } 547 }
540 else 548 else
541#endif 549#endif
542 if (options & Opt_secondaryScroll) 550 if (OPTION (Opt_secondaryScroll))
543 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 551 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
544 552
545 return scrn; 553 return scrn;
546} 554}
547 555
… …
609 num_scr += count; 617 num_scr += count;
610 618
611 if (count > 0 619 if (count > 0
612 && row1 == 0 620 && row1 == 0
613 && row2 == nrow - 1 621 && row2 == nrow - 1
614 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
615 { 623 {
616 nsaved = min (nsaved + count, saveLines); 624 nsaved = min (nsaved + count, saveLines);
625
626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
627
617 term_start = (term_start + count) % total_rows; 628 term_start = (term_start + count) % total_rows;
618 629
619 if (selection.op && current_screen == selection.screen) 630 if (selection.op && current_screen == selection.screen)
620 { 631 {
621 selection.beg.row -= count; 632 selection.beg.row -= count;
622 selection.end.row -= count; 633 selection.end.row -= count;
623 selection.mark.row -= count; 634 selection.mark.row -= count;
624 635
625 selection_check (0); 636 if (selection.beg.row < -nsaved
637 || selection.end.row < -nsaved
638 || selection.mark.row < -nsaved)
639 {
640 CLEAR_ALL_SELECTION ();
641 selection.op = SELECTION_CLEAR;
642 }
626 } 643 }
627 644
628 for (int i = count; i--; ) 645 for (int i = count; i--; )
629 scr_blank_screen_mem (ROW(row2 - i), rstyle); 646 scr_blank_screen_mem (ROW(row2 - i), rstyle);
630 647
631 if ((options & Opt_scrollWithBuffer) 648 if (OPTION (Opt_scrollWithBuffer)
632 && view_start != 0 649 && view_start != 0
633 && view_start != saveLines) 650 && view_start != saveLines)
634 scr_page (UP, count); 651 scr_page (UP, count);
635 } 652 }
636 else 653 else
637 { 654 {
638 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
639 { 656 {
640 int i = selection.beg.row; 657 if ((selection.beg.row < row1 && selection.end.row > row1)
641 int j = selection.end.row; 658 || (selection.beg.row < row2 && selection.end.row > row2)
642
643 if ((i < row1 && j > row1)
644 || (i < row2 && j > row2)
645 || (i - count < row1 && i >= row1) 659 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
646 || (i - count > row2 && i <= row2) 660 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
647 || (j - count < row1 && j >= row1) 661 || (selection.end.row - count < row1 && selection.end.row >= row1)
648 || (j - count > row2 && j <= row2)) 662 || (selection.end.row - count > row2 && selection.end.row <= row2))
649 { 663 {
650 CLEAR_ALL_SELECTION (); 664 CLEAR_ALL_SELECTION ();
651 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 665 selection.op = SELECTION_CLEAR;
652 } 666 }
653 else if (j >= row1 && j <= row2) 667 else if (selection.end.row >= row1 && selection.end.row <= row2)
654 { 668 {
655 /* move selected region too */ 669 /* move selected region too */
656 selection.beg.row -= count; 670 selection.beg.row -= count;
657 selection.end.row -= count; 671 selection.end.row -= count;
658 selection.mark.row -= count; 672 selection.mark.row -= count;
… …
686/* ------------------------------------------------------------------------- */ 700/* ------------------------------------------------------------------------- */
687/* 701/*
688 * Add text given in <str> of length <len> to screen struct 702 * Add text given in <str> of length <len> to screen struct
689 */ 703 */
690void 704void
691rxvt_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)
692{ 706{
693 if (len <= 0) /* sanity */ 707 if (len <= 0) /* sanity */
694 return; 708 return;
695 709
696 unsigned char checksel; 710 unsigned char checksel;
697 unicode_t c; 711 unicode_t c;
698 int row, last_col; 712 int ncol = this->ncol;
699 const unicode_t *strend = str + len; 713 const wchar_t *strend = str + len;
700 714
701 want_refresh = 1; 715 want_refresh = 1;
702 ZERO_SCROLLBACK (); 716 ZERO_SCROLLBACK ();
703 last_col = ncol;
704 717
705 if (nlines > 0) 718 if (minlines > 0)
706 { 719 {
707 nlines += screen.cur.row - screen.bscroll; 720 minlines += screen.cur.row - screen.bscroll;
721
708 if (nlines > 0 722 if (minlines > 0
709 && screen.tscroll == 0 723 && screen.tscroll == 0
710 && screen.bscroll == (nrow - 1)) 724 && screen.bscroll == nrow - 1)
711 { 725 {
712 /* _at least_ this many lines need to be scrolled */ 726 /* _at least_ this many lines need to be scrolled */
713 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 727 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
714 screen.cur.row -= nlines; 728 screen.cur.row -= minlines;
715 } 729 }
716 } 730 }
717 731
718#ifdef DEBUG_STRICT 732#ifdef DEBUG_STRICT
719 assert (screen.cur.col < last_col); 733 assert (screen.cur.col < ncol);
720 assert (screen.cur.row < nrow 734 assert (screen.cur.row < nrow
721 && screen.cur.row >= -nsaved); 735 && screen.cur.row >= -nsaved);
722#endif 736#endif
723 row = screen.cur.row; 737 int row = screen.cur.row;
724 738
725 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 739 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
726 740
727 line_t *line = &ROW(row); 741 line_t *line = &ROW(row);
728 742
729 while (str < strend) 743 while (str < strend)
730 { 744 {
731 c = *str++; 745 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
732 746
733 if (c < 0x20) 747 if (c < 0x20)
734 if (c == C0_LF) 748 if (c == C0_LF)
735 { 749 {
736 if (!line->is_longer ()) /* XXX: think about this */
737 max_it (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
738 751
739 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
740 753
741 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
742 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
746 line = &ROW(row); /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
747 continue; 760 continue;
748 } 761 }
749 else if (c == C0_CR) 762 else if (c == C0_CR)
750 { 763 {
751 if (!line->is_longer ()) /* XXX: think about this */
752 max_it (line->l, screen.cur.col); 764 max_it (line->l, screen.cur.col);
753 765
754 screen.flags &= ~Screen_WrapNext; 766 screen.flags &= ~Screen_WrapNext;
755 screen.cur.col = 0; 767 screen.cur.col = 0;
756 continue; 768 continue;
757 } 769 }
… …
774 CLEAR_SELECTION (); 786 CLEAR_SELECTION ();
775 } 787 }
776 788
777 if (screen.flags & Screen_WrapNext) 789 if (screen.flags & Screen_WrapNext)
778 { 790 {
791 max_it (line->l, ncol);
779 line->set_is_longer (); 792 line->is_longer (1);
780 793
781 scr_do_wrap (); 794 scr_do_wrap ();
782 795
783 row = screen.cur.row; 796 row = screen.cur.row;
784 line = &ROW(row); /* _must_ refresh */ 797 line = &ROW(row); /* _must_ refresh */
… …
792 // do wcwidth before further replacements, as wcwidth might return -1 805 // do wcwidth before further replacements, as wcwidth might return -1
793 // 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
794 // locale. 807 // locale.
795 int width = c < 0x100 ? 1 : wcwidth (c); 808 int width = c < 0x100 ? 1 : wcwidth (c);
796 809
797 if (charsets[screen.charset] == '0') // DEC SPECIAL 810 if (charsets [screen.charset] == '0') // DEC SPECIAL
798 { 811 {
799 // vt100 special graphics and line drawing 812 // vt100 special graphics and line drawing
800 // 5f-7e standard vt100 813 // 5f-7e standard vt100
801 // 40-5e rxvt extension for extra curses acs chars 814 // 40-5e rxvt extension for extra curses acs chars
802 static uint16_t vt100_0[62] = { // 41 .. 7e 815 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
854 } 867 }
855 868
856 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
857 870
858 // if the character doesn't fit into the remaining columns... 871 // if the character doesn't fit into the remaining columns...
859 if (screen.cur.col > last_col - width && last_col >= width) 872 if (screen.cur.col > ncol - width && ncol >= width)
860 { 873 {
861 // ...output spaces 874 // ...output spaces
862 c = ' '; 875 c = ' ';
863 // and try the same character next loop iteration 876 // and try the same character next loop iteration
864 --str; 877 --str;
865 } 878 }
866 879
880 line->touch ();
881
867 do 882 do
868 { 883 {
869 line->t[screen.cur.col] = c; 884 line->t[screen.cur.col] = c;
870 line->r[screen.cur.col] = rend; 885 line->r[screen.cur.col] = rend;
871 886
872 if (screen.cur.col < last_col - 1) 887 if (screen.cur.col < ncol - 1)
873 screen.cur.col++; 888 screen.cur.col++;
874 else 889 else
875 { 890 {
876 line->l = last_col; 891 line->l = ncol;
877 if (screen.flags & Screen_Autowrap) 892 if (screen.flags & Screen_Autowrap)
878 screen.flags |= Screen_WrapNext; 893 screen.flags |= Screen_WrapNext;
879 break; 894 break;
880 } 895 }
881 896
… …
883 } 898 }
884 while (--width > 0); 899 while (--width > 0);
885 900
886 // pad with spaces when overwriting wide character with smaller one 901 // pad with spaces when overwriting wide character with smaller one
887 if (!width) 902 if (!width)
903 {
904 line->touch ();
905
888 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++)
889 { 907 {
890 line->t[c] = ' '; 908 line->t[c] = ' ';
891 line->r[c] = rend; 909 line->r[c] = rend;
892 } 910 }
911 }
893 } 912 }
894 else // width == 0 913 else // width == 0
895 { 914 {
896#if ENABLE_COMBINING 915#if ENABLE_COMBINING
897 // handle combining characters 916 // handle combining characters
898 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
899 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
900 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
920 line_t *linep;
901 text_t *tp; 921 text_t *tp;
902 rend_t *rp; 922 rend_t *rp;
903 923
904 if (screen.cur.col > 0) 924 if (screen.cur.col > 0)
905 { 925 {
926 linep = line;
906 tp = line->t + screen.cur.col - 1; 927 tp = line->t + screen.cur.col - 1;
907 rp = line->r + screen.cur.col - 1; 928 rp = line->r + screen.cur.col - 1;
908
909 while (*tp == NOCHAR && tp > line->t)
910 tp--, rp--;
911 } 929 }
912 else if (screen.cur.row > 0 930 else if (screen.cur.row > 0
913 && ROW(screen.cur.row - 1).is_longer ()) 931 && ROW(screen.cur.row - 1).is_longer ())
914 { 932 {
915 line_t *line = &ROW(screen.cur.row - 1); 933 linep = &ROW(screen.cur.row - 1);
916
917 tp = line->t + last_col - 1; 934 tp = line->t + ncol - 1;
918 rp = line->r + last_col - 1; 935 rp = line->r + ncol - 1;
919
920 while (*tp == NOCHAR && tp > line->t)
921 tp--, rp--;
922 } 936 }
923 else 937 else
924 continue; 938 continue;
939
940 linep->touch ();
941
942 while (*tp == NOCHAR && tp > linep->t)
943 tp--, rp--;
925 944
926 // first try to find a precomposed character 945 // first try to find a precomposed character
927 unicode_t n = rxvt_compose (*tp, c); 946 unicode_t n = rxvt_compose (*tp, c);
928 if (n == NOCHAR) 947 if (n == NOCHAR)
929 n = rxvt_composite.compose (*tp, c); 948 n = rxvt_composite.compose (*tp, c);
… …
932 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
933#endif 952#endif
934 } 953 }
935 } 954 }
936 955
937 if (!line->is_longer ()) /* XXX: think about this */
938 max_it (line->l, screen.cur.col); 956 max_it (line->l, screen.cur.col);
939 957
940#ifdef DEBUG_STRICT 958#ifdef DEBUG_STRICT
941 assert (screen.cur.row >= 0); 959 assert (screen.cur.row >= 0);
942#endif 960#endif
943} 961}
… …
985 1003
986 if (count == 0) 1004 if (count == 0)
987 return; 1005 return;
988 else if (count > 0) 1006 else if (count > 0)
989 { 1007 {
990 int row = screen.cur.row;
991
992 line_t &l = ROW(row); 1008 line_t &l = ROW(screen.cur.row);
993 rend_t base_rend = l.r[i]; 1009 rend_t base_rend = l.r[i];
994 ht &= l.t[i] == ' '; 1010 ht &= l.t[i] == ' ';
995 1011
996 for (; ++i < ncol; ) 1012 for (; ++i < ncol; )
997 if (tabs[i]) 1013 if (tabs[i])
998 { 1014 {
999 x = i; 1015 x = i;
1016
1000 if (!--count) 1017 if (!--count)
1001 break; 1018 break;
1002 } 1019 }
1003 else 1020 else
1004 ht &= l.t[i] == ' ' 1021 ht &= l.t[i] == ' '
… …
1007 if (count) 1024 if (count)
1008 x = ncol - 1; 1025 x = ncol - 1;
1009 1026
1010 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1011 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1012 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1013 { 1030 {
1014 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1015 1032
1016 if (!l.is_longer ()) /* XXX: think about this */ 1033 l.touch (x);
1017 max_it (l.l, x);
1018 1034
1019 i = screen.cur.col; 1035 i = screen.cur.col;
1020 1036
1021 l.t[i] = '\t'; 1037 l.t[i] = '\t';
1022 l.r[i] = base_rend; 1038 l.r[i] = base_rend;
… …
1072 */ 1088 */
1073#if ENABLE_FRILLS 1089#if ENABLE_FRILLS
1074void 1090void
1075rxvt_term::scr_forwardindex () 1091rxvt_term::scr_forwardindex ()
1076{ 1092{
1077 int row;
1078
1079 if (screen.cur.col < ncol - 1) 1093 if (screen.cur.col < ncol - 1)
1080 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1081 else 1095 else
1082 { 1096 {
1083 row = screen.cur.row; 1097 line_t &l = ROW(screen.cur.row);
1084 1098
1085 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1099 l.touch ();
1086 ROW(row).l = ncol; 1100 l.is_longer (0);
1087 1101
1088 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1089 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1090 scr_gotorc (0, ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1091 } 1105 }
… …
1174 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1175 */ 1189 */
1176void 1190void
1177rxvt_term::scr_erase_line (int mode) 1191rxvt_term::scr_erase_line (int mode)
1178{ 1192{
1179 unsigned int row, col, num; 1193 unsigned int col, num;
1180 1194
1181 want_refresh = 1; 1195 want_refresh = 1;
1182 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1183 1197
1184 selection_check (1); 1198 selection_check (1);
1185 1199
1186 row = screen.cur.row; 1200 line_t &line = ROW(screen.cur.row);
1201
1202 line.touch ();
1203 line.is_longer (0);
1187 1204
1188 switch (mode) 1205 switch (mode)
1189 { 1206 {
1190 case 0: /* erase to end of line */ 1207 case 0: /* erase to end of line */
1191 col = screen.cur.col; 1208 col = screen.cur.col;
1192 num = ncol - col; 1209 num = ncol - col;
1193 min_it (ROW(row).l, col); 1210 min_it (line.l, col);
1194 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1211 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1195 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1212 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1196 CLEAR_SELECTION (); 1213 CLEAR_SELECTION ();
1197 break; 1214 break;
1198 case 1: /* erase to beginning of line */ 1215 case 1: /* erase to beginning of line */
… …
1203 CLEAR_SELECTION (); 1220 CLEAR_SELECTION ();
1204 break; 1221 break;
1205 case 2: /* erase whole line */ 1222 case 2: /* erase whole line */
1206 col = 0; 1223 col = 0;
1207 num = ncol; 1224 num = ncol;
1208 ROW(row).l = 0; 1225 line.l = 0;
1209 if (selection.beg.row <= screen.cur.row 1226 if (selection.beg.row <= screen.cur.row
1210 && selection.end.row >= screen.cur.row) 1227 && selection.end.row >= screen.cur.row)
1211 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1212 break; 1229 break;
1213 default: 1230 default:
1214 return; 1231 return;
1215 } 1232 }
1216 1233
1217 scr_blank_line (ROW(row), col, num, rstyle); 1234 scr_blank_line (line, col, num, rstyle);
1218} 1235}
1219 1236
1220/* ------------------------------------------------------------------------- */ 1237/* ------------------------------------------------------------------------- */
1221/* 1238/*
1222 * Erase part of whole of the screen 1239 * Erase part of whole of the screen
… …
1277 CLEAR_ROWS (row, num); 1294 CLEAR_ROWS (row, num);
1278 } 1295 }
1279 else 1296 else
1280 { 1297 {
1281 ren = rstyle & (RS_fgMask | RS_bgMask); 1298 ren = rstyle & (RS_fgMask | RS_bgMask);
1282 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1283 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1300 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1284 ERASE_ROWS (row, num); 1301 ERASE_ROWS (row, num);
1285 gcvalue.foreground = pix_colors[Color_fg]; 1302 gcvalue.foreground = pix_colors[Color_fg];
1286 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1303 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1287 } 1304 }
1288 1305
1289 for (; num--; row++) 1306 for (; num--; row++)
1290 { 1307 {
1291 scr_blank_screen_mem (ROW (row), rstyle); 1308 scr_blank_screen_mem (ROW(row), rstyle);
1292 ROW (row).l = 0;
1293 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1309 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1294 } 1310 }
1295} 1311}
1296 1312
1297#if ENABLE_FRILLS 1313#if ENABLE_FRILLS
… …
1330 rend_t *r1 = line.r; 1346 rend_t *r1 = line.r;
1331 1347
1332 for (int j = ncol; j--; ) 1348 for (int j = ncol; j--; )
1333 *r1++ = fs; 1349 *r1++ = fs;
1334 1350
1335 line.l = ncol; /* make the `E's selectable */ 1351 line.is_longer (0);
1352 line.touch (ncol);
1336 } 1353 }
1337} 1354}
1338 1355
1339/* ------------------------------------------------------------------------- */ 1356/* ------------------------------------------------------------------------- */
1340/* 1357/*
… …
1388 min_it (count, ncol - screen.cur.col); 1405 min_it (count, ncol - screen.cur.col);
1389 1406
1390 row = screen.cur.row; 1407 row = screen.cur.row;
1391 1408
1392 line_t *line = &ROW(row); 1409 line_t *line = &ROW(row);
1410
1411 line->touch ();
1412 line->is_longer (0);
1393 1413
1394 switch (insdel) 1414 switch (insdel)
1395 { 1415 {
1396 case INSERT: 1416 case INSERT:
1397 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1417 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1398 { 1418 {
1399 line->t[col] = line->t[col - count]; 1419 line->t[col] = line->t[col - count];
1400 line->r[col] = line->r[col - count]; 1420 line->r[col] = line->r[col - count];
1401 } 1421 }
1402 1422
1403 if (!line->is_longer ()) 1423 line->l = min (line->l + count, ncol);
1404 {
1405 line->l += count;
1406 min_it (line->l, ncol);
1407 }
1408 1424
1409 if (selection.op && current_screen == selection.screen 1425 if (selection.op && current_screen == selection.screen
1410 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1426 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1411 { 1427 {
1412 if (selection.end.row != screen.cur.row 1428 if (selection.end.row != screen.cur.row
… …
1425 1441
1426 case ERASE: 1442 case ERASE:
1427 screen.cur.col += count; /* don't worry if > ncol */ 1443 screen.cur.col += count; /* don't worry if > ncol */
1428 selection_check (1); 1444 selection_check (1);
1429 screen.cur.col -= count; 1445 screen.cur.col -= count;
1446
1447 line->l = max (line->l - count, 0);
1430 scr_blank_line (*line, screen.cur.col, count, rstyle); 1448 scr_blank_line (*line, screen.cur.col, count, rstyle);
1431 break; 1449 break;
1432 1450
1433 case DELETE: 1451 case DELETE:
1434 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1452 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1437 { 1455 {
1438 line->t[col] = line->t[col + count]; 1456 line->t[col] = line->t[col + count];
1439 line->r[col] = line->r[col + count]; 1457 line->r[col] = line->r[col + count];
1440 } 1458 }
1441 1459
1460 line->l = max (line->l - count, 0);
1442 scr_blank_line (*line, ncol - count, count, tr); 1461 scr_blank_line (*line, ncol - count, count, tr);
1443
1444 if (line->is_longer ()) /* break line continuation */
1445 line->l = ncol;
1446
1447 line->l = max (line->l - count, 0);
1448 1462
1449 if (selection.op && current_screen == selection.screen 1463 if (selection.op && current_screen == selection.screen
1450 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1451 { 1465 {
1452 if (selection.end.row != screen.cur.row 1466 if (selection.end.row != screen.cur.row
… …
1564rxvt_term::scr_set_tab (int mode) 1578rxvt_term::scr_set_tab (int mode)
1565{ 1579{
1566 if (mode < 0) 1580 if (mode < 0)
1567 memset (tabs, 0, ncol * sizeof (char)); 1581 memset (tabs, 0, ncol * sizeof (char));
1568 else if (screen.cur.col < ncol) 1582 else if (screen.cur.col < ncol)
1569 tabs[screen.cur.col] = (mode ? 1 : 0); 1583 tabs [screen.cur.col] = !!mode;
1570} 1584}
1571 1585
1572/* ------------------------------------------------------------------------- */ 1586/* ------------------------------------------------------------------------- */
1573/* 1587/*
1574 * Set reverse/normal video 1588 * Set reverse/normal video
… …
1586 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1587#if XPM_BACKGROUND 1601#if XPM_BACKGROUND
1588 if (bgPixmap.pixmap == None) 1602 if (bgPixmap.pixmap == None)
1589#endif 1603#endif
1590#if TRANSPARENT 1604#if TRANSPARENT
1591 if (! (options & Opt_transparent) || am_transparent == 0) 1605 if (! OPTION (Opt_transparent) || am_transparent == 0)
1592#endif 1606#endif
1593 XSetWindowBackground (display->display, vt, 1607 XSetWindowBackground (display->display, vt,
1594 pix_colors[Color_bg]); 1608 pix_colors[Color_bg]);
1595 1609
1596 gcvalue.foreground = pix_colors[Color_fg]; 1610 gcvalue.foreground = pix_colors[Color_fg];
… …
1621 * Set font style 1635 * Set font style
1622 */ 1636 */
1623void 1637void
1624rxvt_term::set_font_style () 1638rxvt_term::set_font_style ()
1625{ 1639{
1640#if 0
1626 switch (charsets[screen.charset]) 1641 switch (charsets [screen.charset])
1627 { 1642 {
1628 case '0': /* DEC Special Character & Line Drawing Set */ 1643 case '0': /* DEC Special Character & Line Drawing Set */
1629 break; 1644 break;
1630 case 'A': /* United Kingdom (UK) */ 1645 case 'A': /* United Kingdom (UK) */
1631 break; 1646 break;
… …
1638 case 'C': /* Finnish character set */ 1653 case 'C': /* Finnish character set */
1639 break; 1654 break;
1640 case 'K': /* German character set */ 1655 case 'K': /* German character set */
1641 break; 1656 break;
1642 } 1657 }
1658#endif
1643} 1659}
1644 1660
1645/* ------------------------------------------------------------------------- */ 1661/* ------------------------------------------------------------------------- */
1646/* 1662/*
1647 * Choose a font 1663 * Choose a font
… …
1814int 1830int
1815rxvt_term::scr_changeview (unsigned int oldviewstart) 1831rxvt_term::scr_changeview (unsigned int oldviewstart)
1816{ 1832{
1817 if (view_start != oldviewstart) 1833 if (view_start != oldviewstart)
1818 { 1834 {
1835 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1836
1819 want_refresh = 1; 1837 want_refresh = 1;
1820 num_scr -= (view_start - oldviewstart); 1838 num_scr -= (view_start - oldviewstart);
1821 } 1839 }
1822 1840
1823 return (int) (view_start - oldviewstart); 1841 return (int)view_start - (int)oldviewstart;
1824} 1842}
1825 1843
1826/* ------------------------------------------------------------------------- */ 1844/* ------------------------------------------------------------------------- */
1827void 1845void
1828rxvt_term::scr_bell () 1846rxvt_term::scr_bell ()
1829{ 1847{
1830#ifndef NO_BELL 1848#ifndef NO_BELL
1831 1849
1832# ifndef NO_MAPALERT 1850# ifndef NO_MAPALERT
1833# ifdef MAPALERT_OPTION 1851# ifdef MAPALERT_OPTION
1834 if (options & Opt_mapAlert) 1852 if (OPTION (Opt_mapAlert))
1835# endif 1853# endif
1836 XMapWindow (display->display, parent[0]); 1854 XMapWindow (display->display, parent[0]);
1837# endif 1855# endif
1838 1856
1839 if (options & Opt_visualBell) 1857 if (OPTION (Opt_visualBell))
1840 { 1858 {
1841 scr_rvideo_mode (!rvideo); /* refresh also done */ 1859 scr_rvideo_mode (!rvideo); /* refresh also done */
1842 rxvt_usleep (VISUAL_BELL_DURATION); 1860 rxvt_usleep (VISUAL_BELL_DURATION);
1843 scr_rvideo_mode (!rvideo); /* refresh also done */ 1861 scr_rvideo_mode (!rvideo); /* refresh also done */
1844 } 1862 }
… …
1935 1953
1936#if XPM_BACKGROUND 1954#if XPM_BACKGROUND
1937 must_clear |= bgPixmap.pixmap != None; 1955 must_clear |= bgPixmap.pixmap != None;
1938#endif 1956#endif
1939#if TRANSPARENT 1957#if TRANSPARENT
1940 must_clear |= (options & Opt_transparent) && am_transparent; 1958 must_clear |= OPTION (Opt_transparent) && am_transparent;
1941#endif 1959#endif
1942 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1960 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1943 1961
1944 /* 1962 /*
1945 * B: reverse any characters which are selected 1963 * B: reverse any characters which are selected
… …
1969 1987
1970 crp = &ROW(screen.cur.row).r[col]; 1988 crp = &ROW(screen.cur.row).r[col];
1971 1989
1972 if (showcursor && focus) 1990 if (showcursor && focus)
1973 { 1991 {
1974 if (options & Opt_cursorUnderline) 1992 if (OPTION (Opt_cursorUnderline))
1975 *crp ^= RS_Uline; 1993 *crp ^= RS_Uline;
1976 else 1994 else
1977 { 1995 {
1978 *crp ^= RS_RVid; 1996 *crp ^= RS_RVid;
1979 1997
… …
1981 cc1 = *crp & (RS_fgMask | RS_bgMask); 1999 cc1 = *crp & (RS_fgMask | RS_bgMask);
1982 if (ISSET_PIXCOLOR (Color_cursor)) 2000 if (ISSET_PIXCOLOR (Color_cursor))
1983 ccol1 = Color_cursor; 2001 ccol1 = Color_cursor;
1984 else 2002 else
1985#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2003#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1986 ccol1 = GET_FGCOLOR (rstyle); 2004 ccol1 = fgcolor_of (rstyle);
1987#else 2005#else
1988 ccol1 = Color_fg; 2006 ccol1 = Color_fg;
1989#endif 2007#endif
1990 if (ISSET_PIXCOLOR (Color_cursor2)) 2008 if (ISSET_PIXCOLOR (Color_cursor2))
1991 ccol2 = Color_cursor2; 2009 ccol2 = Color_cursor2;
1992 else 2010 else
1993#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1994 ccol2 = GET_BGCOLOR (rstyle); 2012 ccol2 = bgcolor_of (rstyle);
1995#else 2013#else
1996 ccol2 = Color_bg; 2014 ccol2 = Color_bg;
1997#endif 2015#endif
1998 *crp = SET_FGCOLOR (*crp, ccol1); 2016 *crp = SET_FGCOLOR (*crp, ccol1);
1999 *crp = SET_BGCOLOR (*crp, ccol2); 2017 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2032 oldcursor.col = screen.cur.col; 2050 oldcursor.col = screen.cur.col;
2033 } 2051 }
2034 } 2052 }
2035 } 2053 }
2036 2054
2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2037#if ENABLE_OVERLAY 2056#if ENABLE_OVERLAY
2038 scr_swap_overlay (); 2057 scr_swap_overlay ();
2039#endif 2058#endif
2040 2059
2041#ifndef NO_SLOW_LINK_SUPPORT 2060#ifndef NO_SLOW_LINK_SUPPORT
… …
2091 if (wlen < len) 2110 if (wlen < len)
2092 ::swap (wlen, len); 2111 ::swap (wlen, len);
2093 2112
2094 XCopyArea (display->display, vt, vt, 2113 XCopyArea (display->display, vt, vt,
2095 gc, 0, Row2Pixel (len + i), 2114 gc, 0, Row2Pixel (len + i),
2096 (unsigned int)TermWin_TotalWidth (), 2115 (unsigned int)this->width,
2097 (unsigned int)Height2Pixel (wlen - len + 1), 2116 (unsigned int)Height2Pixel (wlen - len + 1),
2098 0, Row2Pixel (len)); 2117 0, Row2Pixel (len));
2099 len = -1; 2118 len = -1;
2100 } 2119 }
2101 } 2120 }
… …
2180 count++, i--; 2199 count++, i--;
2181 2200
2182 /* 2201 /*
2183 * Determine the attributes for the string 2202 * Determine the attributes for the string
2184 */ 2203 */
2185 int fore = GET_FGCOLOR (rend); // desired foreground 2204 int fore = fgcolor_of (rend); // desired foreground
2186 int back = GET_BGCOLOR (rend); // desired background 2205 int back = bgcolor_of (rend); // desired background
2187 2206
2188 // only do special processing if any attributes are set, which is rare 2207 // only do special processing if any attributes are set, which is unlikely
2189 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2208 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2190 { 2209 {
2191#if ENABLE_STYLES 2210#if ENABLE_STYLES
2192 // force redraw after "careful" characters to avoid pixel droppings 2211 // force redraw after "careful" characters to avoid pixel droppings
2193 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2212 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2304 } /* for (row....) */ 2323 } /* for (row....) */
2305 2324
2306#if ENABLE_OVERLAY 2325#if ENABLE_OVERLAY
2307 scr_swap_overlay (); 2326 scr_swap_overlay ();
2308#endif 2327#endif
2328 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2309 2329
2310 /* 2330 /*
2311 * G: cleanup cursor and display outline cursor if necessary 2331 * G: cleanup cursor and display outline cursor if necessary
2312 */ 2332 */
2313 if (showcursor) 2333 if (showcursor)
2314 { 2334 {
2315 if (focus) 2335 if (focus)
2316 { 2336 {
2317 if (options & Opt_cursorUnderline) 2337 if (OPTION (Opt_cursorUnderline))
2318 *crp ^= RS_Uline; 2338 *crp ^= RS_Uline;
2319 else 2339 else
2320 { 2340 {
2321 *crp ^= RS_RVid; 2341 *crp ^= RS_RVid;
2322#ifndef NO_CURSORCOLOR 2342#ifndef NO_CURSORCOLOR
… …
2360 num_scr = 0; 2380 num_scr = 0;
2361 num_scr_allow = 1; 2381 num_scr_allow = 1;
2362} 2382}
2363 2383
2364void 2384void
2365rxvt_term::scr_remap_chars (const line_t &l) 2385rxvt_term::scr_remap_chars (line_t &l)
2366{ 2386{
2367 if (!l.t) 2387 if (!l.t)
2368 return; 2388 return;
2389
2390 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2369 2391
2370 for (int i = ncol; i--; ) 2392 for (int i = ncol; i--; )
2371 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]));
2372} 2394}
2373 2395
… …
2441 2463
2442#if ENABLE_FRILLS 2464#if ENABLE_FRILLS
2443 if (selection.rect) 2465 if (selection.rect)
2444 { 2466 {
2445 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2467 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2468 {
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2471
2446 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2472 for (col = selection.beg.col; col < selection.end.col; col++)
2447 srp[col] ^= RS_RVid; 2473 srp[col] ^= RS_RVid;
2474
2475 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= RS_RVid | RS_Uline;
2477
2478 if (++col < selection.end.col)
2479 srp[col] ^= RS_RVid | RS_Uline;
2480 }
2448 } 2481 }
2449 else 2482 else
2450#endif 2483#endif
2451 { 2484 {
2452 if (selection.beg.row >= -view_start) 2485 if (selection.beg.row >= -view_start)
… …
2455 row = selection.beg.row; 2488 row = selection.beg.row;
2456 } 2489 }
2457 else 2490 else
2458 { 2491 {
2459 col = 0; 2492 col = 0;
2460 row = view_start; 2493 row = -view_start;
2461 } 2494 }
2462 2495
2463 for (; row < min (selection.end.row, view_end); row++, col = 0) 2496 for (; row < min (selection.end.row, view_end); row++, col = 0)
2464 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2465 srp[col] ^= RS_RVid; 2498 srp[col] ^= RS_RVid;
… …
2536/* ------------------------------------------------------------------------- */ 2569/* ------------------------------------------------------------------------- */
2537/* 2570/*
2538 * Paste a selection direct to the command fd 2571 * Paste a selection direct to the command fd
2539 */ 2572 */
2540void 2573void
2541rxvt_term::paste (unsigned char *data, unsigned int len) 2574rxvt_term::paste (char *data, unsigned int len)
2542{ 2575{
2543 /* convert normal newline chars into common keyboard Return key sequence */ 2576 /* convert normal newline chars into common keyboard Return key sequence */
2544 for (unsigned int i = 0; i < len; i++) 2577 for (unsigned int i = 0; i < len; i++)
2545 if (data[i] == C0_LF) 2578 if (data[i] == C0_LF)
2546 data[i] = C0_CR; 2579 data[i] = C0_CR;
… …
2690 { 2723 {
2691 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2724 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2692 char *s = rxvt_wcstombs (w); 2725 char *s = rxvt_wcstombs (w);
2693 free (w); 2726 free (w);
2694 // TODO: strlen == only the first element will be converted. well... 2727 // TODO: strlen == only the first element will be converted. well...
2695 paste ((unsigned char *)s, strlen (s)); 2728 paste (s, strlen (s));
2696 free (s); 2729 free (s);
2697 } 2730 }
2698 else 2731 else
2699#endif 2732#endif
2700 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2733 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2701 && cl) 2734 && cl)
2702 { 2735 {
2703 for (int i = 0; i < cr; i++) 2736 for (int i = 0; i < cr; i++)
2704 paste ((unsigned char *)cl[i], strlen (cl[i])); 2737 paste (cl[i], strlen (cl[i]));
2705 2738
2706 XFreeStringList (cl); 2739 XFreeStringList (cl);
2707 } 2740 }
2708 else 2741 else
2709 paste (ct.value, ct.nitems); // paste raw 2742 paste ((char *)ct.value, ct.nitems); // paste raw
2710 2743
2711bailout: 2744bailout:
2712 XFree (ct.value); 2745 XFree (ct.value);
2713 2746
2714 if (selection_wait == Sel_normal) 2747 if (selection_wait == Sel_normal)
… …
2752 return; /* outside window */ 2785 return; /* outside window */
2753 2786
2754 if (selection.text) 2787 if (selection.text)
2755 { /* internal selection */ 2788 { /* internal selection */
2756 char *str = rxvt_wcstombs (selection.text, selection.len); 2789 char *str = rxvt_wcstombs (selection.text, selection.len);
2757 paste ((unsigned char *)str, strlen (str)); 2790 paste (str, strlen (str));
2758 free (str); 2791 free (str);
2759 return; 2792 return;
2760 } 2793 }
2761 else 2794 else
2762 { 2795 {
… …
2854 selection.op = SELECTION_DONE; 2887 selection.op = SELECTION_DONE;
2855 2888
2856 if (selection.clicks == 4) 2889 if (selection.clicks == 4)
2857 return; /* nothing selected, go away */ 2890 return; /* nothing selected, go away */
2858 2891
2892 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2893 return;
2894
2859 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2895 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2860 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));
2861 2897
2862 int ofs = 0; 2898 int ofs = 0;
2863 int extra = 0; 2899 int extra = 0;
… …
2875 col = selection.beg.col; 2911 col = selection.beg.col;
2876 end_col = ncol + 1; 2912 end_col = ncol + 1;
2877 } 2913 }
2878 else 2914 else
2879#endif 2915#endif
2880 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2916 end_col = ROW(row).l;
2881 2917
2882 col = max (col, 0); 2918 col = max (col, 0);
2883 2919
2884 if (row == selection.end.row || selection.rect) 2920 if (row == selection.end.row
2921#if ENABLE_FRILLS
2922 || selection.rect
2923#endif
2924 )
2885 end_col = min (end_col, selection.end.col); 2925 min_it (end_col, selection.end.col);
2886 2926
2887 t = ROW(row).t + col; 2927 t = ROW(row).t + col;
2928
2888 for (; col < end_col; col++) 2929 for (; col < end_col; col++)
2889 { 2930 {
2890 if (*t == NOCHAR) 2931 if (*t == NOCHAR)
2891 t++; 2932 t++;
2892#if ENABLE_COMBINING 2933#if ENABLE_COMBINING
… …
2908#endif 2949#endif
2909 else 2950 else
2910 new_selection_text[ofs++] = *t++; 2951 new_selection_text[ofs++] = *t++;
2911 } 2952 }
2912 2953
2954#if ENABLE_FRILLS
2955 if (selection.rect)
2956 {
2957 while (ofs
2958 && new_selection_text[ofs - 1] != C0_LF
2959 && unicode::is_space (new_selection_text[ofs - 1]))
2960 --ofs;
2961
2962 new_selection_text[ofs++] = C0_LF;
2963 }
2964 else
2965#endif
2913 if (!ROW(row).is_longer () && row != selection.end.row) 2966 if (!ROW(row).is_longer () && row != selection.end.row)
2914 new_selection_text[ofs++] = C0_LF; 2967 new_selection_text[ofs++] = C0_LF;
2915 } 2968 }
2916 2969
2917 if (end_col != selection.end.col) 2970 if (end_col != selection.end.col)
2918 new_selection_text[ofs++] = C0_LF; 2971 new_selection_text[ofs++] = C0_LF;
2919 2972
… …
2929 2982
2930 // 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
2931 selection.len = ofs; 2984 selection.len = ofs;
2932 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));
2933 2986
2987 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2988 return;
2989
2990 selection_grab (tm);
2991}
2992
2993bool
2994rxvt_term::selection_grab (Time tm)
2995{
2996 selection_time = tm;
2997
2934 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 2998 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2935 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 2999 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3000 {
2936 display->set_selection_owner (this); 3001 display->set_selection_owner (this);
3002 return true;
3003 }
2937 else 3004 else
2938 rxvt_warn ("can't get primary selection, ignoring.\n"); 3005 return false;
2939 3006
2940#if 0 3007#if 0
2941 XTextProperty ct; 3008 XTextProperty ct;
2942 3009
2943 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3010 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2944 { 3011 {
2945 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3012 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2946 XFree (ct.value); 3013 XFree (ct.value);
2947 } 3014 }
2948#endif 3015#endif
2949
2950 selection_time = tm;
2951} 3016}
2952 3017
2953/* ------------------------------------------------------------------------- */ 3018/* ------------------------------------------------------------------------- */
2954/* 3019/*
2955 * Mark or select text based upon number of clicks: 1, 2, or 3 3020 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3077 } 3142 }
3078 } 3143 }
3079 break; 3144 break;
3080 } 3145 }
3081 3146
3082Old_Word_Selection_You_Die:
3083 if (dirn == DN) 3147 if (dirn == DN)
3084 col++; /* put us on one past the end */ 3148 col++; /* put us on one past the end */
3085 3149
3086 /* Poke the values back in */ 3150 /* Poke the values back in */
3087 ret->row = row; 3151 ret->row = row;
… …
3264 else if (selection.clicks == 2) 3328 else if (selection.clicks == 2)
3265 { 3329 {
3266 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3330 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3267 selection.end.col--; 3331 selection.end.col--;
3268 3332
3333 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3334 {
3269 selection_delimit_word (UP, &selection.beg, &selection.beg); 3335 selection_delimit_word (UP, &selection.beg, &selection.beg);
3270 selection_delimit_word (DN, &selection.end, &selection.end); 3336 selection_delimit_word (DN, &selection.end, &selection.end);
3337 }
3271 } 3338 }
3272 else if (selection.clicks == 3) 3339 else if (selection.clicks == 3)
3273 { 3340 {
3274#if ENABLE_FRILLS 3341#if ENABLE_FRILLS
3275 if (options & Opt_tripleclickwords) 3342 if (OPTION (Opt_tripleclickwords))
3276 { 3343 {
3277 selection_delimit_word (UP, &selection.beg, &selection.beg); 3344 selection_delimit_word (UP, &selection.beg, &selection.beg);
3278 3345
3279 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3346 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3280 { 3347 {
… …
3341 { 3408 {
3342 stp = ROW(end_row).t; 3409 stp = ROW(end_row).t;
3343 3410
3344 while (--end_col >= 0) 3411 while (--end_col >= 0)
3345 { 3412 {
3346 if (stp[end_col] != ' ' 3413 if (stp[end_col] != NOCHAR
3347 && stp[end_col] != '\t' 3414 && !unicode::is_space (stp[end_col]))
3348 && stp[end_col] != NOCHAR)
3349 break; 3415 break;
3350 } 3416 }
3351 3417
3352 if (end_col >= 0 3418 if (end_col >= 0
3353 || !ROW(end_row - 1).is_longer ()) 3419 || !ROW(end_row - 1).is_longer ())
… …
3552 3618
3553#if ENABLE_OVERLAY 3619#if ENABLE_OVERLAY
3554void 3620void
3555rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3621rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3556{ 3622{
3557 if (nrow < 3 || ncol < 3) 3623 if (nrow < 1 || ncol < 1)
3558 return; 3624 return;
3559 3625
3560 want_refresh = 1; 3626 want_refresh = 1;
3561 3627
3562 scr_overlay_off (); 3628 scr_overlay_off ();
… …
3669 for (int y = ov_h; y--; ) 3735 for (int y = ov_h; y--; )
3670 { 3736 {
3671 text_t *t1 = ov_text[y]; 3737 text_t *t1 = ov_text[y];
3672 rend_t *r1 = ov_rend[y]; 3738 rend_t *r1 = ov_rend[y];
3673 3739
3674 text_t *t2 = ROW(y - view_start).t + ov_x; 3740 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3675 rend_t *r2 = ROW(y - view_start).r + ov_x; 3741 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3676 3742
3677 for (int x = ov_w; x--; ) 3743 for (int x = ov_w; x--; )
3678 { 3744 {
3679 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3745 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3680 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3746 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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