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.315 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.391 by root, Sun Jul 10 00:39:53 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 begin, 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++;
153 } while (col < ncol && l.t[col] == NOCHAR); 154 } while (col < ncol && l.t[col] == NOCHAR);
… …
162{ 163{
163#if ENABLE_OVERLAY 164#if ENABLE_OVERLAY
164 scr_overlay_off (); 165 scr_overlay_off ();
165#endif 166#endif
166 167
167 rvideo_mode = false;
168 view_start = 0; 168 view_start = 0;
169 num_scr = 0; 169 num_scr = 0;
170 170
171 if (ncol == 0) 171 if (ncol == 0)
172 ncol = 80; 172 ncol = 80;
… …
174 if (nrow == 0) 174 if (nrow == 0)
175 nrow = 24; 175 nrow = 24;
176 176
177 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 178 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 179
183 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
185 { 182 {
186 //TODO//FIXME 183 //TODO//FIXME
… …
206 term_start = 0; 203 term_start = 0;
207 204
208 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
209 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
210 207
211 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
212 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
213 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
214 211
215 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
216 { 213 {
… …
239 selection.text = NULL; 236 selection.text = NULL;
240 selection.len = 0; 237 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
243 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
244 } 243 }
245 else 244 else
246 { 245 {
247 /* 246 /*
248 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
276 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);
277 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);
278 } 277 }
279 278
280 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
281 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
282 281
283 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
284 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
285 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
286 285
287 if (top_row) 286 if (top_row)
288 { 287 {
289 // 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
290 // 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
291 291
292 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 294
295 do 295 do
296 { 296 {
297 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 299 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 301
304 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 ())
305 { 303 {
… …
399 delete old_ta; 397 delete old_ta;
400 delete old_ra; 398 delete old_ra;
401 399
402 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
404 403
405 free (tabs); 404 free (tabs);
406 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
407 409
408 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
409 411
410 prev_nrow = nrow; 412 prev_nrow = nrow;
411 prev_ncol = ncol; 413 prev_ncol = ncol;
412
413 tabs = (char *)rxvt_malloc (ncol);
414
415 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420 414
421 tt_winch (); 415 tt_winch ();
422 416
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 418}
… …
436 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
437 431
438 free (row_buf); 432 free (row_buf);
439 free (swap_buf); 433 free (swap_buf);
440 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
441 free (tabs); 437 free (tabs);
442 438 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 439 }
445} 440}
446 441
447/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
448/* 443/*
449 * Hard reset 444 * Hard/Soft reset
450 */ 445 */
451void 446void
452rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
453{ 448{
454 scr_release (); 449 scr_release ();
455 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
456 scr_reset (); 453 scr_reset ();
457 454
458 scr_clear (true); 455 scr_clear (true);
459 scr_refresh (); 456 scr_refresh ();
457}
458
459void
460rxvt_term::scr_soft_reset ()
461{
462 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY
464 scr_overlay_off ();
465#endif
466
467 if (current_screen != PRIMARY)
468 scr_swap_screen ();
469
470 scr_scroll_region (0, MAX_ROWS - 1);
471 scr_rendition (0, ~RS_None);
472 scr_insert_mode (0);
460} 473}
461 474
462/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
502 } 515 }
503 516
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
510#endif
511} 522}
512 523
513void 524void
514rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
515{ 526{
… …
540 want_refresh = 1; 551 want_refresh = 1;
541 view_start = 0; 552 view_start = 0;
542 553
543 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
544 555
545 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
546 557
547#if NSCREENS 558#if NSCREENS
548 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
549 { 560 {
550 num_scr = 0; 561 num_scr = 0;
… …
627 638
628 if (count > 0 639 if (count > 0
629 && row1 == 0 640 && row1 == 0
630 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
631 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
632 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
633
634 // scroll everything up 'count' lines
635 term_start = (term_start + count) % total_rows;
636 646
637 // sever bottommost line 647 // sever bottommost line
638 { 648 {
639 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
640 l.is_longer (0); 650 l.is_longer (0);
641 l.touch (); 651 l.touch ();
642 } 652 }
643 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
644 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
645 for (int i = count; i--; ) 670 for (int i = count; i--; )
646 { 671 {
647 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
648 673
649 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
650 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
651 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)))
652 { 677 {
653 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
654 l.l = 0; 679 l.l = 0;
655 l.f = 0; 680 l.f = 0;
656 } 681 }
657 else 682 else
658 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
659 }
660
661 // now copy lines below the scroll region bottom to the
662 // bottom of the screen again, so they look as if they
663 // hadn't moved.
664 for (int i = nrow; --i > row2; )
665 {
666 line_t &l1 = ROW(i - count);
667 line_t &l2 = ROW(i);
668
669 ::swap (l1, l2);
670 l2.touch ();
671 } 684 }
672 685
673 // move and/or clear selection, if any 686 // move and/or clear selection, if any
674 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen)
675 { 688 {
… …
721 } 734 }
722 735
723 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
724 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
725 738
739 // sever line above scroll region
740 if (row1)
741 {
742 line_t &l = ROW(row1 - 1);
743 l.is_longer (0);
744 l.touch ();
745 }
746
726 int rows = row2 - row1 + 1; 747 int rows = row2 - row1 + 1;
727 748
728 min_it (count, rows); 749 min_it (count, rows);
729 750
730 line_t *temp_buf = row_buf + total_rows; 751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
731 752
732 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
733 { 754 {
734 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
735 756
… …
737 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
738 } 759 }
739 760
740 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
741 ROW(row1 + row) = temp_buf [row]; 762 ROW(row1 + row) = temp_buf [row];
763
764 // sever bottommost line
765 {
766 line_t &l = ROW(row2 - 1);
767 l.is_longer (0);
768 l.touch ();
769 }
770
742 } 771 }
743 772
744 return count; 773 return count;
745} 774}
746 775
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 804 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 805 screen.cur.row -= minlines;
777 } 806 }
778 } 807 }
779 808
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 809 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 810 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 811 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 812 int row = screen.cur.row;
786 813
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 814 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 815
789 line_t *line = &ROW(row); 816 line_t *line = &ROW(row);
790 817
791 while (str < strend) 818 while (str < strend)
792 { 819 {
793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 820 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
794 821
795 if (expect_false (c < 0x20)) 822 if (ecb_unlikely (c < 0x20))
796 if (c == C0_LF) 823 if (c == C0_LF)
797 { 824 {
798 max_it (line->l, screen.cur.col); 825 max_it (line->l, screen.cur.col);
799 826
800 screen.flags &= ~Screen_WrapNext; 827 screen.flags &= ~Screen_WrapNext;
… …
819 { 846 {
820 scr_tab (1, true); 847 scr_tab (1, true);
821 continue; 848 continue;
822 } 849 }
823 850
824 if (expect_false ( 851 if (ecb_unlikely (
825 checksel /* see if we're writing within selection */ 852 checksel /* see if we're writing within selection */
826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 853 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
827 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 854 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 )) 855 ))
829 { 856 {
… …
834 * should be a similar check. 861 * should be a similar check.
835 */ 862 */
836 CLEAR_SELECTION (); 863 CLEAR_SELECTION ();
837 } 864 }
838 865
839 if (expect_false (screen.flags & Screen_WrapNext)) 866 if (ecb_unlikely (screen.flags & Screen_WrapNext))
840 { 867 {
841 scr_do_wrap (); 868 scr_do_wrap ();
842 869
843 line->l = ncol; 870 line->l = ncol;
844 line->is_longer (1); 871 line->is_longer (1);
… …
846 row = screen.cur.row; 873 row = screen.cur.row;
847 line = &ROW(row); /* _must_ refresh */ 874 line = &ROW(row); /* _must_ refresh */
848 } 875 }
849 876
850 // some utf-8 decoders "decode" surrogate characters: let's fix this. 877 // some utf-8 decoders "decode" surrogate characters: let's fix this.
851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 878 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
852 c = 0xfffd; 879 c = 0xfffd;
853 880
854 // rely on wcwidth to tell us the character width, do wcwidth before 881 // rely on wcwidth to tell us the character width, do wcwidth before
855 // further replacements, as wcwidth might return -1 for the line 882 // further replacements, as wcwidth might return -1 for the line
856 // drawing characters below as they might be invalid in the current 883 // drawing characters below as they might be invalid in the current
857 // locale. 884 // locale.
858 int width = WCWIDTH (c); 885 int width = WCWIDTH (c);
859 886
860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 887 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
861 { 888 {
862 // vt100 special graphics and line drawing 889 // vt100 special graphics and line drawing
863 // 5f-7e standard vt100 890 // 5f-7e standard vt100
864 // 40-5e rxvt extension for extra curses acs chars 891 // 40-5e rxvt extension for extra curses acs chars
865 static uint16_t vt100_0[62] = { // 41 .. 7e 892 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
878 c = vt100_0[c - 0x41]; 905 c = vt100_0[c - 0x41];
879 width = 1; // vt100 line drawing characters are always single-width 906 width = 1; // vt100 line drawing characters are always single-width
880 } 907 }
881 } 908 }
882 909
883 if (expect_false (screen.flags & Screen_Insert)) 910 if (ecb_unlikely (screen.flags & Screen_Insert))
884 scr_insdel_chars (width, INSERT); 911 scr_insdel_chars (width, INSERT);
885 912
886 if (width != 0) 913 if (width != 0)
887 { 914 {
888#if !UNICODE_3 915#if !UNICODE_3
… …
893# else 920# else
894 c = 0xfffd; 921 c = 0xfffd;
895# endif 922# endif
896#endif 923#endif
897 924
925 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
926
927 // if the character doesn't fit into the remaining columns...
928 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
929 {
930 if (screen.flags & Screen_Autowrap)
931 {
932 // ... artificially enlargen the previous one
933 c = NOCHAR;
934 // and try the same character next loop iteration
935 --str;
936 }
937 else
938 screen.cur.col = ncol - width;
939 }
940
898 // nuke the character at this position, if required 941 // nuke the character at this position, if required
899 if (expect_false ( 942 // due to wonderful coincidences everywhere else in this loop
943 // we never have to check for overwriting a wide char itself,
944 // only its tail.
900 line->t[screen.cur.col] == NOCHAR 945 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
901 || (screen.cur.col < ncol - 1
902 && line->t[screen.cur.col + 1] == NOCHAR)
903 ))
904 scr_kill_char (*line, screen.cur.col); 946 scr_kill_char (*line, screen.cur.col);
905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907
908 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 {
911 // ...output spaces
912 c = ' ';
913 // and try the same character next loop iteration
914 --str;
915 }
916 947
917 line->touch (); 948 line->touch ();
918 949
919 do 950 do
920 { 951 {
921 line->t[screen.cur.col] = c; 952 line->t[screen.cur.col] = c;
922 line->r[screen.cur.col] = rend; 953 line->r[screen.cur.col] = rend;
923 954
924 if (expect_true (screen.cur.col < ncol - 1)) 955 if (ecb_likely (screen.cur.col < ncol - 1))
925 screen.cur.col++; 956 screen.cur.col++;
926 else 957 else
927 { 958 {
928 line->l = ncol; 959 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 960 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 961 screen.flags |= Screen_WrapNext;
931 break; 962
963 goto end_of_line;
932 } 964 }
933 965
934 c = NOCHAR; 966 c = NOCHAR;
935 } 967 }
936 while (expect_false (--width > 0)); 968 while (ecb_unlikely (--width > 0));
937 969
938 // pad with spaces when overwriting wide character with smaller one 970 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 971 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
940 { 972 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 973 line->t[c] = ' ';
946 line->r[c] = rend; 974 line->r[c] = rend;
947 }
948 } 975 }
976
977end_of_line:
978 ;
949 } 979 }
950#if ENABLE_COMBINING 980#if ENABLE_COMBINING
951 else // width == 0 981 else // width == 0
952 { 982 {
953 if (c != 0xfeff) // ignore BOM 983 if (c != 0xfeff) // ignore BOM
… …
993#endif 1023#endif
994 } 1024 }
995 1025
996 max_it (line->l, screen.cur.col); 1026 max_it (line->l, screen.cur.col);
997 1027
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1028 assert (screen.cur.row >= 0);
1000#endif
1001} 1029}
1002 1030
1003/* ------------------------------------------------------------------------- */ 1031/* ------------------------------------------------------------------------- */
1004/* 1032/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1033 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1046
1019 want_refresh = 1; 1047 want_refresh = 1;
1020#endif 1048#endif
1021 } 1049 }
1022 } 1050 }
1051 else if (screen.flags & Screen_WrapNext)
1052 screen.flags &= ~Screen_WrapNext;
1023 else 1053 else
1024 scr_gotorc (0, -1, RELATIVE); 1054 scr_gotorc (0, -1, RELATIVE);
1025} 1055}
1026 1056
1027/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1363 if (row >= nrow) /* Out Of Bounds */
1334 return; 1364 return;
1335 1365
1336 min_it (num, nrow - row); 1366 min_it (num, nrow - row);
1337 1367
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1368 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1369 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1370 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1371 {
1343 ren = DEFAULT_RSTYLE; 1372 ren = DEFAULT_RSTYLE;
1344 1373
1345 if (mapped) 1374 if (mapped)
1346 XClearArea (dpy, vt, 0, 1375 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1376 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1377 (unsigned int)Height2Pixel (num), False);
1349 } 1378 }
1350 else 1379 else
1351 { 1380 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1381 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1382
1383 if (mapped)
1384 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1385 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1386 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1387 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1388 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1389 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1390 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1391 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1392 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1393 }
1362 } 1394 }
1363 1395
1364 for (; num--; row++) 1396 for (; num--; row++)
1365 { 1397 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1398 scr_blank_screen_mem (ROW(row), rstyle);
1399
1400 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1401 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1402 }
1369} 1403}
1370 1404
1371#if !ENABLE_MINIMAL 1405#if !ENABLE_MINIMAL
1372void 1406void
… …
1464 line_t *line = &ROW(row); 1498 line_t *line = &ROW(row);
1465 1499
1466 line->touch (); 1500 line->touch ();
1467 line->is_longer (0); 1501 line->is_longer (0);
1468 1502
1469 // nuke wide char at beginning 1503 // nuke wide spanning the start
1470 if (line->t[screen.cur.col] == NOCHAR) 1504 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col); 1505 scr_kill_char (*line, screen.cur.col);
1472 1506
1473 switch (insdel) 1507 switch (insdel)
1474 { 1508 {
… …
1513 1547
1514 scr_blank_line (*line, screen.cur.col, count, rstyle); 1548 scr_blank_line (*line, screen.cur.col, count, rstyle);
1515 break; 1549 break;
1516 1550
1517 case DELETE: 1551 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0); 1552 line->l = max (line->l - count, 0);
1520 1553
1521 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1554 // nuke wide char spanning the end
1555 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1556 scr_kill_char (*line, screen.cur.col + count);
1522 1557
1523 for (int col = screen.cur.col; (col + count) < ncol; col++) 1558 for (int col = screen.cur.col; (col + count) < ncol; col++)
1524 { 1559 {
1525 line->t[col] = line->t[col + count]; 1560 line->t[col] = line->t[col + count];
1526 line->r[col] = line->r[col + count]; 1561 line->r[col] = line->r[col + count];
1527 } 1562 }
1528 1563
1529 // nuke wide char at the end
1530 if (line->t[screen.cur.col] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col);
1532
1533 scr_blank_line (*line, ncol - count, count, tr); 1564 scr_blank_line (*line, ncol - count, count, rstyle);
1534 1565
1535 if (selection.op && current_screen == selection.screen 1566 if (selection.op && current_screen == selection.screen
1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1567 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1537 { 1568 {
1538 if (selection.end.row != screen.cur.row 1569 if (selection.end.row != screen.cur.row
1539 || (screen.cur.col >= selection.beg.col - count) 1570 || (screen.cur.col >= selection.beg.col - count)
1540 || selection.end.col >= ncol) 1571 || selection.end.col >= ncol)
1541 CLEAR_SELECTION (); 1572 CLEAR_SELECTION ();
1542 else 1573 else
1543 { 1574 {
1544 /* shift selection */ 1575 /* shift selection */
1545 selection.beg.col -= count; 1576 selection.beg.col -= count;
1546 selection.mark.col -= count; /* XXX: yes? */ 1577 selection.mark.col -= count; /* XXX: yes? */
1547 selection.end.col -= count; 1578 selection.end.col -= count;
1548 } 1579 }
1549 }
1550 } 1580 }
1551 1581
1552 break; 1582 break;
1553 } 1583 }
1554} 1584}
… …
1675 { 1705 {
1676 rvideo_state = on; 1706 rvideo_state = on;
1677 1707
1678 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1679#ifdef HAVE_BG_PIXMAP 1709#ifdef HAVE_BG_PIXMAP
1680 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1681#endif 1711#endif
1682 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1683 1713
1684 XGCValues gcvalue; 1714 XGCValues gcvalue;
1685 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1829 for (i = PART_BEG; i < RC_COUNT; i++) 1859 for (i = PART_BEG; i < RC_COUNT; i++)
1830 { 1860 {
1831 min_it (rc[i].col, ncol - 1); 1861 min_it (rc[i].col, ncol - 1);
1832 min_it (rc[i].row, nrow - 1); 1862 min_it (rc[i].row, nrow - 1);
1833 } 1863 }
1834// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1864
1835 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1865 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1836 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1866 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1837 1867
1838 num_scr_allow = 0; 1868 num_scr_allow = 0;
1839 1869
… …
1912 1942
1913# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1914# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1915 if (option (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1916# endif 1946# endif
1917 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1918# endif 1948# endif
1919 1949
1920# if ENABLE_FRILLS 1950# if ENABLE_FRILLS
1921 if (option (Opt_urgentOnBell)) 1951 if (option (Opt_urgentOnBell))
1922 set_urgency (1); 1952 set_urgency (1);
… …
1930 1960
1931 bell_ev.start (VISUAL_BELL_DURATION); 1961 bell_ev.start (VISUAL_BELL_DURATION);
1932 } 1962 }
1933 else 1963 else
1934 XBell (dpy, 0); 1964 XBell (dpy, 0);
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1935#endif 1966#endif
1936} 1967}
1937 1968
1938/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1939/* ARGSUSED */
1940void 1970void
1941rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1942{ 1972{
1943#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1944 int nrows, row_start; 1974 int nrows, row_start;
… …
1958 row_start = view_start; 1988 row_start = view_start;
1959 } 1989 }
1960 1990
1961 wctomb (0, 0); 1991 wctomb (0, 0);
1962 1992
1963 for (int r1 = 0; r1 < nrows; r1++) 1993 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1964 { 1994 {
1965 text_t *tp = ROW(r1).t; 1995 text_t *tp = ROW(r1).t;
1966 int len = ROW(r1).l; 1996 int len = ROW(r1).l;
1967 1997
1968 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1998 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1997 * screen.text/screen.rend contain what the screen will change to. 2027 * screen.text/screen.rend contain what the screen will change to.
1998 */ 2028 */
1999void 2029void
2000rxvt_term::scr_refresh () NOTHROW 2030rxvt_term::scr_refresh () NOTHROW
2001{ 2031{
2002 unsigned char have_bg,
2003 showcursor; /* show the cursor */
2004 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
2005 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
2006 int i; /* tmp */ 2034 int i; /* tmp */
2007#ifndef NO_CURSORCOLOR 2035#ifndef NO_CURSORCOLOR
2008 rend_t cc1; /* store colours at cursor position (s) */ 2036 rend_t cc1; /* store colours at cursor position (s) */
… …
2019 /* 2047 /*
2020 * A: set up vars 2048 * A: set up vars
2021 */ 2049 */
2022 refresh_count = 0; 2050 refresh_count = 0;
2023 2051
2052 unsigned int old_screen_flags = screen.flags;
2024 have_bg = 0; 2053 char have_bg = 0;
2025#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2026 have_bg = bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
2027#endif 2056#endif
2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2029 2058
2030 /* 2059 /*
2031 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
2032 */ 2061 */
2033 scr_reverse_selection (); 2062 scr_reverse_selection ();
2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY
2066 scr_swap_overlay ();
2067#endif
2068
2069 char showcursor = screen.flags & Screen_VisibleCursor;
2034 2070
2035 /* 2071 /*
2036 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2037 */ 2073 */
2038 { 2074 {
2039 unsigned char setoldcursor; 2075 unsigned char setoldcursor;
2040 2076
2041 showcursor = (screen.flags & Screen_VisibleCursor);
2042#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2043 if (hidden_cursor) 2078 if (hidden_cursor)
2044 showcursor = 0; 2079 showcursor = 0;
2045#endif 2080#endif
2046 2081
… …
2074 ccol2 = bgcolor_of (rstyle); 2109 ccol2 = bgcolor_of (rstyle);
2075#else 2110#else
2076 ccol2 = Color_bg; 2111 ccol2 = Color_bg;
2077#endif 2112#endif
2078 2113
2079 if (showcursor && focus) 2114 if (focus)
2080 { 2115 {
2081 if (option (Opt_cursorUnderline)) 2116 if (option (Opt_cursorUnderline))
2082 *crp ^= RS_Uline; 2117 *crp ^= RS_Uline;
2083 else 2118 else
2084 { 2119 {
… …
2119 oldcursor.col = screen.cur.col; 2154 oldcursor.col = screen.cur.col;
2120 } 2155 }
2121 } 2156 }
2122 } 2157 }
2123 2158
2124 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2125#if ENABLE_OVERLAY
2126 scr_swap_overlay ();
2127#endif
2128
2129#ifndef NO_SLOW_LINK_SUPPORT 2159#ifndef NO_SLOW_LINK_SUPPORT
2130 /* 2160 /*
2131 * D: CopyArea pass - very useful for slower links 2161 * D: CopyArea pass - very useful for slower links
2132 * This has been deliberately kept simple. 2162 * This has been deliberately kept simple.
2133 */ 2163 */
… …
2222 continue; 2252 continue;
2223 2253
2224 // redraw one or more characters 2254 // redraw one or more characters
2225 2255
2226 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2227 while (expect_false (stp[col] == NOCHAR && col > 0)) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2228 --col; 2258 --col;
2229 2259
2230 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2231 text_t *text = stp + col; 2261 text_t *text = stp + col;
2232 int count = 1; 2262 int count = 1;
2233 2263
2234 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2235 drp[col] = rend; 2265 drp[col] = rend;
… …
2239 for (i = 0; ++col < ncol; ) 2269 for (i = 0; ++col < ncol; )
2240 { 2270 {
2241 if (stp[col] == NOCHAR) 2271 if (stp[col] == NOCHAR)
2242 { 2272 {
2243 dtp[col] = stp[col]; 2273 dtp[col] = stp[col];
2244 drp[col] = rend; 2274 drp[col] = srp[col];
2275
2245 count++; 2276 count++;
2246 i++; 2277 i++;
2247 2278
2248 continue; 2279 continue;
2249 } 2280 }
… …
2269 2300
2270 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2271 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2272 2303
2273 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2274 while (expect_false (i && text[count] == NOCHAR)) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2275 count++, i--; 2306 count++, i--;
2276 2307
2277 /* 2308 /*
2278 * Determine the attributes for the string 2309 * Determine the attributes for the string
2279 */ 2310 */
2280 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2281 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2282 2313
2283 // only do special processing if any attributes are set, which is unlikely 2314 // only do special processing if any attributes are set, which is unlikely
2284 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2285 { 2316 {
2286 bool invert = rend & RS_RVid; 2317 bool invert = rend & RS_RVid;
2287 2318
2288#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2289 if (rend & RS_Bold && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
… …
2308 2339
2309 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2340 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2310 fore = Color_UL; 2341 fore = Color_UL;
2311#endif 2342#endif
2312 2343
2344#ifdef OPTION_HC
2345 if (rend & RS_Sel)
2346 {
2347 /* invert the column if no highlightColor is set or it is the
2348 * current cursor column */
2349 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2350 && ISSET_PIXCOLOR (Color_HC))
2351 {
2352 if (ISSET_PIXCOLOR (Color_HTC))
2353 fore = Color_HTC;
2354 // if invert is 0 reverse video is set so we use bg color as fg color
2355 else if (!invert)
2356 fore = back;
2357
2358 back = Color_HC;
2359 invert = 0;
2360 }
2361 }
2362#endif
2363
2313 if (invert) 2364 if (invert)
2314 { 2365 {
2315#ifdef OPTION_HC
2316 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2317 || !ISSET_PIXCOLOR (Color_HC))
2318#endif
2319 /* invert the column if no highlightColor is set or it is the
2320 * current cursor column */
2321 ::swap (fore, back); 2366 ::swap (fore, back);
2322#ifdef OPTION_HC
2323 else if (ISSET_PIXCOLOR (Color_HC))
2324 back = Color_HC;
2325#endif
2326 2367
2327#ifndef NO_BOLD_UNDERLINE_REVERSE 2368#ifndef NO_BOLD_UNDERLINE_REVERSE
2328# ifndef OPTION_HC
2329 if (ISSET_PIXCOLOR (Color_RV))
2330 back = Color_RV;
2331# endif
2332 if (fore == back) 2369 if (fore == back)
2333 { 2370 {
2334 fore = Color_bg; 2371 fore = Color_bg;
2335 back = Color_fg; 2372 back = Color_fg;
2336 } 2373 }
… …
2372 /* 2409 /*
2373 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2374 */ 2411 */
2375 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2376 2413
2377 if (expect_true (have_bg && back == Color_bg)) 2414 if (ecb_likely (have_bg && back == Color_bg))
2378 { 2415 {
2379 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2380 2417
2381 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2382 if (text[i] != ' ') 2419 if (text[i] != ' ')
… …
2389 did_clear: ; 2426 did_clear: ;
2390 } 2427 }
2391 else 2428 else
2392 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2393 2430
2394 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2395 { 2432 {
2396#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2397 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2398 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2399 else 2436 else
… …
2404 xpixel, ypixel + font->ascent + 1, 2441 xpixel, ypixel + font->ascent + 1,
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2442 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 } 2443 }
2407 } /* for (col....) */ 2444 } /* for (col....) */
2408 } /* for (row....) */ 2445 } /* for (row....) */
2409
2410#if ENABLE_OVERLAY
2411 scr_swap_overlay ();
2412#endif
2413 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414 2446
2415 /* 2447 /*
2416 * G: cleanup cursor and display outline cursor if necessary 2448 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2449 */
2418 if (showcursor) 2450 if (showcursor)
… …
2457 } 2489 }
2458 2490
2459 /* 2491 /*
2460 * H: cleanup selection 2492 * H: cleanup selection
2461 */ 2493 */
2494#if ENABLE_OVERLAY
2495 scr_swap_overlay ();
2496#endif
2497 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2498
2462 scr_reverse_selection (); 2499 scr_reverse_selection ();
2463 2500
2501 screen.flags = old_screen_flags;
2464 num_scr = 0; 2502 num_scr = 0;
2465 num_scr_allow = 1; 2503 num_scr_allow = 1;
2466} 2504}
2467 2505
2468void 2506void
… …
2489 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2490 } 2528 }
2491} 2529}
2492 2530
2493void 2531void
2494rxvt_term::scr_recolour () NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2495{ 2533{
2534 bool transparent = false;
2535
2496#ifdef HAVE_BG_PIXMAP 2536#ifdef HAVE_BG_PIXMAP
2497 bgPixmap.apply (); 2537 if (bg_pixmap != None)
2498#else 2538 {
2539# ifdef ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT)
2541 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2499 2544
2545 transparent = true;
2546 }
2547 else
2548# endif
2549 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2552 }
2553 }
2554 else
2555#endif
2556 {
2500 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2557 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2501 XClearWindow (dpy, parent[0]);
2502 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559 }
2560
2561 XClearWindow (dpy, parent);
2503 2562
2504 if (scrollBar.win) 2563 if (scrollBar.win)
2505 { 2564 {
2565 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else
2506 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2507 scrollBar.state = STATE_IDLE; 2569 scrollBar.state = STATE_IDLE;
2508 scrollBar.show (0); 2570 scrollBar.show (0);
2509 } 2571 }
2510 2572
2511#endif 2573 if (refresh)
2512 2574 {
2513 /* bgPixmap.apply () does not do the following : */
2514 scr_clear (); 2575 scr_clear ();
2515 scr_touch (true); 2576 scr_touch (true);
2577 }
2516 want_refresh = 1; 2578 want_refresh = 1;
2517} 2579}
2518 2580
2519/* ------------------------------------------------------------------------- */ 2581/* ------------------------------------------------------------------------- */
2520void 2582void
… …
2588 { 2650 {
2589#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2590 if (selection.rect) 2652 if (selection.rect)
2591 scr_xor_rect (selection.beg.row, selection.beg.col, 2653 scr_xor_rect (selection.beg.row, selection.beg.col,
2592 selection.end.row, selection.end.col, 2654 selection.end.row, selection.end.col,
2593 RS_RVid, RS_RVid | RS_Uline); 2655 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2594 else 2656 else
2595#endif 2657#endif
2596 scr_xor_span (selection.beg.row, selection.beg.col, 2658 scr_xor_span (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2598 RS_RVid); 2660 RS_Sel | RS_RVid);
2599 } 2661 }
2600} 2662}
2601 2663
2602/* ------------------------------------------------------------------------- */ 2664/* ------------------------------------------------------------------------- */
2603/* 2665/*
… …
2608void 2670void
2609rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2610{ 2672{
2611 int row, wrote; 2673 int row, wrote;
2612 unsigned int width, towrite; 2674 unsigned int width, towrite;
2613 char r1[] = "\n"; 2675 const char r1[] = "\n";
2614 2676
2615 for (row = saveLines + top_row; 2677 for (row = saveLines + top_row;
2616 row < saveLines + nrow - 1; row++) 2678 row < saveLines + nrow - 1; row++)
2617 { 2679 {
2618 width = row_buf[row].l >= 0 ? row_buf[row].l 2680 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2664/* ------------------------------------------------------------------------- */ 2726/* ------------------------------------------------------------------------- */
2665/* 2727/*
2666 * Paste a selection direct to the command fd 2728 * Paste a selection direct to the command fd
2667 */ 2729 */
2668void 2730void
2669rxvt_term::paste (char *data, unsigned int len) NOTHROW 2731rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2670{ 2732{
2671 /* convert normal newline chars into common keyboard Return key sequence */ 2733 /* convert normal newline chars into common keyboard Return key sequence */
2672 for (unsigned int i = 0; i < len; i++) 2734 for (unsigned int i = 0; i < len; i++)
2673 if (data[i] == C0_LF) 2735 if (data[i] == C0_LF)
2674 data[i] = C0_CR; 2736 data[i] = C0_CR;
… …
2680 2742
2681 if (priv_modes & PrivMode_BracketPaste) 2743 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[201~"); 2744 tt_printf ("\e[201~");
2683} 2745}
2684 2746
2685/* ------------------------------------------------------------------------- */
2686/*
2687 * Respond to a notification that a primary selection has been sent
2688 * EXT: SelectionNotify
2689 */
2690void 2747void
2691rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2748rxvt_term::paste (char *data, unsigned int len) NOTHROW
2692{ 2749{
2693 if (prop == None) /* check for failed XConvertSelection */ 2750 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2694 {
2695 if ((selection_type & Sel_CompoundText))
2696 {
2697 int selnum = selection_type & Sel_whereMask;
2698
2699 selection_type = 0;
2700 if (selnum != Sel_direct)
2701 selection_request_other (XA_STRING, selnum);
2702 }
2703
2704 if ((selection_type & Sel_UTF8String))
2705 {
2706 int selnum = selection_type & Sel_whereMask;
2707
2708 selection_type = Sel_CompoundText;
2709 if (selnum != Sel_direct)
2710 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2711 else
2712 selection_type = 0;
2713 }
2714
2715 return;
2716 }
2717
2718 unsigned long bytes_after;
2719 XTextProperty ct;
2720
2721 if (XGetWindowProperty (dpy, win, prop,
2722 0, PROP_SIZE / 4,
2723 delete_prop, AnyPropertyType,
2724 &ct.encoding, &ct.format,
2725 &ct.nitems, &bytes_after,
2726 &ct.value) != Success)
2727 {
2728 ct.value = 0;
2729 goto bailout;
2730 }
2731
2732 if (ct.encoding == None)
2733 goto bailout;
2734
2735 if (bytes_after)
2736 {
2737 // fetch and append remaining data
2738 XTextProperty ct2;
2739
2740 if (XGetWindowProperty (dpy, win, prop,
2741 ct.nitems / 4, (bytes_after + 3) / 4,
2742 delete_prop, AnyPropertyType,
2743 &ct2.encoding, &ct2.format,
2744 &ct2.nitems, &bytes_after,
2745 &ct2.value) != Success)
2746 goto bailout;
2747
2748 // realloc should be compatible to XFree, here, and elsewhere, too
2749 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2750 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2751 ct.nitems += ct2.nitems;
2752
2753 XFree (ct2.value);
2754 }
2755
2756 if (ct.value == 0)
2757 goto bailout;
2758
2759 if (ct.encoding == xa[XA_INCR])
2760 {
2761 // INCR selection, start handshake
2762 if (!delete_prop)
2763 XDeleteProperty (dpy, win, prop);
2764
2765 selection_wait = Sel_incr;
2766 incr_buf_fill = 0;
2767 incr_ev.start (10);
2768
2769 goto bailout;
2770 }
2771
2772 if (ct.nitems == 0)
2773 {
2774 if (selection_wait == Sel_incr)
2775 {
2776 XFree (ct.value);
2777
2778 // finally complete, now paste the whole thing
2779 selection_wait = Sel_normal;
2780 ct.value = (unsigned char *)incr_buf;
2781 ct.nitems = incr_buf_fill;
2782 incr_buf = 0;
2783 incr_buf_size = 0;
2784 incr_ev.stop ();
2785 }
2786 else
2787 {
2788 if (selection_wait == Sel_normal
2789 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2790 {
2791 /*
2792 * pass through again trying CUT_BUFFER0 if we've come from
2793 * XConvertSelection () but nothing was presented
2794 */
2795 selection_paste (display->root, XA_CUT_BUFFER0, False);
2796 }
2797
2798 goto bailout;
2799 }
2800 }
2801 else if (selection_wait == Sel_incr)
2802 {
2803 incr_ev.start (10);
2804
2805 while (incr_buf_fill + ct.nitems > incr_buf_size)
2806 {
2807 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2808 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2809 }
2810
2811 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2812 incr_buf_fill += ct.nitems;
2813
2814 goto bailout;
2815 }
2816
2817 char **cl;
2818 int cr;
2819
2820#if !ENABLE_MINIMAL
2821 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2822 // so recode it manually
2823 if (ct.encoding == xa[XA_UTF8_STRING])
2824 {
2825 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2826 char *s = rxvt_wcstombs (w);
2827 free (w);
2828 // TODO: strlen == only the first element will be converted. well...
2829 paste (s, strlen (s));
2830 free (s);
2831 }
2832 else
2833#endif
2834 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2835 && cl)
2836 {
2837 for (int i = 0; i < cr; i++)
2838 paste (cl[i], strlen (cl[i]));
2839
2840 XFreeStringList (cl);
2841 }
2842 else
2843 paste ((char *)ct.value, ct.nitems); // paste raw
2844
2845bailout:
2846 XFree (ct.value);
2847
2848 if (selection_wait == Sel_normal)
2849 selection_wait = Sel_none;
2850}
2851
2852void
2853rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2854{
2855 selection_wait = Sel_none;
2856
2857 incr_buf_size = 0;
2858 free (incr_buf);
2859
2860 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2861}
2862
2863void
2864rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2865{
2866 if (prop == None || selection_wait != Sel_incr)
2867 return; 2751 return;
2868 2752
2869 selection_paste (win, prop, true); 2753 tt_paste (data, len);
2870} 2754}
2871 2755
2872/* ------------------------------------------------------------------------- */ 2756/* ------------------------------------------------------------------------- */
2873/* 2757/*
2874 * Request the current selection: 2758 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2875 * Order: > internal selection if available 2759 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2876 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2760 * as fallback
2877 * > CUT_BUFFER0
2878 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2879 * will auto fallback to CUT_BUFFER0
2880 * EXT: button 2 release 2761 * EXT: button 2 release
2881 */ 2762 */
2882void 2763void
2883rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2764rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2884{ 2765{
2885 if (selection.text && selnum == Sel_Primary) 2766 if (!selection_req)
2886 {
2887 /* internal selection */
2888 char *str = rxvt_wcstombs (selection.text, selection.len);
2889 paste (str, strlen (str));
2890 free (str);
2891 return;
2892 } 2767 {
2893 else 2768 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2769 selection_req->run ();
2894 { 2770 }
2895 selection_request_time = tm;
2896 selection_wait = Sel_normal;
2897
2898#if X_HAVE_UTF8_STRING
2899 selection_type = Sel_UTF8String;
2900 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2901 return;
2902#else
2903 selection_type = Sel_CompoundText;
2904 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2905 return;
2906#endif
2907 }
2908
2909 selection_wait = Sel_none; /* don't loop in selection_paste () */
2910 selection_paste (display->root, XA_CUT_BUFFER0, false);
2911}
2912
2913int
2914rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2915{
2916 Atom sel;
2917
2918 selection_type |= selnum;
2919
2920 if (selnum == Sel_Primary)
2921 sel = XA_PRIMARY;
2922 else if (selnum == Sel_Secondary)
2923 sel = XA_SECONDARY;
2924 else
2925 sel = xa[XA_CLIPBOARD];
2926
2927 if (XGetSelectionOwner (dpy, sel) != None)
2928 {
2929 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2930 vt, selection_request_time);
2931 return 1;
2932 }
2933
2934 return 0;
2935} 2771}
2936 2772
2937/* ------------------------------------------------------------------------- */ 2773/* ------------------------------------------------------------------------- */
2938/* 2774/*
2939 * Clear all selected text 2775 * Clear all selected text
2940 * EXT: SelectionClear 2776 * EXT: SelectionClear
2941 */ 2777 */
2942void 2778void
2943rxvt_term::selection_clear () NOTHROW 2779rxvt_term::selection_clear (bool clipboard) NOTHROW
2944{ 2780{
2781 if (!clipboard)
2782 {
2945 want_refresh = 1; 2783 want_refresh = 1;
2946 free (selection.text); 2784 free (selection.text);
2947 selection.text = NULL; 2785 selection.text = NULL;
2948 selection.len = 0; 2786 selection.len = 0;
2949 CLEAR_SELECTION (); 2787 CLEAR_SELECTION ();
2950 2788
2951 if (display->selection_owner == this) 2789 if (display->selection_owner == this)
2952 display->selection_owner = 0; 2790 display->selection_owner = 0;
2791 }
2792 else
2793 {
2794 free (selection.clip_text);
2795 selection.clip_text = NULL;
2796 selection.clip_len = 0;
2797
2798 if (display->clipboard_owner == this)
2799 display->clipboard_owner = 0;
2800 }
2953} 2801}
2954 2802
2955/* ------------------------------------------------------------------------- */ 2803/* ------------------------------------------------------------------------- */
2956/* 2804/*
2957 * Copy a selection into the cut buffer 2805 * Copy a selection into the cut buffer
2958 * EXT: button 1 or 3 release 2806 * EXT: button 1 or 3 release
2959 */ 2807 */
2960void 2808void
2961rxvt_term::selection_make (Time tm) 2809rxvt_term::selection_make (Time tm)
2962{ 2810{
2963 int i; 2811 int size;
2964 wchar_t *new_selection_text; 2812 wchar_t *new_selection_text;
2965 text_t *t; 2813 text_t *t;
2966 2814
2967 switch (selection.op) 2815 switch (selection.op)
2968 { 2816 {
… …
2984 return; /* nothing selected, go away */ 2832 return; /* nothing selected, go away */
2985 2833
2986 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2834 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2987 return; 2835 return;
2988 2836
2989 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2837 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2990 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2838 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2991 2839
2992 int ofs = 0; 2840 int ofs = 0;
2993 int extra = 0; 2841 int extra = 0;
2994 2842
2995 int col = selection.beg.col; 2843 int col = selection.beg.col;
… …
3001 { 2849 {
3002#if !ENABLE_MINIMAL 2850#if !ENABLE_MINIMAL
3003 if (selection.rect) 2851 if (selection.rect)
3004 { 2852 {
3005 col = selection.beg.col; 2853 col = selection.beg.col;
3006 end_col = ncol + 1; 2854 end_col = selection.end.col;
3007 } 2855 }
3008 else 2856 else
3009#endif 2857#endif
3010 end_col = ROW(row).l; 2858 end_col = ROW(row).l;
3011 2859
3012 col = max (col, 0); 2860 col = max (col, 0);
3013 2861
3014 if (row == selection.end.row 2862 if (row == selection.end.row)
3015#if !ENABLE_MINIMAL
3016 || selection.rect
3017#endif
3018 )
3019 min_it (end_col, selection.end.col); 2863 min_it (end_col, selection.end.col);
3020 2864
3021 t = ROW(row).t + col; 2865 t = ROW(row).t + col;
3022 2866
3023 for (; col < end_col; col++) 2867 for (; col < end_col; col++)
… …
3031 2875
3032 extra -= (len - 1); 2876 extra -= (len - 1);
3033 2877
3034 if (extra < 0) 2878 if (extra < 0)
3035 { 2879 {
3036 extra += i; 2880 extra += size;
3037 i += i; 2881 size += size;
3038 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2882 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3039 } 2883 }
3040 2884
3041 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2885 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3042 } 2886 }
3043#endif 2887#endif
… …
3055 2899
3056 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3057 } 2901 }
3058 else 2902 else
3059#endif 2903#endif
3060 if (!ROW(row).is_longer () && row != selection.end.row) 2904 if (!ROW(row).is_longer ()
2905 && (row != selection.end.row || end_col != selection.end.col)
2906 && (row != selection.beg.row || selection.beg.col < ncol))
3061 new_selection_text[ofs++] = C0_LF; 2907 new_selection_text[ofs++] = C0_LF;
3062 } 2908 }
3063
3064 if (end_col != selection.end.col)
3065 new_selection_text[ofs++] = C0_LF;
3066 2909
3067 new_selection_text[ofs] = 0; 2910 new_selection_text[ofs] = 0;
3068 2911
3069 if (ofs == 0) 2912 if (ofs == 0)
3070 { 2913 {
… …
3083 2926
3084 selection_grab (tm); 2927 selection_grab (tm);
3085} 2928}
3086 2929
3087bool 2930bool
3088rxvt_term::selection_grab (Time tm) NOTHROW 2931rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3089{ 2932{
2933 Atom sel;
2934
2935 if (!clipboard)
2936 {
3090 selection_time = tm; 2937 selection_time = tm;
2938 sel = XA_PRIMARY;
2939 }
2940 else
2941 {
2942 clipboard_time = tm;
2943 sel = xa[XA_CLIPBOARD];
2944 }
3091 2945
3092 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2946 XSetSelectionOwner (dpy, sel, vt, tm);
3093 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2947 if (XGetSelectionOwner (dpy, sel) == vt)
3094 { 2948 {
3095 display->set_selection_owner (this); 2949 display->set_selection_owner (this, clipboard);
3096 return true; 2950 return true;
3097 } 2951 }
3098 else 2952 else
3099 { 2953 {
3100 selection_clear (); 2954 selection_clear (clipboard);
3101 return false; 2955 return false;
3102 } 2956 }
3103 2957
3104#if 0 2958#if 0
3105 XTextProperty ct; 2959 XTextProperty ct;
… …
3565 * EXT: SelectionRequest 3419 * EXT: SelectionRequest
3566 */ 3420 */
3567void 3421void
3568rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3422rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3569{ 3423{
3424 Atom property = rq.property == None ? rq.target : rq.property;
3570 XSelectionEvent ev; 3425 XSelectionEvent ev;
3571 3426
3572 ev.type = SelectionNotify; 3427 ev.type = SelectionNotify;
3573 ev.property = None; 3428 ev.property = None;
3574 ev.display = rq.display; 3429 ev.display = rq.display;
… …
3589 *target++ = xa[XA_COMPOUND_TEXT]; 3444 *target++ = xa[XA_COMPOUND_TEXT];
3590#if X_HAVE_UTF8_STRING 3445#if X_HAVE_UTF8_STRING
3591 *target++ = xa[XA_UTF8_STRING]; 3446 *target++ = xa[XA_UTF8_STRING];
3592#endif 3447#endif
3593 3448
3594 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3449 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3595 32, PropModeReplace, 3450 32, PropModeReplace,
3596 (unsigned char *)target_list, target - target_list); 3451 (unsigned char *)target_list, target - target_list);
3597 ev.property = rq.property; 3452 ev.property = property;
3598 } 3453 }
3599#if TODO // TODO 3454#if TODO // TODO
3600 else if (rq.target == xa[XA_MULTIPLE]) 3455 else if (rq.target == xa[XA_MULTIPLE])
3601 { 3456 {
3602 /* TODO: Handle MULTIPLE */ 3457 /* TODO: Handle MULTIPLE */
3603 } 3458 }
3604#endif 3459#endif
3605 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3460 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3606 { 3461 {
3607 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3462 XChangeProperty (dpy, rq.requestor, property, rq.target,
3608 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3463 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3609 ev.property = rq.property; 3464 ev.property = property;
3465 }
3466 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3467 {
3468 XChangeProperty (dpy, rq.requestor, property, rq.target,
3469 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3470 ev.property = property;
3610 } 3471 }
3611 else if (rq.target == XA_STRING 3472 else if (rq.target == XA_STRING
3612 || rq.target == xa[XA_TEXT] 3473 || rq.target == xa[XA_TEXT]
3613 || rq.target == xa[XA_COMPOUND_TEXT] 3474 || rq.target == xa[XA_COMPOUND_TEXT]
3614 || rq.target == xa[XA_UTF8_STRING] 3475 || rq.target == xa[XA_UTF8_STRING]
… …
3646 { 3507 {
3647 target = xa[XA_COMPOUND_TEXT]; 3508 target = xa[XA_COMPOUND_TEXT];
3648 style = enc_compound_text; 3509 style = enc_compound_text;
3649 } 3510 }
3650 3511
3651 if (selection.text) 3512 if (rq.selection == XA_PRIMARY && selection.text)
3652 { 3513 {
3653 cl = selection.text; 3514 cl = selection.text;
3654 selectlen = selection.len; 3515 selectlen = selection.len;
3516 }
3517 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3518 {
3519 cl = selection.clip_text;
3520 selectlen = selection.clip_len;
3655 } 3521 }
3656 else 3522 else
3657 { 3523 {
3658 cl = L""; 3524 cl = L"";
3659 selectlen = 0; 3525 selectlen = 0;
… …
3680 ct.value = (unsigned char *)cl; 3546 ct.value = (unsigned char *)cl;
3681 ct.nitems = selectlen; 3547 ct.nitems = selectlen;
3682 ct.encoding = target; 3548 ct.encoding = target;
3683 } 3549 }
3684 3550
3685 XChangeProperty (dpy, rq.requestor, rq.property, 3551 XChangeProperty (dpy, rq.requestor, property,
3686 ct.encoding, 8, PropModeReplace, 3552 ct.encoding, 8, PropModeReplace,
3687 ct.value, (int)ct.nitems); 3553 ct.value, (int)ct.nitems);
3688 ev.property = rq.property; 3554 ev.property = property;
3689 3555
3690 if (freect) 3556 if (freect)
3691 XFree (ct.value); 3557 XFree (ct.value);
3692 } 3558 }
3693 3559
… …
3727 h += 2; min_it (h, nrow); 3593 h += 2; min_it (h, nrow);
3728 3594
3729 x -= 1; clamp_it (x, 0, ncol - w); 3595 x -= 1; clamp_it (x, 0, ncol - w);
3730 y -= 1; clamp_it (y, 0, nrow - h); 3596 y -= 1; clamp_it (y, 0, nrow - h);
3731 3597
3732 ov_x = x; ov_y = y; 3598 ov.x = x; ov.y = y;
3733 ov_w = w; ov_h = h; 3599 ov.w = w; ov.h = h;
3734 3600
3735 ov_text = new text_t *[h]; 3601 ov.text = new text_t *[h];
3736 ov_rend = new rend_t *[h]; 3602 ov.rend = new rend_t *[h];
3737 3603
3738 for (y = 0; y < h; y++) 3604 for (y = 0; y < h; y++)
3739 { 3605 {
3740 text_t *tp = ov_text[y] = new text_t[w]; 3606 text_t *tp = ov.text[y] = new text_t[w];
3741 rend_t *rp = ov_rend[y] = new rend_t[w]; 3607 rend_t *rp = ov.rend[y] = new rend_t[w];
3742 3608
3743 text_t t0, t1, t2; 3609 text_t t0, t1, t2;
3744 rend_t r = OVERLAY_RSTYLE; 3610 rend_t r = OVERLAY_RSTYLE;
3745 3611
3746 if (y == 0) 3612 if (y == 0)
… …
3765} 3631}
3766 3632
3767void 3633void
3768rxvt_term::scr_overlay_off () NOTHROW 3634rxvt_term::scr_overlay_off () NOTHROW
3769{ 3635{
3770 if (!ov_text) 3636 if (!ov.text)
3771 return; 3637 return;
3772 3638
3773 want_refresh = 1; 3639 want_refresh = 1;
3774 3640
3775 for (int y = 0; y < ov_h; y++) 3641 for (int y = 0; y < ov.h; y++)
3776 { 3642 {
3777 delete [] ov_text[y]; 3643 delete [] ov.text[y];
3778 delete [] ov_rend[y]; 3644 delete [] ov.rend[y];
3779 } 3645 }
3780 3646
3781 delete [] ov_text; ov_text = 0; 3647 delete [] ov.text; ov.text = 0;
3782 delete [] ov_rend; ov_rend = 0; 3648 delete [] ov.rend; ov.rend = 0;
3783} 3649}
3784 3650
3785void 3651void
3786rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3652rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3787{ 3653{
3788 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3654 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3789 return; 3655 return;
3790 3656
3791 x++, y++; 3657 x++, y++;
3792 3658
3793 ov_text[y][x] = text; 3659 ov.text[y][x] = text;
3794 ov_rend[y][x] = rend; 3660 ov.rend[y][x] = rend;
3795} 3661}
3796 3662
3797void 3663void
3798rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3664rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3799{ 3665{
… …
3818} 3684}
3819 3685
3820void 3686void
3821rxvt_term::scr_swap_overlay () NOTHROW 3687rxvt_term::scr_swap_overlay () NOTHROW
3822{ 3688{
3823 if (!ov_text) 3689 if (!ov.text)
3824 return; 3690 return;
3825 3691
3692 // hide cursor if it is within the overlay area
3693 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3694 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3695 screen.flags &= ~Screen_VisibleCursor;
3696
3826 // swap screen mem with overlay 3697 // swap screen mem with overlay
3827 for (int y = ov_h; y--; ) 3698 for (int y = ov.h; y--; )
3828 { 3699 {
3829 text_t *t1 = ov_text[y]; 3700 text_t *t1 = ov.text[y];
3830 rend_t *r1 = ov_rend[y]; 3701 rend_t *r1 = ov.rend[y];
3831 3702
3832 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3703 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3833 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3704 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3834 3705
3835 for (int x = ov_w; x--; ) 3706 for (int x = ov.w; x--; )
3836 { 3707 {
3837 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3708 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3838 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3709 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3839 } 3710 }
3840 } 3711 }

Diff Legend

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