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.400 by sf-exg, Tue Nov 15 02:24:25 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)
686 { 688 {
687 selection.beg.row -= count; 689 selection.beg.row -= count;
688 selection.end.row -= count; 690 selection.end.row -= count;
689 selection.mark.row -= count; 691 selection.mark.row -= count;
690 692
691 if (selection.beg.row < top_row 693 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 } 694 }
699 695
700 // finally move the view window, if desired 696 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 697 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 698 && view_start != 0
… …
732 } 728 }
733 729
734 // use a simple and robust scrolling algorithm, this 730 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 731 // part of scr_scroll_text is not time-critical.
736 732
733 // sever line above scroll region
734 if (row1)
735 {
736 line_t &l = ROW(row1 - 1);
737 l.is_longer (0);
738 l.touch ();
739 }
740
737 int rows = row2 - row1 + 1; 741 int rows = row2 - row1 + 1;
738 742
739 min_it (count, rows); 743 min_it (count, rows);
740 744
741 line_t *temp_buf = row_buf + total_rows; 745 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 746
743 for (int row = 0; row < rows; row++) 747 for (int row = 0; row < rows; row++)
744 { 748 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 749 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 750
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 752 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 753 }
750 754
751 for (int row = 0; row < rows; row++) 755 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 756 ROW(row1 + row) = temp_buf [row];
757
758 // sever bottommost line
759 {
760 line_t &l = ROW(row2);
761 l.is_longer (0);
762 l.touch ();
763 }
753 } 764 }
754 765
755 return count; 766 return count;
756} 767}
757 768
… …
786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 797 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
787 screen.cur.row -= minlines; 798 screen.cur.row -= minlines;
788 } 799 }
789 } 800 }
790 801
791#ifdef DEBUG_STRICT
792 assert (screen.cur.col < ncol); 802 assert (screen.cur.col < ncol);
793 assert (screen.cur.row < nrow 803 assert (screen.cur.row < nrow
794 && screen.cur.row >= top_row); 804 && screen.cur.row >= top_row);
795#endif
796 int row = screen.cur.row; 805 int row = screen.cur.row;
797 806
798 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 807 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
799 808
800 line_t *line = &ROW(row); 809 line_t *line = &ROW(row);
801 810
802 while (str < strend) 811 while (str < strend)
803 { 812 {
804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 813 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
805 814
806 if (expect_false (c < 0x20)) 815 if (ecb_unlikely (c < 0x20))
807 if (c == C0_LF) 816 if (c == C0_LF)
808 { 817 {
809 max_it (line->l, screen.cur.col); 818 max_it (line->l, screen.cur.col);
810 819
811 screen.flags &= ~Screen_WrapNext; 820 screen.flags &= ~Screen_WrapNext;
… …
830 { 839 {
831 scr_tab (1, true); 840 scr_tab (1, true);
832 continue; 841 continue;
833 } 842 }
834 843
835 if (expect_false ( 844 if (ecb_unlikely (
836 checksel /* see if we're writing within selection */ 845 checksel /* see if we're writing within selection */
837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 846 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
838 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 847 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
839 )) 848 ))
840 { 849 {
… …
845 * should be a similar check. 854 * should be a similar check.
846 */ 855 */
847 CLEAR_SELECTION (); 856 CLEAR_SELECTION ();
848 } 857 }
849 858
850 if (expect_false (screen.flags & Screen_WrapNext)) 859 if (ecb_unlikely (screen.flags & Screen_WrapNext))
851 { 860 {
852 scr_do_wrap (); 861 scr_do_wrap ();
853 862
854 line->l = ncol; 863 line->l = ncol;
855 line->is_longer (1); 864 line->is_longer (1);
… …
857 row = screen.cur.row; 866 row = screen.cur.row;
858 line = &ROW(row); /* _must_ refresh */ 867 line = &ROW(row); /* _must_ refresh */
859 } 868 }
860 869
861 // some utf-8 decoders "decode" surrogate characters: let's fix this. 870 // some utf-8 decoders "decode" surrogate characters: let's fix this.
862 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 871 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
863 c = 0xfffd; 872 c = 0xfffd;
864 873
865 // rely on wcwidth to tell us the character width, do wcwidth before 874 // rely on wcwidth to tell us the character width, do wcwidth before
866 // further replacements, as wcwidth might return -1 for the line 875 // further replacements, as wcwidth might return -1 for the line
867 // drawing characters below as they might be invalid in the current 876 // drawing characters below as they might be invalid in the current
868 // locale. 877 // locale.
869 int width = WCWIDTH (c); 878 int width = WCWIDTH (c);
870 879
871 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 880 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
872 { 881 {
873 // vt100 special graphics and line drawing 882 // vt100 special graphics and line drawing
874 // 5f-7e standard vt100 883 // 5f-7e standard vt100
875 // 40-5e rxvt extension for extra curses acs chars 884 // 40-5e rxvt extension for extra curses acs chars
876 static uint16_t vt100_0[62] = { // 41 .. 7e 885 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
889 c = vt100_0[c - 0x41]; 898 c = vt100_0[c - 0x41];
890 width = 1; // vt100 line drawing characters are always single-width 899 width = 1; // vt100 line drawing characters are always single-width
891 } 900 }
892 } 901 }
893 902
894 if (expect_false (screen.flags & Screen_Insert)) 903 if (ecb_unlikely (screen.flags & Screen_Insert))
895 scr_insdel_chars (width, INSERT); 904 scr_insdel_chars (width, INSERT);
896 905
897 if (width != 0) 906 if (width != 0)
898 { 907 {
899#if !UNICODE_3 908#if !UNICODE_3
… …
904# else 913# else
905 c = 0xfffd; 914 c = 0xfffd;
906# endif 915# endif
907#endif 916#endif
908 917
918 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
919
920 // if the character doesn't fit into the remaining columns...
921 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
922 {
923 if (screen.flags & Screen_Autowrap)
924 {
925 // ... artificially enlargen the previous one
926 c = NOCHAR;
927 // and try the same character next loop iteration
928 --str;
929 }
930 else
931 screen.cur.col = ncol - width;
932 }
933
909 // nuke the character at this position, if required 934 // nuke the character at this position, if required
910 if (expect_false ( 935 // due to wonderful coincidences everywhere else in this loop
936 // we never have to check for overwriting a wide char itself,
937 // only its tail.
911 line->t[screen.cur.col] == NOCHAR 938 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); 939 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 940
928 line->touch (); 941 line->touch ();
929 942
930 do 943 do
931 { 944 {
932 line->t[screen.cur.col] = c; 945 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 946 line->r[screen.cur.col] = rend;
934 947
935 if (expect_true (screen.cur.col < ncol - 1)) 948 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 949 screen.cur.col++;
937 else 950 else
938 { 951 {
939 line->l = ncol; 952 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 953 if (screen.flags & Screen_Autowrap)
941 screen.flags |= Screen_WrapNext; 954 screen.flags |= Screen_WrapNext;
942 break; 955
956 goto end_of_line;
943 } 957 }
944 958
945 c = NOCHAR; 959 c = NOCHAR;
946 } 960 }
947 while (expect_false (--width > 0)); 961 while (ecb_unlikely (--width > 0));
948 962
949 // pad with spaces when overwriting wide character with smaller one 963 // pad with spaces when overwriting wide character with smaller one
950 if (expect_false (!width)) 964 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
951 { 965 {
952 line->touch ();
953
954 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
955 {
956 line->t[c] = ' '; 966 line->t[c] = ' ';
957 line->r[c] = rend; 967 line->r[c] = rend;
958 }
959 } 968 }
969
970end_of_line:
971 ;
960 } 972 }
961#if ENABLE_COMBINING 973#if ENABLE_COMBINING
962 else // width == 0 974 else // width == 0
963 { 975 {
964 if (c != 0xfeff) // ignore BOM 976 if (c != 0xfeff) // ignore BOM
… …
1004#endif 1016#endif
1005 } 1017 }
1006 1018
1007 max_it (line->l, screen.cur.col); 1019 max_it (line->l, screen.cur.col);
1008 1020
1009#ifdef DEBUG_STRICT
1010 assert (screen.cur.row >= 0); 1021 assert (screen.cur.row >= 0);
1011#endif
1012} 1022}
1013 1023
1014/* ------------------------------------------------------------------------- */ 1024/* ------------------------------------------------------------------------- */
1015/* 1025/*
1016 * Process Backspace. Move back the cursor back a position, wrap if have to 1026 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1029 1039
1030 want_refresh = 1; 1040 want_refresh = 1;
1031#endif 1041#endif
1032 } 1042 }
1033 } 1043 }
1044 else if (screen.flags & Screen_WrapNext)
1045 screen.flags &= ~Screen_WrapNext;
1034 else 1046 else
1035 scr_gotorc (0, -1, RELATIVE); 1047 scr_gotorc (0, -1, RELATIVE);
1036} 1048}
1037 1049
1038/* ------------------------------------------------------------------------- */ 1050/* ------------------------------------------------------------------------- */
… …
1344 if (row >= nrow) /* Out Of Bounds */ 1356 if (row >= nrow) /* Out Of Bounds */
1345 return; 1357 return;
1346 1358
1347 min_it (num, nrow - row); 1359 min_it (num, nrow - row);
1348 1360
1349 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1350 if (rstyle & (RS_RVid | RS_Uline)) 1361 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1351 ren = (rend_t) ~RS_None; 1362 ren = (rend_t) ~RS_None;
1352 else if (GET_BASEBG (rstyle) == Color_bg) 1363 else if (GET_BASEBG (rstyle) == Color_bg)
1353 { 1364 {
1354 ren = DEFAULT_RSTYLE; 1365 ren = DEFAULT_RSTYLE;
1355 1366
1356 if (mapped) 1367 if (mapped)
1357 XClearArea (dpy, vt, 0, 1368 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row), (unsigned int)width, 1369 Row2Pixel (row - view_start), (unsigned int)width,
1359 (unsigned int)Height2Pixel (num), False); 1370 (unsigned int)Height2Pixel (num), False);
1360 } 1371 }
1361 else 1372 else
1362 { 1373 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1374 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 1375
1376 if (mapped)
1377 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1379 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1380 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row), 1381 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1382 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num)); 1383 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1386 }
1373 } 1387 }
1374 1388
1375 for (; num--; row++) 1389 for (; num--; row++)
1376 { 1390 {
1377 scr_blank_screen_mem (ROW(row), rstyle); 1391 scr_blank_screen_mem (ROW(row), rstyle);
1392
1393 if (row - view_start < nrow)
1378 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1394 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1379 } 1395 }
1380} 1396}
1381 1397
1382#if !ENABLE_MINIMAL 1398#if !ENABLE_MINIMAL
1383void 1399void
… …
1536 { 1552 {
1537 line->t[col] = line->t[col + count]; 1553 line->t[col] = line->t[col + count];
1538 line->r[col] = line->r[col + count]; 1554 line->r[col] = line->r[col + count];
1539 } 1555 }
1540 1556
1541 scr_blank_line (*line, ncol - count, count, 1557 scr_blank_line (*line, ncol - count, count, rstyle);
1542 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1543 1558
1544 if (selection.op && current_screen == selection.screen 1559 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1560 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1561 {
1547 if (selection.end.row != screen.cur.row 1562 if (selection.end.row != screen.cur.row
… …
1683 { 1698 {
1684 rvideo_state = on; 1699 rvideo_state = on;
1685 1700
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1701 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1702#ifdef HAVE_BG_PIXMAP
1688 if (bgPixmap.pixmap == None) 1703 if (bg_pixmap == None)
1689#endif 1704#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1705 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1706
1692 XGCValues gcvalue; 1707 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1708 gcvalue.foreground = pix_colors[Color_fg];
… …
1837 for (i = PART_BEG; i < RC_COUNT; i++) 1852 for (i = PART_BEG; i < RC_COUNT; i++)
1838 { 1853 {
1839 min_it (rc[i].col, ncol - 1); 1854 min_it (rc[i].col, ncol - 1);
1840 min_it (rc[i].row, nrow - 1); 1855 min_it (rc[i].row, nrow - 1);
1841 } 1856 }
1842// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1857
1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1858 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); 1859 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1845 1860
1846 num_scr_allow = 0; 1861 num_scr_allow = 0;
1847 1862
… …
1920 1935
1921# ifndef NO_MAPALERT 1936# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1937# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1938 if (option (Opt_mapAlert))
1924# endif 1939# endif
1925 XMapWindow (dpy, parent[0]); 1940 XMapWindow (dpy, parent);
1926# endif 1941# endif
1927 1942
1928# if ENABLE_FRILLS 1943# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1944 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1945 set_urgency (1);
… …
1938 1953
1939 bell_ev.start (VISUAL_BELL_DURATION); 1954 bell_ev.start (VISUAL_BELL_DURATION);
1940 } 1955 }
1941 else 1956 else
1942 XBell (dpy, 0); 1957 XBell (dpy, 0);
1958 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1943#endif 1959#endif
1944} 1960}
1945 1961
1946/* ------------------------------------------------------------------------- */ 1962/* ------------------------------------------------------------------------- */
1947/* ARGSUSED */
1948void 1963void
1949rxvt_term::scr_printscreen (int fullhist) NOTHROW 1964rxvt_term::scr_printscreen (int fullhist) NOTHROW
1950{ 1965{
1951#ifdef PRINTPIPE 1966#ifdef PRINTPIPE
1952 int nrows, row_start; 1967 int nrows, row_start;
… …
1966 row_start = view_start; 1981 row_start = view_start;
1967 } 1982 }
1968 1983
1969 wctomb (0, 0); 1984 wctomb (0, 0);
1970 1985
1971 for (int r1 = 0; r1 < nrows; r1++) 1986 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1972 { 1987 {
1973 text_t *tp = ROW(r1).t; 1988 text_t *tp = ROW(r1).t;
1974 int len = ROW(r1).l; 1989 int len = ROW(r1).l;
1975 1990
1976 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1991 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2005 * screen.text/screen.rend contain what the screen will change to. 2020 * screen.text/screen.rend contain what the screen will change to.
2006 */ 2021 */
2007void 2022void
2008rxvt_term::scr_refresh () NOTHROW 2023rxvt_term::scr_refresh () NOTHROW
2009{ 2024{
2010 unsigned char have_bg,
2011 showcursor; /* show the cursor */
2012 int16_t col, row, /* column/row we're processing */ 2025 int16_t col, row, /* column/row we're processing */
2013 ocrow; /* old cursor row */ 2026 ocrow; /* old cursor row */
2014 int i; /* tmp */ 2027 int i; /* tmp */
2015#ifndef NO_CURSORCOLOR 2028#ifndef NO_CURSORCOLOR
2016 rend_t cc1; /* store colours at cursor position (s) */ 2029 rend_t cc1; /* store colours at cursor position (s) */
… …
2027 /* 2040 /*
2028 * A: set up vars 2041 * A: set up vars
2029 */ 2042 */
2030 refresh_count = 0; 2043 refresh_count = 0;
2031 2044
2045 unsigned int old_screen_flags = screen.flags;
2032 have_bg = 0; 2046 char have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2047#ifdef HAVE_BG_PIXMAP
2034 have_bg = bgPixmap.pixmap != None; 2048 have_bg = bg_pixmap != None;
2035#endif 2049#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2050 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2051
2038 /* 2052 /*
2039 * B: reverse any characters which are selected 2053 * B: reverse any characters which are selected
2040 */ 2054 */
2041 scr_reverse_selection (); 2055 scr_reverse_selection ();
2056
2057 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2058#if ENABLE_OVERLAY
2059 scr_swap_overlay ();
2060#endif
2061
2062 char showcursor = screen.flags & Screen_VisibleCursor;
2042 2063
2043 /* 2064 /*
2044 * C: set the cursor character (s) 2065 * C: set the cursor character (s)
2045 */ 2066 */
2046 { 2067 {
2047 unsigned char setoldcursor; 2068 unsigned char setoldcursor;
2048 2069
2049 showcursor = (screen.flags & Screen_VisibleCursor);
2050#ifdef CURSOR_BLINK 2070#ifdef CURSOR_BLINK
2051 if (hidden_cursor) 2071 if (hidden_cursor)
2052 showcursor = 0; 2072 showcursor = 0;
2053#endif 2073#endif
2054 2074
… …
2082 ccol2 = bgcolor_of (rstyle); 2102 ccol2 = bgcolor_of (rstyle);
2083#else 2103#else
2084 ccol2 = Color_bg; 2104 ccol2 = Color_bg;
2085#endif 2105#endif
2086 2106
2087 if (showcursor && focus) 2107 if (focus)
2088 { 2108 {
2089 if (option (Opt_cursorUnderline)) 2109 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2110 *crp ^= RS_Uline;
2091 else 2111 else
2092 { 2112 {
… …
2127 oldcursor.col = screen.cur.col; 2147 oldcursor.col = screen.cur.col;
2128 } 2148 }
2129 } 2149 }
2130 } 2150 }
2131 2151
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 2152#ifndef NO_SLOW_LINK_SUPPORT
2138 /* 2153 /*
2139 * D: CopyArea pass - very useful for slower links 2154 * D: CopyArea pass - very useful for slower links
2140 * This has been deliberately kept simple. 2155 * This has been deliberately kept simple.
2141 */ 2156 */
… …
2230 continue; 2245 continue;
2231 2246
2232 // redraw one or more characters 2247 // redraw one or more characters
2233 2248
2234 // seek to the beginning of wide characters 2249 // seek to the beginning of wide characters
2235 while (expect_false (stp[col] == NOCHAR && col > 0)) 2250 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2236 --col; 2251 --col;
2237 2252
2238 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2253 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2239 text_t *text = stp + col; 2254 text_t *text = stp + col;
2240 int count = 1; 2255 int count = 1;
2241 2256
2242 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2243 drp[col] = rend; 2258 drp[col] = rend;
… …
2247 for (i = 0; ++col < ncol; ) 2262 for (i = 0; ++col < ncol; )
2248 { 2263 {
2249 if (stp[col] == NOCHAR) 2264 if (stp[col] == NOCHAR)
2250 { 2265 {
2251 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2252 drp[col] = rend; 2267 drp[col] = srp[col];
2268
2253 count++; 2269 count++;
2254 i++; 2270 i++;
2255 2271
2256 continue; 2272 continue;
2257 } 2273 }
… …
2277 2293
2278 col--; /* went one too far. move back */ 2294 col--; /* went one too far. move back */
2279 count -= i; /* dump any matching trailing chars */ 2295 count -= i; /* dump any matching trailing chars */
2280 2296
2281 // sometimes we optimize away the trailing NOCHAR's, add them back 2297 // sometimes we optimize away the trailing NOCHAR's, add them back
2282 while (expect_false (i && text[count] == NOCHAR)) 2298 while (ecb_unlikely (i && text[count] == NOCHAR))
2283 count++, i--; 2299 count++, i--;
2284 2300
2285 /* 2301 /*
2286 * Determine the attributes for the string 2302 * Determine the attributes for the string
2287 */ 2303 */
2288 int fore = fgcolor_of (rend); // desired foreground 2304 int fore = fgcolor_of (rend); // desired foreground
2289 int back = bgcolor_of (rend); // desired background 2305 int back = bgcolor_of (rend); // desired background
2290 2306
2291 // only do special processing if any attributes are set, which is unlikely 2307 // 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))) 2308 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2293 { 2309 {
2294 bool invert = rend & RS_RVid; 2310 bool invert = rend & RS_RVid;
2295 2311
2296#ifndef NO_BOLD_UNDERLINE_REVERSE 2312#ifndef NO_BOLD_UNDERLINE_REVERSE
2297 if (rend & RS_Bold && fore == Color_fg) 2313 if (rend & RS_Bold && fore == Color_fg)
… …
2316 2332
2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2333 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2318 fore = Color_UL; 2334 fore = Color_UL;
2319#endif 2335#endif
2320 2336
2337#ifdef OPTION_HC
2338 if (rend & RS_Sel)
2339 {
2340 /* invert the column if no highlightColor is set or it is the
2341 * current cursor column */
2342 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2343 && ISSET_PIXCOLOR (Color_HC))
2344 {
2345 if (ISSET_PIXCOLOR (Color_HTC))
2346 fore = Color_HTC;
2347 // if invert is 0 reverse video is set so we use bg color as fg color
2348 else if (!invert)
2349 fore = back;
2350
2351 back = Color_HC;
2352 invert = 0;
2353 }
2354 }
2355#endif
2356
2321 if (invert) 2357 if (invert)
2322 { 2358 {
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); 2359 ::swap (fore, back);
2330#ifdef OPTION_HC
2331 else if (ISSET_PIXCOLOR (Color_HC))
2332 back = Color_HC;
2333#endif
2334 2360
2335#ifndef NO_BOLD_UNDERLINE_REVERSE 2361#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) 2362 if (fore == back)
2341 { 2363 {
2342 fore = Color_bg; 2364 fore = Color_bg;
2343 back = Color_fg; 2365 back = Color_fg;
2344 } 2366 }
… …
2380 /* 2402 /*
2381 * Actually do the drawing of the string here 2403 * Actually do the drawing of the string here
2382 */ 2404 */
2383 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2405 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2384 2406
2385 if (expect_true (have_bg && back == Color_bg)) 2407 if (ecb_likely (have_bg && back == Color_bg))
2386 { 2408 {
2387 // this is very ugly, maybe push it into ->draw? 2409 // this is very ugly, maybe push it into ->draw?
2388 2410
2389 for (i = 0; i < count; i++) /* don't draw empty strings */ 2411 for (i = 0; i < count; i++) /* don't draw empty strings */
2390 if (text[i] != ' ') 2412 if (text[i] != ' ')
… …
2397 did_clear: ; 2419 did_clear: ;
2398 } 2420 }
2399 else 2421 else
2400 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2422 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2401 2423
2402 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2424 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2403 { 2425 {
2404#if ENABLE_FRILLS 2426#if ENABLE_FRILLS
2405 if (ISSET_PIXCOLOR (Color_underline)) 2427 if (ISSET_PIXCOLOR (Color_underline))
2406 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2428 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2407 else 2429 else
… …
2412 xpixel, ypixel + font->ascent + 1, 2434 xpixel, ypixel + font->ascent + 1,
2413 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2435 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2414 } 2436 }
2415 } /* for (col....) */ 2437 } /* for (col....) */
2416 } /* for (row....) */ 2438 } /* for (row....) */
2417
2418#if ENABLE_OVERLAY
2419 scr_swap_overlay ();
2420#endif
2421 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2422 2439
2423 /* 2440 /*
2424 * G: cleanup cursor and display outline cursor if necessary 2441 * G: cleanup cursor and display outline cursor if necessary
2425 */ 2442 */
2426 if (showcursor) 2443 if (showcursor)
… …
2465 } 2482 }
2466 2483
2467 /* 2484 /*
2468 * H: cleanup selection 2485 * H: cleanup selection
2469 */ 2486 */
2487#if ENABLE_OVERLAY
2488 scr_swap_overlay ();
2489#endif
2490 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2491
2470 scr_reverse_selection (); 2492 scr_reverse_selection ();
2471 2493
2494 screen.flags = old_screen_flags;
2472 num_scr = 0; 2495 num_scr = 0;
2473 num_scr_allow = 1; 2496 num_scr_allow = 1;
2474} 2497}
2475 2498
2476void 2499void
… …
2497 scr_remap_chars (swap_buf [i]); 2520 scr_remap_chars (swap_buf [i]);
2498 } 2521 }
2499} 2522}
2500 2523
2501void 2524void
2502rxvt_term::scr_recolour () NOTHROW 2525rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2526{
2527 bool transparent = false;
2528
2504#ifdef HAVE_BG_PIXMAP 2529#ifdef HAVE_BG_PIXMAP
2505 bgPixmap.apply (); 2530 if (bg_pixmap != None)
2506#else 2531 {
2532# ifdef ENABLE_TRANSPARENCY
2533 if (bg_flags & BG_IS_TRANSPARENT)
2534 {
2535 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2536 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2507 2537
2538 transparent = true;
2539 }
2540 else
2541# endif
2542 {
2543 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2544 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2545 }
2546 }
2547 else
2548#endif
2549 {
2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2509 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2551 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2552 }
2553
2554 XClearWindow (dpy, parent);
2511 2555
2512 if (scrollBar.win) 2556 if (scrollBar.win)
2513 { 2557 {
2558 if (transparent)
2559 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2560 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.state = STATE_IDLE; 2562 scrollBar.state = SB_STATE_IDLE;
2516 scrollBar.show (0); 2563 scrollBar.show (0);
2517 } 2564 }
2518 2565
2519#endif 2566 if (refresh)
2520 2567 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2568 scr_clear ();
2523 scr_touch (true); 2569 scr_touch (true);
2570 }
2524 want_refresh = 1; 2571 want_refresh = 1;
2525} 2572}
2526 2573
2527/* ------------------------------------------------------------------------- */ 2574/* ------------------------------------------------------------------------- */
2528void 2575void
… …
2596 { 2643 {
2597#if !ENABLE_MINIMAL 2644#if !ENABLE_MINIMAL
2598 if (selection.rect) 2645 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2646 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2647 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2648 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2649 else
2603#endif 2650#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2651 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2652 selection.end.row, selection.end.col,
2606 RS_RVid); 2653 RS_Sel | RS_RVid);
2607 } 2654 }
2608} 2655}
2609 2656
2610/* ------------------------------------------------------------------------- */ 2657/* ------------------------------------------------------------------------- */
2611/* 2658/*
… …
2616void 2663void
2617rxvt_term::scr_dump (int fd) NOTHROW 2664rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2665{
2619 int row, wrote; 2666 int row, wrote;
2620 unsigned int width, towrite; 2667 unsigned int width, towrite;
2621 char r1[] = "\n"; 2668 const char r1[] = "\n";
2622 2669
2623 for (row = saveLines + top_row; 2670 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++) 2671 row < saveLines + nrow - 1; row++)
2625 { 2672 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l 2673 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2643 * CHARACTER SELECTION * 2690 * CHARACTER SELECTION *
2644 * ------------------------------------------------------------------------- */ 2691 * ------------------------------------------------------------------------- */
2645void 2692void
2646rxvt_term::selection_check (int check_more) NOTHROW 2693rxvt_term::selection_check (int check_more) NOTHROW
2647{ 2694{
2648 row_col_t pos;
2649
2650 if (!selection.op) 2695 if (!selection.op)
2651 return; 2696 return;
2652 2697
2698 row_col_t pos;
2653 pos.row = pos.col = 0; 2699 pos.row = pos.col = 0;
2700
2654 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2701 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2655 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2702 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2656 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2657 || (check_more == 1 2704 || (check_more == 1
2658 && current_screen == selection.screen 2705 && current_screen == selection.screen
… …
2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2661 || (check_more == 2 2708 || (check_more == 2
2662 && ROWCOL_IS_BEFORE (selection.beg, pos) 2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2663 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 3 2711 || (check_more == 3
2665 && ROWCOL_IS_AFTER (selection.end, pos)) 2712 && 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 (); 2713 CLEAR_ALL_SELECTION ();
2670} 2714}
2671 2715
2672/* ------------------------------------------------------------------------- */ 2716/* ------------------------------------------------------------------------- */
2673/* 2717/*
2674 * Paste a selection direct to the command fd 2718 * Paste a selection direct to the command fd
2675 */ 2719 */
2676void 2720void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2722{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2723 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2724 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2725 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2726 data[i] = C0_CR;
… …
2688 2732
2689 if (priv_modes & PrivMode_BracketPaste) 2733 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2734 tt_printf ("\e[201~");
2691} 2735}
2692 2736
2693/* ------------------------------------------------------------------------- */
2694/*
2695 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify
2697 */
2698void 2737void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2738rxvt_term::paste (char *data, unsigned int len) NOTHROW
2700{ 2739{
2701 if (prop == None) /* check for failed XConvertSelection */ 2740 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; 2741 return;
2876 2742
2877 selection_paste (win, prop, true); 2743 tt_paste (data, len);
2878} 2744}
2879 2745
2880/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2881/* 2747/*
2882 * Request the current selection: 2748 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2883 * Order: > internal selection if available 2749 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2750 * 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 2751 * EXT: button 2 release
2889 */ 2752 */
2890void 2753void
2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2754rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2892{ 2755{
2893 if (selection.text && selnum == Sel_Primary) 2756 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 } 2757 {
2901 else 2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2759 selection_req->run ();
2902 { 2760 }
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} 2761}
2944 2762
2945/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2946/* 2764/*
2947 * Clear all selected text 2765 * Clear all selected text
2948 * EXT: SelectionClear 2766 * EXT: SelectionClear
2949 */ 2767 */
2950void 2768void
2951rxvt_term::selection_clear () NOTHROW 2769rxvt_term::selection_clear (bool clipboard) NOTHROW
2952{ 2770{
2771 if (!clipboard)
2772 {
2953 want_refresh = 1; 2773 want_refresh = 1;
2954 free (selection.text); 2774 free (selection.text);
2955 selection.text = NULL; 2775 selection.text = NULL;
2956 selection.len = 0; 2776 selection.len = 0;
2957 CLEAR_SELECTION (); 2777 CLEAR_SELECTION ();
2958 2778
2959 if (display->selection_owner == this) 2779 if (display->selection_owner == this)
2960 display->selection_owner = 0; 2780 display->selection_owner = 0;
2781 }
2782 else
2783 {
2784 free (selection.clip_text);
2785 selection.clip_text = NULL;
2786 selection.clip_len = 0;
2787
2788 if (display->clipboard_owner == this)
2789 display->clipboard_owner = 0;
2790 }
2961} 2791}
2962 2792
2963/* ------------------------------------------------------------------------- */ 2793/* ------------------------------------------------------------------------- */
2964/* 2794/*
2965 * Copy a selection into the cut buffer 2795 * Copy a selection into the cut buffer
2966 * EXT: button 1 or 3 release 2796 * EXT: button 1 or 3 release
2967 */ 2797 */
2968void 2798void
2969rxvt_term::selection_make (Time tm) 2799rxvt_term::selection_make (Time tm)
2970{ 2800{
2971 int i; 2801 int size;
2972 wchar_t *new_selection_text; 2802 wchar_t *new_selection_text;
2973 text_t *t; 2803 text_t *t;
2974 2804
2975 switch (selection.op) 2805 switch (selection.op)
2976 { 2806 {
… …
2992 return; /* nothing selected, go away */ 2822 return; /* nothing selected, go away */
2993 2823
2994 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2824 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2995 return; 2825 return;
2996 2826
2997 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2827 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2998 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2828 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2999 2829
3000 int ofs = 0; 2830 int ofs = 0;
3001 int extra = 0; 2831 int extra = 0;
3002 2832
3003 int col = selection.beg.col; 2833 int col = selection.beg.col;
… …
3009 { 2839 {
3010#if !ENABLE_MINIMAL 2840#if !ENABLE_MINIMAL
3011 if (selection.rect) 2841 if (selection.rect)
3012 { 2842 {
3013 col = selection.beg.col; 2843 col = selection.beg.col;
3014 end_col = ncol + 1; 2844 end_col = selection.end.col;
3015 } 2845 }
3016 else 2846 else
3017#endif 2847#endif
3018 end_col = ROW(row).l; 2848 end_col = ROW(row).l;
3019 2849
3020 col = max (col, 0); 2850 col = max (col, 0);
3021 2851
3022 if (row == selection.end.row 2852 if (row == selection.end.row)
3023#if !ENABLE_MINIMAL
3024 || selection.rect
3025#endif
3026 )
3027 min_it (end_col, selection.end.col); 2853 min_it (end_col, selection.end.col);
3028 2854
3029 t = ROW(row).t + col; 2855 t = ROW(row).t + col;
3030 2856
3031 for (; col < end_col; col++) 2857 for (; col < end_col; col++)
… …
3039 2865
3040 extra -= (len - 1); 2866 extra -= (len - 1);
3041 2867
3042 if (extra < 0) 2868 if (extra < 0)
3043 { 2869 {
3044 extra += i; 2870 extra += size;
3045 i += i; 2871 size += size;
3046 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2872 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3047 } 2873 }
3048 2874
3049 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2875 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3050 } 2876 }
3051#endif 2877#endif
… …
3063 2889
3064 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3065 } 2891 }
3066 else 2892 else
3067#endif 2893#endif
3068 if (!ROW(row).is_longer () && row != selection.end.row) 2894 if (!ROW(row).is_longer ()
2895 && (row != selection.end.row || end_col != selection.end.col)
2896 && (row != selection.beg.row || selection.beg.col < ncol))
3069 new_selection_text[ofs++] = C0_LF; 2897 new_selection_text[ofs++] = C0_LF;
3070 } 2898 }
3071
3072 if (end_col != selection.end.col)
3073 new_selection_text[ofs++] = C0_LF;
3074 2899
3075 new_selection_text[ofs] = 0; 2900 new_selection_text[ofs] = 0;
3076 2901
3077 if (ofs == 0) 2902 if (ofs == 0)
3078 { 2903 {
… …
3091 2916
3092 selection_grab (tm); 2917 selection_grab (tm);
3093} 2918}
3094 2919
3095bool 2920bool
3096rxvt_term::selection_grab (Time tm) NOTHROW 2921rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3097{ 2922{
2923 Atom sel;
2924
2925 if (!clipboard)
2926 {
3098 selection_time = tm; 2927 selection_time = tm;
2928 sel = XA_PRIMARY;
2929 }
2930 else
2931 {
2932 clipboard_time = tm;
2933 sel = xa[XA_CLIPBOARD];
2934 }
3099 2935
3100 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2936 XSetSelectionOwner (dpy, sel, vt, tm);
3101 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2937 if (XGetSelectionOwner (dpy, sel) == vt)
3102 { 2938 {
3103 display->set_selection_owner (this); 2939 display->set_selection_owner (this, clipboard);
3104 return true; 2940 return true;
3105 } 2941 }
3106 else 2942 else
3107 { 2943 {
3108 selection_clear (); 2944 selection_clear (clipboard);
3109 return false; 2945 return false;
3110 } 2946 }
3111 2947
3112#if 0 2948#if 0
3113 XTextProperty ct; 2949 XTextProperty ct;
… …
3573 * EXT: SelectionRequest 3409 * EXT: SelectionRequest
3574 */ 3410 */
3575void 3411void
3576rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3412rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3577{ 3413{
3414 Atom property = rq.property == None ? rq.target : rq.property;
3578 XSelectionEvent ev; 3415 XSelectionEvent ev;
3579 3416
3580 ev.type = SelectionNotify; 3417 ev.type = SelectionNotify;
3581 ev.property = None; 3418 ev.property = None;
3582 ev.display = rq.display; 3419 ev.display = rq.display;
… …
3597 *target++ = xa[XA_COMPOUND_TEXT]; 3434 *target++ = xa[XA_COMPOUND_TEXT];
3598#if X_HAVE_UTF8_STRING 3435#if X_HAVE_UTF8_STRING
3599 *target++ = xa[XA_UTF8_STRING]; 3436 *target++ = xa[XA_UTF8_STRING];
3600#endif 3437#endif
3601 3438
3602 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3439 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3603 32, PropModeReplace, 3440 32, PropModeReplace,
3604 (unsigned char *)target_list, target - target_list); 3441 (unsigned char *)target_list, target - target_list);
3605 ev.property = rq.property; 3442 ev.property = property;
3606 } 3443 }
3607#if TODO // TODO 3444#if TODO // TODO
3608 else if (rq.target == xa[XA_MULTIPLE]) 3445 else if (rq.target == xa[XA_MULTIPLE])
3609 { 3446 {
3610 /* TODO: Handle MULTIPLE */ 3447 /* TODO: Handle MULTIPLE */
3611 } 3448 }
3612#endif 3449#endif
3613 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3450 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3614 { 3451 {
3615 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3616 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3453 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3617 ev.property = rq.property; 3454 ev.property = property;
3455 }
3456 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3457 {
3458 XChangeProperty (dpy, rq.requestor, property, rq.target,
3459 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3460 ev.property = property;
3618 } 3461 }
3619 else if (rq.target == XA_STRING 3462 else if (rq.target == XA_STRING
3620 || rq.target == xa[XA_TEXT] 3463 || rq.target == xa[XA_TEXT]
3621 || rq.target == xa[XA_COMPOUND_TEXT] 3464 || rq.target == xa[XA_COMPOUND_TEXT]
3622 || rq.target == xa[XA_UTF8_STRING] 3465 || rq.target == xa[XA_UTF8_STRING]
… …
3654 { 3497 {
3655 target = xa[XA_COMPOUND_TEXT]; 3498 target = xa[XA_COMPOUND_TEXT];
3656 style = enc_compound_text; 3499 style = enc_compound_text;
3657 } 3500 }
3658 3501
3659 if (selection.text) 3502 if (rq.selection == XA_PRIMARY && selection.text)
3660 { 3503 {
3661 cl = selection.text; 3504 cl = selection.text;
3662 selectlen = selection.len; 3505 selectlen = selection.len;
3506 }
3507 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3508 {
3509 cl = selection.clip_text;
3510 selectlen = selection.clip_len;
3663 } 3511 }
3664 else 3512 else
3665 { 3513 {
3666 cl = L""; 3514 cl = L"";
3667 selectlen = 0; 3515 selectlen = 0;
… …
3688 ct.value = (unsigned char *)cl; 3536 ct.value = (unsigned char *)cl;
3689 ct.nitems = selectlen; 3537 ct.nitems = selectlen;
3690 ct.encoding = target; 3538 ct.encoding = target;
3691 } 3539 }
3692 3540
3693 XChangeProperty (dpy, rq.requestor, rq.property, 3541 XChangeProperty (dpy, rq.requestor, property,
3694 ct.encoding, 8, PropModeReplace, 3542 ct.encoding, 8, PropModeReplace,
3695 ct.value, (int)ct.nitems); 3543 ct.value, (int)ct.nitems);
3696 ev.property = rq.property; 3544 ev.property = property;
3697 3545
3698 if (freect) 3546 if (freect)
3699 XFree (ct.value); 3547 XFree (ct.value);
3700 } 3548 }
3701 3549
… …
3735 h += 2; min_it (h, nrow); 3583 h += 2; min_it (h, nrow);
3736 3584
3737 x -= 1; clamp_it (x, 0, ncol - w); 3585 x -= 1; clamp_it (x, 0, ncol - w);
3738 y -= 1; clamp_it (y, 0, nrow - h); 3586 y -= 1; clamp_it (y, 0, nrow - h);
3739 3587
3740 ov_x = x; ov_y = y; 3588 ov.x = x; ov.y = y;
3741 ov_w = w; ov_h = h; 3589 ov.w = w; ov.h = h;
3742 3590
3743 ov_text = new text_t *[h]; 3591 ov.text = new text_t *[h];
3744 ov_rend = new rend_t *[h]; 3592 ov.rend = new rend_t *[h];
3745 3593
3746 for (y = 0; y < h; y++) 3594 for (y = 0; y < h; y++)
3747 { 3595 {
3748 text_t *tp = ov_text[y] = new text_t[w]; 3596 text_t *tp = ov.text[y] = new text_t[w];
3749 rend_t *rp = ov_rend[y] = new rend_t[w]; 3597 rend_t *rp = ov.rend[y] = new rend_t[w];
3750 3598
3751 text_t t0, t1, t2; 3599 text_t t0, t1, t2;
3752 rend_t r = OVERLAY_RSTYLE; 3600 rend_t r = OVERLAY_RSTYLE;
3753 3601
3754 if (y == 0) 3602 if (y == 0)
… …
3773} 3621}
3774 3622
3775void 3623void
3776rxvt_term::scr_overlay_off () NOTHROW 3624rxvt_term::scr_overlay_off () NOTHROW
3777{ 3625{
3778 if (!ov_text) 3626 if (!ov.text)
3779 return; 3627 return;
3780 3628
3781 want_refresh = 1; 3629 want_refresh = 1;
3782 3630
3783 for (int y = 0; y < ov_h; y++) 3631 for (int y = 0; y < ov.h; y++)
3784 { 3632 {
3785 delete [] ov_text[y]; 3633 delete [] ov.text[y];
3786 delete [] ov_rend[y]; 3634 delete [] ov.rend[y];
3787 } 3635 }
3788 3636
3789 delete [] ov_text; ov_text = 0; 3637 delete [] ov.text; ov.text = 0;
3790 delete [] ov_rend; ov_rend = 0; 3638 delete [] ov.rend; ov.rend = 0;
3791} 3639}
3792 3640
3793void 3641void
3794rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3642rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3795{ 3643{
3796 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3644 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3797 return; 3645 return;
3798 3646
3799 x++, y++; 3647 x++, y++;
3800 3648
3801 ov_text[y][x] = text; 3649 ov.text[y][x] = text;
3802 ov_rend[y][x] = rend; 3650 ov.rend[y][x] = rend;
3803} 3651}
3804 3652
3805void 3653void
3806rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3654rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3807{ 3655{
… …
3826} 3674}
3827 3675
3828void 3676void
3829rxvt_term::scr_swap_overlay () NOTHROW 3677rxvt_term::scr_swap_overlay () NOTHROW
3830{ 3678{
3831 if (!ov_text) 3679 if (!ov.text)
3832 return; 3680 return;
3833 3681
3682 // hide cursor if it is within the overlay area
3683 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3684 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3685 screen.flags &= ~Screen_VisibleCursor;
3686
3834 // swap screen mem with overlay 3687 // swap screen mem with overlay
3835 for (int y = ov_h; y--; ) 3688 for (int y = ov.h; y--; )
3836 { 3689 {
3837 text_t *t1 = ov_text[y]; 3690 text_t *t1 = ov.text[y];
3838 rend_t *r1 = ov_rend[y]; 3691 rend_t *r1 = ov.rend[y];
3839 3692
3840 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3693 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; 3694 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3842 3695
3843 for (int x = ov_w; x--; ) 3696 for (int x = ov.w; x--; )
3844 { 3697 {
3845 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3698 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3846 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3699 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3847 } 3700 }
3848 } 3701 }

Diff Legend

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