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.328 by root, Sun Mar 29 13:36:03 2009 UTC vs.
Revision 1.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
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-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
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.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
50 if (option (Opt_scrollTtyOutput)) \ 49 if (option (Opt_scrollTtyOutput)) \
51 view_start = 0 50 view_start = 0
52#define CLEAR_SELECTION() \ 51#define CLEAR_SELECTION() \
53 selection.beg.row = selection.beg.col \ 52 selection.beg.row = selection.beg.col \
54 = selection.end.row = selection.end.col = 0 53 = selection.end.row = selection.end.col = 0
55#define CLEAR_ALL_SELECTION() \ 54#define CLEAR_SELECTION_MARK() \
56 selection.beg.row = selection.beg.col \
57 = selection.mark.row = selection.mark.col \
58 = selection.end.row = selection.end.col = 0 55 selection.mark.row = selection.mark.col = 0
59 56
60#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 57#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
61 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 58 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
62#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 59#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
63 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 60 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
… …
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 144
145 l.touch ();
146
148 // found start, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
152 col++; 151 col++;
… …
158 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
159 158
160void 159void
161rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
162{ 161{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
163 view_start = 0; 166 view_start = 0;
164 num_scr = 0; 167 num_scr = 0;
165 168
166 if (ncol == 0) 169 if (ncol == 0)
167 ncol = 80; 170 ncol = 80;
… …
198 term_start = 0; 201 term_start = 0;
199 202
200 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202 205
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 209
207 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
208 { 211 {
… …
231 selection.text = NULL; 234 selection.text = NULL;
232 selection.len = 0; 235 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
235 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
236 } 241 }
237 else 242 else
238 { 243 {
239 /* 244 /*
240 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
268 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270 } 275 }
271 276
272 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
274 279
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
278 283
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 292
288 do 293 do
289 { 294 {
290 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 297 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 299
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 301 {
… …
397 } 400 }
398 401
399 free (tabs); 402 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
401 404
402 for (int col = ncol; --col; ) 405 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
404 407
405 CLEAR_ALL_SELECTION (); 408 CLEAR_SELECTION ();
409 CLEAR_SELECTION_MARK ();
406 410
407 prev_nrow = nrow; 411 prev_nrow = nrow;
408 prev_ncol = ncol; 412 prev_ncol = ncol;
409 413
410 tt_winch (); 414 tt_winch ();
… …
510 } 514 }
511 515
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 516 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 517 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 518 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 519 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 520 assert (s->cur.col >= 0);
518#endif
519} 521}
520 522
521void 523void
522rxvt_term::scr_swap_screen () 524rxvt_term::scr_swap_screen ()
523{ 525{
… …
548 want_refresh = 1; 550 want_refresh = 1;
549 view_start = 0; 551 view_start = 0;
550 552
551 selection_check (2); /* check for boundary cross */ 553 selection_check (2); /* check for boundary cross */
552 554
553 int i = current_screen; current_screen = scrn; scrn = i; 555 current_screen = scrn;
554 556
555#if NSCREENS 557#if NSCREENS
556 if (option (Opt_secondaryScreen)) 558 if (option (Opt_secondaryScreen))
557 { 559 {
558 num_scr = 0; 560 num_scr = 0;
… …
635 637
636 if (count > 0 638 if (count > 0
637 && row1 == 0 639 && row1 == 0
638 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 640 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
639 { 641 {
642 min_it (count, total_rows - (nrow - (row2 + 1)));
643
640 top_row = max (top_row - count, -saveLines); 644 top_row = max (top_row - count, -saveLines);
641
642 // scroll everything up 'count' lines
643 term_start = (term_start + count) % total_rows;
644 645
645 // sever bottommost line 646 // sever bottommost line
646 { 647 {
647 line_t &l = ROW(row2 - count); 648 line_t &l = ROW(row2);
648 l.is_longer (0); 649 l.is_longer (0);
649 l.touch (); 650 l.touch ();
650 } 651 }
651 652
653 // scroll everything up 'count' lines
654 term_start = (term_start + count) % total_rows;
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
652 // erase newly scrolled-in lines 668 // erase newly scrolled-in lines
653 for (int i = count; i--; ) 669 for (int i = count; i--; )
654 { 670 {
655 line_t &l = ROW(nrow - 1 - i); 671 line_t &l = ROW(row2 - i);
656 672
657 // optimize if already cleared, can be significant on slow machines 673 // optimise if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem 674 // could be rolled into scr_blank_screen_mem
659 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 675 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660 { 676 {
661 scr_blank_line (l, 0, l.l, rstyle); 677 scr_blank_line (l, 0, l.l, rstyle);
662 l.l = 0; 678 l.l = 0;
… …
664 } 680 }
665 else 681 else
666 scr_blank_screen_mem (l, rstyle); 682 scr_blank_screen_mem (l, rstyle);
667 } 683 }
668 684
669 // now copy lines below the scroll region bottom to the
670 // bottom of the screen again, so they look as if they
671 // hadn't moved.
672 for (int i = nrow; --i > row2; )
673 {
674 line_t &l1 = ROW(i - count);
675 line_t &l2 = ROW(i);
676
677 ::swap (l1, l2);
678 l2.touch ();
679 }
680
681 // move and/or clear selection, if any 685 // move and/or clear selection, if any
682 if (selection.op && current_screen == selection.screen) 686 if (selection.op && current_screen == selection.screen
687 && selection.beg.row <= row2)
683 { 688 {
684 selection.beg.row -= count; 689 selection.beg.row -= count;
685 selection.end.row -= count; 690 selection.end.row -= count;
686 selection.mark.row -= count; 691 selection.mark.row -= count;
687 692
688 if (selection.beg.row < top_row 693 selection_check (0);
689 || selection.end.row < top_row
690 || selection.mark.row < top_row)
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 } 694 }
696 695
697 // finally move the view window, if desired 696 // finally move the view window, if desired
698 if (option (Opt_scrollWithBuffer) 697 if (option (Opt_scrollWithBuffer)
699 && view_start != 0 698 && view_start != 0
… …
712 || (selection.beg.row - count < row1 && selection.beg.row >= row1) 711 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
713 || (selection.beg.row - count > row2 && selection.beg.row <= row2) 712 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
714 || (selection.end.row - count < row1 && selection.end.row >= row1) 713 || (selection.end.row - count < row1 && selection.end.row >= row1)
715 || (selection.end.row - count > row2 && selection.end.row <= row2)) 714 || (selection.end.row - count > row2 && selection.end.row <= row2))
716 { 715 {
717 CLEAR_ALL_SELECTION (); 716 CLEAR_SELECTION ();
718 selection.op = SELECTION_CLEAR; 717 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
718 CLEAR_SELECTION_MARK ();
719 } 719 }
720 else if (selection.end.row >= row1 && selection.end.row <= row2) 720 else if (selection.end.row >= row1 && selection.end.row <= row2)
721 { 721 {
722 /* move selected region too */ 722 /* move selected region too */
723 selection.beg.row -= count; 723 selection.beg.row -= count;
… …
729 } 729 }
730 730
731 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
732 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
733 733
734 // sever line above scroll region
735 if (row1)
736 {
737 line_t &l = ROW(row1 - 1);
738 l.is_longer (0);
739 l.touch ();
740 }
741
734 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
735 743
736 min_it (count, rows); 744 min_it (count, rows);
737 745
738 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
739 747
740 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
741 { 749 {
742 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
743 751
… …
745 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
746 } 754 }
747 755
748 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
749 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
758
759 // sever bottommost line
760 {
761 line_t &l = ROW(row2);
762 l.is_longer (0);
763 l.touch ();
764 }
750 } 765 }
751 766
752 return count; 767 return count;
753} 768}
754 769
… …
760rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
761{ 776{
762 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
763 return; 778 return;
764 779
765 unsigned char checksel; 780 bool checksel;
766 unicode_t c; 781 unicode_t c;
767 int ncol = this->ncol; 782 int ncol = this->ncol;
768 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
769 784
770 want_refresh = 1; 785 want_refresh = 1;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 798 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 799 screen.cur.row -= minlines;
785 } 800 }
786 } 801 }
787 802
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 803 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 804 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 805 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 806 int row = screen.cur.row;
794 807
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 808 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 809
797 line_t *line = &ROW(row); 810 line_t *line = &ROW(row);
798 811
799 while (str < strend) 812 while (str < strend)
800 { 813 {
801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
802 815
803 if (expect_false (c < 0x20)) 816 if (ecb_unlikely (c < 0x20))
804 if (c == C0_LF) 817 if (c == C0_LF)
805 { 818 {
806 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
807 820
808 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
… …
827 { 840 {
828 scr_tab (1, true); 841 scr_tab (1, true);
829 continue; 842 continue;
830 } 843 }
831 844
832 if (expect_false ( 845 if (ecb_unlikely (
833 checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
835 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 )) 849 ))
837 { 850 {
… …
842 * should be a similar check. 855 * should be a similar check.
843 */ 856 */
844 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
845 } 858 }
846 859
847 if (expect_false (screen.flags & Screen_WrapNext)) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
848 { 861 {
849 scr_do_wrap (); 862 scr_do_wrap ();
850 863
851 line->l = ncol; 864 line->l = ncol;
852 line->is_longer (1); 865 line->is_longer (1);
… …
854 row = screen.cur.row; 867 row = screen.cur.row;
855 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
856 } 869 }
857 870
858 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
860 c = 0xfffd; 873 c = 0xfffd;
861 874
862 // rely on wcwidth to tell us the character width, do wcwidth before 875 // rely on wcwidth to tell us the character width, do wcwidth before
863 // further replacements, as wcwidth might return -1 for the line 876 // further replacements, as wcwidth might return -1 for the line
864 // drawing characters below as they might be invalid in the current 877 // drawing characters below as they might be invalid in the current
865 // locale. 878 // locale.
866 int width = WCWIDTH (c); 879 int width = WCWIDTH (c);
867 880
868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
869 { 882 {
870 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
871 // 5f-7e standard vt100 884 // 5f-7e standard vt100
872 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
873 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
886 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
887 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
888 } 901 }
889 } 902 }
890 903
891 if (expect_false (screen.flags & Screen_Insert)) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
892 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
893 906
894 if (width != 0) 907 if (width != 0)
895 { 908 {
896#if !UNICODE_3 909#if !UNICODE_3
… …
901# else 914# else
902 c = 0xfffd; 915 c = 0xfffd;
903# endif 916# endif
904#endif 917#endif
905 918
919 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
920
921 // if the character doesn't fit into the remaining columns...
922 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
923 {
924 if (screen.flags & Screen_Autowrap)
925 {
926 // ... artificially enlargen the previous one
927 c = NOCHAR;
928 // and try the same character next loop iteration
929 --str;
930 }
931 else
932 screen.cur.col = ncol - width;
933 }
934
906 // nuke the character at this position, if required 935 // nuke the character at this position, if required
907 if (expect_false ( 936 // due to wonderful coincidences everywhere else in this loop
937 // we never have to check for overwriting a wide char itself,
938 // only its tail.
908 line->t[screen.cur.col] == NOCHAR 939 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col); 940 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 {
919 // ... artificially enlargen the previous one
920 c = NOCHAR;
921 // and try the same character next loop iteration
922 --str;
923 }
924 941
925 line->touch (); 942 line->touch ();
926 943
927 do 944 do
928 { 945 {
929 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
931 948
932 if (expect_true (screen.cur.col < ncol - 1)) 949 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 950 screen.cur.col++;
934 else 951 else
935 { 952 {
936 line->l = ncol; 953 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 955 screen.flags |= Screen_WrapNext;
939 break; 956
957 goto end_of_line;
940 } 958 }
941 959
942 c = NOCHAR; 960 c = NOCHAR;
943 } 961 }
944 while (expect_false (--width > 0)); 962 while (ecb_unlikely (--width > 0));
945 963
946 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 965 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 966 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 967 line->t[c] = ' ';
954 line->r[c] = rend; 968 line->r[c] = rend;
955 }
956 } 969 }
970
971end_of_line:
972 ;
957 } 973 }
958#if ENABLE_COMBINING 974#if ENABLE_COMBINING
959 else // width == 0 975 else // width == 0
960 { 976 {
961 if (c != 0xfeff) // ignore BOM 977 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1017#endif
1002 } 1018 }
1003 1019
1004 max_it (line->l, screen.cur.col); 1020 max_it (line->l, screen.cur.col);
1005 1021
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1022 assert (screen.cur.row >= 0);
1008#endif
1009} 1023}
1010 1024
1011/* ------------------------------------------------------------------------- */ 1025/* ------------------------------------------------------------------------- */
1012/* 1026/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1027 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1040
1027 want_refresh = 1; 1041 want_refresh = 1;
1028#endif 1042#endif
1029 } 1043 }
1030 } 1044 }
1045 else if (screen.flags & Screen_WrapNext)
1046 screen.flags &= ~Screen_WrapNext;
1031 else 1047 else
1032 scr_gotorc (0, -1, RELATIVE); 1048 scr_gotorc (0, -1, RELATIVE);
1033} 1049}
1034 1050
1035/* ------------------------------------------------------------------------- */ 1051/* ------------------------------------------------------------------------- */
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1357 if (row >= nrow) /* Out Of Bounds */
1342 return; 1358 return;
1343 1359
1344 min_it (num, nrow - row); 1360 min_it (num, nrow - row);
1345 1361
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1362 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1363 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1364 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1365 {
1353 ren = DEFAULT_RSTYLE; 1366 ren = DEFAULT_RSTYLE;
1354 1367
1355 if (mapped && !view_start) 1368 if (mapped)
1356 XClearArea (dpy, vt, 0, 1369 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1370 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False); 1371 (unsigned int)Height2Pixel (num), False);
1359 } 1372 }
1360 else 1373 else
1361 { 1374 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1375 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1376
1364 if (mapped && !view_start) 1377 if (mapped)
1365 { 1378 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1379 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1380 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1381 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1382 0, Row2Pixel (row - view_start),
… …
1376 1389
1377 for (; num--; row++) 1390 for (; num--; row++)
1378 { 1391 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1392 scr_blank_screen_mem (ROW(row), rstyle);
1380 1393
1381 if (!view_start) 1394 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1395 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1396 }
1384} 1397}
1385 1398
1386#if !ENABLE_MINIMAL 1399#if !ENABLE_MINIMAL
1387void 1400void
… …
1686 { 1699 {
1687 rvideo_state = on; 1700 rvideo_state = on;
1688 1701
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1702 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1703#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1704 if (bg_pixmap == None)
1692#endif 1705#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1706 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1707
1695 XGCValues gcvalue; 1708 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1709 gcvalue.foreground = pix_colors[Color_fg];
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1853 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1854 {
1842 min_it (rc[i].col, ncol - 1); 1855 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1856 min_it (rc[i].row, nrow - 1);
1844 } 1857 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1858
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1859 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1860 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1861
1849 num_scr_allow = 0; 1862 num_scr_allow = 0;
1850 1863
… …
1923 1936
1924# ifndef NO_MAPALERT 1937# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1938# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1939 if (option (Opt_mapAlert))
1927# endif 1940# endif
1928 XMapWindow (dpy, parent[0]); 1941 XMapWindow (dpy, parent);
1929# endif 1942# endif
1930 1943
1931# if ENABLE_FRILLS 1944# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1945 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1946 set_urgency (1);
… …
1941 1954
1942 bell_ev.start (VISUAL_BELL_DURATION); 1955 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1956 }
1944 else 1957 else
1945 XBell (dpy, 0); 1958 XBell (dpy, 0);
1959 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1960#endif
1947} 1961}
1948 1962
1949/* ------------------------------------------------------------------------- */ 1963/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */
1951void 1964void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1965rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1966{
1954#ifdef PRINTPIPE 1967#ifdef PRINTPIPE
1955 int nrows, row_start; 1968 int nrows, row_start;
… …
1969 row_start = view_start; 1982 row_start = view_start;
1970 } 1983 }
1971 1984
1972 wctomb (0, 0); 1985 wctomb (0, 0);
1973 1986
1974 for (int r1 = 0; r1 < nrows; r1++) 1987 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1988 {
1976 text_t *tp = ROW(r1).t; 1989 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1990 int len = ROW(r1).l;
1978 1991
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1992 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2029 * A: set up vars 2042 * A: set up vars
2030 */ 2043 */
2031 refresh_count = 0; 2044 refresh_count = 0;
2032 2045
2033 unsigned int old_screen_flags = screen.flags; 2046 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2047 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2048#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2049 have_bg = bg_pixmap != None;
2037#endif 2050#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2052
2040 /* 2053 /*
2041 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2059#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2060 scr_swap_overlay ();
2048#endif 2061#endif
2049 2062
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2063 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2064
2052 /* 2065 /*
2053 * C: set the cursor character (s) 2066 * C: set the cursor character (s)
2054 */ 2067 */
2055 { 2068 {
2056 unsigned char setoldcursor; 2069 bool setoldcursor;
2057 2070
2058#ifdef CURSOR_BLINK 2071#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2072 if (hidden_cursor)
2060 showcursor = 0; 2073 showcursor = 0;
2061#endif 2074#endif
… …
2090 ccol2 = bgcolor_of (rstyle); 2103 ccol2 = bgcolor_of (rstyle);
2091#else 2104#else
2092 ccol2 = Color_bg; 2105 ccol2 = Color_bg;
2093#endif 2106#endif
2094 2107
2095 if (showcursor && focus) 2108 if (focus)
2096 { 2109 {
2097 if (option (Opt_cursorUnderline)) 2110 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2111 *crp ^= RS_Uline;
2099 else 2112 else
2100 { 2113 {
… …
2233 continue; 2246 continue;
2234 2247
2235 // redraw one or more characters 2248 // redraw one or more characters
2236 2249
2237 // seek to the beginning of wide characters 2250 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2251 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2252 --col;
2240 2253
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2255 text_t *text = stp + col;
2243 int count = 1; 2256 int count = 1;
2244 2257
2245 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2246 drp[col] = rend; 2259 drp[col] = rend;
… …
2281 2294
2282 col--; /* went one too far. move back */ 2295 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2296 count -= i; /* dump any matching trailing chars */
2284 2297
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2298 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2299 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2300 count++, i--;
2288 2301
2289 /* 2302 /*
2290 * Determine the attributes for the string 2303 * Determine the attributes for the string
2291 */ 2304 */
2292 int fore = fgcolor_of (rend); // desired foreground 2305 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2306 int back = bgcolor_of (rend); // desired background
2294 2307
2295 // only do special processing if any attributes are set, which is unlikely 2308 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2309 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2310 {
2298 bool invert = rend & RS_RVid; 2311 bool invert = rend & RS_RVid;
2299 2312
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2314 if (rend & RS_Bold && fore == Color_fg)
… …
2320 2333
2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2334 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2322 fore = Color_UL; 2335 fore = Color_UL;
2323#endif 2336#endif
2324 2337
2338#ifdef OPTION_HC
2339 if (rend & RS_Sel)
2340 {
2341 /* invert the column if no highlightColor is set or it is the
2342 * current cursor column */
2343 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2344 && ISSET_PIXCOLOR (Color_HC))
2345 {
2346 if (ISSET_PIXCOLOR (Color_HTC))
2347 fore = Color_HTC;
2348 // if invert is 0 reverse video is set so we use bg color as fg color
2349 else if (!invert)
2350 fore = back;
2351
2352 back = Color_HC;
2353 invert = 0;
2354 }
2355 }
2356#endif
2357
2325 if (invert) 2358 if (invert)
2326 { 2359 {
2327#ifdef OPTION_HC
2328 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 || !ISSET_PIXCOLOR (Color_HC))
2330#endif
2331 /* invert the column if no highlightColor is set or it is the
2332 * current cursor column */
2333 ::swap (fore, back); 2360 ::swap (fore, back);
2334#ifdef OPTION_HC
2335 else if (ISSET_PIXCOLOR (Color_HC))
2336 back = Color_HC;
2337#endif
2338 2361
2339#ifndef NO_BOLD_UNDERLINE_REVERSE 2362#ifndef NO_BOLD_UNDERLINE_REVERSE
2340# ifndef OPTION_HC
2341 if (ISSET_PIXCOLOR (Color_RV))
2342 back = Color_RV;
2343# endif
2344 if (fore == back) 2363 if (fore == back)
2345 { 2364 {
2346 fore = Color_bg; 2365 fore = Color_bg;
2347 back = Color_fg; 2366 back = Color_fg;
2348 } 2367 }
… …
2384 /* 2403 /*
2385 * Actually do the drawing of the string here 2404 * Actually do the drawing of the string here
2386 */ 2405 */
2387 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2406 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2388 2407
2389 if (expect_true (have_bg && back == Color_bg)) 2408 if (ecb_likely (have_bg && back == Color_bg))
2390 { 2409 {
2391 // this is very ugly, maybe push it into ->draw? 2410 // this is very ugly, maybe push it into ->draw?
2392 2411
2393 for (i = 0; i < count; i++) /* don't draw empty strings */ 2412 for (i = 0; i < count; i++) /* don't draw empty strings */
2394 if (text[i] != ' ') 2413 if (text[i] != ' ')
… …
2401 did_clear: ; 2420 did_clear: ;
2402 } 2421 }
2403 else 2422 else
2404 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2405 2424
2406 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2425 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2407 { 2426 {
2408#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2409 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2410 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2411 else 2430 else
… …
2502 scr_remap_chars (swap_buf [i]); 2521 scr_remap_chars (swap_buf [i]);
2503 } 2522 }
2504} 2523}
2505 2524
2506void 2525void
2507rxvt_term::scr_recolour () NOTHROW 2526rxvt_term::scr_recolour (bool refresh) NOTHROW
2508{ 2527{
2528 bool transparent = false;
2529
2509#ifdef HAVE_BG_PIXMAP 2530#ifdef HAVE_BG_PIXMAP
2510 bgPixmap.apply (); 2531 if (bg_pixmap != None)
2511#else 2532 {
2533# ifdef ENABLE_TRANSPARENCY
2534 if (bg_flags & BG_IS_TRANSPARENT)
2535 {
2536 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2537 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2512 2538
2539 transparent = true;
2540 }
2541 else
2542# endif
2543 {
2544 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2545 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2546 }
2547 }
2548 else
2549#endif
2550 {
2513 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2514 XClearWindow (dpy, parent[0]);
2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2552 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2553 }
2554
2555 XClearWindow (dpy, parent);
2516 2556
2517 if (scrollBar.win) 2557 if (scrollBar.win)
2518 { 2558 {
2559 if (transparent)
2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561 else
2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2520 scrollBar.state = STATE_IDLE; 2563 scrollBar.state = SB_STATE_IDLE;
2521 scrollBar.show (0); 2564 scrollBar.show (0);
2522 } 2565 }
2523 2566
2524#endif 2567 if (refresh)
2525 2568 {
2526 /* bgPixmap.apply () does not do the following : */
2527 scr_clear (); 2569 scr_clear ();
2528 scr_touch (true); 2570 scr_touch (true);
2571 }
2529 want_refresh = 1; 2572 want_refresh = 1;
2530} 2573}
2531 2574
2532/* ------------------------------------------------------------------------- */ 2575/* ------------------------------------------------------------------------- */
2533void 2576void
… …
2601 { 2644 {
2602#if !ENABLE_MINIMAL 2645#if !ENABLE_MINIMAL
2603 if (selection.rect) 2646 if (selection.rect)
2604 scr_xor_rect (selection.beg.row, selection.beg.col, 2647 scr_xor_rect (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2648 selection.end.row, selection.end.col,
2606 RS_RVid, RS_RVid | RS_Uline); 2649 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2607 else 2650 else
2608#endif 2651#endif
2609 scr_xor_span (selection.beg.row, selection.beg.col, 2652 scr_xor_span (selection.beg.row, selection.beg.col,
2610 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2611 RS_RVid); 2654 RS_Sel | RS_RVid);
2612 } 2655 }
2613} 2656}
2614 2657
2615/* ------------------------------------------------------------------------- */ 2658/* ------------------------------------------------------------------------- */
2616/* 2659/*
… …
2621void 2664void
2622rxvt_term::scr_dump (int fd) NOTHROW 2665rxvt_term::scr_dump (int fd) NOTHROW
2623{ 2666{
2624 int row, wrote; 2667 int row, wrote;
2625 unsigned int width, towrite; 2668 unsigned int width, towrite;
2626 char r1[] = "\n"; 2669 const char r1[] = "\n";
2627 2670
2628 for (row = saveLines + top_row; 2671 for (row = saveLines + top_row;
2629 row < saveLines + nrow - 1; row++) 2672 row < saveLines + nrow - 1; row++)
2630 { 2673 {
2631 width = row_buf[row].l >= 0 ? row_buf[row].l 2674 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2648 * CHARACTER SELECTION * 2691 * CHARACTER SELECTION *
2649 * ------------------------------------------------------------------------- */ 2692 * ------------------------------------------------------------------------- */
2650void 2693void
2651rxvt_term::selection_check (int check_more) NOTHROW 2694rxvt_term::selection_check (int check_more) NOTHROW
2652{ 2695{
2653 row_col_t pos;
2654
2655 if (!selection.op) 2696 if (!selection.op)
2656 return; 2697 return;
2657 2698
2699 row_col_t pos;
2658 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2701
2659 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2660 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2661 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2662 || (check_more == 1 2704 || (check_more == 1
2663 && current_screen == selection.screen 2705 && current_screen == selection.screen
2664 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2665 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2666 || (check_more == 2 2708 || (check_more == 2
2667 && ROWCOL_IS_BEFORE (selection.beg, pos) 2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2668 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos))
2669 || (check_more == 3 2711 || (check_more == 3
2670 && ROWCOL_IS_AFTER (selection.end, pos)) 2712 && ROWCOL_IS_AFTER (selection.end, pos)))
2671 || (check_more == 4 /* screen width change */
2672 && (selection.beg.row != selection.end.row
2673 || selection.end.col > ncol)))
2674 CLEAR_SELECTION (); 2713 CLEAR_SELECTION ();
2714
2715 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
2716 CLEAR_SELECTION_MARK ();
2675} 2717}
2676 2718
2677/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2678/* 2720/*
2679 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
2680 */ 2722 */
2681void 2723void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2724rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2725{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2726 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2727 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2728 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2729 data[i] = C0_CR;
… …
2693 2735
2694 if (priv_modes & PrivMode_BracketPaste) 2736 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2737 tt_printf ("\e[201~");
2696} 2738}
2697 2739
2698/* ------------------------------------------------------------------------- */
2699/*
2700 * Respond to a notification that a primary selection has been sent
2701 * EXT: SelectionNotify
2702 */
2703void 2740void
2704rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::paste (char *data, unsigned int len) NOTHROW
2705{ 2742{
2706 if (prop == None) /* check for failed XConvertSelection */ 2743 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2707 {
2708 if ((selection_type & Sel_CompoundText))
2709 {
2710 int selnum = selection_type & Sel_whereMask;
2711
2712 selection_type = 0;
2713 if (selnum != Sel_direct)
2714 selection_request_other (XA_STRING, selnum);
2715 }
2716
2717 if ((selection_type & Sel_UTF8String))
2718 {
2719 int selnum = selection_type & Sel_whereMask;
2720
2721 selection_type = Sel_CompoundText;
2722 if (selnum != Sel_direct)
2723 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2724 else
2725 selection_type = 0;
2726 }
2727
2728 return;
2729 }
2730
2731 unsigned long bytes_after;
2732 XTextProperty ct;
2733
2734 if (XGetWindowProperty (dpy, win, prop,
2735 0, PROP_SIZE / 4,
2736 delete_prop, AnyPropertyType,
2737 &ct.encoding, &ct.format,
2738 &ct.nitems, &bytes_after,
2739 &ct.value) != Success)
2740 {
2741 ct.value = 0;
2742 goto bailout;
2743 }
2744
2745 if (ct.encoding == None)
2746 goto bailout;
2747
2748 if (bytes_after)
2749 {
2750 // fetch and append remaining data
2751 XTextProperty ct2;
2752
2753 if (XGetWindowProperty (dpy, win, prop,
2754 ct.nitems / 4, (bytes_after + 3) / 4,
2755 delete_prop, AnyPropertyType,
2756 &ct2.encoding, &ct2.format,
2757 &ct2.nitems, &bytes_after,
2758 &ct2.value) != Success)
2759 goto bailout;
2760
2761 // realloc should be compatible to XFree, here, and elsewhere, too
2762 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2763 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2764 ct.nitems += ct2.nitems;
2765
2766 XFree (ct2.value);
2767 }
2768
2769 if (ct.value == 0)
2770 goto bailout;
2771
2772 if (ct.encoding == xa[XA_INCR])
2773 {
2774 // INCR selection, start handshake
2775 if (!delete_prop)
2776 XDeleteProperty (dpy, win, prop);
2777
2778 selection_wait = Sel_incr;
2779 incr_buf_fill = 0;
2780 incr_ev.start (10);
2781
2782 goto bailout;
2783 }
2784
2785 if (ct.nitems == 0)
2786 {
2787 if (selection_wait == Sel_incr)
2788 {
2789 XFree (ct.value);
2790
2791 // finally complete, now paste the whole thing
2792 selection_wait = Sel_normal;
2793 ct.value = (unsigned char *)incr_buf;
2794 ct.nitems = incr_buf_fill;
2795 incr_buf = 0;
2796 incr_buf_size = 0;
2797 incr_ev.stop ();
2798 }
2799 else
2800 {
2801 if (selection_wait == Sel_normal
2802 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2803 {
2804 /*
2805 * pass through again trying CUT_BUFFER0 if we've come from
2806 * XConvertSelection () but nothing was presented
2807 */
2808 selection_paste (display->root, XA_CUT_BUFFER0, False);
2809 }
2810
2811 goto bailout;
2812 }
2813 }
2814 else if (selection_wait == Sel_incr)
2815 {
2816 incr_ev.start (10);
2817
2818 while (incr_buf_fill + ct.nitems > incr_buf_size)
2819 {
2820 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2821 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2822 }
2823
2824 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2825 incr_buf_fill += ct.nitems;
2826
2827 goto bailout;
2828 }
2829
2830 char **cl;
2831 int cr;
2832
2833#if !ENABLE_MINIMAL
2834 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2835 // so recode it manually
2836 if (ct.encoding == xa[XA_UTF8_STRING])
2837 {
2838 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2839 char *s = rxvt_wcstombs (w);
2840 free (w);
2841 // TODO: strlen == only the first element will be converted. well...
2842 paste (s, strlen (s));
2843 free (s);
2844 }
2845 else
2846#endif
2847 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2848 && cl)
2849 {
2850 for (int i = 0; i < cr; i++)
2851 paste (cl[i], strlen (cl[i]));
2852
2853 XFreeStringList (cl);
2854 }
2855 else
2856 paste ((char *)ct.value, ct.nitems); // paste raw
2857
2858bailout:
2859 XFree (ct.value);
2860
2861 if (selection_wait == Sel_normal)
2862 selection_wait = Sel_none;
2863}
2864
2865void
2866rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2867{
2868 selection_wait = Sel_none;
2869
2870 incr_buf_size = 0;
2871 free (incr_buf);
2872
2873 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2874}
2875
2876void
2877rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2878{
2879 if (prop == None || selection_wait != Sel_incr)
2880 return; 2744 return;
2881 2745
2882 selection_paste (win, prop, true); 2746 tt_paste (data, len);
2883} 2747}
2884 2748
2885/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2886/* 2750/*
2887 * Request the current selection: 2751 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2888 * Order: > internal selection if available 2752 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2889 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2753 * as fallback
2890 * > CUT_BUFFER0
2891 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2892 * will auto fallback to CUT_BUFFER0
2893 * EXT: button 2 release 2754 * EXT: button 2 release
2894 */ 2755 */
2895void 2756void
2896rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2757rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2897{ 2758{
2898 if (selection.text && selnum == Sel_Primary) 2759 if (!selection_req)
2899 {
2900 /* internal selection */
2901 char *str = rxvt_wcstombs (selection.text, selection.len);
2902 paste (str, strlen (str));
2903 free (str);
2904 return;
2905 } 2760 {
2906 else 2761 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2762 selection_req->run ();
2907 { 2763 }
2908 selection_request_time = tm;
2909 selection_wait = Sel_normal;
2910
2911#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return;
2915#else
2916 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return;
2919#endif
2920 }
2921
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */
2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
2924}
2925
2926int
2927rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2928{
2929 Atom sel;
2930
2931 selection_type |= selnum;
2932
2933 if (selnum == Sel_Primary)
2934 sel = XA_PRIMARY;
2935 else if (selnum == Sel_Secondary)
2936 sel = XA_SECONDARY;
2937 else
2938 sel = xa[XA_CLIPBOARD];
2939
2940 if (XGetSelectionOwner (dpy, sel) != None)
2941 {
2942 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2943 vt, selection_request_time);
2944 return 1;
2945 }
2946
2947 return 0;
2948} 2764}
2949 2765
2950/* ------------------------------------------------------------------------- */ 2766/* ------------------------------------------------------------------------- */
2951/* 2767/*
2952 * Clear all selected text 2768 * Clear all selected text
2953 * EXT: SelectionClear 2769 * EXT: SelectionClear
2954 */ 2770 */
2955void 2771void
2956rxvt_term::selection_clear () NOTHROW 2772rxvt_term::selection_clear (bool clipboard) NOTHROW
2957{ 2773{
2774 if (!clipboard)
2775 {
2958 want_refresh = 1; 2776 want_refresh = 1;
2959 free (selection.text); 2777 free (selection.text);
2960 selection.text = NULL; 2778 selection.text = NULL;
2961 selection.len = 0; 2779 selection.len = 0;
2962 CLEAR_SELECTION (); 2780 CLEAR_SELECTION ();
2963 2781
2964 if (display->selection_owner == this) 2782 if (display->selection_owner == this)
2965 display->selection_owner = 0; 2783 display->selection_owner = 0;
2784 }
2785 else
2786 {
2787 free (selection.clip_text);
2788 selection.clip_text = NULL;
2789 selection.clip_len = 0;
2790
2791 if (display->clipboard_owner == this)
2792 display->clipboard_owner = 0;
2793 }
2966} 2794}
2967 2795
2968/* ------------------------------------------------------------------------- */ 2796/* ------------------------------------------------------------------------- */
2969/* 2797/*
2970 * Copy a selection into the cut buffer 2798 * Copy a selection into the cut buffer
2971 * EXT: button 1 or 3 release 2799 * EXT: button 1 or 3 release
2972 */ 2800 */
2973void 2801void
2974rxvt_term::selection_make (Time tm) 2802rxvt_term::selection_make (Time tm)
2975{ 2803{
2976 int i; 2804 int size;
2977 wchar_t *new_selection_text; 2805 wchar_t *new_selection_text;
2978 text_t *t; 2806 text_t *t;
2979 2807
2980 switch (selection.op) 2808 switch (selection.op)
2981 { 2809 {
… …
2997 return; /* nothing selected, go away */ 2825 return; /* nothing selected, go away */
2998 2826
2999 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2827 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3000 return; 2828 return;
3001 2829
3002 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2830 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3003 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2831 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3004 2832
3005 int ofs = 0; 2833 int ofs = 0;
3006 int extra = 0; 2834 int extra = 0;
3007 2835
3008 int col = selection.beg.col; 2836 int col = selection.beg.col;
… …
3014 { 2842 {
3015#if !ENABLE_MINIMAL 2843#if !ENABLE_MINIMAL
3016 if (selection.rect) 2844 if (selection.rect)
3017 { 2845 {
3018 col = selection.beg.col; 2846 col = selection.beg.col;
3019 end_col = ncol + 1; 2847 end_col = selection.end.col;
3020 } 2848 }
3021 else 2849 else
3022#endif 2850#endif
3023 end_col = ROW(row).l; 2851 end_col = ROW(row).l;
3024 2852
3025 col = max (col, 0); 2853 col = max (col, 0);
3026 2854
3027 if (row == selection.end.row 2855 if (row == selection.end.row)
3028#if !ENABLE_MINIMAL
3029 || selection.rect
3030#endif
3031 )
3032 min_it (end_col, selection.end.col); 2856 min_it (end_col, selection.end.col);
3033 2857
3034 t = ROW(row).t + col; 2858 t = ROW(row).t + col;
3035 2859
3036 for (; col < end_col; col++) 2860 for (; col < end_col; col++)
… …
3044 2868
3045 extra -= (len - 1); 2869 extra -= (len - 1);
3046 2870
3047 if (extra < 0) 2871 if (extra < 0)
3048 { 2872 {
3049 extra += i; 2873 extra += size;
3050 i += i; 2874 size += size;
3051 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2875 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3052 } 2876 }
3053 2877
3054 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2878 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3055 } 2879 }
3056#endif 2880#endif
… …
3068 2892
3069 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3070 } 2894 }
3071 else 2895 else
3072#endif 2896#endif
3073 if (!ROW(row).is_longer () && row != selection.end.row) 2897 if (!ROW(row).is_longer ()
2898 && (row != selection.end.row || end_col != selection.end.col)
2899 && (row != selection.beg.row || selection.beg.col < ncol))
3074 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3075 } 2901 }
3076
3077 if (end_col != selection.end.col)
3078 new_selection_text[ofs++] = C0_LF;
3079 2902
3080 new_selection_text[ofs] = 0; 2903 new_selection_text[ofs] = 0;
3081 2904
3082 if (ofs == 0) 2905 if (ofs == 0)
3083 { 2906 {
… …
3096 2919
3097 selection_grab (tm); 2920 selection_grab (tm);
3098} 2921}
3099 2922
3100bool 2923bool
3101rxvt_term::selection_grab (Time tm) NOTHROW 2924rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3102{ 2925{
2926 Atom sel;
2927
2928 if (!clipboard)
2929 {
3103 selection_time = tm; 2930 selection_time = tm;
2931 sel = XA_PRIMARY;
2932 }
2933 else
2934 {
2935 clipboard_time = tm;
2936 sel = xa[XA_CLIPBOARD];
2937 }
3104 2938
3105 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2939 XSetSelectionOwner (dpy, sel, vt, tm);
3106 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2940 if (XGetSelectionOwner (dpy, sel) == vt)
3107 { 2941 {
3108 display->set_selection_owner (this); 2942 display->set_selection_owner (this, clipboard);
3109 return true; 2943 return true;
3110 } 2944 }
3111 else 2945 else
3112 { 2946 {
3113 selection_clear (); 2947 selection_clear (clipboard);
3114 return false; 2948 return false;
3115 } 2949 }
3116 2950
3117#if 0 2951#if 0
3118 XTextProperty ct; 2952 XTextProperty ct;
… …
3578 * EXT: SelectionRequest 3412 * EXT: SelectionRequest
3579 */ 3413 */
3580void 3414void
3581rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3582{ 3416{
3417 Atom property = rq.property == None ? rq.target : rq.property;
3583 XSelectionEvent ev; 3418 XSelectionEvent ev;
3584 3419
3585 ev.type = SelectionNotify; 3420 ev.type = SelectionNotify;
3586 ev.property = None; 3421 ev.property = None;
3587 ev.display = rq.display; 3422 ev.display = rq.display;
… …
3602 *target++ = xa[XA_COMPOUND_TEXT]; 3437 *target++ = xa[XA_COMPOUND_TEXT];
3603#if X_HAVE_UTF8_STRING 3438#if X_HAVE_UTF8_STRING
3604 *target++ = xa[XA_UTF8_STRING]; 3439 *target++ = xa[XA_UTF8_STRING];
3605#endif 3440#endif
3606 3441
3607 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3442 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3608 32, PropModeReplace, 3443 32, PropModeReplace,
3609 (unsigned char *)target_list, target - target_list); 3444 (unsigned char *)target_list, target - target_list);
3610 ev.property = rq.property; 3445 ev.property = property;
3611 } 3446 }
3612#if TODO // TODO 3447#if TODO // TODO
3613 else if (rq.target == xa[XA_MULTIPLE]) 3448 else if (rq.target == xa[XA_MULTIPLE])
3614 { 3449 {
3615 /* TODO: Handle MULTIPLE */ 3450 /* TODO: Handle MULTIPLE */
3616 } 3451 }
3617#endif 3452#endif
3618 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3453 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3619 { 3454 {
3620 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3455 XChangeProperty (dpy, rq.requestor, property, rq.target,
3621 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3456 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3622 ev.property = rq.property; 3457 ev.property = property;
3458 }
3459 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3460 {
3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3462 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3463 ev.property = property;
3623 } 3464 }
3624 else if (rq.target == XA_STRING 3465 else if (rq.target == XA_STRING
3625 || rq.target == xa[XA_TEXT] 3466 || rq.target == xa[XA_TEXT]
3626 || rq.target == xa[XA_COMPOUND_TEXT] 3467 || rq.target == xa[XA_COMPOUND_TEXT]
3627 || rq.target == xa[XA_UTF8_STRING] 3468 || rq.target == xa[XA_UTF8_STRING]
… …
3659 { 3500 {
3660 target = xa[XA_COMPOUND_TEXT]; 3501 target = xa[XA_COMPOUND_TEXT];
3661 style = enc_compound_text; 3502 style = enc_compound_text;
3662 } 3503 }
3663 3504
3664 if (selection.text) 3505 if (rq.selection == XA_PRIMARY && selection.text)
3665 { 3506 {
3666 cl = selection.text; 3507 cl = selection.text;
3667 selectlen = selection.len; 3508 selectlen = selection.len;
3509 }
3510 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3511 {
3512 cl = selection.clip_text;
3513 selectlen = selection.clip_len;
3668 } 3514 }
3669 else 3515 else
3670 { 3516 {
3671 cl = L""; 3517 cl = L"";
3672 selectlen = 0; 3518 selectlen = 0;
… …
3693 ct.value = (unsigned char *)cl; 3539 ct.value = (unsigned char *)cl;
3694 ct.nitems = selectlen; 3540 ct.nitems = selectlen;
3695 ct.encoding = target; 3541 ct.encoding = target;
3696 } 3542 }
3697 3543
3698 XChangeProperty (dpy, rq.requestor, rq.property, 3544 XChangeProperty (dpy, rq.requestor, property,
3699 ct.encoding, 8, PropModeReplace, 3545 ct.encoding, 8, PropModeReplace,
3700 ct.value, (int)ct.nitems); 3546 ct.value, (int)ct.nitems);
3701 ev.property = rq.property; 3547 ev.property = property;
3702 3548
3703 if (freect) 3549 if (freect)
3704 XFree (ct.value); 3550 XFree (ct.value);
3705 } 3551 }
3706 3552

Diff Legend

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