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.312 by root, Tue Nov 4 13:30:41 2008 UTC vs.
Revision 1.384 by sf-exg, Mon May 30 18:39:04 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;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 787 screen.cur.row -= minlines;
758 } 788 }
759 } 789 }
760 790
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 791 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 792 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 793 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 794 int row = screen.cur.row;
767 795
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 796 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 797
770 line_t *line = &ROW(row); 798 line_t *line = &ROW(row);
771 799
772 while (str < strend) 800 while (str < strend)
773 { 801 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 803
776 if (expect_false (c < 0x20)) 804 if (ecb_unlikely (c < 0x20))
777 if (c == C0_LF) 805 if (c == C0_LF)
778 { 806 {
779 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
780 808
781 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
… …
800 { 828 {
801 scr_tab (1, true); 829 scr_tab (1, true);
802 continue; 830 continue;
803 } 831 }
804 832
805 if (expect_false ( 833 if (ecb_unlikely (
806 checksel /* see if we're writing within selection */ 834 checksel /* see if we're writing within selection */
807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 836 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 )) 837 ))
810 { 838 {
… …
815 * should be a similar check. 843 * should be a similar check.
816 */ 844 */
817 CLEAR_SELECTION (); 845 CLEAR_SELECTION ();
818 } 846 }
819 847
820 if (expect_false (screen.flags & Screen_WrapNext)) 848 if (ecb_unlikely (screen.flags & Screen_WrapNext))
821 { 849 {
822 scr_do_wrap (); 850 scr_do_wrap ();
823 851
824 line->l = ncol; 852 line->l = ncol;
825 line->is_longer (1); 853 line->is_longer (1);
… …
827 row = screen.cur.row; 855 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 856 line = &ROW(row); /* _must_ refresh */
829 } 857 }
830 858
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 859 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 860 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
833 c = 0xfffd; 861 c = 0xfffd;
834 862
835 // rely on wcwidth to tell us the character width, do wcwidth before 863 // rely on wcwidth to tell us the character width, do wcwidth before
836 // further replacements, as wcwidth might return -1 for the line 864 // further replacements, as wcwidth might return -1 for the line
837 // drawing characters below as they might be invalid in the current 865 // drawing characters below as they might be invalid in the current
838 // locale. 866 // locale.
839 int width = WCWIDTH (c); 867 int width = WCWIDTH (c);
840 868
841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 869 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
842 { 870 {
843 // vt100 special graphics and line drawing 871 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 872 // 5f-7e standard vt100
845 // 40-5e rxvt extension for extra curses acs chars 873 // 40-5e rxvt extension for extra curses acs chars
846 static uint16_t vt100_0[62] = { // 41 .. 7e 874 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
859 c = vt100_0[c - 0x41]; 887 c = vt100_0[c - 0x41];
860 width = 1; // vt100 line drawing characters are always single-width 888 width = 1; // vt100 line drawing characters are always single-width
861 } 889 }
862 } 890 }
863 891
864 if (expect_false (screen.flags & Screen_Insert)) 892 if (ecb_unlikely (screen.flags & Screen_Insert))
865 scr_insdel_chars (width, INSERT); 893 scr_insdel_chars (width, INSERT);
866 894
867 if (width != 0) 895 if (width != 0)
868 { 896 {
869#if !UNICODE_3 897#if !UNICODE_3
… …
874# else 902# else
875 c = 0xfffd; 903 c = 0xfffd;
876# endif 904# endif
877#endif 905#endif
878 906
907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908
909 // if the character doesn't fit into the remaining columns...
910 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
911 {
912 if (screen.flags & Screen_Autowrap)
913 {
914 // ... artificially enlargen the previous one
915 c = NOCHAR;
916 // and try the same character next loop iteration
917 --str;
918 }
919 else
920 screen.cur.col = ncol - width;
921 }
922
879 // nuke the character at this position, if required 923 // nuke the character at this position, if required
880 if (expect_false ( 924 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself,
926 // only its tail.
881 line->t[screen.cur.col] == NOCHAR 927 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
882 || (screen.cur.col < ncol - 1 928 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 929
913 line->touch (); 930 line->touch ();
914 931
915 do 932 do
916 { 933 {
917 line->t[screen.cur.col] = c; 934 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 935 line->r[screen.cur.col] = rend;
919 936
920 if (expect_true (screen.cur.col < ncol - 1)) 937 if (ecb_likely (screen.cur.col < ncol - 1))
921 screen.cur.col++; 938 screen.cur.col++;
922 else 939 else
923 { 940 {
924 line->l = ncol; 941 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 943 screen.flags |= Screen_WrapNext;
927 break; 944
945 goto end_of_line;
928 } 946 }
929 947
930 c = NOCHAR; 948 c = NOCHAR;
931 } 949 }
932 while (expect_false (--width > 0)); 950 while (ecb_unlikely (--width > 0));
933 951
934 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
935 if (expect_false (!width)) 953 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
936 { 954 {
937 line->touch ();
938
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 {
941 line->t[c] = ' '; 955 line->t[c] = ' ';
942 line->r[c] = rend; 956 line->r[c] = rend;
943 }
944 } 957 }
958
959end_of_line:
960 ;
945 } 961 }
946#if ENABLE_COMBINING 962#if ENABLE_COMBINING
947 else // width == 0 963 else // width == 0
948 { 964 {
949 if (c != 0xfeff) // ignore BOM 965 if (c != 0xfeff) // ignore BOM
… …
989#endif 1005#endif
990 } 1006 }
991 1007
992 max_it (line->l, screen.cur.col); 1008 max_it (line->l, screen.cur.col);
993 1009
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1010 assert (screen.cur.row >= 0);
996#endif
997} 1011}
998 1012
999/* ------------------------------------------------------------------------- */ 1013/* ------------------------------------------------------------------------- */
1000/* 1014/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1015 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1014 1028
1015 want_refresh = 1; 1029 want_refresh = 1;
1016#endif 1030#endif
1017 } 1031 }
1018 } 1032 }
1033 else if (screen.flags & Screen_WrapNext)
1034 screen.flags &= ~Screen_WrapNext;
1019 else 1035 else
1020 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1021} 1037}
1022 1038
1023/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1330 return; 1346 return;
1331 1347
1332 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1333 1349
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1353 {
1339 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1340 1355
1341 if (mapped) 1356 if (mapped)
1342 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1345 } 1360 }
1346 else 1361 else
1347 { 1362 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1364
1365 if (mapped)
1366 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1370 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1371 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1372 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1373 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1374 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 }
1358 } 1376 }
1359 1377
1360 for (; num--; row++) 1378 for (; num--; row++)
1361 { 1379 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381
1382 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1384 }
1365} 1385}
1366 1386
1367#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1368void 1388void
… …
1442 * Insert/Delete <count> characters from the current position 1462 * Insert/Delete <count> characters from the current position
1443 */ 1463 */
1444void 1464void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1465rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1466{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1467 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1452 1469
1453 if (count <= 0) 1470 if (count <= 0)
1454 return; 1471 return;
… …
1456 scr_do_wrap (); 1473 scr_do_wrap ();
1457 1474
1458 selection_check (1); 1475 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1476 min_it (count, ncol - screen.cur.col);
1460 1477
1461 row = screen.cur.row; 1478 int row = screen.cur.row;
1462 1479
1463 line_t *line = &ROW(row); 1480 line_t *line = &ROW(row);
1464 1481
1465 line->touch (); 1482 line->touch ();
1466 line->is_longer (0); 1483 line->is_longer (0);
1467 1484
1485 // nuke wide spanning the start
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1468 switch (insdel) 1489 switch (insdel)
1469 { 1490 {
1470 case INSERT: 1491 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1492 line->l = min (line->l + count, ncol);
1493
1494 if (line->t[screen.cur.col] == NOCHAR)
1495 scr_kill_char (*line, screen.cur.col);
1496
1497 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1498 {
1473 line->t[col] = line->t[col - count]; 1499 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1500 line->r[col] = line->r[col - count];
1475 } 1501 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1502
1479 if (selection.op && current_screen == selection.screen 1503 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1505 {
1482 if (selection.end.row != screen.cur.row 1506 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1521 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1522 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1523 selection_check (1);
1500 screen.cur.col -= count; 1524 screen.cur.col -= count;
1501 1525
1526 // nuke wide char after the end
1527 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1528 scr_kill_char (*line, screen.cur.col + count);
1529
1502 scr_blank_line (*line, screen.cur.col, count, rstyle); 1530 scr_blank_line (*line, screen.cur.col, count, rstyle);
1503 break; 1531 break;
1504 1532
1505 case DELETE: 1533 case DELETE:
1506 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 line->l = max (line->l - count, 0);
1507 1535
1536 // nuke wide char spanning the end
1537 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1538 scr_kill_char (*line, screen.cur.col + count);
1539
1508 for (col = screen.cur.col; (col + count) < ncol; col++) 1540 for (int col = screen.cur.col; (col + count) < ncol; col++)
1509 { 1541 {
1510 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1511 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1512 } 1544 }
1513 1545
1514 line->l = max (line->l - count, 0);
1515 scr_blank_line (*line, ncol - count, count, tr); 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1516 1547
1517 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1518 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1519 { 1550 {
1520 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
… …
1656 { 1687 {
1657 rvideo_state = on; 1688 rvideo_state = on;
1658 1689
1659 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1660#ifdef HAVE_BG_PIXMAP 1691#ifdef HAVE_BG_PIXMAP
1661 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1662#endif 1693#endif
1663 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1664 1695
1665 XGCValues gcvalue; 1696 XGCValues gcvalue;
1666 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
… …
1810 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1811 { 1842 {
1812 min_it (rc[i].col, ncol - 1); 1843 min_it (rc[i].col, ncol - 1);
1813 min_it (rc[i].row, nrow - 1); 1844 min_it (rc[i].row, nrow - 1);
1814 } 1845 }
1815// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1846
1816 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1817 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1848 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1818 1849
1819 num_scr_allow = 0; 1850 num_scr_allow = 0;
1820 1851
… …
1893 1924
1894# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1895# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1896 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1897# endif 1928# endif
1898 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1899# endif 1930# endif
1900 1931
1901# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1902 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1903 set_urgency (1); 1934 set_urgency (1);
… …
1911 1942
1912 bell_ev.start (VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1913 } 1944 }
1914 else 1945 else
1915 XBell (dpy, 0); 1946 XBell (dpy, 0);
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1916#endif 1948#endif
1917} 1949}
1918 1950
1919/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1920/* ARGSUSED */
1921void 1952void
1922rxvt_term::scr_printscreen (int fullhist) NOTHROW 1953rxvt_term::scr_printscreen (int fullhist) NOTHROW
1923{ 1954{
1924#ifdef PRINTPIPE 1955#ifdef PRINTPIPE
1925 int nrows, row_start; 1956 int nrows, row_start;
… …
1939 row_start = view_start; 1970 row_start = view_start;
1940 } 1971 }
1941 1972
1942 wctomb (0, 0); 1973 wctomb (0, 0);
1943 1974
1944 for (int r1 = 0; r1 < nrows; r1++) 1975 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1945 { 1976 {
1946 text_t *tp = ROW(r1).t; 1977 text_t *tp = ROW(r1).t;
1947 int len = ROW(r1).l; 1978 int len = ROW(r1).l;
1948 1979
1949 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1980 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1978 * screen.text/screen.rend contain what the screen will change to. 2009 * screen.text/screen.rend contain what the screen will change to.
1979 */ 2010 */
1980void 2011void
1981rxvt_term::scr_refresh () NOTHROW 2012rxvt_term::scr_refresh () NOTHROW
1982{ 2013{
1983 unsigned char have_bg,
1984 showcursor; /* show the cursor */
1985 int16_t col, row, /* column/row we're processing */ 2014 int16_t col, row, /* column/row we're processing */
1986 ocrow; /* old cursor row */ 2015 ocrow; /* old cursor row */
1987 int i; /* tmp */ 2016 int i; /* tmp */
1988#ifndef NO_CURSORCOLOR 2017#ifndef NO_CURSORCOLOR
1989 rend_t cc1; /* store colours at cursor position (s) */ 2018 rend_t cc1; /* store colours at cursor position (s) */
… …
2000 /* 2029 /*
2001 * A: set up vars 2030 * A: set up vars
2002 */ 2031 */
2003 refresh_count = 0; 2032 refresh_count = 0;
2004 2033
2034 unsigned int old_screen_flags = screen.flags;
2005 have_bg = 0; 2035 char have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP 2036#ifdef HAVE_BG_PIXMAP
2007 have_bg = bgPixmap.pixmap != None; 2037 have_bg = bg_pixmap != None;
2008#endif 2038#endif
2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010 2040
2011 /* 2041 /*
2012 * B: reverse any characters which are selected 2042 * B: reverse any characters which are selected
2013 */ 2043 */
2014 scr_reverse_selection (); 2044 scr_reverse_selection ();
2045
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY
2048 scr_swap_overlay ();
2049#endif
2050
2051 char showcursor = screen.flags & Screen_VisibleCursor;
2015 2052
2016 /* 2053 /*
2017 * C: set the cursor character (s) 2054 * C: set the cursor character (s)
2018 */ 2055 */
2019 { 2056 {
2020 unsigned char setoldcursor; 2057 unsigned char setoldcursor;
2021 2058
2022 showcursor = (screen.flags & Screen_VisibleCursor);
2023#ifdef CURSOR_BLINK 2059#ifdef CURSOR_BLINK
2024 if (hidden_cursor) 2060 if (hidden_cursor)
2025 showcursor = 0; 2061 showcursor = 0;
2026#endif 2062#endif
2027 2063
… …
2055 ccol2 = bgcolor_of (rstyle); 2091 ccol2 = bgcolor_of (rstyle);
2056#else 2092#else
2057 ccol2 = Color_bg; 2093 ccol2 = Color_bg;
2058#endif 2094#endif
2059 2095
2060 if (showcursor && focus) 2096 if (focus)
2061 { 2097 {
2062 if (option (Opt_cursorUnderline)) 2098 if (option (Opt_cursorUnderline))
2063 *crp ^= RS_Uline; 2099 *crp ^= RS_Uline;
2064 else 2100 else
2065 { 2101 {
… …
2100 oldcursor.col = screen.cur.col; 2136 oldcursor.col = screen.cur.col;
2101 } 2137 }
2102 } 2138 }
2103 } 2139 }
2104 2140
2105 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2106#if ENABLE_OVERLAY
2107 scr_swap_overlay ();
2108#endif
2109
2110#ifndef NO_SLOW_LINK_SUPPORT 2141#ifndef NO_SLOW_LINK_SUPPORT
2111 /* 2142 /*
2112 * D: CopyArea pass - very useful for slower links 2143 * D: CopyArea pass - very useful for slower links
2113 * This has been deliberately kept simple. 2144 * This has been deliberately kept simple.
2114 */ 2145 */
… …
2203 continue; 2234 continue;
2204 2235
2205 // redraw one or more characters 2236 // redraw one or more characters
2206 2237
2207 // seek to the beginning of wide characters 2238 // seek to the beginning of wide characters
2208 while (expect_false (stp[col] == NOCHAR && col > 0)) 2239 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2209 --col; 2240 --col;
2210 2241
2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2212 text_t *text = stp + col; 2243 text_t *text = stp + col;
2213 int count = 1; 2244 int count = 1;
2214 2245
2215 dtp[col] = stp[col]; 2246 dtp[col] = stp[col];
2216 drp[col] = rend; 2247 drp[col] = rend;
… …
2220 for (i = 0; ++col < ncol; ) 2251 for (i = 0; ++col < ncol; )
2221 { 2252 {
2222 if (stp[col] == NOCHAR) 2253 if (stp[col] == NOCHAR)
2223 { 2254 {
2224 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2225 drp[col] = rend; 2256 drp[col] = srp[col];
2257
2226 count++; 2258 count++;
2227 i++; 2259 i++;
2228 2260
2229 continue; 2261 continue;
2230 } 2262 }
… …
2250 2282
2251 col--; /* went one too far. move back */ 2283 col--; /* went one too far. move back */
2252 count -= i; /* dump any matching trailing chars */ 2284 count -= i; /* dump any matching trailing chars */
2253 2285
2254 // sometimes we optimize away the trailing NOCHAR's, add them back 2286 // sometimes we optimize away the trailing NOCHAR's, add them back
2255 while (expect_false (i && text[count] == NOCHAR)) 2287 while (ecb_unlikely (i && text[count] == NOCHAR))
2256 count++, i--; 2288 count++, i--;
2257 2289
2258 /* 2290 /*
2259 * Determine the attributes for the string 2291 * Determine the attributes for the string
2260 */ 2292 */
2261 int fore = fgcolor_of (rend); // desired foreground 2293 int fore = fgcolor_of (rend); // desired foreground
2262 int back = bgcolor_of (rend); // desired background 2294 int back = bgcolor_of (rend); // desired background
2263 2295
2264 // only do special processing if any attributes are set, which is unlikely 2296 // only do special processing if any attributes are set, which is unlikely
2265 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2297 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2266 { 2298 {
2267 bool invert = rend & RS_RVid; 2299 bool invert = rend & RS_RVid;
2268 2300
2269#ifndef NO_BOLD_UNDERLINE_REVERSE 2301#ifndef NO_BOLD_UNDERLINE_REVERSE
2270 if (rend & RS_Bold && fore == Color_fg) 2302 if (rend & RS_Bold && fore == Color_fg)
… …
2289 2321
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2322 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2323 fore = Color_UL;
2292#endif 2324#endif
2293 2325
2326#ifdef OPTION_HC
2327 if (rend & RS_Sel)
2328 {
2329 /* invert the column if no highlightColor is set or it is the
2330 * current cursor column */
2331 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2332 && ISSET_PIXCOLOR (Color_HC))
2333 {
2334 if (ISSET_PIXCOLOR (Color_HTC))
2335 fore = Color_HTC;
2336 // if invert is 0 reverse video is set so we use bg color as fg color
2337 else if (!invert)
2338 fore = back;
2339
2340 back = Color_HC;
2341 invert = 0;
2342 }
2343 }
2344#endif
2345
2294 if (invert) 2346 if (invert)
2295 { 2347 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2302 ::swap (fore, back); 2348 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2349
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2350#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312# endif
2313 if (fore == back) 2351 if (fore == back)
2314 { 2352 {
2315 fore = Color_bg; 2353 fore = Color_bg;
2316 back = Color_fg; 2354 back = Color_fg;
2317 } 2355 }
… …
2353 /* 2391 /*
2354 * Actually do the drawing of the string here 2392 * Actually do the drawing of the string here
2355 */ 2393 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2394 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2395
2358 if (expect_true (have_bg && back == Color_bg)) 2396 if (ecb_likely (have_bg && back == Color_bg))
2359 { 2397 {
2360 // this is very ugly, maybe push it into ->draw? 2398 // this is very ugly, maybe push it into ->draw?
2361 2399
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2400 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2401 if (text[i] != ' ')
… …
2370 did_clear: ; 2408 did_clear: ;
2371 } 2409 }
2372 else 2410 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2411 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2412
2375 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2413 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2414 {
2377#if ENABLE_FRILLS 2415#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2416 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2417 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2418 else
… …
2385 xpixel, ypixel + font->ascent + 1, 2423 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2424 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2425 }
2388 } /* for (col....) */ 2426 } /* for (col....) */
2389 } /* for (row....) */ 2427 } /* for (row....) */
2390
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395 2428
2396 /* 2429 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2430 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2431 */
2399 if (showcursor) 2432 if (showcursor)
… …
2438 } 2471 }
2439 2472
2440 /* 2473 /*
2441 * H: cleanup selection 2474 * H: cleanup selection
2442 */ 2475 */
2476#if ENABLE_OVERLAY
2477 scr_swap_overlay ();
2478#endif
2479 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2480
2443 scr_reverse_selection (); 2481 scr_reverse_selection ();
2444 2482
2483 screen.flags = old_screen_flags;
2445 num_scr = 0; 2484 num_scr = 0;
2446 num_scr_allow = 1; 2485 num_scr_allow = 1;
2447} 2486}
2448 2487
2449void 2488void
… …
2470 scr_remap_chars (swap_buf [i]); 2509 scr_remap_chars (swap_buf [i]);
2471 } 2510 }
2472} 2511}
2473 2512
2474void 2513void
2475rxvt_term::scr_recolour () NOTHROW 2514rxvt_term::scr_recolour (bool refresh) NOTHROW
2476{ 2515{
2516 bool transparent = false;
2517
2477#ifdef HAVE_BG_PIXMAP 2518#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2519 if (bg_pixmap != None)
2479#else 2520 {
2521# ifdef ENABLE_TRANSPARENCY
2522 if (bg_flags & BG_IS_TRANSPARENT)
2523 {
2524 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2525 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2480 2526
2527 transparent = true;
2528 }
2529 else
2530# endif
2531 {
2532 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2533 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2534 }
2535 }
2536 else
2537#endif
2538 {
2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2539 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2482 XClearWindow (dpy, parent[0]);
2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2540 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2541 }
2542
2543 XClearWindow (dpy, parent);
2484 2544
2485 if (scrollBar.win) 2545 if (scrollBar.win)
2486 { 2546 {
2547 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else
2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2488 scrollBar.state = STATE_IDLE; 2551 scrollBar.state = STATE_IDLE;
2489 scrollBar.show (0); 2552 scrollBar.show (0);
2490 } 2553 }
2491 2554
2492#endif 2555 if (refresh)
2493 2556 {
2494 /* bgPixmap.apply () does not do the following : */
2495 scr_clear (); 2557 scr_clear ();
2496 scr_touch (true); 2558 scr_touch (true);
2559 }
2497 want_refresh = 1; 2560 want_refresh = 1;
2498} 2561}
2499 2562
2500/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2501void 2564void
… …
2569 { 2632 {
2570#if !ENABLE_MINIMAL 2633#if !ENABLE_MINIMAL
2571 if (selection.rect) 2634 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2635 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2636 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2637 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2638 else
2576#endif 2639#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2640 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2641 selection.end.row, selection.end.col,
2579 RS_RVid); 2642 RS_Sel | RS_RVid);
2580 } 2643 }
2581} 2644}
2582 2645
2583/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2584/* 2647/*
… …
2589void 2652void
2590rxvt_term::scr_dump (int fd) NOTHROW 2653rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2654{
2592 int row, wrote; 2655 int row, wrote;
2593 unsigned int width, towrite; 2656 unsigned int width, towrite;
2594 char r1[] = "\n"; 2657 const char r1[] = "\n";
2595 2658
2596 for (row = saveLines + top_row; 2659 for (row = saveLines + top_row;
2597 row < saveLines + nrow - 1; row++) 2660 row < saveLines + nrow - 1; row++)
2598 { 2661 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l 2662 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2645/* ------------------------------------------------------------------------- */ 2708/* ------------------------------------------------------------------------- */
2646/* 2709/*
2647 * Paste a selection direct to the command fd 2710 * Paste a selection direct to the command fd
2648 */ 2711 */
2649void 2712void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2713rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2714{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2715 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2716 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2717 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2718 data[i] = C0_CR;
… …
2661 2724
2662 if (priv_modes & PrivMode_BracketPaste) 2725 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~"); 2726 tt_printf ("\e[201~");
2664} 2727}
2665 2728
2666/* ------------------------------------------------------------------------- */
2667/*
2668 * Respond to a notification that a primary selection has been sent
2669 * EXT: SelectionNotify
2670 */
2671void 2729void
2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2730rxvt_term::paste (char *data, unsigned int len) NOTHROW
2673{ 2731{
2674 if (prop == None) /* check for failed XConvertSelection */ 2732 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2675 {
2676 if ((selection_type & Sel_CompoundText))
2677 {
2678 int selnum = selection_type & Sel_whereMask;
2679
2680 selection_type = 0;
2681 if (selnum != Sel_direct)
2682 selection_request_other (XA_STRING, selnum);
2683 }
2684
2685 if ((selection_type & Sel_UTF8String))
2686 {
2687 int selnum = selection_type & Sel_whereMask;
2688
2689 selection_type = Sel_CompoundText;
2690 if (selnum != Sel_direct)
2691 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2692 else
2693 selection_type = 0;
2694 }
2695
2696 return;
2697 }
2698
2699 unsigned long bytes_after;
2700 XTextProperty ct;
2701
2702 if (XGetWindowProperty (dpy, win, prop,
2703 0, PROP_SIZE / 4,
2704 delete_prop, AnyPropertyType,
2705 &ct.encoding, &ct.format,
2706 &ct.nitems, &bytes_after,
2707 &ct.value) != Success)
2708 {
2709 ct.value = 0;
2710 goto bailout;
2711 }
2712
2713 if (ct.encoding == None)
2714 goto bailout;
2715
2716 if (bytes_after)
2717 {
2718 // fetch and append remaining data
2719 XTextProperty ct2;
2720
2721 if (XGetWindowProperty (dpy, win, prop,
2722 ct.nitems / 4, (bytes_after + 3) / 4,
2723 delete_prop, AnyPropertyType,
2724 &ct2.encoding, &ct2.format,
2725 &ct2.nitems, &bytes_after,
2726 &ct2.value) != Success)
2727 goto bailout;
2728
2729 // realloc should be compatible to XFree, here, and elsewhere, too
2730 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2731 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2732 ct.nitems += ct2.nitems;
2733
2734 XFree (ct2.value);
2735 }
2736
2737 if (ct.value == 0)
2738 goto bailout;
2739
2740 if (ct.encoding == xa[XA_INCR])
2741 {
2742 // INCR selection, start handshake
2743 if (!delete_prop)
2744 XDeleteProperty (dpy, win, prop);
2745
2746 selection_wait = Sel_incr;
2747 incr_buf_fill = 0;
2748 incr_ev.start (10);
2749
2750 goto bailout;
2751 }
2752
2753 if (ct.nitems == 0)
2754 {
2755 if (selection_wait == Sel_incr)
2756 {
2757 XFree (ct.value);
2758
2759 // finally complete, now paste the whole thing
2760 selection_wait = Sel_normal;
2761 ct.value = (unsigned char *)incr_buf;
2762 ct.nitems = incr_buf_fill;
2763 incr_buf = 0;
2764 incr_buf_size = 0;
2765 incr_ev.stop ();
2766 }
2767 else
2768 {
2769 if (selection_wait == Sel_normal
2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2771 {
2772 /*
2773 * pass through again trying CUT_BUFFER0 if we've come from
2774 * XConvertSelection () but nothing was presented
2775 */
2776 selection_paste (display->root, XA_CUT_BUFFER0, False);
2777 }
2778
2779 goto bailout;
2780 }
2781 }
2782 else if (selection_wait == Sel_incr)
2783 {
2784 incr_ev.start (10);
2785
2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2787 {
2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2790 }
2791
2792 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2793 incr_buf_fill += ct.nitems;
2794
2795 goto bailout;
2796 }
2797
2798 char **cl;
2799 int cr;
2800
2801#if !ENABLE_MINIMAL
2802 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2803 // so recode it manually
2804 if (ct.encoding == xa[XA_UTF8_STRING])
2805 {
2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2807 char *s = rxvt_wcstombs (w);
2808 free (w);
2809 // TODO: strlen == only the first element will be converted. well...
2810 paste (s, strlen (s));
2811 free (s);
2812 }
2813 else
2814#endif
2815 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2816 && cl)
2817 {
2818 for (int i = 0; i < cr; i++)
2819 paste (cl[i], strlen (cl[i]));
2820
2821 XFreeStringList (cl);
2822 }
2823 else
2824 paste ((char *)ct.value, ct.nitems); // paste raw
2825
2826bailout:
2827 XFree (ct.value);
2828
2829 if (selection_wait == Sel_normal)
2830 selection_wait = Sel_none;
2831}
2832
2833void
2834rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2835{
2836 selection_wait = Sel_none;
2837
2838 incr_buf_size = 0;
2839 free (incr_buf);
2840
2841 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2842}
2843
2844void
2845rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2846{
2847 if (prop == None || selection_wait != Sel_incr)
2848 return; 2733 return;
2849 2734
2850 selection_paste (win, prop, true); 2735 tt_paste (data, len);
2851} 2736}
2852 2737
2853/* ------------------------------------------------------------------------- */ 2738/* ------------------------------------------------------------------------- */
2854/* 2739/*
2855 * Request the current selection: 2740 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2856 * Order: > internal selection if available 2741 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2857 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2742 * as fallback
2858 * > CUT_BUFFER0
2859 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2860 * will auto fallback to CUT_BUFFER0
2861 * EXT: button 2 release 2743 * EXT: button 2 release
2862 */ 2744 */
2863void 2745void
2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2865{ 2747{
2866 if (selection.text && selnum == Sel_Primary) 2748 if (!selection_req)
2867 {
2868 /* internal selection */
2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2870 paste (str, strlen (str));
2871 free (str);
2872 return;
2873 } 2749 {
2874 else 2750 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2751 selection_req->run ();
2875 { 2752 }
2876 selection_request_time = tm;
2877 selection_wait = Sel_normal;
2878
2879#if X_HAVE_UTF8_STRING
2880 selection_type = Sel_UTF8String;
2881 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2882 return;
2883#else
2884 selection_type = Sel_CompoundText;
2885 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2886 return;
2887#endif
2888 }
2889
2890 selection_wait = Sel_none; /* don't loop in selection_paste () */
2891 selection_paste (display->root, XA_CUT_BUFFER0, false);
2892}
2893
2894int
2895rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2896{
2897 Atom sel;
2898
2899 selection_type |= selnum;
2900
2901 if (selnum == Sel_Primary)
2902 sel = XA_PRIMARY;
2903 else if (selnum == Sel_Secondary)
2904 sel = XA_SECONDARY;
2905 else
2906 sel = xa[XA_CLIPBOARD];
2907
2908 if (XGetSelectionOwner (dpy, sel) != None)
2909 {
2910 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2911 vt, selection_request_time);
2912 return 1;
2913 }
2914
2915 return 0;
2916} 2753}
2917 2754
2918/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2919/* 2756/*
2920 * Clear all selected text 2757 * Clear all selected text
2921 * EXT: SelectionClear 2758 * EXT: SelectionClear
2922 */ 2759 */
2923void 2760void
2924rxvt_term::selection_clear () NOTHROW 2761rxvt_term::selection_clear (bool clipboard) NOTHROW
2925{ 2762{
2763 if (!clipboard)
2764 {
2926 want_refresh = 1; 2765 want_refresh = 1;
2927 free (selection.text); 2766 free (selection.text);
2928 selection.text = NULL; 2767 selection.text = NULL;
2929 selection.len = 0; 2768 selection.len = 0;
2930 CLEAR_SELECTION (); 2769 CLEAR_SELECTION ();
2931 2770
2932 if (display->selection_owner == this) 2771 if (display->selection_owner == this)
2933 display->selection_owner = 0; 2772 display->selection_owner = 0;
2773 }
2774 else
2775 {
2776 free (selection.clip_text);
2777 selection.clip_text = NULL;
2778 selection.clip_len = 0;
2779
2780 if (display->clipboard_owner == this)
2781 display->clipboard_owner = 0;
2782 }
2934} 2783}
2935 2784
2936/* ------------------------------------------------------------------------- */ 2785/* ------------------------------------------------------------------------- */
2937/* 2786/*
2938 * Copy a selection into the cut buffer 2787 * Copy a selection into the cut buffer
2939 * EXT: button 1 or 3 release 2788 * EXT: button 1 or 3 release
2940 */ 2789 */
2941void 2790void
2942rxvt_term::selection_make (Time tm) 2791rxvt_term::selection_make (Time tm)
2943{ 2792{
2944 int i; 2793 int size;
2945 wchar_t *new_selection_text; 2794 wchar_t *new_selection_text;
2946 text_t *t; 2795 text_t *t;
2947 2796
2948 switch (selection.op) 2797 switch (selection.op)
2949 { 2798 {
… …
2965 return; /* nothing selected, go away */ 2814 return; /* nothing selected, go away */
2966 2815
2967 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2816 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2968 return; 2817 return;
2969 2818
2970 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2819 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2971 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2820 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2972 2821
2973 int ofs = 0; 2822 int ofs = 0;
2974 int extra = 0; 2823 int extra = 0;
2975 2824
2976 int col = selection.beg.col; 2825 int col = selection.beg.col;
… …
2982 { 2831 {
2983#if !ENABLE_MINIMAL 2832#if !ENABLE_MINIMAL
2984 if (selection.rect) 2833 if (selection.rect)
2985 { 2834 {
2986 col = selection.beg.col; 2835 col = selection.beg.col;
2987 end_col = ncol + 1; 2836 end_col = selection.end.col;
2988 } 2837 }
2989 else 2838 else
2990#endif 2839#endif
2991 end_col = ROW(row).l; 2840 end_col = ROW(row).l;
2992 2841
2993 col = max (col, 0); 2842 col = max (col, 0);
2994 2843
2995 if (row == selection.end.row 2844 if (row == selection.end.row)
2996#if !ENABLE_MINIMAL
2997 || selection.rect
2998#endif
2999 )
3000 min_it (end_col, selection.end.col); 2845 min_it (end_col, selection.end.col);
3001 2846
3002 t = ROW(row).t + col; 2847 t = ROW(row).t + col;
3003 2848
3004 for (; col < end_col; col++) 2849 for (; col < end_col; col++)
… …
3012 2857
3013 extra -= (len - 1); 2858 extra -= (len - 1);
3014 2859
3015 if (extra < 0) 2860 if (extra < 0)
3016 { 2861 {
3017 extra += i; 2862 extra += size;
3018 i += i; 2863 size += size;
3019 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2864 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3020 } 2865 }
3021 2866
3022 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2867 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3023 } 2868 }
3024#endif 2869#endif
… …
3036 2881
3037 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3038 } 2883 }
3039 else 2884 else
3040#endif 2885#endif
3041 if (!ROW(row).is_longer () && row != selection.end.row) 2886 if (!ROW(row).is_longer ()
2887 && (row != selection.end.row || end_col != selection.end.col)
2888 && (row != selection.beg.row || selection.beg.col < ncol))
3042 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3043 } 2890 }
3044
3045 if (end_col != selection.end.col)
3046 new_selection_text[ofs++] = C0_LF;
3047 2891
3048 new_selection_text[ofs] = 0; 2892 new_selection_text[ofs] = 0;
3049 2893
3050 if (ofs == 0) 2894 if (ofs == 0)
3051 { 2895 {
… …
3064 2908
3065 selection_grab (tm); 2909 selection_grab (tm);
3066} 2910}
3067 2911
3068bool 2912bool
3069rxvt_term::selection_grab (Time tm) NOTHROW 2913rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3070{ 2914{
2915 Atom sel;
2916
2917 if (!clipboard)
2918 {
3071 selection_time = tm; 2919 selection_time = tm;
2920 sel = XA_PRIMARY;
2921 }
2922 else
2923 {
2924 clipboard_time = tm;
2925 sel = xa[XA_CLIPBOARD];
2926 }
3072 2927
3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2928 XSetSelectionOwner (dpy, sel, vt, tm);
3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2929 if (XGetSelectionOwner (dpy, sel) == vt)
3075 { 2930 {
3076 display->set_selection_owner (this); 2931 display->set_selection_owner (this, clipboard);
3077 return true; 2932 return true;
3078 } 2933 }
3079 else 2934 else
3080 { 2935 {
3081 selection_clear (); 2936 selection_clear (clipboard);
3082 return false; 2937 return false;
3083 } 2938 }
3084 2939
3085#if 0 2940#if 0
3086 XTextProperty ct; 2941 XTextProperty ct;
… …
3546 * EXT: SelectionRequest 3401 * EXT: SelectionRequest
3547 */ 3402 */
3548void 3403void
3549rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3404rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3550{ 3405{
3406 Atom property = rq.property == None ? rq.target : rq.property;
3551 XSelectionEvent ev; 3407 XSelectionEvent ev;
3552 3408
3553 ev.type = SelectionNotify; 3409 ev.type = SelectionNotify;
3554 ev.property = None; 3410 ev.property = None;
3555 ev.display = rq.display; 3411 ev.display = rq.display;
… …
3570 *target++ = xa[XA_COMPOUND_TEXT]; 3426 *target++ = xa[XA_COMPOUND_TEXT];
3571#if X_HAVE_UTF8_STRING 3427#if X_HAVE_UTF8_STRING
3572 *target++ = xa[XA_UTF8_STRING]; 3428 *target++ = xa[XA_UTF8_STRING];
3573#endif 3429#endif
3574 3430
3575 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3431 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3576 32, PropModeReplace, 3432 32, PropModeReplace,
3577 (unsigned char *)target_list, target - target_list); 3433 (unsigned char *)target_list, target - target_list);
3578 ev.property = rq.property; 3434 ev.property = property;
3579 } 3435 }
3580#if TODO // TODO 3436#if TODO // TODO
3581 else if (rq.target == xa[XA_MULTIPLE]) 3437 else if (rq.target == xa[XA_MULTIPLE])
3582 { 3438 {
3583 /* TODO: Handle MULTIPLE */ 3439 /* TODO: Handle MULTIPLE */
3584 } 3440 }
3585#endif 3441#endif
3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3442 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3587 { 3443 {
3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3444 XChangeProperty (dpy, rq.requestor, property, rq.target,
3589 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3445 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3590 ev.property = rq.property; 3446 ev.property = property;
3447 }
3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3449 {
3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3451 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3452 ev.property = property;
3591 } 3453 }
3592 else if (rq.target == XA_STRING 3454 else if (rq.target == XA_STRING
3593 || rq.target == xa[XA_TEXT] 3455 || rq.target == xa[XA_TEXT]
3594 || rq.target == xa[XA_COMPOUND_TEXT] 3456 || rq.target == xa[XA_COMPOUND_TEXT]
3595 || rq.target == xa[XA_UTF8_STRING] 3457 || rq.target == xa[XA_UTF8_STRING]
… …
3627 { 3489 {
3628 target = xa[XA_COMPOUND_TEXT]; 3490 target = xa[XA_COMPOUND_TEXT];
3629 style = enc_compound_text; 3491 style = enc_compound_text;
3630 } 3492 }
3631 3493
3632 if (selection.text) 3494 if (rq.selection == XA_PRIMARY && selection.text)
3633 { 3495 {
3634 cl = selection.text; 3496 cl = selection.text;
3635 selectlen = selection.len; 3497 selectlen = selection.len;
3498 }
3499 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3500 {
3501 cl = selection.clip_text;
3502 selectlen = selection.clip_len;
3636 } 3503 }
3637 else 3504 else
3638 { 3505 {
3639 cl = L""; 3506 cl = L"";
3640 selectlen = 0; 3507 selectlen = 0;
… …
3661 ct.value = (unsigned char *)cl; 3528 ct.value = (unsigned char *)cl;
3662 ct.nitems = selectlen; 3529 ct.nitems = selectlen;
3663 ct.encoding = target; 3530 ct.encoding = target;
3664 } 3531 }
3665 3532
3666 XChangeProperty (dpy, rq.requestor, rq.property, 3533 XChangeProperty (dpy, rq.requestor, property,
3667 ct.encoding, 8, PropModeReplace, 3534 ct.encoding, 8, PropModeReplace,
3668 ct.value, (int)ct.nitems); 3535 ct.value, (int)ct.nitems);
3669 ev.property = rq.property; 3536 ev.property = property;
3670 3537
3671 if (freect) 3538 if (freect)
3672 XFree (ct.value); 3539 XFree (ct.value);
3673 } 3540 }
3674 3541
… …
3708 h += 2; min_it (h, nrow); 3575 h += 2; min_it (h, nrow);
3709 3576
3710 x -= 1; clamp_it (x, 0, ncol - w); 3577 x -= 1; clamp_it (x, 0, ncol - w);
3711 y -= 1; clamp_it (y, 0, nrow - h); 3578 y -= 1; clamp_it (y, 0, nrow - h);
3712 3579
3713 ov_x = x; ov_y = y; 3580 ov.x = x; ov.y = y;
3714 ov_w = w; ov_h = h; 3581 ov.w = w; ov.h = h;
3715 3582
3716 ov_text = new text_t *[h]; 3583 ov.text = new text_t *[h];
3717 ov_rend = new rend_t *[h]; 3584 ov.rend = new rend_t *[h];
3718 3585
3719 for (y = 0; y < h; y++) 3586 for (y = 0; y < h; y++)
3720 { 3587 {
3721 text_t *tp = ov_text[y] = new text_t[w]; 3588 text_t *tp = ov.text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w]; 3589 rend_t *rp = ov.rend[y] = new rend_t[w];
3723 3590
3724 text_t t0, t1, t2; 3591 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE; 3592 rend_t r = OVERLAY_RSTYLE;
3726 3593
3727 if (y == 0) 3594 if (y == 0)
… …
3746} 3613}
3747 3614
3748void 3615void
3749rxvt_term::scr_overlay_off () NOTHROW 3616rxvt_term::scr_overlay_off () NOTHROW
3750{ 3617{
3751 if (!ov_text) 3618 if (!ov.text)
3752 return; 3619 return;
3753 3620
3754 want_refresh = 1; 3621 want_refresh = 1;
3755 3622
3756 for (int y = 0; y < ov_h; y++) 3623 for (int y = 0; y < ov.h; y++)
3757 { 3624 {
3758 delete [] ov_text[y]; 3625 delete [] ov.text[y];
3759 delete [] ov_rend[y]; 3626 delete [] ov.rend[y];
3760 } 3627 }
3761 3628
3762 delete [] ov_text; ov_text = 0; 3629 delete [] ov.text; ov.text = 0;
3763 delete [] ov_rend; ov_rend = 0; 3630 delete [] ov.rend; ov.rend = 0;
3764} 3631}
3765 3632
3766void 3633void
3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3634rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3768{ 3635{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3636 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770 return; 3637 return;
3771 3638
3772 x++, y++; 3639 x++, y++;
3773 3640
3774 ov_text[y][x] = text; 3641 ov.text[y][x] = text;
3775 ov_rend[y][x] = rend; 3642 ov.rend[y][x] = rend;
3776} 3643}
3777 3644
3778void 3645void
3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3646rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3780{ 3647{
… …
3799} 3666}
3800 3667
3801void 3668void
3802rxvt_term::scr_swap_overlay () NOTHROW 3669rxvt_term::scr_swap_overlay () NOTHROW
3803{ 3670{
3804 if (!ov_text) 3671 if (!ov.text)
3805 return; 3672 return;
3806 3673
3674 // hide cursor if it is within the overlay area
3675 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3676 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3677 screen.flags &= ~Screen_VisibleCursor;
3678
3807 // swap screen mem with overlay 3679 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3680 for (int y = ov.h; y--; )
3809 { 3681 {
3810 text_t *t1 = ov_text[y]; 3682 text_t *t1 = ov.text[y];
3811 rend_t *r1 = ov_rend[y]; 3683 rend_t *r1 = ov.rend[y];
3812 3684
3813 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3685 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3814 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3686 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3815 3687
3816 for (int x = ov_w; x--; ) 3688 for (int x = ov.w; x--; )
3817 { 3689 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3690 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3691 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3820 } 3692 }
3821 } 3693 }

Diff Legend

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