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.301 by ayin, Tue Jan 29 13:57:23 2008 UTC vs.
Revision 1.388 by root, Fri Jul 8 00:08:40 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
… …
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
… …
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 - 1);
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;
650 l.f = 0; 680 l.f = 0;
651 } 681 }
652 else 682 else
653 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
654 }
655
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 } 684 }
667 685
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 {
… …
770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 788 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771 screen.cur.row -= minlines; 789 screen.cur.row -= minlines;
772 } 790 }
773 } 791 }
774 792
775#ifdef DEBUG_STRICT
776 assert (screen.cur.col < ncol); 793 assert (screen.cur.col < ncol);
777 assert (screen.cur.row < nrow 794 assert (screen.cur.row < nrow
778 && screen.cur.row >= top_row); 795 && screen.cur.row >= top_row);
779#endif
780 int row = screen.cur.row; 796 int row = screen.cur.row;
781 797
782 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 798 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783 799
784 line_t *line = &ROW(row); 800 line_t *line = &ROW(row);
785 801
786 while (str < strend) 802 while (str < strend)
787 { 803 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 805
790 if (c < 0x20) 806 if (ecb_unlikely (c < 0x20))
791 if (c == C0_LF) 807 if (c == C0_LF)
792 { 808 {
793 max_it (line->l, screen.cur.col); 809 max_it (line->l, screen.cur.col);
794 810
795 screen.flags &= ~Screen_WrapNext; 811 screen.flags &= ~Screen_WrapNext;
… …
814 { 830 {
815 scr_tab (1, true); 831 scr_tab (1, true);
816 continue; 832 continue;
817 } 833 }
818 834
835 if (ecb_unlikely (
819 if (checksel /* see if we're writing within selection */ 836 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 838 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
839 ))
822 { 840 {
823 checksel = 0; 841 checksel = 0;
824 /* 842 /*
825 * If we wrote anywhere in the selected area, kill the selection 843 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 844 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 845 * should be a similar check.
828 */ 846 */
829 CLEAR_SELECTION (); 847 CLEAR_SELECTION ();
830 } 848 }
831 849
832 if (screen.flags & Screen_WrapNext) 850 if (ecb_unlikely (screen.flags & Screen_WrapNext))
833 { 851 {
834 scr_do_wrap (); 852 scr_do_wrap ();
835 853
836 line->l = ncol; 854 line->l = ncol;
837 line->is_longer (1); 855 line->is_longer (1);
… …
839 row = screen.cur.row; 857 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
841 } 859 }
842 860
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 862 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 863 c = 0xfffd;
846 864
847 // rely on wcwidth to tell us the character width, do wcwidth before 865 // rely on wcwidth to tell us the character width, do wcwidth before
848 // further replacements, as wcwidth might return -1 for the line 866 // further replacements, as wcwidth might return -1 for the line
849 // drawing characters below as they might be invalid in the current 867 // drawing characters below as they might be invalid in the current
850 // locale. 868 // locale.
851 int width = WCWIDTH (c); 869 int width = WCWIDTH (c);
852 870
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 871 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 872 {
855 // vt100 special graphics and line drawing 873 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 874 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 875 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 876 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 889 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 890 width = 1; // vt100 line drawing characters are always single-width
873 } 891 }
874 } 892 }
875 893
876 if (screen.flags & Screen_Insert) 894 if (ecb_unlikely (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 895 scr_insdel_chars (width, INSERT);
878 896
879 if (width != 0) 897 if (width != 0)
880 { 898 {
881#if !UNICODE_3 899#if !UNICODE_3
… …
886# else 904# else
887 c = 0xfffd; 905 c = 0xfffd;
888# endif 906# endif
889#endif 907#endif
890 908
909 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
910
911 // if the character doesn't fit into the remaining columns...
912 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
913 {
914 if (screen.flags & Screen_Autowrap)
915 {
916 // ... artificially enlargen the previous one
917 c = NOCHAR;
918 // and try the same character next loop iteration
919 --str;
920 }
921 else
922 screen.cur.col = ncol - width;
923 }
924
891 // nuke the character at this position, if required 925 // nuke the character at this position, if required
926 // due to wonderful coincidences everywhere else in this loop
927 // we never have to check for overwriting a wide char itself,
928 // only its tail.
892 if (line->t[screen.cur.col] == NOCHAR 929 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
893 || (screen.cur.col < ncol - 1 930 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 931
923 line->touch (); 932 line->touch ();
924 933
925 do 934 do
926 { 935 {
927 line->t[screen.cur.col] = c; 936 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 937 line->r[screen.cur.col] = rend;
929 938
930 if (screen.cur.col < ncol - 1) 939 if (ecb_likely (screen.cur.col < ncol - 1))
931 screen.cur.col++; 940 screen.cur.col++;
932 else 941 else
933 { 942 {
934 line->l = ncol; 943 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
936 screen.flags |= Screen_WrapNext; 945 screen.flags |= Screen_WrapNext;
937 break; 946
947 goto end_of_line;
938 } 948 }
939 949
940 c = NOCHAR; 950 c = NOCHAR;
941 } 951 }
942 while (--width > 0); 952 while (ecb_unlikely (--width > 0));
943 953
944 // pad with spaces when overwriting wide character with smaller one 954 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 955 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
946 { 956 {
947 line->touch (); 957 line->t[c] = ' ';
958 line->r[c] = rend;
959 }
948 960
949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 961end_of_line:
962 ;
963 }
964#if ENABLE_COMBINING
965 else // width == 0
966 {
967 if (c != 0xfeff) // ignore BOM
968 {
969 // handle combining characters
970 // we just tag the accent on the previous on-screen character.
971 // this is arguably not correct, but also arguably not wrong.
972 // we don't handle double-width characters nicely yet.
973 line_t *linep;
974 text_t *tp;
975 rend_t *rp;
976
977 if (screen.cur.col > 0)
950 { 978 {
951 line->t[c] = ' ';
952 line->r[c] = rend; 979 linep = line;
980 tp = line->t + screen.cur.col - 1;
981 rp = line->r + screen.cur.col - 1;
953 } 982 }
983 else if (screen.cur.row > 0
984 && ROW(screen.cur.row - 1).is_longer ())
985 {
986 linep = &ROW(screen.cur.row - 1);
987 tp = line->t + ncol - 1;
988 rp = line->r + ncol - 1;
989 }
990 else
991 continue;
992
993 linep->touch ();
994
995 while (*tp == NOCHAR && tp > linep->t)
996 tp--, rp--;
997
998 // first try to find a precomposed character
999 unicode_t n = rxvt_compose (*tp, c);
1000 if (n == NOCHAR)
1001 n = rxvt_composite.compose (*tp, c);
1002
1003 *tp = n;
1004 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
954 } 1005 }
955 } 1006 }
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 1007#endif
996 }
997 } 1008 }
998 1009
999 max_it (line->l, screen.cur.col); 1010 max_it (line->l, screen.cur.col);
1000 1011
1001#ifdef DEBUG_STRICT
1002 assert (screen.cur.row >= 0); 1012 assert (screen.cur.row >= 0);
1003#endif
1004} 1013}
1005 1014
1006/* ------------------------------------------------------------------------- */ 1015/* ------------------------------------------------------------------------- */
1007/* 1016/*
1008 * Process Backspace. Move back the cursor back a position, wrap if have to 1017 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1021 1030
1022 want_refresh = 1; 1031 want_refresh = 1;
1023#endif 1032#endif
1024 } 1033 }
1025 } 1034 }
1035 else if (screen.flags & Screen_WrapNext)
1036 screen.flags &= ~Screen_WrapNext;
1026 else 1037 else
1027 scr_gotorc (0, -1, RELATIVE); 1038 scr_gotorc (0, -1, RELATIVE);
1028} 1039}
1029 1040
1030/* ------------------------------------------------------------------------- */ 1041/* ------------------------------------------------------------------------- */
… …
1225/* 1236/*
1226 * Erase part or whole of a line 1237 * Erase part or whole of a line
1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1238 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1239 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1240 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1241 * extension: clear to right unless wrapped: ESC [ 3 K
1230 */ 1242 */
1231void 1243void
1232rxvt_term::scr_erase_line (int mode) NOTHROW 1244rxvt_term::scr_erase_line (int mode) NOTHROW
1233{ 1245{
1234 unsigned int col, num; 1246 unsigned int col, num;
… …
1243 line.touch (); 1255 line.touch ();
1244 line.is_longer (0); 1256 line.is_longer (0);
1245 1257
1246 switch (mode) 1258 switch (mode)
1247 { 1259 {
1260 case 3:
1261 if (screen.flags & Screen_WrapNext)
1262 return;
1263
1264 /* fall through */
1265
1248 case 0: /* erase to end of line */ 1266 case 0: /* erase to end of line */
1249 col = screen.cur.col; 1267 col = screen.cur.col;
1250 num = ncol - col; 1268 num = ncol - col;
1251 min_it (line.l, col); 1269 min_it (line.l, col);
1270
1252 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1271 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1253 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1272 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1254 CLEAR_SELECTION (); 1273 CLEAR_SELECTION ();
1255 break; 1274 break;
1275
1256 case 1: /* erase to beginning of line */ 1276 case 1: /* erase to beginning of line */
1257 col = 0; 1277 col = 0;
1258 num = screen.cur.col + 1; 1278 num = screen.cur.col + 1;
1279
1259 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1280 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1260 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1281 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1261 CLEAR_SELECTION (); 1282 CLEAR_SELECTION ();
1262 break; 1283 break;
1284
1263 case 2: /* erase whole line */ 1285 case 2: /* erase whole line */
1264 col = 0; 1286 col = 0;
1265 num = ncol; 1287 num = ncol;
1266 line.l = 0; 1288 line.l = 0;
1267 if (selection.beg.row <= screen.cur.row 1289 if (selection.beg.row <= screen.cur.row
… …
1325 if (row >= nrow) /* Out Of Bounds */ 1347 if (row >= nrow) /* Out Of Bounds */
1326 return; 1348 return;
1327 1349
1328 min_it (num, nrow - row); 1350 min_it (num, nrow - row);
1329 1351
1330 if (rstyle & (RS_RVid | RS_Uline)) 1352 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1331 ren = (rend_t) ~RS_None; 1353 ren = (rend_t) ~RS_None;
1332 else if (GET_BASEBG (rstyle) == Color_bg) 1354 else if (GET_BASEBG (rstyle) == Color_bg)
1333 { 1355 {
1334 ren = DEFAULT_RSTYLE; 1356 ren = DEFAULT_RSTYLE;
1335 CLEAR_ROWS (row, num); 1357
1358 if (mapped)
1359 XClearArea (dpy, vt, 0,
1360 Row2Pixel (row - view_start), (unsigned int)width,
1361 (unsigned int)Height2Pixel (num), False);
1336 } 1362 }
1337 else 1363 else
1338 { 1364 {
1339 ren = rstyle & (RS_fgMask | RS_bgMask); 1365 ren = rstyle & (RS_fgMask | RS_bgMask);
1366
1367 if (mapped)
1368 {
1340 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1341 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1342 ERASE_ROWS (row, num); 1371 XFillRectangle (dpy, vt, gc,
1372 0, Row2Pixel (row - view_start),
1373 (unsigned int)width,
1374 (unsigned int)Height2Pixel (num));
1343 gcvalue.foreground = pix_colors[Color_fg]; 1375 gcvalue.foreground = pix_colors[Color_fg];
1344 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1376 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1377 }
1345 } 1378 }
1346 1379
1347 for (; num--; row++) 1380 for (; num--; row++)
1348 { 1381 {
1349 scr_blank_screen_mem (ROW(row), rstyle); 1382 scr_blank_screen_mem (ROW(row), rstyle);
1383
1384 if (row - view_start < nrow)
1350 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1385 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1351 } 1386 }
1352} 1387}
1353 1388
1354#if !ENABLE_MINIMAL 1389#if !ENABLE_MINIMAL
1355void 1390void
… …
1429 * Insert/Delete <count> characters from the current position 1464 * Insert/Delete <count> characters from the current position
1430 */ 1465 */
1431void 1466void
1432rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1467rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1433{ 1468{
1434 int col, row;
1435 rend_t tr;
1436
1437 want_refresh = 1; 1469 want_refresh = 1;
1438 ZERO_SCROLLBACK (); 1470 ZERO_SCROLLBACK ();
1439 1471
1440 if (count <= 0) 1472 if (count <= 0)
1441 return; 1473 return;
… …
1443 scr_do_wrap (); 1475 scr_do_wrap ();
1444 1476
1445 selection_check (1); 1477 selection_check (1);
1446 min_it (count, ncol - screen.cur.col); 1478 min_it (count, ncol - screen.cur.col);
1447 1479
1448 row = screen.cur.row; 1480 int row = screen.cur.row;
1449 1481
1450 line_t *line = &ROW(row); 1482 line_t *line = &ROW(row);
1451 1483
1452 line->touch (); 1484 line->touch ();
1453 line->is_longer (0); 1485 line->is_longer (0);
1454 1486
1487 // nuke wide spanning the start
1488 if (line->t[screen.cur.col] == NOCHAR)
1489 scr_kill_char (*line, screen.cur.col);
1490
1455 switch (insdel) 1491 switch (insdel)
1456 { 1492 {
1457 case INSERT: 1493 case INSERT:
1458 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1494 line->l = min (line->l + count, ncol);
1495
1496 if (line->t[screen.cur.col] == NOCHAR)
1497 scr_kill_char (*line, screen.cur.col);
1498
1499 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1459 { 1500 {
1460 line->t[col] = line->t[col - count]; 1501 line->t[col] = line->t[col - count];
1461 line->r[col] = line->r[col - count]; 1502 line->r[col] = line->r[col - count];
1462 } 1503 }
1463
1464 line->l = min (line->l + count, ncol);
1465 1504
1466 if (selection.op && current_screen == selection.screen 1505 if (selection.op && current_screen == selection.screen
1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1468 { 1507 {
1469 if (selection.end.row != screen.cur.row 1508 if (selection.end.row != screen.cur.row
… …
1484 case ERASE: 1523 case ERASE:
1485 screen.cur.col += count; /* don't worry if > ncol */ 1524 screen.cur.col += count; /* don't worry if > ncol */
1486 selection_check (1); 1525 selection_check (1);
1487 screen.cur.col -= count; 1526 screen.cur.col -= count;
1488 1527
1489 line->l = max (line->l - count, 0); 1528 // nuke wide char after the end
1529 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1530 scr_kill_char (*line, screen.cur.col + count);
1531
1490 scr_blank_line (*line, screen.cur.col, count, rstyle); 1532 scr_blank_line (*line, screen.cur.col, count, rstyle);
1491 break; 1533 break;
1492 1534
1493 case DELETE: 1535 case DELETE:
1494 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1536 line->l = max (line->l - count, 0);
1495 1537
1538 // nuke wide char spanning the end
1539 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1540 scr_kill_char (*line, screen.cur.col + count);
1541
1496 for (col = screen.cur.col; (col + count) < ncol; col++) 1542 for (int col = screen.cur.col; (col + count) < ncol; col++)
1497 { 1543 {
1498 line->t[col] = line->t[col + count]; 1544 line->t[col] = line->t[col + count];
1499 line->r[col] = line->r[col + count]; 1545 line->r[col] = line->r[col + count];
1500 } 1546 }
1501 1547
1502 line->l = max (line->l - count, 0);
1503 scr_blank_line (*line, ncol - count, count, tr); 1548 scr_blank_line (*line, ncol - count, count, rstyle);
1504 1549
1505 if (selection.op && current_screen == selection.screen 1550 if (selection.op && current_screen == selection.screen
1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1551 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507 { 1552 {
1508 if (selection.end.row != screen.cur.row 1553 if (selection.end.row != screen.cur.row
… …
1644 { 1689 {
1645 rvideo_state = on; 1690 rvideo_state = on;
1646 1691
1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1648#ifdef HAVE_BG_PIXMAP 1693#ifdef HAVE_BG_PIXMAP
1649 if (bgPixmap.pixmap == None) 1694 if (bg_pixmap == None)
1650#endif 1695#endif
1651 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1652 1697
1653 XGCValues gcvalue; 1698 XGCValues gcvalue;
1654 gcvalue.foreground = pix_colors[Color_fg]; 1699 gcvalue.foreground = pix_colors[Color_fg];
… …
1798 for (i = PART_BEG; i < RC_COUNT; i++) 1843 for (i = PART_BEG; i < RC_COUNT; i++)
1799 { 1844 {
1800 min_it (rc[i].col, ncol - 1); 1845 min_it (rc[i].col, ncol - 1);
1801 min_it (rc[i].row, nrow - 1); 1846 min_it (rc[i].row, nrow - 1);
1802 } 1847 }
1803// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1848
1804 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1849 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1805 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1850 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1806 1851
1807 num_scr_allow = 0; 1852 num_scr_allow = 0;
1808 1853
… …
1881 1926
1882# ifndef NO_MAPALERT 1927# ifndef NO_MAPALERT
1883# ifdef MAPALERT_OPTION 1928# ifdef MAPALERT_OPTION
1884 if (option (Opt_mapAlert)) 1929 if (option (Opt_mapAlert))
1885# endif 1930# endif
1886 XMapWindow (dpy, parent[0]); 1931 XMapWindow (dpy, parent);
1887# endif 1932# endif
1888 1933
1889# if ENABLE_FRILLS 1934# if ENABLE_FRILLS
1890 if (option (Opt_urgentOnBell)) 1935 if (option (Opt_urgentOnBell))
1891 { 1936 set_urgency (1);
1892 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893 {
1894 h->flags |= XUrgencyHint;
1895 XSetWMHints (dpy, parent[0], h);
1896 }
1897 }
1898# endif 1937# endif
1899 1938
1900 if (option (Opt_visualBell)) 1939 if (option (Opt_visualBell))
1901 { 1940 {
1902 rvideo_bell = true; 1941 rvideo_bell = true;
… …
1905 1944
1906 bell_ev.start (VISUAL_BELL_DURATION); 1945 bell_ev.start (VISUAL_BELL_DURATION);
1907 } 1946 }
1908 else 1947 else
1909 XBell (dpy, 0); 1948 XBell (dpy, 0);
1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1910#endif 1950#endif
1911} 1951}
1912 1952
1913/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1914/* ARGSUSED */
1915void 1954void
1916rxvt_term::scr_printscreen (int fullhist) NOTHROW 1955rxvt_term::scr_printscreen (int fullhist) NOTHROW
1917{ 1956{
1918#ifdef PRINTPIPE 1957#ifdef PRINTPIPE
1919 int nrows, row_start; 1958 int nrows, row_start;
1920 FILE *fd; 1959 FILE *fd = popen_printer ();
1921 1960
1922 if ((fd = popen_printer ()) == NULL) 1961 if (!fd)
1923 return; 1962 return;
1924 1963
1925 if (fullhist) 1964 if (fullhist)
1926 { 1965 {
1927 nrows = nrow - top_row; 1966 nrows = nrow - top_row;
… …
1933 row_start = view_start; 1972 row_start = view_start;
1934 } 1973 }
1935 1974
1936 wctomb (0, 0); 1975 wctomb (0, 0);
1937 1976
1938 for (int r1 = 0; r1 < nrows; r1++) 1977 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1939 { 1978 {
1940 text_t *tp = ROW(r1).t; 1979 text_t *tp = ROW(r1).t;
1941 int len = ROW(r1).l; 1980 int len = ROW(r1).l;
1942 1981
1943 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1982 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1972 * screen.text/screen.rend contain what the screen will change to. 2011 * screen.text/screen.rend contain what the screen will change to.
1973 */ 2012 */
1974void 2013void
1975rxvt_term::scr_refresh () NOTHROW 2014rxvt_term::scr_refresh () NOTHROW
1976{ 2015{
1977 unsigned char have_bg,
1978 showcursor; /* show the cursor */
1979 int16_t col, row, /* column/row we're processing */ 2016 int16_t col, row, /* column/row we're processing */
1980 ocrow; /* old cursor row */ 2017 ocrow; /* old cursor row */
1981 int i; /* tmp */ 2018 int i; /* tmp */
1982#ifndef NO_CURSORCOLOR 2019#ifndef NO_CURSORCOLOR
1983 rend_t cc1; /* store colours at cursor position (s) */ 2020 rend_t cc1; /* store colours at cursor position (s) */
… …
1992 return; 2029 return;
1993 2030
1994 /* 2031 /*
1995 * A: set up vars 2032 * A: set up vars
1996 */ 2033 */
1997 have_bg = 0;
1998 refresh_count = 0; 2034 refresh_count = 0;
1999 2035
2036 unsigned int old_screen_flags = screen.flags;
2037 char have_bg = 0;
2000#ifdef HAVE_BG_PIXMAP 2038#ifdef HAVE_BG_PIXMAP
2001 have_bg |= bgPixmap.pixmap != None; 2039 have_bg = bg_pixmap != None;
2002#endif 2040#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2042
2005 /* 2043 /*
2006 * B: reverse any characters which are selected 2044 * B: reverse any characters which are selected
2007 */ 2045 */
2008 scr_reverse_selection (); 2046 scr_reverse_selection ();
2047
2048 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2049#if ENABLE_OVERLAY
2050 scr_swap_overlay ();
2051#endif
2052
2053 char showcursor = screen.flags & Screen_VisibleCursor;
2009 2054
2010 /* 2055 /*
2011 * C: set the cursor character (s) 2056 * C: set the cursor character (s)
2012 */ 2057 */
2013 { 2058 {
2014 unsigned char setoldcursor; 2059 unsigned char setoldcursor;
2015 2060
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2061#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2062 if (hidden_cursor)
2019 showcursor = 0; 2063 showcursor = 0;
2020#endif 2064#endif
2021 2065
… …
2049 ccol2 = bgcolor_of (rstyle); 2093 ccol2 = bgcolor_of (rstyle);
2050#else 2094#else
2051 ccol2 = Color_bg; 2095 ccol2 = Color_bg;
2052#endif 2096#endif
2053 2097
2054 if (showcursor && focus) 2098 if (focus)
2055 { 2099 {
2056 if (option (Opt_cursorUnderline)) 2100 if (option (Opt_cursorUnderline))
2057 *crp ^= RS_Uline; 2101 *crp ^= RS_Uline;
2058 else 2102 else
2059 { 2103 {
… …
2094 oldcursor.col = screen.cur.col; 2138 oldcursor.col = screen.cur.col;
2095 } 2139 }
2096 } 2140 }
2097 } 2141 }
2098 2142
2099 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2100#if ENABLE_OVERLAY
2101 scr_swap_overlay ();
2102#endif
2103
2104#ifndef NO_SLOW_LINK_SUPPORT 2143#ifndef NO_SLOW_LINK_SUPPORT
2105 /* 2144 /*
2106 * D: CopyArea pass - very useful for slower links 2145 * D: CopyArea pass - very useful for slower links
2107 * This has been deliberately kept simple. 2146 * This has been deliberately kept simple.
2108 */ 2147 */
… …
2197 continue; 2236 continue;
2198 2237
2199 // redraw one or more characters 2238 // redraw one or more characters
2200 2239
2201 // seek to the beginning of wide characters 2240 // seek to the beginning of wide characters
2202 while (stp[col] == NOCHAR && col > 0) 2241 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2203 --col; 2242 --col;
2204 2243
2205 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2244 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2206 text_t *text = stp + col; 2245 text_t *text = stp + col;
2207 int count = 1; 2246 int count = 1;
2208 2247
2209 dtp[col] = stp[col]; 2248 dtp[col] = stp[col];
2210 drp[col] = rend; 2249 drp[col] = rend;
… …
2214 for (i = 0; ++col < ncol; ) 2253 for (i = 0; ++col < ncol; )
2215 { 2254 {
2216 if (stp[col] == NOCHAR) 2255 if (stp[col] == NOCHAR)
2217 { 2256 {
2218 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2219 drp[col] = rend; 2258 drp[col] = srp[col];
2259
2220 count++; 2260 count++;
2221 i++; 2261 i++;
2222 2262
2223 continue; 2263 continue;
2224 } 2264 }
… …
2244 2284
2245 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2246 count -= i; /* dump any matching trailing chars */ 2286 count -= i; /* dump any matching trailing chars */
2247 2287
2248 // sometimes we optimize away the trailing NOCHAR's, add them back 2288 // sometimes we optimize away the trailing NOCHAR's, add them back
2249 while (i && text[count] == NOCHAR) 2289 while (ecb_unlikely (i && text[count] == NOCHAR))
2250 count++, i--; 2290 count++, i--;
2251 2291
2252 /* 2292 /*
2253 * Determine the attributes for the string 2293 * Determine the attributes for the string
2254 */ 2294 */
2255 int fore = fgcolor_of (rend); // desired foreground 2295 int fore = fgcolor_of (rend); // desired foreground
2256 int back = bgcolor_of (rend); // desired background 2296 int back = bgcolor_of (rend); // desired background
2257 2297
2258 // only do special processing if any attributes are set, which is unlikely 2298 // only do special processing if any attributes are set, which is unlikely
2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2299 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2260 { 2300 {
2261 bool invert = rend & RS_RVid; 2301 bool invert = rend & RS_RVid;
2262 2302
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (rend & RS_Bold && fore == Color_fg) 2304 if (rend & RS_Bold && fore == Color_fg)
… …
2283 2323
2284 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2324 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2285 fore = Color_UL; 2325 fore = Color_UL;
2286#endif 2326#endif
2287 2327
2328#ifdef OPTION_HC
2329 if (rend & RS_Sel)
2330 {
2331 /* invert the column if no highlightColor is set or it is the
2332 * current cursor column */
2333 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2334 && ISSET_PIXCOLOR (Color_HC))
2335 {
2336 if (ISSET_PIXCOLOR (Color_HTC))
2337 fore = Color_HTC;
2338 // if invert is 0 reverse video is set so we use bg color as fg color
2339 else if (!invert)
2340 fore = back;
2341
2342 back = Color_HC;
2343 invert = 0;
2344 }
2345 }
2346#endif
2347
2288 if (invert) 2348 if (invert)
2289 { 2349 {
2290#ifdef OPTION_HC
2291 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2292 || !ISSET_PIXCOLOR (Color_HC))
2293#endif
2294 /* invert the column if no highlightColor is set or it is the
2295 * current cursor column */
2296 ::swap (fore, back); 2350 ::swap (fore, back);
2297#ifdef OPTION_HC
2298 else if (ISSET_PIXCOLOR (Color_HC))
2299 back = Color_HC;
2300#endif
2301 2351
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2352#ifndef NO_BOLD_UNDERLINE_REVERSE
2303# ifndef OPTION_HC
2304 if (ISSET_PIXCOLOR (Color_RV))
2305 back = Color_RV;
2306# endif
2307 if (fore == back) 2353 if (fore == back)
2308 { 2354 {
2309 fore = Color_bg; 2355 fore = Color_bg;
2310 back = Color_fg; 2356 back = Color_fg;
2311 } 2357 }
… …
2347 /* 2393 /*
2348 * Actually do the drawing of the string here 2394 * Actually do the drawing of the string here
2349 */ 2395 */
2350 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2396 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2351 2397
2352 if (have_bg && back == Color_bg) 2398 if (ecb_likely (have_bg && back == Color_bg))
2353 { 2399 {
2354 // this is very ugly, maybe push it into ->draw? 2400 // this is very ugly, maybe push it into ->draw?
2355 2401
2356 for (i = 0; i < count; i++) /* don't draw empty strings */ 2402 for (i = 0; i < count; i++) /* don't draw empty strings */
2357 if (text[i] != ' ') 2403 if (text[i] != ' ')
… …
2364 did_clear: ; 2410 did_clear: ;
2365 } 2411 }
2366 else 2412 else
2367 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2368 2414
2369 if (rend & RS_Uline && font->descent > 1 && fore != back) 2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2370 { 2416 {
2371#if ENABLE_FRILLS 2417#if ENABLE_FRILLS
2372 if (ISSET_PIXCOLOR (Color_underline)) 2418 if (ISSET_PIXCOLOR (Color_underline))
2373 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2419 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2374 else 2420 else
… …
2379 xpixel, ypixel + font->ascent + 1, 2425 xpixel, ypixel + font->ascent + 1,
2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2426 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2381 } 2427 }
2382 } /* for (col....) */ 2428 } /* for (col....) */
2383 } /* for (row....) */ 2429 } /* for (row....) */
2384
2385#if ENABLE_OVERLAY
2386 scr_swap_overlay ();
2387#endif
2388 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2389 2430
2390 /* 2431 /*
2391 * G: cleanup cursor and display outline cursor if necessary 2432 * G: cleanup cursor and display outline cursor if necessary
2392 */ 2433 */
2393 if (showcursor) 2434 if (showcursor)
… …
2432 } 2473 }
2433 2474
2434 /* 2475 /*
2435 * H: cleanup selection 2476 * H: cleanup selection
2436 */ 2477 */
2478#if ENABLE_OVERLAY
2479 scr_swap_overlay ();
2480#endif
2481 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2482
2437 scr_reverse_selection (); 2483 scr_reverse_selection ();
2438 2484
2485 screen.flags = old_screen_flags;
2439 num_scr = 0; 2486 num_scr = 0;
2440 num_scr_allow = 1; 2487 num_scr_allow = 1;
2441} 2488}
2442 2489
2443void 2490void
… …
2464 scr_remap_chars (swap_buf [i]); 2511 scr_remap_chars (swap_buf [i]);
2465 } 2512 }
2466} 2513}
2467 2514
2468void 2515void
2469rxvt_term::scr_recolour () NOTHROW 2516rxvt_term::scr_recolour (bool refresh) NOTHROW
2470{ 2517{
2518 bool transparent = false;
2519
2471#ifdef HAVE_BG_PIXMAP 2520#ifdef HAVE_BG_PIXMAP
2472 bgPixmap.apply (); 2521 if (bg_pixmap != None)
2473#else 2522 {
2523# ifdef ENABLE_TRANSPARENCY
2524 if (bg_flags & BG_IS_TRANSPARENT)
2525 {
2526 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2527 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2474 2528
2529 transparent = true;
2530 }
2531 else
2532# endif
2533 {
2534 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2535 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2536 }
2537 }
2538 else
2539#endif
2540 {
2475 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2476 XClearWindow (dpy, parent[0]);
2477 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2542 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2543 }
2544
2545 XClearWindow (dpy, parent);
2478 2546
2479 if (scrollBar.win) 2547 if (scrollBar.win)
2480 { 2548 {
2549 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else
2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2482 scrollBar.state = STATE_IDLE; 2553 scrollBar.state = STATE_IDLE;
2483 scrollbar_show (0); 2554 scrollBar.show (0);
2484 } 2555 }
2485 2556
2557 if (refresh)
2558 {
2486 scr_clear (); 2559 scr_clear ();
2487 scr_touch (true); 2560 scr_touch (true);
2561 }
2488 want_refresh = 1; 2562 want_refresh = 1;
2489
2490#endif
2491} 2563}
2492 2564
2493/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2494void 2566void
2495rxvt_term::scr_clear (bool really) NOTHROW 2567rxvt_term::scr_clear (bool really) NOTHROW
… …
2562 { 2634 {
2563#if !ENABLE_MINIMAL 2635#if !ENABLE_MINIMAL
2564 if (selection.rect) 2636 if (selection.rect)
2565 scr_xor_rect (selection.beg.row, selection.beg.col, 2637 scr_xor_rect (selection.beg.row, selection.beg.col,
2566 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2567 RS_RVid, RS_RVid | RS_Uline); 2639 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2568 else 2640 else
2569#endif 2641#endif
2570 scr_xor_span (selection.beg.row, selection.beg.col, 2642 scr_xor_span (selection.beg.row, selection.beg.col,
2571 selection.end.row, selection.end.col, 2643 selection.end.row, selection.end.col,
2572 RS_RVid); 2644 RS_Sel | RS_RVid);
2573 } 2645 }
2574} 2646}
2575 2647
2576/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2577/* 2649/*
… …
2582void 2654void
2583rxvt_term::scr_dump (int fd) NOTHROW 2655rxvt_term::scr_dump (int fd) NOTHROW
2584{ 2656{
2585 int row, wrote; 2657 int row, wrote;
2586 unsigned int width, towrite; 2658 unsigned int width, towrite;
2587 char r1[] = "\n"; 2659 const char r1[] = "\n";
2588 2660
2589 for (row = saveLines - nsaved; 2661 for (row = saveLines + top_row;
2590 row < saveLines + nrow - 1; row++) 2662 row < saveLines + nrow - 1; row++)
2591 { 2663 {
2592 width = row_buf[row].l >= 0 ? row_buf[row].l 2664 width = row_buf[row].l >= 0 ? row_buf[row].l
2593 : ncol; 2665 : ncol;
2594 for (towrite = width; towrite; towrite -= wrote) 2666 for (towrite = width; towrite; towrite -= wrote)
… …
2638/* ------------------------------------------------------------------------- */ 2710/* ------------------------------------------------------------------------- */
2639/* 2711/*
2640 * Paste a selection direct to the command fd 2712 * Paste a selection direct to the command fd
2641 */ 2713 */
2642void 2714void
2643rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2644{ 2716{
2645 /* convert normal newline chars into common keyboard Return key sequence */ 2717 /* convert normal newline chars into common keyboard Return key sequence */
2646 for (unsigned int i = 0; i < len; i++) 2718 for (unsigned int i = 0; i < len; i++)
2647 if (data[i] == C0_LF) 2719 if (data[i] == C0_LF)
2648 data[i] = C0_CR; 2720 data[i] = C0_CR;
… …
2654 2726
2655 if (priv_modes & PrivMode_BracketPaste) 2727 if (priv_modes & PrivMode_BracketPaste)
2656 tt_printf ("\e[201~"); 2728 tt_printf ("\e[201~");
2657} 2729}
2658 2730
2659/* ------------------------------------------------------------------------- */
2660/*
2661 * Respond to a notification that a primary selection has been sent
2662 * EXT: SelectionNotify
2663 */
2664void 2731void
2665rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2732rxvt_term::paste (char *data, unsigned int len) NOTHROW
2666{ 2733{
2667 if (prop == None) /* check for failed XConvertSelection */ 2734 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2668 {
2669 if ((selection_type & Sel_CompoundText))
2670 {
2671 int selnum = selection_type & Sel_whereMask;
2672
2673 selection_type = 0;
2674 if (selnum != Sel_direct)
2675 selection_request_other (XA_STRING, selnum);
2676 }
2677
2678 if ((selection_type & Sel_UTF8String))
2679 {
2680 int selnum = selection_type & Sel_whereMask;
2681
2682 selection_type = Sel_CompoundText;
2683 if (selnum != Sel_direct)
2684 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2685 else
2686 selection_type = 0;
2687 }
2688
2689 return;
2690 }
2691
2692 unsigned long bytes_after;
2693 XTextProperty ct;
2694
2695 if (XGetWindowProperty (dpy, win, prop,
2696 0, PROP_SIZE / 4,
2697 delete_prop, AnyPropertyType,
2698 &ct.encoding, &ct.format,
2699 &ct.nitems, &bytes_after,
2700 &ct.value) != Success)
2701 {
2702 ct.value = 0;
2703 goto bailout;
2704 }
2705
2706 if (ct.encoding == None)
2707 goto bailout;
2708
2709 if (bytes_after)
2710 {
2711 // fetch and append remaining data
2712 XTextProperty ct2;
2713
2714 if (XGetWindowProperty (dpy, win, prop,
2715 ct.nitems / 4, (bytes_after + 3) / 4,
2716 delete_prop, AnyPropertyType,
2717 &ct2.encoding, &ct2.format,
2718 &ct2.nitems, &bytes_after,
2719 &ct2.value) != Success)
2720 goto bailout;
2721
2722 // realloc should be compatible to XFree, here, and elsewhere, too
2723 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2724 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2725 ct.nitems += ct2.nitems;
2726
2727 XFree (ct2.value);
2728 }
2729
2730 if (ct.value == 0)
2731 goto bailout;
2732
2733 if (ct.encoding == xa[XA_INCR])
2734 {
2735 // INCR selection, start handshake
2736 if (!delete_prop)
2737 XDeleteProperty (dpy, win, prop);
2738
2739 selection_wait = Sel_incr;
2740 incr_buf_fill = 0;
2741 incr_ev.start (10);
2742
2743 goto bailout;
2744 }
2745
2746 if (ct.nitems == 0)
2747 {
2748 if (selection_wait == Sel_incr)
2749 {
2750 XFree (ct.value);
2751
2752 // finally complete, now paste the whole thing
2753 selection_wait = Sel_normal;
2754 ct.value = (unsigned char *)incr_buf;
2755 ct.nitems = incr_buf_fill;
2756 incr_buf = 0;
2757 incr_buf_size = 0;
2758 incr_ev.stop ();
2759 }
2760 else
2761 {
2762 if (selection_wait == Sel_normal
2763 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2764 {
2765 /*
2766 * pass through again trying CUT_BUFFER0 if we've come from
2767 * XConvertSelection () but nothing was presented
2768 */
2769 selection_paste (display->root, XA_CUT_BUFFER0, False);
2770 }
2771
2772 goto bailout;
2773 }
2774 }
2775 else if (selection_wait == Sel_incr)
2776 {
2777 incr_ev.start (10);
2778
2779 while (incr_buf_fill + ct.nitems > incr_buf_size)
2780 {
2781 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2782 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2783 }
2784
2785 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2786 incr_buf_fill += ct.nitems;
2787
2788 goto bailout;
2789 }
2790
2791 char **cl;
2792 int cr;
2793
2794#if !ENABLE_MINIMAL
2795 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2796 // so recode it manually
2797 if (ct.encoding == xa[XA_UTF8_STRING])
2798 {
2799 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2800 char *s = rxvt_wcstombs (w);
2801 free (w);
2802 // TODO: strlen == only the first element will be converted. well...
2803 paste (s, strlen (s));
2804 free (s);
2805 }
2806 else
2807#endif
2808 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2809 && cl)
2810 {
2811 for (int i = 0; i < cr; i++)
2812 paste (cl[i], strlen (cl[i]));
2813
2814 XFreeStringList (cl);
2815 }
2816 else
2817 paste ((char *)ct.value, ct.nitems); // paste raw
2818
2819bailout:
2820 XFree (ct.value);
2821
2822 if (selection_wait == Sel_normal)
2823 selection_wait = Sel_none;
2824}
2825
2826void
2827rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2828{
2829 selection_wait = Sel_none;
2830
2831 incr_buf_size = 0;
2832 free (incr_buf);
2833
2834 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2835}
2836
2837void
2838rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2839{
2840 if (prop == None || selection_wait != Sel_incr)
2841 return; 2735 return;
2842 2736
2843 selection_paste (win, prop, true); 2737 tt_paste (data, len);
2844} 2738}
2845 2739
2846/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2847/* 2741/*
2848 * Request the current selection: 2742 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2849 * Order: > internal selection if available 2743 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2850 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2744 * as fallback
2851 * > CUT_BUFFER0
2852 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2853 * will auto fallback to CUT_BUFFER0
2854 * EXT: button 2 release 2745 * EXT: button 2 release
2855 */ 2746 */
2856void 2747void
2857rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2748rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2858{ 2749{
2859 if (selection.text && selnum == Sel_Primary) 2750 if (!selection_req)
2860 {
2861 /* internal selection */
2862 char *str = rxvt_wcstombs (selection.text, selection.len);
2863 paste (str, strlen (str));
2864 free (str);
2865 return;
2866 } 2751 {
2867 else 2752 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2753 selection_req->run ();
2868 { 2754 }
2869 selection_request_time = tm;
2870 selection_wait = Sel_normal;
2871
2872#if X_HAVE_UTF8_STRING
2873 selection_type = Sel_UTF8String;
2874 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2875 return;
2876#else
2877 selection_type = Sel_CompoundText;
2878 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2879 return;
2880#endif
2881 }
2882
2883 selection_wait = Sel_none; /* don't loop in selection_paste () */
2884 selection_paste (display->root, XA_CUT_BUFFER0, false);
2885}
2886
2887int
2888rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2889{
2890 Atom sel;
2891
2892 selection_type |= selnum;
2893
2894 if (selnum == Sel_Primary)
2895 sel = XA_PRIMARY;
2896 else if (selnum == Sel_Secondary)
2897 sel = XA_SECONDARY;
2898 else
2899 sel = xa[XA_CLIPBOARD];
2900
2901 if (XGetSelectionOwner (dpy, sel) != None)
2902 {
2903 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2904 vt, selection_request_time);
2905 return 1;
2906 }
2907
2908 return 0;
2909} 2755}
2910 2756
2911/* ------------------------------------------------------------------------- */ 2757/* ------------------------------------------------------------------------- */
2912/* 2758/*
2913 * Clear all selected text 2759 * Clear all selected text
2914 * EXT: SelectionClear 2760 * EXT: SelectionClear
2915 */ 2761 */
2916void 2762void
2917rxvt_term::selection_clear () NOTHROW 2763rxvt_term::selection_clear (bool clipboard) NOTHROW
2918{ 2764{
2765 if (!clipboard)
2766 {
2919 want_refresh = 1; 2767 want_refresh = 1;
2920 free (selection.text); 2768 free (selection.text);
2921 selection.text = NULL; 2769 selection.text = NULL;
2922 selection.len = 0; 2770 selection.len = 0;
2923 CLEAR_SELECTION (); 2771 CLEAR_SELECTION ();
2924 2772
2925 if (display->selection_owner == this) 2773 if (display->selection_owner == this)
2926 display->selection_owner = 0; 2774 display->selection_owner = 0;
2775 }
2776 else
2777 {
2778 free (selection.clip_text);
2779 selection.clip_text = NULL;
2780 selection.clip_len = 0;
2781
2782 if (display->clipboard_owner == this)
2783 display->clipboard_owner = 0;
2784 }
2927} 2785}
2928 2786
2929/* ------------------------------------------------------------------------- */ 2787/* ------------------------------------------------------------------------- */
2930/* 2788/*
2931 * Copy a selection into the cut buffer 2789 * Copy a selection into the cut buffer
2932 * EXT: button 1 or 3 release 2790 * EXT: button 1 or 3 release
2933 */ 2791 */
2934void 2792void
2935rxvt_term::selection_make (Time tm) 2793rxvt_term::selection_make (Time tm)
2936{ 2794{
2937 int i; 2795 int size;
2938 wchar_t *new_selection_text; 2796 wchar_t *new_selection_text;
2939 text_t *t; 2797 text_t *t;
2940 2798
2941 switch (selection.op) 2799 switch (selection.op)
2942 { 2800 {
… …
2958 return; /* nothing selected, go away */ 2816 return; /* nothing selected, go away */
2959 2817
2960 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2818 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2961 return; 2819 return;
2962 2820
2963 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2821 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2964 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2822 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2965 2823
2966 int ofs = 0; 2824 int ofs = 0;
2967 int extra = 0; 2825 int extra = 0;
2968 2826
2969 int col = selection.beg.col; 2827 int col = selection.beg.col;
… …
2975 { 2833 {
2976#if !ENABLE_MINIMAL 2834#if !ENABLE_MINIMAL
2977 if (selection.rect) 2835 if (selection.rect)
2978 { 2836 {
2979 col = selection.beg.col; 2837 col = selection.beg.col;
2980 end_col = ncol + 1; 2838 end_col = selection.end.col;
2981 } 2839 }
2982 else 2840 else
2983#endif 2841#endif
2984 end_col = ROW(row).l; 2842 end_col = ROW(row).l;
2985 2843
2986 col = max (col, 0); 2844 col = max (col, 0);
2987 2845
2988 if (row == selection.end.row 2846 if (row == selection.end.row)
2989#if !ENABLE_MINIMAL
2990 || selection.rect
2991#endif
2992 )
2993 min_it (end_col, selection.end.col); 2847 min_it (end_col, selection.end.col);
2994 2848
2995 t = ROW(row).t + col; 2849 t = ROW(row).t + col;
2996 2850
2997 for (; col < end_col; col++) 2851 for (; col < end_col; col++)
… …
3005 2859
3006 extra -= (len - 1); 2860 extra -= (len - 1);
3007 2861
3008 if (extra < 0) 2862 if (extra < 0)
3009 { 2863 {
3010 extra += i; 2864 extra += size;
3011 i += i; 2865 size += size;
3012 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2866 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3013 } 2867 }
3014 2868
3015 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2869 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3016 } 2870 }
3017#endif 2871#endif
… …
3029 2883
3030 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3031 } 2885 }
3032 else 2886 else
3033#endif 2887#endif
3034 if (!ROW(row).is_longer () && row != selection.end.row) 2888 if (!ROW(row).is_longer ()
2889 && (row != selection.end.row || end_col != selection.end.col)
2890 && (row != selection.beg.row || selection.beg.col < ncol))
3035 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3036 } 2892 }
3037
3038 if (end_col != selection.end.col)
3039 new_selection_text[ofs++] = C0_LF;
3040 2893
3041 new_selection_text[ofs] = 0; 2894 new_selection_text[ofs] = 0;
3042 2895
3043 if (ofs == 0) 2896 if (ofs == 0)
3044 { 2897 {
… …
3057 2910
3058 selection_grab (tm); 2911 selection_grab (tm);
3059} 2912}
3060 2913
3061bool 2914bool
3062rxvt_term::selection_grab (Time tm) NOTHROW 2915rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3063{ 2916{
2917 Atom sel;
2918
2919 if (!clipboard)
2920 {
3064 selection_time = tm; 2921 selection_time = tm;
2922 sel = XA_PRIMARY;
2923 }
2924 else
2925 {
2926 clipboard_time = tm;
2927 sel = xa[XA_CLIPBOARD];
2928 }
3065 2929
3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2930 XSetSelectionOwner (dpy, sel, vt, tm);
3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2931 if (XGetSelectionOwner (dpy, sel) == vt)
3068 { 2932 {
3069 display->set_selection_owner (this); 2933 display->set_selection_owner (this, clipboard);
3070 return true; 2934 return true;
3071 } 2935 }
3072 else 2936 else
3073 { 2937 {
3074 selection_clear (); 2938 selection_clear (clipboard);
3075 return false; 2939 return false;
3076 } 2940 }
3077 2941
3078#if 0 2942#if 0
3079 XTextProperty ct; 2943 XTextProperty ct;
… …
3539 * EXT: SelectionRequest 3403 * EXT: SelectionRequest
3540 */ 3404 */
3541void 3405void
3542rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3543{ 3407{
3408 Atom property = rq.property == None ? rq.target : rq.property;
3544 XSelectionEvent ev; 3409 XSelectionEvent ev;
3545 3410
3546 ev.type = SelectionNotify; 3411 ev.type = SelectionNotify;
3547 ev.property = None; 3412 ev.property = None;
3548 ev.display = rq.display; 3413 ev.display = rq.display;
… …
3563 *target++ = xa[XA_COMPOUND_TEXT]; 3428 *target++ = xa[XA_COMPOUND_TEXT];
3564#if X_HAVE_UTF8_STRING 3429#if X_HAVE_UTF8_STRING
3565 *target++ = xa[XA_UTF8_STRING]; 3430 *target++ = xa[XA_UTF8_STRING];
3566#endif 3431#endif
3567 3432
3568 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3433 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3569 32, PropModeReplace, 3434 32, PropModeReplace,
3570 (unsigned char *)target_list, target - target_list); 3435 (unsigned char *)target_list, target - target_list);
3571 ev.property = rq.property; 3436 ev.property = property;
3572 } 3437 }
3573#if TODO // TODO 3438#if TODO // TODO
3574 else if (rq.target == xa[XA_MULTIPLE]) 3439 else if (rq.target == xa[XA_MULTIPLE])
3575 { 3440 {
3576 /* TODO: Handle MULTIPLE */ 3441 /* TODO: Handle MULTIPLE */
3577 } 3442 }
3578#endif 3443#endif
3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3444 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3580 { 3445 {
3581 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3446 XChangeProperty (dpy, rq.requestor, property, rq.target,
3582 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3447 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3583 ev.property = rq.property; 3448 ev.property = property;
3449 }
3450 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3451 {
3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3453 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3454 ev.property = property;
3584 } 3455 }
3585 else if (rq.target == XA_STRING 3456 else if (rq.target == XA_STRING
3586 || rq.target == xa[XA_TEXT] 3457 || rq.target == xa[XA_TEXT]
3587 || rq.target == xa[XA_COMPOUND_TEXT] 3458 || rq.target == xa[XA_COMPOUND_TEXT]
3588 || rq.target == xa[XA_UTF8_STRING] 3459 || rq.target == xa[XA_UTF8_STRING]
… …
3620 { 3491 {
3621 target = xa[XA_COMPOUND_TEXT]; 3492 target = xa[XA_COMPOUND_TEXT];
3622 style = enc_compound_text; 3493 style = enc_compound_text;
3623 } 3494 }
3624 3495
3625 if (selection.text) 3496 if (rq.selection == XA_PRIMARY && selection.text)
3626 { 3497 {
3627 cl = selection.text; 3498 cl = selection.text;
3628 selectlen = selection.len; 3499 selectlen = selection.len;
3500 }
3501 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3502 {
3503 cl = selection.clip_text;
3504 selectlen = selection.clip_len;
3629 } 3505 }
3630 else 3506 else
3631 { 3507 {
3632 cl = L""; 3508 cl = L"";
3633 selectlen = 0; 3509 selectlen = 0;
… …
3654 ct.value = (unsigned char *)cl; 3530 ct.value = (unsigned char *)cl;
3655 ct.nitems = selectlen; 3531 ct.nitems = selectlen;
3656 ct.encoding = target; 3532 ct.encoding = target;
3657 } 3533 }
3658 3534
3659 XChangeProperty (dpy, rq.requestor, rq.property, 3535 XChangeProperty (dpy, rq.requestor, property,
3660 ct.encoding, 8, PropModeReplace, 3536 ct.encoding, 8, PropModeReplace,
3661 ct.value, (int)ct.nitems); 3537 ct.value, (int)ct.nitems);
3662 ev.property = rq.property; 3538 ev.property = property;
3663 3539
3664 if (freect) 3540 if (freect)
3665 XFree (ct.value); 3541 XFree (ct.value);
3666 } 3542 }
3667 3543
… …
3701 h += 2; min_it (h, nrow); 3577 h += 2; min_it (h, nrow);
3702 3578
3703 x -= 1; clamp_it (x, 0, ncol - w); 3579 x -= 1; clamp_it (x, 0, ncol - w);
3704 y -= 1; clamp_it (y, 0, nrow - h); 3580 y -= 1; clamp_it (y, 0, nrow - h);
3705 3581
3706 ov_x = x; ov_y = y; 3582 ov.x = x; ov.y = y;
3707 ov_w = w; ov_h = h; 3583 ov.w = w; ov.h = h;
3708 3584
3709 ov_text = new text_t *[h]; 3585 ov.text = new text_t *[h];
3710 ov_rend = new rend_t *[h]; 3586 ov.rend = new rend_t *[h];
3711 3587
3712 for (y = 0; y < h; y++) 3588 for (y = 0; y < h; y++)
3713 { 3589 {
3714 text_t *tp = ov_text[y] = new text_t[w]; 3590 text_t *tp = ov.text[y] = new text_t[w];
3715 rend_t *rp = ov_rend[y] = new rend_t[w]; 3591 rend_t *rp = ov.rend[y] = new rend_t[w];
3716 3592
3717 text_t t0, t1, t2; 3593 text_t t0, t1, t2;
3718 rend_t r = OVERLAY_RSTYLE; 3594 rend_t r = OVERLAY_RSTYLE;
3719 3595
3720 if (y == 0) 3596 if (y == 0)
… …
3739} 3615}
3740 3616
3741void 3617void
3742rxvt_term::scr_overlay_off () NOTHROW 3618rxvt_term::scr_overlay_off () NOTHROW
3743{ 3619{
3744 if (!ov_text) 3620 if (!ov.text)
3745 return; 3621 return;
3746 3622
3747 want_refresh = 1; 3623 want_refresh = 1;
3748 3624
3749 for (int y = 0; y < ov_h; y++) 3625 for (int y = 0; y < ov.h; y++)
3750 { 3626 {
3751 delete [] ov_text[y]; 3627 delete [] ov.text[y];
3752 delete [] ov_rend[y]; 3628 delete [] ov.rend[y];
3753 } 3629 }
3754 3630
3755 delete [] ov_text; ov_text = 0; 3631 delete [] ov.text; ov.text = 0;
3756 delete [] ov_rend; ov_rend = 0; 3632 delete [] ov.rend; ov.rend = 0;
3757} 3633}
3758 3634
3759void 3635void
3760rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3636rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3761{ 3637{
3762 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3638 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3763 return; 3639 return;
3764 3640
3765 x++, y++; 3641 x++, y++;
3766 3642
3767 ov_text[y][x] = text; 3643 ov.text[y][x] = text;
3768 ov_rend[y][x] = rend; 3644 ov.rend[y][x] = rend;
3769} 3645}
3770 3646
3771void 3647void
3772rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3648rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3773{ 3649{
… …
3792} 3668}
3793 3669
3794void 3670void
3795rxvt_term::scr_swap_overlay () NOTHROW 3671rxvt_term::scr_swap_overlay () NOTHROW
3796{ 3672{
3797 if (!ov_text) 3673 if (!ov.text)
3798 return; 3674 return;
3799 3675
3676 // hide cursor if it is within the overlay area
3677 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3678 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3679 screen.flags &= ~Screen_VisibleCursor;
3680
3800 // swap screen mem with overlay 3681 // swap screen mem with overlay
3801 for (int y = ov_h; y--; ) 3682 for (int y = ov.h; y--; )
3802 { 3683 {
3803 text_t *t1 = ov_text[y]; 3684 text_t *t1 = ov.text[y];
3804 rend_t *r1 = ov_rend[y]; 3685 rend_t *r1 = ov.rend[y];
3805 3686
3806 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3687 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3807 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3688 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3808 3689
3809 for (int x = ov_w; x--; ) 3690 for (int x = ov.w; x--; )
3810 { 3691 {
3811 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3692 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3812 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3693 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3813 } 3694 }
3814 } 3695 }

Diff Legend

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