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.317 by root, Tue Nov 4 15:09:51 2008 UTC vs.
Revision 1.394 by sf-exg, Thu Sep 1 08:11:27 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++;
… …
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);
767 l.is_longer (0);
768 l.touch ();
769 }
742 } 770 }
743 771
744 return count; 772 return count;
745} 773}
746 774
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 803 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 804 screen.cur.row -= minlines;
777 } 805 }
778 } 806 }
779 807
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 808 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 809 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 810 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 811 int row = screen.cur.row;
786 812
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 813 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 814
789 line_t *line = &ROW(row); 815 line_t *line = &ROW(row);
790 816
791 while (str < strend) 817 while (str < strend)
792 { 818 {
793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 819 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
794 820
795 if (expect_false (c < 0x20)) 821 if (ecb_unlikely (c < 0x20))
796 if (c == C0_LF) 822 if (c == C0_LF)
797 { 823 {
798 max_it (line->l, screen.cur.col); 824 max_it (line->l, screen.cur.col);
799 825
800 screen.flags &= ~Screen_WrapNext; 826 screen.flags &= ~Screen_WrapNext;
… …
819 { 845 {
820 scr_tab (1, true); 846 scr_tab (1, true);
821 continue; 847 continue;
822 } 848 }
823 849
824 if (expect_false ( 850 if (ecb_unlikely (
825 checksel /* see if we're writing within selection */ 851 checksel /* see if we're writing within selection */
826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 852 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
827 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 853 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 )) 854 ))
829 { 855 {
… …
834 * should be a similar check. 860 * should be a similar check.
835 */ 861 */
836 CLEAR_SELECTION (); 862 CLEAR_SELECTION ();
837 } 863 }
838 864
839 if (expect_false (screen.flags & Screen_WrapNext)) 865 if (ecb_unlikely (screen.flags & Screen_WrapNext))
840 { 866 {
841 scr_do_wrap (); 867 scr_do_wrap ();
842 868
843 line->l = ncol; 869 line->l = ncol;
844 line->is_longer (1); 870 line->is_longer (1);
… …
846 row = screen.cur.row; 872 row = screen.cur.row;
847 line = &ROW(row); /* _must_ refresh */ 873 line = &ROW(row); /* _must_ refresh */
848 } 874 }
849 875
850 // some utf-8 decoders "decode" surrogate characters: let's fix this. 876 // some utf-8 decoders "decode" surrogate characters: let's fix this.
851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 877 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
852 c = 0xfffd; 878 c = 0xfffd;
853 879
854 // rely on wcwidth to tell us the character width, do wcwidth before 880 // rely on wcwidth to tell us the character width, do wcwidth before
855 // further replacements, as wcwidth might return -1 for the line 881 // further replacements, as wcwidth might return -1 for the line
856 // drawing characters below as they might be invalid in the current 882 // drawing characters below as they might be invalid in the current
857 // locale. 883 // locale.
858 int width = WCWIDTH (c); 884 int width = WCWIDTH (c);
859 885
860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 886 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
861 { 887 {
862 // vt100 special graphics and line drawing 888 // vt100 special graphics and line drawing
863 // 5f-7e standard vt100 889 // 5f-7e standard vt100
864 // 40-5e rxvt extension for extra curses acs chars 890 // 40-5e rxvt extension for extra curses acs chars
865 static uint16_t vt100_0[62] = { // 41 .. 7e 891 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
878 c = vt100_0[c - 0x41]; 904 c = vt100_0[c - 0x41];
879 width = 1; // vt100 line drawing characters are always single-width 905 width = 1; // vt100 line drawing characters are always single-width
880 } 906 }
881 } 907 }
882 908
883 if (expect_false (screen.flags & Screen_Insert)) 909 if (ecb_unlikely (screen.flags & Screen_Insert))
884 scr_insdel_chars (width, INSERT); 910 scr_insdel_chars (width, INSERT);
885 911
886 if (width != 0) 912 if (width != 0)
887 { 913 {
888#if !UNICODE_3 914#if !UNICODE_3
… …
893# else 919# else
894 c = 0xfffd; 920 c = 0xfffd;
895# endif 921# endif
896#endif 922#endif
897 923
924 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
925
926 // if the character doesn't fit into the remaining columns...
927 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
928 {
929 if (screen.flags & Screen_Autowrap)
930 {
931 // ... artificially enlargen the previous one
932 c = NOCHAR;
933 // and try the same character next loop iteration
934 --str;
935 }
936 else
937 screen.cur.col = ncol - width;
938 }
939
898 // nuke the character at this position, if required 940 // nuke the character at this position, if required
899 if (expect_false ( 941 // due to wonderful coincidences everywhere else in this loop
942 // we never have to check for overwriting a wide char itself,
943 // only its tail.
900 line->t[screen.cur.col] == NOCHAR 944 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); 945 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 // ... artificially enlargen the previous one
912 c = NOCHAR;
913 // and try the same character next loop iteration
914 --str;
915 }
916 946
917 line->touch (); 947 line->touch ();
918 948
919 do 949 do
920 { 950 {
921 line->t[screen.cur.col] = c; 951 line->t[screen.cur.col] = c;
922 line->r[screen.cur.col] = rend; 952 line->r[screen.cur.col] = rend;
923 953
924 if (expect_true (screen.cur.col < ncol - 1)) 954 if (ecb_likely (screen.cur.col < ncol - 1))
925 screen.cur.col++; 955 screen.cur.col++;
926 else 956 else
927 { 957 {
928 line->l = ncol; 958 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 959 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 960 screen.flags |= Screen_WrapNext;
931 break; 961
962 goto end_of_line;
932 } 963 }
933 964
934 c = NOCHAR; 965 c = NOCHAR;
935 } 966 }
936 while (expect_false (--width > 0)); 967 while (ecb_unlikely (--width > 0));
937 968
938 // pad with spaces when overwriting wide character with smaller one 969 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 970 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
940 { 971 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 972 line->t[c] = ' ';
946 line->r[c] = rend; 973 line->r[c] = rend;
947 }
948 } 974 }
975
976end_of_line:
977 ;
949 } 978 }
950#if ENABLE_COMBINING 979#if ENABLE_COMBINING
951 else // width == 0 980 else // width == 0
952 { 981 {
953 if (c != 0xfeff) // ignore BOM 982 if (c != 0xfeff) // ignore BOM
… …
993#endif 1022#endif
994 } 1023 }
995 1024
996 max_it (line->l, screen.cur.col); 1025 max_it (line->l, screen.cur.col);
997 1026
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1027 assert (screen.cur.row >= 0);
1000#endif
1001} 1028}
1002 1029
1003/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1004/* 1031/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1032 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1045
1019 want_refresh = 1; 1046 want_refresh = 1;
1020#endif 1047#endif
1021 } 1048 }
1022 } 1049 }
1050 else if (screen.flags & Screen_WrapNext)
1051 screen.flags &= ~Screen_WrapNext;
1023 else 1052 else
1024 scr_gotorc (0, -1, RELATIVE); 1053 scr_gotorc (0, -1, RELATIVE);
1025} 1054}
1026 1055
1027/* ------------------------------------------------------------------------- */ 1056/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1362 if (row >= nrow) /* Out Of Bounds */
1334 return; 1363 return;
1335 1364
1336 min_it (num, nrow - row); 1365 min_it (num, nrow - row);
1337 1366
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1367 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1368 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1369 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1370 {
1343 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1344 1372
1345 if (mapped) 1373 if (mapped)
1346 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1349 } 1377 }
1350 else 1378 else
1351 { 1379 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1381
1382 if (mapped)
1383 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1387 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1388 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1389 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1392 }
1362 } 1393 }
1363 1394
1364 for (; num--; row++) 1395 for (; num--; row++)
1365 { 1396 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1397 scr_blank_screen_mem (ROW(row), rstyle);
1398
1399 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1400 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1401 }
1369} 1402}
1370 1403
1371#if !ENABLE_MINIMAL 1404#if !ENABLE_MINIMAL
1372void 1405void
… …
1525 { 1558 {
1526 line->t[col] = line->t[col + count]; 1559 line->t[col] = line->t[col + count];
1527 line->r[col] = line->r[col + count]; 1560 line->r[col] = line->r[col + count];
1528 } 1561 }
1529 1562
1530 scr_blank_line (*line, ncol - count, count, 1563 scr_blank_line (*line, ncol - count, count, rstyle);
1531 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1532 1564
1533 if (selection.op && current_screen == selection.screen 1565 if (selection.op && current_screen == selection.screen
1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1566 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1535 { 1567 {
1536 if (selection.end.row != screen.cur.row 1568 if (selection.end.row != screen.cur.row
… …
1672 { 1704 {
1673 rvideo_state = on; 1705 rvideo_state = on;
1674 1706
1675 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1707 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1676#ifdef HAVE_BG_PIXMAP 1708#ifdef HAVE_BG_PIXMAP
1677 if (bgPixmap.pixmap == None) 1709 if (bg_pixmap == None)
1678#endif 1710#endif
1679 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1711 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1680 1712
1681 XGCValues gcvalue; 1713 XGCValues gcvalue;
1682 gcvalue.foreground = pix_colors[Color_fg]; 1714 gcvalue.foreground = pix_colors[Color_fg];
… …
1826 for (i = PART_BEG; i < RC_COUNT; i++) 1858 for (i = PART_BEG; i < RC_COUNT; i++)
1827 { 1859 {
1828 min_it (rc[i].col, ncol - 1); 1860 min_it (rc[i].col, ncol - 1);
1829 min_it (rc[i].row, nrow - 1); 1861 min_it (rc[i].row, nrow - 1);
1830 } 1862 }
1831// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1863
1832 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1864 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1833 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1865 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1834 1866
1835 num_scr_allow = 0; 1867 num_scr_allow = 0;
1836 1868
… …
1909 1941
1910# ifndef NO_MAPALERT 1942# ifndef NO_MAPALERT
1911# ifdef MAPALERT_OPTION 1943# ifdef MAPALERT_OPTION
1912 if (option (Opt_mapAlert)) 1944 if (option (Opt_mapAlert))
1913# endif 1945# endif
1914 XMapWindow (dpy, parent[0]); 1946 XMapWindow (dpy, parent);
1915# endif 1947# endif
1916 1948
1917# if ENABLE_FRILLS 1949# if ENABLE_FRILLS
1918 if (option (Opt_urgentOnBell)) 1950 if (option (Opt_urgentOnBell))
1919 set_urgency (1); 1951 set_urgency (1);
… …
1927 1959
1928 bell_ev.start (VISUAL_BELL_DURATION); 1960 bell_ev.start (VISUAL_BELL_DURATION);
1929 } 1961 }
1930 else 1962 else
1931 XBell (dpy, 0); 1963 XBell (dpy, 0);
1964 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1932#endif 1965#endif
1933} 1966}
1934 1967
1935/* ------------------------------------------------------------------------- */ 1968/* ------------------------------------------------------------------------- */
1936/* ARGSUSED */
1937void 1969void
1938rxvt_term::scr_printscreen (int fullhist) NOTHROW 1970rxvt_term::scr_printscreen (int fullhist) NOTHROW
1939{ 1971{
1940#ifdef PRINTPIPE 1972#ifdef PRINTPIPE
1941 int nrows, row_start; 1973 int nrows, row_start;
… …
1955 row_start = view_start; 1987 row_start = view_start;
1956 } 1988 }
1957 1989
1958 wctomb (0, 0); 1990 wctomb (0, 0);
1959 1991
1960 for (int r1 = 0; r1 < nrows; r1++) 1992 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1961 { 1993 {
1962 text_t *tp = ROW(r1).t; 1994 text_t *tp = ROW(r1).t;
1963 int len = ROW(r1).l; 1995 int len = ROW(r1).l;
1964 1996
1965 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1997 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1994 * screen.text/screen.rend contain what the screen will change to. 2026 * screen.text/screen.rend contain what the screen will change to.
1995 */ 2027 */
1996void 2028void
1997rxvt_term::scr_refresh () NOTHROW 2029rxvt_term::scr_refresh () NOTHROW
1998{ 2030{
1999 unsigned char have_bg,
2000 showcursor; /* show the cursor */
2001 int16_t col, row, /* column/row we're processing */ 2031 int16_t col, row, /* column/row we're processing */
2002 ocrow; /* old cursor row */ 2032 ocrow; /* old cursor row */
2003 int i; /* tmp */ 2033 int i; /* tmp */
2004#ifndef NO_CURSORCOLOR 2034#ifndef NO_CURSORCOLOR
2005 rend_t cc1; /* store colours at cursor position (s) */ 2035 rend_t cc1; /* store colours at cursor position (s) */
… …
2016 /* 2046 /*
2017 * A: set up vars 2047 * A: set up vars
2018 */ 2048 */
2019 refresh_count = 0; 2049 refresh_count = 0;
2020 2050
2051 unsigned int old_screen_flags = screen.flags;
2021 have_bg = 0; 2052 char have_bg = 0;
2022#ifdef HAVE_BG_PIXMAP 2053#ifdef HAVE_BG_PIXMAP
2023 have_bg = bgPixmap.pixmap != None; 2054 have_bg = bg_pixmap != None;
2024#endif 2055#endif
2025 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2056 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2026 2057
2027 /* 2058 /*
2028 * B: reverse any characters which are selected 2059 * B: reverse any characters which are selected
2029 */ 2060 */
2030 scr_reverse_selection (); 2061 scr_reverse_selection ();
2062
2063 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2064#if ENABLE_OVERLAY
2065 scr_swap_overlay ();
2066#endif
2067
2068 char showcursor = screen.flags & Screen_VisibleCursor;
2031 2069
2032 /* 2070 /*
2033 * C: set the cursor character (s) 2071 * C: set the cursor character (s)
2034 */ 2072 */
2035 { 2073 {
2036 unsigned char setoldcursor; 2074 unsigned char setoldcursor;
2037 2075
2038 showcursor = (screen.flags & Screen_VisibleCursor);
2039#ifdef CURSOR_BLINK 2076#ifdef CURSOR_BLINK
2040 if (hidden_cursor) 2077 if (hidden_cursor)
2041 showcursor = 0; 2078 showcursor = 0;
2042#endif 2079#endif
2043 2080
… …
2071 ccol2 = bgcolor_of (rstyle); 2108 ccol2 = bgcolor_of (rstyle);
2072#else 2109#else
2073 ccol2 = Color_bg; 2110 ccol2 = Color_bg;
2074#endif 2111#endif
2075 2112
2076 if (showcursor && focus) 2113 if (focus)
2077 { 2114 {
2078 if (option (Opt_cursorUnderline)) 2115 if (option (Opt_cursorUnderline))
2079 *crp ^= RS_Uline; 2116 *crp ^= RS_Uline;
2080 else 2117 else
2081 { 2118 {
… …
2116 oldcursor.col = screen.cur.col; 2153 oldcursor.col = screen.cur.col;
2117 } 2154 }
2118 } 2155 }
2119 } 2156 }
2120 2157
2121 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2122#if ENABLE_OVERLAY
2123 scr_swap_overlay ();
2124#endif
2125
2126#ifndef NO_SLOW_LINK_SUPPORT 2158#ifndef NO_SLOW_LINK_SUPPORT
2127 /* 2159 /*
2128 * D: CopyArea pass - very useful for slower links 2160 * D: CopyArea pass - very useful for slower links
2129 * This has been deliberately kept simple. 2161 * This has been deliberately kept simple.
2130 */ 2162 */
… …
2219 continue; 2251 continue;
2220 2252
2221 // redraw one or more characters 2253 // redraw one or more characters
2222 2254
2223 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
2224 while (expect_false (stp[col] == NOCHAR && col > 0)) 2256 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2225 --col; 2257 --col;
2226 2258
2227 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2259 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2228 text_t *text = stp + col; 2260 text_t *text = stp + col;
2229 int count = 1; 2261 int count = 1;
2230 2262
2231 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2232 drp[col] = rend; 2264 drp[col] = rend;
… …
2236 for (i = 0; ++col < ncol; ) 2268 for (i = 0; ++col < ncol; )
2237 { 2269 {
2238 if (stp[col] == NOCHAR) 2270 if (stp[col] == NOCHAR)
2239 { 2271 {
2240 dtp[col] = stp[col]; 2272 dtp[col] = stp[col];
2241 drp[col] = rend; 2273 drp[col] = srp[col];
2274
2242 count++; 2275 count++;
2243 i++; 2276 i++;
2244 2277
2245 continue; 2278 continue;
2246 } 2279 }
… …
2266 2299
2267 col--; /* went one too far. move back */ 2300 col--; /* went one too far. move back */
2268 count -= i; /* dump any matching trailing chars */ 2301 count -= i; /* dump any matching trailing chars */
2269 2302
2270 // sometimes we optimize away the trailing NOCHAR's, add them back 2303 // sometimes we optimize away the trailing NOCHAR's, add them back
2271 while (expect_false (i && text[count] == NOCHAR)) 2304 while (ecb_unlikely (i && text[count] == NOCHAR))
2272 count++, i--; 2305 count++, i--;
2273 2306
2274 /* 2307 /*
2275 * Determine the attributes for the string 2308 * Determine the attributes for the string
2276 */ 2309 */
2277 int fore = fgcolor_of (rend); // desired foreground 2310 int fore = fgcolor_of (rend); // desired foreground
2278 int back = bgcolor_of (rend); // desired background 2311 int back = bgcolor_of (rend); // desired background
2279 2312
2280 // only do special processing if any attributes are set, which is unlikely 2313 // only do special processing if any attributes are set, which is unlikely
2281 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2314 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2282 { 2315 {
2283 bool invert = rend & RS_RVid; 2316 bool invert = rend & RS_RVid;
2284 2317
2285#ifndef NO_BOLD_UNDERLINE_REVERSE 2318#ifndef NO_BOLD_UNDERLINE_REVERSE
2286 if (rend & RS_Bold && fore == Color_fg) 2319 if (rend & RS_Bold && fore == Color_fg)
… …
2305 2338
2306 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2339 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2307 fore = Color_UL; 2340 fore = Color_UL;
2308#endif 2341#endif
2309 2342
2343#ifdef OPTION_HC
2344 if (rend & RS_Sel)
2345 {
2346 /* invert the column if no highlightColor is set or it is the
2347 * current cursor column */
2348 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2349 && ISSET_PIXCOLOR (Color_HC))
2350 {
2351 if (ISSET_PIXCOLOR (Color_HTC))
2352 fore = Color_HTC;
2353 // if invert is 0 reverse video is set so we use bg color as fg color
2354 else if (!invert)
2355 fore = back;
2356
2357 back = Color_HC;
2358 invert = 0;
2359 }
2360 }
2361#endif
2362
2310 if (invert) 2363 if (invert)
2311 { 2364 {
2312#ifdef OPTION_HC
2313 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2314 || !ISSET_PIXCOLOR (Color_HC))
2315#endif
2316 /* invert the column if no highlightColor is set or it is the
2317 * current cursor column */
2318 ::swap (fore, back); 2365 ::swap (fore, back);
2319#ifdef OPTION_HC
2320 else if (ISSET_PIXCOLOR (Color_HC))
2321 back = Color_HC;
2322#endif
2323 2366
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2367#ifndef NO_BOLD_UNDERLINE_REVERSE
2325# ifndef OPTION_HC
2326 if (ISSET_PIXCOLOR (Color_RV))
2327 back = Color_RV;
2328# endif
2329 if (fore == back) 2368 if (fore == back)
2330 { 2369 {
2331 fore = Color_bg; 2370 fore = Color_bg;
2332 back = Color_fg; 2371 back = Color_fg;
2333 } 2372 }
… …
2369 /* 2408 /*
2370 * Actually do the drawing of the string here 2409 * Actually do the drawing of the string here
2371 */ 2410 */
2372 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2411 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2373 2412
2374 if (expect_true (have_bg && back == Color_bg)) 2413 if (ecb_likely (have_bg && back == Color_bg))
2375 { 2414 {
2376 // this is very ugly, maybe push it into ->draw? 2415 // this is very ugly, maybe push it into ->draw?
2377 2416
2378 for (i = 0; i < count; i++) /* don't draw empty strings */ 2417 for (i = 0; i < count; i++) /* don't draw empty strings */
2379 if (text[i] != ' ') 2418 if (text[i] != ' ')
… …
2386 did_clear: ; 2425 did_clear: ;
2387 } 2426 }
2388 else 2427 else
2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2390 2429
2391 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2392 { 2431 {
2393#if ENABLE_FRILLS 2432#if ENABLE_FRILLS
2394 if (ISSET_PIXCOLOR (Color_underline)) 2433 if (ISSET_PIXCOLOR (Color_underline))
2395 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2434 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2396 else 2435 else
… …
2401 xpixel, ypixel + font->ascent + 1, 2440 xpixel, ypixel + font->ascent + 1,
2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2441 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2403 } 2442 }
2404 } /* for (col....) */ 2443 } /* for (col....) */
2405 } /* for (row....) */ 2444 } /* for (row....) */
2406
2407#if ENABLE_OVERLAY
2408 scr_swap_overlay ();
2409#endif
2410 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2411 2445
2412 /* 2446 /*
2413 * G: cleanup cursor and display outline cursor if necessary 2447 * G: cleanup cursor and display outline cursor if necessary
2414 */ 2448 */
2415 if (showcursor) 2449 if (showcursor)
… …
2454 } 2488 }
2455 2489
2456 /* 2490 /*
2457 * H: cleanup selection 2491 * H: cleanup selection
2458 */ 2492 */
2493#if ENABLE_OVERLAY
2494 scr_swap_overlay ();
2495#endif
2496 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2497
2459 scr_reverse_selection (); 2498 scr_reverse_selection ();
2460 2499
2500 screen.flags = old_screen_flags;
2461 num_scr = 0; 2501 num_scr = 0;
2462 num_scr_allow = 1; 2502 num_scr_allow = 1;
2463} 2503}
2464 2504
2465void 2505void
… …
2486 scr_remap_chars (swap_buf [i]); 2526 scr_remap_chars (swap_buf [i]);
2487 } 2527 }
2488} 2528}
2489 2529
2490void 2530void
2491rxvt_term::scr_recolour () NOTHROW 2531rxvt_term::scr_recolour (bool refresh) NOTHROW
2492{ 2532{
2533 bool transparent = false;
2534
2493#ifdef HAVE_BG_PIXMAP 2535#ifdef HAVE_BG_PIXMAP
2494 bgPixmap.apply (); 2536 if (bg_pixmap != None)
2495#else 2537 {
2538# ifdef ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT)
2540 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2496 2543
2544 transparent = true;
2545 }
2546 else
2547# endif
2548 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2551 }
2552 }
2553 else
2554#endif
2555 {
2497 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2498 XClearWindow (dpy, parent[0]);
2499 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2557 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2558 }
2559
2560 XClearWindow (dpy, parent);
2500 2561
2501 if (scrollBar.win) 2562 if (scrollBar.win)
2502 { 2563 {
2564 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else
2503 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2504 scrollBar.state = STATE_IDLE; 2568 scrollBar.state = SB_STATE_IDLE;
2505 scrollBar.show (0); 2569 scrollBar.show (0);
2506 } 2570 }
2507 2571
2508#endif 2572 if (refresh)
2509 2573 {
2510 /* bgPixmap.apply () does not do the following : */
2511 scr_clear (); 2574 scr_clear ();
2512 scr_touch (true); 2575 scr_touch (true);
2576 }
2513 want_refresh = 1; 2577 want_refresh = 1;
2514} 2578}
2515 2579
2516/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2517void 2581void
… …
2585 { 2649 {
2586#if !ENABLE_MINIMAL 2650#if !ENABLE_MINIMAL
2587 if (selection.rect) 2651 if (selection.rect)
2588 scr_xor_rect (selection.beg.row, selection.beg.col, 2652 scr_xor_rect (selection.beg.row, selection.beg.col,
2589 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2590 RS_RVid, RS_RVid | RS_Uline); 2654 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2591 else 2655 else
2592#endif 2656#endif
2593 scr_xor_span (selection.beg.row, selection.beg.col, 2657 scr_xor_span (selection.beg.row, selection.beg.col,
2594 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2595 RS_RVid); 2659 RS_Sel | RS_RVid);
2596 } 2660 }
2597} 2661}
2598 2662
2599/* ------------------------------------------------------------------------- */ 2663/* ------------------------------------------------------------------------- */
2600/* 2664/*
… …
2605void 2669void
2606rxvt_term::scr_dump (int fd) NOTHROW 2670rxvt_term::scr_dump (int fd) NOTHROW
2607{ 2671{
2608 int row, wrote; 2672 int row, wrote;
2609 unsigned int width, towrite; 2673 unsigned int width, towrite;
2610 char r1[] = "\n"; 2674 const char r1[] = "\n";
2611 2675
2612 for (row = saveLines + top_row; 2676 for (row = saveLines + top_row;
2613 row < saveLines + nrow - 1; row++) 2677 row < saveLines + nrow - 1; row++)
2614 { 2678 {
2615 width = row_buf[row].l >= 0 ? row_buf[row].l 2679 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2661/* ------------------------------------------------------------------------- */ 2725/* ------------------------------------------------------------------------- */
2662/* 2726/*
2663 * Paste a selection direct to the command fd 2727 * Paste a selection direct to the command fd
2664 */ 2728 */
2665void 2729void
2666rxvt_term::paste (char *data, unsigned int len) NOTHROW 2730rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2667{ 2731{
2668 /* convert normal newline chars into common keyboard Return key sequence */ 2732 /* convert normal newline chars into common keyboard Return key sequence */
2669 for (unsigned int i = 0; i < len; i++) 2733 for (unsigned int i = 0; i < len; i++)
2670 if (data[i] == C0_LF) 2734 if (data[i] == C0_LF)
2671 data[i] = C0_CR; 2735 data[i] = C0_CR;
… …
2677 2741
2678 if (priv_modes & PrivMode_BracketPaste) 2742 if (priv_modes & PrivMode_BracketPaste)
2679 tt_printf ("\e[201~"); 2743 tt_printf ("\e[201~");
2680} 2744}
2681 2745
2682/* ------------------------------------------------------------------------- */
2683/*
2684 * Respond to a notification that a primary selection has been sent
2685 * EXT: SelectionNotify
2686 */
2687void 2746void
2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2747rxvt_term::paste (char *data, unsigned int len) NOTHROW
2689{ 2748{
2690 if (prop == None) /* check for failed XConvertSelection */ 2749 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2691 {
2692 if ((selection_type & Sel_CompoundText))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = 0;
2697 if (selnum != Sel_direct)
2698 selection_request_other (XA_STRING, selnum);
2699 }
2700
2701 if ((selection_type & Sel_UTF8String))
2702 {
2703 int selnum = selection_type & Sel_whereMask;
2704
2705 selection_type = Sel_CompoundText;
2706 if (selnum != Sel_direct)
2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708 else
2709 selection_type = 0;
2710 }
2711
2712 return;
2713 }
2714
2715 unsigned long bytes_after;
2716 XTextProperty ct;
2717
2718 if (XGetWindowProperty (dpy, win, prop,
2719 0, PROP_SIZE / 4,
2720 delete_prop, AnyPropertyType,
2721 &ct.encoding, &ct.format,
2722 &ct.nitems, &bytes_after,
2723 &ct.value) != Success)
2724 {
2725 ct.value = 0;
2726 goto bailout;
2727 }
2728
2729 if (ct.encoding == None)
2730 goto bailout;
2731
2732 if (bytes_after)
2733 {
2734 // fetch and append remaining data
2735 XTextProperty ct2;
2736
2737 if (XGetWindowProperty (dpy, win, prop,
2738 ct.nitems / 4, (bytes_after + 3) / 4,
2739 delete_prop, AnyPropertyType,
2740 &ct2.encoding, &ct2.format,
2741 &ct2.nitems, &bytes_after,
2742 &ct2.value) != Success)
2743 goto bailout;
2744
2745 // realloc should be compatible to XFree, here, and elsewhere, too
2746 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2747 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2748 ct.nitems += ct2.nitems;
2749
2750 XFree (ct2.value);
2751 }
2752
2753 if (ct.value == 0)
2754 goto bailout;
2755
2756 if (ct.encoding == xa[XA_INCR])
2757 {
2758 // INCR selection, start handshake
2759 if (!delete_prop)
2760 XDeleteProperty (dpy, win, prop);
2761
2762 selection_wait = Sel_incr;
2763 incr_buf_fill = 0;
2764 incr_ev.start (10);
2765
2766 goto bailout;
2767 }
2768
2769 if (ct.nitems == 0)
2770 {
2771 if (selection_wait == Sel_incr)
2772 {
2773 XFree (ct.value);
2774
2775 // finally complete, now paste the whole thing
2776 selection_wait = Sel_normal;
2777 ct.value = (unsigned char *)incr_buf;
2778 ct.nitems = incr_buf_fill;
2779 incr_buf = 0;
2780 incr_buf_size = 0;
2781 incr_ev.stop ();
2782 }
2783 else
2784 {
2785 if (selection_wait == Sel_normal
2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2787 {
2788 /*
2789 * pass through again trying CUT_BUFFER0 if we've come from
2790 * XConvertSelection () but nothing was presented
2791 */
2792 selection_paste (display->root, XA_CUT_BUFFER0, False);
2793 }
2794
2795 goto bailout;
2796 }
2797 }
2798 else if (selection_wait == Sel_incr)
2799 {
2800 incr_ev.start (10);
2801
2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2803 {
2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2806 }
2807
2808 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2809 incr_buf_fill += ct.nitems;
2810
2811 goto bailout;
2812 }
2813
2814 char **cl;
2815 int cr;
2816
2817#if !ENABLE_MINIMAL
2818 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2819 // so recode it manually
2820 if (ct.encoding == xa[XA_UTF8_STRING])
2821 {
2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2823 char *s = rxvt_wcstombs (w);
2824 free (w);
2825 // TODO: strlen == only the first element will be converted. well...
2826 paste (s, strlen (s));
2827 free (s);
2828 }
2829 else
2830#endif
2831 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2832 && cl)
2833 {
2834 for (int i = 0; i < cr; i++)
2835 paste (cl[i], strlen (cl[i]));
2836
2837 XFreeStringList (cl);
2838 }
2839 else
2840 paste ((char *)ct.value, ct.nitems); // paste raw
2841
2842bailout:
2843 XFree (ct.value);
2844
2845 if (selection_wait == Sel_normal)
2846 selection_wait = Sel_none;
2847}
2848
2849void
2850rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2851{
2852 selection_wait = Sel_none;
2853
2854 incr_buf_size = 0;
2855 free (incr_buf);
2856
2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2858}
2859
2860void
2861rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2862{
2863 if (prop == None || selection_wait != Sel_incr)
2864 return; 2750 return;
2865 2751
2866 selection_paste (win, prop, true); 2752 tt_paste (data, len);
2867} 2753}
2868 2754
2869/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2870/* 2756/*
2871 * Request the current selection: 2757 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2872 * Order: > internal selection if available 2758 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2873 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2759 * as fallback
2874 * > CUT_BUFFER0
2875 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2876 * will auto fallback to CUT_BUFFER0
2877 * EXT: button 2 release 2760 * EXT: button 2 release
2878 */ 2761 */
2879void 2762void
2880rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2763rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2881{ 2764{
2882 if (selection.text && selnum == Sel_Primary) 2765 if (!selection_req)
2883 {
2884 /* internal selection */
2885 char *str = rxvt_wcstombs (selection.text, selection.len);
2886 paste (str, strlen (str));
2887 free (str);
2888 return;
2889 } 2766 {
2890 else 2767 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2768 selection_req->run ();
2891 { 2769 }
2892 selection_request_time = tm;
2893 selection_wait = Sel_normal;
2894
2895#if X_HAVE_UTF8_STRING
2896 selection_type = Sel_UTF8String;
2897 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2898 return;
2899#else
2900 selection_type = Sel_CompoundText;
2901 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2902 return;
2903#endif
2904 }
2905
2906 selection_wait = Sel_none; /* don't loop in selection_paste () */
2907 selection_paste (display->root, XA_CUT_BUFFER0, false);
2908}
2909
2910int
2911rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2912{
2913 Atom sel;
2914
2915 selection_type |= selnum;
2916
2917 if (selnum == Sel_Primary)
2918 sel = XA_PRIMARY;
2919 else if (selnum == Sel_Secondary)
2920 sel = XA_SECONDARY;
2921 else
2922 sel = xa[XA_CLIPBOARD];
2923
2924 if (XGetSelectionOwner (dpy, sel) != None)
2925 {
2926 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2927 vt, selection_request_time);
2928 return 1;
2929 }
2930
2931 return 0;
2932} 2770}
2933 2771
2934/* ------------------------------------------------------------------------- */ 2772/* ------------------------------------------------------------------------- */
2935/* 2773/*
2936 * Clear all selected text 2774 * Clear all selected text
2937 * EXT: SelectionClear 2775 * EXT: SelectionClear
2938 */ 2776 */
2939void 2777void
2940rxvt_term::selection_clear () NOTHROW 2778rxvt_term::selection_clear (bool clipboard) NOTHROW
2941{ 2779{
2780 if (!clipboard)
2781 {
2942 want_refresh = 1; 2782 want_refresh = 1;
2943 free (selection.text); 2783 free (selection.text);
2944 selection.text = NULL; 2784 selection.text = NULL;
2945 selection.len = 0; 2785 selection.len = 0;
2946 CLEAR_SELECTION (); 2786 CLEAR_SELECTION ();
2947 2787
2948 if (display->selection_owner == this) 2788 if (display->selection_owner == this)
2949 display->selection_owner = 0; 2789 display->selection_owner = 0;
2790 }
2791 else
2792 {
2793 free (selection.clip_text);
2794 selection.clip_text = NULL;
2795 selection.clip_len = 0;
2796
2797 if (display->clipboard_owner == this)
2798 display->clipboard_owner = 0;
2799 }
2950} 2800}
2951 2801
2952/* ------------------------------------------------------------------------- */ 2802/* ------------------------------------------------------------------------- */
2953/* 2803/*
2954 * Copy a selection into the cut buffer 2804 * Copy a selection into the cut buffer
2955 * EXT: button 1 or 3 release 2805 * EXT: button 1 or 3 release
2956 */ 2806 */
2957void 2807void
2958rxvt_term::selection_make (Time tm) 2808rxvt_term::selection_make (Time tm)
2959{ 2809{
2960 int i; 2810 int size;
2961 wchar_t *new_selection_text; 2811 wchar_t *new_selection_text;
2962 text_t *t; 2812 text_t *t;
2963 2813
2964 switch (selection.op) 2814 switch (selection.op)
2965 { 2815 {
… …
2981 return; /* nothing selected, go away */ 2831 return; /* nothing selected, go away */
2982 2832
2983 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2833 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2984 return; 2834 return;
2985 2835
2986 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2836 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2987 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2837 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2988 2838
2989 int ofs = 0; 2839 int ofs = 0;
2990 int extra = 0; 2840 int extra = 0;
2991 2841
2992 int col = selection.beg.col; 2842 int col = selection.beg.col;
… …
2998 { 2848 {
2999#if !ENABLE_MINIMAL 2849#if !ENABLE_MINIMAL
3000 if (selection.rect) 2850 if (selection.rect)
3001 { 2851 {
3002 col = selection.beg.col; 2852 col = selection.beg.col;
3003 end_col = ncol + 1; 2853 end_col = selection.end.col;
3004 } 2854 }
3005 else 2855 else
3006#endif 2856#endif
3007 end_col = ROW(row).l; 2857 end_col = ROW(row).l;
3008 2858
3009 col = max (col, 0); 2859 col = max (col, 0);
3010 2860
3011 if (row == selection.end.row 2861 if (row == selection.end.row)
3012#if !ENABLE_MINIMAL
3013 || selection.rect
3014#endif
3015 )
3016 min_it (end_col, selection.end.col); 2862 min_it (end_col, selection.end.col);
3017 2863
3018 t = ROW(row).t + col; 2864 t = ROW(row).t + col;
3019 2865
3020 for (; col < end_col; col++) 2866 for (; col < end_col; col++)
… …
3028 2874
3029 extra -= (len - 1); 2875 extra -= (len - 1);
3030 2876
3031 if (extra < 0) 2877 if (extra < 0)
3032 { 2878 {
3033 extra += i; 2879 extra += size;
3034 i += i; 2880 size += size;
3035 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2881 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3036 } 2882 }
3037 2883
3038 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2884 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3039 } 2885 }
3040#endif 2886#endif
… …
3052 2898
3053 new_selection_text[ofs++] = C0_LF; 2899 new_selection_text[ofs++] = C0_LF;
3054 } 2900 }
3055 else 2901 else
3056#endif 2902#endif
3057 if (!ROW(row).is_longer () && row != selection.end.row) 2903 if (!ROW(row).is_longer ()
2904 && (row != selection.end.row || end_col != selection.end.col)
2905 && (row != selection.beg.row || selection.beg.col < ncol))
3058 new_selection_text[ofs++] = C0_LF; 2906 new_selection_text[ofs++] = C0_LF;
3059 } 2907 }
3060
3061 if (end_col != selection.end.col)
3062 new_selection_text[ofs++] = C0_LF;
3063 2908
3064 new_selection_text[ofs] = 0; 2909 new_selection_text[ofs] = 0;
3065 2910
3066 if (ofs == 0) 2911 if (ofs == 0)
3067 { 2912 {
… …
3080 2925
3081 selection_grab (tm); 2926 selection_grab (tm);
3082} 2927}
3083 2928
3084bool 2929bool
3085rxvt_term::selection_grab (Time tm) NOTHROW 2930rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3086{ 2931{
2932 Atom sel;
2933
2934 if (!clipboard)
2935 {
3087 selection_time = tm; 2936 selection_time = tm;
2937 sel = XA_PRIMARY;
2938 }
2939 else
2940 {
2941 clipboard_time = tm;
2942 sel = xa[XA_CLIPBOARD];
2943 }
3088 2944
3089 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2945 XSetSelectionOwner (dpy, sel, vt, tm);
3090 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2946 if (XGetSelectionOwner (dpy, sel) == vt)
3091 { 2947 {
3092 display->set_selection_owner (this); 2948 display->set_selection_owner (this, clipboard);
3093 return true; 2949 return true;
3094 } 2950 }
3095 else 2951 else
3096 { 2952 {
3097 selection_clear (); 2953 selection_clear (clipboard);
3098 return false; 2954 return false;
3099 } 2955 }
3100 2956
3101#if 0 2957#if 0
3102 XTextProperty ct; 2958 XTextProperty ct;
… …
3562 * EXT: SelectionRequest 3418 * EXT: SelectionRequest
3563 */ 3419 */
3564void 3420void
3565rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3421rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3566{ 3422{
3423 Atom property = rq.property == None ? rq.target : rq.property;
3567 XSelectionEvent ev; 3424 XSelectionEvent ev;
3568 3425
3569 ev.type = SelectionNotify; 3426 ev.type = SelectionNotify;
3570 ev.property = None; 3427 ev.property = None;
3571 ev.display = rq.display; 3428 ev.display = rq.display;
… …
3586 *target++ = xa[XA_COMPOUND_TEXT]; 3443 *target++ = xa[XA_COMPOUND_TEXT];
3587#if X_HAVE_UTF8_STRING 3444#if X_HAVE_UTF8_STRING
3588 *target++ = xa[XA_UTF8_STRING]; 3445 *target++ = xa[XA_UTF8_STRING];
3589#endif 3446#endif
3590 3447
3591 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3448 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3592 32, PropModeReplace, 3449 32, PropModeReplace,
3593 (unsigned char *)target_list, target - target_list); 3450 (unsigned char *)target_list, target - target_list);
3594 ev.property = rq.property; 3451 ev.property = property;
3595 } 3452 }
3596#if TODO // TODO 3453#if TODO // TODO
3597 else if (rq.target == xa[XA_MULTIPLE]) 3454 else if (rq.target == xa[XA_MULTIPLE])
3598 { 3455 {
3599 /* TODO: Handle MULTIPLE */ 3456 /* TODO: Handle MULTIPLE */
3600 } 3457 }
3601#endif 3458#endif
3602 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3459 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3603 { 3460 {
3604 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3605 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3462 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3606 ev.property = rq.property; 3463 ev.property = property;
3464 }
3465 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3466 {
3467 XChangeProperty (dpy, rq.requestor, property, rq.target,
3468 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3469 ev.property = property;
3607 } 3470 }
3608 else if (rq.target == XA_STRING 3471 else if (rq.target == XA_STRING
3609 || rq.target == xa[XA_TEXT] 3472 || rq.target == xa[XA_TEXT]
3610 || rq.target == xa[XA_COMPOUND_TEXT] 3473 || rq.target == xa[XA_COMPOUND_TEXT]
3611 || rq.target == xa[XA_UTF8_STRING] 3474 || rq.target == xa[XA_UTF8_STRING]
… …
3643 { 3506 {
3644 target = xa[XA_COMPOUND_TEXT]; 3507 target = xa[XA_COMPOUND_TEXT];
3645 style = enc_compound_text; 3508 style = enc_compound_text;
3646 } 3509 }
3647 3510
3648 if (selection.text) 3511 if (rq.selection == XA_PRIMARY && selection.text)
3649 { 3512 {
3650 cl = selection.text; 3513 cl = selection.text;
3651 selectlen = selection.len; 3514 selectlen = selection.len;
3515 }
3516 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3517 {
3518 cl = selection.clip_text;
3519 selectlen = selection.clip_len;
3652 } 3520 }
3653 else 3521 else
3654 { 3522 {
3655 cl = L""; 3523 cl = L"";
3656 selectlen = 0; 3524 selectlen = 0;
… …
3677 ct.value = (unsigned char *)cl; 3545 ct.value = (unsigned char *)cl;
3678 ct.nitems = selectlen; 3546 ct.nitems = selectlen;
3679 ct.encoding = target; 3547 ct.encoding = target;
3680 } 3548 }
3681 3549
3682 XChangeProperty (dpy, rq.requestor, rq.property, 3550 XChangeProperty (dpy, rq.requestor, property,
3683 ct.encoding, 8, PropModeReplace, 3551 ct.encoding, 8, PropModeReplace,
3684 ct.value, (int)ct.nitems); 3552 ct.value, (int)ct.nitems);
3685 ev.property = rq.property; 3553 ev.property = property;
3686 3554
3687 if (freect) 3555 if (freect)
3688 XFree (ct.value); 3556 XFree (ct.value);
3689 } 3557 }
3690 3558
… …
3724 h += 2; min_it (h, nrow); 3592 h += 2; min_it (h, nrow);
3725 3593
3726 x -= 1; clamp_it (x, 0, ncol - w); 3594 x -= 1; clamp_it (x, 0, ncol - w);
3727 y -= 1; clamp_it (y, 0, nrow - h); 3595 y -= 1; clamp_it (y, 0, nrow - h);
3728 3596
3729 ov_x = x; ov_y = y; 3597 ov.x = x; ov.y = y;
3730 ov_w = w; ov_h = h; 3598 ov.w = w; ov.h = h;
3731 3599
3732 ov_text = new text_t *[h]; 3600 ov.text = new text_t *[h];
3733 ov_rend = new rend_t *[h]; 3601 ov.rend = new rend_t *[h];
3734 3602
3735 for (y = 0; y < h; y++) 3603 for (y = 0; y < h; y++)
3736 { 3604 {
3737 text_t *tp = ov_text[y] = new text_t[w]; 3605 text_t *tp = ov.text[y] = new text_t[w];
3738 rend_t *rp = ov_rend[y] = new rend_t[w]; 3606 rend_t *rp = ov.rend[y] = new rend_t[w];
3739 3607
3740 text_t t0, t1, t2; 3608 text_t t0, t1, t2;
3741 rend_t r = OVERLAY_RSTYLE; 3609 rend_t r = OVERLAY_RSTYLE;
3742 3610
3743 if (y == 0) 3611 if (y == 0)
… …
3762} 3630}
3763 3631
3764void 3632void
3765rxvt_term::scr_overlay_off () NOTHROW 3633rxvt_term::scr_overlay_off () NOTHROW
3766{ 3634{
3767 if (!ov_text) 3635 if (!ov.text)
3768 return; 3636 return;
3769 3637
3770 want_refresh = 1; 3638 want_refresh = 1;
3771 3639
3772 for (int y = 0; y < ov_h; y++) 3640 for (int y = 0; y < ov.h; y++)
3773 { 3641 {
3774 delete [] ov_text[y]; 3642 delete [] ov.text[y];
3775 delete [] ov_rend[y]; 3643 delete [] ov.rend[y];
3776 } 3644 }
3777 3645
3778 delete [] ov_text; ov_text = 0; 3646 delete [] ov.text; ov.text = 0;
3779 delete [] ov_rend; ov_rend = 0; 3647 delete [] ov.rend; ov.rend = 0;
3780} 3648}
3781 3649
3782void 3650void
3783rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3651rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3784{ 3652{
3785 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3653 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3786 return; 3654 return;
3787 3655
3788 x++, y++; 3656 x++, y++;
3789 3657
3790 ov_text[y][x] = text; 3658 ov.text[y][x] = text;
3791 ov_rend[y][x] = rend; 3659 ov.rend[y][x] = rend;
3792} 3660}
3793 3661
3794void 3662void
3795rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3663rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3796{ 3664{
… …
3815} 3683}
3816 3684
3817void 3685void
3818rxvt_term::scr_swap_overlay () NOTHROW 3686rxvt_term::scr_swap_overlay () NOTHROW
3819{ 3687{
3820 if (!ov_text) 3688 if (!ov.text)
3821 return; 3689 return;
3822 3690
3691 // hide cursor if it is within the overlay area
3692 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3693 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3694 screen.flags &= ~Screen_VisibleCursor;
3695
3823 // swap screen mem with overlay 3696 // swap screen mem with overlay
3824 for (int y = ov_h; y--; ) 3697 for (int y = ov.h; y--; )
3825 { 3698 {
3826 text_t *t1 = ov_text[y]; 3699 text_t *t1 = ov.text[y];
3827 rend_t *r1 = ov_rend[y]; 3700 rend_t *r1 = ov.rend[y];
3828 3701
3829 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3702 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3830 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3703 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3831 3704
3832 for (int x = ov_w; x--; ) 3705 for (int x = ov.w; x--; )
3833 { 3706 {
3834 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3707 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3835 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3708 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3836 } 3709 }
3837 } 3710 }

Diff Legend

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