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.289 by root, Fri Dec 14 05:25:26 2007 UTC vs.
Revision 1.385 by sf-exg, Wed Jul 6 00:40:10 2011 UTC

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

Diff Legend

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