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.319 by root, Tue Nov 4 23:08:44 2008 UTC vs.
Revision 1.396 by root, Wed Nov 2 10:53:12 2011 UTC

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

Diff Legend

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