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.306 by root, Sun Jun 15 10:15:39 2008 UTC vs.
Revision 1.396 by root, Wed Nov 2 10:53:12 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
83 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)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 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)
86 85
87/* 86/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 88 */
92#define CLEAR_ROWS(row, num) \
93 if (mapped) \
94 XClearArea (dpy, vt, 0, \
95 Row2Pixel (row), (unsigned int)width, \
96 (unsigned int)Height2Pixel (num), False)
97
98#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
99 if (mapped) \ 90 if (mapped) \
100 XClearArea (dpy, vt, x, y, \ 91 XClearArea (dpy, vt, x, y, \
101 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
102 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
103 94
104#define ERASE_ROWS(row, num) \
105 XFillRectangle (dpy, vt, gc, \
106 0, Row2Pixel (row), \
107 (unsigned int)width, \
108 (unsigned int)Height2Pixel (num))
109
110/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
111 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
112 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
113 98
114/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
… …
146 131
147 l.l = 0; 132 l.l = 0;
148 l.f = 0; 133 l.f = 0;
149} 134}
150 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
151/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
152 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
153 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
154 160
155void 161void
… …
157{ 163{
158#if ENABLE_OVERLAY 164#if ENABLE_OVERLAY
159 scr_overlay_off (); 165 scr_overlay_off ();
160#endif 166#endif
161 167
162 rvideo_mode = false;
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
169 if (nrow == 0) 174 if (nrow == 0)
170 nrow = 24; 175 nrow = 24;
171 176
172 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 178 return;
174
175 if (current_screen != PRIMARY)
176 scr_swap_screen ();
177 179
178 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
179 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
180 { 182 {
181 //TODO//FIXME 183 //TODO//FIXME
… …
201 term_start = 0; 203 term_start = 0;
202 204
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 207
206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 211
210 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
211 { 213 {
… …
234 selection.text = NULL; 236 selection.text = NULL;
235 selection.len = 0; 237 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
238 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
239 } 243 }
240 else 244 else
241 { 245 {
242 /* 246 /*
243 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
271 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);
272 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);
273 } 277 }
274 278
275 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
277 281
278 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
279 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
281 285
282 if (top_row) 286 if (top_row)
283 { 287 {
284 // 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
285 // 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
286 291
287 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 294
290 do 295 do
291 { 296 {
292 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
293#ifdef DEBUG_STRICT
294 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
295#endif
296 int plines = 1; 299 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 301
299 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 ())
300 { 303 {
… …
394 delete old_ta; 397 delete old_ta;
395 delete old_ra; 398 delete old_ra;
396 399
397 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
398 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
399 403
400 free (tabs); 404 free (tabs);
401 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
402 409
403 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
404 411
405 prev_nrow = nrow; 412 prev_nrow = nrow;
406 prev_ncol = ncol; 413 prev_ncol = ncol;
407
408 tabs = (char *)rxvt_malloc (ncol);
409
410 for (int col = ncol; --col; )
411 tabs [col] = col % TABSIZE == 0;
412
413 if (current_screen != PRIMARY)
414 scr_swap_screen ();
415 414
416 tt_winch (); 415 tt_winch ();
417 416
418 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
419} 418}
… …
431 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
432 431
433 free (row_buf); 432 free (row_buf);
434 free (swap_buf); 433 free (swap_buf);
435 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
436 free (tabs); 437 free (tabs);
437 438 tabs = 0;
438 row_buf = 0; // signal that we freed all the arrays
439 } 439 }
440} 440}
441 441
442/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
443/* 443/*
444 * Hard reset 444 * Hard/Soft reset
445 */ 445 */
446void 446void
447rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
448{ 448{
449 scr_release (); 449 scr_release ();
450 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
451 scr_reset (); 453 scr_reset ();
452 454
453 scr_clear (true); 455 scr_clear (true);
454 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);
455} 473}
456 474
457/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
458 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
459 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
497 } 515 }
498 516
499 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
500 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
501 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
502#ifdef DEBUG_STRICT
503 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
504 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
505#endif
506} 522}
507 523
508void 524void
509rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
510{ 526{
… …
535 want_refresh = 1; 551 want_refresh = 1;
536 view_start = 0; 552 view_start = 0;
537 553
538 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
539 555
540 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
541 557
542#if NSCREENS 558#if NSCREENS
543 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
544 { 560 {
545 num_scr = 0; 561 num_scr = 0;
… …
622 638
623 if (count > 0 639 if (count > 0
624 && row1 == 0 640 && row1 == 0
625 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
626 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
627 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
628
629 // scroll everything up 'count' lines
630 term_start = (term_start + count) % total_rows;
631 646
632 // sever bottommost line 647 // sever bottommost line
633 { 648 {
634 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
635 l.is_longer (0); 650 l.is_longer (0);
636 l.touch (); 651 l.touch ();
637 } 652 }
638 653
654 // scroll everything up 'count' lines
655 term_start = (term_start + count) % total_rows;
656
657 // now copy lines below the scroll region bottom to the
658 // bottom of the screen again, so they look as if they
659 // hadn't moved.
660 for (int i = nrow; --i > row2; )
661 {
662 line_t &l1 = ROW(i - count);
663 line_t &l2 = ROW(i);
664
665 ::swap (l1, l2);
666 l2.touch ();
667 }
668
639 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
640 for (int i = count; i--; ) 670 for (int i = count; i--; )
641 { 671 {
642 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
643 673
644 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
645 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
646 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 676 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
647 { 677 {
648 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
649 l.l = 0; 679 l.l = 0;
… …
651 } 681 }
652 else 682 else
653 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
654 } 684 }
655 685
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
668 // move and/or clear selection, if any 686 // move and/or clear selection, if any
669 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen)
670 { 688 {
671 selection.beg.row -= count; 689 selection.beg.row -= count;
672 selection.end.row -= count; 690 selection.end.row -= count;
673 selection.mark.row -= count; 691 selection.mark.row -= count;
674 692
675 if (selection.beg.row < top_row 693 selection_check (0);
676 || selection.end.row < top_row
677 || selection.mark.row < top_row)
678 {
679 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR;
681 }
682 } 694 }
683 695
684 // finally move the view window, if desired 696 // finally move the view window, if desired
685 if (option (Opt_scrollWithBuffer) 697 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 698 && view_start != 0
… …
716 } 728 }
717 729
718 // use a simple and robust scrolling algorithm, this 730 // use a simple and robust scrolling algorithm, this
719 // part of scr_scroll_text is not time-critical. 731 // part of scr_scroll_text is not time-critical.
720 732
733 // sever line above scroll region
734 if (row1)
735 {
736 line_t &l = ROW(row1 - 1);
737 l.is_longer (0);
738 l.touch ();
739 }
740
721 int rows = row2 - row1 + 1; 741 int rows = row2 - row1 + 1;
722 742
723 min_it (count, rows); 743 min_it (count, rows);
724 744
725 line_t *temp_buf = row_buf + total_rows; 745 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
726 746
727 for (int row = 0; row < rows; row++) 747 for (int row = 0; row < rows; row++)
728 { 748 {
729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 749 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
730 750
… …
732 scr_blank_screen_mem (temp_buf [row], rstyle); 752 scr_blank_screen_mem (temp_buf [row], rstyle);
733 } 753 }
734 754
735 for (int row = 0; row < rows; row++) 755 for (int row = 0; row < rows; row++)
736 ROW(row1 + row) = temp_buf [row]; 756 ROW(row1 + row) = temp_buf [row];
757
758 // sever bottommost line
759 {
760 line_t &l = ROW(row2);
761 l.is_longer (0);
762 l.touch ();
763 }
737 } 764 }
738 765
739 return count; 766 return count;
740} 767}
741 768
… …
770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 797 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771 screen.cur.row -= minlines; 798 screen.cur.row -= minlines;
772 } 799 }
773 } 800 }
774 801
775#ifdef DEBUG_STRICT
776 assert (screen.cur.col < ncol); 802 assert (screen.cur.col < ncol);
777 assert (screen.cur.row < nrow 803 assert (screen.cur.row < nrow
778 && screen.cur.row >= top_row); 804 && screen.cur.row >= top_row);
779#endif
780 int row = screen.cur.row; 805 int row = screen.cur.row;
781 806
782 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 807 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783 808
784 line_t *line = &ROW(row); 809 line_t *line = &ROW(row);
785 810
786 while (str < strend) 811 while (str < strend)
787 { 812 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 813 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 814
790 if (c < 0x20) 815 if (ecb_unlikely (c < 0x20))
791 if (c == C0_LF) 816 if (c == C0_LF)
792 { 817 {
793 max_it (line->l, screen.cur.col); 818 max_it (line->l, screen.cur.col);
794 819
795 screen.flags &= ~Screen_WrapNext; 820 screen.flags &= ~Screen_WrapNext;
… …
814 { 839 {
815 scr_tab (1, true); 840 scr_tab (1, true);
816 continue; 841 continue;
817 } 842 }
818 843
844 if (ecb_unlikely (
819 if (checksel /* see if we're writing within selection */ 845 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 846 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 847 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
848 ))
822 { 849 {
823 checksel = 0; 850 checksel = 0;
824 /* 851 /*
825 * If we wrote anywhere in the selected area, kill the selection 852 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 853 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 854 * should be a similar check.
828 */ 855 */
829 CLEAR_SELECTION (); 856 CLEAR_SELECTION ();
830 } 857 }
831 858
832 if (screen.flags & Screen_WrapNext) 859 if (ecb_unlikely (screen.flags & Screen_WrapNext))
833 { 860 {
834 scr_do_wrap (); 861 scr_do_wrap ();
835 862
836 line->l = ncol; 863 line->l = ncol;
837 line->is_longer (1); 864 line->is_longer (1);
… …
839 row = screen.cur.row; 866 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 867 line = &ROW(row); /* _must_ refresh */
841 } 868 }
842 869
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 870 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 871 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 872 c = 0xfffd;
846 873
847 // rely on wcwidth to tell us the character width, do wcwidth before 874 // rely on wcwidth to tell us the character width, do wcwidth before
848 // further replacements, as wcwidth might return -1 for the line 875 // further replacements, as wcwidth might return -1 for the line
849 // drawing characters below as they might be invalid in the current 876 // drawing characters below as they might be invalid in the current
850 // locale. 877 // locale.
851 int width = WCWIDTH (c); 878 int width = WCWIDTH (c);
852 879
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 880 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 881 {
855 // vt100 special graphics and line drawing 882 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 883 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 884 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 885 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 898 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 899 width = 1; // vt100 line drawing characters are always single-width
873 } 900 }
874 } 901 }
875 902
876 if (screen.flags & Screen_Insert) 903 if (ecb_unlikely (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 904 scr_insdel_chars (width, INSERT);
878 905
879 if (width != 0) 906 if (width != 0)
880 { 907 {
881#if !UNICODE_3 908#if !UNICODE_3
… …
886# else 913# else
887 c = 0xfffd; 914 c = 0xfffd;
888# endif 915# endif
889#endif 916#endif
890 917
918 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
919
920 // if the character doesn't fit into the remaining columns...
921 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
922 {
923 if (screen.flags & Screen_Autowrap)
924 {
925 // ... artificially enlargen the previous one
926 c = NOCHAR;
927 // and try the same character next loop iteration
928 --str;
929 }
930 else
931 screen.cur.col = ncol - width;
932 }
933
891 // nuke the character at this position, if required 934 // nuke the character at this position, if required
935 // due to wonderful coincidences everywhere else in this loop
936 // we never have to check for overwriting a wide char itself,
937 // only its tail.
892 if (line->t[screen.cur.col] == NOCHAR 938 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
893 || (screen.cur.col < ncol - 1 939 scr_kill_char (*line, screen.cur.col);
894 && line->t[screen.cur.col + 1] == NOCHAR))
895 {
896 int col = screen.cur.col;
897
898 // find begin
899 while (col > 0 && line->t[col] == NOCHAR)
900 col--;
901
902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904 // found begin, nuke
905 do {
906 line->t[col] = ' ';
907 line->r[col] = rend;
908 col++;
909 } while (col < ncol && line->t[col] == NOCHAR);
910 }
911
912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' ';
919 // and try the same character next loop iteration
920 --str;
921 }
922 940
923 line->touch (); 941 line->touch ();
924 942
925 do 943 do
926 { 944 {
927 line->t[screen.cur.col] = c; 945 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 946 line->r[screen.cur.col] = rend;
929 947
930 if (screen.cur.col < ncol - 1) 948 if (ecb_likely (screen.cur.col < ncol - 1))
931 screen.cur.col++; 949 screen.cur.col++;
932 else 950 else
933 { 951 {
934 line->l = ncol; 952 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 953 if (screen.flags & Screen_Autowrap)
936 screen.flags |= Screen_WrapNext; 954 screen.flags |= Screen_WrapNext;
937 break; 955
956 goto end_of_line;
938 } 957 }
939 958
940 c = NOCHAR; 959 c = NOCHAR;
941 } 960 }
942 while (--width > 0); 961 while (ecb_unlikely (--width > 0));
943 962
944 // pad with spaces when overwriting wide character with smaller one 963 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 964 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
946 { 965 {
947 line->touch (); 966 line->t[c] = ' ';
967 line->r[c] = rend;
968 }
948 969
949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 970end_of_line:
971 ;
972 }
973#if ENABLE_COMBINING
974 else // width == 0
975 {
976 if (c != 0xfeff) // ignore BOM
977 {
978 // handle combining characters
979 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet.
982 line_t *linep;
983 text_t *tp;
984 rend_t *rp;
985
986 if (screen.cur.col > 0)
950 { 987 {
951 line->t[c] = ' ';
952 line->r[c] = rend; 988 linep = line;
989 tp = line->t + screen.cur.col - 1;
990 rp = line->r + screen.cur.col - 1;
953 } 991 }
992 else if (screen.cur.row > 0
993 && ROW(screen.cur.row - 1).is_longer ())
994 {
995 linep = &ROW(screen.cur.row - 1);
996 tp = line->t + ncol - 1;
997 rp = line->r + ncol - 1;
998 }
999 else
1000 continue;
1001
1002 linep->touch ();
1003
1004 while (*tp == NOCHAR && tp > linep->t)
1005 tp--, rp--;
1006
1007 // first try to find a precomposed character
1008 unicode_t n = rxvt_compose (*tp, c);
1009 if (n == NOCHAR)
1010 n = rxvt_composite.compose (*tp, c);
1011
1012 *tp = n;
1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
954 } 1014 }
955 } 1015 }
956 else // width == 0
957 {
958#if ENABLE_COMBINING
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 {
969 linep = line;
970 tp = line->t + screen.cur.col - 1;
971 rp = line->r + screen.cur.col - 1;
972 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
995#endif 1016#endif
996 }
997 } 1017 }
998 1018
999 max_it (line->l, screen.cur.col); 1019 max_it (line->l, screen.cur.col);
1000 1020
1001#ifdef DEBUG_STRICT
1002 assert (screen.cur.row >= 0); 1021 assert (screen.cur.row >= 0);
1003#endif
1004} 1022}
1005 1023
1006/* ------------------------------------------------------------------------- */ 1024/* ------------------------------------------------------------------------- */
1007/* 1025/*
1008 * Process Backspace. Move back the cursor back a position, wrap if have to 1026 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1021 1039
1022 want_refresh = 1; 1040 want_refresh = 1;
1023#endif 1041#endif
1024 } 1042 }
1025 } 1043 }
1044 else if (screen.flags & Screen_WrapNext)
1045 screen.flags &= ~Screen_WrapNext;
1026 else 1046 else
1027 scr_gotorc (0, -1, RELATIVE); 1047 scr_gotorc (0, -1, RELATIVE);
1028} 1048}
1029 1049
1030/* ------------------------------------------------------------------------- */ 1050/* ------------------------------------------------------------------------- */
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1356 if (row >= nrow) /* Out Of Bounds */
1337 return; 1357 return;
1338 1358
1339 min_it (num, nrow - row); 1359 min_it (num, nrow - row);
1340 1360
1341 if (rstyle & (RS_RVid | RS_Uline)) 1361 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1362 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1363 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1364 {
1345 ren = DEFAULT_RSTYLE; 1365 ren = DEFAULT_RSTYLE;
1346 CLEAR_ROWS (row, num); 1366
1367 if (mapped)
1368 XClearArea (dpy, vt, 0,
1369 Row2Pixel (row - view_start), (unsigned int)width,
1370 (unsigned int)Height2Pixel (num), False);
1347 } 1371 }
1348 else 1372 else
1349 { 1373 {
1350 ren = rstyle & (RS_fgMask | RS_bgMask); 1374 ren = rstyle & (RS_fgMask | RS_bgMask);
1375
1376 if (mapped)
1377 {
1351 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1352 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1379 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1353 ERASE_ROWS (row, num); 1380 XFillRectangle (dpy, vt, gc,
1381 0, Row2Pixel (row - view_start),
1382 (unsigned int)width,
1383 (unsigned int)Height2Pixel (num));
1354 gcvalue.foreground = pix_colors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1386 }
1356 } 1387 }
1357 1388
1358 for (; num--; row++) 1389 for (; num--; row++)
1359 { 1390 {
1360 scr_blank_screen_mem (ROW(row), rstyle); 1391 scr_blank_screen_mem (ROW(row), rstyle);
1392
1393 if (row - view_start < nrow)
1361 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1394 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1362 } 1395 }
1363} 1396}
1364 1397
1365#if !ENABLE_MINIMAL 1398#if !ENABLE_MINIMAL
1366void 1399void
… …
1440 * Insert/Delete <count> characters from the current position 1473 * Insert/Delete <count> characters from the current position
1441 */ 1474 */
1442void 1475void
1443rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1476rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1444{ 1477{
1445 int col, row;
1446 rend_t tr;
1447
1448 want_refresh = 1; 1478 want_refresh = 1;
1449 ZERO_SCROLLBACK (); 1479 ZERO_SCROLLBACK ();
1450 1480
1451 if (count <= 0) 1481 if (count <= 0)
1452 return; 1482 return;
… …
1454 scr_do_wrap (); 1484 scr_do_wrap ();
1455 1485
1456 selection_check (1); 1486 selection_check (1);
1457 min_it (count, ncol - screen.cur.col); 1487 min_it (count, ncol - screen.cur.col);
1458 1488
1459 row = screen.cur.row; 1489 int row = screen.cur.row;
1460 1490
1461 line_t *line = &ROW(row); 1491 line_t *line = &ROW(row);
1462 1492
1463 line->touch (); 1493 line->touch ();
1464 line->is_longer (0); 1494 line->is_longer (0);
1465 1495
1496 // nuke wide spanning the start
1497 if (line->t[screen.cur.col] == NOCHAR)
1498 scr_kill_char (*line, screen.cur.col);
1499
1466 switch (insdel) 1500 switch (insdel)
1467 { 1501 {
1468 case INSERT: 1502 case INSERT:
1469 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1503 line->l = min (line->l + count, ncol);
1504
1505 if (line->t[screen.cur.col] == NOCHAR)
1506 scr_kill_char (*line, screen.cur.col);
1507
1508 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1470 { 1509 {
1471 line->t[col] = line->t[col - count]; 1510 line->t[col] = line->t[col - count];
1472 line->r[col] = line->r[col - count]; 1511 line->r[col] = line->r[col - count];
1473 } 1512 }
1474
1475 line->l = min (line->l + count, ncol);
1476 1513
1477 if (selection.op && current_screen == selection.screen 1514 if (selection.op && current_screen == selection.screen
1478 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1515 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1479 { 1516 {
1480 if (selection.end.row != screen.cur.row 1517 if (selection.end.row != screen.cur.row
… …
1495 case ERASE: 1532 case ERASE:
1496 screen.cur.col += count; /* don't worry if > ncol */ 1533 screen.cur.col += count; /* don't worry if > ncol */
1497 selection_check (1); 1534 selection_check (1);
1498 screen.cur.col -= count; 1535 screen.cur.col -= count;
1499 1536
1500 line->l = max (line->l - count, 0); 1537 // nuke wide char after the end
1538 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1539 scr_kill_char (*line, screen.cur.col + count);
1540
1501 scr_blank_line (*line, screen.cur.col, count, rstyle); 1541 scr_blank_line (*line, screen.cur.col, count, rstyle);
1502 break; 1542 break;
1503 1543
1504 case DELETE: 1544 case DELETE:
1505 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1545 line->l = max (line->l - count, 0);
1506 1546
1547 // nuke wide char spanning the end
1548 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1549 scr_kill_char (*line, screen.cur.col + count);
1550
1507 for (col = screen.cur.col; (col + count) < ncol; col++) 1551 for (int col = screen.cur.col; (col + count) < ncol; col++)
1508 { 1552 {
1509 line->t[col] = line->t[col + count]; 1553 line->t[col] = line->t[col + count];
1510 line->r[col] = line->r[col + count]; 1554 line->r[col] = line->r[col + count];
1511 } 1555 }
1512 1556
1513 line->l = max (line->l - count, 0);
1514 scr_blank_line (*line, ncol - count, count, tr); 1557 scr_blank_line (*line, ncol - count, count, rstyle);
1515 1558
1516 if (selection.op && current_screen == selection.screen 1559 if (selection.op && current_screen == selection.screen
1517 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1560 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1518 { 1561 {
1519 if (selection.end.row != screen.cur.row 1562 if (selection.end.row != screen.cur.row
… …
1655 { 1698 {
1656 rvideo_state = on; 1699 rvideo_state = on;
1657 1700
1658 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1701 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1659#ifdef HAVE_BG_PIXMAP 1702#ifdef HAVE_BG_PIXMAP
1660 if (bgPixmap.pixmap == None) 1703 if (bg_pixmap == None)
1661#endif 1704#endif
1662 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1705 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1663 1706
1664 XGCValues gcvalue; 1707 XGCValues gcvalue;
1665 gcvalue.foreground = pix_colors[Color_fg]; 1708 gcvalue.foreground = pix_colors[Color_fg];
… …
1809 for (i = PART_BEG; i < RC_COUNT; i++) 1852 for (i = PART_BEG; i < RC_COUNT; i++)
1810 { 1853 {
1811 min_it (rc[i].col, ncol - 1); 1854 min_it (rc[i].col, ncol - 1);
1812 min_it (rc[i].row, nrow - 1); 1855 min_it (rc[i].row, nrow - 1);
1813 } 1856 }
1814// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1857
1815 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1858 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1816 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1859 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1817 1860
1818 num_scr_allow = 0; 1861 num_scr_allow = 0;
1819 1862
… …
1892 1935
1893# ifndef NO_MAPALERT 1936# ifndef NO_MAPALERT
1894# ifdef MAPALERT_OPTION 1937# ifdef MAPALERT_OPTION
1895 if (option (Opt_mapAlert)) 1938 if (option (Opt_mapAlert))
1896# endif 1939# endif
1897 XMapWindow (dpy, parent[0]); 1940 XMapWindow (dpy, parent);
1898# endif 1941# endif
1899 1942
1900# if ENABLE_FRILLS 1943# if ENABLE_FRILLS
1901 if (option (Opt_urgentOnBell)) 1944 if (option (Opt_urgentOnBell))
1902 { 1945 set_urgency (1);
1903 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1904 {
1905 h->flags |= XUrgencyHint;
1906 XSetWMHints (dpy, parent[0], h);
1907 }
1908 }
1909# endif 1946# endif
1910 1947
1911 if (option (Opt_visualBell)) 1948 if (option (Opt_visualBell))
1912 { 1949 {
1913 rvideo_bell = true; 1950 rvideo_bell = true;
… …
1916 1953
1917 bell_ev.start (VISUAL_BELL_DURATION); 1954 bell_ev.start (VISUAL_BELL_DURATION);
1918 } 1955 }
1919 else 1956 else
1920 XBell (dpy, 0); 1957 XBell (dpy, 0);
1958 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1921#endif 1959#endif
1922} 1960}
1923 1961
1924/* ------------------------------------------------------------------------- */ 1962/* ------------------------------------------------------------------------- */
1925/* ARGSUSED */
1926void 1963void
1927rxvt_term::scr_printscreen (int fullhist) NOTHROW 1964rxvt_term::scr_printscreen (int fullhist) NOTHROW
1928{ 1965{
1929#ifdef PRINTPIPE 1966#ifdef PRINTPIPE
1930 int nrows, row_start; 1967 int nrows, row_start;
1931 FILE *fd; 1968 FILE *fd = popen_printer ();
1932 1969
1933 if ((fd = popen_printer ()) == NULL) 1970 if (!fd)
1934 return; 1971 return;
1935 1972
1936 if (fullhist) 1973 if (fullhist)
1937 { 1974 {
1938 nrows = nrow - top_row; 1975 nrows = nrow - top_row;
… …
1944 row_start = view_start; 1981 row_start = view_start;
1945 } 1982 }
1946 1983
1947 wctomb (0, 0); 1984 wctomb (0, 0);
1948 1985
1949 for (int r1 = 0; r1 < nrows; r1++) 1986 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1950 { 1987 {
1951 text_t *tp = ROW(r1).t; 1988 text_t *tp = ROW(r1).t;
1952 int len = ROW(r1).l; 1989 int len = ROW(r1).l;
1953 1990
1954 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1991 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1983 * screen.text/screen.rend contain what the screen will change to. 2020 * screen.text/screen.rend contain what the screen will change to.
1984 */ 2021 */
1985void 2022void
1986rxvt_term::scr_refresh () NOTHROW 2023rxvt_term::scr_refresh () NOTHROW
1987{ 2024{
1988 unsigned char have_bg,
1989 showcursor; /* show the cursor */
1990 int16_t col, row, /* column/row we're processing */ 2025 int16_t col, row, /* column/row we're processing */
1991 ocrow; /* old cursor row */ 2026 ocrow; /* old cursor row */
1992 int i; /* tmp */ 2027 int i; /* tmp */
1993#ifndef NO_CURSORCOLOR 2028#ifndef NO_CURSORCOLOR
1994 rend_t cc1; /* store colours at cursor position (s) */ 2029 rend_t cc1; /* store colours at cursor position (s) */
… …
2005 /* 2040 /*
2006 * A: set up vars 2041 * A: set up vars
2007 */ 2042 */
2008 refresh_count = 0; 2043 refresh_count = 0;
2009 2044
2045 unsigned int old_screen_flags = screen.flags;
2010 have_bg = 0; 2046 char have_bg = 0;
2011#ifdef HAVE_BG_PIXMAP 2047#ifdef HAVE_BG_PIXMAP
2012 have_bg = bgPixmap.pixmap != None; 2048 have_bg = bg_pixmap != None;
2013#endif 2049#endif
2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2050 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2015 2051
2016 /* 2052 /*
2017 * B: reverse any characters which are selected 2053 * B: reverse any characters which are selected
2018 */ 2054 */
2019 scr_reverse_selection (); 2055 scr_reverse_selection ();
2056
2057 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2058#if ENABLE_OVERLAY
2059 scr_swap_overlay ();
2060#endif
2061
2062 char showcursor = screen.flags & Screen_VisibleCursor;
2020 2063
2021 /* 2064 /*
2022 * C: set the cursor character (s) 2065 * C: set the cursor character (s)
2023 */ 2066 */
2024 { 2067 {
2025 unsigned char setoldcursor; 2068 unsigned char setoldcursor;
2026 2069
2027 showcursor = (screen.flags & Screen_VisibleCursor);
2028#ifdef CURSOR_BLINK 2070#ifdef CURSOR_BLINK
2029 if (hidden_cursor) 2071 if (hidden_cursor)
2030 showcursor = 0; 2072 showcursor = 0;
2031#endif 2073#endif
2032 2074
… …
2060 ccol2 = bgcolor_of (rstyle); 2102 ccol2 = bgcolor_of (rstyle);
2061#else 2103#else
2062 ccol2 = Color_bg; 2104 ccol2 = Color_bg;
2063#endif 2105#endif
2064 2106
2065 if (showcursor && focus) 2107 if (focus)
2066 { 2108 {
2067 if (option (Opt_cursorUnderline)) 2109 if (option (Opt_cursorUnderline))
2068 *crp ^= RS_Uline; 2110 *crp ^= RS_Uline;
2069 else 2111 else
2070 { 2112 {
… …
2105 oldcursor.col = screen.cur.col; 2147 oldcursor.col = screen.cur.col;
2106 } 2148 }
2107 } 2149 }
2108 } 2150 }
2109 2151
2110 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2111#if ENABLE_OVERLAY
2112 scr_swap_overlay ();
2113#endif
2114
2115#ifndef NO_SLOW_LINK_SUPPORT 2152#ifndef NO_SLOW_LINK_SUPPORT
2116 /* 2153 /*
2117 * D: CopyArea pass - very useful for slower links 2154 * D: CopyArea pass - very useful for slower links
2118 * This has been deliberately kept simple. 2155 * This has been deliberately kept simple.
2119 */ 2156 */
… …
2208 continue; 2245 continue;
2209 2246
2210 // redraw one or more characters 2247 // redraw one or more characters
2211 2248
2212 // seek to the beginning of wide characters 2249 // seek to the beginning of wide characters
2213 while (stp[col] == NOCHAR && col > 0) 2250 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2214 --col; 2251 --col;
2215 2252
2216 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2253 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2217 text_t *text = stp + col; 2254 text_t *text = stp + col;
2218 int count = 1; 2255 int count = 1;
2219 2256
2220 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2221 drp[col] = rend; 2258 drp[col] = rend;
… …
2225 for (i = 0; ++col < ncol; ) 2262 for (i = 0; ++col < ncol; )
2226 { 2263 {
2227 if (stp[col] == NOCHAR) 2264 if (stp[col] == NOCHAR)
2228 { 2265 {
2229 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2230 drp[col] = rend; 2267 drp[col] = srp[col];
2268
2231 count++; 2269 count++;
2232 i++; 2270 i++;
2233 2271
2234 continue; 2272 continue;
2235 } 2273 }
… …
2255 2293
2256 col--; /* went one too far. move back */ 2294 col--; /* went one too far. move back */
2257 count -= i; /* dump any matching trailing chars */ 2295 count -= i; /* dump any matching trailing chars */
2258 2296
2259 // sometimes we optimize away the trailing NOCHAR's, add them back 2297 // sometimes we optimize away the trailing NOCHAR's, add them back
2260 while (i && text[count] == NOCHAR) 2298 while (ecb_unlikely (i && text[count] == NOCHAR))
2261 count++, i--; 2299 count++, i--;
2262 2300
2263 /* 2301 /*
2264 * Determine the attributes for the string 2302 * Determine the attributes for the string
2265 */ 2303 */
2266 int fore = fgcolor_of (rend); // desired foreground 2304 int fore = fgcolor_of (rend); // desired foreground
2267 int back = bgcolor_of (rend); // desired background 2305 int back = bgcolor_of (rend); // desired background
2268 2306
2269 // only do special processing if any attributes are set, which is unlikely 2307 // only do special processing if any attributes are set, which is unlikely
2270 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2308 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2271 { 2309 {
2272 bool invert = rend & RS_RVid; 2310 bool invert = rend & RS_RVid;
2273 2311
2274#ifndef NO_BOLD_UNDERLINE_REVERSE 2312#ifndef NO_BOLD_UNDERLINE_REVERSE
2275 if (rend & RS_Bold && fore == Color_fg) 2313 if (rend & RS_Bold && fore == Color_fg)
… …
2294 2332
2295 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2333 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2296 fore = Color_UL; 2334 fore = Color_UL;
2297#endif 2335#endif
2298 2336
2337#ifdef OPTION_HC
2338 if (rend & RS_Sel)
2339 {
2340 /* invert the column if no highlightColor is set or it is the
2341 * current cursor column */
2342 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2343 && ISSET_PIXCOLOR (Color_HC))
2344 {
2345 if (ISSET_PIXCOLOR (Color_HTC))
2346 fore = Color_HTC;
2347 // if invert is 0 reverse video is set so we use bg color as fg color
2348 else if (!invert)
2349 fore = back;
2350
2351 back = Color_HC;
2352 invert = 0;
2353 }
2354 }
2355#endif
2356
2299 if (invert) 2357 if (invert)
2300 { 2358 {
2301#ifdef OPTION_HC
2302 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2303 || !ISSET_PIXCOLOR (Color_HC))
2304#endif
2305 /* invert the column if no highlightColor is set or it is the
2306 * current cursor column */
2307 ::swap (fore, back); 2359 ::swap (fore, back);
2308#ifdef OPTION_HC
2309 else if (ISSET_PIXCOLOR (Color_HC))
2310 back = Color_HC;
2311#endif
2312 2360
2313#ifndef NO_BOLD_UNDERLINE_REVERSE 2361#ifndef NO_BOLD_UNDERLINE_REVERSE
2314# ifndef OPTION_HC
2315 if (ISSET_PIXCOLOR (Color_RV))
2316 back = Color_RV;
2317# endif
2318 if (fore == back) 2362 if (fore == back)
2319 { 2363 {
2320 fore = Color_bg; 2364 fore = Color_bg;
2321 back = Color_fg; 2365 back = Color_fg;
2322 } 2366 }
… …
2358 /* 2402 /*
2359 * Actually do the drawing of the string here 2403 * Actually do the drawing of the string here
2360 */ 2404 */
2361 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2405 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2362 2406
2363 if (have_bg && back == Color_bg) 2407 if (ecb_likely (have_bg && back == Color_bg))
2364 { 2408 {
2365 // this is very ugly, maybe push it into ->draw? 2409 // this is very ugly, maybe push it into ->draw?
2366 2410
2367 for (i = 0; i < count; i++) /* don't draw empty strings */ 2411 for (i = 0; i < count; i++) /* don't draw empty strings */
2368 if (text[i] != ' ') 2412 if (text[i] != ' ')
… …
2375 did_clear: ; 2419 did_clear: ;
2376 } 2420 }
2377 else 2421 else
2378 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2422 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2379 2423
2380 if (rend & RS_Uline && font->descent > 1 && fore != back) 2424 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2381 { 2425 {
2382#if ENABLE_FRILLS 2426#if ENABLE_FRILLS
2383 if (ISSET_PIXCOLOR (Color_underline)) 2427 if (ISSET_PIXCOLOR (Color_underline))
2384 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2428 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2385 else 2429 else
… …
2390 xpixel, ypixel + font->ascent + 1, 2434 xpixel, ypixel + font->ascent + 1,
2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2435 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2392 } 2436 }
2393 } /* for (col....) */ 2437 } /* for (col....) */
2394 } /* for (row....) */ 2438 } /* for (row....) */
2395
2396#if ENABLE_OVERLAY
2397 scr_swap_overlay ();
2398#endif
2399 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2400 2439
2401 /* 2440 /*
2402 * G: cleanup cursor and display outline cursor if necessary 2441 * G: cleanup cursor and display outline cursor if necessary
2403 */ 2442 */
2404 if (showcursor) 2443 if (showcursor)
… …
2443 } 2482 }
2444 2483
2445 /* 2484 /*
2446 * H: cleanup selection 2485 * H: cleanup selection
2447 */ 2486 */
2487#if ENABLE_OVERLAY
2488 scr_swap_overlay ();
2489#endif
2490 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2491
2448 scr_reverse_selection (); 2492 scr_reverse_selection ();
2449 2493
2494 screen.flags = old_screen_flags;
2450 num_scr = 0; 2495 num_scr = 0;
2451 num_scr_allow = 1; 2496 num_scr_allow = 1;
2452} 2497}
2453 2498
2454void 2499void
… …
2475 scr_remap_chars (swap_buf [i]); 2520 scr_remap_chars (swap_buf [i]);
2476 } 2521 }
2477} 2522}
2478 2523
2479void 2524void
2480rxvt_term::scr_recolour () NOTHROW 2525rxvt_term::scr_recolour (bool refresh) NOTHROW
2481{ 2526{
2527 bool transparent = false;
2528
2482#ifdef HAVE_BG_PIXMAP 2529#ifdef HAVE_BG_PIXMAP
2483 bgPixmap.apply (); 2530 if (bg_pixmap != None)
2484#else 2531 {
2532# ifdef ENABLE_TRANSPARENCY
2533 if (bg_flags & BG_IS_TRANSPARENT)
2534 {
2535 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2536 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2485 2537
2538 transparent = true;
2539 }
2540 else
2541# endif
2542 {
2543 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2544 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2545 }
2546 }
2547 else
2548#endif
2549 {
2486 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2487 XClearWindow (dpy, parent[0]);
2488 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2551 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2552 }
2553
2554 XClearWindow (dpy, parent);
2489 2555
2490 if (scrollBar.win) 2556 if (scrollBar.win)
2491 { 2557 {
2558 if (transparent)
2559 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2560 else
2492 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2493 scrollBar.state = STATE_IDLE; 2562 scrollBar.state = SB_STATE_IDLE;
2494 scrollBar.show (0); 2563 scrollBar.show (0);
2495 } 2564 }
2496 2565
2497#endif 2566 if (refresh)
2498 2567 {
2499 /* bgPixmap.apply () does not do the following : */
2500 scr_clear (); 2568 scr_clear ();
2501 scr_touch (true); 2569 scr_touch (true);
2570 }
2502 want_refresh = 1; 2571 want_refresh = 1;
2503} 2572}
2504 2573
2505/* ------------------------------------------------------------------------- */ 2574/* ------------------------------------------------------------------------- */
2506void 2575void
… …
2574 { 2643 {
2575#if !ENABLE_MINIMAL 2644#if !ENABLE_MINIMAL
2576 if (selection.rect) 2645 if (selection.rect)
2577 scr_xor_rect (selection.beg.row, selection.beg.col, 2646 scr_xor_rect (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2647 selection.end.row, selection.end.col,
2579 RS_RVid, RS_RVid | RS_Uline); 2648 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2580 else 2649 else
2581#endif 2650#endif
2582 scr_xor_span (selection.beg.row, selection.beg.col, 2651 scr_xor_span (selection.beg.row, selection.beg.col,
2583 selection.end.row, selection.end.col, 2652 selection.end.row, selection.end.col,
2584 RS_RVid); 2653 RS_Sel | RS_RVid);
2585 } 2654 }
2586} 2655}
2587 2656
2588/* ------------------------------------------------------------------------- */ 2657/* ------------------------------------------------------------------------- */
2589/* 2658/*
… …
2594void 2663void
2595rxvt_term::scr_dump (int fd) NOTHROW 2664rxvt_term::scr_dump (int fd) NOTHROW
2596{ 2665{
2597 int row, wrote; 2666 int row, wrote;
2598 unsigned int width, towrite; 2667 unsigned int width, towrite;
2599 char r1[] = "\n"; 2668 const char r1[] = "\n";
2600 2669
2601 for (row = saveLines + top_row; 2670 for (row = saveLines + top_row;
2602 row < saveLines + nrow - 1; row++) 2671 row < saveLines + nrow - 1; row++)
2603 { 2672 {
2604 width = row_buf[row].l >= 0 ? row_buf[row].l 2673 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2642 || (check_more == 3 2711 || (check_more == 3
2643 && ROWCOL_IS_AFTER (selection.end, pos)) 2712 && ROWCOL_IS_AFTER (selection.end, pos))
2644 || (check_more == 4 /* screen width change */ 2713 || (check_more == 4 /* screen width change */
2645 && (selection.beg.row != selection.end.row 2714 && (selection.beg.row != selection.end.row
2646 || selection.end.col > ncol))) 2715 || selection.end.col > ncol)))
2647 CLEAR_SELECTION (); 2716 CLEAR_ALL_SELECTION ();
2648} 2717}
2649 2718
2650/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2651/* 2720/*
2652 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
2653 */ 2722 */
2654void 2723void
2655rxvt_term::paste (char *data, unsigned int len) NOTHROW 2724rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2656{ 2725{
2657 /* convert normal newline chars into common keyboard Return key sequence */ 2726 /* convert normal newline chars into common keyboard Return key sequence */
2658 for (unsigned int i = 0; i < len; i++) 2727 for (unsigned int i = 0; i < len; i++)
2659 if (data[i] == C0_LF) 2728 if (data[i] == C0_LF)
2660 data[i] = C0_CR; 2729 data[i] = C0_CR;
… …
2666 2735
2667 if (priv_modes & PrivMode_BracketPaste) 2736 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~"); 2737 tt_printf ("\e[201~");
2669} 2738}
2670 2739
2671/* ------------------------------------------------------------------------- */
2672/*
2673 * Respond to a notification that a primary selection has been sent
2674 * EXT: SelectionNotify
2675 */
2676void 2740void
2677rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::paste (char *data, unsigned int len) NOTHROW
2678{ 2742{
2679 if (prop == None) /* check for failed XConvertSelection */ 2743 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2680 {
2681 if ((selection_type & Sel_CompoundText))
2682 {
2683 int selnum = selection_type & Sel_whereMask;
2684
2685 selection_type = 0;
2686 if (selnum != Sel_direct)
2687 selection_request_other (XA_STRING, selnum);
2688 }
2689
2690 if ((selection_type & Sel_UTF8String))
2691 {
2692 int selnum = selection_type & Sel_whereMask;
2693
2694 selection_type = Sel_CompoundText;
2695 if (selnum != Sel_direct)
2696 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2697 else
2698 selection_type = 0;
2699 }
2700
2701 return;
2702 }
2703
2704 unsigned long bytes_after;
2705 XTextProperty ct;
2706
2707 if (XGetWindowProperty (dpy, win, prop,
2708 0, PROP_SIZE / 4,
2709 delete_prop, AnyPropertyType,
2710 &ct.encoding, &ct.format,
2711 &ct.nitems, &bytes_after,
2712 &ct.value) != Success)
2713 {
2714 ct.value = 0;
2715 goto bailout;
2716 }
2717
2718 if (ct.encoding == None)
2719 goto bailout;
2720
2721 if (bytes_after)
2722 {
2723 // fetch and append remaining data
2724 XTextProperty ct2;
2725
2726 if (XGetWindowProperty (dpy, win, prop,
2727 ct.nitems / 4, (bytes_after + 3) / 4,
2728 delete_prop, AnyPropertyType,
2729 &ct2.encoding, &ct2.format,
2730 &ct2.nitems, &bytes_after,
2731 &ct2.value) != Success)
2732 goto bailout;
2733
2734 // realloc should be compatible to XFree, here, and elsewhere, too
2735 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2736 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2737 ct.nitems += ct2.nitems;
2738
2739 XFree (ct2.value);
2740 }
2741
2742 if (ct.value == 0)
2743 goto bailout;
2744
2745 if (ct.encoding == xa[XA_INCR])
2746 {
2747 // INCR selection, start handshake
2748 if (!delete_prop)
2749 XDeleteProperty (dpy, win, prop);
2750
2751 selection_wait = Sel_incr;
2752 incr_buf_fill = 0;
2753 incr_ev.start (10);
2754
2755 goto bailout;
2756 }
2757
2758 if (ct.nitems == 0)
2759 {
2760 if (selection_wait == Sel_incr)
2761 {
2762 XFree (ct.value);
2763
2764 // finally complete, now paste the whole thing
2765 selection_wait = Sel_normal;
2766 ct.value = (unsigned char *)incr_buf;
2767 ct.nitems = incr_buf_fill;
2768 incr_buf = 0;
2769 incr_buf_size = 0;
2770 incr_ev.stop ();
2771 }
2772 else
2773 {
2774 if (selection_wait == Sel_normal
2775 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2776 {
2777 /*
2778 * pass through again trying CUT_BUFFER0 if we've come from
2779 * XConvertSelection () but nothing was presented
2780 */
2781 selection_paste (display->root, XA_CUT_BUFFER0, False);
2782 }
2783
2784 goto bailout;
2785 }
2786 }
2787 else if (selection_wait == Sel_incr)
2788 {
2789 incr_ev.start (10);
2790
2791 while (incr_buf_fill + ct.nitems > incr_buf_size)
2792 {
2793 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2794 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2795 }
2796
2797 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2798 incr_buf_fill += ct.nitems;
2799
2800 goto bailout;
2801 }
2802
2803 char **cl;
2804 int cr;
2805
2806#if !ENABLE_MINIMAL
2807 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2808 // so recode it manually
2809 if (ct.encoding == xa[XA_UTF8_STRING])
2810 {
2811 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2812 char *s = rxvt_wcstombs (w);
2813 free (w);
2814 // TODO: strlen == only the first element will be converted. well...
2815 paste (s, strlen (s));
2816 free (s);
2817 }
2818 else
2819#endif
2820 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2821 && cl)
2822 {
2823 for (int i = 0; i < cr; i++)
2824 paste (cl[i], strlen (cl[i]));
2825
2826 XFreeStringList (cl);
2827 }
2828 else
2829 paste ((char *)ct.value, ct.nitems); // paste raw
2830
2831bailout:
2832 XFree (ct.value);
2833
2834 if (selection_wait == Sel_normal)
2835 selection_wait = Sel_none;
2836}
2837
2838void
2839rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2840{
2841 selection_wait = Sel_none;
2842
2843 incr_buf_size = 0;
2844 free (incr_buf);
2845
2846 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2847}
2848
2849void
2850rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2851{
2852 if (prop == None || selection_wait != Sel_incr)
2853 return; 2744 return;
2854 2745
2855 selection_paste (win, prop, true); 2746 tt_paste (data, len);
2856} 2747}
2857 2748
2858/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2859/* 2750/*
2860 * Request the current selection: 2751 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2861 * Order: > internal selection if available 2752 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2862 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2753 * as fallback
2863 * > CUT_BUFFER0
2864 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2865 * will auto fallback to CUT_BUFFER0
2866 * EXT: button 2 release 2754 * EXT: button 2 release
2867 */ 2755 */
2868void 2756void
2869rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2757rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2870{ 2758{
2871 if (selection.text && selnum == Sel_Primary) 2759 if (!selection_req)
2872 {
2873 /* internal selection */
2874 char *str = rxvt_wcstombs (selection.text, selection.len);
2875 paste (str, strlen (str));
2876 free (str);
2877 return;
2878 } 2760 {
2879 else 2761 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2762 selection_req->run ();
2880 { 2763 }
2881 selection_request_time = tm;
2882 selection_wait = Sel_normal;
2883
2884#if X_HAVE_UTF8_STRING
2885 selection_type = Sel_UTF8String;
2886 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2887 return;
2888#else
2889 selection_type = Sel_CompoundText;
2890 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2891 return;
2892#endif
2893 }
2894
2895 selection_wait = Sel_none; /* don't loop in selection_paste () */
2896 selection_paste (display->root, XA_CUT_BUFFER0, false);
2897}
2898
2899int
2900rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2901{
2902 Atom sel;
2903
2904 selection_type |= selnum;
2905
2906 if (selnum == Sel_Primary)
2907 sel = XA_PRIMARY;
2908 else if (selnum == Sel_Secondary)
2909 sel = XA_SECONDARY;
2910 else
2911 sel = xa[XA_CLIPBOARD];
2912
2913 if (XGetSelectionOwner (dpy, sel) != None)
2914 {
2915 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2916 vt, selection_request_time);
2917 return 1;
2918 }
2919
2920 return 0;
2921} 2764}
2922 2765
2923/* ------------------------------------------------------------------------- */ 2766/* ------------------------------------------------------------------------- */
2924/* 2767/*
2925 * Clear all selected text 2768 * Clear all selected text
2926 * EXT: SelectionClear 2769 * EXT: SelectionClear
2927 */ 2770 */
2928void 2771void
2929rxvt_term::selection_clear () NOTHROW 2772rxvt_term::selection_clear (bool clipboard) NOTHROW
2930{ 2773{
2774 if (!clipboard)
2775 {
2931 want_refresh = 1; 2776 want_refresh = 1;
2932 free (selection.text); 2777 free (selection.text);
2933 selection.text = NULL; 2778 selection.text = NULL;
2934 selection.len = 0; 2779 selection.len = 0;
2935 CLEAR_SELECTION (); 2780 CLEAR_SELECTION ();
2936 2781
2937 if (display->selection_owner == this) 2782 if (display->selection_owner == this)
2938 display->selection_owner = 0; 2783 display->selection_owner = 0;
2784 }
2785 else
2786 {
2787 free (selection.clip_text);
2788 selection.clip_text = NULL;
2789 selection.clip_len = 0;
2790
2791 if (display->clipboard_owner == this)
2792 display->clipboard_owner = 0;
2793 }
2939} 2794}
2940 2795
2941/* ------------------------------------------------------------------------- */ 2796/* ------------------------------------------------------------------------- */
2942/* 2797/*
2943 * Copy a selection into the cut buffer 2798 * Copy a selection into the cut buffer
2944 * EXT: button 1 or 3 release 2799 * EXT: button 1 or 3 release
2945 */ 2800 */
2946void 2801void
2947rxvt_term::selection_make (Time tm) 2802rxvt_term::selection_make (Time tm)
2948{ 2803{
2949 int i; 2804 int size;
2950 wchar_t *new_selection_text; 2805 wchar_t *new_selection_text;
2951 text_t *t; 2806 text_t *t;
2952 2807
2953 switch (selection.op) 2808 switch (selection.op)
2954 { 2809 {
… …
2970 return; /* nothing selected, go away */ 2825 return; /* nothing selected, go away */
2971 2826
2972 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2827 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2973 return; 2828 return;
2974 2829
2975 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2830 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2976 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2831 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2977 2832
2978 int ofs = 0; 2833 int ofs = 0;
2979 int extra = 0; 2834 int extra = 0;
2980 2835
2981 int col = selection.beg.col; 2836 int col = selection.beg.col;
… …
2987 { 2842 {
2988#if !ENABLE_MINIMAL 2843#if !ENABLE_MINIMAL
2989 if (selection.rect) 2844 if (selection.rect)
2990 { 2845 {
2991 col = selection.beg.col; 2846 col = selection.beg.col;
2992 end_col = ncol + 1; 2847 end_col = selection.end.col;
2993 } 2848 }
2994 else 2849 else
2995#endif 2850#endif
2996 end_col = ROW(row).l; 2851 end_col = ROW(row).l;
2997 2852
2998 col = max (col, 0); 2853 col = max (col, 0);
2999 2854
3000 if (row == selection.end.row 2855 if (row == selection.end.row)
3001#if !ENABLE_MINIMAL
3002 || selection.rect
3003#endif
3004 )
3005 min_it (end_col, selection.end.col); 2856 min_it (end_col, selection.end.col);
3006 2857
3007 t = ROW(row).t + col; 2858 t = ROW(row).t + col;
3008 2859
3009 for (; col < end_col; col++) 2860 for (; col < end_col; col++)
… …
3017 2868
3018 extra -= (len - 1); 2869 extra -= (len - 1);
3019 2870
3020 if (extra < 0) 2871 if (extra < 0)
3021 { 2872 {
3022 extra += i; 2873 extra += size;
3023 i += i; 2874 size += size;
3024 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2875 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3025 } 2876 }
3026 2877
3027 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2878 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3028 } 2879 }
3029#endif 2880#endif
… …
3041 2892
3042 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3043 } 2894 }
3044 else 2895 else
3045#endif 2896#endif
3046 if (!ROW(row).is_longer () && row != selection.end.row) 2897 if (!ROW(row).is_longer ()
2898 && (row != selection.end.row || end_col != selection.end.col)
2899 && (row != selection.beg.row || selection.beg.col < ncol))
3047 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3048 } 2901 }
3049
3050 if (end_col != selection.end.col)
3051 new_selection_text[ofs++] = C0_LF;
3052 2902
3053 new_selection_text[ofs] = 0; 2903 new_selection_text[ofs] = 0;
3054 2904
3055 if (ofs == 0) 2905 if (ofs == 0)
3056 { 2906 {
… …
3069 2919
3070 selection_grab (tm); 2920 selection_grab (tm);
3071} 2921}
3072 2922
3073bool 2923bool
3074rxvt_term::selection_grab (Time tm) NOTHROW 2924rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3075{ 2925{
2926 Atom sel;
2927
2928 if (!clipboard)
2929 {
3076 selection_time = tm; 2930 selection_time = tm;
2931 sel = XA_PRIMARY;
2932 }
2933 else
2934 {
2935 clipboard_time = tm;
2936 sel = xa[XA_CLIPBOARD];
2937 }
3077 2938
3078 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2939 XSetSelectionOwner (dpy, sel, vt, tm);
3079 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2940 if (XGetSelectionOwner (dpy, sel) == vt)
3080 { 2941 {
3081 display->set_selection_owner (this); 2942 display->set_selection_owner (this, clipboard);
3082 return true; 2943 return true;
3083 } 2944 }
3084 else 2945 else
3085 { 2946 {
3086 selection_clear (); 2947 selection_clear (clipboard);
3087 return false; 2948 return false;
3088 } 2949 }
3089 2950
3090#if 0 2951#if 0
3091 XTextProperty ct; 2952 XTextProperty ct;
… …
3551 * EXT: SelectionRequest 3412 * EXT: SelectionRequest
3552 */ 3413 */
3553void 3414void
3554rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3555{ 3416{
3417 Atom property = rq.property == None ? rq.target : rq.property;
3556 XSelectionEvent ev; 3418 XSelectionEvent ev;
3557 3419
3558 ev.type = SelectionNotify; 3420 ev.type = SelectionNotify;
3559 ev.property = None; 3421 ev.property = None;
3560 ev.display = rq.display; 3422 ev.display = rq.display;
… …
3575 *target++ = xa[XA_COMPOUND_TEXT]; 3437 *target++ = xa[XA_COMPOUND_TEXT];
3576#if X_HAVE_UTF8_STRING 3438#if X_HAVE_UTF8_STRING
3577 *target++ = xa[XA_UTF8_STRING]; 3439 *target++ = xa[XA_UTF8_STRING];
3578#endif 3440#endif
3579 3441
3580 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3442 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3581 32, PropModeReplace, 3443 32, PropModeReplace,
3582 (unsigned char *)target_list, target - target_list); 3444 (unsigned char *)target_list, target - target_list);
3583 ev.property = rq.property; 3445 ev.property = property;
3584 } 3446 }
3585#if TODO // TODO 3447#if TODO // TODO
3586 else if (rq.target == xa[XA_MULTIPLE]) 3448 else if (rq.target == xa[XA_MULTIPLE])
3587 { 3449 {
3588 /* TODO: Handle MULTIPLE */ 3450 /* TODO: Handle MULTIPLE */
3589 } 3451 }
3590#endif 3452#endif
3591 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3453 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3592 { 3454 {
3593 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3455 XChangeProperty (dpy, rq.requestor, property, rq.target,
3594 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3456 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3595 ev.property = rq.property; 3457 ev.property = property;
3458 }
3459 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3460 {
3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3462 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3463 ev.property = property;
3596 } 3464 }
3597 else if (rq.target == XA_STRING 3465 else if (rq.target == XA_STRING
3598 || rq.target == xa[XA_TEXT] 3466 || rq.target == xa[XA_TEXT]
3599 || rq.target == xa[XA_COMPOUND_TEXT] 3467 || rq.target == xa[XA_COMPOUND_TEXT]
3600 || rq.target == xa[XA_UTF8_STRING] 3468 || rq.target == xa[XA_UTF8_STRING]
… …
3632 { 3500 {
3633 target = xa[XA_COMPOUND_TEXT]; 3501 target = xa[XA_COMPOUND_TEXT];
3634 style = enc_compound_text; 3502 style = enc_compound_text;
3635 } 3503 }
3636 3504
3637 if (selection.text) 3505 if (rq.selection == XA_PRIMARY && selection.text)
3638 { 3506 {
3639 cl = selection.text; 3507 cl = selection.text;
3640 selectlen = selection.len; 3508 selectlen = selection.len;
3509 }
3510 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3511 {
3512 cl = selection.clip_text;
3513 selectlen = selection.clip_len;
3641 } 3514 }
3642 else 3515 else
3643 { 3516 {
3644 cl = L""; 3517 cl = L"";
3645 selectlen = 0; 3518 selectlen = 0;
… …
3666 ct.value = (unsigned char *)cl; 3539 ct.value = (unsigned char *)cl;
3667 ct.nitems = selectlen; 3540 ct.nitems = selectlen;
3668 ct.encoding = target; 3541 ct.encoding = target;
3669 } 3542 }
3670 3543
3671 XChangeProperty (dpy, rq.requestor, rq.property, 3544 XChangeProperty (dpy, rq.requestor, property,
3672 ct.encoding, 8, PropModeReplace, 3545 ct.encoding, 8, PropModeReplace,
3673 ct.value, (int)ct.nitems); 3546 ct.value, (int)ct.nitems);
3674 ev.property = rq.property; 3547 ev.property = property;
3675 3548
3676 if (freect) 3549 if (freect)
3677 XFree (ct.value); 3550 XFree (ct.value);
3678 } 3551 }
3679 3552
… …
3713 h += 2; min_it (h, nrow); 3586 h += 2; min_it (h, nrow);
3714 3587
3715 x -= 1; clamp_it (x, 0, ncol - w); 3588 x -= 1; clamp_it (x, 0, ncol - w);
3716 y -= 1; clamp_it (y, 0, nrow - h); 3589 y -= 1; clamp_it (y, 0, nrow - h);
3717 3590
3718 ov_x = x; ov_y = y; 3591 ov.x = x; ov.y = y;
3719 ov_w = w; ov_h = h; 3592 ov.w = w; ov.h = h;
3720 3593
3721 ov_text = new text_t *[h]; 3594 ov.text = new text_t *[h];
3722 ov_rend = new rend_t *[h]; 3595 ov.rend = new rend_t *[h];
3723 3596
3724 for (y = 0; y < h; y++) 3597 for (y = 0; y < h; y++)
3725 { 3598 {
3726 text_t *tp = ov_text[y] = new text_t[w]; 3599 text_t *tp = ov.text[y] = new text_t[w];
3727 rend_t *rp = ov_rend[y] = new rend_t[w]; 3600 rend_t *rp = ov.rend[y] = new rend_t[w];
3728 3601
3729 text_t t0, t1, t2; 3602 text_t t0, t1, t2;
3730 rend_t r = OVERLAY_RSTYLE; 3603 rend_t r = OVERLAY_RSTYLE;
3731 3604
3732 if (y == 0) 3605 if (y == 0)
… …
3751} 3624}
3752 3625
3753void 3626void
3754rxvt_term::scr_overlay_off () NOTHROW 3627rxvt_term::scr_overlay_off () NOTHROW
3755{ 3628{
3756 if (!ov_text) 3629 if (!ov.text)
3757 return; 3630 return;
3758 3631
3759 want_refresh = 1; 3632 want_refresh = 1;
3760 3633
3761 for (int y = 0; y < ov_h; y++) 3634 for (int y = 0; y < ov.h; y++)
3762 { 3635 {
3763 delete [] ov_text[y]; 3636 delete [] ov.text[y];
3764 delete [] ov_rend[y]; 3637 delete [] ov.rend[y];
3765 } 3638 }
3766 3639
3767 delete [] ov_text; ov_text = 0; 3640 delete [] ov.text; ov.text = 0;
3768 delete [] ov_rend; ov_rend = 0; 3641 delete [] ov.rend; ov.rend = 0;
3769} 3642}
3770 3643
3771void 3644void
3772rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3645rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3773{ 3646{
3774 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3647 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3775 return; 3648 return;
3776 3649
3777 x++, y++; 3650 x++, y++;
3778 3651
3779 ov_text[y][x] = text; 3652 ov.text[y][x] = text;
3780 ov_rend[y][x] = rend; 3653 ov.rend[y][x] = rend;
3781} 3654}
3782 3655
3783void 3656void
3784rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3657rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3785{ 3658{
… …
3804} 3677}
3805 3678
3806void 3679void
3807rxvt_term::scr_swap_overlay () NOTHROW 3680rxvt_term::scr_swap_overlay () NOTHROW
3808{ 3681{
3809 if (!ov_text) 3682 if (!ov.text)
3810 return; 3683 return;
3811 3684
3685 // hide cursor if it is within the overlay area
3686 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3687 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3688 screen.flags &= ~Screen_VisibleCursor;
3689
3812 // swap screen mem with overlay 3690 // swap screen mem with overlay
3813 for (int y = ov_h; y--; ) 3691 for (int y = ov.h; y--; )
3814 { 3692 {
3815 text_t *t1 = ov_text[y]; 3693 text_t *t1 = ov.text[y];
3816 rend_t *r1 = ov_rend[y]; 3694 rend_t *r1 = ov.rend[y];
3817 3695
3818 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3696 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3819 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3697 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3820 3698
3821 for (int x = ov_w; x--; ) 3699 for (int x = ov.w; x--; )
3822 { 3700 {
3823 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3701 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3824 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3702 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3825 } 3703 }
3826 } 3704 }

Diff Legend

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