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.294 by root, Wed Jan 9 00:51:50 2008 UTC vs.
Revision 1.386 by root, Thu Jul 7 23:15:44 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 drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 90 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 94
112/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
115 98
… …
148 131
149 l.l = 0; 132 l.l = 0;
150 l.f = 0; 133 l.f = 0;
151} 134}
152 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
153/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
156 160
157void 161void
… …
159{ 163{
160#if ENABLE_OVERLAY 164#if ENABLE_OVERLAY
161 scr_overlay_off (); 165 scr_overlay_off ();
162#endif 166#endif
163 167
164 rvideo_mode = false;
165 view_start = 0; 168 view_start = 0;
166 num_scr = 0; 169 num_scr = 0;
167 170
168 if (ncol == 0) 171 if (ncol == 0)
169 ncol = 80; 172 ncol = 80;
… …
171 if (nrow == 0) 174 if (nrow == 0)
172 nrow = 24; 175 nrow = 24;
173 176
174 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 178 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 179
180 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
182 { 182 {
183 //TODO//FIXME 183 //TODO//FIXME
… …
236 selection.text = NULL; 236 selection.text = NULL;
237 selection.len = 0; 237 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
240 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
241 } 243 }
242 else 244 else
243 { 245 {
244 /* 246 /*
245 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
283 285
284 if (top_row) 286 if (top_row)
285 { 287 {
286 // 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
287 // 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
288 291
289 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 294
292 do 295 do
293 { 296 {
294 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 299 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 301
301 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 ())
302 { 303 {
… …
396 delete old_ta; 397 delete old_ta;
397 delete old_ra; 398 delete old_ra;
398 399
399 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
401 403
402 free (tabs); 404 free (tabs);
403 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
404 409
405 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
406 411
407 prev_nrow = nrow; 412 prev_nrow = nrow;
408 prev_ncol = ncol; 413 prev_ncol = ncol;
409
410 tabs = (char *)rxvt_malloc (ncol);
411
412 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0;
414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417 414
418 tt_winch (); 415 tt_winch ();
419 416
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 418}
… …
433 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
434 431
435 free (row_buf); 432 free (row_buf);
436 free (swap_buf); 433 free (swap_buf);
437 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
438 free (tabs); 437 free (tabs);
439 438 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 439 }
442} 440}
443 441
444/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
445/* 443/*
446 * Hard reset 444 * Hard/Soft reset
447 */ 445 */
448void 446void
449rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
450{ 448{
451 scr_release (); 449 scr_release ();
452 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
453 scr_reset (); 453 scr_reset ();
454 454
455 scr_clear (true); 455 scr_clear (true);
456 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);
457} 473}
458 474
459/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
499 } 515 }
500 516
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
507#endif
508} 522}
509 523
510void 524void
511rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
512{ 526{
… …
537 want_refresh = 1; 551 want_refresh = 1;
538 view_start = 0; 552 view_start = 0;
539 553
540 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
541 555
542 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
543 557
544#if NSCREENS 558#if NSCREENS
545 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
546 { 560 {
547 num_scr = 0; 561 num_scr = 0;
… …
624 638
625 if (count > 0 639 if (count > 0
626 && row1 == 0 640 && row1 == 0
627 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
628 { 642 {
643 min_it (count, row2 - total_rows);
644
629 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
630 646
631 // scroll everything up 'count' lines 647 // scroll everything up 'count' lines
632 term_start = (term_start + count) % total_rows; 648 term_start = (term_start + count) % total_rows;
633 649
… …
641 // erase newly scrolled-in lines 657 // erase newly scrolled-in lines
642 for (int i = count; i--; ) 658 for (int i = count; i--; )
643 { 659 {
644 line_t &l = ROW(nrow - 1 - i); 660 line_t &l = ROW(nrow - 1 - i);
645 661
646 // optimize if already cleared, can be significant on slow machines 662 // optimise if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem 663 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 664 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 { 665 {
650 scr_blank_line (l, 0, l.l, rstyle); 666 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0; 667 l.l = 0;
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 788 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 789 screen.cur.row -= minlines;
774 } 790 }
775 } 791 }
776 792
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 793 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 794 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 795 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 796 int row = screen.cur.row;
783 797
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 798 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 799
786 line_t *line = &ROW(row); 800 line_t *line = &ROW(row);
787 801
788 while (str < strend) 802 while (str < strend)
789 { 803 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 805
792 if (c < 0x20) 806 if (ecb_unlikely (c < 0x20))
793 if (c == C0_LF) 807 if (c == C0_LF)
794 { 808 {
795 max_it (line->l, screen.cur.col); 809 max_it (line->l, screen.cur.col);
796 810
797 screen.flags &= ~Screen_WrapNext; 811 screen.flags &= ~Screen_WrapNext;
… …
816 { 830 {
817 scr_tab (1, true); 831 scr_tab (1, true);
818 continue; 832 continue;
819 } 833 }
820 834
835 if (ecb_unlikely (
821 if (checksel /* see if we're writing within selection */ 836 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 838 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
839 ))
824 { 840 {
825 checksel = 0; 841 checksel = 0;
826 /* 842 /*
827 * If we wrote anywhere in the selected area, kill the selection 843 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 844 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 845 * should be a similar check.
830 */ 846 */
831 CLEAR_SELECTION (); 847 CLEAR_SELECTION ();
832 } 848 }
833 849
834 if (screen.flags & Screen_WrapNext) 850 if (ecb_unlikely (screen.flags & Screen_WrapNext))
835 { 851 {
836 scr_do_wrap (); 852 scr_do_wrap ();
837 853
838 line->l = ncol; 854 line->l = ncol;
839 line->is_longer (1); 855 line->is_longer (1);
… …
841 row = screen.cur.row; 857 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
843 } 859 }
844 860
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 862 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 863 c = 0xfffd;
848 864
849 // 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
850 // further replacements, as wcwidth might return -1 for the line 866 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 867 // drawing characters below as they might be invalid in the current
852 // locale. 868 // locale.
853 int width = WCWIDTH (c); 869 int width = WCWIDTH (c);
854 870
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 871 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 872 {
857 // vt100 special graphics and line drawing 873 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 874 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 875 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 876 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 889 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 890 width = 1; // vt100 line drawing characters are always single-width
875 } 891 }
876 } 892 }
877 893
878 if (screen.flags & Screen_Insert) 894 if (ecb_unlikely (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 895 scr_insdel_chars (width, INSERT);
880 896
881 if (width != 0) 897 if (width != 0)
882 { 898 {
883#if !UNICODE_3 899#if !UNICODE_3
… …
888# else 904# else
889 c = 0xfffd; 905 c = 0xfffd;
890# endif 906# endif
891#endif 907#endif
892 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
893 // 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.
894 if (line->t[screen.cur.col] == NOCHAR 929 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 930 scr_kill_char (*line, screen.cur.col);
896 && line->t[screen.cur.col + 1] == NOCHAR))
897 {
898 int col = screen.cur.col;
899
900 // find begin
901 while (col > 0 && line->t[col] == NOCHAR)
902 col--;
903
904 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906 // found begin, nuke
907 do {
908 line->t[col] = ' ';
909 line->r[col] = rend;
910 col++;
911 } while (col < ncol && line->t[col] == NOCHAR);
912 }
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (screen.cur.col > ncol - width && ncol >= width)
918 {
919 // ...output spaces
920 c = ' ';
921 // and try the same character next loop iteration
922 --str;
923 }
924 931
925 line->touch (); 932 line->touch ();
926 933
927 do 934 do
928 { 935 {
929 line->t[screen.cur.col] = c; 936 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 937 line->r[screen.cur.col] = rend;
931 938
932 if (screen.cur.col < ncol - 1) 939 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 940 screen.cur.col++;
934 else 941 else
935 { 942 {
936 line->l = ncol; 943 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 945 screen.flags |= Screen_WrapNext;
939 break; 946
947 goto end_of_line;
940 } 948 }
941 949
942 c = NOCHAR; 950 c = NOCHAR;
943 } 951 }
944 while (--width > 0); 952 while (ecb_unlikely (--width > 0));
945 953
946 // pad with spaces when overwriting wide character with smaller one 954 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 955 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 956 {
949 line->touch (); 957 line->t[c] = ' ';
958 line->r[c] = rend;
959 }
950 960
951 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)
952 { 978 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 979 linep = line;
980 tp = line->t + screen.cur.col - 1;
981 rp = line->r + screen.cur.col - 1;
955 } 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));
956 } 1005 }
957 } 1006 }
958 else // width == 0
959 {
960#if ENABLE_COMBINING
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 {
971 linep = line;
972 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1;
974 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 1007#endif
998 }
999 } 1008 }
1000 1009
1001 max_it (line->l, screen.cur.col); 1010 max_it (line->l, screen.cur.col);
1002 1011
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1012 assert (screen.cur.row >= 0);
1005#endif
1006} 1013}
1007 1014
1008/* ------------------------------------------------------------------------- */ 1015/* ------------------------------------------------------------------------- */
1009/* 1016/*
1010 * 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
1011 * XTERM_SEQ: CTRL-H 1018 * XTERM_SEQ: CTRL-H
1012 */ 1019 */
1013void 1020void
1014rxvt_term::scr_backspace () NOTHROW 1021rxvt_term::scr_backspace () NOTHROW
1015{ 1022{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1023 if (screen.cur.col == 0)
1019 { 1024 {
1020 if (screen.cur.row > 0) 1025 if (screen.cur.row > 0)
1021 { 1026 {
1022#ifdef TERMCAP_HAS_BW 1027#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1028 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1029 --screen.cur.row;
1025 return; 1030
1031 want_refresh = 1;
1026#endif 1032#endif
1027 } 1033 }
1028 } 1034 }
1035 else if (screen.flags & Screen_WrapNext)
1036 screen.flags &= ~Screen_WrapNext;
1029 else 1037 else
1030 scr_gotorc (0, -1, RELATIVE); 1038 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1039}
1034 1040
1035/* ------------------------------------------------------------------------- */ 1041/* ------------------------------------------------------------------------- */
1036/* 1042/*
1037 * Process Horizontal Tab 1043 * Process Horizontal Tab
… …
1230/* 1236/*
1231 * Erase part or whole of a line 1237 * Erase part or whole of a line
1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1238 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1239 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1234 * 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
1235 */ 1242 */
1236void 1243void
1237rxvt_term::scr_erase_line (int mode) NOTHROW 1244rxvt_term::scr_erase_line (int mode) NOTHROW
1238{ 1245{
1239 unsigned int col, num; 1246 unsigned int col, num;
… …
1248 line.touch (); 1255 line.touch ();
1249 line.is_longer (0); 1256 line.is_longer (0);
1250 1257
1251 switch (mode) 1258 switch (mode)
1252 { 1259 {
1260 case 3:
1261 if (screen.flags & Screen_WrapNext)
1262 return;
1263
1264 /* fall through */
1265
1253 case 0: /* erase to end of line */ 1266 case 0: /* erase to end of line */
1254 col = screen.cur.col; 1267 col = screen.cur.col;
1255 num = ncol - col; 1268 num = ncol - col;
1256 min_it (line.l, col); 1269 min_it (line.l, col);
1270
1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1271 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1272 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1259 CLEAR_SELECTION (); 1273 CLEAR_SELECTION ();
1260 break; 1274 break;
1275
1261 case 1: /* erase to beginning of line */ 1276 case 1: /* erase to beginning of line */
1262 col = 0; 1277 col = 0;
1263 num = screen.cur.col + 1; 1278 num = screen.cur.col + 1;
1279
1264 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1280 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1265 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1281 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1266 CLEAR_SELECTION (); 1282 CLEAR_SELECTION ();
1267 break; 1283 break;
1284
1268 case 2: /* erase whole line */ 1285 case 2: /* erase whole line */
1269 col = 0; 1286 col = 0;
1270 num = ncol; 1287 num = ncol;
1271 line.l = 0; 1288 line.l = 0;
1272 if (selection.beg.row <= screen.cur.row 1289 if (selection.beg.row <= screen.cur.row
… …
1330 if (row >= nrow) /* Out Of Bounds */ 1347 if (row >= nrow) /* Out Of Bounds */
1331 return; 1348 return;
1332 1349
1333 min_it (num, nrow - row); 1350 min_it (num, nrow - row);
1334 1351
1335 if (rstyle & (RS_RVid | RS_Uline)) 1352 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1353 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1354 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1355 {
1339 ren = DEFAULT_RSTYLE; 1356 ren = DEFAULT_RSTYLE;
1340 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);
1341 } 1362 }
1342 else 1363 else
1343 { 1364 {
1344 ren = rstyle & (RS_fgMask | RS_bgMask); 1365 ren = rstyle & (RS_fgMask | RS_bgMask);
1366
1367 if (mapped)
1368 {
1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 ERASE_ROWS (row, num); 1371 XFillRectangle (dpy, vt, gc,
1372 0, Row2Pixel (row - view_start),
1373 (unsigned int)width,
1374 (unsigned int)Height2Pixel (num));
1348 gcvalue.foreground = pix_colors[Color_fg]; 1375 gcvalue.foreground = pix_colors[Color_fg];
1349 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1376 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1377 }
1350 } 1378 }
1351 1379
1352 for (; num--; row++) 1380 for (; num--; row++)
1353 { 1381 {
1354 scr_blank_screen_mem (ROW(row), rstyle); 1382 scr_blank_screen_mem (ROW(row), rstyle);
1383
1384 if (row - view_start < nrow)
1355 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1385 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1356 } 1386 }
1357} 1387}
1358 1388
1359#if !ENABLE_MINIMAL 1389#if !ENABLE_MINIMAL
1360void 1390void
… …
1434 * Insert/Delete <count> characters from the current position 1464 * Insert/Delete <count> characters from the current position
1435 */ 1465 */
1436void 1466void
1437rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1467rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1438{ 1468{
1439 int col, row;
1440 rend_t tr;
1441
1442 want_refresh = 1; 1469 want_refresh = 1;
1443 ZERO_SCROLLBACK (); 1470 ZERO_SCROLLBACK ();
1444 1471
1445 if (count <= 0) 1472 if (count <= 0)
1446 return; 1473 return;
… …
1448 scr_do_wrap (); 1475 scr_do_wrap ();
1449 1476
1450 selection_check (1); 1477 selection_check (1);
1451 min_it (count, ncol - screen.cur.col); 1478 min_it (count, ncol - screen.cur.col);
1452 1479
1453 row = screen.cur.row; 1480 int row = screen.cur.row;
1454 1481
1455 line_t *line = &ROW(row); 1482 line_t *line = &ROW(row);
1456 1483
1457 line->touch (); 1484 line->touch ();
1458 line->is_longer (0); 1485 line->is_longer (0);
1459 1486
1487 // nuke wide spanning the start
1488 if (line->t[screen.cur.col] == NOCHAR)
1489 scr_kill_char (*line, screen.cur.col);
1490
1460 switch (insdel) 1491 switch (insdel)
1461 { 1492 {
1462 case INSERT: 1493 case INSERT:
1463 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--)
1464 { 1500 {
1465 line->t[col] = line->t[col - count]; 1501 line->t[col] = line->t[col - count];
1466 line->r[col] = line->r[col - count]; 1502 line->r[col] = line->r[col - count];
1467 } 1503 }
1468
1469 line->l = min (line->l + count, ncol);
1470 1504
1471 if (selection.op && current_screen == selection.screen 1505 if (selection.op && current_screen == selection.screen
1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1473 { 1507 {
1474 if (selection.end.row != screen.cur.row 1508 if (selection.end.row != screen.cur.row
… …
1489 case ERASE: 1523 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1524 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1525 selection_check (1);
1492 screen.cur.col -= count; 1526 screen.cur.col -= count;
1493 1527
1494 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
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1532 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1533 break;
1497 1534
1498 case DELETE: 1535 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1536 line->l = max (line->l - count, 0);
1500 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
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1542 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1543 {
1503 line->t[col] = line->t[col + count]; 1544 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1545 line->r[col] = line->r[col + count];
1505 } 1546 }
1506 1547
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1548 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1549
1510 if (selection.op && current_screen == selection.screen 1550 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1551 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1552 {
1513 if (selection.end.row != screen.cur.row 1553 if (selection.end.row != screen.cur.row
… …
1649 { 1689 {
1650 rvideo_state = on; 1690 rvideo_state = on;
1651 1691
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP 1693#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1694 if (bg_pixmap == None)
1655#endif 1695#endif
1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1657 1697
1658 XGCValues gcvalue; 1698 XGCValues gcvalue;
1659 gcvalue.foreground = pix_colors[Color_fg]; 1699 gcvalue.foreground = pix_colors[Color_fg];
… …
1803 for (i = PART_BEG; i < RC_COUNT; i++) 1843 for (i = PART_BEG; i < RC_COUNT; i++)
1804 { 1844 {
1805 min_it (rc[i].col, ncol - 1); 1845 min_it (rc[i].col, ncol - 1);
1806 min_it (rc[i].row, nrow - 1); 1846 min_it (rc[i].row, nrow - 1);
1807 } 1847 }
1808// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1848
1809 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++)
1810 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);
1811 1851
1812 num_scr_allow = 0; 1852 num_scr_allow = 0;
1813 1853
… …
1886 1926
1887# ifndef NO_MAPALERT 1927# ifndef NO_MAPALERT
1888# ifdef MAPALERT_OPTION 1928# ifdef MAPALERT_OPTION
1889 if (option (Opt_mapAlert)) 1929 if (option (Opt_mapAlert))
1890# endif 1930# endif
1891 XMapWindow (dpy, parent[0]); 1931 XMapWindow (dpy, parent);
1892# endif 1932# endif
1893 1933
1894# if ENABLE_FRILLS 1934# if ENABLE_FRILLS
1895 if (option (Opt_urgentOnBell)) 1935 if (option (Opt_urgentOnBell))
1896 { 1936 set_urgency (1);
1897 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1898 {
1899 h->flags |= XUrgencyHint;
1900 XSetWMHints (dpy, parent[0], h);
1901 }
1902 }
1903# endif 1937# endif
1904 1938
1905 if (option (Opt_visualBell)) 1939 if (option (Opt_visualBell))
1906 { 1940 {
1907 rvideo_bell = true; 1941 rvideo_bell = true;
… …
1910 1944
1911 bell_ev.start (VISUAL_BELL_DURATION); 1945 bell_ev.start (VISUAL_BELL_DURATION);
1912 } 1946 }
1913 else 1947 else
1914 XBell (dpy, 0); 1948 XBell (dpy, 0);
1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1915#endif 1950#endif
1916} 1951}
1917 1952
1918/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1919/* ARGSUSED */
1920void 1954void
1921rxvt_term::scr_printscreen (int fullhist) NOTHROW 1955rxvt_term::scr_printscreen (int fullhist) NOTHROW
1922{ 1956{
1923#ifdef PRINTPIPE 1957#ifdef PRINTPIPE
1924 int nrows, row_start; 1958 int nrows, row_start;
1925 FILE *fd; 1959 FILE *fd = popen_printer ();
1926 1960
1927 if ((fd = popen_printer ()) == NULL) 1961 if (!fd)
1928 return; 1962 return;
1929 1963
1930 if (fullhist) 1964 if (fullhist)
1931 { 1965 {
1932 nrows = nrow - top_row; 1966 nrows = nrow - top_row;
… …
1938 row_start = view_start; 1972 row_start = view_start;
1939 } 1973 }
1940 1974
1941 wctomb (0, 0); 1975 wctomb (0, 0);
1942 1976
1943 for (int r1 = 0; r1 < nrows; r1++) 1977 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1944 { 1978 {
1945 text_t *tp = ROW(r1).t; 1979 text_t *tp = ROW(r1).t;
1946 int len = ROW(r1).l; 1980 int len = ROW(r1).l;
1947 1981
1948 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
… …
1977 * screen.text/screen.rend contain what the screen will change to. 2011 * screen.text/screen.rend contain what the screen will change to.
1978 */ 2012 */
1979void 2013void
1980rxvt_term::scr_refresh () NOTHROW 2014rxvt_term::scr_refresh () NOTHROW
1981{ 2015{
1982 unsigned char have_bg,
1983 showcursor; /* show the cursor */
1984 int16_t col, row, /* column/row we're processing */ 2016 int16_t col, row, /* column/row we're processing */
1985 ocrow; /* old cursor row */ 2017 ocrow; /* old cursor row */
1986 int i; /* tmp */ 2018 int i; /* tmp */
1987#ifndef NO_CURSORCOLOR 2019#ifndef NO_CURSORCOLOR
1988 rend_t cc1; /* store colours at cursor position (s) */ 2020 rend_t cc1; /* store colours at cursor position (s) */
… …
1997 return; 2029 return;
1998 2030
1999 /* 2031 /*
2000 * A: set up vars 2032 * A: set up vars
2001 */ 2033 */
2002 have_bg = 0;
2003 refresh_count = 0; 2034 refresh_count = 0;
2004 2035
2036 unsigned int old_screen_flags = screen.flags;
2037 char have_bg = 0;
2005#ifdef HAVE_BG_PIXMAP 2038#ifdef HAVE_BG_PIXMAP
2006 have_bg |= bgPixmap.pixmap != None; 2039 have_bg = bg_pixmap != None;
2007#endif 2040#endif
2008 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2009 2042
2010 /* 2043 /*
2011 * B: reverse any characters which are selected 2044 * B: reverse any characters which are selected
2012 */ 2045 */
2013 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;
2014 2054
2015 /* 2055 /*
2016 * C: set the cursor character (s) 2056 * C: set the cursor character (s)
2017 */ 2057 */
2018 { 2058 {
2019 unsigned char setoldcursor; 2059 unsigned char setoldcursor;
2020 2060
2021 showcursor = (screen.flags & Screen_VisibleCursor);
2022#ifdef CURSOR_BLINK 2061#ifdef CURSOR_BLINK
2023 if (hidden_cursor) 2062 if (hidden_cursor)
2024 showcursor = 0; 2063 showcursor = 0;
2025#endif 2064#endif
2026 2065
… …
2054 ccol2 = bgcolor_of (rstyle); 2093 ccol2 = bgcolor_of (rstyle);
2055#else 2094#else
2056 ccol2 = Color_bg; 2095 ccol2 = Color_bg;
2057#endif 2096#endif
2058 2097
2059 if (showcursor && focus) 2098 if (focus)
2060 { 2099 {
2061 if (option (Opt_cursorUnderline)) 2100 if (option (Opt_cursorUnderline))
2062 *crp ^= RS_Uline; 2101 *crp ^= RS_Uline;
2063 else 2102 else
2064 { 2103 {
… …
2099 oldcursor.col = screen.cur.col; 2138 oldcursor.col = screen.cur.col;
2100 } 2139 }
2101 } 2140 }
2102 } 2141 }
2103 2142
2104 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2105#if ENABLE_OVERLAY
2106 scr_swap_overlay ();
2107#endif
2108
2109#ifndef NO_SLOW_LINK_SUPPORT 2143#ifndef NO_SLOW_LINK_SUPPORT
2110 /* 2144 /*
2111 * D: CopyArea pass - very useful for slower links 2145 * D: CopyArea pass - very useful for slower links
2112 * This has been deliberately kept simple. 2146 * This has been deliberately kept simple.
2113 */ 2147 */
… …
2202 continue; 2236 continue;
2203 2237
2204 // redraw one or more characters 2238 // redraw one or more characters
2205 2239
2206 // seek to the beginning of wide characters 2240 // seek to the beginning of wide characters
2207 while (stp[col] == NOCHAR && col > 0) 2241 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2208 --col; 2242 --col;
2209 2243
2210 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2244 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2211 text_t *text = stp + col; 2245 text_t *text = stp + col;
2212 int count = 1; 2246 int count = 1;
2213 2247
2214 dtp[col] = stp[col]; 2248 dtp[col] = stp[col];
2215 drp[col] = rend; 2249 drp[col] = rend;
… …
2219 for (i = 0; ++col < ncol; ) 2253 for (i = 0; ++col < ncol; )
2220 { 2254 {
2221 if (stp[col] == NOCHAR) 2255 if (stp[col] == NOCHAR)
2222 { 2256 {
2223 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2224 drp[col] = rend; 2258 drp[col] = srp[col];
2259
2225 count++; 2260 count++;
2226 i++; 2261 i++;
2227 2262
2228 continue; 2263 continue;
2229 } 2264 }
… …
2249 2284
2250 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2251 count -= i; /* dump any matching trailing chars */ 2286 count -= i; /* dump any matching trailing chars */
2252 2287
2253 // sometimes we optimize away the trailing NOCHAR's, add them back 2288 // sometimes we optimize away the trailing NOCHAR's, add them back
2254 while (i && text[count] == NOCHAR) 2289 while (ecb_unlikely (i && text[count] == NOCHAR))
2255 count++, i--; 2290 count++, i--;
2256 2291
2257 /* 2292 /*
2258 * Determine the attributes for the string 2293 * Determine the attributes for the string
2259 */ 2294 */
2260 int fore = fgcolor_of (rend); // desired foreground 2295 int fore = fgcolor_of (rend); // desired foreground
2261 int back = bgcolor_of (rend); // desired background 2296 int back = bgcolor_of (rend); // desired background
2262 2297
2263 // 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
2264 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)))
2265 { 2300 {
2266 bool invert = rend & RS_RVid; 2301 bool invert = rend & RS_RVid;
2267 2302
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2269 if (rend & RS_Bold && fore == Color_fg) 2304 if (rend & RS_Bold && fore == Color_fg)
… …
2288 2323
2289 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2324 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2290 fore = Color_UL; 2325 fore = Color_UL;
2291#endif 2326#endif
2292 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
2293 if (invert) 2348 if (invert)
2294 { 2349 {
2295#ifdef OPTION_HC
2296 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2297 || !ISSET_PIXCOLOR (Color_HC))
2298#endif
2299 /* invert the column if no highlightColor is set or it is the
2300 * current cursor column */
2301 ::swap (fore, back); 2350 ::swap (fore, back);
2302#ifdef OPTION_HC
2303 else if (ISSET_PIXCOLOR (Color_HC))
2304 back = Color_HC;
2305#endif
2306 2351
2307#ifndef NO_BOLD_UNDERLINE_REVERSE 2352#ifndef NO_BOLD_UNDERLINE_REVERSE
2308# ifndef OPTION_HC
2309 if (ISSET_PIXCOLOR (Color_RV))
2310 back = Color_RV;
2311# endif
2312 if (fore == back) 2353 if (fore == back)
2313 { 2354 {
2314 fore = Color_bg; 2355 fore = Color_bg;
2315 back = Color_fg; 2356 back = Color_fg;
2316 } 2357 }
… …
2352 /* 2393 /*
2353 * Actually do the drawing of the string here 2394 * Actually do the drawing of the string here
2354 */ 2395 */
2355 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2396 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2356 2397
2357 if (have_bg && back == Color_bg) 2398 if (ecb_likely (have_bg && back == Color_bg))
2358 { 2399 {
2359 // this is very ugly, maybe push it into ->draw? 2400 // this is very ugly, maybe push it into ->draw?
2360 2401
2361 for (i = 0; i < count; i++) /* don't draw empty strings */ 2402 for (i = 0; i < count; i++) /* don't draw empty strings */
2362 if (text[i] != ' ') 2403 if (text[i] != ' ')
… …
2369 did_clear: ; 2410 did_clear: ;
2370 } 2411 }
2371 else 2412 else
2372 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2373 2414
2374 if (rend & RS_Uline && font->descent > 1 && fore != back) 2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2375 { 2416 {
2376#if ENABLE_FRILLS 2417#if ENABLE_FRILLS
2377 if (ISSET_PIXCOLOR (Color_underline)) 2418 if (ISSET_PIXCOLOR (Color_underline))
2378 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2419 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2379 else 2420 else
2380#endif 2421#endif
2381 XSetForeground (dpy, gc, pix_colors[fore]); 2422 XSetForeground (dpy, gc, pix_colors[fore]);
2382 2423
2383 XDrawLine (dpy, drawBuffer, gc, 2424 XDrawLine (dpy, vt, gc,
2384 xpixel, ypixel + font->ascent + 1, 2425 xpixel, ypixel + font->ascent + 1,
2385 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2426 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2386 } 2427 }
2387 } /* for (col....) */ 2428 } /* for (col....) */
2388 } /* for (row....) */ 2429 } /* for (row....) */
2389
2390#if ENABLE_OVERLAY
2391 scr_swap_overlay ();
2392#endif
2393 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2394 2430
2395 /* 2431 /*
2396 * G: cleanup cursor and display outline cursor if necessary 2432 * G: cleanup cursor and display outline cursor if necessary
2397 */ 2433 */
2398 if (showcursor) 2434 if (showcursor)
… …
2426 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2462 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2427 else 2463 else
2428#endif 2464#endif
2429 XSetForeground (dpy, gc, pix_colors[ccol1]); 2465 XSetForeground (dpy, gc, pix_colors[ccol1]);
2430 2466
2431 XDrawRectangle (dpy, drawBuffer, gc, 2467 XDrawRectangle (dpy, vt, gc,
2432 Col2Pixel (col), 2468 Col2Pixel (col),
2433 Row2Pixel (oldcursor.row), 2469 Row2Pixel (oldcursor.row),
2434 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2470 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2435 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2471 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2436 } 2472 }
2437 } 2473 }
2438 2474
2439 /* 2475 /*
2440 * H: cleanup selection 2476 * H: cleanup selection
2441 */ 2477 */
2478#if ENABLE_OVERLAY
2479 scr_swap_overlay ();
2480#endif
2481 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2482
2442 scr_reverse_selection (); 2483 scr_reverse_selection ();
2443 2484
2485 screen.flags = old_screen_flags;
2444 num_scr = 0; 2486 num_scr = 0;
2445 num_scr_allow = 1; 2487 num_scr_allow = 1;
2446} 2488}
2447 2489
2448void 2490void
… …
2469 scr_remap_chars (swap_buf [i]); 2511 scr_remap_chars (swap_buf [i]);
2470 } 2512 }
2471} 2513}
2472 2514
2473void 2515void
2474rxvt_term::scr_recolour () NOTHROW 2516rxvt_term::scr_recolour (bool refresh) NOTHROW
2475{ 2517{
2518 bool transparent = false;
2519
2476#ifdef HAVE_BG_PIXMAP 2520#ifdef HAVE_BG_PIXMAP
2477 bgPixmap.apply (); 2521 if (bg_pixmap != None)
2478#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);
2479 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 {
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2542 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2543 }
2483 2544
2484# if HAVE_SCROLLBARS 2545 XClearWindow (dpy, parent);
2546
2485 if (scrollBar.win) 2547 if (scrollBar.win)
2486 { 2548 {
2549 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else
2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2488 scrollBar.setIdle (); 2553 scrollBar.state = STATE_IDLE;
2489 scrollbar_show (0); 2554 scrollBar.show (0);
2490 } 2555 }
2491# endif
2492 2556
2557 if (refresh)
2558 {
2493 scr_clear (); 2559 scr_clear ();
2494 scr_touch (true); 2560 scr_touch (true);
2561 }
2495 want_refresh = 1; 2562 want_refresh = 1;
2496
2497#endif
2498} 2563}
2499 2564
2500/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2501void 2566void
2502rxvt_term::scr_clear (bool really) NOTHROW 2567rxvt_term::scr_clear (bool really) NOTHROW
… …
2569 { 2634 {
2570#if !ENABLE_MINIMAL 2635#if !ENABLE_MINIMAL
2571 if (selection.rect) 2636 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2637 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2639 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2640 else
2576#endif 2641#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2642 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2643 selection.end.row, selection.end.col,
2579 RS_RVid); 2644 RS_Sel | RS_RVid);
2580 } 2645 }
2581} 2646}
2582 2647
2583/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2584/* 2649/*
… …
2589void 2654void
2590rxvt_term::scr_dump (int fd) NOTHROW 2655rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2656{
2592 int row, wrote; 2657 int row, wrote;
2593 unsigned int width, towrite; 2658 unsigned int width, towrite;
2594 char r1[] = "\n"; 2659 const char r1[] = "\n";
2595 2660
2596 for (row = saveLines - nsaved; 2661 for (row = saveLines + top_row;
2597 row < saveLines + nrow - 1; row++) 2662 row < saveLines + nrow - 1; row++)
2598 { 2663 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l 2664 width = row_buf[row].l >= 0 ? row_buf[row].l
2600 : ncol; 2665 : ncol;
2601 for (towrite = width; towrite; towrite -= wrote) 2666 for (towrite = width; towrite; towrite -= wrote)
… …
2645/* ------------------------------------------------------------------------- */ 2710/* ------------------------------------------------------------------------- */
2646/* 2711/*
2647 * Paste a selection direct to the command fd 2712 * Paste a selection direct to the command fd
2648 */ 2713 */
2649void 2714void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2716{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2717 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2718 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2719 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2720 data[i] = C0_CR;
2656 2721
2722 if (priv_modes & PrivMode_BracketPaste)
2723 tt_printf ("\e[200~");
2724
2657 tt_write (data, len); 2725 tt_write (data, len);
2658}
2659 2726
2660/* ------------------------------------------------------------------------- */ 2727 if (priv_modes & PrivMode_BracketPaste)
2661/* 2728 tt_printf ("\e[201~");
2662 * Respond to a notification that a primary selection has been sent
2663 * EXT: SelectionNotify
2664 */
2665void
2666rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2667{
2668 if (prop == None) /* check for failed XConvertSelection */
2669 {
2670 if ((selection_type & Sel_CompoundText))
2671 {
2672 int selnum = selection_type & Sel_whereMask;
2673
2674 selection_type = 0;
2675 if (selnum != Sel_direct)
2676 selection_request_other (XA_STRING, selnum);
2677 }
2678
2679 if ((selection_type & Sel_UTF8String))
2680 {
2681 int selnum = selection_type & Sel_whereMask;
2682
2683 selection_type = Sel_CompoundText;
2684 if (selnum != Sel_direct)
2685 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2686 else
2687 selection_type = 0;
2688 }
2689
2690 return;
2691 }
2692
2693 unsigned long bytes_after;
2694 XTextProperty ct;
2695
2696 if (XGetWindowProperty (dpy, win, prop,
2697 0, PROP_SIZE / 4,
2698 delete_prop, AnyPropertyType,
2699 &ct.encoding, &ct.format,
2700 &ct.nitems, &bytes_after,
2701 &ct.value) != Success)
2702 {
2703 ct.value = 0;
2704 goto bailout;
2705 }
2706
2707 if (ct.encoding == None)
2708 goto bailout;
2709
2710 if (bytes_after)
2711 {
2712 // fetch and append remaining data
2713 XTextProperty ct2;
2714
2715 if (XGetWindowProperty (dpy, win, prop,
2716 ct.nitems / 4, (bytes_after + 3) / 4,
2717 delete_prop, AnyPropertyType,
2718 &ct2.encoding, &ct2.format,
2719 &ct2.nitems, &bytes_after,
2720 &ct2.value) != Success)
2721 goto bailout;
2722
2723 // realloc should be compatible to XFree, here, and elsewhere, too
2724 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2725 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2726 ct.nitems += ct2.nitems;
2727
2728 XFree (ct2.value);
2729 }
2730
2731 if (ct.value == 0)
2732 goto bailout;
2733
2734 if (ct.encoding == xa[XA_INCR])
2735 {
2736 // INCR selection, start handshake
2737 if (!delete_prop)
2738 XDeleteProperty (dpy, win, prop);
2739
2740 selection_wait = Sel_incr;
2741 incr_buf_fill = 0;
2742 incr_ev.start (10);
2743
2744 goto bailout;
2745 }
2746
2747 if (ct.nitems == 0)
2748 {
2749 if (selection_wait == Sel_incr)
2750 {
2751 XFree (ct.value);
2752
2753 // finally complete, now paste the whole thing
2754 selection_wait = Sel_normal;
2755 ct.value = (unsigned char *)incr_buf;
2756 ct.nitems = incr_buf_fill;
2757 incr_buf = 0;
2758 incr_buf_size = 0;
2759 incr_ev.stop ();
2760 }
2761 else
2762 {
2763 if (selection_wait == Sel_normal
2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2765 {
2766 /*
2767 * pass through again trying CUT_BUFFER0 if we've come from
2768 * XConvertSelection () but nothing was presented
2769 */
2770 selection_paste (display->root, XA_CUT_BUFFER0, False);
2771 }
2772
2773 goto bailout;
2774 }
2775 }
2776 else if (selection_wait == Sel_incr)
2777 {
2778 incr_ev.start (10);
2779
2780 while (incr_buf_fill + ct.nitems > incr_buf_size)
2781 {
2782 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2784 }
2785
2786 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2787 incr_buf_fill += ct.nitems;
2788
2789 goto bailout;
2790 }
2791
2792 char **cl;
2793 int cr;
2794
2795#if !ENABLE_MINIMAL
2796 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2797 // so recode it manually
2798 if (ct.encoding == xa[XA_UTF8_STRING])
2799 {
2800 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2801 char *s = rxvt_wcstombs (w);
2802 free (w);
2803 // TODO: strlen == only the first element will be converted. well...
2804 paste (s, strlen (s));
2805 free (s);
2806 }
2807 else
2808#endif
2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2810 && cl)
2811 {
2812 for (int i = 0; i < cr; i++)
2813 paste (cl[i], strlen (cl[i]));
2814
2815 XFreeStringList (cl);
2816 }
2817 else
2818 paste ((char *)ct.value, ct.nitems); // paste raw
2819
2820bailout:
2821 XFree (ct.value);
2822
2823 if (selection_wait == Sel_normal)
2824 selection_wait = Sel_none;
2825} 2729}
2826 2730
2827void 2731void
2828rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW 2732rxvt_term::paste (char *data, unsigned int len) NOTHROW
2829{ 2733{
2830 selection_wait = Sel_none; 2734 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2831
2832 incr_buf_size = 0;
2833 free (incr_buf);
2834
2835 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2836}
2837
2838void
2839rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2840{
2841 if (prop == None || selection_wait != Sel_incr)
2842 return; 2735 return;
2843 2736
2844 selection_paste (win, prop, true); 2737 tt_paste (data, len);
2845} 2738}
2846 2739
2847/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2848/* 2741/*
2849 * Request the current selection: 2742 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2850 * Order: > internal selection if available 2743 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2744 * as fallback
2852 * > CUT_BUFFER0
2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2854 * will auto fallback to CUT_BUFFER0
2855 * EXT: button 2 release 2745 * EXT: button 2 release
2856 */ 2746 */
2857void 2747void
2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2748rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2859{ 2749{
2860 if (selection.text && selnum == Sel_Primary) 2750 if (!selection_req)
2861 {
2862 /* internal selection */
2863 char *str = rxvt_wcstombs (selection.text, selection.len);
2864 paste (str, strlen (str));
2865 free (str);
2866 return;
2867 } 2751 {
2868 else 2752 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2753 selection_req->run ();
2869 { 2754 }
2870 selection_request_time = tm;
2871 selection_wait = Sel_normal;
2872
2873#if X_HAVE_UTF8_STRING
2874 selection_type = Sel_UTF8String;
2875 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2876 return;
2877#else
2878 selection_type = Sel_CompoundText;
2879 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2880 return;
2881#endif
2882 }
2883
2884 selection_wait = Sel_none; /* don't loop in selection_paste () */
2885 selection_paste (display->root, XA_CUT_BUFFER0, false);
2886}
2887
2888int
2889rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2890{
2891 Atom sel;
2892
2893 selection_type |= selnum;
2894
2895 if (selnum == Sel_Primary)
2896 sel = XA_PRIMARY;
2897 else if (selnum == Sel_Secondary)
2898 sel = XA_SECONDARY;
2899 else
2900 sel = xa[XA_CLIPBOARD];
2901
2902 if (XGetSelectionOwner (dpy, sel) != None)
2903 {
2904 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2905 vt, selection_request_time);
2906 return 1;
2907 }
2908
2909 return 0;
2910} 2755}
2911 2756
2912/* ------------------------------------------------------------------------- */ 2757/* ------------------------------------------------------------------------- */
2913/* 2758/*
2914 * Clear all selected text 2759 * Clear all selected text
2915 * EXT: SelectionClear 2760 * EXT: SelectionClear
2916 */ 2761 */
2917void 2762void
2918rxvt_term::selection_clear () NOTHROW 2763rxvt_term::selection_clear (bool clipboard) NOTHROW
2919{ 2764{
2765 if (!clipboard)
2766 {
2920 want_refresh = 1; 2767 want_refresh = 1;
2921 free (selection.text); 2768 free (selection.text);
2922 selection.text = NULL; 2769 selection.text = NULL;
2923 selection.len = 0; 2770 selection.len = 0;
2924 CLEAR_SELECTION (); 2771 CLEAR_SELECTION ();
2925 2772
2926 if (display->selection_owner == this) 2773 if (display->selection_owner == this)
2927 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 }
2928} 2785}
2929 2786
2930/* ------------------------------------------------------------------------- */ 2787/* ------------------------------------------------------------------------- */
2931/* 2788/*
2932 * Copy a selection into the cut buffer 2789 * Copy a selection into the cut buffer
2933 * EXT: button 1 or 3 release 2790 * EXT: button 1 or 3 release
2934 */ 2791 */
2935void 2792void
2936rxvt_term::selection_make (Time tm) 2793rxvt_term::selection_make (Time tm)
2937{ 2794{
2938 int i; 2795 int size;
2939 wchar_t *new_selection_text; 2796 wchar_t *new_selection_text;
2940 text_t *t; 2797 text_t *t;
2941 2798
2942 switch (selection.op) 2799 switch (selection.op)
2943 { 2800 {
… …
2959 return; /* nothing selected, go away */ 2816 return; /* nothing selected, go away */
2960 2817
2961 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)))
2962 return; 2819 return;
2963 2820
2964 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2821 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2965 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));
2966 2823
2967 int ofs = 0; 2824 int ofs = 0;
2968 int extra = 0; 2825 int extra = 0;
2969 2826
2970 int col = selection.beg.col; 2827 int col = selection.beg.col;
… …
2976 { 2833 {
2977#if !ENABLE_MINIMAL 2834#if !ENABLE_MINIMAL
2978 if (selection.rect) 2835 if (selection.rect)
2979 { 2836 {
2980 col = selection.beg.col; 2837 col = selection.beg.col;
2981 end_col = ncol + 1; 2838 end_col = selection.end.col;
2982 } 2839 }
2983 else 2840 else
2984#endif 2841#endif
2985 end_col = ROW(row).l; 2842 end_col = ROW(row).l;
2986 2843
2987 col = max (col, 0); 2844 col = max (col, 0);
2988 2845
2989 if (row == selection.end.row 2846 if (row == selection.end.row)
2990#if !ENABLE_MINIMAL
2991 || selection.rect
2992#endif
2993 )
2994 min_it (end_col, selection.end.col); 2847 min_it (end_col, selection.end.col);
2995 2848
2996 t = ROW(row).t + col; 2849 t = ROW(row).t + col;
2997 2850
2998 for (; col < end_col; col++) 2851 for (; col < end_col; col++)
… …
3006 2859
3007 extra -= (len - 1); 2860 extra -= (len - 1);
3008 2861
3009 if (extra < 0) 2862 if (extra < 0)
3010 { 2863 {
3011 extra += i; 2864 extra += size;
3012 i += i; 2865 size += size;
3013 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));
3014 } 2867 }
3015 2868
3016 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2869 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3017 } 2870 }
3018#endif 2871#endif
… …
3030 2883
3031 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3032 } 2885 }
3033 else 2886 else
3034#endif 2887#endif
3035 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))
3036 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3037 } 2892 }
3038
3039 if (end_col != selection.end.col)
3040 new_selection_text[ofs++] = C0_LF;
3041 2893
3042 new_selection_text[ofs] = 0; 2894 new_selection_text[ofs] = 0;
3043 2895
3044 if (ofs == 0) 2896 if (ofs == 0)
3045 { 2897 {
… …
3058 2910
3059 selection_grab (tm); 2911 selection_grab (tm);
3060} 2912}
3061 2913
3062bool 2914bool
3063rxvt_term::selection_grab (Time tm) NOTHROW 2915rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3064{ 2916{
2917 Atom sel;
2918
2919 if (!clipboard)
2920 {
3065 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 }
3066 2929
3067 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2930 XSetSelectionOwner (dpy, sel, vt, tm);
3068 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2931 if (XGetSelectionOwner (dpy, sel) == vt)
3069 { 2932 {
3070 display->set_selection_owner (this); 2933 display->set_selection_owner (this, clipboard);
3071 return true; 2934 return true;
3072 } 2935 }
3073 else 2936 else
3074 { 2937 {
3075 selection_clear (); 2938 selection_clear (clipboard);
3076 return false; 2939 return false;
3077 } 2940 }
3078 2941
3079#if 0 2942#if 0
3080 XTextProperty ct; 2943 XTextProperty ct;
… …
3540 * EXT: SelectionRequest 3403 * EXT: SelectionRequest
3541 */ 3404 */
3542void 3405void
3543rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3544{ 3407{
3408 Atom property = rq.property == None ? rq.target : rq.property;
3545 XSelectionEvent ev; 3409 XSelectionEvent ev;
3546 3410
3547 ev.type = SelectionNotify; 3411 ev.type = SelectionNotify;
3548 ev.property = None; 3412 ev.property = None;
3549 ev.display = rq.display; 3413 ev.display = rq.display;
… …
3564 *target++ = xa[XA_COMPOUND_TEXT]; 3428 *target++ = xa[XA_COMPOUND_TEXT];
3565#if X_HAVE_UTF8_STRING 3429#if X_HAVE_UTF8_STRING
3566 *target++ = xa[XA_UTF8_STRING]; 3430 *target++ = xa[XA_UTF8_STRING];
3567#endif 3431#endif
3568 3432
3569 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3433 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3570 32, PropModeReplace, 3434 32, PropModeReplace,
3571 (unsigned char *)target_list, target - target_list); 3435 (unsigned char *)target_list, target - target_list);
3572 ev.property = rq.property; 3436 ev.property = property;
3573 } 3437 }
3574#if TODO // TODO 3438#if TODO // TODO
3575 else if (rq.target == xa[XA_MULTIPLE]) 3439 else if (rq.target == xa[XA_MULTIPLE])
3576 { 3440 {
3577 /* TODO: Handle MULTIPLE */ 3441 /* TODO: Handle MULTIPLE */
3578 } 3442 }
3579#endif 3443#endif
3580 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3444 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3581 { 3445 {
3582 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3446 XChangeProperty (dpy, rq.requestor, property, rq.target,
3583 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3447 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3584 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;
3585 } 3455 }
3586 else if (rq.target == XA_STRING 3456 else if (rq.target == XA_STRING
3587 || rq.target == xa[XA_TEXT] 3457 || rq.target == xa[XA_TEXT]
3588 || rq.target == xa[XA_COMPOUND_TEXT] 3458 || rq.target == xa[XA_COMPOUND_TEXT]
3589 || rq.target == xa[XA_UTF8_STRING] 3459 || rq.target == xa[XA_UTF8_STRING]
… …
3621 { 3491 {
3622 target = xa[XA_COMPOUND_TEXT]; 3492 target = xa[XA_COMPOUND_TEXT];
3623 style = enc_compound_text; 3493 style = enc_compound_text;
3624 } 3494 }
3625 3495
3626 if (selection.text) 3496 if (rq.selection == XA_PRIMARY && selection.text)
3627 { 3497 {
3628 cl = selection.text; 3498 cl = selection.text;
3629 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;
3630 } 3505 }
3631 else 3506 else
3632 { 3507 {
3633 cl = L""; 3508 cl = L"";
3634 selectlen = 0; 3509 selectlen = 0;
… …
3655 ct.value = (unsigned char *)cl; 3530 ct.value = (unsigned char *)cl;
3656 ct.nitems = selectlen; 3531 ct.nitems = selectlen;
3657 ct.encoding = target; 3532 ct.encoding = target;
3658 } 3533 }
3659 3534
3660 XChangeProperty (dpy, rq.requestor, rq.property, 3535 XChangeProperty (dpy, rq.requestor, property,
3661 ct.encoding, 8, PropModeReplace, 3536 ct.encoding, 8, PropModeReplace,
3662 ct.value, (int)ct.nitems); 3537 ct.value, (int)ct.nitems);
3663 ev.property = rq.property; 3538 ev.property = property;
3664 3539
3665 if (freect) 3540 if (freect)
3666 XFree (ct.value); 3541 XFree (ct.value);
3667 } 3542 }
3668 3543
… …
3702 h += 2; min_it (h, nrow); 3577 h += 2; min_it (h, nrow);
3703 3578
3704 x -= 1; clamp_it (x, 0, ncol - w); 3579 x -= 1; clamp_it (x, 0, ncol - w);
3705 y -= 1; clamp_it (y, 0, nrow - h); 3580 y -= 1; clamp_it (y, 0, nrow - h);
3706 3581
3707 ov_x = x; ov_y = y; 3582 ov.x = x; ov.y = y;
3708 ov_w = w; ov_h = h; 3583 ov.w = w; ov.h = h;
3709 3584
3710 ov_text = new text_t *[h]; 3585 ov.text = new text_t *[h];
3711 ov_rend = new rend_t *[h]; 3586 ov.rend = new rend_t *[h];
3712 3587
3713 for (y = 0; y < h; y++) 3588 for (y = 0; y < h; y++)
3714 { 3589 {
3715 text_t *tp = ov_text[y] = new text_t[w]; 3590 text_t *tp = ov.text[y] = new text_t[w];
3716 rend_t *rp = ov_rend[y] = new rend_t[w]; 3591 rend_t *rp = ov.rend[y] = new rend_t[w];
3717 3592
3718 text_t t0, t1, t2; 3593 text_t t0, t1, t2;
3719 rend_t r = OVERLAY_RSTYLE; 3594 rend_t r = OVERLAY_RSTYLE;
3720 3595
3721 if (y == 0) 3596 if (y == 0)
… …
3740} 3615}
3741 3616
3742void 3617void
3743rxvt_term::scr_overlay_off () NOTHROW 3618rxvt_term::scr_overlay_off () NOTHROW
3744{ 3619{
3745 if (!ov_text) 3620 if (!ov.text)
3746 return; 3621 return;
3747 3622
3748 want_refresh = 1; 3623 want_refresh = 1;
3749 3624
3750 for (int y = 0; y < ov_h; y++) 3625 for (int y = 0; y < ov.h; y++)
3751 { 3626 {
3752 delete [] ov_text[y]; 3627 delete [] ov.text[y];
3753 delete [] ov_rend[y]; 3628 delete [] ov.rend[y];
3754 } 3629 }
3755 3630
3756 delete [] ov_text; ov_text = 0; 3631 delete [] ov.text; ov.text = 0;
3757 delete [] ov_rend; ov_rend = 0; 3632 delete [] ov.rend; ov.rend = 0;
3758} 3633}
3759 3634
3760void 3635void
3761rxvt_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
3762{ 3637{
3763 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3638 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3764 return; 3639 return;
3765 3640
3766 x++, y++; 3641 x++, y++;
3767 3642
3768 ov_text[y][x] = text; 3643 ov.text[y][x] = text;
3769 ov_rend[y][x] = rend; 3644 ov.rend[y][x] = rend;
3770} 3645}
3771 3646
3772void 3647void
3773rxvt_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
3774{ 3649{
… …
3793} 3668}
3794 3669
3795void 3670void
3796rxvt_term::scr_swap_overlay () NOTHROW 3671rxvt_term::scr_swap_overlay () NOTHROW
3797{ 3672{
3798 if (!ov_text) 3673 if (!ov.text)
3799 return; 3674 return;
3800 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
3801 // swap screen mem with overlay 3681 // swap screen mem with overlay
3802 for (int y = ov_h; y--; ) 3682 for (int y = ov.h; y--; )
3803 { 3683 {
3804 text_t *t1 = ov_text[y]; 3684 text_t *t1 = ov.text[y];
3805 rend_t *r1 = ov_rend[y]; 3685 rend_t *r1 = ov.rend[y];
3806 3686
3807 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;
3808 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;
3809 3689
3810 for (int x = ov_w; x--; ) 3690 for (int x = ov.w; x--; )
3811 { 3691 {
3812 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3692 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3813 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));
3814 } 3694 }
3815 } 3695 }

Diff Legend

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