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.271 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.385 by sf-exg, Wed Jul 6 00:40:10 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-2006 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.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
36 34
35static inline void
37inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
47 44
48/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 85
89/* 86/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 88 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 90 if (mapped) \
104 XClearArea (dpy, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 94
114/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
117 98
… …
150 131
151 l.l = 0; 132 l.l = 0;
152 l.f = 0; 133 l.f = 0;
153} 134}
154 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
155/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
158 160
159void 161void
… …
172 if (nrow == 0) 174 if (nrow == 0)
173 nrow = 24; 175 nrow = 24;
174 176
175 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 178 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 179
181 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
183 { 182 {
184 //TODO//FIXME 183 //TODO//FIXME
… …
237 selection.text = NULL; 236 selection.text = NULL;
238 selection.len = 0; 237 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
241 selection.clicks = 0; 240 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false; 241 selection.clip_text = NULL;
242 selection.clip_len = 0;
243 } 243 }
244 else 244 else
245 { 245 {
246 /* 246 /*
247 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 277 }
278 278
279 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 281
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
285 285
286 if (top_row) 286 if (top_row)
287 { 287 {
288 // 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
289 // 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
290 291
291 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 294
294 do 295 do
295 { 296 {
296 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 299 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 301
303 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 ())
304 { 303 {
… …
330 int qcol = 0; 329 int qcol = 0;
331 330
332 // see below for cursor adjustment rationale 331 // see below for cursor adjustment rationale
333 if (p == ocur.row) 332 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 333 screen.cur.row = q - (total_rows - nrow);
335 334
336 // fill a single destination line 335 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 336 while (lofs < llen && qcol < ncol)
338 { 337 {
339 int prow = lofs / prev_ncol; 338 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 339 int pcol = lofs % prev_ncol;
… …
366 } 365 }
367 while (p != pend && q > 0); 366 while (p != pend && q > 0);
368 367
369 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
370 top_row = q - term_start; 369 top_row = q - term_start;
371 370
372 // make sure all terminal lines exist 371 // make sure all terminal lines exist
373 while (top_row > 0) 372 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 373 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 374 }
376 else 375 else
377 { 376 {
378 // if no scrollback exists (yet), wing, instead of wrap 377 // if no scrollback exists (yet), wing, instead of wrap
379 378
380 for (int row = min (nrow, prev_nrow); row--; ) 379 for (int row = min (nrow, prev_nrow); row--; )
381 { 380 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 382 line_t &qline = row_buf [row];
384 383
… …
398 delete old_ta; 397 delete old_ta;
399 delete old_ra; 398 delete old_ra;
400 399
401 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
403 403
404 free (tabs); 404 free (tabs);
405 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
406 409
407 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
408 411
409 prev_nrow = nrow; 412 prev_nrow = nrow;
410 prev_ncol = ncol; 413 prev_ncol = ncol;
411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419 414
420 tt_winch (); 415 tt_winch ();
421 416
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 418}
… …
435 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
436 431
437 free (row_buf); 432 free (row_buf);
438 free (swap_buf); 433 free (swap_buf);
439 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
440 free (tabs); 437 free (tabs);
441 438 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 439 }
444} 440}
445 441
446/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
447/* 443/*
448 * Hard reset 444 * Hard/Soft reset
449 */ 445 */
450void 446void
451rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
452{ 448{
453 scr_release (); 449 scr_release ();
454 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
455 scr_reset (); 453 scr_reset ();
456 454
457 scr_clear (true); 455 scr_clear (true);
458 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);
459} 473}
460 474
461/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
501 } 515 }
502 516
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
509#endif
510} 522}
511 523
512void 524void
513rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
514{ 526{
… …
539 want_refresh = 1; 551 want_refresh = 1;
540 view_start = 0; 552 view_start = 0;
541 553
542 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
543 555
544 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
545 557
546#if NSCREENS 558#if NSCREENS
547 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
548 { 560 {
549 num_scr = 0; 561 num_scr = 0;
… …
598/* 610/*
599 * Change the rendition style for following text 611 * Change the rendition style for following text
600 */ 612 */
601void 613void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 614rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 615{
604 if (set) 616 if (set)
605 rstyle |= style; 617 rstyle |= style;
606 else if (style == ~RS_None) 618 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 619 rstyle = DEFAULT_RSTYLE;
608 else 620 else
609 rstyle &= ~style; 621 rstyle &= ~style;
610 } 622}
611 623
612/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
613/* 625/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 626 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 627 * count positive ==> scroll up
… …
618int 630int
619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
620{ 632{
621 if (count == 0 || (row1 > row2)) 633 if (count == 0 || (row1 > row2))
622 return 0; 634 return 0;
635
636 int rows = row2 - row1 + 1;
637
638 min_it (count, rows);
623 639
624 want_refresh = 1; 640 want_refresh = 1;
625 num_scr += count; 641 num_scr += count;
626 642
627 if (count > 0 643 if (count > 0
… …
666 line_t &l2 = ROW(i); 682 line_t &l2 = ROW(i);
667 683
668 ::swap (l1, l2); 684 ::swap (l1, l2);
669 l2.touch (); 685 l2.touch ();
670 } 686 }
671 687
672 // move and/or clear selection, if any 688 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 689 if (selection.op && current_screen == selection.screen)
674 { 690 {
675 selection.beg.row -= count; 691 selection.beg.row -= count;
676 selection.end.row -= count; 692 selection.end.row -= count;
… …
712 { 728 {
713 /* move selected region too */ 729 /* move selected region too */
714 selection.beg.row -= count; 730 selection.beg.row -= count;
715 selection.end.row -= count; 731 selection.end.row -= count;
716 selection.mark.row -= count; 732 selection.mark.row -= count;
717 733
718 selection_check (0); 734 selection_check (0);
719 } 735 }
720 } 736 }
721 737
722 // use a simple and robust scrolling algorithm, this 738 // use a simple and robust scrolling algorithm, this
723 // part of scr_scroll_text is not time-critical. 739 // part of scr_scroll_text is not time-critical.
724
725 int rows = row2 - row1 + 1;
726
727 min_it (count, rows);
728 740
729 line_t *temp_buf = row_buf + total_rows; 741 line_t *temp_buf = row_buf + total_rows;
730 742
731 for (int row = 0; row < rows; row++) 743 for (int row = 0; row < rows; row++)
732 { 744 {
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 787 screen.cur.row -= minlines;
776 } 788 }
777 } 789 }
778 790
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 791 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 792 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 793 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 794 int row = screen.cur.row;
785 795
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 796 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 797
788 line_t *line = &ROW(row); 798 line_t *line = &ROW(row);
789 799
790 while (str < strend) 800 while (str < strend)
791 { 801 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 803
794 if (c < 0x20) 804 if (ecb_unlikely (c < 0x20))
795 if (c == C0_LF) 805 if (c == C0_LF)
796 { 806 {
797 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
798 808
799 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
… …
818 { 828 {
819 scr_tab (1, true); 829 scr_tab (1, true);
820 continue; 830 continue;
821 } 831 }
822 832
833 if (ecb_unlikely (
823 if (checksel /* see if we're writing within selection */ 834 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 836 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 ))
826 { 838 {
827 checksel = 0; 839 checksel = 0;
828 /* 840 /*
829 * If we wrote anywhere in the selected area, kill the selection 841 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 842 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 843 * should be a similar check.
832 */ 844 */
833 CLEAR_SELECTION (); 845 CLEAR_SELECTION ();
834 } 846 }
835 847
836 if (screen.flags & Screen_WrapNext) 848 if (ecb_unlikely (screen.flags & Screen_WrapNext))
837 { 849 {
838 scr_do_wrap (); 850 scr_do_wrap ();
839 851
840 line->l = ncol; 852 line->l = ncol;
841 line->is_longer (1); 853 line->is_longer (1);
842 854
843 row = screen.cur.row; 855 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 856 line = &ROW(row); /* _must_ refresh */
845 } 857 }
846 858
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 859 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 860 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 861 c = 0xfffd;
850 862
851 // 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
852 // further replacements, as wcwidth might return -1 for the line 864 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 865 // drawing characters below as they might be invalid in the current
854 // locale. 866 // locale.
855 int width = WCWIDTH (c); 867 int width = WCWIDTH (c);
856 868
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 869 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 870 {
859 // vt100 special graphics and line drawing 871 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 872 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 873 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 874 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 887 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 888 width = 1; // vt100 line drawing characters are always single-width
877 } 889 }
878 } 890 }
879 891
880 if (screen.flags & Screen_Insert) 892 if (ecb_unlikely (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 893 scr_insdel_chars (width, INSERT);
882 894
883 if (width != 0) 895 if (width != 0)
884 { 896 {
885#if !UNICODE_3 897#if !UNICODE_3
… …
890# else 902# else
891 c = 0xfffd; 903 c = 0xfffd;
892# endif 904# endif
893#endif 905#endif
894 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
895 // nuke the character at this position, if required 923 // nuke the character at this position, if required
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.
896 if (line->t[screen.cur.col] == NOCHAR 927 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
897 || (screen.cur.col < ncol - 1 928 scr_kill_char (*line, screen.cur.col);
898 && line->t[screen.cur.col + 1] == NOCHAR))
899 {
900 int col = screen.cur.col;
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' ';
923 // and try the same character next loop iteration
924 --str;
925 }
926 929
927 line->touch (); 930 line->touch ();
928 931
929 do 932 do
930 { 933 {
931 line->t[screen.cur.col] = c; 934 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 935 line->r[screen.cur.col] = rend;
933 936
934 if (screen.cur.col < ncol - 1) 937 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 938 screen.cur.col++;
936 else 939 else
937 { 940 {
938 line->l = ncol; 941 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 943 screen.flags |= Screen_WrapNext;
941 break; 944
945 goto end_of_line;
942 } 946 }
943 947
944 c = NOCHAR; 948 c = NOCHAR;
945 } 949 }
946 while (--width > 0); 950 while (ecb_unlikely (--width > 0));
947 951
948 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 953 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 954 {
951 line->touch (); 955 line->t[c] = ' ';
956 line->r[c] = rend;
957 }
952 958
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 959end_of_line:
960 ;
961 }
962#if ENABLE_COMBINING
963 else // width == 0
964 {
965 if (c != 0xfeff) // ignore BOM
966 {
967 // handle combining characters
968 // we just tag the accent on the previous on-screen character.
969 // this is arguably not correct, but also arguably not wrong.
970 // we don't handle double-width characters nicely yet.
971 line_t *linep;
972 text_t *tp;
973 rend_t *rp;
974
975 if (screen.cur.col > 0)
954 { 976 {
955 line->t[c] = ' ';
956 line->r[c] = rend; 977 linep = line;
978 tp = line->t + screen.cur.col - 1;
979 rp = line->r + screen.cur.col - 1;
957 } 980 }
981 else if (screen.cur.row > 0
982 && ROW(screen.cur.row - 1).is_longer ())
983 {
984 linep = &ROW(screen.cur.row - 1);
985 tp = line->t + ncol - 1;
986 rp = line->r + ncol - 1;
987 }
988 else
989 continue;
990
991 linep->touch ();
992
993 while (*tp == NOCHAR && tp > linep->t)
994 tp--, rp--;
995
996 // first try to find a precomposed character
997 unicode_t n = rxvt_compose (*tp, c);
998 if (n == NOCHAR)
999 n = rxvt_composite.compose (*tp, c);
1000
1001 *tp = n;
1002 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 1003 }
959 } 1004 }
960 else // width == 0
961 {
962#if ENABLE_COMBINING
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 1005#endif
1000 }
1001 } 1006 }
1002 1007
1003 max_it (line->l, screen.cur.col); 1008 max_it (line->l, screen.cur.col);
1004 1009
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1010 assert (screen.cur.row >= 0);
1007#endif
1008} 1011}
1009 1012
1010/* ------------------------------------------------------------------------- */ 1013/* ------------------------------------------------------------------------- */
1011/* 1014/*
1012 * 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
1013 * XTERM_SEQ: CTRL-H 1016 * XTERM_SEQ: CTRL-H
1014 */ 1017 */
1015void 1018void
1016rxvt_term::scr_backspace () NOTHROW 1019rxvt_term::scr_backspace () NOTHROW
1017{ 1020{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1021 if (screen.cur.col == 0)
1021 { 1022 {
1022 if (screen.cur.row > 0) 1023 if (screen.cur.row > 0)
1023 { 1024 {
1024#ifdef TERMCAP_HAS_BW 1025#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1026 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1027 --screen.cur.row;
1027 return; 1028
1029 want_refresh = 1;
1028#endif 1030#endif
1029 } 1031 }
1030 } 1032 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1033 else if (screen.flags & Screen_WrapNext)
1034 screen.flags &= ~Screen_WrapNext;
1035 else
1032 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1037}
1036 1038
1037/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
1038/* 1040/*
1039 * Process Horizontal Tab 1041 * Process Horizontal Tab
… …
1062 x = i; 1064 x = i;
1063 1065
1064 if (!--count) 1066 if (!--count)
1065 break; 1067 break;
1066 } 1068 }
1067 else 1069 else
1068 ht &= l.t[i] == ' ' 1070 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1071 && RS_SAME (l.r[i], base_rend);
1070 1072
1071 if (count) 1073 if (count)
1072 x = ncol - 1; 1074 x = ncol - 1;
… …
1188 } 1190 }
1189 } 1191 }
1190 else 1192 else
1191 { 1193 {
1192 if (screen.flags & Screen_Relative) 1194 if (screen.flags & Screen_Relative)
1195 {
1193 { /* relative origin mode */ 1196 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1197 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1198 min_it (screen.cur.row, screen.bscroll);
1196 } 1199 }
1197 else 1200 else
1198 screen.cur.row = row; 1201 screen.cur.row = row;
… …
1231/* 1234/*
1232 * Erase part or whole of a line 1235 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1236 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1237 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1238 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1239 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1240 */
1237void 1241void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1242rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1243{
1240 unsigned int col, num; 1244 unsigned int col, num;
… …
1249 line.touch (); 1253 line.touch ();
1250 line.is_longer (0); 1254 line.is_longer (0);
1251 1255
1252 switch (mode) 1256 switch (mode)
1253 { 1257 {
1258 case 3:
1259 if (screen.flags & Screen_WrapNext)
1260 return;
1261
1262 /* fall through */
1263
1254 case 0: /* erase to end of line */ 1264 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1265 col = screen.cur.col;
1256 num = ncol - col; 1266 num = ncol - col;
1257 min_it (line.l, col); 1267 min_it (line.l, col);
1268
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1261 break; 1272 break;
1273
1262 case 1: /* erase to beginning of line */ 1274 case 1: /* erase to beginning of line */
1263 col = 0; 1275 col = 0;
1264 num = screen.cur.col + 1; 1276 num = screen.cur.col + 1;
1277
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1278 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1279 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1280 CLEAR_SELECTION ();
1268 break; 1281 break;
1282
1269 case 2: /* erase whole line */ 1283 case 2: /* erase whole line */
1270 col = 0; 1284 col = 0;
1271 num = ncol; 1285 num = ncol;
1272 line.l = 0; 1286 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1287 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1332 return; 1346 return;
1333 1347
1334 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1335 1349
1336 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1353 {
1340 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1355
1356 if (mapped)
1357 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width,
1359 (unsigned int)Height2Pixel (num), False);
1342 } 1360 }
1343 else 1361 else
1344 { 1362 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1364
1365 if (mapped)
1366 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1369 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start),
1371 (unsigned int)width,
1372 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1373 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1374 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 }
1351 } 1376 }
1352 1377
1353 for (; num--; row++) 1378 for (; num--; row++)
1354 { 1379 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381
1382 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1384 }
1358} 1385}
1359 1386
1360#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1361void 1388void
… …
1435 * Insert/Delete <count> characters from the current position 1462 * Insert/Delete <count> characters from the current position
1436 */ 1463 */
1437void 1464void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1465rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1466{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1467 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1445 1469
1446 if (count <= 0) 1470 if (count <= 0)
1447 return; 1471 return;
… …
1449 scr_do_wrap (); 1473 scr_do_wrap ();
1450 1474
1451 selection_check (1); 1475 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1476 min_it (count, ncol - screen.cur.col);
1453 1477
1454 row = screen.cur.row; 1478 int row = screen.cur.row;
1455 1479
1456 line_t *line = &ROW(row); 1480 line_t *line = &ROW(row);
1457 1481
1458 line->touch (); 1482 line->touch ();
1459 line->is_longer (0); 1483 line->is_longer (0);
1460 1484
1485 // nuke wide spanning the start
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1461 switch (insdel) 1489 switch (insdel)
1462 { 1490 {
1463 case INSERT: 1491 case INSERT:
1464 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--)
1465 { 1498 {
1466 line->t[col] = line->t[col - count]; 1499 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1500 line->r[col] = line->r[col - count];
1468 } 1501 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1502
1472 if (selection.op && current_screen == selection.screen 1503 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1505 {
1475 if (selection.end.row != screen.cur.row 1506 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1507 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1508 CLEAR_SELECTION ();
1478 else 1509 else
1510 {
1479 { /* shift selection */ 1511 /* shift selection */
1480 selection.beg.col += count; 1512 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1513 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1514 selection.end.col += count;
1483 } 1515 }
1484 } 1516 }
… …
1489 case ERASE: 1521 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1522 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1523 selection_check (1);
1492 screen.cur.col -= count; 1524 screen.cur.col -= count;
1493 1525
1494 line->l = max (line->l - count, 0); 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
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1530 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1531 break;
1497 1532
1498 case DELETE: 1533 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 line->l = max (line->l - count, 0);
1500 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
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1540 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1541 {
1503 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1505 } 1544 }
1506 1545
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1547
1510 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1550 {
1513 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
… …
1623 */ 1661 */
1624void 1662void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1663rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1664{
1627 if (mode < 0) 1665 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1666 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1667 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1668 tabs [screen.cur.col] = !!mode;
1631} 1669}
1632 1670
1633/* ------------------------------------------------------------------------- */ 1671/* ------------------------------------------------------------------------- */
… …
1649 { 1687 {
1650 rvideo_state = on; 1688 rvideo_state = on;
1651 1689
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP 1691#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1655#endif
1656#if ENABLE_TRANSPARENCY
1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1693#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1695
1661 XGCValues gcvalue; 1696 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
… …
1871 return true; 1906 return true;
1872} 1907}
1873 1908
1874#ifndef NO_BELL 1909#ifndef NO_BELL
1875void 1910void
1876rxvt_term::bell_cb (time_watcher &w) 1911rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1912{
1878 rvideo_bell = false; 1913 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1914 scr_rvideo_mode (rvideo_mode);
1915 refresh_check ();
1880} 1916}
1881#endif 1917#endif
1882 1918
1883/* ------------------------------------------------------------------------- */ 1919/* ------------------------------------------------------------------------- */
1884void 1920void
… …
1888 1924
1889# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1891 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1892# endif 1928# endif
1893 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1894# endif 1930# endif
1931
1895# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1897 { 1934 set_urgency (1);
1898 XWMHints *h;
1899
1900 h = XGetWMHints(dpy, parent[0]);
1901 if (h != NULL)
1902 {
1903 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h);
1905 }
1906 }
1907# endif 1935# endif
1908 1936
1909 if (option (Opt_visualBell)) 1937 if (option (Opt_visualBell))
1910 { 1938 {
1911 rvideo_bell = true; 1939 rvideo_bell = true;
1912 scr_rvideo_mode (rvideo_mode); 1940 scr_rvideo_mode (rvideo_mode);
1913 display->flush (); 1941 flush ();
1914 1942
1915 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1916 } 1944 }
1917 else 1945 else
1918 XBell (dpy, 0); 1946 XBell (dpy, 0);
1919 1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1920#endif 1948#endif
1921} 1949}
1922 1950
1923/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1924/* ARGSUSED */
1925void 1952void
1926rxvt_term::scr_printscreen (int fullhist) NOTHROW 1953rxvt_term::scr_printscreen (int fullhist) NOTHROW
1927{ 1954{
1928#ifdef PRINTPIPE 1955#ifdef PRINTPIPE
1929 int nrows, row_start; 1956 int nrows, row_start;
1930 FILE *fd; 1957 FILE *fd = popen_printer ();
1931 1958
1932 if ((fd = popen_printer ()) == NULL) 1959 if (!fd)
1933 return; 1960 return;
1934 1961
1935 if (fullhist) 1962 if (fullhist)
1936 { 1963 {
1937 nrows = nrow - top_row; 1964 nrows = nrow - top_row;
… …
1943 row_start = view_start; 1970 row_start = view_start;
1944 } 1971 }
1945 1972
1946 wctomb (0, 0); 1973 wctomb (0, 0);
1947 1974
1948 for (int r1 = 0; r1 < nrows; r1++) 1975 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1949 { 1976 {
1950 text_t *tp = ROW(r1).t; 1977 text_t *tp = ROW(r1).t;
1951 int len = ROW(r1).l; 1978 int len = ROW(r1).l;
1952 1979
1953 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
… …
1982 * screen.text/screen.rend contain what the screen will change to. 2009 * screen.text/screen.rend contain what the screen will change to.
1983 */ 2010 */
1984void 2011void
1985rxvt_term::scr_refresh () NOTHROW 2012rxvt_term::scr_refresh () NOTHROW
1986{ 2013{
1987 unsigned char have_bg,
1988 showcursor; /* show the cursor */
1989 int16_t col, row, /* column/row we're processing */ 2014 int16_t col, row, /* column/row we're processing */
1990 ocrow; /* old cursor row */ 2015 ocrow; /* old cursor row */
1991 int i; /* tmp */ 2016 int i; /* tmp */
1992#ifndef NO_CURSORCOLOR 2017#ifndef NO_CURSORCOLOR
1993 rend_t cc1; /* store colours at cursor position (s) */ 2018 rend_t cc1; /* store colours at cursor position (s) */
… …
2002 return; 2027 return;
2003 2028
2004 /* 2029 /*
2005 * A: set up vars 2030 * A: set up vars
2006 */ 2031 */
2007 have_bg = 0;
2008 refresh_count = 0; 2032 refresh_count = 0;
2009 2033
2034 unsigned int old_screen_flags = screen.flags;
2035 char have_bg = 0;
2010#ifdef HAVE_BG_PIXMAP 2036#ifdef HAVE_BG_PIXMAP
2011 have_bg |= bgPixmap.pixmap != None; 2037 have_bg = bg_pixmap != None;
2012#endif
2013#if ENABLE_TRANSPARENCY
2014 have_bg |= option (Opt_transparent) && am_transparent;
2015#endif 2038#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2040
2018 /* 2041 /*
2019 * B: reverse any characters which are selected 2042 * B: reverse any characters which are selected
2020 */ 2043 */
2021 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;
2022 2052
2023 /* 2053 /*
2024 * C: set the cursor character (s) 2054 * C: set the cursor character (s)
2025 */ 2055 */
2026 { 2056 {
2027 unsigned char setoldcursor; 2057 unsigned char setoldcursor;
2028 2058
2029 showcursor = (screen.flags & Screen_VisibleCursor);
2030#ifdef CURSOR_BLINK 2059#ifdef CURSOR_BLINK
2031 if (hidden_cursor) 2060 if (hidden_cursor)
2032 showcursor = 0; 2061 showcursor = 0;
2033#endif 2062#endif
2034 2063
… …
2062 ccol2 = bgcolor_of (rstyle); 2091 ccol2 = bgcolor_of (rstyle);
2063#else 2092#else
2064 ccol2 = Color_bg; 2093 ccol2 = Color_bg;
2065#endif 2094#endif
2066 2095
2067 if (showcursor && focus) 2096 if (focus)
2068 { 2097 {
2069 if (option (Opt_cursorUnderline)) 2098 if (option (Opt_cursorUnderline))
2070 *crp ^= RS_Uline; 2099 *crp ^= RS_Uline;
2071 else 2100 else
2072 { 2101 {
… …
2107 oldcursor.col = screen.cur.col; 2136 oldcursor.col = screen.cur.col;
2108 } 2137 }
2109 } 2138 }
2110 } 2139 }
2111 2140
2112 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2113#if ENABLE_OVERLAY
2114 scr_swap_overlay ();
2115#endif
2116
2117#ifndef NO_SLOW_LINK_SUPPORT 2141#ifndef NO_SLOW_LINK_SUPPORT
2118 /* 2142 /*
2119 * D: CopyArea pass - very useful for slower links 2143 * D: CopyArea pass - very useful for slower links
2120 * This has been deliberately kept simple. 2144 * This has been deliberately kept simple.
2121 */ 2145 */
… …
2210 continue; 2234 continue;
2211 2235
2212 // redraw one or more characters 2236 // redraw one or more characters
2213 2237
2214 // seek to the beginning of wide characters 2238 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2239 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2216 --col; 2240 --col;
2217 2241
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2219 text_t *text = stp + col; 2243 text_t *text = stp + col;
2220 int count = 1; 2244 int count = 1;
2221 2245
2222 dtp[col] = stp[col]; 2246 dtp[col] = stp[col];
2223 drp[col] = rend; 2247 drp[col] = rend;
… …
2227 for (i = 0; ++col < ncol; ) 2251 for (i = 0; ++col < ncol; )
2228 { 2252 {
2229 if (stp[col] == NOCHAR) 2253 if (stp[col] == NOCHAR)
2230 { 2254 {
2231 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2232 drp[col] = rend; 2256 drp[col] = srp[col];
2257
2233 count++; 2258 count++;
2234 i++; 2259 i++;
2235 2260
2236 continue; 2261 continue;
2237 } 2262 }
… …
2257 2282
2258 col--; /* went one too far. move back */ 2283 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2284 count -= i; /* dump any matching trailing chars */
2260 2285
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2286 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2287 while (ecb_unlikely (i && text[count] == NOCHAR))
2263 count++, i--; 2288 count++, i--;
2264 2289
2265 /* 2290 /*
2266 * Determine the attributes for the string 2291 * Determine the attributes for the string
2267 */ 2292 */
2268 int fore = fgcolor_of (rend); // desired foreground 2293 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2294 int back = bgcolor_of (rend); // desired background
2270 2295
2271 // 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
2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2297 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2273 { 2298 {
2274 bool invert = rend & RS_RVid; 2299 bool invert = rend & RS_RVid;
2275 2300
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2301#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold
2278 && fore == Color_fg) 2302 if (rend & RS_Bold && fore == Color_fg)
2279 { 2303 {
2280 if (ISSET_PIXCOLOR (Color_BD)) 2304 if (ISSET_PIXCOLOR (Color_BD))
2281 fore = Color_BD; 2305 fore = Color_BD;
2282# if !ENABLE_STYLES 2306# if !ENABLE_STYLES
2283 else 2307 else
2284 invert = !invert; 2308 invert = !invert;
2285# endif 2309# endif
2286 } 2310 }
2287 2311
2288 if (rend & RS_Italic 2312 if (rend & RS_Italic && fore == Color_fg)
2289 && fore == Color_fg)
2290 { 2313 {
2291 if (ISSET_PIXCOLOR (Color_IT)) 2314 if (ISSET_PIXCOLOR (Color_IT))
2292 fore = Color_IT; 2315 fore = Color_IT;
2293# if !ENABLE_STYLES 2316# if !ENABLE_STYLES
2294 else 2317 else
… …
2298 2321
2299 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2322 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2300 fore = Color_UL; 2323 fore = Color_UL;
2301#endif 2324#endif
2302 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
2303 if (invert) 2346 if (invert)
2304 { 2347 {
2305#ifdef OPTION_HC
2306 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2307 || !ISSET_PIXCOLOR (Color_HC))
2308#endif
2309 /* invert the column if no highlightColor is set or it is the
2310 * current cursor column */
2311 ::swap (fore, back); 2348 ::swap (fore, back);
2312#ifdef OPTION_HC
2313 else if (ISSET_PIXCOLOR (Color_HC))
2314 back = Color_HC;
2315#endif
2316 2349
2317#ifndef NO_BOLD_UNDERLINE_REVERSE 2350#ifndef NO_BOLD_UNDERLINE_REVERSE
2318# ifndef OPTION_HC
2319 if (ISSET_PIXCOLOR (Color_RV))
2320 back = Color_RV;
2321# endif
2322 if (fore == back) 2351 if (fore == back)
2323 { 2352 {
2324 fore = Color_bg; 2353 fore = Color_bg;
2325 back = Color_fg; 2354 back = Color_fg;
2326 } 2355 }
… …
2328 } 2357 }
2329 2358
2330#ifdef TEXT_BLINK 2359#ifdef TEXT_BLINK
2331 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2360 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2332 { 2361 {
2333 if (!text_blink_ev.active) 2362 if (!text_blink_ev.is_active ())
2334 { 2363 {
2335 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2364 text_blink_ev.again ();
2336 hidden_text = 0; 2365 hidden_text = 0;
2337 } 2366 }
2338 else if (hidden_text) 2367 else if (hidden_text)
2339 fore = back; 2368 fore = back;
2340 } 2369 }
… …
2362 /* 2391 /*
2363 * Actually do the drawing of the string here 2392 * Actually do the drawing of the string here
2364 */ 2393 */
2365 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2394 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2366 2395
2367 if (have_bg && back == Color_bg) 2396 if (ecb_likely (have_bg && back == Color_bg))
2368 { 2397 {
2369 // this is very ugly, maybe push it into ->draw? 2398 // this is very ugly, maybe push it into ->draw?
2370 2399
2371 for (i = 0; i < count; i++) /* don't draw empty strings */ 2400 for (i = 0; i < count; i++) /* don't draw empty strings */
2372 if (text[i] != ' ') 2401 if (text[i] != ' ')
… …
2379 did_clear: ; 2408 did_clear: ;
2380 } 2409 }
2381 else 2410 else
2382 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2411 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2383 2412
2384 if (rend & RS_Uline && font->descent > 1 && fore != back) 2413 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2385 { 2414 {
2386#if ENABLE_FRILLS 2415#if ENABLE_FRILLS
2387 if (ISSET_PIXCOLOR (Color_underline)) 2416 if (ISSET_PIXCOLOR (Color_underline))
2388 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2417 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2389 else 2418 else
2390#endif 2419#endif
2391 XSetForeground (dpy, gc, pix_colors[fore]); 2420 XSetForeground (dpy, gc, pix_colors[fore]);
2392 2421
2393 XDrawLine (dpy, drawBuffer, gc, 2422 XDrawLine (dpy, vt, gc,
2394 xpixel, ypixel + font->ascent + 1, 2423 xpixel, ypixel + font->ascent + 1,
2395 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2424 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2396 } 2425 }
2397 } /* for (col....) */ 2426 } /* for (col....) */
2398 } /* for (row....) */ 2427 } /* for (row....) */
2399
2400#if ENABLE_OVERLAY
2401 scr_swap_overlay ();
2402#endif
2403 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2404 2428
2405 /* 2429 /*
2406 * G: cleanup cursor and display outline cursor if necessary 2430 * G: cleanup cursor and display outline cursor if necessary
2407 */ 2431 */
2408 if (showcursor) 2432 if (showcursor)
… …
2436 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2460 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2437 else 2461 else
2438#endif 2462#endif
2439 XSetForeground (dpy, gc, pix_colors[ccol1]); 2463 XSetForeground (dpy, gc, pix_colors[ccol1]);
2440 2464
2441 XDrawRectangle (dpy, drawBuffer, gc, 2465 XDrawRectangle (dpy, vt, gc,
2442 Col2Pixel (col), 2466 Col2Pixel (col),
2443 Row2Pixel (oldcursor.row), 2467 Row2Pixel (oldcursor.row),
2444 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2468 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2445 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2469 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2446 } 2470 }
2447 } 2471 }
2448 2472
2449 /* 2473 /*
2450 * H: cleanup selection 2474 * H: cleanup selection
2451 */ 2475 */
2476#if ENABLE_OVERLAY
2477 scr_swap_overlay ();
2478#endif
2479 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2480
2452 scr_reverse_selection (); 2481 scr_reverse_selection ();
2453 2482
2483 screen.flags = old_screen_flags;
2454 num_scr = 0; 2484 num_scr = 0;
2455 num_scr_allow = 1; 2485 num_scr_allow = 1;
2456} 2486}
2457 2487
2458void 2488void
… …
2479 scr_remap_chars (swap_buf [i]); 2509 scr_remap_chars (swap_buf [i]);
2480 } 2510 }
2481} 2511}
2482 2512
2483void 2513void
2484rxvt_term::scr_recolour () NOTHROW 2514rxvt_term::scr_recolour (bool refresh) NOTHROW
2485{ 2515{
2486 if (1 2516 bool transparent = false;
2487#if ENABLE_TRANSPARENCY 2517
2488 && !am_transparent
2489#endif
2490#ifdef HAVE_BG_PIXMAP 2518#ifdef HAVE_BG_PIXMAP
2491 && !bgPixmap.pixmap 2519 if (bg_pixmap != None)
2520 {
2521# ifdef ENABLE_TRANSPARENCY
2522 if (bg_flags & BG_IS_TRANSPARENT)
2523 {
2524 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2525 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2526
2527 transparent = true;
2528 }
2529 else
2492#endif 2530# endif
2493 ) 2531 {
2532 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2533 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2534 }
2494 { 2535 }
2536 else
2537#endif
2538 {
2495 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2539 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2496 XClearWindow (dpy, parent[0]);
2497 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2540 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2541 }
2542
2543 XClearWindow (dpy, parent);
2544
2499 if (scrollBar.win) 2545 if (scrollBar.win)
2500 { 2546 {
2547 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else
2501 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2551 scrollBar.state = STATE_IDLE;
2503 scrollbar_show (0); 2552 scrollBar.show (0);
2504 } 2553 }
2505#endif 2554
2555 if (refresh)
2506 } 2556 {
2507
2508 scr_clear (); 2557 scr_clear ();
2509 scr_touch (true); 2558 scr_touch (true);
2559 }
2510 want_refresh = 1; 2560 want_refresh = 1;
2511} 2561}
2512 2562
2513/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2514void 2564void
… …
2582 { 2632 {
2583#if !ENABLE_MINIMAL 2633#if !ENABLE_MINIMAL
2584 if (selection.rect) 2634 if (selection.rect)
2585 scr_xor_rect (selection.beg.row, selection.beg.col, 2635 scr_xor_rect (selection.beg.row, selection.beg.col,
2586 selection.end.row, selection.end.col, 2636 selection.end.row, selection.end.col,
2587 RS_RVid, RS_RVid | RS_Uline); 2637 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2588 else 2638 else
2589#endif 2639#endif
2590 scr_xor_span (selection.beg.row, selection.beg.col, 2640 scr_xor_span (selection.beg.row, selection.beg.col,
2591 selection.end.row, selection.end.col, 2641 selection.end.row, selection.end.col,
2592 RS_RVid); 2642 RS_Sel | RS_RVid);
2593 } 2643 }
2594} 2644}
2595 2645
2596/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2597/* 2647/*
… …
2602void 2652void
2603rxvt_term::scr_dump (int fd) NOTHROW 2653rxvt_term::scr_dump (int fd) NOTHROW
2604{ 2654{
2605 int row, wrote; 2655 int row, wrote;
2606 unsigned int width, towrite; 2656 unsigned int width, towrite;
2607 char r1[] = "\n"; 2657 const char r1[] = "\n";
2608 2658
2609 for (row = saveLines - nsaved; 2659 for (row = saveLines + top_row;
2610 row < saveLines + nrow - 1; row++) 2660 row < saveLines + nrow - 1; row++)
2611 { 2661 {
2612 width = row_buf[row].l >= 0 ? row_buf[row].l 2662 width = row_buf[row].l >= 0 ? row_buf[row].l
2613 : ncol; 2663 : ncol;
2614 for (towrite = width; towrite; towrite -= wrote) 2664 for (towrite = width; towrite; towrite -= wrote)
… …
2658/* ------------------------------------------------------------------------- */ 2708/* ------------------------------------------------------------------------- */
2659/* 2709/*
2660 * Paste a selection direct to the command fd 2710 * Paste a selection direct to the command fd
2661 */ 2711 */
2662void 2712void
2663rxvt_term::paste (char *data, unsigned int len) NOTHROW 2713rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2664{ 2714{
2665 /* convert normal newline chars into common keyboard Return key sequence */ 2715 /* convert normal newline chars into common keyboard Return key sequence */
2666 for (unsigned int i = 0; i < len; i++) 2716 for (unsigned int i = 0; i < len; i++)
2667 if (data[i] == C0_LF) 2717 if (data[i] == C0_LF)
2668 data[i] = C0_CR; 2718 data[i] = C0_CR;
2669 2719
2720 if (priv_modes & PrivMode_BracketPaste)
2721 tt_printf ("\e[200~");
2722
2670 tt_write (data, len); 2723 tt_write (data, len);
2671}
2672 2724
2673/* ------------------------------------------------------------------------- */ 2725 if (priv_modes & PrivMode_BracketPaste)
2674/* 2726 tt_printf ("\e[201~");
2675 * Respond to a notification that a primary selection has been sent
2676 * EXT: SelectionNotify
2677 */
2678void
2679rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2680{
2681 if (prop == None) /* check for failed XConvertSelection */
2682 {
2683 if ((selection_type & Sel_CompoundText))
2684 {
2685 int selnum = selection_type & Sel_whereMask;
2686
2687 selection_type = 0;
2688 if (selnum != Sel_direct)
2689 selection_request_other (XA_STRING, selnum);
2690 }
2691
2692 if ((selection_type & Sel_UTF8String))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = Sel_CompoundText;
2697 if (selnum != Sel_direct)
2698 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2699 else
2700 selection_type = 0;
2701 }
2702
2703 return;
2704 }
2705
2706 unsigned long bytes_after;
2707 XTextProperty ct;
2708
2709 if (XGetWindowProperty (dpy, win, prop,
2710 0, PROP_SIZE / 4,
2711 delete_prop, AnyPropertyType,
2712 &ct.encoding, &ct.format,
2713 &ct.nitems, &bytes_after,
2714 &ct.value) != Success)
2715 {
2716 ct.value = 0;
2717 goto bailout;
2718 }
2719
2720 if (ct.encoding == None)
2721 goto bailout;
2722
2723 if (bytes_after)
2724 {
2725 // fetch and append remaining data
2726 XTextProperty ct2;
2727
2728 if (XGetWindowProperty (dpy, win, prop,
2729 ct.nitems / 4, (bytes_after + 3) / 4,
2730 delete_prop, AnyPropertyType,
2731 &ct2.encoding, &ct2.format,
2732 &ct2.nitems, &bytes_after,
2733 &ct2.value) != Success)
2734 goto bailout;
2735
2736 // realloc should be compatible to XFree, here, and elsewhere, too
2737 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2738 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2739 ct.nitems += ct2.nitems;
2740
2741 XFree (ct2.value);
2742 }
2743
2744 if (ct.value == 0)
2745 goto bailout;
2746
2747 if (ct.encoding == xa[XA_INCR])
2748 {
2749 // INCR selection, start handshake
2750 if (!delete_prop)
2751 XDeleteProperty (dpy, win, prop);
2752
2753 selection_wait = Sel_incr;
2754 incr_buf_fill = 0;
2755 incr_ev.start (NOW + 10);
2756
2757 goto bailout;
2758 }
2759
2760 if (ct.nitems == 0)
2761 {
2762 if (selection_wait == Sel_incr)
2763 {
2764 XFree (ct.value);
2765
2766 // finally complete, now paste the whole thing
2767 selection_wait = Sel_normal;
2768 ct.value = (unsigned char *)incr_buf;
2769 ct.nitems = incr_buf_fill;
2770 incr_buf = 0;
2771 incr_buf_size = 0;
2772 incr_ev.stop ();
2773 }
2774 else
2775 {
2776 if (selection_wait == Sel_normal
2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2778 {
2779 /*
2780 * pass through again trying CUT_BUFFER0 if we've come from
2781 * XConvertSelection () but nothing was presented
2782 */
2783 selection_paste (display->root, XA_CUT_BUFFER0, False);
2784 }
2785
2786 goto bailout;
2787 }
2788 }
2789 else if (selection_wait == Sel_incr)
2790 {
2791 incr_ev.start (NOW + 10);
2792
2793 while (incr_buf_fill + ct.nitems > incr_buf_size)
2794 {
2795 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2797 }
2798
2799 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2800 incr_buf_fill += ct.nitems;
2801
2802 goto bailout;
2803 }
2804
2805 char **cl;
2806 int cr;
2807
2808#if !ENABLE_MINIMAL
2809 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2810 // so recode it manually
2811 if (ct.encoding == xa[XA_UTF8_STRING])
2812 {
2813 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2814 char *s = rxvt_wcstombs (w);
2815 free (w);
2816 // TODO: strlen == only the first element will be converted. well...
2817 paste (s, strlen (s));
2818 free (s);
2819 }
2820 else
2821#endif
2822 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2823 && cl)
2824 {
2825 for (int i = 0; i < cr; i++)
2826 paste (cl[i], strlen (cl[i]));
2827
2828 XFreeStringList (cl);
2829 }
2830 else
2831 paste ((char *)ct.value, ct.nitems); // paste raw
2832
2833bailout:
2834 XFree (ct.value);
2835
2836 if (selection_wait == Sel_normal)
2837 selection_wait = Sel_none;
2838} 2727}
2839 2728
2840void 2729void
2841rxvt_term::incr_cb (time_watcher &w) NOTHROW 2730rxvt_term::paste (char *data, unsigned int len) NOTHROW
2842{ 2731{
2843 selection_wait = Sel_none; 2732 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2844
2845 incr_buf_size = 0;
2846 free (incr_buf);
2847
2848 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2849}
2850
2851void
2852rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2853{
2854 if (prop == None || selection_wait != Sel_incr)
2855 return; 2733 return;
2856 2734
2857 selection_paste (win, prop, true); 2735 tt_paste (data, len);
2858} 2736}
2859 2737
2860/* ------------------------------------------------------------------------- */ 2738/* ------------------------------------------------------------------------- */
2861/* 2739/*
2862 * Request the current selection: 2740 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2863 * Order: > internal selection if available 2741 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2742 * as fallback
2865 * > CUT_BUFFER0
2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2867 * will auto fallback to CUT_BUFFER0
2868 * EXT: button 2 release 2743 * EXT: button 2 release
2869 */ 2744 */
2870void 2745void
2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2872{ 2747{
2873 if (selection.text && selnum == Sel_Primary) 2748 if (!selection_req)
2874 { /* internal selection */
2875 char *str = rxvt_wcstombs (selection.text, selection.len);
2876 paste (str, strlen (str));
2877 free (str);
2878 return;
2879 } 2749 {
2880 else 2750 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2751 selection_req->run ();
2881 { 2752 }
2882 selection_request_time = tm;
2883 selection_wait = Sel_normal;
2884
2885#if X_HAVE_UTF8_STRING
2886 selection_type = Sel_UTF8String;
2887 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2888 return;
2889#else
2890 selection_type = Sel_CompoundText;
2891 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2892 return;
2893#endif
2894 }
2895
2896 selection_wait = Sel_none; /* don't loop in selection_paste () */
2897 selection_paste (display->root, XA_CUT_BUFFER0, false);
2898}
2899
2900int
2901rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2902{
2903 Atom sel;
2904
2905 selection_type |= selnum;
2906
2907 if (selnum == Sel_Primary)
2908 sel = XA_PRIMARY;
2909 else if (selnum == Sel_Secondary)
2910 sel = XA_SECONDARY;
2911 else
2912 sel = xa[XA_CLIPBOARD];
2913
2914 if (XGetSelectionOwner (dpy, sel) != None)
2915 {
2916 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2917 vt, selection_request_time);
2918 return 1;
2919 }
2920
2921 return 0;
2922} 2753}
2923 2754
2924/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2925/* 2756/*
2926 * Clear all selected text 2757 * Clear all selected text
2927 * EXT: SelectionClear 2758 * EXT: SelectionClear
2928 */ 2759 */
2929void 2760void
2930rxvt_term::selection_clear () NOTHROW 2761rxvt_term::selection_clear (bool clipboard) NOTHROW
2931{ 2762{
2763 if (!clipboard)
2764 {
2932 want_refresh = 1; 2765 want_refresh = 1;
2933 free (selection.text); 2766 free (selection.text);
2934 selection.text = NULL; 2767 selection.text = NULL;
2935 selection.len = 0; 2768 selection.len = 0;
2936 CLEAR_SELECTION (); 2769 CLEAR_SELECTION ();
2937 2770
2938 if (display->selection_owner == this) 2771 if (display->selection_owner == this)
2939 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 }
2940} 2783}
2941 2784
2942/* ------------------------------------------------------------------------- */ 2785/* ------------------------------------------------------------------------- */
2943/* 2786/*
2944 * Copy a selection into the cut buffer 2787 * Copy a selection into the cut buffer
2945 * EXT: button 1 or 3 release 2788 * EXT: button 1 or 3 release
2946 */ 2789 */
2947void 2790void
2948rxvt_term::selection_make (Time tm) 2791rxvt_term::selection_make (Time tm)
2949{ 2792{
2950 int i; 2793 int size;
2951 wchar_t *new_selection_text; 2794 wchar_t *new_selection_text;
2952 text_t *t; 2795 text_t *t;
2953 2796
2954 switch (selection.op) 2797 switch (selection.op)
2955 { 2798 {
… …
2971 return; /* nothing selected, go away */ 2814 return; /* nothing selected, go away */
2972 2815
2973 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)))
2974 return; 2817 return;
2975 2818
2976 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2819 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2977 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));
2978 2821
2979 int ofs = 0; 2822 int ofs = 0;
2980 int extra = 0; 2823 int extra = 0;
2981 2824
2982 int col = selection.beg.col; 2825 int col = selection.beg.col;
… …
2988 { 2831 {
2989#if !ENABLE_MINIMAL 2832#if !ENABLE_MINIMAL
2990 if (selection.rect) 2833 if (selection.rect)
2991 { 2834 {
2992 col = selection.beg.col; 2835 col = selection.beg.col;
2993 end_col = ncol + 1; 2836 end_col = selection.end.col;
2994 } 2837 }
2995 else 2838 else
2996#endif 2839#endif
2997 end_col = ROW(row).l; 2840 end_col = ROW(row).l;
2998 2841
2999 col = max (col, 0); 2842 col = max (col, 0);
3000 2843
3001 if (row == selection.end.row 2844 if (row == selection.end.row)
3002#if !ENABLE_MINIMAL
3003 || selection.rect
3004#endif
3005 )
3006 min_it (end_col, selection.end.col); 2845 min_it (end_col, selection.end.col);
3007 2846
3008 t = ROW(row).t + col; 2847 t = ROW(row).t + col;
3009 2848
3010 for (; col < end_col; col++) 2849 for (; col < end_col; col++)
… …
3018 2857
3019 extra -= (len - 1); 2858 extra -= (len - 1);
3020 2859
3021 if (extra < 0) 2860 if (extra < 0)
3022 { 2861 {
3023 extra += i; 2862 extra += size;
3024 i += i; 2863 size += size;
3025 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));
3026 } 2865 }
3027 2866
3028 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2867 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3029 } 2868 }
3030#endif 2869#endif
… …
3042 2881
3043 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3044 } 2883 }
3045 else 2884 else
3046#endif 2885#endif
3047 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))
3048 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3049 } 2890 }
3050
3051 if (end_col != selection.end.col)
3052 new_selection_text[ofs++] = C0_LF;
3053 2891
3054 new_selection_text[ofs] = 0; 2892 new_selection_text[ofs] = 0;
3055 2893
3056 if (ofs == 0) 2894 if (ofs == 0)
3057 { 2895 {
… …
3070 2908
3071 selection_grab (tm); 2909 selection_grab (tm);
3072} 2910}
3073 2911
3074bool 2912bool
3075rxvt_term::selection_grab (Time tm) NOTHROW 2913rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3076{ 2914{
2915 Atom sel;
2916
2917 if (!clipboard)
2918 {
3077 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 }
3078 2927
3079 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2928 XSetSelectionOwner (dpy, sel, vt, tm);
3080 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2929 if (XGetSelectionOwner (dpy, sel) == vt)
3081 { 2930 {
3082 display->set_selection_owner (this); 2931 display->set_selection_owner (this, clipboard);
3083 return true; 2932 return true;
3084 } 2933 }
3085 else 2934 else
3086 { 2935 {
3087 selection_clear (); 2936 selection_clear (clipboard);
3088 return false; 2937 return false;
3089 } 2938 }
3090 2939
3091#if 0 2940#if 0
3092 XTextProperty ct; 2941 XTextProperty ct;
… …
3145 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2994 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3146 2995
3147 while (selection.mark.col > 0 2996 while (selection.mark.col > 0
3148 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2997 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3149 --selection.mark.col; 2998 --selection.mark.col;
3150 2999
3151 if (selection.op) 3000 if (selection.op)
3001 {
3152 { /* clear the old selection */ 3002 /* clear the old selection */
3153 selection.beg.row = selection.end.row = selection.mark.row; 3003 selection.beg.row = selection.end.row = selection.mark.row;
3154 selection.beg.col = selection.end.col = selection.mark.col; 3004 selection.beg.col = selection.end.col = selection.mark.col;
3155 } 3005 }
3156 3006
3157 selection.op = SELECTION_INIT; 3007 selection.op = SELECTION_INIT;
… …
3346 * a point/word/line which is either the start or end of the selection 3196 * a point/word/line which is either the start or end of the selection
3347 * and it was decided by whichever point/word/line was `fixed' at the 3197 * and it was decided by whichever point/word/line was `fixed' at the
3348 * time of the most recent button3 press 3198 * time of the most recent button3 press
3349 */ 3199 */
3350 if (button3 && buttonpress) 3200 if (button3 && buttonpress)
3201 {
3351 { /* button3 press */ 3202 /* button3 press */
3352 /* 3203 /*
3353 * first determine which edge of the selection we are closest to 3204 * first determine which edge of the selection we are closest to
3354 */ 3205 */
3355 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3206 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3356 || (!ROWCOL_IS_AFTER (pos, selection.end) 3207 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3374 selection.mark.row = selection.beg.row; 3225 selection.mark.row = selection.beg.row;
3375 selection.mark.col = selection.beg.col; 3226 selection.mark.col = selection.beg.col;
3376 } 3227 }
3377 } 3228 }
3378 else 3229 else
3230 {
3379 { /* button1 drag or button3 drag */ 3231 /* button1 drag or button3 drag */
3380 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3232 if (ROWCOL_IS_AFTER (selection.mark, pos))
3381 { 3233 {
3382 if (selection.mark.row == selection.end.row 3234 if (selection.mark.row == selection.end.row
3383 && selection.mark.col == selection.end.col 3235 && selection.mark.col == selection.end.col
3384 && clickchange 3236 && clickchange
… …
3465 selection.end.row++; 3317 selection.end.row++;
3466 } 3318 }
3467 } 3319 }
3468 3320
3469 if (button3 && buttonpress) 3321 if (button3 && buttonpress)
3322 {
3470 { /* mark may need to be changed */ 3323 /* mark may need to be changed */
3471 if (closeto == LEFT) 3324 if (closeto == LEFT)
3472 { 3325 {
3473 selection.mark.row = selection.end.row; 3326 selection.mark.row = selection.end.row;
3474 selection.mark.col = selection.end.col - (selection.clicks == 2); 3327 selection.mark.col = selection.end.col - (selection.clicks == 2);
3475 } 3328 }
… …
3548 * EXT: SelectionRequest 3401 * EXT: SelectionRequest
3549 */ 3402 */
3550void 3403void
3551rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3404rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3552{ 3405{
3406 Atom property = rq.property == None ? rq.target : rq.property;
3553 XSelectionEvent ev; 3407 XSelectionEvent ev;
3554 3408
3555 ev.type = SelectionNotify; 3409 ev.type = SelectionNotify;
3556 ev.property = None; 3410 ev.property = None;
3557 ev.display = rq.display; 3411 ev.display = rq.display;
… …
3572 *target++ = xa[XA_COMPOUND_TEXT]; 3426 *target++ = xa[XA_COMPOUND_TEXT];
3573#if X_HAVE_UTF8_STRING 3427#if X_HAVE_UTF8_STRING
3574 *target++ = xa[XA_UTF8_STRING]; 3428 *target++ = xa[XA_UTF8_STRING];
3575#endif 3429#endif
3576 3430
3577 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3431 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3578 32, PropModeReplace, 3432 32, PropModeReplace,
3579 (unsigned char *)target_list, target - target_list); 3433 (unsigned char *)target_list, target - target_list);
3580 ev.property = rq.property; 3434 ev.property = property;
3581 } 3435 }
3582#if TODO // TODO 3436#if TODO // TODO
3583 else if (rq.target == xa[XA_MULTIPLE]) 3437 else if (rq.target == xa[XA_MULTIPLE])
3584 { 3438 {
3585 /* TODO: Handle MULTIPLE */ 3439 /* TODO: Handle MULTIPLE */
3586 } 3440 }
3587#endif 3441#endif
3588 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3442 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3589 { 3443 {
3590 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3444 XChangeProperty (dpy, rq.requestor, property, rq.target,
3591 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3445 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3592 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;
3593 } 3453 }
3594 else if (rq.target == XA_STRING 3454 else if (rq.target == XA_STRING
3595 || rq.target == xa[XA_TEXT] 3455 || rq.target == xa[XA_TEXT]
3596 || rq.target == xa[XA_COMPOUND_TEXT] 3456 || rq.target == xa[XA_COMPOUND_TEXT]
3597 || rq.target == xa[XA_UTF8_STRING] 3457 || rq.target == xa[XA_UTF8_STRING]
… …
3629 { 3489 {
3630 target = xa[XA_COMPOUND_TEXT]; 3490 target = xa[XA_COMPOUND_TEXT];
3631 style = enc_compound_text; 3491 style = enc_compound_text;
3632 } 3492 }
3633 3493
3634 if (selection.text) 3494 if (rq.selection == XA_PRIMARY && selection.text)
3635 { 3495 {
3636 cl = selection.text; 3496 cl = selection.text;
3637 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;
3638 } 3503 }
3639 else 3504 else
3640 { 3505 {
3641 cl = L""; 3506 cl = L"";
3642 selectlen = 0; 3507 selectlen = 0;
… …
3663 ct.value = (unsigned char *)cl; 3528 ct.value = (unsigned char *)cl;
3664 ct.nitems = selectlen; 3529 ct.nitems = selectlen;
3665 ct.encoding = target; 3530 ct.encoding = target;
3666 } 3531 }
3667 3532
3668 XChangeProperty (dpy, rq.requestor, rq.property, 3533 XChangeProperty (dpy, rq.requestor, property,
3669 ct.encoding, 8, PropModeReplace, 3534 ct.encoding, 8, PropModeReplace,
3670 ct.value, (int)ct.nitems); 3535 ct.value, (int)ct.nitems);
3671 ev.property = rq.property; 3536 ev.property = property;
3672 3537
3673 if (freect) 3538 if (freect)
3674 XFree (ct.value); 3539 XFree (ct.value);
3675 } 3540 }
3676 3541
3677 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3542 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3678}
3679
3680/* ------------------------------------------------------------------------- *
3681 * MOUSE ROUTINES *
3682 * ------------------------------------------------------------------------- */
3683
3684/*
3685 * return col/row values corresponding to x/y pixel values
3686 */
3687void
3688rxvt_term::pixel_position (int *x, int *y) NOTHROW
3689{
3690 *x = Pixel2Col (*x);
3691 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3692 *y = Pixel2Row (*y);
3693 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3694} 3543}
3695 3544
3696/* ------------------------------------------------------------------------- */ 3545/* ------------------------------------------------------------------------- */
3697#ifdef USE_XIM 3546#ifdef USE_XIM
3698void 3547void
… …
3726 h += 2; min_it (h, nrow); 3575 h += 2; min_it (h, nrow);
3727 3576
3728 x -= 1; clamp_it (x, 0, ncol - w); 3577 x -= 1; clamp_it (x, 0, ncol - w);
3729 y -= 1; clamp_it (y, 0, nrow - h); 3578 y -= 1; clamp_it (y, 0, nrow - h);
3730 3579
3731 ov_x = x; ov_y = y; 3580 ov.x = x; ov.y = y;
3732 ov_w = w; ov_h = h; 3581 ov.w = w; ov.h = h;
3733 3582
3734 ov_text = new text_t *[h]; 3583 ov.text = new text_t *[h];
3735 ov_rend = new rend_t *[h]; 3584 ov.rend = new rend_t *[h];
3736 3585
3737 for (y = 0; y < h; y++) 3586 for (y = 0; y < h; y++)
3738 { 3587 {
3739 text_t *tp = ov_text[y] = new text_t[w]; 3588 text_t *tp = ov.text[y] = new text_t[w];
3740 rend_t *rp = ov_rend[y] = new rend_t[w]; 3589 rend_t *rp = ov.rend[y] = new rend_t[w];
3741 3590
3742 text_t t0, t1, t2; 3591 text_t t0, t1, t2;
3743 rend_t r = OVERLAY_RSTYLE; 3592 rend_t r = OVERLAY_RSTYLE;
3744 3593
3745 if (y == 0) 3594 if (y == 0)
… …
3764} 3613}
3765 3614
3766void 3615void
3767rxvt_term::scr_overlay_off () NOTHROW 3616rxvt_term::scr_overlay_off () NOTHROW
3768{ 3617{
3769 if (!ov_text) 3618 if (!ov.text)
3770 return; 3619 return;
3771 3620
3772 want_refresh = 1; 3621 want_refresh = 1;
3773 3622
3774 for (int y = 0; y < ov_h; y++) 3623 for (int y = 0; y < ov.h; y++)
3775 { 3624 {
3776 delete [] ov_text[y]; 3625 delete [] ov.text[y];
3777 delete [] ov_rend[y]; 3626 delete [] ov.rend[y];
3778 } 3627 }
3779 3628
3780 delete [] ov_text; ov_text = 0; 3629 delete [] ov.text; ov.text = 0;
3781 delete [] ov_rend; ov_rend = 0; 3630 delete [] ov.rend; ov.rend = 0;
3782} 3631}
3783 3632
3784void 3633void
3785rxvt_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
3786{ 3635{
3787 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3636 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3788 return; 3637 return;
3789 3638
3790 x++, y++; 3639 x++, y++;
3791 3640
3792 ov_text[y][x] = text; 3641 ov.text[y][x] = text;
3793 ov_rend[y][x] = rend; 3642 ov.rend[y][x] = rend;
3794} 3643}
3795 3644
3796void 3645void
3797rxvt_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
3798{ 3647{
… …
3817} 3666}
3818 3667
3819void 3668void
3820rxvt_term::scr_swap_overlay () NOTHROW 3669rxvt_term::scr_swap_overlay () NOTHROW
3821{ 3670{
3822 if (!ov_text) 3671 if (!ov.text)
3823 return; 3672 return;
3824 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
3825 // swap screen mem with overlay 3679 // swap screen mem with overlay
3826 for (int y = ov_h; y--; ) 3680 for (int y = ov.h; y--; )
3827 { 3681 {
3828 text_t *t1 = ov_text[y]; 3682 text_t *t1 = ov.text[y];
3829 rend_t *r1 = ov_rend[y]; 3683 rend_t *r1 = ov.rend[y];
3830 3684
3831 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;
3832 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;
3833 3687
3834 for (int x = ov_w; x--; ) 3688 for (int x = ov.w; x--; )
3835 { 3689 {
3836 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3690 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3837 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));
3838 } 3692 }
3839 } 3693 }

Diff Legend

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