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.309 by root, Mon Jul 21 16:51:31 2008 UTC vs.
Revision 1.412 by root, Wed Jan 18 12:26:59 2012 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
… …
187 term_start = 0; 203 term_start = 0;
188 204
189 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
190 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
191 207
192 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
193 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
194 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
195 211
196 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
197 { 213 {
… …
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
… …
257 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
258 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);
259 } 277 }
260 278
261 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
263 281
264 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
265 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
266 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
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{
… …
519 return; 549 return;
520 550
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 /* check for boundary cross */
555 row_col_t pos;
556 pos.row = pos.col = 0;
557 if (ROWCOL_IS_BEFORE (selection.beg, pos)
558 && ROWCOL_IS_AFTER (selection.end, pos))
559 CLEAR_SELECTION ();
525 560
526 int i = current_screen; current_screen = scrn; scrn = i; 561 current_screen = scrn;
527 562
528#if NSCREENS 563#if NSCREENS
529 if (option (Opt_secondaryScreen)) 564 if (option (Opt_secondaryScreen))
530 { 565 {
531 num_scr = 0; 566 num_scr = 0;
… …
608 643
609 if (count > 0 644 if (count > 0
610 && row1 == 0 645 && row1 == 0
611 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 646 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
612 { 647 {
648 min_it (count, total_rows - (nrow - (row2 + 1)));
649
613 top_row = max (top_row - count, -saveLines); 650 top_row = max (top_row - count, -saveLines);
614
615 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows;
617 651
618 // sever bottommost line 652 // sever bottommost line
619 { 653 {
620 line_t &l = ROW(row2 - count); 654 line_t &l = ROW(row2);
621 l.is_longer (0); 655 l.is_longer (0);
622 l.touch (); 656 l.touch ();
623 } 657 }
624 658
659 // scroll everything up 'count' lines
660 term_start = (term_start + count) % total_rows;
661
662 // now copy lines below the scroll region bottom to the
663 // bottom of the screen again, so they look as if they
664 // hadn't moved.
665 for (int i = nrow; --i > row2; )
666 {
667 line_t &l1 = ROW(i - count);
668 line_t &l2 = ROW(i);
669
670 ::swap (l1, l2);
671 l2.touch ();
672 }
673
625 // erase newly scrolled-in lines 674 // erase newly scrolled-in lines
626 for (int i = count; i--; ) 675 for (int i = count; i--; )
627 { 676 {
628 line_t &l = ROW(nrow - 1 - i); 677 line_t &l = ROW(row2 - i);
629 678
630 // optimize if already cleared, can be significant on slow machines 679 // optimise if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem 680 // could be rolled into scr_blank_screen_mem
632 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 681 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 { 682 {
634 scr_blank_line (l, 0, l.l, rstyle); 683 scr_blank_line (l, 0, l.l, rstyle);
635 l.l = 0; 684 l.l = 0;
… …
637 } 686 }
638 else 687 else
639 scr_blank_screen_mem (l, rstyle); 688 scr_blank_screen_mem (l, rstyle);
640 } 689 }
641 690
642 // now copy lines below the scroll region bottom to the
643 // bottom of the screen again, so they look as if they
644 // hadn't moved.
645 for (int i = nrow; --i > row2; )
646 {
647 line_t &l1 = ROW(i - count);
648 line_t &l2 = ROW(i);
649
650 ::swap (l1, l2);
651 l2.touch ();
652 }
653
654 // move and/or clear selection, if any 691 // move and/or clear selection, if any
655 if (selection.op && current_screen == selection.screen) 692 if (selection.op && current_screen == selection.screen
693 && selection.beg.row <= row2)
656 { 694 {
657 selection.beg.row -= count; 695 selection.beg.row -= count;
658 selection.end.row -= count; 696 selection.end.row -= count;
659 selection.mark.row -= count; 697 selection.mark.row -= count;
660 698
661 if (selection.beg.row < top_row 699 selection_check (0);
662 || selection.end.row < top_row
663 || selection.mark.row < top_row)
664 {
665 CLEAR_ALL_SELECTION ();
666 selection.op = SELECTION_CLEAR;
667 }
668 } 700 }
669 701
670 // finally move the view window, if desired 702 // finally move the view window, if desired
671 if (option (Opt_scrollWithBuffer) 703 if (option (Opt_scrollWithBuffer)
672 && view_start != 0 704 && view_start != 0
… …
702 } 734 }
703 735
704 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
705 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
706 738
739 // sever line above scroll region
740 if (row1)
741 {
742 line_t &l = ROW(row1 - 1);
743 l.is_longer (0);
744 l.touch ();
745 }
746
707 int rows = row2 - row1 + 1; 747 int rows = row2 - row1 + 1;
708 748
709 min_it (count, rows); 749 min_it (count, rows);
710 750
711 line_t *temp_buf = row_buf + total_rows; 751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
712 752
713 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
714 { 754 {
715 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716 756
… …
718 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
719 } 759 }
720 760
721 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
722 ROW(row1 + row) = temp_buf [row]; 762 ROW(row1 + row) = temp_buf [row];
763
764 // sever bottommost line
765 {
766 line_t &l = ROW(row2);
767 l.is_longer (0);
768 l.touch ();
769 }
723 } 770 }
724 771
725 return count; 772 return count;
726} 773}
727 774
… …
733rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
734{ 781{
735 if (len <= 0) /* sanity */ 782 if (len <= 0) /* sanity */
736 return; 783 return;
737 784
738 unsigned char checksel; 785 bool checksel;
739 unicode_t c; 786 unicode_t c;
740 int ncol = this->ncol; 787 int ncol = this->ncol;
741 const wchar_t *strend = str + len; 788 const wchar_t *strend = str + len;
742 789
743 want_refresh = 1; 790 want_refresh = 1;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 803 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 804 screen.cur.row -= minlines;
758 } 805 }
759 } 806 }
760 807
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 808 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 809 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 810 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 811 int row = screen.cur.row;
767 812
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 813 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 814
770 line_t *line = &ROW(row); 815 line_t *line = &ROW(row);
771 816
772 while (str < strend) 817 while (str < strend)
773 { 818 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 819 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 820
776 if (expect_false (c < 0x20)) 821 if (ecb_unlikely (c < 0x20))
777 if (c == C0_LF) 822 if (c == C0_LF)
778 { 823 {
779 max_it (line->l, screen.cur.col); 824 max_it (line->l, screen.cur.col);
780 825
781 screen.flags &= ~Screen_WrapNext; 826 screen.flags &= ~Screen_WrapNext;
… …
800 { 845 {
801 scr_tab (1, true); 846 scr_tab (1, true);
802 continue; 847 continue;
803 } 848 }
804 849
805 if (expect_false ( 850 if (ecb_unlikely (
806 checksel /* see if we're writing within selection */ 851 checksel /* see if we're writing within selection */
807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 852 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 853 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 )) 854 ))
810 { 855 {
… …
815 * should be a similar check. 860 * should be a similar check.
816 */ 861 */
817 CLEAR_SELECTION (); 862 CLEAR_SELECTION ();
818 } 863 }
819 864
820 if (expect_false (screen.flags & Screen_WrapNext)) 865 if (ecb_unlikely (screen.flags & Screen_WrapNext))
821 { 866 {
822 scr_do_wrap (); 867 scr_do_wrap ();
823 868
824 line->l = ncol; 869 line->l = ncol;
825 line->is_longer (1); 870 line->is_longer (1);
… …
827 row = screen.cur.row; 872 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 873 line = &ROW(row); /* _must_ refresh */
829 } 874 }
830 875
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 876 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 877 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
833 c = 0xfffd; 878 c = 0xfffd;
834 879
835 // rely on wcwidth to tell us the character width, do wcwidth before 880 // rely on wcwidth to tell us the character width, do wcwidth before
836 // further replacements, as wcwidth might return -1 for the line 881 // further replacements, as wcwidth might return -1 for the line
837 // drawing characters below as they might be invalid in the current 882 // drawing characters below as they might be invalid in the current
838 // locale. 883 // locale.
839 int width = WCWIDTH (c); 884 int width = WCWIDTH (c);
840 885
841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 886 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
842 { 887 {
843 // vt100 special graphics and line drawing 888 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 889 // 5f-7e standard vt100
845 // 40-5e rxvt extension for extra curses acs chars 890 // 40-5e rxvt extension for extra curses acs chars
846 static uint16_t vt100_0[62] = { // 41 .. 7e 891 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
859 c = vt100_0[c - 0x41]; 904 c = vt100_0[c - 0x41];
860 width = 1; // vt100 line drawing characters are always single-width 905 width = 1; // vt100 line drawing characters are always single-width
861 } 906 }
862 } 907 }
863 908
864 if (expect_false (screen.flags & Screen_Insert)) 909 if (ecb_unlikely (screen.flags & Screen_Insert))
865 scr_insdel_chars (width, INSERT); 910 scr_insdel_chars (width, INSERT);
866 911
867 if (width != 0) 912 if (width != 0)
868 { 913 {
869#if !UNICODE_3 914#if !UNICODE_3
… …
874# else 919# else
875 c = 0xfffd; 920 c = 0xfffd;
876# endif 921# endif
877#endif 922#endif
878 923
924 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
925
926 // if the character doesn't fit into the remaining columns...
927 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
928 {
929 if (screen.flags & Screen_Autowrap)
930 {
931 // ... artificially enlargen the previous one
932 c = NOCHAR;
933 // and try the same character next loop iteration
934 --str;
935 }
936 else
937 screen.cur.col = ncol - width;
938 }
939
879 // nuke the character at this position, if required 940 // nuke the character at this position, if required
880 if (expect_false ( 941 // due to wonderful coincidences everywhere else in this loop
942 // we never have to check for overwriting a wide char itself,
943 // only its tail.
881 line->t[screen.cur.col] == NOCHAR 944 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
882 || (screen.cur.col < ncol - 1 945 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 946
913 line->touch (); 947 line->touch ();
914 948
915 do 949 do
916 { 950 {
917 line->t[screen.cur.col] = c; 951 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 952 line->r[screen.cur.col] = rend;
919 953
920 if (expect_true (screen.cur.col < ncol - 1)) 954 if (ecb_likely (screen.cur.col < ncol - 1))
921 screen.cur.col++; 955 screen.cur.col++;
922 else 956 else
923 { 957 {
924 line->l = ncol; 958 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 959 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 960 screen.flags |= Screen_WrapNext;
927 break; 961
962 goto end_of_line;
928 } 963 }
929 964
930 c = NOCHAR; 965 c = NOCHAR;
931 } 966 }
932 while (expect_false (--width > 0)); 967 while (ecb_unlikely (--width > 0));
933 968
934 // pad with spaces when overwriting wide character with smaller one 969 // pad with spaces when overwriting wide character with smaller one
935 if (expect_false (!width)) 970 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
936 { 971 {
937 line->touch ();
938
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 {
941 line->t[c] = ' '; 972 line->t[c] = ' ';
942 line->r[c] = rend; 973 line->r[c] = rend;
943 }
944 } 974 }
975
976end_of_line:
977 ;
945 } 978 }
946#if ENABLE_COMBINING 979#if ENABLE_COMBINING
947 else // width == 0 980 else // width == 0
948 { 981 {
949 if (c != 0xfeff) // ignore BOM 982 if (c != 0xfeff) // ignore BOM
… …
989#endif 1022#endif
990 } 1023 }
991 1024
992 max_it (line->l, screen.cur.col); 1025 max_it (line->l, screen.cur.col);
993 1026
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1027 assert (screen.cur.row >= 0);
996#endif
997} 1028}
998 1029
999/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1000/* 1031/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1032 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1014 1045
1015 want_refresh = 1; 1046 want_refresh = 1;
1016#endif 1047#endif
1017 } 1048 }
1018 } 1049 }
1050 else if (screen.flags & Screen_WrapNext)
1051 screen.flags &= ~Screen_WrapNext;
1019 else 1052 else
1020 scr_gotorc (0, -1, RELATIVE); 1053 scr_gotorc (0, -1, RELATIVE);
1021} 1054}
1022 1055
1023/* ------------------------------------------------------------------------- */ 1056/* ------------------------------------------------------------------------- */
… …
1279 scr_blank_line (line, col, num, rstyle); 1312 scr_blank_line (line, col, num, rstyle);
1280} 1313}
1281 1314
1282/* ------------------------------------------------------------------------- */ 1315/* ------------------------------------------------------------------------- */
1283/* 1316/*
1284 * Erase part of whole of the screen 1317 * Erase part or whole of the screen
1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1318 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1319 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1320 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1288 */ 1321 */
1289void 1322void
… …
1298 ZERO_SCROLLBACK (); 1331 ZERO_SCROLLBACK ();
1299 1332
1300 switch (mode) 1333 switch (mode)
1301 { 1334 {
1302 case 0: /* erase to end of screen */ 1335 case 0: /* erase to end of screen */
1303 selection_check (1);
1304 scr_erase_line (0); 1336 scr_erase_line (0);
1305 row = screen.cur.row + 1; /* possible OOB */ 1337 row = screen.cur.row + 1; /* possible OOB */
1306 num = nrow - row; 1338 num = nrow - row;
1307 break; 1339 break;
1308 case 1: /* erase to beginning of screen */ 1340 case 1: /* erase to beginning of screen */
1309 selection_check (3);
1310 scr_erase_line (1); 1341 scr_erase_line (1);
1311 row = 0; 1342 row = 0;
1312 num = screen.cur.row; 1343 num = screen.cur.row;
1313 break; 1344 break;
1314 case 2: /* erase whole screen */ 1345 case 2: /* erase whole screen */
1315 selection_check (3);
1316 row = 0; 1346 row = 0;
1317 num = nrow; 1347 num = nrow;
1318 break; 1348 break;
1319 default: 1349 default:
1320 return; 1350 return;
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1359 if (row >= nrow) /* Out Of Bounds */
1330 return; 1360 return;
1331 1361
1332 min_it (num, nrow - row); 1362 min_it (num, nrow - row);
1333 1363
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1364 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1365 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1366 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1367 {
1339 ren = DEFAULT_RSTYLE; 1368 ren = DEFAULT_RSTYLE;
1340 1369
1341 if (mapped) 1370 if (mapped)
1342 XClearArea (dpy, vt, 0, 1371 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1372 Row2Pixel (row - view_start), (unsigned int)vt_width,
1344 (unsigned int)Height2Pixel (num), False); 1373 (unsigned int)Height2Pixel (num), False);
1345 } 1374 }
1346 else 1375 else
1347 { 1376 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1377 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1378
1379 if (mapped)
1380 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1381 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1382 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1383 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1384 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1385 (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num)); 1386 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1387 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1389 }
1358 } 1390 }
1359 1391
1360 for (; num--; row++) 1392 for (; num--; row++)
1361 { 1393 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1394 scr_blank_screen_mem (ROW(row), rstyle);
1395
1396 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1397 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1398 }
1365} 1399}
1366 1400
1367#if !ENABLE_MINIMAL 1401#if !ENABLE_MINIMAL
1368void 1402void
… …
1387 1421
1388 want_refresh = 1; 1422 want_refresh = 1;
1389 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1390 1424
1391 num_scr_allow = 0; 1425 num_scr_allow = 0;
1392 selection_check (3); 1426
1427 row_col_t pos;
1428 pos.row = pos.col = 0;
1429 if (ROWCOL_IS_AFTER (selection.end, pos))
1430 CLEAR_SELECTION ();
1393 1431
1394 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1395 for (int row = nrow; row--; ) 1433 for (int row = nrow; row--; )
1396 { 1434 {
1397 line_t &line = ROW(row); 1435 line_t &line = ROW(row);
… …
1442 * Insert/Delete <count> characters from the current position 1480 * Insert/Delete <count> characters from the current position
1443 */ 1481 */
1444void 1482void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1483rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1484{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1485 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1486 ZERO_SCROLLBACK ();
1452 1487
1453 if (count <= 0) 1488 if (count <= 0)
1454 return; 1489 return;
… …
1456 scr_do_wrap (); 1491 scr_do_wrap ();
1457 1492
1458 selection_check (1); 1493 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1494 min_it (count, ncol - screen.cur.col);
1460 1495
1461 row = screen.cur.row; 1496 int row = screen.cur.row;
1462 1497
1463 line_t *line = &ROW(row); 1498 line_t *line = &ROW(row);
1464 1499
1465 line->touch (); 1500 line->touch ();
1466 line->is_longer (0); 1501 line->is_longer (0);
1467 1502
1503 // nuke wide spanning the start
1504 if (line->t[screen.cur.col] == NOCHAR)
1505 scr_kill_char (*line, screen.cur.col);
1506
1468 switch (insdel) 1507 switch (insdel)
1469 { 1508 {
1470 case INSERT: 1509 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1510 line->l = min (line->l + count, ncol);
1511
1512 if (line->t[screen.cur.col] == NOCHAR)
1513 scr_kill_char (*line, screen.cur.col);
1514
1515 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1516 {
1473 line->t[col] = line->t[col - count]; 1517 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1518 line->r[col] = line->r[col - count];
1475 } 1519 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1520
1479 if (selection.op && current_screen == selection.screen 1521 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1522 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1523 {
1482 if (selection.end.row != screen.cur.row 1524 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1539 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1540 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1541 selection_check (1);
1500 screen.cur.col -= count; 1542 screen.cur.col -= count;
1501 1543
1502 line->l = max (line->l - count, 0); 1544 // nuke wide char after the end
1545 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1546 scr_kill_char (*line, screen.cur.col + count);
1547
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1548 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1549 break;
1505 1550
1506 case DELETE: 1551 case DELETE:
1507 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1552 line->l = max (line->l - count, 0);
1508 1553
1554 // nuke wide char spanning the end
1555 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1556 scr_kill_char (*line, screen.cur.col + count);
1557
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1558 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1559 {
1511 line->t[col] = line->t[col + count]; 1560 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1561 line->r[col] = line->r[col + count];
1513 } 1562 }
1514 1563
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1564 scr_blank_line (*line, ncol - count, count, rstyle);
1517 1565
1518 if (selection.op && current_screen == selection.screen 1566 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1567 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1568 {
1521 if (selection.end.row != screen.cur.row 1569 if (selection.end.row != screen.cur.row
… …
1657 { 1705 {
1658 rvideo_state = on; 1706 rvideo_state = on;
1659 1707
1660 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1661#ifdef HAVE_BG_PIXMAP 1709#ifdef HAVE_BG_PIXMAP
1662 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1663#endif 1711#endif
1664 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1665 1713
1666 XGCValues gcvalue; 1714 XGCValues gcvalue;
1667 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1811 for (i = PART_BEG; i < RC_COUNT; i++) 1859 for (i = PART_BEG; i < RC_COUNT; i++)
1812 { 1860 {
1813 min_it (rc[i].col, ncol - 1); 1861 min_it (rc[i].col, ncol - 1);
1814 min_it (rc[i].row, nrow - 1); 1862 min_it (rc[i].row, nrow - 1);
1815 } 1863 }
1816// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1864
1817 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1865 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1818 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1866 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1819 1867
1820 num_scr_allow = 0; 1868 num_scr_allow = 0;
1821 1869
… …
1828 * Refresh the entire screen 1876 * Refresh the entire screen
1829 */ 1877 */
1830void 1878void
1831rxvt_term::scr_touch (bool refresh) NOTHROW 1879rxvt_term::scr_touch (bool refresh) NOTHROW
1832{ 1880{
1833 scr_expose (0, 0, width, height, refresh); 1881 scr_expose (0, 0, vt_width, vt_height, refresh);
1834} 1882}
1835 1883
1836/* ------------------------------------------------------------------------- */ 1884/* ------------------------------------------------------------------------- */
1837/* 1885/*
1838 * Move the display so that the line represented by scrollbar value Y is at 1886 * Move the display so that the line represented by scrollbar value Y is at
… …
1894 1942
1895# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1896# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1897 if (option (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1898# endif 1946# endif
1899 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1900# endif 1948# endif
1901 1949
1902# if ENABLE_FRILLS 1950# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1951 if (option (Opt_urgentOnBell))
1904 { 1952 set_urgency (1);
1905 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1906 {
1907 h->flags |= XUrgencyHint;
1908 XSetWMHints (dpy, parent[0], h);
1909 }
1910 }
1911# endif 1953# endif
1912 1954
1913 if (option (Opt_visualBell)) 1955 if (option (Opt_visualBell))
1914 { 1956 {
1915 rvideo_bell = true; 1957 rvideo_bell = true;
… …
1918 1960
1919 bell_ev.start (VISUAL_BELL_DURATION); 1961 bell_ev.start (VISUAL_BELL_DURATION);
1920 } 1962 }
1921 else 1963 else
1922 XBell (dpy, 0); 1964 XBell (dpy, 0);
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1923#endif 1966#endif
1924} 1967}
1925 1968
1926/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1927/* ARGSUSED */
1928void 1970void
1929rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1930{ 1972{
1931#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1932 int nrows, row_start; 1974 int nrows, row_start;
… …
1946 row_start = view_start; 1988 row_start = view_start;
1947 } 1989 }
1948 1990
1949 wctomb (0, 0); 1991 wctomb (0, 0);
1950 1992
1951 for (int r1 = 0; r1 < nrows; r1++) 1993 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1952 { 1994 {
1953 text_t *tp = ROW(r1).t; 1995 text_t *tp = ROW(r1).t;
1954 int len = ROW(r1).l; 1996 int len = ROW(r1).l;
1955 1997
1956 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1998 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1985 * screen.text/screen.rend contain what the screen will change to. 2027 * screen.text/screen.rend contain what the screen will change to.
1986 */ 2028 */
1987void 2029void
1988rxvt_term::scr_refresh () NOTHROW 2030rxvt_term::scr_refresh () NOTHROW
1989{ 2031{
1990 unsigned char have_bg,
1991 showcursor; /* show the cursor */
1992 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1993 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1994 int i; /* tmp */ 2034 int i; /* tmp */
1995#ifndef NO_CURSORCOLOR 2035#ifndef NO_CURSORCOLOR
1996 rend_t cc1; /* store colours at cursor position (s) */ 2036 rend_t cc1; /* store colours at cursor position (s) */
… …
2007 /* 2047 /*
2008 * A: set up vars 2048 * A: set up vars
2009 */ 2049 */
2010 refresh_count = 0; 2050 refresh_count = 0;
2011 2051
2052 unsigned int old_screen_flags = screen.flags;
2012 have_bg = 0; 2053 bool have_bg = 0;
2013#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2014 have_bg = bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
2015#endif 2056#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2058
2018 /* 2059 /*
2019 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
2020 */ 2061 */
2021 scr_reverse_selection (); 2062 scr_reverse_selection ();
2022 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY
2066 scr_swap_overlay ();
2067#endif
2068
2069 bool showcursor = screen.flags & Screen_VisibleCursor;
2070
2023 /* 2071 /*
2024 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2025 */ 2073 */
2026 { 2074 {
2027 unsigned char setoldcursor; 2075 bool setoldcursor;
2028 2076
2029 showcursor = (screen.flags & Screen_VisibleCursor);
2030#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2031 if (hidden_cursor) 2078 if (hidden_cursor)
2032 showcursor = 0; 2079 showcursor = 0;
2033#endif 2080#endif
2034 2081
… …
2062 ccol2 = bgcolor_of (rstyle); 2109 ccol2 = bgcolor_of (rstyle);
2063#else 2110#else
2064 ccol2 = Color_bg; 2111 ccol2 = Color_bg;
2065#endif 2112#endif
2066 2113
2067 if (showcursor && focus) 2114 if (focus)
2068 { 2115 {
2069 if (option (Opt_cursorUnderline)) 2116 if (option (Opt_cursorUnderline))
2070 *crp ^= RS_Uline; 2117 *crp ^= RS_Uline;
2071 else 2118 else
2072 { 2119 {
… …
2107 oldcursor.col = screen.cur.col; 2154 oldcursor.col = screen.cur.col;
2108 } 2155 }
2109 } 2156 }
2110 } 2157 }
2111 2158
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 2159#ifndef NO_SLOW_LINK_SUPPORT
2118 /* 2160 /*
2119 * D: CopyArea pass - very useful for slower links 2161 * D: CopyArea pass - very useful for slower links
2120 * This has been deliberately kept simple. 2162 * This has been deliberately kept simple.
2121 */ 2163 */
… …
2125 { 2167 {
2126 int16_t nits; 2168 int16_t nits;
2127 int i = num_scr; 2169 int i = num_scr;
2128 int j; 2170 int j;
2129 int len, wlen; 2171 int len, wlen;
2130 dLocal (int, num_scr);
2131 2172
2132 j = nrow; 2173 j = nrow;
2133 wlen = len = -1; 2174 wlen = len = -1;
2134 row = i > 0 ? 0 : j - 1; 2175 row = i > 0 ? 0 : j - 1;
2135 2176
… …
2210 continue; 2251 continue;
2211 2252
2212 // redraw one or more characters 2253 // redraw one or more characters
2213 2254
2214 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2256 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2216 --col; 2257 --col;
2217 2258
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2259 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2219 text_t *text = stp + col; 2260 text_t *text = stp + col;
2220 int count = 1; 2261 int count = 1;
2221 2262
2222 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2223 drp[col] = rend; 2264 drp[col] = rend;
… …
2227 for (i = 0; ++col < ncol; ) 2268 for (i = 0; ++col < ncol; )
2228 { 2269 {
2229 if (stp[col] == NOCHAR) 2270 if (stp[col] == NOCHAR)
2230 { 2271 {
2231 dtp[col] = stp[col]; 2272 dtp[col] = stp[col];
2232 drp[col] = rend; 2273 drp[col] = srp[col];
2274
2233 count++; 2275 count++;
2234 i++; 2276 i++;
2235 2277
2236 continue; 2278 continue;
2237 } 2279 }
… …
2257 2299
2258 col--; /* went one too far. move back */ 2300 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2301 count -= i; /* dump any matching trailing chars */
2260 2302
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2303 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2304 while (ecb_unlikely (i && text[count] == NOCHAR))
2263 count++, i--; 2305 count++, i--;
2264 2306
2265 /* 2307 /*
2266 * Determine the attributes for the string 2308 * Determine the attributes for the string
2267 */ 2309 */
2268 int fore = fgcolor_of (rend); // desired foreground 2310 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2311 int back = bgcolor_of (rend); // desired background
2270 2312
2271 // only do special processing if any attributes are set, which is unlikely 2313 // 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)) 2314 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2273 { 2315 {
2274 bool invert = rend & RS_RVid; 2316 bool invert = rend & RS_RVid;
2275 2317
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2318#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold && fore == Color_fg) 2319 if (rend & RS_Bold && fore == Color_fg)
… …
2296 2338
2297 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2339 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2298 fore = Color_UL; 2340 fore = Color_UL;
2299#endif 2341#endif
2300 2342
2343#ifdef OPTION_HC
2344 if (rend & RS_Sel)
2345 {
2346 /* invert the column if no highlightColor is set or it is the
2347 * current cursor column */
2348 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2349 && ISSET_PIXCOLOR (Color_HC))
2350 {
2351 if (ISSET_PIXCOLOR (Color_HTC))
2352 fore = Color_HTC;
2353 // if invert is 0 reverse video is set so we use bg color as fg color
2354 else if (!invert)
2355 fore = back;
2356
2357 back = Color_HC;
2358 invert = 0;
2359 }
2360 }
2361#endif
2362
2301 if (invert) 2363 if (invert)
2302 { 2364 {
2303#ifdef OPTION_HC
2304 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2305 || !ISSET_PIXCOLOR (Color_HC))
2306#endif
2307 /* invert the column if no highlightColor is set or it is the
2308 * current cursor column */
2309 ::swap (fore, back); 2365 ::swap (fore, back);
2310#ifdef OPTION_HC
2311 else if (ISSET_PIXCOLOR (Color_HC))
2312 back = Color_HC;
2313#endif
2314 2366
2315#ifndef NO_BOLD_UNDERLINE_REVERSE 2367#ifndef NO_BOLD_UNDERLINE_REVERSE
2316# ifndef OPTION_HC
2317 if (ISSET_PIXCOLOR (Color_RV))
2318 back = Color_RV;
2319# endif
2320 if (fore == back) 2368 if (fore == back)
2321 { 2369 {
2322 fore = Color_bg; 2370 fore = Color_bg;
2323 back = Color_fg; 2371 back = Color_fg;
2324 } 2372 }
… …
2360 /* 2408 /*
2361 * Actually do the drawing of the string here 2409 * Actually do the drawing of the string here
2362 */ 2410 */
2363 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2411 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2364 2412
2365 if (have_bg && back == Color_bg) 2413 if (ecb_likely (have_bg && back == Color_bg))
2366 { 2414 {
2367 // this is very ugly, maybe push it into ->draw? 2415 // this is very ugly, maybe push it into ->draw?
2368 2416
2369 for (i = 0; i < count; i++) /* don't draw empty strings */ 2417 for (i = 0; i < count; i++) /* don't draw empty strings */
2370 if (text[i] != ' ') 2418 if (text[i] != ' ')
… …
2377 did_clear: ; 2425 did_clear: ;
2378 } 2426 }
2379 else 2427 else
2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2381 2429
2382 if (rend & RS_Uline && font->descent > 1 && fore != back) 2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2383 { 2431 {
2384#if ENABLE_FRILLS 2432#if ENABLE_FRILLS
2385 if (ISSET_PIXCOLOR (Color_underline)) 2433 if (ISSET_PIXCOLOR (Color_underline))
2386 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2434 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2387 else 2435 else
… …
2392 xpixel, ypixel + font->ascent + 1, 2440 xpixel, ypixel + font->ascent + 1,
2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2441 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2394 } 2442 }
2395 } /* for (col....) */ 2443 } /* for (col....) */
2396 } /* for (row....) */ 2444 } /* for (row....) */
2397
2398#if ENABLE_OVERLAY
2399 scr_swap_overlay ();
2400#endif
2401 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2402 2445
2403 /* 2446 /*
2404 * G: cleanup cursor and display outline cursor if necessary 2447 * G: cleanup cursor and display outline cursor if necessary
2405 */ 2448 */
2406 if (showcursor) 2449 if (showcursor)
… …
2445 } 2488 }
2446 2489
2447 /* 2490 /*
2448 * H: cleanup selection 2491 * H: cleanup selection
2449 */ 2492 */
2493#if ENABLE_OVERLAY
2494 scr_swap_overlay ();
2495#endif
2496 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2497
2450 scr_reverse_selection (); 2498 scr_reverse_selection ();
2451 2499
2500 screen.flags = old_screen_flags;
2452 num_scr = 0; 2501 num_scr = 0;
2453 num_scr_allow = 1; 2502 num_scr_allow = 1;
2454} 2503}
2455 2504
2456void 2505void
… …
2477 scr_remap_chars (swap_buf [i]); 2526 scr_remap_chars (swap_buf [i]);
2478 } 2527 }
2479} 2528}
2480 2529
2481void 2530void
2482rxvt_term::scr_recolour () NOTHROW 2531rxvt_term::scr_recolour (bool refresh) NOTHROW
2483{ 2532{
2533 bool transparent = false;
2534
2484#ifdef HAVE_BG_PIXMAP 2535#ifdef HAVE_BG_PIXMAP
2485 bgPixmap.apply (); 2536 if (bg_pixmap != None)
2486#else 2537 {
2538# ifdef ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT)
2540 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2487 2543
2544 transparent = true;
2545 }
2546 else
2547# endif
2548 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2551 }
2552 }
2553 else
2554#endif
2555 {
2488 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2489 XClearWindow (dpy, parent[0]);
2490 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2557 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2558 }
2559
2560 XClearWindow (dpy, parent);
2491 2561
2492 if (scrollBar.win) 2562 if (scrollBar.win)
2493 { 2563 {
2564 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else
2494 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2495 scrollBar.state = STATE_IDLE; 2568 scrollBar.state = SB_STATE_IDLE;
2496 scrollBar.show (0); 2569 scrollBar.show (0);
2497 } 2570 }
2498 2571
2499#endif 2572 if (refresh)
2500 2573 {
2501 /* bgPixmap.apply () does not do the following : */
2502 scr_clear (); 2574 scr_clear ();
2503 scr_touch (true); 2575 scr_touch (true);
2576 }
2504 want_refresh = 1; 2577 want_refresh = 1;
2505} 2578}
2506 2579
2507/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2508void 2581void
… …
2576 { 2649 {
2577#if !ENABLE_MINIMAL 2650#if !ENABLE_MINIMAL
2578 if (selection.rect) 2651 if (selection.rect)
2579 scr_xor_rect (selection.beg.row, selection.beg.col, 2652 scr_xor_rect (selection.beg.row, selection.beg.col,
2580 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2581 RS_RVid, RS_RVid | RS_Uline); 2654 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2582 else 2655 else
2583#endif 2656#endif
2584 scr_xor_span (selection.beg.row, selection.beg.col, 2657 scr_xor_span (selection.beg.row, selection.beg.col,
2585 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2586 RS_RVid); 2659 RS_Sel | RS_RVid);
2587 } 2660 }
2588} 2661}
2589 2662
2590/* ------------------------------------------------------------------------- */ 2663/* ------------------------------------------------------------------------- */
2591/* 2664/*
… …
2594 */ 2667 */
2595#if 0 2668#if 0
2596void 2669void
2597rxvt_term::scr_dump (int fd) NOTHROW 2670rxvt_term::scr_dump (int fd) NOTHROW
2598{ 2671{
2599 int row, wrote; 2672 // if this method is needed, it can be implemented by factoring the
2600 unsigned int width, towrite; 2673 // relevant code in scr_printscreen
2601 char r1[] = "\n";
2602
2603 for (row = saveLines + top_row;
2604 row < saveLines + nrow - 1; row++)
2605 {
2606 width = row_buf[row].l >= 0 ? row_buf[row].l
2607 : ncol;
2608 for (towrite = width; towrite; towrite -= wrote)
2609 {
2610 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2611 towrite);
2612 if (wrote < 0)
2613 return; /* XXX: death, no report */
2614 }
2615 if (row_buf[row].l >= 0)
2616 if (write (fd, r1, 1) <= 0)
2617 return; /* XXX: death, no report */
2618 }
2619} 2674}
2620#endif 2675#endif
2621 2676
2622/* ------------------------------------------------------------------------- * 2677/* ------------------------------------------------------------------------- *
2623 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2624 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2625void 2680void
2626rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2627{ 2682{
2628 row_col_t pos;
2629
2630 if (!selection.op) 2683 if (!selection.op)
2631 return; 2684 return;
2632 2685
2633 pos.row = pos.col = 0;
2634 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2686 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2635 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2687 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2636 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2637 || (check_more == 1 2689 || (check_more == 1
2638 && current_screen == selection.screen 2690 && current_screen == selection.screen
2639 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2691 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2640 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2692 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2641 || (check_more == 2
2642 && ROWCOL_IS_BEFORE (selection.beg, pos)
2643 && ROWCOL_IS_AFTER (selection.end, pos))
2644 || (check_more == 3
2645 && ROWCOL_IS_AFTER (selection.end, pos))
2646 || (check_more == 4 /* screen width change */
2647 && (selection.beg.row != selection.end.row
2648 || selection.end.col > ncol)))
2649 CLEAR_SELECTION (); 2693 CLEAR_ALL_SELECTION ();
2650} 2694}
2651 2695
2652/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2653/* 2697/*
2654 * Paste a selection direct to the command fd 2698 * Paste a selection direct to the command fd
2655 */ 2699 */
2656void 2700void
2657rxvt_term::paste (char *data, unsigned int len) NOTHROW 2701rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2658{ 2702{
2659 /* convert normal newline chars into common keyboard Return key sequence */ 2703 /* convert normal newline chars into common keyboard Return key sequence */
2660 for (unsigned int i = 0; i < len; i++) 2704 for (unsigned int i = 0; i < len; i++)
2661 if (data[i] == C0_LF) 2705 if (data[i] == C0_LF)
2662 data[i] = C0_CR; 2706 data[i] = C0_CR;
2663 2707
2664 if (priv_modes & PrivMode_BracketPaste) 2708 if (priv_modes & PrivMode_BracketPaste)
2665 tt_printf ("\e[200~"); 2709 tt_printf ("\x1b[200~");
2666 2710
2667 tt_write (data, len); 2711 tt_write (data, len);
2668 2712
2669 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2670 tt_printf ("\e[201~"); 2714 tt_printf ("\x1b[201~");
2671} 2715}
2672 2716
2673/* ------------------------------------------------------------------------- */
2674/*
2675 * Respond to a notification that a primary selection has been sent
2676 * EXT: SelectionNotify
2677 */
2678void 2717void
2679rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2718rxvt_term::paste (char *data, unsigned int len) NOTHROW
2680{ 2719{
2681 if (prop == None) /* check for failed XConvertSelection */ 2720 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
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 (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 (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}
2839
2840void
2841rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2842{
2843 selection_wait = Sel_none;
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; 2721 return;
2856 2722
2857 selection_paste (win, prop, true); 2723 tt_paste (data, len);
2858} 2724}
2859 2725
2860/* ------------------------------------------------------------------------- */ 2726/* ------------------------------------------------------------------------- */
2861/* 2727/*
2862 * Request the current selection: 2728 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2863 * Order: > internal selection if available 2729 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2730 * 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 2731 * EXT: button 2 release
2869 */ 2732 */
2870void 2733void
2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2734rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2872{ 2735{
2873 if (selection.text && selnum == Sel_Primary) 2736 if (!selection_req)
2874 {
2875 /* internal selection */
2876 char *str = rxvt_wcstombs (selection.text, selection.len);
2877 paste (str, strlen (str));
2878 free (str);
2879 return;
2880 } 2737 {
2881 else 2738 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2739 selection_req->run ();
2882 { 2740 }
2883 selection_request_time = tm;
2884 selection_wait = Sel_normal;
2885
2886#if X_HAVE_UTF8_STRING
2887 selection_type = Sel_UTF8String;
2888 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2889 return;
2890#else
2891 selection_type = Sel_CompoundText;
2892 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2893 return;
2894#endif
2895 }
2896
2897 selection_wait = Sel_none; /* don't loop in selection_paste () */
2898 selection_paste (display->root, XA_CUT_BUFFER0, false);
2899}
2900
2901int
2902rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2903{
2904 Atom sel;
2905
2906 selection_type |= selnum;
2907
2908 if (selnum == Sel_Primary)
2909 sel = XA_PRIMARY;
2910 else if (selnum == Sel_Secondary)
2911 sel = XA_SECONDARY;
2912 else
2913 sel = xa[XA_CLIPBOARD];
2914
2915 if (XGetSelectionOwner (dpy, sel) != None)
2916 {
2917 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2918 vt, selection_request_time);
2919 return 1;
2920 }
2921
2922 return 0;
2923} 2741}
2924 2742
2925/* ------------------------------------------------------------------------- */ 2743/* ------------------------------------------------------------------------- */
2926/* 2744/*
2927 * Clear all selected text 2745 * Clear all selected text
2928 * EXT: SelectionClear 2746 * EXT: SelectionClear
2929 */ 2747 */
2930void 2748void
2931rxvt_term::selection_clear () NOTHROW 2749rxvt_term::selection_clear (bool clipboard) NOTHROW
2932{ 2750{
2751 if (!clipboard)
2752 {
2933 want_refresh = 1; 2753 want_refresh = 1;
2934 free (selection.text); 2754 free (selection.text);
2935 selection.text = NULL; 2755 selection.text = NULL;
2936 selection.len = 0; 2756 selection.len = 0;
2937 CLEAR_SELECTION (); 2757 CLEAR_SELECTION ();
2938 2758
2939 if (display->selection_owner == this) 2759 if (display->selection_owner == this)
2940 display->selection_owner = 0; 2760 display->selection_owner = 0;
2761 }
2762 else
2763 {
2764 free (selection.clip_text);
2765 selection.clip_text = NULL;
2766 selection.clip_len = 0;
2767
2768 if (display->clipboard_owner == this)
2769 display->clipboard_owner = 0;
2770 }
2941} 2771}
2942 2772
2943/* ------------------------------------------------------------------------- */ 2773/* ------------------------------------------------------------------------- */
2944/* 2774/*
2945 * Copy a selection into the cut buffer 2775 * Copy a selection into the cut buffer
2946 * EXT: button 1 or 3 release 2776 * EXT: button 1 or 3 release
2947 */ 2777 */
2948void 2778void
2949rxvt_term::selection_make (Time tm) 2779rxvt_term::selection_make (Time tm)
2950{ 2780{
2951 int i; 2781 int size;
2952 wchar_t *new_selection_text; 2782 wchar_t *new_selection_text;
2953 text_t *t; 2783 text_t *t;
2954 2784
2955 switch (selection.op) 2785 switch (selection.op)
2956 { 2786 {
… …
2972 return; /* nothing selected, go away */ 2802 return; /* nothing selected, go away */
2973 2803
2974 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2804 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2975 return; 2805 return;
2976 2806
2977 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2807 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2808 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2979 2809
2980 int ofs = 0; 2810 int ofs = 0;
2981 int extra = 0; 2811 int extra = 0;
2982 2812
2983 int col = selection.beg.col; 2813 int col = selection.beg.col;
… …
2989 { 2819 {
2990#if !ENABLE_MINIMAL 2820#if !ENABLE_MINIMAL
2991 if (selection.rect) 2821 if (selection.rect)
2992 { 2822 {
2993 col = selection.beg.col; 2823 col = selection.beg.col;
2994 end_col = ncol + 1; 2824 end_col = selection.end.col;
2995 } 2825 }
2996 else 2826 else
2997#endif 2827#endif
2998 end_col = ROW(row).l; 2828 end_col = ROW(row).l;
2999 2829
3000 col = max (col, 0); 2830 col = max (col, 0);
3001 2831
3002 if (row == selection.end.row 2832 if (row == selection.end.row)
3003#if !ENABLE_MINIMAL
3004 || selection.rect
3005#endif
3006 )
3007 min_it (end_col, selection.end.col); 2833 min_it (end_col, selection.end.col);
3008 2834
3009 t = ROW(row).t + col; 2835 t = ROW(row).t + col;
3010 2836
3011 for (; col < end_col; col++) 2837 for (; col < end_col; col++)
… …
3019 2845
3020 extra -= (len - 1); 2846 extra -= (len - 1);
3021 2847
3022 if (extra < 0) 2848 if (extra < 0)
3023 { 2849 {
3024 extra += i; 2850 extra += size;
3025 i += i; 2851 size += size;
3026 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2852 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3027 } 2853 }
3028 2854
3029 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2855 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3030 } 2856 }
3031#endif 2857#endif
… …
3043 2869
3044 new_selection_text[ofs++] = C0_LF; 2870 new_selection_text[ofs++] = C0_LF;
3045 } 2871 }
3046 else 2872 else
3047#endif 2873#endif
3048 if (!ROW(row).is_longer () && row != selection.end.row) 2874 if (!ROW(row).is_longer ()
2875 && (row != selection.end.row || end_col != selection.end.col)
2876 && (row != selection.beg.row || selection.beg.col < ncol))
3049 new_selection_text[ofs++] = C0_LF; 2877 new_selection_text[ofs++] = C0_LF;
3050 } 2878 }
3051
3052 if (end_col != selection.end.col)
3053 new_selection_text[ofs++] = C0_LF;
3054 2879
3055 new_selection_text[ofs] = 0; 2880 new_selection_text[ofs] = 0;
3056 2881
3057 if (ofs == 0) 2882 if (ofs == 0)
3058 { 2883 {
… …
3071 2896
3072 selection_grab (tm); 2897 selection_grab (tm);
3073} 2898}
3074 2899
3075bool 2900bool
3076rxvt_term::selection_grab (Time tm) NOTHROW 2901rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3077{ 2902{
2903 Atom sel;
2904
2905 if (!clipboard)
2906 {
3078 selection_time = tm; 2907 selection_time = tm;
2908 sel = XA_PRIMARY;
2909 }
2910 else
2911 {
2912 clipboard_time = tm;
2913 sel = xa[XA_CLIPBOARD];
2914 }
3079 2915
3080 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2916 XSetSelectionOwner (dpy, sel, vt, tm);
3081 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2917 if (XGetSelectionOwner (dpy, sel) == vt)
3082 { 2918 {
3083 display->set_selection_owner (this); 2919 display->set_selection_owner (this, clipboard);
3084 return true; 2920 return true;
3085 } 2921 }
3086 else 2922 else
3087 { 2923 {
3088 selection_clear (); 2924 selection_clear (clipboard);
3089 return false; 2925 return false;
3090 } 2926 }
3091 2927
3092#if 0 2928#if 0
3093 XTextProperty ct; 2929 XTextProperty ct;
… …
3553 * EXT: SelectionRequest 3389 * EXT: SelectionRequest
3554 */ 3390 */
3555void 3391void
3556rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3392rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3557{ 3393{
3394 Atom property = rq.property == None ? rq.target : rq.property;
3558 XSelectionEvent ev; 3395 XSelectionEvent ev;
3559 3396
3560 ev.type = SelectionNotify; 3397 ev.type = SelectionNotify;
3561 ev.property = None; 3398 ev.property = None;
3562 ev.display = rq.display; 3399 ev.display = rq.display;
… …
3577 *target++ = xa[XA_COMPOUND_TEXT]; 3414 *target++ = xa[XA_COMPOUND_TEXT];
3578#if X_HAVE_UTF8_STRING 3415#if X_HAVE_UTF8_STRING
3579 *target++ = xa[XA_UTF8_STRING]; 3416 *target++ = xa[XA_UTF8_STRING];
3580#endif 3417#endif
3581 3418
3582 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3419 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3583 32, PropModeReplace, 3420 32, PropModeReplace,
3584 (unsigned char *)target_list, target - target_list); 3421 (unsigned char *)target_list, target - target_list);
3585 ev.property = rq.property; 3422 ev.property = property;
3586 } 3423 }
3587#if TODO // TODO 3424#if TODO // TODO
3588 else if (rq.target == xa[XA_MULTIPLE]) 3425 else if (rq.target == xa[XA_MULTIPLE])
3589 { 3426 {
3590 /* TODO: Handle MULTIPLE */ 3427 /* TODO: Handle MULTIPLE */
3591 } 3428 }
3592#endif 3429#endif
3593 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3430 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3594 { 3431 {
3595 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3432 XChangeProperty (dpy, rq.requestor, property, rq.target,
3596 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3433 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3597 ev.property = rq.property; 3434 ev.property = property;
3435 }
3436 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3437 {
3438 XChangeProperty (dpy, rq.requestor, property, rq.target,
3439 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3440 ev.property = property;
3598 } 3441 }
3599 else if (rq.target == XA_STRING 3442 else if (rq.target == XA_STRING
3600 || rq.target == xa[XA_TEXT] 3443 || rq.target == xa[XA_TEXT]
3601 || rq.target == xa[XA_COMPOUND_TEXT] 3444 || rq.target == xa[XA_COMPOUND_TEXT]
3602 || rq.target == xa[XA_UTF8_STRING] 3445 || rq.target == xa[XA_UTF8_STRING]
… …
3634 { 3477 {
3635 target = xa[XA_COMPOUND_TEXT]; 3478 target = xa[XA_COMPOUND_TEXT];
3636 style = enc_compound_text; 3479 style = enc_compound_text;
3637 } 3480 }
3638 3481
3639 if (selection.text) 3482 if (rq.selection == XA_PRIMARY && selection.text)
3640 { 3483 {
3641 cl = selection.text; 3484 cl = selection.text;
3642 selectlen = selection.len; 3485 selectlen = selection.len;
3486 }
3487 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3488 {
3489 cl = selection.clip_text;
3490 selectlen = selection.clip_len;
3643 } 3491 }
3644 else 3492 else
3645 { 3493 {
3646 cl = L""; 3494 cl = L"";
3647 selectlen = 0; 3495 selectlen = 0;
… …
3668 ct.value = (unsigned char *)cl; 3516 ct.value = (unsigned char *)cl;
3669 ct.nitems = selectlen; 3517 ct.nitems = selectlen;
3670 ct.encoding = target; 3518 ct.encoding = target;
3671 } 3519 }
3672 3520
3673 XChangeProperty (dpy, rq.requestor, rq.property, 3521 XChangeProperty (dpy, rq.requestor, property,
3674 ct.encoding, 8, PropModeReplace, 3522 ct.encoding, 8, PropModeReplace,
3675 ct.value, (int)ct.nitems); 3523 ct.value, (int)ct.nitems);
3676 ev.property = rq.property; 3524 ev.property = property;
3677 3525
3678 if (freect) 3526 if (freect)
3679 XFree (ct.value); 3527 XFree (ct.value);
3680 } 3528 }
3681 3529
… …
3715 h += 2; min_it (h, nrow); 3563 h += 2; min_it (h, nrow);
3716 3564
3717 x -= 1; clamp_it (x, 0, ncol - w); 3565 x -= 1; clamp_it (x, 0, ncol - w);
3718 y -= 1; clamp_it (y, 0, nrow - h); 3566 y -= 1; clamp_it (y, 0, nrow - h);
3719 3567
3720 ov_x = x; ov_y = y; 3568 ov.x = x; ov.y = y;
3721 ov_w = w; ov_h = h; 3569 ov.w = w; ov.h = h;
3722 3570
3723 ov_text = new text_t *[h]; 3571 ov.text = new text_t *[h];
3724 ov_rend = new rend_t *[h]; 3572 ov.rend = new rend_t *[h];
3725 3573
3726 for (y = 0; y < h; y++) 3574 for (y = 0; y < h; y++)
3727 { 3575 {
3728 text_t *tp = ov_text[y] = new text_t[w]; 3576 text_t *tp = ov.text[y] = new text_t[w];
3729 rend_t *rp = ov_rend[y] = new rend_t[w]; 3577 rend_t *rp = ov.rend[y] = new rend_t[w];
3730 3578
3731 text_t t0, t1, t2; 3579 text_t t0, t1, t2;
3732 rend_t r = OVERLAY_RSTYLE; 3580 rend_t r = OVERLAY_RSTYLE;
3733 3581
3734 if (y == 0) 3582 if (y == 0)
… …
3753} 3601}
3754 3602
3755void 3603void
3756rxvt_term::scr_overlay_off () NOTHROW 3604rxvt_term::scr_overlay_off () NOTHROW
3757{ 3605{
3758 if (!ov_text) 3606 if (!ov.text)
3759 return; 3607 return;
3760 3608
3761 want_refresh = 1; 3609 want_refresh = 1;
3762 3610
3763 for (int y = 0; y < ov_h; y++) 3611 for (int y = 0; y < ov.h; y++)
3764 { 3612 {
3765 delete [] ov_text[y]; 3613 delete [] ov.text[y];
3766 delete [] ov_rend[y]; 3614 delete [] ov.rend[y];
3767 } 3615 }
3768 3616
3769 delete [] ov_text; ov_text = 0; 3617 delete [] ov.text; ov.text = 0;
3770 delete [] ov_rend; ov_rend = 0; 3618 delete [] ov.rend; ov.rend = 0;
3771} 3619}
3772 3620
3773void 3621void
3774rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3622rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3775{ 3623{
3776 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3624 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3777 return; 3625 return;
3778 3626
3779 x++, y++; 3627 x++, y++;
3780 3628
3781 ov_text[y][x] = text; 3629 ov.text[y][x] = text;
3782 ov_rend[y][x] = rend; 3630 ov.rend[y][x] = rend;
3783} 3631}
3784 3632
3785void 3633void
3786rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3634rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3787{ 3635{
… …
3806} 3654}
3807 3655
3808void 3656void
3809rxvt_term::scr_swap_overlay () NOTHROW 3657rxvt_term::scr_swap_overlay () NOTHROW
3810{ 3658{
3811 if (!ov_text) 3659 if (!ov.text)
3812 return; 3660 return;
3813 3661
3662 // hide cursor if it is within the overlay area
3663 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3664 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3665 screen.flags &= ~Screen_VisibleCursor;
3666
3814 // swap screen mem with overlay 3667 // swap screen mem with overlay
3815 for (int y = ov_h; y--; ) 3668 for (int y = ov.h; y--; )
3816 { 3669 {
3817 text_t *t1 = ov_text[y]; 3670 text_t *t1 = ov.text[y];
3818 rend_t *r1 = ov_rend[y]; 3671 rend_t *r1 = ov.rend[y];
3819 3672
3820 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3673 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3821 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3674 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3822 3675
3823 for (int x = ov_w; x--; ) 3676 for (int x = ov.w; x--; )
3824 { 3677 {
3825 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3678 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3826 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3679 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3827 } 3680 }
3828 } 3681 }

Diff Legend

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