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.314 by root, Tue Nov 4 14:34:13 2008 UTC vs.
Revision 1.388 by root, Fri Jul 8 00:08:40 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found begin, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 154 } while (col < ncol && l.t[col] == NOCHAR);
… …
162{ 163{
163#if ENABLE_OVERLAY 164#if ENABLE_OVERLAY
164 scr_overlay_off (); 165 scr_overlay_off ();
165#endif 166#endif
166 167
167 rvideo_mode = false;
168 view_start = 0; 168 view_start = 0;
169 num_scr = 0; 169 num_scr = 0;
170 170
171 if (ncol == 0) 171 if (ncol == 0)
172 ncol = 80; 172 ncol = 80;
… …
174 if (nrow == 0) 174 if (nrow == 0)
175 nrow = 24; 175 nrow = 24;
176 176
177 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 178 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 179
183 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
185 { 182 {
186 //TODO//FIXME 183 //TODO//FIXME
… …
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
… …
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 - 1);
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 {
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 788 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 789 screen.cur.row -= minlines;
777 } 790 }
778 } 791 }
779 792
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 793 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 794 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 795 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 796 int row = screen.cur.row;
786 797
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 798 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 799
789 line_t *line = &ROW(row); 800 line_t *line = &ROW(row);
790 801
791 while (str < strend) 802 while (str < strend)
792 { 803 {
793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
794 805
795 if (expect_false (c < 0x20)) 806 if (ecb_unlikely (c < 0x20))
796 if (c == C0_LF) 807 if (c == C0_LF)
797 { 808 {
798 max_it (line->l, screen.cur.col); 809 max_it (line->l, screen.cur.col);
799 810
800 screen.flags &= ~Screen_WrapNext; 811 screen.flags &= ~Screen_WrapNext;
… …
819 { 830 {
820 scr_tab (1, true); 831 scr_tab (1, true);
821 continue; 832 continue;
822 } 833 }
823 834
824 if (expect_false ( 835 if (ecb_unlikely (
825 checksel /* see if we're writing within selection */ 836 checksel /* see if we're writing within selection */
826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
827 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 838 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 )) 839 ))
829 { 840 {
… …
834 * should be a similar check. 845 * should be a similar check.
835 */ 846 */
836 CLEAR_SELECTION (); 847 CLEAR_SELECTION ();
837 } 848 }
838 849
839 if (expect_false (screen.flags & Screen_WrapNext)) 850 if (ecb_unlikely (screen.flags & Screen_WrapNext))
840 { 851 {
841 scr_do_wrap (); 852 scr_do_wrap ();
842 853
843 line->l = ncol; 854 line->l = ncol;
844 line->is_longer (1); 855 line->is_longer (1);
… …
846 row = screen.cur.row; 857 row = screen.cur.row;
847 line = &ROW(row); /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
848 } 859 }
849 860
850 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 862 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
852 c = 0xfffd; 863 c = 0xfffd;
853 864
854 // rely on wcwidth to tell us the character width, do wcwidth before 865 // rely on wcwidth to tell us the character width, do wcwidth before
855 // further replacements, as wcwidth might return -1 for the line 866 // further replacements, as wcwidth might return -1 for the line
856 // drawing characters below as they might be invalid in the current 867 // drawing characters below as they might be invalid in the current
857 // locale. 868 // locale.
858 int width = WCWIDTH (c); 869 int width = WCWIDTH (c);
859 870
860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 871 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
861 { 872 {
862 // vt100 special graphics and line drawing 873 // vt100 special graphics and line drawing
863 // 5f-7e standard vt100 874 // 5f-7e standard vt100
864 // 40-5e rxvt extension for extra curses acs chars 875 // 40-5e rxvt extension for extra curses acs chars
865 static uint16_t vt100_0[62] = { // 41 .. 7e 876 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
878 c = vt100_0[c - 0x41]; 889 c = vt100_0[c - 0x41];
879 width = 1; // vt100 line drawing characters are always single-width 890 width = 1; // vt100 line drawing characters are always single-width
880 } 891 }
881 } 892 }
882 893
883 if (expect_false (screen.flags & Screen_Insert)) 894 if (ecb_unlikely (screen.flags & Screen_Insert))
884 scr_insdel_chars (width, INSERT); 895 scr_insdel_chars (width, INSERT);
885 896
886 if (width != 0) 897 if (width != 0)
887 { 898 {
888#if !UNICODE_3 899#if !UNICODE_3
… …
893# else 904# else
894 c = 0xfffd; 905 c = 0xfffd;
895# endif 906# endif
896#endif 907#endif
897 908
909 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
910
911 // if the character doesn't fit into the remaining columns...
912 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
913 {
914 if (screen.flags & Screen_Autowrap)
915 {
916 // ... artificially enlargen the previous one
917 c = NOCHAR;
918 // and try the same character next loop iteration
919 --str;
920 }
921 else
922 screen.cur.col = ncol - width;
923 }
924
898 // nuke the character at this position, if required 925 // nuke the character at this position, if required
899 if (expect_false ( 926 // due to wonderful coincidences everywhere else in this loop
927 // we never have to check for overwriting a wide char itself,
928 // only its tail.
900 line->t[screen.cur.col] == NOCHAR 929 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); 930 scr_kill_char (*line, screen.cur.col);
905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907
908 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 {
911 // ...output spaces
912 c = ' ';
913 // and try the same character next loop iteration
914 --str;
915 }
916 931
917 line->touch (); 932 line->touch ();
918 933
919 do 934 do
920 { 935 {
921 line->t[screen.cur.col] = c; 936 line->t[screen.cur.col] = c;
922 line->r[screen.cur.col] = rend; 937 line->r[screen.cur.col] = rend;
923 938
924 if (expect_true (screen.cur.col < ncol - 1)) 939 if (ecb_likely (screen.cur.col < ncol - 1))
925 screen.cur.col++; 940 screen.cur.col++;
926 else 941 else
927 { 942 {
928 line->l = ncol; 943 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 945 screen.flags |= Screen_WrapNext;
931 break; 946
947 goto end_of_line;
932 } 948 }
933 949
934 c = NOCHAR; 950 c = NOCHAR;
935 } 951 }
936 while (expect_false (--width > 0)); 952 while (ecb_unlikely (--width > 0));
937 953
938 // pad with spaces when overwriting wide character with smaller one 954 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 955 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
940 { 956 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 957 line->t[c] = ' ';
946 line->r[c] = rend; 958 line->r[c] = rend;
947 }
948 } 959 }
960
961end_of_line:
962 ;
949 } 963 }
950#if ENABLE_COMBINING 964#if ENABLE_COMBINING
951 else // width == 0 965 else // width == 0
952 { 966 {
953 if (c != 0xfeff) // ignore BOM 967 if (c != 0xfeff) // ignore BOM
… …
993#endif 1007#endif
994 } 1008 }
995 1009
996 max_it (line->l, screen.cur.col); 1010 max_it (line->l, screen.cur.col);
997 1011
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1012 assert (screen.cur.row >= 0);
1000#endif
1001} 1013}
1002 1014
1003/* ------------------------------------------------------------------------- */ 1015/* ------------------------------------------------------------------------- */
1004/* 1016/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1017 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1030
1019 want_refresh = 1; 1031 want_refresh = 1;
1020#endif 1032#endif
1021 } 1033 }
1022 } 1034 }
1035 else if (screen.flags & Screen_WrapNext)
1036 screen.flags &= ~Screen_WrapNext;
1023 else 1037 else
1024 scr_gotorc (0, -1, RELATIVE); 1038 scr_gotorc (0, -1, RELATIVE);
1025} 1039}
1026 1040
1027/* ------------------------------------------------------------------------- */ 1041/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1347 if (row >= nrow) /* Out Of Bounds */
1334 return; 1348 return;
1335 1349
1336 min_it (num, nrow - row); 1350 min_it (num, nrow - row);
1337 1351
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1352 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1353 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1354 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1355 {
1343 ren = DEFAULT_RSTYLE; 1356 ren = DEFAULT_RSTYLE;
1344 1357
1345 if (mapped) 1358 if (mapped)
1346 XClearArea (dpy, vt, 0, 1359 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1360 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1361 (unsigned int)Height2Pixel (num), False);
1349 } 1362 }
1350 else 1363 else
1351 { 1364 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1365 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1366
1367 if (mapped)
1368 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1371 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1372 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1373 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1374 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1375 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1376 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1377 }
1362 } 1378 }
1363 1379
1364 for (; num--; row++) 1380 for (; num--; row++)
1365 { 1381 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1382 scr_blank_screen_mem (ROW(row), rstyle);
1383
1384 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1385 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1386 }
1369} 1387}
1370 1388
1371#if !ENABLE_MINIMAL 1389#if !ENABLE_MINIMAL
1372void 1390void
… …
1464 line_t *line = &ROW(row); 1482 line_t *line = &ROW(row);
1465 1483
1466 line->touch (); 1484 line->touch ();
1467 line->is_longer (0); 1485 line->is_longer (0);
1468 1486
1487 // nuke wide spanning the start
1488 if (line->t[screen.cur.col] == NOCHAR)
1489 scr_kill_char (*line, screen.cur.col);
1490
1469 switch (insdel) 1491 switch (insdel)
1470 { 1492 {
1471 case INSERT: 1493 case INSERT:
1472 line->l = min (line->l + count, ncol); 1494 line->l = min (line->l + count, ncol);
1495
1496 if (line->t[screen.cur.col] == NOCHAR)
1497 scr_kill_char (*line, screen.cur.col);
1473 1498
1474 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) 1499 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1475 { 1500 {
1476 line->t[col] = line->t[col - count]; 1501 line->t[col] = line->t[col - count];
1477 line->r[col] = line->r[col - count]; 1502 line->r[col] = line->r[col - count];
… …
1498 case ERASE: 1523 case ERASE:
1499 screen.cur.col += count; /* don't worry if > ncol */ 1524 screen.cur.col += count; /* don't worry if > ncol */
1500 selection_check (1); 1525 selection_check (1);
1501 screen.cur.col -= count; 1526 screen.cur.col -= count;
1502 1527
1528 // nuke wide char after the end
1529 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1530 scr_kill_char (*line, screen.cur.col + count);
1531
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1532 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1533 break;
1505 1534
1506 case DELETE: 1535 case DELETE:
1507 {
1508 line->l = max (line->l - count, 0); 1536 line->l = max (line->l - count, 0);
1509 1537
1510 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1538 // nuke wide char spanning the end
1539 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1540 scr_kill_char (*line, screen.cur.col + count);
1511 1541
1512 for (int col = screen.cur.col; (col + count) < ncol; col++) 1542 for (int col = screen.cur.col; (col + count) < ncol; col++)
1513 { 1543 {
1514 line->t[col] = line->t[col + count]; 1544 line->t[col] = line->t[col + count];
1515 line->r[col] = line->r[col + count]; 1545 line->r[col] = line->r[col + count];
1516 } 1546 }
1517 1547
1518 // nuke wide char at the end
1519 if (line->t[screen.cur.col] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col);
1521
1522 scr_blank_line (*line, ncol - count, count, tr); 1548 scr_blank_line (*line, ncol - count, count, rstyle);
1523 1549
1524 if (selection.op && current_screen == selection.screen 1550 if (selection.op && current_screen == selection.screen
1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1551 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1526 { 1552 {
1527 if (selection.end.row != screen.cur.row 1553 if (selection.end.row != screen.cur.row
1528 || (screen.cur.col >= selection.beg.col - count) 1554 || (screen.cur.col >= selection.beg.col - count)
1529 || selection.end.col >= ncol) 1555 || selection.end.col >= ncol)
1530 CLEAR_SELECTION (); 1556 CLEAR_SELECTION ();
1531 else 1557 else
1532 { 1558 {
1533 /* shift selection */ 1559 /* shift selection */
1534 selection.beg.col -= count; 1560 selection.beg.col -= count;
1535 selection.mark.col -= count; /* XXX: yes? */ 1561 selection.mark.col -= count; /* XXX: yes? */
1536 selection.end.col -= count; 1562 selection.end.col -= count;
1537 } 1563 }
1538 }
1539 } 1564 }
1540 1565
1541 break; 1566 break;
1542 } 1567 }
1543} 1568}
… …
1664 { 1689 {
1665 rvideo_state = on; 1690 rvideo_state = on;
1666 1691
1667 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1668#ifdef HAVE_BG_PIXMAP 1693#ifdef HAVE_BG_PIXMAP
1669 if (bgPixmap.pixmap == None) 1694 if (bg_pixmap == None)
1670#endif 1695#endif
1671 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1672 1697
1673 XGCValues gcvalue; 1698 XGCValues gcvalue;
1674 gcvalue.foreground = pix_colors[Color_fg]; 1699 gcvalue.foreground = pix_colors[Color_fg];
… …
1818 for (i = PART_BEG; i < RC_COUNT; i++) 1843 for (i = PART_BEG; i < RC_COUNT; i++)
1819 { 1844 {
1820 min_it (rc[i].col, ncol - 1); 1845 min_it (rc[i].col, ncol - 1);
1821 min_it (rc[i].row, nrow - 1); 1846 min_it (rc[i].row, nrow - 1);
1822 } 1847 }
1823// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1848
1824 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1849 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1825 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1850 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1826 1851
1827 num_scr_allow = 0; 1852 num_scr_allow = 0;
1828 1853
… …
1901 1926
1902# ifndef NO_MAPALERT 1927# ifndef NO_MAPALERT
1903# ifdef MAPALERT_OPTION 1928# ifdef MAPALERT_OPTION
1904 if (option (Opt_mapAlert)) 1929 if (option (Opt_mapAlert))
1905# endif 1930# endif
1906 XMapWindow (dpy, parent[0]); 1931 XMapWindow (dpy, parent);
1907# endif 1932# endif
1908 1933
1909# if ENABLE_FRILLS 1934# if ENABLE_FRILLS
1910 if (option (Opt_urgentOnBell)) 1935 if (option (Opt_urgentOnBell))
1911 set_urgency (1); 1936 set_urgency (1);
… …
1919 1944
1920 bell_ev.start (VISUAL_BELL_DURATION); 1945 bell_ev.start (VISUAL_BELL_DURATION);
1921 } 1946 }
1922 else 1947 else
1923 XBell (dpy, 0); 1948 XBell (dpy, 0);
1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1924#endif 1950#endif
1925} 1951}
1926 1952
1927/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1928/* ARGSUSED */
1929void 1954void
1930rxvt_term::scr_printscreen (int fullhist) NOTHROW 1955rxvt_term::scr_printscreen (int fullhist) NOTHROW
1931{ 1956{
1932#ifdef PRINTPIPE 1957#ifdef PRINTPIPE
1933 int nrows, row_start; 1958 int nrows, row_start;
… …
1947 row_start = view_start; 1972 row_start = view_start;
1948 } 1973 }
1949 1974
1950 wctomb (0, 0); 1975 wctomb (0, 0);
1951 1976
1952 for (int r1 = 0; r1 < nrows; r1++) 1977 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1953 { 1978 {
1954 text_t *tp = ROW(r1).t; 1979 text_t *tp = ROW(r1).t;
1955 int len = ROW(r1).l; 1980 int len = ROW(r1).l;
1956 1981
1957 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1982 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1986 * screen.text/screen.rend contain what the screen will change to. 2011 * screen.text/screen.rend contain what the screen will change to.
1987 */ 2012 */
1988void 2013void
1989rxvt_term::scr_refresh () NOTHROW 2014rxvt_term::scr_refresh () NOTHROW
1990{ 2015{
1991 unsigned char have_bg,
1992 showcursor; /* show the cursor */
1993 int16_t col, row, /* column/row we're processing */ 2016 int16_t col, row, /* column/row we're processing */
1994 ocrow; /* old cursor row */ 2017 ocrow; /* old cursor row */
1995 int i; /* tmp */ 2018 int i; /* tmp */
1996#ifndef NO_CURSORCOLOR 2019#ifndef NO_CURSORCOLOR
1997 rend_t cc1; /* store colours at cursor position (s) */ 2020 rend_t cc1; /* store colours at cursor position (s) */
… …
2008 /* 2031 /*
2009 * A: set up vars 2032 * A: set up vars
2010 */ 2033 */
2011 refresh_count = 0; 2034 refresh_count = 0;
2012 2035
2036 unsigned int old_screen_flags = screen.flags;
2013 have_bg = 0; 2037 char have_bg = 0;
2014#ifdef HAVE_BG_PIXMAP 2038#ifdef HAVE_BG_PIXMAP
2015 have_bg = bgPixmap.pixmap != None; 2039 have_bg = bg_pixmap != None;
2016#endif 2040#endif
2017 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2018 2042
2019 /* 2043 /*
2020 * B: reverse any characters which are selected 2044 * B: reverse any characters which are selected
2021 */ 2045 */
2022 scr_reverse_selection (); 2046 scr_reverse_selection ();
2047
2048 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2049#if ENABLE_OVERLAY
2050 scr_swap_overlay ();
2051#endif
2052
2053 char showcursor = screen.flags & Screen_VisibleCursor;
2023 2054
2024 /* 2055 /*
2025 * C: set the cursor character (s) 2056 * C: set the cursor character (s)
2026 */ 2057 */
2027 { 2058 {
2028 unsigned char setoldcursor; 2059 unsigned char setoldcursor;
2029 2060
2030 showcursor = (screen.flags & Screen_VisibleCursor);
2031#ifdef CURSOR_BLINK 2061#ifdef CURSOR_BLINK
2032 if (hidden_cursor) 2062 if (hidden_cursor)
2033 showcursor = 0; 2063 showcursor = 0;
2034#endif 2064#endif
2035 2065
… …
2063 ccol2 = bgcolor_of (rstyle); 2093 ccol2 = bgcolor_of (rstyle);
2064#else 2094#else
2065 ccol2 = Color_bg; 2095 ccol2 = Color_bg;
2066#endif 2096#endif
2067 2097
2068 if (showcursor && focus) 2098 if (focus)
2069 { 2099 {
2070 if (option (Opt_cursorUnderline)) 2100 if (option (Opt_cursorUnderline))
2071 *crp ^= RS_Uline; 2101 *crp ^= RS_Uline;
2072 else 2102 else
2073 { 2103 {
… …
2108 oldcursor.col = screen.cur.col; 2138 oldcursor.col = screen.cur.col;
2109 } 2139 }
2110 } 2140 }
2111 } 2141 }
2112 2142
2113 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2114#if ENABLE_OVERLAY
2115 scr_swap_overlay ();
2116#endif
2117
2118#ifndef NO_SLOW_LINK_SUPPORT 2143#ifndef NO_SLOW_LINK_SUPPORT
2119 /* 2144 /*
2120 * D: CopyArea pass - very useful for slower links 2145 * D: CopyArea pass - very useful for slower links
2121 * This has been deliberately kept simple. 2146 * This has been deliberately kept simple.
2122 */ 2147 */
… …
2211 continue; 2236 continue;
2212 2237
2213 // redraw one or more characters 2238 // redraw one or more characters
2214 2239
2215 // seek to the beginning of wide characters 2240 // seek to the beginning of wide characters
2216 while (expect_false (stp[col] == NOCHAR && col > 0)) 2241 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2217 --col; 2242 --col;
2218 2243
2219 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2244 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2220 text_t *text = stp + col; 2245 text_t *text = stp + col;
2221 int count = 1; 2246 int count = 1;
2222 2247
2223 dtp[col] = stp[col]; 2248 dtp[col] = stp[col];
2224 drp[col] = rend; 2249 drp[col] = rend;
… …
2228 for (i = 0; ++col < ncol; ) 2253 for (i = 0; ++col < ncol; )
2229 { 2254 {
2230 if (stp[col] == NOCHAR) 2255 if (stp[col] == NOCHAR)
2231 { 2256 {
2232 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2233 drp[col] = rend; 2258 drp[col] = srp[col];
2259
2234 count++; 2260 count++;
2235 i++; 2261 i++;
2236 2262
2237 continue; 2263 continue;
2238 } 2264 }
… …
2258 2284
2259 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2260 count -= i; /* dump any matching trailing chars */ 2286 count -= i; /* dump any matching trailing chars */
2261 2287
2262 // sometimes we optimize away the trailing NOCHAR's, add them back 2288 // sometimes we optimize away the trailing NOCHAR's, add them back
2263 while (expect_false (i && text[count] == NOCHAR)) 2289 while (ecb_unlikely (i && text[count] == NOCHAR))
2264 count++, i--; 2290 count++, i--;
2265 2291
2266 /* 2292 /*
2267 * Determine the attributes for the string 2293 * Determine the attributes for the string
2268 */ 2294 */
2269 int fore = fgcolor_of (rend); // desired foreground 2295 int fore = fgcolor_of (rend); // desired foreground
2270 int back = bgcolor_of (rend); // desired background 2296 int back = bgcolor_of (rend); // desired background
2271 2297
2272 // only do special processing if any attributes are set, which is unlikely 2298 // only do special processing if any attributes are set, which is unlikely
2273 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2299 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2274 { 2300 {
2275 bool invert = rend & RS_RVid; 2301 bool invert = rend & RS_RVid;
2276 2302
2277#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2278 if (rend & RS_Bold && fore == Color_fg) 2304 if (rend & RS_Bold && fore == Color_fg)
… …
2297 2323
2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2324 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2299 fore = Color_UL; 2325 fore = Color_UL;
2300#endif 2326#endif
2301 2327
2328#ifdef OPTION_HC
2329 if (rend & RS_Sel)
2330 {
2331 /* invert the column if no highlightColor is set or it is the
2332 * current cursor column */
2333 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2334 && ISSET_PIXCOLOR (Color_HC))
2335 {
2336 if (ISSET_PIXCOLOR (Color_HTC))
2337 fore = Color_HTC;
2338 // if invert is 0 reverse video is set so we use bg color as fg color
2339 else if (!invert)
2340 fore = back;
2341
2342 back = Color_HC;
2343 invert = 0;
2344 }
2345 }
2346#endif
2347
2302 if (invert) 2348 if (invert)
2303 { 2349 {
2304#ifdef OPTION_HC
2305 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2306 || !ISSET_PIXCOLOR (Color_HC))
2307#endif
2308 /* invert the column if no highlightColor is set or it is the
2309 * current cursor column */
2310 ::swap (fore, back); 2350 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2315 2351
2316#ifndef NO_BOLD_UNDERLINE_REVERSE 2352#ifndef NO_BOLD_UNDERLINE_REVERSE
2317# ifndef OPTION_HC
2318 if (ISSET_PIXCOLOR (Color_RV))
2319 back = Color_RV;
2320# endif
2321 if (fore == back) 2353 if (fore == back)
2322 { 2354 {
2323 fore = Color_bg; 2355 fore = Color_bg;
2324 back = Color_fg; 2356 back = Color_fg;
2325 } 2357 }
… …
2361 /* 2393 /*
2362 * Actually do the drawing of the string here 2394 * Actually do the drawing of the string here
2363 */ 2395 */
2364 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2396 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2365 2397
2366 if (expect_true (have_bg && back == Color_bg)) 2398 if (ecb_likely (have_bg && back == Color_bg))
2367 { 2399 {
2368 // this is very ugly, maybe push it into ->draw? 2400 // this is very ugly, maybe push it into ->draw?
2369 2401
2370 for (i = 0; i < count; i++) /* don't draw empty strings */ 2402 for (i = 0; i < count; i++) /* don't draw empty strings */
2371 if (text[i] != ' ') 2403 if (text[i] != ' ')
… …
2378 did_clear: ; 2410 did_clear: ;
2379 } 2411 }
2380 else 2412 else
2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2382 2414
2383 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2384 { 2416 {
2385#if ENABLE_FRILLS 2417#if ENABLE_FRILLS
2386 if (ISSET_PIXCOLOR (Color_underline)) 2418 if (ISSET_PIXCOLOR (Color_underline))
2387 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2419 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2388 else 2420 else
… …
2393 xpixel, ypixel + font->ascent + 1, 2425 xpixel, ypixel + font->ascent + 1,
2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2426 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2395 } 2427 }
2396 } /* for (col....) */ 2428 } /* for (col....) */
2397 } /* for (row....) */ 2429 } /* for (row....) */
2398
2399#if ENABLE_OVERLAY
2400 scr_swap_overlay ();
2401#endif
2402 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2403 2430
2404 /* 2431 /*
2405 * G: cleanup cursor and display outline cursor if necessary 2432 * G: cleanup cursor and display outline cursor if necessary
2406 */ 2433 */
2407 if (showcursor) 2434 if (showcursor)
… …
2446 } 2473 }
2447 2474
2448 /* 2475 /*
2449 * H: cleanup selection 2476 * H: cleanup selection
2450 */ 2477 */
2478#if ENABLE_OVERLAY
2479 scr_swap_overlay ();
2480#endif
2481 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2482
2451 scr_reverse_selection (); 2483 scr_reverse_selection ();
2452 2484
2485 screen.flags = old_screen_flags;
2453 num_scr = 0; 2486 num_scr = 0;
2454 num_scr_allow = 1; 2487 num_scr_allow = 1;
2455} 2488}
2456 2489
2457void 2490void
… …
2478 scr_remap_chars (swap_buf [i]); 2511 scr_remap_chars (swap_buf [i]);
2479 } 2512 }
2480} 2513}
2481 2514
2482void 2515void
2483rxvt_term::scr_recolour () NOTHROW 2516rxvt_term::scr_recolour (bool refresh) NOTHROW
2484{ 2517{
2518 bool transparent = false;
2519
2485#ifdef HAVE_BG_PIXMAP 2520#ifdef HAVE_BG_PIXMAP
2486 bgPixmap.apply (); 2521 if (bg_pixmap != None)
2487#else 2522 {
2523# ifdef ENABLE_TRANSPARENCY
2524 if (bg_flags & BG_IS_TRANSPARENT)
2525 {
2526 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2527 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2488 2528
2529 transparent = true;
2530 }
2531 else
2532# endif
2533 {
2534 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2535 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2536 }
2537 }
2538 else
2539#endif
2540 {
2489 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2490 XClearWindow (dpy, parent[0]);
2491 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2542 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2543 }
2544
2545 XClearWindow (dpy, parent);
2492 2546
2493 if (scrollBar.win) 2547 if (scrollBar.win)
2494 { 2548 {
2549 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else
2495 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2496 scrollBar.state = STATE_IDLE; 2553 scrollBar.state = STATE_IDLE;
2497 scrollBar.show (0); 2554 scrollBar.show (0);
2498 } 2555 }
2499 2556
2500#endif 2557 if (refresh)
2501 2558 {
2502 /* bgPixmap.apply () does not do the following : */
2503 scr_clear (); 2559 scr_clear ();
2504 scr_touch (true); 2560 scr_touch (true);
2561 }
2505 want_refresh = 1; 2562 want_refresh = 1;
2506} 2563}
2507 2564
2508/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2509void 2566void
… …
2577 { 2634 {
2578#if !ENABLE_MINIMAL 2635#if !ENABLE_MINIMAL
2579 if (selection.rect) 2636 if (selection.rect)
2580 scr_xor_rect (selection.beg.row, selection.beg.col, 2637 scr_xor_rect (selection.beg.row, selection.beg.col,
2581 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2582 RS_RVid, RS_RVid | RS_Uline); 2639 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2583 else 2640 else
2584#endif 2641#endif
2585 scr_xor_span (selection.beg.row, selection.beg.col, 2642 scr_xor_span (selection.beg.row, selection.beg.col,
2586 selection.end.row, selection.end.col, 2643 selection.end.row, selection.end.col,
2587 RS_RVid); 2644 RS_Sel | RS_RVid);
2588 } 2645 }
2589} 2646}
2590 2647
2591/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2592/* 2649/*
… …
2597void 2654void
2598rxvt_term::scr_dump (int fd) NOTHROW 2655rxvt_term::scr_dump (int fd) NOTHROW
2599{ 2656{
2600 int row, wrote; 2657 int row, wrote;
2601 unsigned int width, towrite; 2658 unsigned int width, towrite;
2602 char r1[] = "\n"; 2659 const char r1[] = "\n";
2603 2660
2604 for (row = saveLines + top_row; 2661 for (row = saveLines + top_row;
2605 row < saveLines + nrow - 1; row++) 2662 row < saveLines + nrow - 1; row++)
2606 { 2663 {
2607 width = row_buf[row].l >= 0 ? row_buf[row].l 2664 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2653/* ------------------------------------------------------------------------- */ 2710/* ------------------------------------------------------------------------- */
2654/* 2711/*
2655 * Paste a selection direct to the command fd 2712 * Paste a selection direct to the command fd
2656 */ 2713 */
2657void 2714void
2658rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2659{ 2716{
2660 /* convert normal newline chars into common keyboard Return key sequence */ 2717 /* convert normal newline chars into common keyboard Return key sequence */
2661 for (unsigned int i = 0; i < len; i++) 2718 for (unsigned int i = 0; i < len; i++)
2662 if (data[i] == C0_LF) 2719 if (data[i] == C0_LF)
2663 data[i] = C0_CR; 2720 data[i] = C0_CR;
… …
2669 2726
2670 if (priv_modes & PrivMode_BracketPaste) 2727 if (priv_modes & PrivMode_BracketPaste)
2671 tt_printf ("\e[201~"); 2728 tt_printf ("\e[201~");
2672} 2729}
2673 2730
2674/* ------------------------------------------------------------------------- */
2675/*
2676 * Respond to a notification that a primary selection has been sent
2677 * EXT: SelectionNotify
2678 */
2679void 2731void
2680rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2732rxvt_term::paste (char *data, unsigned int len) NOTHROW
2681{ 2733{
2682 if (prop == None) /* check for failed XConvertSelection */ 2734 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2683 {
2684 if ((selection_type & Sel_CompoundText))
2685 {
2686 int selnum = selection_type & Sel_whereMask;
2687
2688 selection_type = 0;
2689 if (selnum != Sel_direct)
2690 selection_request_other (XA_STRING, selnum);
2691 }
2692
2693 if ((selection_type & Sel_UTF8String))
2694 {
2695 int selnum = selection_type & Sel_whereMask;
2696
2697 selection_type = Sel_CompoundText;
2698 if (selnum != Sel_direct)
2699 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2700 else
2701 selection_type = 0;
2702 }
2703
2704 return;
2705 }
2706
2707 unsigned long bytes_after;
2708 XTextProperty ct;
2709
2710 if (XGetWindowProperty (dpy, win, prop,
2711 0, PROP_SIZE / 4,
2712 delete_prop, AnyPropertyType,
2713 &ct.encoding, &ct.format,
2714 &ct.nitems, &bytes_after,
2715 &ct.value) != Success)
2716 {
2717 ct.value = 0;
2718 goto bailout;
2719 }
2720
2721 if (ct.encoding == None)
2722 goto bailout;
2723
2724 if (bytes_after)
2725 {
2726 // fetch and append remaining data
2727 XTextProperty ct2;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 ct.nitems / 4, (bytes_after + 3) / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct2.encoding, &ct2.format,
2733 &ct2.nitems, &bytes_after,
2734 &ct2.value) != Success)
2735 goto bailout;
2736
2737 // realloc should be compatible to XFree, here, and elsewhere, too
2738 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2739 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2740 ct.nitems += ct2.nitems;
2741
2742 XFree (ct2.value);
2743 }
2744
2745 if (ct.value == 0)
2746 goto bailout;
2747
2748 if (ct.encoding == xa[XA_INCR])
2749 {
2750 // INCR selection, start handshake
2751 if (!delete_prop)
2752 XDeleteProperty (dpy, win, prop);
2753
2754 selection_wait = Sel_incr;
2755 incr_buf_fill = 0;
2756 incr_ev.start (10);
2757
2758 goto bailout;
2759 }
2760
2761 if (ct.nitems == 0)
2762 {
2763 if (selection_wait == Sel_incr)
2764 {
2765 XFree (ct.value);
2766
2767 // finally complete, now paste the whole thing
2768 selection_wait = Sel_normal;
2769 ct.value = (unsigned char *)incr_buf;
2770 ct.nitems = incr_buf_fill;
2771 incr_buf = 0;
2772 incr_buf_size = 0;
2773 incr_ev.stop ();
2774 }
2775 else
2776 {
2777 if (selection_wait == Sel_normal
2778 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2779 {
2780 /*
2781 * pass through again trying CUT_BUFFER0 if we've come from
2782 * XConvertSelection () but nothing was presented
2783 */
2784 selection_paste (display->root, XA_CUT_BUFFER0, False);
2785 }
2786
2787 goto bailout;
2788 }
2789 }
2790 else if (selection_wait == Sel_incr)
2791 {
2792 incr_ev.start (10);
2793
2794 while (incr_buf_fill + ct.nitems > incr_buf_size)
2795 {
2796 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2797 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2798 }
2799
2800 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2801 incr_buf_fill += ct.nitems;
2802
2803 goto bailout;
2804 }
2805
2806 char **cl;
2807 int cr;
2808
2809#if !ENABLE_MINIMAL
2810 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2811 // so recode it manually
2812 if (ct.encoding == xa[XA_UTF8_STRING])
2813 {
2814 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2815 char *s = rxvt_wcstombs (w);
2816 free (w);
2817 // TODO: strlen == only the first element will be converted. well...
2818 paste (s, strlen (s));
2819 free (s);
2820 }
2821 else
2822#endif
2823 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2824 && cl)
2825 {
2826 for (int i = 0; i < cr; i++)
2827 paste (cl[i], strlen (cl[i]));
2828
2829 XFreeStringList (cl);
2830 }
2831 else
2832 paste ((char *)ct.value, ct.nitems); // paste raw
2833
2834bailout:
2835 XFree (ct.value);
2836
2837 if (selection_wait == Sel_normal)
2838 selection_wait = Sel_none;
2839}
2840
2841void
2842rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2843{
2844 selection_wait = Sel_none;
2845
2846 incr_buf_size = 0;
2847 free (incr_buf);
2848
2849 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2850}
2851
2852void
2853rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2854{
2855 if (prop == None || selection_wait != Sel_incr)
2856 return; 2735 return;
2857 2736
2858 selection_paste (win, prop, true); 2737 tt_paste (data, len);
2859} 2738}
2860 2739
2861/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2862/* 2741/*
2863 * Request the current selection: 2742 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2864 * Order: > internal selection if available 2743 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2865 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2744 * as fallback
2866 * > CUT_BUFFER0
2867 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2868 * will auto fallback to CUT_BUFFER0
2869 * EXT: button 2 release 2745 * EXT: button 2 release
2870 */ 2746 */
2871void 2747void
2872rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2748rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2873{ 2749{
2874 if (selection.text && selnum == Sel_Primary) 2750 if (!selection_req)
2875 {
2876 /* internal selection */
2877 char *str = rxvt_wcstombs (selection.text, selection.len);
2878 paste (str, strlen (str));
2879 free (str);
2880 return;
2881 } 2751 {
2882 else 2752 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2753 selection_req->run ();
2883 { 2754 }
2884 selection_request_time = tm;
2885 selection_wait = Sel_normal;
2886
2887#if X_HAVE_UTF8_STRING
2888 selection_type = Sel_UTF8String;
2889 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2890 return;
2891#else
2892 selection_type = Sel_CompoundText;
2893 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2894 return;
2895#endif
2896 }
2897
2898 selection_wait = Sel_none; /* don't loop in selection_paste () */
2899 selection_paste (display->root, XA_CUT_BUFFER0, false);
2900}
2901
2902int
2903rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2904{
2905 Atom sel;
2906
2907 selection_type |= selnum;
2908
2909 if (selnum == Sel_Primary)
2910 sel = XA_PRIMARY;
2911 else if (selnum == Sel_Secondary)
2912 sel = XA_SECONDARY;
2913 else
2914 sel = xa[XA_CLIPBOARD];
2915
2916 if (XGetSelectionOwner (dpy, sel) != None)
2917 {
2918 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2919 vt, selection_request_time);
2920 return 1;
2921 }
2922
2923 return 0;
2924} 2755}
2925 2756
2926/* ------------------------------------------------------------------------- */ 2757/* ------------------------------------------------------------------------- */
2927/* 2758/*
2928 * Clear all selected text 2759 * Clear all selected text
2929 * EXT: SelectionClear 2760 * EXT: SelectionClear
2930 */ 2761 */
2931void 2762void
2932rxvt_term::selection_clear () NOTHROW 2763rxvt_term::selection_clear (bool clipboard) NOTHROW
2933{ 2764{
2765 if (!clipboard)
2766 {
2934 want_refresh = 1; 2767 want_refresh = 1;
2935 free (selection.text); 2768 free (selection.text);
2936 selection.text = NULL; 2769 selection.text = NULL;
2937 selection.len = 0; 2770 selection.len = 0;
2938 CLEAR_SELECTION (); 2771 CLEAR_SELECTION ();
2939 2772
2940 if (display->selection_owner == this) 2773 if (display->selection_owner == this)
2941 display->selection_owner = 0; 2774 display->selection_owner = 0;
2775 }
2776 else
2777 {
2778 free (selection.clip_text);
2779 selection.clip_text = NULL;
2780 selection.clip_len = 0;
2781
2782 if (display->clipboard_owner == this)
2783 display->clipboard_owner = 0;
2784 }
2942} 2785}
2943 2786
2944/* ------------------------------------------------------------------------- */ 2787/* ------------------------------------------------------------------------- */
2945/* 2788/*
2946 * Copy a selection into the cut buffer 2789 * Copy a selection into the cut buffer
2947 * EXT: button 1 or 3 release 2790 * EXT: button 1 or 3 release
2948 */ 2791 */
2949void 2792void
2950rxvt_term::selection_make (Time tm) 2793rxvt_term::selection_make (Time tm)
2951{ 2794{
2952 int i; 2795 int size;
2953 wchar_t *new_selection_text; 2796 wchar_t *new_selection_text;
2954 text_t *t; 2797 text_t *t;
2955 2798
2956 switch (selection.op) 2799 switch (selection.op)
2957 { 2800 {
… …
2973 return; /* nothing selected, go away */ 2816 return; /* nothing selected, go away */
2974 2817
2975 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2818 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2976 return; 2819 return;
2977 2820
2978 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2821 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2979 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2822 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2980 2823
2981 int ofs = 0; 2824 int ofs = 0;
2982 int extra = 0; 2825 int extra = 0;
2983 2826
2984 int col = selection.beg.col; 2827 int col = selection.beg.col;
… …
2990 { 2833 {
2991#if !ENABLE_MINIMAL 2834#if !ENABLE_MINIMAL
2992 if (selection.rect) 2835 if (selection.rect)
2993 { 2836 {
2994 col = selection.beg.col; 2837 col = selection.beg.col;
2995 end_col = ncol + 1; 2838 end_col = selection.end.col;
2996 } 2839 }
2997 else 2840 else
2998#endif 2841#endif
2999 end_col = ROW(row).l; 2842 end_col = ROW(row).l;
3000 2843
3001 col = max (col, 0); 2844 col = max (col, 0);
3002 2845
3003 if (row == selection.end.row 2846 if (row == selection.end.row)
3004#if !ENABLE_MINIMAL
3005 || selection.rect
3006#endif
3007 )
3008 min_it (end_col, selection.end.col); 2847 min_it (end_col, selection.end.col);
3009 2848
3010 t = ROW(row).t + col; 2849 t = ROW(row).t + col;
3011 2850
3012 for (; col < end_col; col++) 2851 for (; col < end_col; col++)
… …
3020 2859
3021 extra -= (len - 1); 2860 extra -= (len - 1);
3022 2861
3023 if (extra < 0) 2862 if (extra < 0)
3024 { 2863 {
3025 extra += i; 2864 extra += size;
3026 i += i; 2865 size += size;
3027 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2866 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3028 } 2867 }
3029 2868
3030 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2869 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3031 } 2870 }
3032#endif 2871#endif
… …
3044 2883
3045 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3046 } 2885 }
3047 else 2886 else
3048#endif 2887#endif
3049 if (!ROW(row).is_longer () && row != selection.end.row) 2888 if (!ROW(row).is_longer ()
2889 && (row != selection.end.row || end_col != selection.end.col)
2890 && (row != selection.beg.row || selection.beg.col < ncol))
3050 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3051 } 2892 }
3052
3053 if (end_col != selection.end.col)
3054 new_selection_text[ofs++] = C0_LF;
3055 2893
3056 new_selection_text[ofs] = 0; 2894 new_selection_text[ofs] = 0;
3057 2895
3058 if (ofs == 0) 2896 if (ofs == 0)
3059 { 2897 {
… …
3072 2910
3073 selection_grab (tm); 2911 selection_grab (tm);
3074} 2912}
3075 2913
3076bool 2914bool
3077rxvt_term::selection_grab (Time tm) NOTHROW 2915rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3078{ 2916{
2917 Atom sel;
2918
2919 if (!clipboard)
2920 {
3079 selection_time = tm; 2921 selection_time = tm;
2922 sel = XA_PRIMARY;
2923 }
2924 else
2925 {
2926 clipboard_time = tm;
2927 sel = xa[XA_CLIPBOARD];
2928 }
3080 2929
3081 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2930 XSetSelectionOwner (dpy, sel, vt, tm);
3082 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2931 if (XGetSelectionOwner (dpy, sel) == vt)
3083 { 2932 {
3084 display->set_selection_owner (this); 2933 display->set_selection_owner (this, clipboard);
3085 return true; 2934 return true;
3086 } 2935 }
3087 else 2936 else
3088 { 2937 {
3089 selection_clear (); 2938 selection_clear (clipboard);
3090 return false; 2939 return false;
3091 } 2940 }
3092 2941
3093#if 0 2942#if 0
3094 XTextProperty ct; 2943 XTextProperty ct;
… …
3554 * EXT: SelectionRequest 3403 * EXT: SelectionRequest
3555 */ 3404 */
3556void 3405void
3557rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3558{ 3407{
3408 Atom property = rq.property == None ? rq.target : rq.property;
3559 XSelectionEvent ev; 3409 XSelectionEvent ev;
3560 3410
3561 ev.type = SelectionNotify; 3411 ev.type = SelectionNotify;
3562 ev.property = None; 3412 ev.property = None;
3563 ev.display = rq.display; 3413 ev.display = rq.display;
… …
3578 *target++ = xa[XA_COMPOUND_TEXT]; 3428 *target++ = xa[XA_COMPOUND_TEXT];
3579#if X_HAVE_UTF8_STRING 3429#if X_HAVE_UTF8_STRING
3580 *target++ = xa[XA_UTF8_STRING]; 3430 *target++ = xa[XA_UTF8_STRING];
3581#endif 3431#endif
3582 3432
3583 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3433 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3584 32, PropModeReplace, 3434 32, PropModeReplace,
3585 (unsigned char *)target_list, target - target_list); 3435 (unsigned char *)target_list, target - target_list);
3586 ev.property = rq.property; 3436 ev.property = property;
3587 } 3437 }
3588#if TODO // TODO 3438#if TODO // TODO
3589 else if (rq.target == xa[XA_MULTIPLE]) 3439 else if (rq.target == xa[XA_MULTIPLE])
3590 { 3440 {
3591 /* TODO: Handle MULTIPLE */ 3441 /* TODO: Handle MULTIPLE */
3592 } 3442 }
3593#endif 3443#endif
3594 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3444 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3595 { 3445 {
3596 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3446 XChangeProperty (dpy, rq.requestor, property, rq.target,
3597 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3447 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3598 ev.property = rq.property; 3448 ev.property = property;
3449 }
3450 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3451 {
3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3453 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3454 ev.property = property;
3599 } 3455 }
3600 else if (rq.target == XA_STRING 3456 else if (rq.target == XA_STRING
3601 || rq.target == xa[XA_TEXT] 3457 || rq.target == xa[XA_TEXT]
3602 || rq.target == xa[XA_COMPOUND_TEXT] 3458 || rq.target == xa[XA_COMPOUND_TEXT]
3603 || rq.target == xa[XA_UTF8_STRING] 3459 || rq.target == xa[XA_UTF8_STRING]
… …
3635 { 3491 {
3636 target = xa[XA_COMPOUND_TEXT]; 3492 target = xa[XA_COMPOUND_TEXT];
3637 style = enc_compound_text; 3493 style = enc_compound_text;
3638 } 3494 }
3639 3495
3640 if (selection.text) 3496 if (rq.selection == XA_PRIMARY && selection.text)
3641 { 3497 {
3642 cl = selection.text; 3498 cl = selection.text;
3643 selectlen = selection.len; 3499 selectlen = selection.len;
3500 }
3501 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3502 {
3503 cl = selection.clip_text;
3504 selectlen = selection.clip_len;
3644 } 3505 }
3645 else 3506 else
3646 { 3507 {
3647 cl = L""; 3508 cl = L"";
3648 selectlen = 0; 3509 selectlen = 0;
… …
3669 ct.value = (unsigned char *)cl; 3530 ct.value = (unsigned char *)cl;
3670 ct.nitems = selectlen; 3531 ct.nitems = selectlen;
3671 ct.encoding = target; 3532 ct.encoding = target;
3672 } 3533 }
3673 3534
3674 XChangeProperty (dpy, rq.requestor, rq.property, 3535 XChangeProperty (dpy, rq.requestor, property,
3675 ct.encoding, 8, PropModeReplace, 3536 ct.encoding, 8, PropModeReplace,
3676 ct.value, (int)ct.nitems); 3537 ct.value, (int)ct.nitems);
3677 ev.property = rq.property; 3538 ev.property = property;
3678 3539
3679 if (freect) 3540 if (freect)
3680 XFree (ct.value); 3541 XFree (ct.value);
3681 } 3542 }
3682 3543
… …
3716 h += 2; min_it (h, nrow); 3577 h += 2; min_it (h, nrow);
3717 3578
3718 x -= 1; clamp_it (x, 0, ncol - w); 3579 x -= 1; clamp_it (x, 0, ncol - w);
3719 y -= 1; clamp_it (y, 0, nrow - h); 3580 y -= 1; clamp_it (y, 0, nrow - h);
3720 3581
3721 ov_x = x; ov_y = y; 3582 ov.x = x; ov.y = y;
3722 ov_w = w; ov_h = h; 3583 ov.w = w; ov.h = h;
3723 3584
3724 ov_text = new text_t *[h]; 3585 ov.text = new text_t *[h];
3725 ov_rend = new rend_t *[h]; 3586 ov.rend = new rend_t *[h];
3726 3587
3727 for (y = 0; y < h; y++) 3588 for (y = 0; y < h; y++)
3728 { 3589 {
3729 text_t *tp = ov_text[y] = new text_t[w]; 3590 text_t *tp = ov.text[y] = new text_t[w];
3730 rend_t *rp = ov_rend[y] = new rend_t[w]; 3591 rend_t *rp = ov.rend[y] = new rend_t[w];
3731 3592
3732 text_t t0, t1, t2; 3593 text_t t0, t1, t2;
3733 rend_t r = OVERLAY_RSTYLE; 3594 rend_t r = OVERLAY_RSTYLE;
3734 3595
3735 if (y == 0) 3596 if (y == 0)
… …
3754} 3615}
3755 3616
3756void 3617void
3757rxvt_term::scr_overlay_off () NOTHROW 3618rxvt_term::scr_overlay_off () NOTHROW
3758{ 3619{
3759 if (!ov_text) 3620 if (!ov.text)
3760 return; 3621 return;
3761 3622
3762 want_refresh = 1; 3623 want_refresh = 1;
3763 3624
3764 for (int y = 0; y < ov_h; y++) 3625 for (int y = 0; y < ov.h; y++)
3765 { 3626 {
3766 delete [] ov_text[y]; 3627 delete [] ov.text[y];
3767 delete [] ov_rend[y]; 3628 delete [] ov.rend[y];
3768 } 3629 }
3769 3630
3770 delete [] ov_text; ov_text = 0; 3631 delete [] ov.text; ov.text = 0;
3771 delete [] ov_rend; ov_rend = 0; 3632 delete [] ov.rend; ov.rend = 0;
3772} 3633}
3773 3634
3774void 3635void
3775rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3636rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3776{ 3637{
3777 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3638 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3778 return; 3639 return;
3779 3640
3780 x++, y++; 3641 x++, y++;
3781 3642
3782 ov_text[y][x] = text; 3643 ov.text[y][x] = text;
3783 ov_rend[y][x] = rend; 3644 ov.rend[y][x] = rend;
3784} 3645}
3785 3646
3786void 3647void
3787rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3648rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3788{ 3649{
… …
3807} 3668}
3808 3669
3809void 3670void
3810rxvt_term::scr_swap_overlay () NOTHROW 3671rxvt_term::scr_swap_overlay () NOTHROW
3811{ 3672{
3812 if (!ov_text) 3673 if (!ov.text)
3813 return; 3674 return;
3814 3675
3676 // hide cursor if it is within the overlay area
3677 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3678 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3679 screen.flags &= ~Screen_VisibleCursor;
3680
3815 // swap screen mem with overlay 3681 // swap screen mem with overlay
3816 for (int y = ov_h; y--; ) 3682 for (int y = ov.h; y--; )
3817 { 3683 {
3818 text_t *t1 = ov_text[y]; 3684 text_t *t1 = ov.text[y];
3819 rend_t *r1 = ov_rend[y]; 3685 rend_t *r1 = ov.rend[y];
3820 3686
3821 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3687 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3822 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3688 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3823 3689
3824 for (int x = ov_w; x--; ) 3690 for (int x = ov.w; x--; )
3825 { 3691 {
3826 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3692 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3827 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3693 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3828 } 3694 }
3829 } 3695 }

Diff Legend

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