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.300 by ayin, Sun Jan 27 22:48:33 2008 UTC vs.
Revision 1.371 by sf-exg, Wed Feb 9 23:07:18 2011 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 85
87/* 86/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 88 */
92#define CLEAR_ROWS(row, num) \
93 if (mapped) \
94 XClearArea (dpy, vt, 0, \
95 Row2Pixel (row), (unsigned int)width, \
96 (unsigned int)Height2Pixel (num), False)
97
98#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
99 if (mapped) \ 90 if (mapped) \
100 XClearArea (dpy, vt, x, y, \ 91 XClearArea (dpy, vt, x, y, \
101 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
102 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
103 94
104#define ERASE_ROWS(row, num) \
105 XFillRectangle (dpy, vt, gc, \
106 0, Row2Pixel (row), \
107 (unsigned int)width, \
108 (unsigned int)Height2Pixel (num))
109
110/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
111 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
112 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
113 98
114/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
… …
146 131
147 l.l = 0; 132 l.l = 0;
148 l.f = 0; 133 l.f = 0;
149} 134}
150 135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
151/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
152 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
153 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
154 160
155void 161void
156rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
157{ 163{
158#if ENABLE_OVERLAY
159 scr_overlay_off ();
160#endif
161
162 rvideo_mode = false;
163 view_start = 0; 164 view_start = 0;
164 num_scr = 0; 165 num_scr = 0;
165 166
166 if (ncol == 0) 167 if (ncol == 0)
167 ncol = 80; 168 ncol = 80;
… …
169 if (nrow == 0) 170 if (nrow == 0)
170 nrow = 24; 171 nrow = 24;
171 172
172 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 174 return;
174
175 if (current_screen != PRIMARY)
176 scr_swap_screen ();
177 175
178 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
179 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
180 { 178 {
181 //TODO//FIXME 179 //TODO//FIXME
… …
234 selection.text = NULL; 232 selection.text = NULL;
235 selection.len = 0; 233 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
238 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
239 } 239 }
240 else 240 else
241 { 241 {
242 /* 242 /*
243 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
281 281
282 if (top_row) 282 if (top_row)
283 { 283 {
284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
285 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
286 287
287 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 290
290 do 291 do
291 { 292 {
292 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
293#ifdef DEBUG_STRICT
294 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
295#endif
296 int plines = 1; 295 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 297
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300 { 299 {
… …
394 delete old_ta; 393 delete old_ta;
395 delete old_ra; 394 delete old_ra;
396 395
397 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
398 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
399 399
400 free (tabs); 400 free (tabs);
401 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0;
402 405
403 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
404 407
405 prev_nrow = nrow; 408 prev_nrow = nrow;
406 prev_ncol = ncol; 409 prev_ncol = ncol;
407
408 tabs = (char *)rxvt_malloc (ncol);
409
410 for (int col = ncol; --col; )
411 tabs [col] = col % TABSIZE == 0;
412
413 if (current_screen != PRIMARY)
414 scr_swap_screen ();
415 410
416 tt_winch (); 411 tt_winch ();
417 412
418 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
419} 414}
… …
431 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
432 427
433 free (row_buf); 428 free (row_buf);
434 free (swap_buf); 429 free (swap_buf);
435 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
436 free (tabs); 433 free (tabs);
437 434 tabs = 0;
438 row_buf = 0; // signal that we freed all the arrays
439 } 435 }
440} 436}
441 437
442/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
443/* 439/*
444 * Hard reset 440 * Hard/Soft reset
445 */ 441 */
446void 442void
447rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
448{ 444{
449 scr_release (); 445 scr_release ();
450 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
451 scr_reset (); 449 scr_reset ();
452 450
453 scr_clear (true); 451 scr_clear (true);
454 scr_refresh (); 452 scr_refresh ();
453}
454
455void
456rxvt_term::scr_soft_reset ()
457{
458 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY
460 scr_overlay_off ();
461#endif
462
463 if (current_screen != PRIMARY)
464 scr_swap_screen ();
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
455} 469}
456 470
457/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
458 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
459 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
497 } 511 }
498 512
499 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
500 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
501 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
502#ifdef DEBUG_STRICT
503 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
504 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
505#endif
506} 518}
507 519
508void 520void
509rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
510{ 522{
… …
535 want_refresh = 1; 547 want_refresh = 1;
536 view_start = 0; 548 view_start = 0;
537 549
538 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
539 551
540 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
541 553
542#if NSCREENS 554#if NSCREENS
543 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
544 { 556 {
545 num_scr = 0; 557 num_scr = 0;
… …
770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
772 } 784 }
773 } 785 }
774 786
775#ifdef DEBUG_STRICT
776 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
777 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
778 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
779#endif
780 int row = screen.cur.row; 790 int row = screen.cur.row;
781 791
782 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783 793
784 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
785 795
786 while (str < strend) 796 while (str < strend)
787 { 797 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 799
790 if (c < 0x20) 800 if (expect_false (c < 0x20))
791 if (c == C0_LF) 801 if (c == C0_LF)
792 { 802 {
793 max_it (line->l, screen.cur.col); 803 max_it (line->l, screen.cur.col);
794 804
795 screen.flags &= ~Screen_WrapNext; 805 screen.flags &= ~Screen_WrapNext;
… …
814 { 824 {
815 scr_tab (1, true); 825 scr_tab (1, true);
816 continue; 826 continue;
817 } 827 }
818 828
829 if (expect_false (
819 if (checksel /* see if we're writing within selection */ 830 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 832 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 ))
822 { 834 {
823 checksel = 0; 835 checksel = 0;
824 /* 836 /*
825 * If we wrote anywhere in the selected area, kill the selection 837 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 838 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 839 * should be a similar check.
828 */ 840 */
829 CLEAR_SELECTION (); 841 CLEAR_SELECTION ();
830 } 842 }
831 843
832 if (screen.flags & Screen_WrapNext) 844 if (expect_false (screen.flags & Screen_WrapNext))
833 { 845 {
834 scr_do_wrap (); 846 scr_do_wrap ();
835 847
836 line->l = ncol; 848 line->l = ncol;
837 line->is_longer (1); 849 line->is_longer (1);
… …
839 row = screen.cur.row; 851 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 852 line = &ROW(row); /* _must_ refresh */
841 } 853 }
842 854
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 855 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 857 c = 0xfffd;
846 858
847 // rely on wcwidth to tell us the character width, do wcwidth before 859 // rely on wcwidth to tell us the character width, do wcwidth before
848 // further replacements, as wcwidth might return -1 for the line 860 // further replacements, as wcwidth might return -1 for the line
849 // drawing characters below as they might be invalid in the current 861 // drawing characters below as they might be invalid in the current
850 // locale. 862 // locale.
851 int width = WCWIDTH (c); 863 int width = WCWIDTH (c);
852 864
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 866 {
855 // vt100 special graphics and line drawing 867 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 868 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 869 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 870 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 883 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 884 width = 1; // vt100 line drawing characters are always single-width
873 } 885 }
874 } 886 }
875 887
876 if (screen.flags & Screen_Insert) 888 if (expect_false (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 889 scr_insdel_chars (width, INSERT);
878 890
879 if (width != 0) 891 if (width != 0)
880 { 892 {
881#if !UNICODE_3 893#if !UNICODE_3
… …
886# else 898# else
887 c = 0xfffd; 899 c = 0xfffd;
888# endif 900# endif
889#endif 901#endif
890 902
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904
905 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
907 {
908 if (screen.flags & Screen_Autowrap)
909 {
910 // ... artificially enlargen the previous one
911 c = NOCHAR;
912 // and try the same character next loop iteration
913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
917 }
918
891 // nuke the character at this position, if required 919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
892 if (line->t[screen.cur.col] == NOCHAR 923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
893 || (screen.cur.col < ncol - 1 924 scr_kill_char (*line, screen.cur.col);
894 && line->t[screen.cur.col + 1] == NOCHAR))
895 {
896 int col = screen.cur.col;
897
898 // find begin
899 while (col > 0 && line->t[col] == NOCHAR)
900 col--;
901
902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904 // found begin, nuke
905 do {
906 line->t[col] = ' ';
907 line->r[col] = rend;
908 col++;
909 } while (col < ncol && line->t[col] == NOCHAR);
910 }
911
912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' ';
919 // and try the same character next loop iteration
920 --str;
921 }
922 925
923 line->touch (); 926 line->touch ();
924 927
925 do 928 do
926 { 929 {
927 line->t[screen.cur.col] = c; 930 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 931 line->r[screen.cur.col] = rend;
929 932
930 if (screen.cur.col < ncol - 1) 933 if (expect_true (screen.cur.col < ncol - 1))
931 screen.cur.col++; 934 screen.cur.col++;
932 else 935 else
933 { 936 {
934 line->l = ncol; 937 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
936 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
937 break; 940
941 goto end_of_line;
938 } 942 }
939 943
940 c = NOCHAR; 944 c = NOCHAR;
941 } 945 }
942 while (--width > 0); 946 while (expect_false (--width > 0));
943 947
944 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
946 { 950 {
947 line->touch (); 951 line->t[c] = ' ';
952 line->r[c] = rend;
953 }
948 954
949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 955end_of_line:
956 ;
957 }
958#if ENABLE_COMBINING
959 else // width == 0
960 {
961 if (c != 0xfeff) // ignore BOM
962 {
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
950 { 972 {
951 line->t[c] = ' ';
952 line->r[c] = rend; 973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
953 } 976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
954 } 999 }
955 } 1000 }
956 else // width == 0
957 {
958#if ENABLE_COMBINING
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 {
969 linep = line;
970 tp = line->t + screen.cur.col - 1;
971 rp = line->r + screen.cur.col - 1;
972 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
995#endif 1001#endif
996 }
997 } 1002 }
998 1003
999 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
1000 1005
1001#ifdef DEBUG_STRICT
1002 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
1003#endif
1004} 1007}
1005 1008
1006/* ------------------------------------------------------------------------- */ 1009/* ------------------------------------------------------------------------- */
1007/* 1010/*
1008 * Process Backspace. Move back the cursor back a position, wrap if have to 1011 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1021 1024
1022 want_refresh = 1; 1025 want_refresh = 1;
1023#endif 1026#endif
1024 } 1027 }
1025 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1026 else 1031 else
1027 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1028} 1033}
1029 1034
1030/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1225/* 1230/*
1226 * Erase part or whole of a line 1231 * Erase part or whole of a line
1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K
1230 */ 1236 */
1231void 1237void
1232rxvt_term::scr_erase_line (int mode) NOTHROW 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1233{ 1239{
1234 unsigned int col, num; 1240 unsigned int col, num;
… …
1243 line.touch (); 1249 line.touch ();
1244 line.is_longer (0); 1250 line.is_longer (0);
1245 1251
1246 switch (mode) 1252 switch (mode)
1247 { 1253 {
1254 case 3:
1255 if (screen.flags & Screen_WrapNext)
1256 return;
1257
1258 /* fall through */
1259
1248 case 0: /* erase to end of line */ 1260 case 0: /* erase to end of line */
1249 col = screen.cur.col; 1261 col = screen.cur.col;
1250 num = ncol - col; 1262 num = ncol - col;
1251 min_it (line.l, col); 1263 min_it (line.l, col);
1264
1252 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1265 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1253 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1266 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1254 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1255 break; 1268 break;
1269
1256 case 1: /* erase to beginning of line */ 1270 case 1: /* erase to beginning of line */
1257 col = 0; 1271 col = 0;
1258 num = screen.cur.col + 1; 1272 num = screen.cur.col + 1;
1273
1259 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1274 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1260 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1275 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1261 CLEAR_SELECTION (); 1276 CLEAR_SELECTION ();
1262 break; 1277 break;
1278
1263 case 2: /* erase whole line */ 1279 case 2: /* erase whole line */
1264 col = 0; 1280 col = 0;
1265 num = ncol; 1281 num = ncol;
1266 line.l = 0; 1282 line.l = 0;
1267 if (selection.beg.row <= screen.cur.row 1283 if (selection.beg.row <= screen.cur.row
… …
1325 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1326 return; 1342 return;
1327 1343
1328 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1329 1345
1330 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1331 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1332 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1333 { 1349 {
1334 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1335 CLEAR_ROWS (row, num); 1351
1352 if (mapped)
1353 XClearArea (dpy, vt, 0,
1354 Row2Pixel (row - view_start), (unsigned int)width,
1355 (unsigned int)Height2Pixel (num), False);
1336 } 1356 }
1337 else 1357 else
1338 { 1358 {
1339 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1360
1361 if (mapped)
1362 {
1340 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1341 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1342 ERASE_ROWS (row, num); 1365 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start),
1367 (unsigned int)width,
1368 (unsigned int)Height2Pixel (num));
1343 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1344 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 }
1345 } 1372 }
1346 1373
1347 for (; num--; row++) 1374 for (; num--; row++)
1348 { 1375 {
1349 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1377
1378 if (row - view_start < nrow)
1350 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1351 } 1380 }
1352} 1381}
1353 1382
1354#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1355void 1384void
… …
1429 * Insert/Delete <count> characters from the current position 1458 * Insert/Delete <count> characters from the current position
1430 */ 1459 */
1431void 1460void
1432rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1461rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1433{ 1462{
1434 int col, row;
1435 rend_t tr;
1436
1437 want_refresh = 1; 1463 want_refresh = 1;
1438 ZERO_SCROLLBACK (); 1464 ZERO_SCROLLBACK ();
1439 1465
1440 if (count <= 0) 1466 if (count <= 0)
1441 return; 1467 return;
… …
1443 scr_do_wrap (); 1469 scr_do_wrap ();
1444 1470
1445 selection_check (1); 1471 selection_check (1);
1446 min_it (count, ncol - screen.cur.col); 1472 min_it (count, ncol - screen.cur.col);
1447 1473
1448 row = screen.cur.row; 1474 int row = screen.cur.row;
1449 1475
1450 line_t *line = &ROW(row); 1476 line_t *line = &ROW(row);
1451 1477
1452 line->touch (); 1478 line->touch ();
1453 line->is_longer (0); 1479 line->is_longer (0);
1454 1480
1481 // nuke wide spanning the start
1482 if (line->t[screen.cur.col] == NOCHAR)
1483 scr_kill_char (*line, screen.cur.col);
1484
1455 switch (insdel) 1485 switch (insdel)
1456 { 1486 {
1457 case INSERT: 1487 case INSERT:
1458 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1488 line->l = min (line->l + count, ncol);
1489
1490 if (line->t[screen.cur.col] == NOCHAR)
1491 scr_kill_char (*line, screen.cur.col);
1492
1493 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1459 { 1494 {
1460 line->t[col] = line->t[col - count]; 1495 line->t[col] = line->t[col - count];
1461 line->r[col] = line->r[col - count]; 1496 line->r[col] = line->r[col - count];
1462 } 1497 }
1463
1464 line->l = min (line->l + count, ncol);
1465 1498
1466 if (selection.op && current_screen == selection.screen 1499 if (selection.op && current_screen == selection.screen
1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1500 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1468 { 1501 {
1469 if (selection.end.row != screen.cur.row 1502 if (selection.end.row != screen.cur.row
… …
1484 case ERASE: 1517 case ERASE:
1485 screen.cur.col += count; /* don't worry if > ncol */ 1518 screen.cur.col += count; /* don't worry if > ncol */
1486 selection_check (1); 1519 selection_check (1);
1487 screen.cur.col -= count; 1520 screen.cur.col -= count;
1488 1521
1489 line->l = max (line->l - count, 0); 1522 // nuke wide char after the end
1523 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1524 scr_kill_char (*line, screen.cur.col + count);
1525
1490 scr_blank_line (*line, screen.cur.col, count, rstyle); 1526 scr_blank_line (*line, screen.cur.col, count, rstyle);
1491 break; 1527 break;
1492 1528
1493 case DELETE: 1529 case DELETE:
1494 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1530 line->l = max (line->l - count, 0);
1495 1531
1532 // nuke wide char spanning the end
1533 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1534 scr_kill_char (*line, screen.cur.col + count);
1535
1496 for (col = screen.cur.col; (col + count) < ncol; col++) 1536 for (int col = screen.cur.col; (col + count) < ncol; col++)
1497 { 1537 {
1498 line->t[col] = line->t[col + count]; 1538 line->t[col] = line->t[col + count];
1499 line->r[col] = line->r[col + count]; 1539 line->r[col] = line->r[col + count];
1500 } 1540 }
1501 1541
1502 line->l = max (line->l - count, 0);
1503 scr_blank_line (*line, ncol - count, count, tr); 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1504 1543
1505 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507 { 1546 {
1508 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
… …
1644 { 1683 {
1645 rvideo_state = on; 1684 rvideo_state = on;
1646 1685
1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1648#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1649 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1650#endif 1689#endif
1651 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1652 1691
1653 XGCValues gcvalue; 1692 XGCValues gcvalue;
1654 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1798 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1799 { 1838 {
1800 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1801 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1802 } 1841 }
1803// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1804 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1805 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1806 1845
1807 num_scr_allow = 0; 1846 num_scr_allow = 0;
1808 1847
… …
1886 XMapWindow (dpy, parent[0]); 1925 XMapWindow (dpy, parent[0]);
1887# endif 1926# endif
1888 1927
1889# if ENABLE_FRILLS 1928# if ENABLE_FRILLS
1890 if (option (Opt_urgentOnBell)) 1929 if (option (Opt_urgentOnBell))
1891 { 1930 set_urgency (1);
1892 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893 {
1894 h->flags |= XUrgencyHint;
1895 XSetWMHints (dpy, parent[0], h);
1896 }
1897 }
1898# endif 1931# endif
1899 1932
1900 if (option (Opt_visualBell)) 1933 if (option (Opt_visualBell))
1901 { 1934 {
1902 rvideo_bell = true; 1935 rvideo_bell = true;
… …
1905 1938
1906 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1907 } 1940 }
1908 else 1941 else
1909 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1910#endif 1944#endif
1911} 1945}
1912 1946
1913/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1914/* ARGSUSED */ 1948/* ARGSUSED */
1915void 1949void
1916rxvt_term::scr_printscreen (int fullhist) NOTHROW 1950rxvt_term::scr_printscreen (int fullhist) NOTHROW
1917{ 1951{
1918#ifdef PRINTPIPE 1952#ifdef PRINTPIPE
1919 int nrows, row_start; 1953 int nrows, row_start;
1920 FILE *fd; 1954 FILE *fd = popen_printer ();
1921 1955
1922 if ((fd = popen_printer ()) == NULL) 1956 if (!fd)
1923 return; 1957 return;
1924 1958
1925 if (fullhist) 1959 if (fullhist)
1926 { 1960 {
1927 nrows = nrow - top_row; 1961 nrows = nrow - top_row;
… …
1933 row_start = view_start; 1967 row_start = view_start;
1934 } 1968 }
1935 1969
1936 wctomb (0, 0); 1970 wctomb (0, 0);
1937 1971
1938 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1939 { 1973 {
1940 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1941 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1942 1976
1943 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1977 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1972 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
1973 */ 2007 */
1974void 2008void
1975rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
1976{ 2010{
1977 unsigned char have_bg,
1978 showcursor; /* show the cursor */
1979 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
1980 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
1981 int i; /* tmp */ 2013 int i; /* tmp */
1982#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
1983 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
1992 return; 2024 return;
1993 2025
1994 /* 2026 /*
1995 * A: set up vars 2027 * A: set up vars
1996 */ 2028 */
1997 have_bg = 0;
1998 refresh_count = 0; 2029 refresh_count = 0;
1999 2030
2031 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0;
2000#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2001 have_bg |= bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2002#endif 2035#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2037
2005 /* 2038 /*
2006 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2007 */ 2040 */
2008 scr_reverse_selection (); 2041 scr_reverse_selection ();
2042
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY
2045 scr_swap_overlay ();
2046#endif
2047
2048 char showcursor = screen.flags & Screen_VisibleCursor;
2009 2049
2010 /* 2050 /*
2011 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2012 */ 2052 */
2013 { 2053 {
2014 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2015 2055
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2057 if (hidden_cursor)
2019 showcursor = 0; 2058 showcursor = 0;
2020#endif 2059#endif
2021 2060
… …
2049 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2050#else 2089#else
2051 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2052#endif 2091#endif
2053 2092
2054 if (showcursor && focus) 2093 if (focus)
2055 { 2094 {
2056 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2057 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2058 else 2097 else
2059 { 2098 {
… …
2094 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2095 } 2134 }
2096 } 2135 }
2097 } 2136 }
2098 2137
2099 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2100#if ENABLE_OVERLAY
2101 scr_swap_overlay ();
2102#endif
2103
2104#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2105 /* 2139 /*
2106 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2107 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2108 */ 2142 */
… …
2197 continue; 2231 continue;
2198 2232
2199 // redraw one or more characters 2233 // redraw one or more characters
2200 2234
2201 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2202 while (stp[col] == NOCHAR && col > 0) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2203 --col; 2237 --col;
2204 2238
2205 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2206 text_t *text = stp + col; 2240 text_t *text = stp + col;
2207 int count = 1; 2241 int count = 1;
2208 2242
2209 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2210 drp[col] = rend; 2244 drp[col] = rend;
… …
2214 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2215 { 2249 {
2216 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2217 { 2251 {
2218 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2219 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2220 count++; 2255 count++;
2221 i++; 2256 i++;
2222 2257
2223 continue; 2258 continue;
2224 } 2259 }
… …
2244 2279
2245 col--; /* went one too far. move back */ 2280 col--; /* went one too far. move back */
2246 count -= i; /* dump any matching trailing chars */ 2281 count -= i; /* dump any matching trailing chars */
2247 2282
2248 // sometimes we optimize away the trailing NOCHAR's, add them back 2283 // sometimes we optimize away the trailing NOCHAR's, add them back
2249 while (i && text[count] == NOCHAR) 2284 while (expect_false (i && text[count] == NOCHAR))
2250 count++, i--; 2285 count++, i--;
2251 2286
2252 /* 2287 /*
2253 * Determine the attributes for the string 2288 * Determine the attributes for the string
2254 */ 2289 */
2255 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2256 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2257 2292
2258 // only do special processing if any attributes are set, which is unlikely 2293 // only do special processing if any attributes are set, which is unlikely
2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2260 { 2295 {
2261 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2262 2297
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2283 2318
2284 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2285 fore = Color_UL; 2320 fore = Color_UL;
2286#endif 2321#endif
2287 2322
2323#ifdef OPTION_HC
2324 if (rend & RS_Sel)
2325 {
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 && ISSET_PIXCOLOR (Color_HC))
2330 {
2331 if (ISSET_PIXCOLOR (Color_HTC))
2332 fore = Color_HTC;
2333 // if invert is 0 reverse video is set so we use bg color as fg color
2334 else if (!invert)
2335 fore = back;
2336
2337 back = Color_HC;
2338 invert = 0;
2339 }
2340 }
2341#endif
2342
2288 if (invert) 2343 if (invert)
2289 { 2344 {
2290#ifdef OPTION_HC
2291 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2292 || !ISSET_PIXCOLOR (Color_HC))
2293#endif
2294 /* invert the column if no highlightColor is set or it is the
2295 * current cursor column */
2296 ::swap (fore, back); 2345 ::swap (fore, back);
2297#ifdef OPTION_HC
2298 else if (ISSET_PIXCOLOR (Color_HC))
2299 back = Color_HC;
2300#endif
2301 2346
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2303# ifndef OPTION_HC
2304 if (ISSET_PIXCOLOR (Color_RV))
2305 back = Color_RV;
2306# endif
2307 if (fore == back) 2348 if (fore == back)
2308 { 2349 {
2309 fore = Color_bg; 2350 fore = Color_bg;
2310 back = Color_fg; 2351 back = Color_fg;
2311 } 2352 }
… …
2347 /* 2388 /*
2348 * Actually do the drawing of the string here 2389 * Actually do the drawing of the string here
2349 */ 2390 */
2350 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2351 2392
2352 if (have_bg && back == Color_bg) 2393 if (expect_true (have_bg && back == Color_bg))
2353 { 2394 {
2354 // this is very ugly, maybe push it into ->draw? 2395 // this is very ugly, maybe push it into ->draw?
2355 2396
2356 for (i = 0; i < count; i++) /* don't draw empty strings */ 2397 for (i = 0; i < count; i++) /* don't draw empty strings */
2357 if (text[i] != ' ') 2398 if (text[i] != ' ')
… …
2364 did_clear: ; 2405 did_clear: ;
2365 } 2406 }
2366 else 2407 else
2367 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2368 2409
2369 if (rend & RS_Uline && font->descent > 1 && fore != back) 2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2370 { 2411 {
2371#if ENABLE_FRILLS 2412#if ENABLE_FRILLS
2372 if (ISSET_PIXCOLOR (Color_underline)) 2413 if (ISSET_PIXCOLOR (Color_underline))
2373 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2414 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2374 else 2415 else
… …
2379 xpixel, ypixel + font->ascent + 1, 2420 xpixel, ypixel + font->ascent + 1,
2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2381 } 2422 }
2382 } /* for (col....) */ 2423 } /* for (col....) */
2383 } /* for (row....) */ 2424 } /* for (row....) */
2384
2385#if ENABLE_OVERLAY
2386 scr_swap_overlay ();
2387#endif
2388 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2389 2425
2390 /* 2426 /*
2391 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2392 */ 2428 */
2393 if (showcursor) 2429 if (showcursor)
… …
2432 } 2468 }
2433 2469
2434 /* 2470 /*
2435 * H: cleanup selection 2471 * H: cleanup selection
2436 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2437 scr_reverse_selection (); 2478 scr_reverse_selection ();
2438 2479
2480 screen.flags = old_screen_flags;
2439 num_scr = 0; 2481 num_scr = 0;
2440 num_scr_allow = 1; 2482 num_scr_allow = 1;
2441} 2483}
2442 2484
2443void 2485void
… …
2464 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2465 } 2507 }
2466} 2508}
2467 2509
2468void 2510void
2469rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2470{ 2512{
2513 bool transparent = false;
2514
2471#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2472 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2473#else 2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2474 2523
2524 transparent = true;
2525 }
2526 else
2527# endif
2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2535 {
2475 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 }
2539
2476 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2477 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2478 2541
2479 if (scrollBar.win) 2542 if (scrollBar.win)
2480 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2482 scrollBar.setIdle (); 2548 scrollBar.state = STATE_IDLE;
2483 scrollbar_show (0); 2549 scrollBar.show (0);
2484 } 2550 }
2485 2551
2552 if (refresh)
2553 {
2486 scr_clear (); 2554 scr_clear ();
2487 scr_touch (true); 2555 scr_touch (true);
2556 }
2488 want_refresh = 1; 2557 want_refresh = 1;
2489
2490#endif
2491} 2558}
2492 2559
2493/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2494void 2561void
2495rxvt_term::scr_clear (bool really) NOTHROW 2562rxvt_term::scr_clear (bool really) NOTHROW
… …
2562 { 2629 {
2563#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2564 if (selection.rect) 2631 if (selection.rect)
2565 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2566 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2567 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2568 else 2635 else
2569#endif 2636#endif
2570 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2571 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2572 RS_RVid); 2639 RS_Sel | RS_RVid);
2573 } 2640 }
2574} 2641}
2575 2642
2576/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2577/* 2644/*
… …
2582void 2649void
2583rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2584{ 2651{
2585 int row, wrote; 2652 int row, wrote;
2586 unsigned int width, towrite; 2653 unsigned int width, towrite;
2587 char r1[] = "\n"; 2654 const char r1[] = "\n";
2588 2655
2589 for (row = saveLines - nsaved; 2656 for (row = saveLines + top_row;
2590 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2591 { 2658 {
2592 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
2593 : ncol; 2660 : ncol;
2594 for (towrite = width; towrite; towrite -= wrote) 2661 for (towrite = width; towrite; towrite -= wrote)
… …
2638/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2639/* 2706/*
2640 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2641 */ 2708 */
2642void 2709void
2643rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2644{ 2711{
2645 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2646 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2647 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2648 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2654 2721
2655 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2656 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2657} 2724}
2658 2725
2726void
2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2728{
2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2730 return;
2731
2732 tt_paste (data, len);
2733}
2734
2659/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2660/* 2736/*
2661 * Respond to a notification that a primary selection has been sent 2737 * Respond to a notification that a primary selection has been sent
2662 * EXT: SelectionNotify 2738 * EXT: SelectionNotify
2663 */ 2739 */
2664void 2740void
2665rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2666{ 2742{
2667 if (prop == None) /* check for failed XConvertSelection */ 2743 if (prop == None) /* check for failed XConvertSelection */
2668 { 2744 {
2745 int selnum = selection_type & Sel_whereMask;
2746
2669 if ((selection_type & Sel_CompoundText)) 2747 if ((selection_type & Sel_CompoundText))
2670 { 2748 {
2671 int selnum = selection_type & Sel_whereMask;
2672
2673 selection_type = 0; 2749 selection_type = 0;
2674 if (selnum != Sel_direct)
2675 selection_request_other (XA_STRING, selnum); 2750 selection_request_other (XA_STRING, selnum);
2676 } 2751 }
2677 2752
2678 if ((selection_type & Sel_UTF8String)) 2753 if ((selection_type & Sel_UTF8String))
2679 { 2754 {
2680 int selnum = selection_type & Sel_whereMask;
2681
2682 selection_type = Sel_CompoundText; 2755 selection_type = Sel_CompoundText;
2683 if (selnum != Sel_direct)
2684 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2756 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2685 else
2686 selection_type = 0;
2687 } 2757 }
2688 2758
2689 return; 2759 return;
2690 } 2760 }
2691 2761
2692 unsigned long bytes_after; 2762 unsigned long bytes_after;
2693 XTextProperty ct; 2763 XTextProperty ct;
2694 2764
2765 // length == (2^31 - 1) / 4, as gdk
2695 if (XGetWindowProperty (dpy, win, prop, 2766 if (XGetWindowProperty (dpy, win, prop,
2696 0, PROP_SIZE / 4, 2767 0, 0x1fffffff,
2697 delete_prop, AnyPropertyType, 2768 delete_prop, AnyPropertyType,
2698 &ct.encoding, &ct.format, 2769 &ct.encoding, &ct.format,
2699 &ct.nitems, &bytes_after, 2770 &ct.nitems, &bytes_after,
2700 &ct.value) != Success) 2771 &ct.value) != Success)
2701 { 2772 {
… …
2703 goto bailout; 2774 goto bailout;
2704 } 2775 }
2705 2776
2706 if (ct.encoding == None) 2777 if (ct.encoding == None)
2707 goto bailout; 2778 goto bailout;
2708
2709 if (bytes_after)
2710 {
2711 // fetch and append remaining data
2712 XTextProperty ct2;
2713
2714 if (XGetWindowProperty (dpy, win, prop,
2715 ct.nitems / 4, (bytes_after + 3) / 4,
2716 delete_prop, AnyPropertyType,
2717 &ct2.encoding, &ct2.format,
2718 &ct2.nitems, &bytes_after,
2719 &ct2.value) != Success)
2720 goto bailout;
2721
2722 // realloc should be compatible to XFree, here, and elsewhere, too
2723 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2724 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2725 ct.nitems += ct2.nitems;
2726
2727 XFree (ct2.value);
2728 }
2729 2779
2730 if (ct.value == 0) 2780 if (ct.value == 0)
2731 goto bailout; 2781 goto bailout;
2732 2782
2733 if (ct.encoding == xa[XA_INCR]) 2783 if (ct.encoding == xa[XA_INCR])
… …
2764 { 2814 {
2765 /* 2815 /*
2766 * pass through again trying CUT_BUFFER0 if we've come from 2816 * pass through again trying CUT_BUFFER0 if we've come from
2767 * XConvertSelection () but nothing was presented 2817 * XConvertSelection () but nothing was presented
2768 */ 2818 */
2769 selection_paste (display->root, XA_CUT_BUFFER0, False); 2819 selection_paste (display->root, XA_CUT_BUFFER0, false);
2770 } 2820 }
2771 2821
2772 goto bailout; 2822 goto bailout;
2773 } 2823 }
2774 } 2824 }
… …
2777 incr_ev.start (10); 2827 incr_ev.start (10);
2778 2828
2779 while (incr_buf_fill + ct.nitems > incr_buf_size) 2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2780 { 2830 {
2781 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2831 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2782 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2832 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2783 } 2833 }
2784 2834
2785 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2786 incr_buf_fill += ct.nitems; 2836 incr_buf_fill += ct.nitems;
2787 2837
… …
2828{ 2878{
2829 selection_wait = Sel_none; 2879 selection_wait = Sel_none;
2830 2880
2831 incr_buf_size = 0; 2881 incr_buf_size = 0;
2832 free (incr_buf); 2882 free (incr_buf);
2883 incr_buf = 0;
2833 2884
2834 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2885 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2835} 2886}
2836 2887
2837void 2888void
… …
2870 selection_wait = Sel_normal; 2921 selection_wait = Sel_normal;
2871 2922
2872#if X_HAVE_UTF8_STRING 2923#if X_HAVE_UTF8_STRING
2873 selection_type = Sel_UTF8String; 2924 selection_type = Sel_UTF8String;
2874 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2925 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2875 return; 2926 return;
2876#else 2927#else
2877 selection_type = Sel_CompoundText; 2928 selection_type = Sel_CompoundText;
2878 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2929 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2879 return; 2930 return;
2880#endif 2931#endif
2881 } 2932 }
2882 2933
2883 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2934 selection_wait = Sel_none; /* don't loop in selection_paste () */
2884 selection_paste (display->root, XA_CUT_BUFFER0, false); 2935 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2912/* 2963/*
2913 * Clear all selected text 2964 * Clear all selected text
2914 * EXT: SelectionClear 2965 * EXT: SelectionClear
2915 */ 2966 */
2916void 2967void
2917rxvt_term::selection_clear () NOTHROW 2968rxvt_term::selection_clear (bool clipboard) NOTHROW
2918{ 2969{
2970 if (!clipboard)
2971 {
2919 want_refresh = 1; 2972 want_refresh = 1;
2920 free (selection.text); 2973 free (selection.text);
2921 selection.text = NULL; 2974 selection.text = NULL;
2922 selection.len = 0; 2975 selection.len = 0;
2923 CLEAR_SELECTION (); 2976 CLEAR_SELECTION ();
2924 2977
2925 if (display->selection_owner == this) 2978 if (display->selection_owner == this)
2926 display->selection_owner = 0; 2979 display->selection_owner = 0;
2980 }
2981 else
2982 {
2983 free (selection.clip_text);
2984 selection.clip_text = NULL;
2985 selection.clip_len = 0;
2986
2987 if (display->clipboard_owner == this)
2988 display->clipboard_owner = 0;
2989 }
2927} 2990}
2928 2991
2929/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
2930/* 2993/*
2931 * Copy a selection into the cut buffer 2994 * Copy a selection into the cut buffer
2932 * EXT: button 1 or 3 release 2995 * EXT: button 1 or 3 release
2933 */ 2996 */
2934void 2997void
2935rxvt_term::selection_make (Time tm) 2998rxvt_term::selection_make (Time tm)
2936{ 2999{
2937 int i; 3000 int size;
2938 wchar_t *new_selection_text; 3001 wchar_t *new_selection_text;
2939 text_t *t; 3002 text_t *t;
2940 3003
2941 switch (selection.op) 3004 switch (selection.op)
2942 { 3005 {
… …
2958 return; /* nothing selected, go away */ 3021 return; /* nothing selected, go away */
2959 3022
2960 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3023 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2961 return; 3024 return;
2962 3025
2963 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3026 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2964 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3027 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2965 3028
2966 int ofs = 0; 3029 int ofs = 0;
2967 int extra = 0; 3030 int extra = 0;
2968 3031
2969 int col = selection.beg.col; 3032 int col = selection.beg.col;
… …
2975 { 3038 {
2976#if !ENABLE_MINIMAL 3039#if !ENABLE_MINIMAL
2977 if (selection.rect) 3040 if (selection.rect)
2978 { 3041 {
2979 col = selection.beg.col; 3042 col = selection.beg.col;
2980 end_col = ncol + 1; 3043 end_col = selection.end.col;
2981 } 3044 }
2982 else 3045 else
2983#endif 3046#endif
2984 end_col = ROW(row).l; 3047 end_col = ROW(row).l;
2985 3048
2986 col = max (col, 0); 3049 col = max (col, 0);
2987 3050
2988 if (row == selection.end.row 3051 if (row == selection.end.row)
2989#if !ENABLE_MINIMAL
2990 || selection.rect
2991#endif
2992 )
2993 min_it (end_col, selection.end.col); 3052 min_it (end_col, selection.end.col);
2994 3053
2995 t = ROW(row).t + col; 3054 t = ROW(row).t + col;
2996 3055
2997 for (; col < end_col; col++) 3056 for (; col < end_col; col++)
… …
3005 3064
3006 extra -= (len - 1); 3065 extra -= (len - 1);
3007 3066
3008 if (extra < 0) 3067 if (extra < 0)
3009 { 3068 {
3010 extra += i; 3069 extra += size;
3011 i += i; 3070 size += size;
3012 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3071 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3013 } 3072 }
3014 3073
3015 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3074 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3016 } 3075 }
3017#endif 3076#endif
… …
3029 3088
3030 new_selection_text[ofs++] = C0_LF; 3089 new_selection_text[ofs++] = C0_LF;
3031 } 3090 }
3032 else 3091 else
3033#endif 3092#endif
3034 if (!ROW(row).is_longer () && row != selection.end.row) 3093 if (!ROW(row).is_longer ()
3094 && (row != selection.end.row || end_col != selection.end.col)
3095 && (row != selection.beg.row || selection.beg.col < ncol))
3035 new_selection_text[ofs++] = C0_LF; 3096 new_selection_text[ofs++] = C0_LF;
3036 } 3097 }
3037
3038 if (end_col != selection.end.col)
3039 new_selection_text[ofs++] = C0_LF;
3040 3098
3041 new_selection_text[ofs] = 0; 3099 new_selection_text[ofs] = 0;
3042 3100
3043 if (ofs == 0) 3101 if (ofs == 0)
3044 { 3102 {
… …
3057 3115
3058 selection_grab (tm); 3116 selection_grab (tm);
3059} 3117}
3060 3118
3061bool 3119bool
3062rxvt_term::selection_grab (Time tm) NOTHROW 3120rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3063{ 3121{
3122 Atom sel;
3123
3124 if (!clipboard)
3125 {
3064 selection_time = tm; 3126 selection_time = tm;
3127 sel = XA_PRIMARY;
3128 }
3129 else
3130 {
3131 clipboard_time = tm;
3132 sel = xa[XA_CLIPBOARD];
3133 }
3065 3134
3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3135 XSetSelectionOwner (dpy, sel, vt, tm);
3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3136 if (XGetSelectionOwner (dpy, sel) == vt)
3068 { 3137 {
3069 display->set_selection_owner (this); 3138 display->set_selection_owner (this, clipboard);
3070 return true; 3139 return true;
3071 } 3140 }
3072 else 3141 else
3073 { 3142 {
3074 selection_clear (); 3143 selection_clear (clipboard);
3075 return false; 3144 return false;
3076 } 3145 }
3077 3146
3078#if 0 3147#if 0
3079 XTextProperty ct; 3148 XTextProperty ct;
… …
3574 else if (rq.target == xa[XA_MULTIPLE]) 3643 else if (rq.target == xa[XA_MULTIPLE])
3575 { 3644 {
3576 /* TODO: Handle MULTIPLE */ 3645 /* TODO: Handle MULTIPLE */
3577 } 3646 }
3578#endif 3647#endif
3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3648 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3580 { 3649 {
3581 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3650 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3582 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3651 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3652 ev.property = rq.property;
3653 }
3654 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3655 {
3656 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3657 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3583 ev.property = rq.property; 3658 ev.property = rq.property;
3584 } 3659 }
3585 else if (rq.target == XA_STRING 3660 else if (rq.target == XA_STRING
3586 || rq.target == xa[XA_TEXT] 3661 || rq.target == xa[XA_TEXT]
3587 || rq.target == xa[XA_COMPOUND_TEXT] 3662 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3620 { 3695 {
3621 target = xa[XA_COMPOUND_TEXT]; 3696 target = xa[XA_COMPOUND_TEXT];
3622 style = enc_compound_text; 3697 style = enc_compound_text;
3623 } 3698 }
3624 3699
3625 if (selection.text) 3700 if (rq.selection == XA_PRIMARY && selection.text)
3626 { 3701 {
3627 cl = selection.text; 3702 cl = selection.text;
3628 selectlen = selection.len; 3703 selectlen = selection.len;
3704 }
3705 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3706 {
3707 cl = selection.clip_text;
3708 selectlen = selection.clip_len;
3629 } 3709 }
3630 else 3710 else
3631 { 3711 {
3632 cl = L""; 3712 cl = L"";
3633 selectlen = 0; 3713 selectlen = 0;
… …
3701 h += 2; min_it (h, nrow); 3781 h += 2; min_it (h, nrow);
3702 3782
3703 x -= 1; clamp_it (x, 0, ncol - w); 3783 x -= 1; clamp_it (x, 0, ncol - w);
3704 y -= 1; clamp_it (y, 0, nrow - h); 3784 y -= 1; clamp_it (y, 0, nrow - h);
3705 3785
3706 ov_x = x; ov_y = y; 3786 ov.x = x; ov.y = y;
3707 ov_w = w; ov_h = h; 3787 ov.w = w; ov.h = h;
3708 3788
3709 ov_text = new text_t *[h]; 3789 ov.text = new text_t *[h];
3710 ov_rend = new rend_t *[h]; 3790 ov.rend = new rend_t *[h];
3711 3791
3712 for (y = 0; y < h; y++) 3792 for (y = 0; y < h; y++)
3713 { 3793 {
3714 text_t *tp = ov_text[y] = new text_t[w]; 3794 text_t *tp = ov.text[y] = new text_t[w];
3715 rend_t *rp = ov_rend[y] = new rend_t[w]; 3795 rend_t *rp = ov.rend[y] = new rend_t[w];
3716 3796
3717 text_t t0, t1, t2; 3797 text_t t0, t1, t2;
3718 rend_t r = OVERLAY_RSTYLE; 3798 rend_t r = OVERLAY_RSTYLE;
3719 3799
3720 if (y == 0) 3800 if (y == 0)
… …
3739} 3819}
3740 3820
3741void 3821void
3742rxvt_term::scr_overlay_off () NOTHROW 3822rxvt_term::scr_overlay_off () NOTHROW
3743{ 3823{
3744 if (!ov_text) 3824 if (!ov.text)
3745 return; 3825 return;
3746 3826
3747 want_refresh = 1; 3827 want_refresh = 1;
3748 3828
3749 for (int y = 0; y < ov_h; y++) 3829 for (int y = 0; y < ov.h; y++)
3750 { 3830 {
3751 delete [] ov_text[y]; 3831 delete [] ov.text[y];
3752 delete [] ov_rend[y]; 3832 delete [] ov.rend[y];
3753 } 3833 }
3754 3834
3755 delete [] ov_text; ov_text = 0; 3835 delete [] ov.text; ov.text = 0;
3756 delete [] ov_rend; ov_rend = 0; 3836 delete [] ov.rend; ov.rend = 0;
3757} 3837}
3758 3838
3759void 3839void
3760rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3840rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3761{ 3841{
3762 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3842 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3763 return; 3843 return;
3764 3844
3765 x++, y++; 3845 x++, y++;
3766 3846
3767 ov_text[y][x] = text; 3847 ov.text[y][x] = text;
3768 ov_rend[y][x] = rend; 3848 ov.rend[y][x] = rend;
3769} 3849}
3770 3850
3771void 3851void
3772rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3852rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3773{ 3853{
… …
3792} 3872}
3793 3873
3794void 3874void
3795rxvt_term::scr_swap_overlay () NOTHROW 3875rxvt_term::scr_swap_overlay () NOTHROW
3796{ 3876{
3797 if (!ov_text) 3877 if (!ov.text)
3798 return; 3878 return;
3799 3879
3880 // hide cursor if it is within the overlay area
3881 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3882 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3883 screen.flags &= ~Screen_VisibleCursor;
3884
3800 // swap screen mem with overlay 3885 // swap screen mem with overlay
3801 for (int y = ov_h; y--; ) 3886 for (int y = ov.h; y--; )
3802 { 3887 {
3803 text_t *t1 = ov_text[y]; 3888 text_t *t1 = ov.text[y];
3804 rend_t *r1 = ov_rend[y]; 3889 rend_t *r1 = ov.rend[y];
3805 3890
3806 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3891 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3807 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3892 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3808 3893
3809 for (int x = ov_w; x--; ) 3894 for (int x = ov.w; x--; )
3810 { 3895 {
3811 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3896 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3812 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3897 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3813 } 3898 }
3814 } 3899 }

Diff Legend

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