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.318 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.401 by sf-exg, Tue Nov 15 18:20:38 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 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
198 term_start = 0; 203 term_start = 0;
199 204
200 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202 207
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 211
207 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
208 { 213 {
… …
231 selection.text = NULL; 236 selection.text = NULL;
232 selection.len = 0; 237 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
235 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
236 } 243 }
237 else 244 else
238 { 245 {
239 /* 246 /*
240 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
268 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 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); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270 } 277 }
271 278
272 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
274 281
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
278 285
279 if (top_row) 286 if (top_row)
280 { 287 {
281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
282 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 // TODO: maybe optimise when width didn't change
283 291
284 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
285 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
286 294
287 do 295 do
288 { 296 {
289 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
290#ifdef DEBUG_STRICT
291 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
292#endif
293 int plines = 1; 299 int plines = 1;
294 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
295 301
296 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
297 { 303 {
… …
393 399
394 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
395 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
396 } 402 }
397 403
404 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
409
398 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
399 411
400 prev_nrow = nrow; 412 prev_nrow = nrow;
401 prev_ncol = ncol; 413 prev_ncol = ncol;
402 414
… …
434void 446void
435rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
436{ 448{
437 scr_release (); 449 scr_release ();
438 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
439 scr_soft_reset (); 452 scr_soft_reset ();
440 scr_reset (); 453 scr_reset ();
441 454
442 scr_clear (true); 455 scr_clear (true);
443 scr_refresh (); 456 scr_refresh ();
… …
448{ 461{
449 /* only affects modes, nothing drastic such as clearing the screen */ 462 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY 463#if ENABLE_OVERLAY
451 scr_overlay_off (); 464 scr_overlay_off ();
452#endif 465#endif
453
454 rvideo_mode = false;
455
456 if (current_screen != PRIMARY)
457 scr_swap_screen ();
458
459 free (tabs);
460 tabs = (char *)rxvt_malloc (ncol);
461
462 for (int col = ncol; --col; )
463 tabs [col] = col % TABSIZE == 0;
464 466
465 if (current_screen != PRIMARY) 467 if (current_screen != PRIMARY)
466 scr_swap_screen (); 468 scr_swap_screen ();
467 469
468 scr_scroll_region (0, MAX_ROWS - 1); 470 scr_scroll_region (0, MAX_ROWS - 1);
… …
513 } 515 }
514 516
515 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
516 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
517 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
518#ifdef DEBUG_STRICT
519 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
520 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
521#endif
522} 522}
523 523
524void 524void
525rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
526{ 526{
… …
551 want_refresh = 1; 551 want_refresh = 1;
552 view_start = 0; 552 view_start = 0;
553 553
554 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
555 555
556 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
557 557
558#if NSCREENS 558#if NSCREENS
559 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
560 { 560 {
561 num_scr = 0; 561 num_scr = 0;
… …
638 638
639 if (count > 0 639 if (count > 0
640 && row1 == 0 640 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
643 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 646
648 // sever bottommost line 647 // sever bottommost line
649 { 648 {
650 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
651 l.is_longer (0); 650 l.is_longer (0);
652 l.touch (); 651 l.touch ();
653 } 652 }
654 653
654 // scroll everything up 'count' lines
655 term_start = (term_start + count) % total_rows;
656
657 // now copy lines below the scroll region bottom to the
658 // bottom of the screen again, so they look as if they
659 // hadn't moved.
660 for (int i = nrow; --i > row2; )
661 {
662 line_t &l1 = ROW(i - count);
663 line_t &l2 = ROW(i);
664
665 ::swap (l1, l2);
666 l2.touch ();
667 }
668
655 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 670 for (int i = count; i--; )
657 { 671 {
658 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
659 673
660 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 676 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 677 {
664 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 679 l.l = 0;
… …
667 } 681 }
668 else 682 else
669 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
670 } 684 }
671 685
672 // now copy lines below the scroll region bottom to the
673 // bottom of the screen again, so they look as if they
674 // hadn't moved.
675 for (int i = nrow; --i > row2; )
676 {
677 line_t &l1 = ROW(i - count);
678 line_t &l2 = ROW(i);
679
680 ::swap (l1, l2);
681 l2.touch ();
682 }
683
684 // move and/or clear selection, if any 686 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen
688 && selection.beg.row < row2)
686 { 689 {
687 selection.beg.row -= count; 690 selection.beg.row -= count;
688 selection.end.row -= count; 691 selection.end.row -= count;
689 selection.mark.row -= count; 692 selection.mark.row -= count;
690 693
691 if (selection.beg.row < top_row 694 selection_check (0);
692 || selection.end.row < top_row
693 || selection.mark.row < top_row)
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 } 695 }
699 696
700 // finally move the view window, if desired 697 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 699 && view_start != 0
… …
732 } 729 }
733 730
734 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
736 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
737 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
738 743
739 min_it (count, rows); 744 min_it (count, rows);
740 745
741 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 747
743 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
744 { 749 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 751
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 754 }
750 755
751 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
752 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 }
753 } 765 }
754 766
755 return count; 767 return count;
756} 768}
757 769
… …
786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 798 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
787 screen.cur.row -= minlines; 799 screen.cur.row -= minlines;
788 } 800 }
789 } 801 }
790 802
791#ifdef DEBUG_STRICT
792 assert (screen.cur.col < ncol); 803 assert (screen.cur.col < ncol);
793 assert (screen.cur.row < nrow 804 assert (screen.cur.row < nrow
794 && screen.cur.row >= top_row); 805 && screen.cur.row >= top_row);
795#endif
796 int row = screen.cur.row; 806 int row = screen.cur.row;
797 807
798 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 808 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
799 809
800 line_t *line = &ROW(row); 810 line_t *line = &ROW(row);
801 811
802 while (str < strend) 812 while (str < strend)
803 { 813 {
804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
805 815
806 if (expect_false (c < 0x20)) 816 if (ecb_unlikely (c < 0x20))
807 if (c == C0_LF) 817 if (c == C0_LF)
808 { 818 {
809 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
810 820
811 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
… …
830 { 840 {
831 scr_tab (1, true); 841 scr_tab (1, true);
832 continue; 842 continue;
833 } 843 }
834 844
835 if (expect_false ( 845 if (ecb_unlikely (
836 checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
838 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
839 )) 849 ))
840 { 850 {
… …
845 * should be a similar check. 855 * should be a similar check.
846 */ 856 */
847 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
848 } 858 }
849 859
850 if (expect_false (screen.flags & Screen_WrapNext)) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
851 { 861 {
852 scr_do_wrap (); 862 scr_do_wrap ();
853 863
854 line->l = ncol; 864 line->l = ncol;
855 line->is_longer (1); 865 line->is_longer (1);
… …
857 row = screen.cur.row; 867 row = screen.cur.row;
858 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
859 } 869 }
860 870
861 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
862 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
863 c = 0xfffd; 873 c = 0xfffd;
864 874
865 // 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
866 // further replacements, as wcwidth might return -1 for the line 876 // further replacements, as wcwidth might return -1 for the line
867 // drawing characters below as they might be invalid in the current 877 // drawing characters below as they might be invalid in the current
868 // locale. 878 // locale.
869 int width = WCWIDTH (c); 879 int width = WCWIDTH (c);
870 880
871 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
872 { 882 {
873 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
874 // 5f-7e standard vt100 884 // 5f-7e standard vt100
875 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
876 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
889 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
890 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
891 } 901 }
892 } 902 }
893 903
894 if (expect_false (screen.flags & Screen_Insert)) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
895 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
896 906
897 if (width != 0) 907 if (width != 0)
898 { 908 {
899#if !UNICODE_3 909#if !UNICODE_3
… …
904# else 914# else
905 c = 0xfffd; 915 c = 0xfffd;
906# endif 916# endif
907#endif 917#endif
908 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
909 // nuke the character at this position, if required 935 // nuke the character at this position, if required
910 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.
911 line->t[screen.cur.col] == NOCHAR 939 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
912 || (screen.cur.col < ncol - 1
913 && line->t[screen.cur.col + 1] == NOCHAR)
914 ))
915 scr_kill_char (*line, screen.cur.col); 940 scr_kill_char (*line, screen.cur.col);
916
917 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
918
919 // if the character doesn't fit into the remaining columns...
920 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
921 {
922 // ... artificially enlargen the previous one
923 c = NOCHAR;
924 // and try the same character next loop iteration
925 --str;
926 }
927 941
928 line->touch (); 942 line->touch ();
929 943
930 do 944 do
931 { 945 {
932 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
934 948
935 if (expect_true (screen.cur.col < ncol - 1)) 949 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 950 screen.cur.col++;
937 else 951 else
938 { 952 {
939 line->l = ncol; 953 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
941 screen.flags |= Screen_WrapNext; 955 screen.flags |= Screen_WrapNext;
942 break; 956
957 goto end_of_line;
943 } 958 }
944 959
945 c = NOCHAR; 960 c = NOCHAR;
946 } 961 }
947 while (expect_false (--width > 0)); 962 while (ecb_unlikely (--width > 0));
948 963
949 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
950 if (expect_false (!width)) 965 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
951 { 966 {
952 line->touch ();
953
954 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
955 {
956 line->t[c] = ' '; 967 line->t[c] = ' ';
957 line->r[c] = rend; 968 line->r[c] = rend;
958 }
959 } 969 }
970
971end_of_line:
972 ;
960 } 973 }
961#if ENABLE_COMBINING 974#if ENABLE_COMBINING
962 else // width == 0 975 else // width == 0
963 { 976 {
964 if (c != 0xfeff) // ignore BOM 977 if (c != 0xfeff) // ignore BOM
… …
1004#endif 1017#endif
1005 } 1018 }
1006 1019
1007 max_it (line->l, screen.cur.col); 1020 max_it (line->l, screen.cur.col);
1008 1021
1009#ifdef DEBUG_STRICT
1010 assert (screen.cur.row >= 0); 1022 assert (screen.cur.row >= 0);
1011#endif
1012} 1023}
1013 1024
1014/* ------------------------------------------------------------------------- */ 1025/* ------------------------------------------------------------------------- */
1015/* 1026/*
1016 * 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
… …
1029 1040
1030 want_refresh = 1; 1041 want_refresh = 1;
1031#endif 1042#endif
1032 } 1043 }
1033 } 1044 }
1045 else if (screen.flags & Screen_WrapNext)
1046 screen.flags &= ~Screen_WrapNext;
1034 else 1047 else
1035 scr_gotorc (0, -1, RELATIVE); 1048 scr_gotorc (0, -1, RELATIVE);
1036} 1049}
1037 1050
1038/* ------------------------------------------------------------------------- */ 1051/* ------------------------------------------------------------------------- */
… …
1344 if (row >= nrow) /* Out Of Bounds */ 1357 if (row >= nrow) /* Out Of Bounds */
1345 return; 1358 return;
1346 1359
1347 min_it (num, nrow - row); 1360 min_it (num, nrow - row);
1348 1361
1349 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1350 if (rstyle & (RS_RVid | RS_Uline)) 1362 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1351 ren = (rend_t) ~RS_None; 1363 ren = (rend_t) ~RS_None;
1352 else if (GET_BASEBG (rstyle) == Color_bg) 1364 else if (GET_BASEBG (rstyle) == Color_bg)
1353 { 1365 {
1354 ren = DEFAULT_RSTYLE; 1366 ren = DEFAULT_RSTYLE;
1355 1367
1356 if (mapped) 1368 if (mapped)
1357 XClearArea (dpy, vt, 0, 1369 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row), (unsigned int)width, 1370 Row2Pixel (row - view_start), (unsigned int)width,
1359 (unsigned int)Height2Pixel (num), False); 1371 (unsigned int)Height2Pixel (num), False);
1360 } 1372 }
1361 else 1373 else
1362 { 1374 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1375 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 1376
1377 if (mapped)
1378 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1379 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1380 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1381 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row), 1382 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1383 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num)); 1384 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1385 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1386 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 }
1373 } 1388 }
1374 1389
1375 for (; num--; row++) 1390 for (; num--; row++)
1376 { 1391 {
1377 scr_blank_screen_mem (ROW(row), rstyle); 1392 scr_blank_screen_mem (ROW(row), rstyle);
1393
1394 if (row - view_start < nrow)
1378 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1395 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1379 } 1396 }
1380} 1397}
1381 1398
1382#if !ENABLE_MINIMAL 1399#if !ENABLE_MINIMAL
1383void 1400void
… …
1536 { 1553 {
1537 line->t[col] = line->t[col + count]; 1554 line->t[col] = line->t[col + count];
1538 line->r[col] = line->r[col + count]; 1555 line->r[col] = line->r[col + count];
1539 } 1556 }
1540 1557
1541 scr_blank_line (*line, ncol - count, count, 1558 scr_blank_line (*line, ncol - count, count, rstyle);
1542 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1543 1559
1544 if (selection.op && current_screen == selection.screen 1560 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1561 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1562 {
1547 if (selection.end.row != screen.cur.row 1563 if (selection.end.row != screen.cur.row
… …
1683 { 1699 {
1684 rvideo_state = on; 1700 rvideo_state = on;
1685 1701
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1702 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1703#ifdef HAVE_BG_PIXMAP
1688 if (bgPixmap.pixmap == None) 1704 if (bg_pixmap == None)
1689#endif 1705#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1706 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1707
1692 XGCValues gcvalue; 1708 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1709 gcvalue.foreground = pix_colors[Color_fg];
… …
1837 for (i = PART_BEG; i < RC_COUNT; i++) 1853 for (i = PART_BEG; i < RC_COUNT; i++)
1838 { 1854 {
1839 min_it (rc[i].col, ncol - 1); 1855 min_it (rc[i].col, ncol - 1);
1840 min_it (rc[i].row, nrow - 1); 1856 min_it (rc[i].row, nrow - 1);
1841 } 1857 }
1842// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1858
1843 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++)
1844 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);
1845 1861
1846 num_scr_allow = 0; 1862 num_scr_allow = 0;
1847 1863
… …
1920 1936
1921# ifndef NO_MAPALERT 1937# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1938# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1939 if (option (Opt_mapAlert))
1924# endif 1940# endif
1925 XMapWindow (dpy, parent[0]); 1941 XMapWindow (dpy, parent);
1926# endif 1942# endif
1927 1943
1928# if ENABLE_FRILLS 1944# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1945 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1946 set_urgency (1);
… …
1938 1954
1939 bell_ev.start (VISUAL_BELL_DURATION); 1955 bell_ev.start (VISUAL_BELL_DURATION);
1940 } 1956 }
1941 else 1957 else
1942 XBell (dpy, 0); 1958 XBell (dpy, 0);
1959 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1943#endif 1960#endif
1944} 1961}
1945 1962
1946/* ------------------------------------------------------------------------- */ 1963/* ------------------------------------------------------------------------- */
1947/* ARGSUSED */
1948void 1964void
1949rxvt_term::scr_printscreen (int fullhist) NOTHROW 1965rxvt_term::scr_printscreen (int fullhist) NOTHROW
1950{ 1966{
1951#ifdef PRINTPIPE 1967#ifdef PRINTPIPE
1952 int nrows, row_start; 1968 int nrows, row_start;
… …
1966 row_start = view_start; 1982 row_start = view_start;
1967 } 1983 }
1968 1984
1969 wctomb (0, 0); 1985 wctomb (0, 0);
1970 1986
1971 for (int r1 = 0; r1 < nrows; r1++) 1987 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1972 { 1988 {
1973 text_t *tp = ROW(r1).t; 1989 text_t *tp = ROW(r1).t;
1974 int len = ROW(r1).l; 1990 int len = ROW(r1).l;
1975 1991
1976 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
… …
2005 * screen.text/screen.rend contain what the screen will change to. 2021 * screen.text/screen.rend contain what the screen will change to.
2006 */ 2022 */
2007void 2023void
2008rxvt_term::scr_refresh () NOTHROW 2024rxvt_term::scr_refresh () NOTHROW
2009{ 2025{
2010 unsigned char have_bg,
2011 showcursor; /* show the cursor */
2012 int16_t col, row, /* column/row we're processing */ 2026 int16_t col, row, /* column/row we're processing */
2013 ocrow; /* old cursor row */ 2027 ocrow; /* old cursor row */
2014 int i; /* tmp */ 2028 int i; /* tmp */
2015#ifndef NO_CURSORCOLOR 2029#ifndef NO_CURSORCOLOR
2016 rend_t cc1; /* store colours at cursor position (s) */ 2030 rend_t cc1; /* store colours at cursor position (s) */
… …
2027 /* 2041 /*
2028 * A: set up vars 2042 * A: set up vars
2029 */ 2043 */
2030 refresh_count = 0; 2044 refresh_count = 0;
2031 2045
2046 unsigned int old_screen_flags = screen.flags;
2032 have_bg = 0; 2047 char have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2048#ifdef HAVE_BG_PIXMAP
2034 have_bg = bgPixmap.pixmap != None; 2049 have_bg = bg_pixmap != None;
2035#endif 2050#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2052
2038 /* 2053 /*
2039 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
2040 */ 2055 */
2041 scr_reverse_selection (); 2056 scr_reverse_selection ();
2057
2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2059#if ENABLE_OVERLAY
2060 scr_swap_overlay ();
2061#endif
2062
2063 char showcursor = screen.flags & Screen_VisibleCursor;
2042 2064
2043 /* 2065 /*
2044 * C: set the cursor character (s) 2066 * C: set the cursor character (s)
2045 */ 2067 */
2046 { 2068 {
2047 unsigned char setoldcursor; 2069 unsigned char setoldcursor;
2048 2070
2049 showcursor = (screen.flags & Screen_VisibleCursor);
2050#ifdef CURSOR_BLINK 2071#ifdef CURSOR_BLINK
2051 if (hidden_cursor) 2072 if (hidden_cursor)
2052 showcursor = 0; 2073 showcursor = 0;
2053#endif 2074#endif
2054 2075
… …
2082 ccol2 = bgcolor_of (rstyle); 2103 ccol2 = bgcolor_of (rstyle);
2083#else 2104#else
2084 ccol2 = Color_bg; 2105 ccol2 = Color_bg;
2085#endif 2106#endif
2086 2107
2087 if (showcursor && focus) 2108 if (focus)
2088 { 2109 {
2089 if (option (Opt_cursorUnderline)) 2110 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2111 *crp ^= RS_Uline;
2091 else 2112 else
2092 { 2113 {
… …
2127 oldcursor.col = screen.cur.col; 2148 oldcursor.col = screen.cur.col;
2128 } 2149 }
2129 } 2150 }
2130 } 2151 }
2131 2152
2132 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2133#if ENABLE_OVERLAY
2134 scr_swap_overlay ();
2135#endif
2136
2137#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2138 /* 2154 /*
2139 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
2140 * This has been deliberately kept simple. 2156 * This has been deliberately kept simple.
2141 */ 2157 */
… …
2230 continue; 2246 continue;
2231 2247
2232 // redraw one or more characters 2248 // redraw one or more characters
2233 2249
2234 // seek to the beginning of wide characters 2250 // seek to the beginning of wide characters
2235 while (expect_false (stp[col] == NOCHAR && col > 0)) 2251 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2236 --col; 2252 --col;
2237 2253
2238 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2239 text_t *text = stp + col; 2255 text_t *text = stp + col;
2240 int count = 1; 2256 int count = 1;
2241 2257
2242 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2243 drp[col] = rend; 2259 drp[col] = rend;
… …
2247 for (i = 0; ++col < ncol; ) 2263 for (i = 0; ++col < ncol; )
2248 { 2264 {
2249 if (stp[col] == NOCHAR) 2265 if (stp[col] == NOCHAR)
2250 { 2266 {
2251 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2252 drp[col] = rend; 2268 drp[col] = srp[col];
2269
2253 count++; 2270 count++;
2254 i++; 2271 i++;
2255 2272
2256 continue; 2273 continue;
2257 } 2274 }
… …
2277 2294
2278 col--; /* went one too far. move back */ 2295 col--; /* went one too far. move back */
2279 count -= i; /* dump any matching trailing chars */ 2296 count -= i; /* dump any matching trailing chars */
2280 2297
2281 // sometimes we optimize away the trailing NOCHAR's, add them back 2298 // sometimes we optimize away the trailing NOCHAR's, add them back
2282 while (expect_false (i && text[count] == NOCHAR)) 2299 while (ecb_unlikely (i && text[count] == NOCHAR))
2283 count++, i--; 2300 count++, i--;
2284 2301
2285 /* 2302 /*
2286 * Determine the attributes for the string 2303 * Determine the attributes for the string
2287 */ 2304 */
2288 int fore = fgcolor_of (rend); // desired foreground 2305 int fore = fgcolor_of (rend); // desired foreground
2289 int back = bgcolor_of (rend); // desired background 2306 int back = bgcolor_of (rend); // desired background
2290 2307
2291 // 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
2292 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)))
2293 { 2310 {
2294 bool invert = rend & RS_RVid; 2311 bool invert = rend & RS_RVid;
2295 2312
2296#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2297 if (rend & RS_Bold && fore == Color_fg) 2314 if (rend & RS_Bold && fore == Color_fg)
… …
2316 2333
2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2334 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2318 fore = Color_UL; 2335 fore = Color_UL;
2319#endif 2336#endif
2320 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
2321 if (invert) 2358 if (invert)
2322 { 2359 {
2323#ifdef OPTION_HC
2324 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2325 || !ISSET_PIXCOLOR (Color_HC))
2326#endif
2327 /* invert the column if no highlightColor is set or it is the
2328 * current cursor column */
2329 ::swap (fore, back); 2360 ::swap (fore, back);
2330#ifdef OPTION_HC
2331 else if (ISSET_PIXCOLOR (Color_HC))
2332 back = Color_HC;
2333#endif
2334 2361
2335#ifndef NO_BOLD_UNDERLINE_REVERSE 2362#ifndef NO_BOLD_UNDERLINE_REVERSE
2336# ifndef OPTION_HC
2337 if (ISSET_PIXCOLOR (Color_RV))
2338 back = Color_RV;
2339# endif
2340 if (fore == back) 2363 if (fore == back)
2341 { 2364 {
2342 fore = Color_bg; 2365 fore = Color_bg;
2343 back = Color_fg; 2366 back = Color_fg;
2344 } 2367 }
… …
2380 /* 2403 /*
2381 * Actually do the drawing of the string here 2404 * Actually do the drawing of the string here
2382 */ 2405 */
2383 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2406 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2384 2407
2385 if (expect_true (have_bg && back == Color_bg)) 2408 if (ecb_likely (have_bg && back == Color_bg))
2386 { 2409 {
2387 // this is very ugly, maybe push it into ->draw? 2410 // this is very ugly, maybe push it into ->draw?
2388 2411
2389 for (i = 0; i < count; i++) /* don't draw empty strings */ 2412 for (i = 0; i < count; i++) /* don't draw empty strings */
2390 if (text[i] != ' ') 2413 if (text[i] != ' ')
… …
2397 did_clear: ; 2420 did_clear: ;
2398 } 2421 }
2399 else 2422 else
2400 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2401 2424
2402 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2425 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2403 { 2426 {
2404#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2405 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2406 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2407 else 2430 else
… …
2412 xpixel, ypixel + font->ascent + 1, 2435 xpixel, ypixel + font->ascent + 1,
2413 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2436 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2414 } 2437 }
2415 } /* for (col....) */ 2438 } /* for (col....) */
2416 } /* for (row....) */ 2439 } /* for (row....) */
2417
2418#if ENABLE_OVERLAY
2419 scr_swap_overlay ();
2420#endif
2421 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2422 2440
2423 /* 2441 /*
2424 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2425 */ 2443 */
2426 if (showcursor) 2444 if (showcursor)
… …
2465 } 2483 }
2466 2484
2467 /* 2485 /*
2468 * H: cleanup selection 2486 * H: cleanup selection
2469 */ 2487 */
2488#if ENABLE_OVERLAY
2489 scr_swap_overlay ();
2490#endif
2491 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2492
2470 scr_reverse_selection (); 2493 scr_reverse_selection ();
2471 2494
2495 screen.flags = old_screen_flags;
2472 num_scr = 0; 2496 num_scr = 0;
2473 num_scr_allow = 1; 2497 num_scr_allow = 1;
2474} 2498}
2475 2499
2476void 2500void
… …
2497 scr_remap_chars (swap_buf [i]); 2521 scr_remap_chars (swap_buf [i]);
2498 } 2522 }
2499} 2523}
2500 2524
2501void 2525void
2502rxvt_term::scr_recolour () NOTHROW 2526rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2527{
2528 bool transparent = false;
2529
2504#ifdef HAVE_BG_PIXMAP 2530#ifdef HAVE_BG_PIXMAP
2505 bgPixmap.apply (); 2531 if (bg_pixmap != None)
2506#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);
2507 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 {
2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2509 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2552 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2553 }
2554
2555 XClearWindow (dpy, parent);
2511 2556
2512 if (scrollBar.win) 2557 if (scrollBar.win)
2513 { 2558 {
2559 if (transparent)
2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.state = STATE_IDLE; 2563 scrollBar.state = SB_STATE_IDLE;
2516 scrollBar.show (0); 2564 scrollBar.show (0);
2517 } 2565 }
2518 2566
2519#endif 2567 if (refresh)
2520 2568 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2569 scr_clear ();
2523 scr_touch (true); 2570 scr_touch (true);
2571 }
2524 want_refresh = 1; 2572 want_refresh = 1;
2525} 2573}
2526 2574
2527/* ------------------------------------------------------------------------- */ 2575/* ------------------------------------------------------------------------- */
2528void 2576void
… …
2596 { 2644 {
2597#if !ENABLE_MINIMAL 2645#if !ENABLE_MINIMAL
2598 if (selection.rect) 2646 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2647 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2648 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2649 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2650 else
2603#endif 2651#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2652 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2606 RS_RVid); 2654 RS_Sel | RS_RVid);
2607 } 2655 }
2608} 2656}
2609 2657
2610/* ------------------------------------------------------------------------- */ 2658/* ------------------------------------------------------------------------- */
2611/* 2659/*
… …
2616void 2664void
2617rxvt_term::scr_dump (int fd) NOTHROW 2665rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2666{
2619 int row, wrote; 2667 int row, wrote;
2620 unsigned int width, towrite; 2668 unsigned int width, towrite;
2621 char r1[] = "\n"; 2669 const char r1[] = "\n";
2622 2670
2623 for (row = saveLines + top_row; 2671 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++) 2672 row < saveLines + nrow - 1; row++)
2625 { 2673 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l 2674 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2643 * CHARACTER SELECTION * 2691 * CHARACTER SELECTION *
2644 * ------------------------------------------------------------------------- */ 2692 * ------------------------------------------------------------------------- */
2645void 2693void
2646rxvt_term::selection_check (int check_more) NOTHROW 2694rxvt_term::selection_check (int check_more) NOTHROW
2647{ 2695{
2648 row_col_t pos;
2649
2650 if (!selection.op) 2696 if (!selection.op)
2651 return; 2697 return;
2652 2698
2699 row_col_t pos;
2653 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2701
2654 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2655 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2656 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2704 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2657 || (check_more == 1 2705 || (check_more == 1
2658 && current_screen == selection.screen 2706 && current_screen == selection.screen
… …
2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2708 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2661 || (check_more == 2 2709 || (check_more == 2
2662 && ROWCOL_IS_BEFORE (selection.beg, pos) 2710 && ROWCOL_IS_BEFORE (selection.beg, pos)
2663 && ROWCOL_IS_AFTER (selection.end, pos)) 2711 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 3 2712 || (check_more == 3
2665 && ROWCOL_IS_AFTER (selection.end, pos)) 2713 && ROWCOL_IS_AFTER (selection.end, pos)))
2666 || (check_more == 4 /* screen width change */
2667 && (selection.beg.row != selection.end.row
2668 || selection.end.col > ncol)))
2669 CLEAR_SELECTION (); 2714 CLEAR_ALL_SELECTION ();
2670} 2715}
2671 2716
2672/* ------------------------------------------------------------------------- */ 2717/* ------------------------------------------------------------------------- */
2673/* 2718/*
2674 * Paste a selection direct to the command fd 2719 * Paste a selection direct to the command fd
2675 */ 2720 */
2676void 2721void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2722rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2723{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2724 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2725 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2726 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2727 data[i] = C0_CR;
… …
2688 2733
2689 if (priv_modes & PrivMode_BracketPaste) 2734 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2735 tt_printf ("\e[201~");
2691} 2736}
2692 2737
2693/* ------------------------------------------------------------------------- */
2694/*
2695 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify
2697 */
2698void 2738void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2739rxvt_term::paste (char *data, unsigned int len) NOTHROW
2700{ 2740{
2701 if (prop == None) /* check for failed XConvertSelection */ 2741 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2702 {
2703 if ((selection_type & Sel_CompoundText))
2704 {
2705 int selnum = selection_type & Sel_whereMask;
2706
2707 selection_type = 0;
2708 if (selnum != Sel_direct)
2709 selection_request_other (XA_STRING, selnum);
2710 }
2711
2712 if ((selection_type & Sel_UTF8String))
2713 {
2714 int selnum = selection_type & Sel_whereMask;
2715
2716 selection_type = Sel_CompoundText;
2717 if (selnum != Sel_direct)
2718 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2719 else
2720 selection_type = 0;
2721 }
2722
2723 return;
2724 }
2725
2726 unsigned long bytes_after;
2727 XTextProperty ct;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 0, PROP_SIZE / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct.encoding, &ct.format,
2733 &ct.nitems, &bytes_after,
2734 &ct.value) != Success)
2735 {
2736 ct.value = 0;
2737 goto bailout;
2738 }
2739
2740 if (ct.encoding == None)
2741 goto bailout;
2742
2743 if (bytes_after)
2744 {
2745 // fetch and append remaining data
2746 XTextProperty ct2;
2747
2748 if (XGetWindowProperty (dpy, win, prop,
2749 ct.nitems / 4, (bytes_after + 3) / 4,
2750 delete_prop, AnyPropertyType,
2751 &ct2.encoding, &ct2.format,
2752 &ct2.nitems, &bytes_after,
2753 &ct2.value) != Success)
2754 goto bailout;
2755
2756 // realloc should be compatible to XFree, here, and elsewhere, too
2757 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2758 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2759 ct.nitems += ct2.nitems;
2760
2761 XFree (ct2.value);
2762 }
2763
2764 if (ct.value == 0)
2765 goto bailout;
2766
2767 if (ct.encoding == xa[XA_INCR])
2768 {
2769 // INCR selection, start handshake
2770 if (!delete_prop)
2771 XDeleteProperty (dpy, win, prop);
2772
2773 selection_wait = Sel_incr;
2774 incr_buf_fill = 0;
2775 incr_ev.start (10);
2776
2777 goto bailout;
2778 }
2779
2780 if (ct.nitems == 0)
2781 {
2782 if (selection_wait == Sel_incr)
2783 {
2784 XFree (ct.value);
2785
2786 // finally complete, now paste the whole thing
2787 selection_wait = Sel_normal;
2788 ct.value = (unsigned char *)incr_buf;
2789 ct.nitems = incr_buf_fill;
2790 incr_buf = 0;
2791 incr_buf_size = 0;
2792 incr_ev.stop ();
2793 }
2794 else
2795 {
2796 if (selection_wait == Sel_normal
2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2798 {
2799 /*
2800 * pass through again trying CUT_BUFFER0 if we've come from
2801 * XConvertSelection () but nothing was presented
2802 */
2803 selection_paste (display->root, XA_CUT_BUFFER0, False);
2804 }
2805
2806 goto bailout;
2807 }
2808 }
2809 else if (selection_wait == Sel_incr)
2810 {
2811 incr_ev.start (10);
2812
2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2814 {
2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2817 }
2818
2819 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2820 incr_buf_fill += ct.nitems;
2821
2822 goto bailout;
2823 }
2824
2825 char **cl;
2826 int cr;
2827
2828#if !ENABLE_MINIMAL
2829 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2830 // so recode it manually
2831 if (ct.encoding == xa[XA_UTF8_STRING])
2832 {
2833 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2834 char *s = rxvt_wcstombs (w);
2835 free (w);
2836 // TODO: strlen == only the first element will be converted. well...
2837 paste (s, strlen (s));
2838 free (s);
2839 }
2840 else
2841#endif
2842 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2843 && cl)
2844 {
2845 for (int i = 0; i < cr; i++)
2846 paste (cl[i], strlen (cl[i]));
2847
2848 XFreeStringList (cl);
2849 }
2850 else
2851 paste ((char *)ct.value, ct.nitems); // paste raw
2852
2853bailout:
2854 XFree (ct.value);
2855
2856 if (selection_wait == Sel_normal)
2857 selection_wait = Sel_none;
2858}
2859
2860void
2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2862{
2863 selection_wait = Sel_none;
2864
2865 incr_buf_size = 0;
2866 free (incr_buf);
2867
2868 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2869}
2870
2871void
2872rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2873{
2874 if (prop == None || selection_wait != Sel_incr)
2875 return; 2742 return;
2876 2743
2877 selection_paste (win, prop, true); 2744 tt_paste (data, len);
2878} 2745}
2879 2746
2880/* ------------------------------------------------------------------------- */ 2747/* ------------------------------------------------------------------------- */
2881/* 2748/*
2882 * Request the current selection: 2749 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2883 * Order: > internal selection if available 2750 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2751 * as fallback
2885 * > CUT_BUFFER0
2886 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2887 * will auto fallback to CUT_BUFFER0
2888 * EXT: button 2 release 2752 * EXT: button 2 release
2889 */ 2753 */
2890void 2754void
2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2755rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2892{ 2756{
2893 if (selection.text && selnum == Sel_Primary) 2757 if (!selection_req)
2894 {
2895 /* internal selection */
2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2897 paste (str, strlen (str));
2898 free (str);
2899 return;
2900 } 2758 {
2901 else 2759 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2760 selection_req->run ();
2902 { 2761 }
2903 selection_request_time = tm;
2904 selection_wait = Sel_normal;
2905
2906#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return;
2910#else
2911 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return;
2914#endif
2915 }
2916
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false);
2919}
2920
2921int
2922rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2923{
2924 Atom sel;
2925
2926 selection_type |= selnum;
2927
2928 if (selnum == Sel_Primary)
2929 sel = XA_PRIMARY;
2930 else if (selnum == Sel_Secondary)
2931 sel = XA_SECONDARY;
2932 else
2933 sel = xa[XA_CLIPBOARD];
2934
2935 if (XGetSelectionOwner (dpy, sel) != None)
2936 {
2937 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2938 vt, selection_request_time);
2939 return 1;
2940 }
2941
2942 return 0;
2943} 2762}
2944 2763
2945/* ------------------------------------------------------------------------- */ 2764/* ------------------------------------------------------------------------- */
2946/* 2765/*
2947 * Clear all selected text 2766 * Clear all selected text
2948 * EXT: SelectionClear 2767 * EXT: SelectionClear
2949 */ 2768 */
2950void 2769void
2951rxvt_term::selection_clear () NOTHROW 2770rxvt_term::selection_clear (bool clipboard) NOTHROW
2952{ 2771{
2772 if (!clipboard)
2773 {
2953 want_refresh = 1; 2774 want_refresh = 1;
2954 free (selection.text); 2775 free (selection.text);
2955 selection.text = NULL; 2776 selection.text = NULL;
2956 selection.len = 0; 2777 selection.len = 0;
2957 CLEAR_SELECTION (); 2778 CLEAR_SELECTION ();
2958 2779
2959 if (display->selection_owner == this) 2780 if (display->selection_owner == this)
2960 display->selection_owner = 0; 2781 display->selection_owner = 0;
2782 }
2783 else
2784 {
2785 free (selection.clip_text);
2786 selection.clip_text = NULL;
2787 selection.clip_len = 0;
2788
2789 if (display->clipboard_owner == this)
2790 display->clipboard_owner = 0;
2791 }
2961} 2792}
2962 2793
2963/* ------------------------------------------------------------------------- */ 2794/* ------------------------------------------------------------------------- */
2964/* 2795/*
2965 * Copy a selection into the cut buffer 2796 * Copy a selection into the cut buffer
2966 * EXT: button 1 or 3 release 2797 * EXT: button 1 or 3 release
2967 */ 2798 */
2968void 2799void
2969rxvt_term::selection_make (Time tm) 2800rxvt_term::selection_make (Time tm)
2970{ 2801{
2971 int i; 2802 int size;
2972 wchar_t *new_selection_text; 2803 wchar_t *new_selection_text;
2973 text_t *t; 2804 text_t *t;
2974 2805
2975 switch (selection.op) 2806 switch (selection.op)
2976 { 2807 {
… …
2992 return; /* nothing selected, go away */ 2823 return; /* nothing selected, go away */
2993 2824
2994 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2825 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2995 return; 2826 return;
2996 2827
2997 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2828 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2998 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2829 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2999 2830
3000 int ofs = 0; 2831 int ofs = 0;
3001 int extra = 0; 2832 int extra = 0;
3002 2833
3003 int col = selection.beg.col; 2834 int col = selection.beg.col;
… …
3009 { 2840 {
3010#if !ENABLE_MINIMAL 2841#if !ENABLE_MINIMAL
3011 if (selection.rect) 2842 if (selection.rect)
3012 { 2843 {
3013 col = selection.beg.col; 2844 col = selection.beg.col;
3014 end_col = ncol + 1; 2845 end_col = selection.end.col;
3015 } 2846 }
3016 else 2847 else
3017#endif 2848#endif
3018 end_col = ROW(row).l; 2849 end_col = ROW(row).l;
3019 2850
3020 col = max (col, 0); 2851 col = max (col, 0);
3021 2852
3022 if (row == selection.end.row 2853 if (row == selection.end.row)
3023#if !ENABLE_MINIMAL
3024 || selection.rect
3025#endif
3026 )
3027 min_it (end_col, selection.end.col); 2854 min_it (end_col, selection.end.col);
3028 2855
3029 t = ROW(row).t + col; 2856 t = ROW(row).t + col;
3030 2857
3031 for (; col < end_col; col++) 2858 for (; col < end_col; col++)
… …
3039 2866
3040 extra -= (len - 1); 2867 extra -= (len - 1);
3041 2868
3042 if (extra < 0) 2869 if (extra < 0)
3043 { 2870 {
3044 extra += i; 2871 extra += size;
3045 i += i; 2872 size += size;
3046 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2873 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3047 } 2874 }
3048 2875
3049 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2876 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3050 } 2877 }
3051#endif 2878#endif
… …
3063 2890
3064 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3065 } 2892 }
3066 else 2893 else
3067#endif 2894#endif
3068 if (!ROW(row).is_longer () && row != selection.end.row) 2895 if (!ROW(row).is_longer ()
2896 && (row != selection.end.row || end_col != selection.end.col)
2897 && (row != selection.beg.row || selection.beg.col < ncol))
3069 new_selection_text[ofs++] = C0_LF; 2898 new_selection_text[ofs++] = C0_LF;
3070 } 2899 }
3071
3072 if (end_col != selection.end.col)
3073 new_selection_text[ofs++] = C0_LF;
3074 2900
3075 new_selection_text[ofs] = 0; 2901 new_selection_text[ofs] = 0;
3076 2902
3077 if (ofs == 0) 2903 if (ofs == 0)
3078 { 2904 {
… …
3091 2917
3092 selection_grab (tm); 2918 selection_grab (tm);
3093} 2919}
3094 2920
3095bool 2921bool
3096rxvt_term::selection_grab (Time tm) NOTHROW 2922rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3097{ 2923{
2924 Atom sel;
2925
2926 if (!clipboard)
2927 {
3098 selection_time = tm; 2928 selection_time = tm;
2929 sel = XA_PRIMARY;
2930 }
2931 else
2932 {
2933 clipboard_time = tm;
2934 sel = xa[XA_CLIPBOARD];
2935 }
3099 2936
3100 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2937 XSetSelectionOwner (dpy, sel, vt, tm);
3101 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2938 if (XGetSelectionOwner (dpy, sel) == vt)
3102 { 2939 {
3103 display->set_selection_owner (this); 2940 display->set_selection_owner (this, clipboard);
3104 return true; 2941 return true;
3105 } 2942 }
3106 else 2943 else
3107 { 2944 {
3108 selection_clear (); 2945 selection_clear (clipboard);
3109 return false; 2946 return false;
3110 } 2947 }
3111 2948
3112#if 0 2949#if 0
3113 XTextProperty ct; 2950 XTextProperty ct;
… …
3573 * EXT: SelectionRequest 3410 * EXT: SelectionRequest
3574 */ 3411 */
3575void 3412void
3576rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3413rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3577{ 3414{
3415 Atom property = rq.property == None ? rq.target : rq.property;
3578 XSelectionEvent ev; 3416 XSelectionEvent ev;
3579 3417
3580 ev.type = SelectionNotify; 3418 ev.type = SelectionNotify;
3581 ev.property = None; 3419 ev.property = None;
3582 ev.display = rq.display; 3420 ev.display = rq.display;
… …
3597 *target++ = xa[XA_COMPOUND_TEXT]; 3435 *target++ = xa[XA_COMPOUND_TEXT];
3598#if X_HAVE_UTF8_STRING 3436#if X_HAVE_UTF8_STRING
3599 *target++ = xa[XA_UTF8_STRING]; 3437 *target++ = xa[XA_UTF8_STRING];
3600#endif 3438#endif
3601 3439
3602 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3440 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3603 32, PropModeReplace, 3441 32, PropModeReplace,
3604 (unsigned char *)target_list, target - target_list); 3442 (unsigned char *)target_list, target - target_list);
3605 ev.property = rq.property; 3443 ev.property = property;
3606 } 3444 }
3607#if TODO // TODO 3445#if TODO // TODO
3608 else if (rq.target == xa[XA_MULTIPLE]) 3446 else if (rq.target == xa[XA_MULTIPLE])
3609 { 3447 {
3610 /* TODO: Handle MULTIPLE */ 3448 /* TODO: Handle MULTIPLE */
3611 } 3449 }
3612#endif 3450#endif
3613 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3614 { 3452 {
3615 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3453 XChangeProperty (dpy, rq.requestor, property, rq.target,
3616 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3454 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3617 ev.property = rq.property; 3455 ev.property = property;
3456 }
3457 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3458 {
3459 XChangeProperty (dpy, rq.requestor, property, rq.target,
3460 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3461 ev.property = property;
3618 } 3462 }
3619 else if (rq.target == XA_STRING 3463 else if (rq.target == XA_STRING
3620 || rq.target == xa[XA_TEXT] 3464 || rq.target == xa[XA_TEXT]
3621 || rq.target == xa[XA_COMPOUND_TEXT] 3465 || rq.target == xa[XA_COMPOUND_TEXT]
3622 || rq.target == xa[XA_UTF8_STRING] 3466 || rq.target == xa[XA_UTF8_STRING]
… …
3654 { 3498 {
3655 target = xa[XA_COMPOUND_TEXT]; 3499 target = xa[XA_COMPOUND_TEXT];
3656 style = enc_compound_text; 3500 style = enc_compound_text;
3657 } 3501 }
3658 3502
3659 if (selection.text) 3503 if (rq.selection == XA_PRIMARY && selection.text)
3660 { 3504 {
3661 cl = selection.text; 3505 cl = selection.text;
3662 selectlen = selection.len; 3506 selectlen = selection.len;
3507 }
3508 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3509 {
3510 cl = selection.clip_text;
3511 selectlen = selection.clip_len;
3663 } 3512 }
3664 else 3513 else
3665 { 3514 {
3666 cl = L""; 3515 cl = L"";
3667 selectlen = 0; 3516 selectlen = 0;
… …
3688 ct.value = (unsigned char *)cl; 3537 ct.value = (unsigned char *)cl;
3689 ct.nitems = selectlen; 3538 ct.nitems = selectlen;
3690 ct.encoding = target; 3539 ct.encoding = target;
3691 } 3540 }
3692 3541
3693 XChangeProperty (dpy, rq.requestor, rq.property, 3542 XChangeProperty (dpy, rq.requestor, property,
3694 ct.encoding, 8, PropModeReplace, 3543 ct.encoding, 8, PropModeReplace,
3695 ct.value, (int)ct.nitems); 3544 ct.value, (int)ct.nitems);
3696 ev.property = rq.property; 3545 ev.property = property;
3697 3546
3698 if (freect) 3547 if (freect)
3699 XFree (ct.value); 3548 XFree (ct.value);
3700 } 3549 }
3701 3550
… …
3735 h += 2; min_it (h, nrow); 3584 h += 2; min_it (h, nrow);
3736 3585
3737 x -= 1; clamp_it (x, 0, ncol - w); 3586 x -= 1; clamp_it (x, 0, ncol - w);
3738 y -= 1; clamp_it (y, 0, nrow - h); 3587 y -= 1; clamp_it (y, 0, nrow - h);
3739 3588
3740 ov_x = x; ov_y = y; 3589 ov.x = x; ov.y = y;
3741 ov_w = w; ov_h = h; 3590 ov.w = w; ov.h = h;
3742 3591
3743 ov_text = new text_t *[h]; 3592 ov.text = new text_t *[h];
3744 ov_rend = new rend_t *[h]; 3593 ov.rend = new rend_t *[h];
3745 3594
3746 for (y = 0; y < h; y++) 3595 for (y = 0; y < h; y++)
3747 { 3596 {
3748 text_t *tp = ov_text[y] = new text_t[w]; 3597 text_t *tp = ov.text[y] = new text_t[w];
3749 rend_t *rp = ov_rend[y] = new rend_t[w]; 3598 rend_t *rp = ov.rend[y] = new rend_t[w];
3750 3599
3751 text_t t0, t1, t2; 3600 text_t t0, t1, t2;
3752 rend_t r = OVERLAY_RSTYLE; 3601 rend_t r = OVERLAY_RSTYLE;
3753 3602
3754 if (y == 0) 3603 if (y == 0)
… …
3773} 3622}
3774 3623
3775void 3624void
3776rxvt_term::scr_overlay_off () NOTHROW 3625rxvt_term::scr_overlay_off () NOTHROW
3777{ 3626{
3778 if (!ov_text) 3627 if (!ov.text)
3779 return; 3628 return;
3780 3629
3781 want_refresh = 1; 3630 want_refresh = 1;
3782 3631
3783 for (int y = 0; y < ov_h; y++) 3632 for (int y = 0; y < ov.h; y++)
3784 { 3633 {
3785 delete [] ov_text[y]; 3634 delete [] ov.text[y];
3786 delete [] ov_rend[y]; 3635 delete [] ov.rend[y];
3787 } 3636 }
3788 3637
3789 delete [] ov_text; ov_text = 0; 3638 delete [] ov.text; ov.text = 0;
3790 delete [] ov_rend; ov_rend = 0; 3639 delete [] ov.rend; ov.rend = 0;
3791} 3640}
3792 3641
3793void 3642void
3794rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3643rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3795{ 3644{
3796 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3645 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3797 return; 3646 return;
3798 3647
3799 x++, y++; 3648 x++, y++;
3800 3649
3801 ov_text[y][x] = text; 3650 ov.text[y][x] = text;
3802 ov_rend[y][x] = rend; 3651 ov.rend[y][x] = rend;
3803} 3652}
3804 3653
3805void 3654void
3806rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3655rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3807{ 3656{
… …
3826} 3675}
3827 3676
3828void 3677void
3829rxvt_term::scr_swap_overlay () NOTHROW 3678rxvt_term::scr_swap_overlay () NOTHROW
3830{ 3679{
3831 if (!ov_text) 3680 if (!ov.text)
3832 return; 3681 return;
3833 3682
3683 // hide cursor if it is within the overlay area
3684 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3685 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3686 screen.flags &= ~Screen_VisibleCursor;
3687
3834 // swap screen mem with overlay 3688 // swap screen mem with overlay
3835 for (int y = ov_h; y--; ) 3689 for (int y = ov.h; y--; )
3836 { 3690 {
3837 text_t *t1 = ov_text[y]; 3691 text_t *t1 = ov.text[y];
3838 rend_t *r1 = ov_rend[y]; 3692 rend_t *r1 = ov.rend[y];
3839 3693
3840 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3694 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3841 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3695 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3842 3696
3843 for (int x = ov_w; x--; ) 3697 for (int x = ov.w; x--; )
3844 { 3698 {
3845 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3699 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3846 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3700 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3847 } 3701 }
3848 } 3702 }

Diff Legend

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