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.311 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.387 by root, Thu Jul 7 23:18:13 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 * ------------------------------------------------------------------------- */
… …
132 131
133 l.l = 0; 132 l.l = 0;
134 l.f = 0; 133 l.f = 0;
135} 134}
136 135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
137/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
140 160
141void 161void
… …
143{ 163{
144#if ENABLE_OVERLAY 164#if ENABLE_OVERLAY
145 scr_overlay_off (); 165 scr_overlay_off ();
146#endif 166#endif
147 167
148 rvideo_mode = false;
149 view_start = 0; 168 view_start = 0;
150 num_scr = 0; 169 num_scr = 0;
151 170
152 if (ncol == 0) 171 if (ncol == 0)
153 ncol = 80; 172 ncol = 80;
… …
155 if (nrow == 0) 174 if (nrow == 0)
156 nrow = 24; 175 nrow = 24;
157 176
158 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 178 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 179
164 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
166 { 182 {
167 //TODO//FIXME 183 //TODO//FIXME
… …
220 selection.text = NULL; 236 selection.text = NULL;
221 selection.len = 0; 237 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
224 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
225 } 243 }
226 else 244 else
227 { 245 {
228 /* 246 /*
229 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
267 285
268 if (top_row) 286 if (top_row)
269 { 287 {
270 // 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
271 // 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
272 291
273 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 294
276 do 295 do
277 { 296 {
278 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 299 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
284 301
285 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 ())
286 { 303 {
… …
380 delete old_ta; 397 delete old_ta;
381 delete old_ra; 398 delete old_ra;
382 399
383 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
385 403
386 free (tabs); 404 free (tabs);
387 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
388 409
389 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
390 411
391 prev_nrow = nrow; 412 prev_nrow = nrow;
392 prev_ncol = ncol; 413 prev_ncol = ncol;
393
394 tabs = (char *)rxvt_malloc (ncol);
395
396 for (int col = ncol; --col; )
397 tabs [col] = col % TABSIZE == 0;
398
399 if (current_screen != PRIMARY)
400 scr_swap_screen ();
401 414
402 tt_winch (); 415 tt_winch ();
403 416
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 418}
… …
417 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
418 431
419 free (row_buf); 432 free (row_buf);
420 free (swap_buf); 433 free (swap_buf);
421 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
422 free (tabs); 437 free (tabs);
423 438 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 439 }
426} 440}
427 441
428/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
429/* 443/*
430 * Hard reset 444 * Hard/Soft reset
431 */ 445 */
432void 446void
433rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
434{ 448{
435 scr_release (); 449 scr_release ();
436 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
437 scr_reset (); 453 scr_reset ();
438 454
439 scr_clear (true); 455 scr_clear (true);
440 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);
441} 473}
442 474
443/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
483 } 515 }
484 516
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
491#endif
492} 522}
493 523
494void 524void
495rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
496{ 526{
… …
521 want_refresh = 1; 551 want_refresh = 1;
522 view_start = 0; 552 view_start = 0;
523 553
524 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
525 555
526 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
527 557
528#if NSCREENS 558#if NSCREENS
529 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
530 { 560 {
531 num_scr = 0; 561 num_scr = 0;
… …
608 638
609 if (count > 0 639 if (count > 0
610 && row1 == 0 640 && row1 == 0
611 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
612 { 642 {
643 min_it (count, row2 + total_rows);
644
613 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
614 646
615 // scroll everything up 'count' lines 647 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows; 648 term_start = (term_start + count) % total_rows;
617 649
… …
625 // erase newly scrolled-in lines 657 // erase newly scrolled-in lines
626 for (int i = count; i--; ) 658 for (int i = count; i--; )
627 { 659 {
628 line_t &l = ROW(nrow - 1 - i); 660 line_t &l = ROW(nrow - 1 - i);
629 661
630 // optimize if already cleared, can be significant on slow machines 662 // optimise if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem 663 // could be rolled into scr_blank_screen_mem
632 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 664 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 { 665 {
634 scr_blank_line (l, 0, l.l, rstyle); 666 scr_blank_line (l, 0, l.l, rstyle);
635 l.l = 0; 667 l.l = 0;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 788 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 789 screen.cur.row -= minlines;
758 } 790 }
759 } 791 }
760 792
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 793 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 794 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 795 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 796 int row = screen.cur.row;
767 797
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 798 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 799
770 line_t *line = &ROW(row); 800 line_t *line = &ROW(row);
771 801
772 while (str < strend) 802 while (str < strend)
773 { 803 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 805
776 if (expect_false (c < 0x20)) 806 if (ecb_unlikely (c < 0x20))
777 if (c == C0_LF) 807 if (c == C0_LF)
778 { 808 {
779 max_it (line->l, screen.cur.col); 809 max_it (line->l, screen.cur.col);
780 810
781 screen.flags &= ~Screen_WrapNext; 811 screen.flags &= ~Screen_WrapNext;
… …
800 { 830 {
801 scr_tab (1, true); 831 scr_tab (1, true);
802 continue; 832 continue;
803 } 833 }
804 834
805 if (expect_false ( 835 if (ecb_unlikely (
806 checksel /* see if we're writing within selection */ 836 checksel /* see if we're writing within selection */
807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 838 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 )) 839 ))
810 { 840 {
… …
815 * should be a similar check. 845 * should be a similar check.
816 */ 846 */
817 CLEAR_SELECTION (); 847 CLEAR_SELECTION ();
818 } 848 }
819 849
820 if (expect_false (screen.flags & Screen_WrapNext)) 850 if (ecb_unlikely (screen.flags & Screen_WrapNext))
821 { 851 {
822 scr_do_wrap (); 852 scr_do_wrap ();
823 853
824 line->l = ncol; 854 line->l = ncol;
825 line->is_longer (1); 855 line->is_longer (1);
… …
827 row = screen.cur.row; 857 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
829 } 859 }
830 860
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 862 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
833 c = 0xfffd; 863 c = 0xfffd;
834 864
835 // 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
836 // further replacements, as wcwidth might return -1 for the line 866 // further replacements, as wcwidth might return -1 for the line
837 // drawing characters below as they might be invalid in the current 867 // drawing characters below as they might be invalid in the current
838 // locale. 868 // locale.
839 int width = WCWIDTH (c); 869 int width = WCWIDTH (c);
840 870
841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 871 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
842 { 872 {
843 // vt100 special graphics and line drawing 873 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 874 // 5f-7e standard vt100
845 // 40-5e rxvt extension for extra curses acs chars 875 // 40-5e rxvt extension for extra curses acs chars
846 static uint16_t vt100_0[62] = { // 41 .. 7e 876 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
859 c = vt100_0[c - 0x41]; 889 c = vt100_0[c - 0x41];
860 width = 1; // vt100 line drawing characters are always single-width 890 width = 1; // vt100 line drawing characters are always single-width
861 } 891 }
862 } 892 }
863 893
864 if (expect_false (screen.flags & Screen_Insert)) 894 if (ecb_unlikely (screen.flags & Screen_Insert))
865 scr_insdel_chars (width, INSERT); 895 scr_insdel_chars (width, INSERT);
866 896
867 if (width != 0) 897 if (width != 0)
868 { 898 {
869#if !UNICODE_3 899#if !UNICODE_3
… …
874# else 904# else
875 c = 0xfffd; 905 c = 0xfffd;
876# endif 906# endif
877#endif 907#endif
878 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
879 // nuke the character at this position, if required 925 // nuke the character at this position, if required
880 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.
881 line->t[screen.cur.col] == NOCHAR 929 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
882 || (screen.cur.col < ncol - 1 930 scr_kill_char (*line, screen.cur.col);
883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
885 {
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903
904 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 {
907 // ...output spaces
908 c = ' ';
909 // and try the same character next loop iteration
910 --str;
911 }
912 931
913 line->touch (); 932 line->touch ();
914 933
915 do 934 do
916 { 935 {
917 line->t[screen.cur.col] = c; 936 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 937 line->r[screen.cur.col] = rend;
919 938
920 if (expect_true (screen.cur.col < ncol - 1)) 939 if (ecb_likely (screen.cur.col < ncol - 1))
921 screen.cur.col++; 940 screen.cur.col++;
922 else 941 else
923 { 942 {
924 line->l = ncol; 943 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 945 screen.flags |= Screen_WrapNext;
927 break; 946
947 goto end_of_line;
928 } 948 }
929 949
930 c = NOCHAR; 950 c = NOCHAR;
931 } 951 }
932 while (expect_false (--width > 0)); 952 while (ecb_unlikely (--width > 0));
933 953
934 // pad with spaces when overwriting wide character with smaller one 954 // pad with spaces when overwriting wide character with smaller one
935 if (expect_false (!width)) 955 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
936 { 956 {
937 line->touch ();
938
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 {
941 line->t[c] = ' '; 957 line->t[c] = ' ';
942 line->r[c] = rend; 958 line->r[c] = rend;
943 }
944 } 959 }
960
961end_of_line:
962 ;
945 } 963 }
946#if ENABLE_COMBINING 964#if ENABLE_COMBINING
947 else // width == 0 965 else // width == 0
948 { 966 {
949 if (c != 0xfeff) // ignore BOM 967 if (c != 0xfeff) // ignore BOM
… …
989#endif 1007#endif
990 } 1008 }
991 1009
992 max_it (line->l, screen.cur.col); 1010 max_it (line->l, screen.cur.col);
993 1011
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1012 assert (screen.cur.row >= 0);
996#endif
997} 1013}
998 1014
999/* ------------------------------------------------------------------------- */ 1015/* ------------------------------------------------------------------------- */
1000/* 1016/*
1001 * 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
… …
1014 1030
1015 want_refresh = 1; 1031 want_refresh = 1;
1016#endif 1032#endif
1017 } 1033 }
1018 } 1034 }
1035 else if (screen.flags & Screen_WrapNext)
1036 screen.flags &= ~Screen_WrapNext;
1019 else 1037 else
1020 scr_gotorc (0, -1, RELATIVE); 1038 scr_gotorc (0, -1, RELATIVE);
1021} 1039}
1022 1040
1023/* ------------------------------------------------------------------------- */ 1041/* ------------------------------------------------------------------------- */
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1347 if (row >= nrow) /* Out Of Bounds */
1330 return; 1348 return;
1331 1349
1332 min_it (num, nrow - row); 1350 min_it (num, nrow - row);
1333 1351
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1352 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1353 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1354 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1355 {
1339 ren = DEFAULT_RSTYLE; 1356 ren = DEFAULT_RSTYLE;
1340 1357
1341 if (mapped) 1358 if (mapped)
1342 XClearArea (dpy, vt, 0, 1359 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1360 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1361 (unsigned int)Height2Pixel (num), False);
1345 } 1362 }
1346 else 1363 else
1347 { 1364 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1365 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1366
1367 if (mapped)
1368 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1371 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1372 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1373 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1374 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1375 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1376 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1377 }
1358 } 1378 }
1359 1379
1360 for (; num--; row++) 1380 for (; num--; row++)
1361 { 1381 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1382 scr_blank_screen_mem (ROW(row), rstyle);
1383
1384 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1385 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1386 }
1365} 1387}
1366 1388
1367#if !ENABLE_MINIMAL 1389#if !ENABLE_MINIMAL
1368void 1390void
… …
1442 * Insert/Delete <count> characters from the current position 1464 * Insert/Delete <count> characters from the current position
1443 */ 1465 */
1444void 1466void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1467rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1468{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1469 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1470 ZERO_SCROLLBACK ();
1452 1471
1453 if (count <= 0) 1472 if (count <= 0)
1454 return; 1473 return;
… …
1456 scr_do_wrap (); 1475 scr_do_wrap ();
1457 1476
1458 selection_check (1); 1477 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1478 min_it (count, ncol - screen.cur.col);
1460 1479
1461 row = screen.cur.row; 1480 int row = screen.cur.row;
1462 1481
1463 line_t *line = &ROW(row); 1482 line_t *line = &ROW(row);
1464 1483
1465 line->touch (); 1484 line->touch ();
1466 line->is_longer (0); 1485 line->is_longer (0);
1467 1486
1487 // nuke wide spanning the start
1488 if (line->t[screen.cur.col] == NOCHAR)
1489 scr_kill_char (*line, screen.cur.col);
1490
1468 switch (insdel) 1491 switch (insdel)
1469 { 1492 {
1470 case INSERT: 1493 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 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);
1498
1499 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1500 {
1473 line->t[col] = line->t[col - count]; 1501 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1502 line->r[col] = line->r[col - count];
1475 } 1503 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1504
1479 if (selection.op && current_screen == selection.screen 1505 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1507 {
1482 if (selection.end.row != screen.cur.row 1508 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1523 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1524 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1525 selection_check (1);
1500 screen.cur.col -= count; 1526 screen.cur.col -= count;
1501 1527
1502 line->l = max (line->l - count, 0); 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 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1536 line->l = max (line->l - count, 0);
1508 1537
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);
1541
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1542 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1543 {
1511 line->t[col] = line->t[col + count]; 1544 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1545 line->r[col] = line->r[col + count];
1513 } 1546 }
1514 1547
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1548 scr_blank_line (*line, ncol - count, count, rstyle);
1517 1549
1518 if (selection.op && current_screen == selection.screen 1550 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1551 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1552 {
1521 if (selection.end.row != screen.cur.row 1553 if (selection.end.row != screen.cur.row
… …
1657 { 1689 {
1658 rvideo_state = on; 1690 rvideo_state = on;
1659 1691
1660 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1661#ifdef HAVE_BG_PIXMAP 1693#ifdef HAVE_BG_PIXMAP
1662 if (bgPixmap.pixmap == None) 1694 if (bg_pixmap == None)
1663#endif 1695#endif
1664 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1665 1697
1666 XGCValues gcvalue; 1698 XGCValues gcvalue;
1667 gcvalue.foreground = pix_colors[Color_fg]; 1699 gcvalue.foreground = pix_colors[Color_fg];
… …
1811 for (i = PART_BEG; i < RC_COUNT; i++) 1843 for (i = PART_BEG; i < RC_COUNT; i++)
1812 { 1844 {
1813 min_it (rc[i].col, ncol - 1); 1845 min_it (rc[i].col, ncol - 1);
1814 min_it (rc[i].row, nrow - 1); 1846 min_it (rc[i].row, nrow - 1);
1815 } 1847 }
1816// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1848
1817 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++)
1818 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);
1819 1851
1820 num_scr_allow = 0; 1852 num_scr_allow = 0;
1821 1853
… …
1894 1926
1895# ifndef NO_MAPALERT 1927# ifndef NO_MAPALERT
1896# ifdef MAPALERT_OPTION 1928# ifdef MAPALERT_OPTION
1897 if (option (Opt_mapAlert)) 1929 if (option (Opt_mapAlert))
1898# endif 1930# endif
1899 XMapWindow (dpy, parent[0]); 1931 XMapWindow (dpy, parent);
1900# endif 1932# endif
1901 1933
1902# if ENABLE_FRILLS 1934# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1935 if (option (Opt_urgentOnBell))
1904 set_urgency (1); 1936 set_urgency (1);
… …
1912 1944
1913 bell_ev.start (VISUAL_BELL_DURATION); 1945 bell_ev.start (VISUAL_BELL_DURATION);
1914 } 1946 }
1915 else 1947 else
1916 XBell (dpy, 0); 1948 XBell (dpy, 0);
1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1917#endif 1950#endif
1918} 1951}
1919 1952
1920/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1921/* ARGSUSED */
1922void 1954void
1923rxvt_term::scr_printscreen (int fullhist) NOTHROW 1955rxvt_term::scr_printscreen (int fullhist) NOTHROW
1924{ 1956{
1925#ifdef PRINTPIPE 1957#ifdef PRINTPIPE
1926 int nrows, row_start; 1958 int nrows, row_start;
… …
1940 row_start = view_start; 1972 row_start = view_start;
1941 } 1973 }
1942 1974
1943 wctomb (0, 0); 1975 wctomb (0, 0);
1944 1976
1945 for (int r1 = 0; r1 < nrows; r1++) 1977 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1946 { 1978 {
1947 text_t *tp = ROW(r1).t; 1979 text_t *tp = ROW(r1).t;
1948 int len = ROW(r1).l; 1980 int len = ROW(r1).l;
1949 1981
1950 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
… …
1979 * screen.text/screen.rend contain what the screen will change to. 2011 * screen.text/screen.rend contain what the screen will change to.
1980 */ 2012 */
1981void 2013void
1982rxvt_term::scr_refresh () NOTHROW 2014rxvt_term::scr_refresh () NOTHROW
1983{ 2015{
1984 unsigned char have_bg,
1985 showcursor; /* show the cursor */
1986 int16_t col, row, /* column/row we're processing */ 2016 int16_t col, row, /* column/row we're processing */
1987 ocrow; /* old cursor row */ 2017 ocrow; /* old cursor row */
1988 int i; /* tmp */ 2018 int i; /* tmp */
1989#ifndef NO_CURSORCOLOR 2019#ifndef NO_CURSORCOLOR
1990 rend_t cc1; /* store colours at cursor position (s) */ 2020 rend_t cc1; /* store colours at cursor position (s) */
… …
2001 /* 2031 /*
2002 * A: set up vars 2032 * A: set up vars
2003 */ 2033 */
2004 refresh_count = 0; 2034 refresh_count = 0;
2005 2035
2036 unsigned int old_screen_flags = screen.flags;
2006 have_bg = 0; 2037 char have_bg = 0;
2007#ifdef HAVE_BG_PIXMAP 2038#ifdef HAVE_BG_PIXMAP
2008 have_bg = bgPixmap.pixmap != None; 2039 have_bg = bg_pixmap != None;
2009#endif 2040#endif
2010 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2011 2042
2012 /* 2043 /*
2013 * B: reverse any characters which are selected 2044 * B: reverse any characters which are selected
2014 */ 2045 */
2015 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;
2016 2054
2017 /* 2055 /*
2018 * C: set the cursor character (s) 2056 * C: set the cursor character (s)
2019 */ 2057 */
2020 { 2058 {
2021 unsigned char setoldcursor; 2059 unsigned char setoldcursor;
2022 2060
2023 showcursor = (screen.flags & Screen_VisibleCursor);
2024#ifdef CURSOR_BLINK 2061#ifdef CURSOR_BLINK
2025 if (hidden_cursor) 2062 if (hidden_cursor)
2026 showcursor = 0; 2063 showcursor = 0;
2027#endif 2064#endif
2028 2065
… …
2056 ccol2 = bgcolor_of (rstyle); 2093 ccol2 = bgcolor_of (rstyle);
2057#else 2094#else
2058 ccol2 = Color_bg; 2095 ccol2 = Color_bg;
2059#endif 2096#endif
2060 2097
2061 if (showcursor && focus) 2098 if (focus)
2062 { 2099 {
2063 if (option (Opt_cursorUnderline)) 2100 if (option (Opt_cursorUnderline))
2064 *crp ^= RS_Uline; 2101 *crp ^= RS_Uline;
2065 else 2102 else
2066 { 2103 {
… …
2101 oldcursor.col = screen.cur.col; 2138 oldcursor.col = screen.cur.col;
2102 } 2139 }
2103 } 2140 }
2104 } 2141 }
2105 2142
2106 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2107#if ENABLE_OVERLAY
2108 scr_swap_overlay ();
2109#endif
2110
2111#ifndef NO_SLOW_LINK_SUPPORT 2143#ifndef NO_SLOW_LINK_SUPPORT
2112 /* 2144 /*
2113 * D: CopyArea pass - very useful for slower links 2145 * D: CopyArea pass - very useful for slower links
2114 * This has been deliberately kept simple. 2146 * This has been deliberately kept simple.
2115 */ 2147 */
… …
2204 continue; 2236 continue;
2205 2237
2206 // redraw one or more characters 2238 // redraw one or more characters
2207 2239
2208 // seek to the beginning of wide characters 2240 // seek to the beginning of wide characters
2209 while (expect_false (stp[col] == NOCHAR && col > 0)) 2241 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2210 --col; 2242 --col;
2211 2243
2212 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2244 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2213 text_t *text = stp + col; 2245 text_t *text = stp + col;
2214 int count = 1; 2246 int count = 1;
2215 2247
2216 dtp[col] = stp[col]; 2248 dtp[col] = stp[col];
2217 drp[col] = rend; 2249 drp[col] = rend;
… …
2221 for (i = 0; ++col < ncol; ) 2253 for (i = 0; ++col < ncol; )
2222 { 2254 {
2223 if (stp[col] == NOCHAR) 2255 if (stp[col] == NOCHAR)
2224 { 2256 {
2225 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2226 drp[col] = rend; 2258 drp[col] = srp[col];
2259
2227 count++; 2260 count++;
2228 i++; 2261 i++;
2229 2262
2230 continue; 2263 continue;
2231 } 2264 }
… …
2251 2284
2252 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2253 count -= i; /* dump any matching trailing chars */ 2286 count -= i; /* dump any matching trailing chars */
2254 2287
2255 // sometimes we optimize away the trailing NOCHAR's, add them back 2288 // sometimes we optimize away the trailing NOCHAR's, add them back
2256 while (expect_false (i && text[count] == NOCHAR)) 2289 while (ecb_unlikely (i && text[count] == NOCHAR))
2257 count++, i--; 2290 count++, i--;
2258 2291
2259 /* 2292 /*
2260 * Determine the attributes for the string 2293 * Determine the attributes for the string
2261 */ 2294 */
2262 int fore = fgcolor_of (rend); // desired foreground 2295 int fore = fgcolor_of (rend); // desired foreground
2263 int back = bgcolor_of (rend); // desired background 2296 int back = bgcolor_of (rend); // desired background
2264 2297
2265 // 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
2266 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)))
2267 { 2300 {
2268 bool invert = rend & RS_RVid; 2301 bool invert = rend & RS_RVid;
2269 2302
2270#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2271 if (rend & RS_Bold && fore == Color_fg) 2304 if (rend & RS_Bold && fore == Color_fg)
… …
2290 2323
2291 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2324 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2292 fore = Color_UL; 2325 fore = Color_UL;
2293#endif 2326#endif
2294 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
2295 if (invert) 2348 if (invert)
2296 { 2349 {
2297#ifdef OPTION_HC
2298 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2299 || !ISSET_PIXCOLOR (Color_HC))
2300#endif
2301 /* invert the column if no highlightColor is set or it is the
2302 * current cursor column */
2303 ::swap (fore, back); 2350 ::swap (fore, back);
2304#ifdef OPTION_HC
2305 else if (ISSET_PIXCOLOR (Color_HC))
2306 back = Color_HC;
2307#endif
2308 2351
2309#ifndef NO_BOLD_UNDERLINE_REVERSE 2352#ifndef NO_BOLD_UNDERLINE_REVERSE
2310# ifndef OPTION_HC
2311 if (ISSET_PIXCOLOR (Color_RV))
2312 back = Color_RV;
2313# endif
2314 if (fore == back) 2353 if (fore == back)
2315 { 2354 {
2316 fore = Color_bg; 2355 fore = Color_bg;
2317 back = Color_fg; 2356 back = Color_fg;
2318 } 2357 }
… …
2354 /* 2393 /*
2355 * Actually do the drawing of the string here 2394 * Actually do the drawing of the string here
2356 */ 2395 */
2357 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2396 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2358 2397
2359 if (expect_true (have_bg && back == Color_bg)) 2398 if (ecb_likely (have_bg && back == Color_bg))
2360 { 2399 {
2361 // this is very ugly, maybe push it into ->draw? 2400 // this is very ugly, maybe push it into ->draw?
2362 2401
2363 for (i = 0; i < count; i++) /* don't draw empty strings */ 2402 for (i = 0; i < count; i++) /* don't draw empty strings */
2364 if (text[i] != ' ') 2403 if (text[i] != ' ')
… …
2371 did_clear: ; 2410 did_clear: ;
2372 } 2411 }
2373 else 2412 else
2374 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2375 2414
2376 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2377 { 2416 {
2378#if ENABLE_FRILLS 2417#if ENABLE_FRILLS
2379 if (ISSET_PIXCOLOR (Color_underline)) 2418 if (ISSET_PIXCOLOR (Color_underline))
2380 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2419 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2381 else 2420 else
… …
2386 xpixel, ypixel + font->ascent + 1, 2425 xpixel, ypixel + font->ascent + 1,
2387 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2426 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2388 } 2427 }
2389 } /* for (col....) */ 2428 } /* for (col....) */
2390 } /* for (row....) */ 2429 } /* for (row....) */
2391
2392#if ENABLE_OVERLAY
2393 scr_swap_overlay ();
2394#endif
2395 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2396 2430
2397 /* 2431 /*
2398 * G: cleanup cursor and display outline cursor if necessary 2432 * G: cleanup cursor and display outline cursor if necessary
2399 */ 2433 */
2400 if (showcursor) 2434 if (showcursor)
… …
2439 } 2473 }
2440 2474
2441 /* 2475 /*
2442 * H: cleanup selection 2476 * H: cleanup selection
2443 */ 2477 */
2478#if ENABLE_OVERLAY
2479 scr_swap_overlay ();
2480#endif
2481 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2482
2444 scr_reverse_selection (); 2483 scr_reverse_selection ();
2445 2484
2485 screen.flags = old_screen_flags;
2446 num_scr = 0; 2486 num_scr = 0;
2447 num_scr_allow = 1; 2487 num_scr_allow = 1;
2448} 2488}
2449 2489
2450void 2490void
… …
2471 scr_remap_chars (swap_buf [i]); 2511 scr_remap_chars (swap_buf [i]);
2472 } 2512 }
2473} 2513}
2474 2514
2475void 2515void
2476rxvt_term::scr_recolour () NOTHROW 2516rxvt_term::scr_recolour (bool refresh) NOTHROW
2477{ 2517{
2518 bool transparent = false;
2519
2478#ifdef HAVE_BG_PIXMAP 2520#ifdef HAVE_BG_PIXMAP
2479 bgPixmap.apply (); 2521 if (bg_pixmap != None)
2480#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);
2481 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 {
2482 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2483 XClearWindow (dpy, parent[0]);
2484 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2542 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2543 }
2544
2545 XClearWindow (dpy, parent);
2485 2546
2486 if (scrollBar.win) 2547 if (scrollBar.win)
2487 { 2548 {
2549 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else
2488 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2489 scrollBar.state = STATE_IDLE; 2553 scrollBar.state = STATE_IDLE;
2490 scrollBar.show (0); 2554 scrollBar.show (0);
2491 } 2555 }
2492 2556
2493#endif 2557 if (refresh)
2494 2558 {
2495 /* bgPixmap.apply () does not do the following : */
2496 scr_clear (); 2559 scr_clear ();
2497 scr_touch (true); 2560 scr_touch (true);
2561 }
2498 want_refresh = 1; 2562 want_refresh = 1;
2499} 2563}
2500 2564
2501/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2502void 2566void
… …
2570 { 2634 {
2571#if !ENABLE_MINIMAL 2635#if !ENABLE_MINIMAL
2572 if (selection.rect) 2636 if (selection.rect)
2573 scr_xor_rect (selection.beg.row, selection.beg.col, 2637 scr_xor_rect (selection.beg.row, selection.beg.col,
2574 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2575 RS_RVid, RS_RVid | RS_Uline); 2639 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2576 else 2640 else
2577#endif 2641#endif
2578 scr_xor_span (selection.beg.row, selection.beg.col, 2642 scr_xor_span (selection.beg.row, selection.beg.col,
2579 selection.end.row, selection.end.col, 2643 selection.end.row, selection.end.col,
2580 RS_RVid); 2644 RS_Sel | RS_RVid);
2581 } 2645 }
2582} 2646}
2583 2647
2584/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2585/* 2649/*
… …
2590void 2654void
2591rxvt_term::scr_dump (int fd) NOTHROW 2655rxvt_term::scr_dump (int fd) NOTHROW
2592{ 2656{
2593 int row, wrote; 2657 int row, wrote;
2594 unsigned int width, towrite; 2658 unsigned int width, towrite;
2595 char r1[] = "\n"; 2659 const char r1[] = "\n";
2596 2660
2597 for (row = saveLines + top_row; 2661 for (row = saveLines + top_row;
2598 row < saveLines + nrow - 1; row++) 2662 row < saveLines + nrow - 1; row++)
2599 { 2663 {
2600 width = row_buf[row].l >= 0 ? row_buf[row].l 2664 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2646/* ------------------------------------------------------------------------- */ 2710/* ------------------------------------------------------------------------- */
2647/* 2711/*
2648 * Paste a selection direct to the command fd 2712 * Paste a selection direct to the command fd
2649 */ 2713 */
2650void 2714void
2651rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2652{ 2716{
2653 /* convert normal newline chars into common keyboard Return key sequence */ 2717 /* convert normal newline chars into common keyboard Return key sequence */
2654 for (unsigned int i = 0; i < len; i++) 2718 for (unsigned int i = 0; i < len; i++)
2655 if (data[i] == C0_LF) 2719 if (data[i] == C0_LF)
2656 data[i] = C0_CR; 2720 data[i] = C0_CR;
… …
2662 2726
2663 if (priv_modes & PrivMode_BracketPaste) 2727 if (priv_modes & PrivMode_BracketPaste)
2664 tt_printf ("\e[201~"); 2728 tt_printf ("\e[201~");
2665} 2729}
2666 2730
2667/* ------------------------------------------------------------------------- */
2668/*
2669 * Respond to a notification that a primary selection has been sent
2670 * EXT: SelectionNotify
2671 */
2672void 2731void
2673rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2732rxvt_term::paste (char *data, unsigned int len) NOTHROW
2674{ 2733{
2675 if (prop == None) /* check for failed XConvertSelection */ 2734 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2676 {
2677 if ((selection_type & Sel_CompoundText))
2678 {
2679 int selnum = selection_type & Sel_whereMask;
2680
2681 selection_type = 0;
2682 if (selnum != Sel_direct)
2683 selection_request_other (XA_STRING, selnum);
2684 }
2685
2686 if ((selection_type & Sel_UTF8String))
2687 {
2688 int selnum = selection_type & Sel_whereMask;
2689
2690 selection_type = Sel_CompoundText;
2691 if (selnum != Sel_direct)
2692 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2693 else
2694 selection_type = 0;
2695 }
2696
2697 return;
2698 }
2699
2700 unsigned long bytes_after;
2701 XTextProperty ct;
2702
2703 if (XGetWindowProperty (dpy, win, prop,
2704 0, PROP_SIZE / 4,
2705 delete_prop, AnyPropertyType,
2706 &ct.encoding, &ct.format,
2707 &ct.nitems, &bytes_after,
2708 &ct.value) != Success)
2709 {
2710 ct.value = 0;
2711 goto bailout;
2712 }
2713
2714 if (ct.encoding == None)
2715 goto bailout;
2716
2717 if (bytes_after)
2718 {
2719 // fetch and append remaining data
2720 XTextProperty ct2;
2721
2722 if (XGetWindowProperty (dpy, win, prop,
2723 ct.nitems / 4, (bytes_after + 3) / 4,
2724 delete_prop, AnyPropertyType,
2725 &ct2.encoding, &ct2.format,
2726 &ct2.nitems, &bytes_after,
2727 &ct2.value) != Success)
2728 goto bailout;
2729
2730 // realloc should be compatible to XFree, here, and elsewhere, too
2731 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2732 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2733 ct.nitems += ct2.nitems;
2734
2735 XFree (ct2.value);
2736 }
2737
2738 if (ct.value == 0)
2739 goto bailout;
2740
2741 if (ct.encoding == xa[XA_INCR])
2742 {
2743 // INCR selection, start handshake
2744 if (!delete_prop)
2745 XDeleteProperty (dpy, win, prop);
2746
2747 selection_wait = Sel_incr;
2748 incr_buf_fill = 0;
2749 incr_ev.start (10);
2750
2751 goto bailout;
2752 }
2753
2754 if (ct.nitems == 0)
2755 {
2756 if (selection_wait == Sel_incr)
2757 {
2758 XFree (ct.value);
2759
2760 // finally complete, now paste the whole thing
2761 selection_wait = Sel_normal;
2762 ct.value = (unsigned char *)incr_buf;
2763 ct.nitems = incr_buf_fill;
2764 incr_buf = 0;
2765 incr_buf_size = 0;
2766 incr_ev.stop ();
2767 }
2768 else
2769 {
2770 if (selection_wait == Sel_normal
2771 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2772 {
2773 /*
2774 * pass through again trying CUT_BUFFER0 if we've come from
2775 * XConvertSelection () but nothing was presented
2776 */
2777 selection_paste (display->root, XA_CUT_BUFFER0, False);
2778 }
2779
2780 goto bailout;
2781 }
2782 }
2783 else if (selection_wait == Sel_incr)
2784 {
2785 incr_ev.start (10);
2786
2787 while (incr_buf_fill + ct.nitems > incr_buf_size)
2788 {
2789 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2790 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2791 }
2792
2793 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2794 incr_buf_fill += ct.nitems;
2795
2796 goto bailout;
2797 }
2798
2799 char **cl;
2800 int cr;
2801
2802#if !ENABLE_MINIMAL
2803 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2804 // so recode it manually
2805 if (ct.encoding == xa[XA_UTF8_STRING])
2806 {
2807 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2808 char *s = rxvt_wcstombs (w);
2809 free (w);
2810 // TODO: strlen == only the first element will be converted. well...
2811 paste (s, strlen (s));
2812 free (s);
2813 }
2814 else
2815#endif
2816 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2817 && cl)
2818 {
2819 for (int i = 0; i < cr; i++)
2820 paste (cl[i], strlen (cl[i]));
2821
2822 XFreeStringList (cl);
2823 }
2824 else
2825 paste ((char *)ct.value, ct.nitems); // paste raw
2826
2827bailout:
2828 XFree (ct.value);
2829
2830 if (selection_wait == Sel_normal)
2831 selection_wait = Sel_none;
2832}
2833
2834void
2835rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2836{
2837 selection_wait = Sel_none;
2838
2839 incr_buf_size = 0;
2840 free (incr_buf);
2841
2842 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2843}
2844
2845void
2846rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2847{
2848 if (prop == None || selection_wait != Sel_incr)
2849 return; 2735 return;
2850 2736
2851 selection_paste (win, prop, true); 2737 tt_paste (data, len);
2852} 2738}
2853 2739
2854/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2855/* 2741/*
2856 * Request the current selection: 2742 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2857 * Order: > internal selection if available 2743 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2858 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2744 * as fallback
2859 * > CUT_BUFFER0
2860 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2861 * will auto fallback to CUT_BUFFER0
2862 * EXT: button 2 release 2745 * EXT: button 2 release
2863 */ 2746 */
2864void 2747void
2865rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2748rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2866{ 2749{
2867 if (selection.text && selnum == Sel_Primary) 2750 if (!selection_req)
2868 {
2869 /* internal selection */
2870 char *str = rxvt_wcstombs (selection.text, selection.len);
2871 paste (str, strlen (str));
2872 free (str);
2873 return;
2874 } 2751 {
2875 else 2752 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2753 selection_req->run ();
2876 { 2754 }
2877 selection_request_time = tm;
2878 selection_wait = Sel_normal;
2879
2880#if X_HAVE_UTF8_STRING
2881 selection_type = Sel_UTF8String;
2882 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2883 return;
2884#else
2885 selection_type = Sel_CompoundText;
2886 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2887 return;
2888#endif
2889 }
2890
2891 selection_wait = Sel_none; /* don't loop in selection_paste () */
2892 selection_paste (display->root, XA_CUT_BUFFER0, false);
2893}
2894
2895int
2896rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2897{
2898 Atom sel;
2899
2900 selection_type |= selnum;
2901
2902 if (selnum == Sel_Primary)
2903 sel = XA_PRIMARY;
2904 else if (selnum == Sel_Secondary)
2905 sel = XA_SECONDARY;
2906 else
2907 sel = xa[XA_CLIPBOARD];
2908
2909 if (XGetSelectionOwner (dpy, sel) != None)
2910 {
2911 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2912 vt, selection_request_time);
2913 return 1;
2914 }
2915
2916 return 0;
2917} 2755}
2918 2756
2919/* ------------------------------------------------------------------------- */ 2757/* ------------------------------------------------------------------------- */
2920/* 2758/*
2921 * Clear all selected text 2759 * Clear all selected text
2922 * EXT: SelectionClear 2760 * EXT: SelectionClear
2923 */ 2761 */
2924void 2762void
2925rxvt_term::selection_clear () NOTHROW 2763rxvt_term::selection_clear (bool clipboard) NOTHROW
2926{ 2764{
2765 if (!clipboard)
2766 {
2927 want_refresh = 1; 2767 want_refresh = 1;
2928 free (selection.text); 2768 free (selection.text);
2929 selection.text = NULL; 2769 selection.text = NULL;
2930 selection.len = 0; 2770 selection.len = 0;
2931 CLEAR_SELECTION (); 2771 CLEAR_SELECTION ();
2932 2772
2933 if (display->selection_owner == this) 2773 if (display->selection_owner == this)
2934 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 }
2935} 2785}
2936 2786
2937/* ------------------------------------------------------------------------- */ 2787/* ------------------------------------------------------------------------- */
2938/* 2788/*
2939 * Copy a selection into the cut buffer 2789 * Copy a selection into the cut buffer
2940 * EXT: button 1 or 3 release 2790 * EXT: button 1 or 3 release
2941 */ 2791 */
2942void 2792void
2943rxvt_term::selection_make (Time tm) 2793rxvt_term::selection_make (Time tm)
2944{ 2794{
2945 int i; 2795 int size;
2946 wchar_t *new_selection_text; 2796 wchar_t *new_selection_text;
2947 text_t *t; 2797 text_t *t;
2948 2798
2949 switch (selection.op) 2799 switch (selection.op)
2950 { 2800 {
… …
2966 return; /* nothing selected, go away */ 2816 return; /* nothing selected, go away */
2967 2817
2968 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)))
2969 return; 2819 return;
2970 2820
2971 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2821 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2972 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));
2973 2823
2974 int ofs = 0; 2824 int ofs = 0;
2975 int extra = 0; 2825 int extra = 0;
2976 2826
2977 int col = selection.beg.col; 2827 int col = selection.beg.col;
… …
2983 { 2833 {
2984#if !ENABLE_MINIMAL 2834#if !ENABLE_MINIMAL
2985 if (selection.rect) 2835 if (selection.rect)
2986 { 2836 {
2987 col = selection.beg.col; 2837 col = selection.beg.col;
2988 end_col = ncol + 1; 2838 end_col = selection.end.col;
2989 } 2839 }
2990 else 2840 else
2991#endif 2841#endif
2992 end_col = ROW(row).l; 2842 end_col = ROW(row).l;
2993 2843
2994 col = max (col, 0); 2844 col = max (col, 0);
2995 2845
2996 if (row == selection.end.row 2846 if (row == selection.end.row)
2997#if !ENABLE_MINIMAL
2998 || selection.rect
2999#endif
3000 )
3001 min_it (end_col, selection.end.col); 2847 min_it (end_col, selection.end.col);
3002 2848
3003 t = ROW(row).t + col; 2849 t = ROW(row).t + col;
3004 2850
3005 for (; col < end_col; col++) 2851 for (; col < end_col; col++)
… …
3013 2859
3014 extra -= (len - 1); 2860 extra -= (len - 1);
3015 2861
3016 if (extra < 0) 2862 if (extra < 0)
3017 { 2863 {
3018 extra += i; 2864 extra += size;
3019 i += i; 2865 size += size;
3020 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));
3021 } 2867 }
3022 2868
3023 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2869 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3024 } 2870 }
3025#endif 2871#endif
… …
3037 2883
3038 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3039 } 2885 }
3040 else 2886 else
3041#endif 2887#endif
3042 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))
3043 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3044 } 2892 }
3045
3046 if (end_col != selection.end.col)
3047 new_selection_text[ofs++] = C0_LF;
3048 2893
3049 new_selection_text[ofs] = 0; 2894 new_selection_text[ofs] = 0;
3050 2895
3051 if (ofs == 0) 2896 if (ofs == 0)
3052 { 2897 {
… …
3065 2910
3066 selection_grab (tm); 2911 selection_grab (tm);
3067} 2912}
3068 2913
3069bool 2914bool
3070rxvt_term::selection_grab (Time tm) NOTHROW 2915rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3071{ 2916{
2917 Atom sel;
2918
2919 if (!clipboard)
2920 {
3072 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 }
3073 2929
3074 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2930 XSetSelectionOwner (dpy, sel, vt, tm);
3075 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2931 if (XGetSelectionOwner (dpy, sel) == vt)
3076 { 2932 {
3077 display->set_selection_owner (this); 2933 display->set_selection_owner (this, clipboard);
3078 return true; 2934 return true;
3079 } 2935 }
3080 else 2936 else
3081 { 2937 {
3082 selection_clear (); 2938 selection_clear (clipboard);
3083 return false; 2939 return false;
3084 } 2940 }
3085 2941
3086#if 0 2942#if 0
3087 XTextProperty ct; 2943 XTextProperty ct;
… …
3547 * EXT: SelectionRequest 3403 * EXT: SelectionRequest
3548 */ 3404 */
3549void 3405void
3550rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3551{ 3407{
3408 Atom property = rq.property == None ? rq.target : rq.property;
3552 XSelectionEvent ev; 3409 XSelectionEvent ev;
3553 3410
3554 ev.type = SelectionNotify; 3411 ev.type = SelectionNotify;
3555 ev.property = None; 3412 ev.property = None;
3556 ev.display = rq.display; 3413 ev.display = rq.display;
… …
3571 *target++ = xa[XA_COMPOUND_TEXT]; 3428 *target++ = xa[XA_COMPOUND_TEXT];
3572#if X_HAVE_UTF8_STRING 3429#if X_HAVE_UTF8_STRING
3573 *target++ = xa[XA_UTF8_STRING]; 3430 *target++ = xa[XA_UTF8_STRING];
3574#endif 3431#endif
3575 3432
3576 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3433 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3577 32, PropModeReplace, 3434 32, PropModeReplace,
3578 (unsigned char *)target_list, target - target_list); 3435 (unsigned char *)target_list, target - target_list);
3579 ev.property = rq.property; 3436 ev.property = property;
3580 } 3437 }
3581#if TODO // TODO 3438#if TODO // TODO
3582 else if (rq.target == xa[XA_MULTIPLE]) 3439 else if (rq.target == xa[XA_MULTIPLE])
3583 { 3440 {
3584 /* TODO: Handle MULTIPLE */ 3441 /* TODO: Handle MULTIPLE */
3585 } 3442 }
3586#endif 3443#endif
3587 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3444 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3588 { 3445 {
3589 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3446 XChangeProperty (dpy, rq.requestor, property, rq.target,
3590 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3447 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3591 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;
3592 } 3455 }
3593 else if (rq.target == XA_STRING 3456 else if (rq.target == XA_STRING
3594 || rq.target == xa[XA_TEXT] 3457 || rq.target == xa[XA_TEXT]
3595 || rq.target == xa[XA_COMPOUND_TEXT] 3458 || rq.target == xa[XA_COMPOUND_TEXT]
3596 || rq.target == xa[XA_UTF8_STRING] 3459 || rq.target == xa[XA_UTF8_STRING]
… …
3628 { 3491 {
3629 target = xa[XA_COMPOUND_TEXT]; 3492 target = xa[XA_COMPOUND_TEXT];
3630 style = enc_compound_text; 3493 style = enc_compound_text;
3631 } 3494 }
3632 3495
3633 if (selection.text) 3496 if (rq.selection == XA_PRIMARY && selection.text)
3634 { 3497 {
3635 cl = selection.text; 3498 cl = selection.text;
3636 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;
3637 } 3505 }
3638 else 3506 else
3639 { 3507 {
3640 cl = L""; 3508 cl = L"";
3641 selectlen = 0; 3509 selectlen = 0;
… …
3662 ct.value = (unsigned char *)cl; 3530 ct.value = (unsigned char *)cl;
3663 ct.nitems = selectlen; 3531 ct.nitems = selectlen;
3664 ct.encoding = target; 3532 ct.encoding = target;
3665 } 3533 }
3666 3534
3667 XChangeProperty (dpy, rq.requestor, rq.property, 3535 XChangeProperty (dpy, rq.requestor, property,
3668 ct.encoding, 8, PropModeReplace, 3536 ct.encoding, 8, PropModeReplace,
3669 ct.value, (int)ct.nitems); 3537 ct.value, (int)ct.nitems);
3670 ev.property = rq.property; 3538 ev.property = property;
3671 3539
3672 if (freect) 3540 if (freect)
3673 XFree (ct.value); 3541 XFree (ct.value);
3674 } 3542 }
3675 3543
… …
3709 h += 2; min_it (h, nrow); 3577 h += 2; min_it (h, nrow);
3710 3578
3711 x -= 1; clamp_it (x, 0, ncol - w); 3579 x -= 1; clamp_it (x, 0, ncol - w);
3712 y -= 1; clamp_it (y, 0, nrow - h); 3580 y -= 1; clamp_it (y, 0, nrow - h);
3713 3581
3714 ov_x = x; ov_y = y; 3582 ov.x = x; ov.y = y;
3715 ov_w = w; ov_h = h; 3583 ov.w = w; ov.h = h;
3716 3584
3717 ov_text = new text_t *[h]; 3585 ov.text = new text_t *[h];
3718 ov_rend = new rend_t *[h]; 3586 ov.rend = new rend_t *[h];
3719 3587
3720 for (y = 0; y < h; y++) 3588 for (y = 0; y < h; y++)
3721 { 3589 {
3722 text_t *tp = ov_text[y] = new text_t[w]; 3590 text_t *tp = ov.text[y] = new text_t[w];
3723 rend_t *rp = ov_rend[y] = new rend_t[w]; 3591 rend_t *rp = ov.rend[y] = new rend_t[w];
3724 3592
3725 text_t t0, t1, t2; 3593 text_t t0, t1, t2;
3726 rend_t r = OVERLAY_RSTYLE; 3594 rend_t r = OVERLAY_RSTYLE;
3727 3595
3728 if (y == 0) 3596 if (y == 0)
… …
3747} 3615}
3748 3616
3749void 3617void
3750rxvt_term::scr_overlay_off () NOTHROW 3618rxvt_term::scr_overlay_off () NOTHROW
3751{ 3619{
3752 if (!ov_text) 3620 if (!ov.text)
3753 return; 3621 return;
3754 3622
3755 want_refresh = 1; 3623 want_refresh = 1;
3756 3624
3757 for (int y = 0; y < ov_h; y++) 3625 for (int y = 0; y < ov.h; y++)
3758 { 3626 {
3759 delete [] ov_text[y]; 3627 delete [] ov.text[y];
3760 delete [] ov_rend[y]; 3628 delete [] ov.rend[y];
3761 } 3629 }
3762 3630
3763 delete [] ov_text; ov_text = 0; 3631 delete [] ov.text; ov.text = 0;
3764 delete [] ov_rend; ov_rend = 0; 3632 delete [] ov.rend; ov.rend = 0;
3765} 3633}
3766 3634
3767void 3635void
3768rxvt_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
3769{ 3637{
3770 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3638 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3771 return; 3639 return;
3772 3640
3773 x++, y++; 3641 x++, y++;
3774 3642
3775 ov_text[y][x] = text; 3643 ov.text[y][x] = text;
3776 ov_rend[y][x] = rend; 3644 ov.rend[y][x] = rend;
3777} 3645}
3778 3646
3779void 3647void
3780rxvt_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
3781{ 3649{
… …
3800} 3668}
3801 3669
3802void 3670void
3803rxvt_term::scr_swap_overlay () NOTHROW 3671rxvt_term::scr_swap_overlay () NOTHROW
3804{ 3672{
3805 if (!ov_text) 3673 if (!ov.text)
3806 return; 3674 return;
3807 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
3808 // swap screen mem with overlay 3681 // swap screen mem with overlay
3809 for (int y = ov_h; y--; ) 3682 for (int y = ov.h; y--; )
3810 { 3683 {
3811 text_t *t1 = ov_text[y]; 3684 text_t *t1 = ov.text[y];
3812 rend_t *r1 = ov_rend[y]; 3685 rend_t *r1 = ov.rend[y];
3813 3686
3814 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;
3815 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;
3816 3689
3817 for (int x = ov_w; x--; ) 3690 for (int x = ov.w; x--; )
3818 { 3691 {
3819 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3692 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3820 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));
3821 } 3694 }
3822 } 3695 }

Diff Legend

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