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.290 by root, Fri Dec 14 05:52:34 2007 UTC vs.
Revision 1.365 by sf-exg, Thu Jan 27 17:37:19 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
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 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) \ 85#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) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 87
87/* 88/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * 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 */ 90 */
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) \ 91#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 92 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 93 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 94 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 95 (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 96
112/* ------------------------------------------------------------------------- * 97/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 98 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 99 * ------------------------------------------------------------------------- */
115 100
… …
148 133
149 l.l = 0; 134 l.l = 0;
150 l.f = 0; 135 l.f = 0;
151} 136}
152 137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
150
151 // found start, nuke
152 do {
153 l.t[col] = ' ';
154 l.r[col] = rend;
155 col++;
156 } while (col < ncol && l.t[col] == NOCHAR);
157}
158
153/* ------------------------------------------------------------------------- * 159/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 160 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
156 162
157void 163void
158rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
159{ 165{
160#if ENABLE_OVERLAY
161 scr_overlay_off ();
162#endif
163
164 rvideo_mode = false;
165 view_start = 0; 166 view_start = 0;
166 num_scr = 0; 167 num_scr = 0;
167 168
168 if (ncol == 0) 169 if (ncol == 0)
169 ncol = 80; 170 ncol = 80;
… …
171 if (nrow == 0) 172 if (nrow == 0)
172 nrow = 24; 173 nrow = 24;
173 174
174 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 176 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 177
180 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
182 { 180 {
183 //TODO//FIXME 181 //TODO//FIXME
… …
236 selection.text = NULL; 234 selection.text = NULL;
237 selection.len = 0; 235 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
240 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
241 } 241 }
242 else 242 else
243 { 243 {
244 /* 244 /*
245 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
283 283
284 if (top_row) 284 if (top_row)
285 { 285 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
288 289
289 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 292
292 do 293 do
293 { 294 {
294 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 297 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 299
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 301 {
… …
396 delete old_ta; 395 delete old_ta;
397 delete old_ra; 396 delete old_ra;
398 397
399 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
401 401
402 free (tabs); 402 free (tabs);
403 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0;
404 407
405 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
406 409
407 prev_nrow = nrow; 410 prev_nrow = nrow;
408 prev_ncol = ncol; 411 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 412
418 tt_winch (); 413 tt_winch ();
419 414
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 416}
… …
433 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
434 429
435 free (row_buf); 430 free (row_buf);
436 free (swap_buf); 431 free (swap_buf);
437 free (drawn_buf); 432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
438 free (tabs); 435 free (tabs);
439 436 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 437 }
442} 438}
443 439
444/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
445/* 441/*
446 * Hard reset 442 * Hard/Soft reset
447 */ 443 */
448void 444void
449rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
450{ 446{
451 scr_release (); 447 scr_release ();
452 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
453 scr_reset (); 451 scr_reset ();
454 452
455 scr_clear (true); 453 scr_clear (true);
456 scr_refresh (); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
457} 471}
458 472
459/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
499 } 513 }
500 514
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
507#endif
508} 520}
509 521
510void 522void
511rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
512{ 524{
… …
537 want_refresh = 1; 549 want_refresh = 1;
538 view_start = 0; 550 view_start = 0;
539 551
540 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
541 553
542 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
543 555
544#if NSCREENS 556#if NSCREENS
545 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
546 { 558 {
547 num_scr = 0; 559 num_scr = 0;
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
774 } 786 }
775 } 787 }
776 788
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 792 int row = screen.cur.row;
783 793
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 795
786 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
787 797
788 while (str < strend) 798 while (str < strend)
789 { 799 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 801
792 if (c < 0x20) 802 if (expect_false (c < 0x20))
793 if (c == C0_LF) 803 if (c == C0_LF)
794 { 804 {
795 max_it (line->l, screen.cur.col); 805 max_it (line->l, screen.cur.col);
796 806
797 screen.flags &= ~Screen_WrapNext; 807 screen.flags &= ~Screen_WrapNext;
… …
816 { 826 {
817 scr_tab (1, true); 827 scr_tab (1, true);
818 continue; 828 continue;
819 } 829 }
820 830
831 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 832 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 834 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 ))
824 { 836 {
825 checksel = 0; 837 checksel = 0;
826 /* 838 /*
827 * If we wrote anywhere in the selected area, kill the selection 839 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 840 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 841 * should be a similar check.
830 */ 842 */
831 CLEAR_SELECTION (); 843 CLEAR_SELECTION ();
832 } 844 }
833 845
834 if (screen.flags & Screen_WrapNext) 846 if (expect_false (screen.flags & Screen_WrapNext))
835 { 847 {
836 scr_do_wrap (); 848 scr_do_wrap ();
837 849
838 line->l = ncol; 850 line->l = ncol;
839 line->is_longer (1); 851 line->is_longer (1);
… …
841 row = screen.cur.row; 853 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 854 line = &ROW(row); /* _must_ refresh */
843 } 855 }
844 856
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 857 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 859 c = 0xfffd;
848 860
849 // rely on wcwidth to tell us the character width, do wcwidth before 861 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 862 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 863 // drawing characters below as they might be invalid in the current
852 // locale. 864 // locale.
853 int width = WCWIDTH (c); 865 int width = WCWIDTH (c);
854 866
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 868 {
857 // vt100 special graphics and line drawing 869 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 870 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 871 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 872 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 885 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 886 width = 1; // vt100 line drawing characters are always single-width
875 } 887 }
876 } 888 }
877 889
878 if (screen.flags & Screen_Insert) 890 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 891 scr_insdel_chars (width, INSERT);
880 892
881 if (width != 0) 893 if (width != 0)
882 { 894 {
883#if !UNICODE_3 895#if !UNICODE_3
… …
888# else 900# else
889 c = 0xfffd; 901 c = 0xfffd;
890# endif 902# endif
891#endif 903#endif
892 904
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
893 // nuke the character at this position, if required 921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 926 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 927
925 line->touch (); 928 line->touch ();
926 929
927 do 930 do
928 { 931 {
929 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 933 line->r[screen.cur.col] = rend;
931 934
932 if (screen.cur.col < ncol - 1) 935 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 936 screen.cur.col++;
934 else 937 else
935 { 938 {
936 line->l = ncol; 939 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
939 break; 942
943 goto end_of_line;
940 } 944 }
941 945
942 c = NOCHAR; 946 c = NOCHAR;
943 } 947 }
944 while (--width > 0); 948 while (expect_false (--width > 0));
945 949
946 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
948 { 952 {
949 line->touch (); 953 line->t[c] = ' ';
954 line->r[c] = rend;
955 }
950 956
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 957end_of_line:
958 ;
959 }
960#if ENABLE_COMBINING
961 else // width == 0
962 {
963 if (c != 0xfeff) // ignore BOM
964 {
965 // handle combining characters
966 // we just tag the accent on the previous on-screen character.
967 // this is arguably not correct, but also arguably not wrong.
968 // we don't handle double-width characters nicely yet.
969 line_t *linep;
970 text_t *tp;
971 rend_t *rp;
972
973 if (screen.cur.col > 0)
952 { 974 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 975 linep = line;
976 tp = line->t + screen.cur.col - 1;
977 rp = line->r + screen.cur.col - 1;
955 } 978 }
979 else if (screen.cur.row > 0
980 && ROW(screen.cur.row - 1).is_longer ())
981 {
982 linep = &ROW(screen.cur.row - 1);
983 tp = line->t + ncol - 1;
984 rp = line->r + ncol - 1;
985 }
986 else
987 continue;
988
989 linep->touch ();
990
991 while (*tp == NOCHAR && tp > linep->t)
992 tp--, rp--;
993
994 // first try to find a precomposed character
995 unicode_t n = rxvt_compose (*tp, c);
996 if (n == NOCHAR)
997 n = rxvt_composite.compose (*tp, c);
998
999 *tp = n;
1000 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1001 }
957 } 1002 }
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 1003#endif
998 }
999 } 1004 }
1000 1005
1001 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1002 1007
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1005#endif
1006} 1009}
1007 1010
1008/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1009/* 1012/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
1012 */ 1015 */
1013void 1016void
1014rxvt_term::scr_backspace () NOTHROW 1017rxvt_term::scr_backspace () NOTHROW
1015{ 1018{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1019 { 1020 {
1020 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1021 { 1022 {
1022#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1025 --screen.cur.row;
1025 return; 1026
1027 want_refresh = 1;
1026#endif 1028#endif
1027 } 1029 }
1028 } 1030 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1033 else
1030 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1035}
1034 1036
1035/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
1036/* 1038/*
1037 * Process Horizontal Tab 1039 * Process Horizontal Tab
… …
1230/* 1232/*
1231 * Erase part or whole of a line 1233 * Erase part or whole of a line
1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1234 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1235 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1236 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1237 * extension: clear to right unless wrapped: ESC [ 3 K
1235 */ 1238 */
1236void 1239void
1237rxvt_term::scr_erase_line (int mode) NOTHROW 1240rxvt_term::scr_erase_line (int mode) NOTHROW
1238{ 1241{
1239 unsigned int col, num; 1242 unsigned int col, num;
… …
1248 line.touch (); 1251 line.touch ();
1249 line.is_longer (0); 1252 line.is_longer (0);
1250 1253
1251 switch (mode) 1254 switch (mode)
1252 { 1255 {
1256 case 3:
1257 if (screen.flags & Screen_WrapNext)
1258 return;
1259
1260 /* fall through */
1261
1253 case 0: /* erase to end of line */ 1262 case 0: /* erase to end of line */
1254 col = screen.cur.col; 1263 col = screen.cur.col;
1255 num = ncol - col; 1264 num = ncol - col;
1256 min_it (line.l, col); 1265 min_it (line.l, col);
1266
1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1267 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1268 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1259 CLEAR_SELECTION (); 1269 CLEAR_SELECTION ();
1260 break; 1270 break;
1271
1261 case 1: /* erase to beginning of line */ 1272 case 1: /* erase to beginning of line */
1262 col = 0; 1273 col = 0;
1263 num = screen.cur.col + 1; 1274 num = screen.cur.col + 1;
1275
1264 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1276 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1265 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1277 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1266 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1267 break; 1279 break;
1280
1268 case 2: /* erase whole line */ 1281 case 2: /* erase whole line */
1269 col = 0; 1282 col = 0;
1270 num = ncol; 1283 num = ncol;
1271 line.l = 0; 1284 line.l = 0;
1272 if (selection.beg.row <= screen.cur.row 1285 if (selection.beg.row <= screen.cur.row
… …
1330 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1331 return; 1344 return;
1332 1345
1333 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1334 1347
1335 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1351 {
1339 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1340 CLEAR_ROWS (row, num); 1353
1354 if (mapped)
1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False);
1341 } 1358 }
1342 else 1359 else
1343 { 1360 {
1344 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped)
1364 {
1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1348 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1349 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1350 } 1374 }
1351 1375
1352 for (; num--; row++) 1376 for (; num--; row++)
1353 { 1377 {
1354 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1355 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1356 } 1382 }
1357} 1383}
1358 1384
1359#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1360void 1386void
… …
1434 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1435 */ 1461 */
1436void 1462void
1437rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1438{ 1464{
1439 int col, row;
1440 rend_t tr;
1441
1442 want_refresh = 1; 1465 want_refresh = 1;
1443 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1444 1467
1445 if (count <= 0) 1468 if (count <= 0)
1446 return; 1469 return;
… …
1448 scr_do_wrap (); 1471 scr_do_wrap ();
1449 1472
1450 selection_check (1); 1473 selection_check (1);
1451 min_it (count, ncol - screen.cur.col); 1474 min_it (count, ncol - screen.cur.col);
1452 1475
1453 row = screen.cur.row; 1476 int row = screen.cur.row;
1454 1477
1455 line_t *line = &ROW(row); 1478 line_t *line = &ROW(row);
1456 1479
1457 line->touch (); 1480 line->touch ();
1458 line->is_longer (0); 1481 line->is_longer (0);
1459 1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1486
1460 switch (insdel) 1487 switch (insdel)
1461 { 1488 {
1462 case INSERT: 1489 case INSERT:
1463 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1490 line->l = min (line->l + count, ncol);
1491
1492 if (line->t[screen.cur.col] == NOCHAR)
1493 scr_kill_char (*line, screen.cur.col);
1494
1495 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1464 { 1496 {
1465 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1466 line->r[col] = line->r[col - count]; 1498 line->r[col] = line->r[col - count];
1467 } 1499 }
1468
1469 line->l = min (line->l + count, ncol);
1470 1500
1471 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1473 { 1503 {
1474 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
… …
1489 case ERASE: 1519 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1521 selection_check (1);
1492 screen.cur.col -= count; 1522 screen.cur.col -= count;
1493 1523
1494 line->l = max (line->l - count, 0); 1524 // nuke wide char after the end
1525 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1526 scr_kill_char (*line, screen.cur.col + count);
1527
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1529 break;
1497 1530
1498 case DELETE: 1531 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1500 1533
1534 // nuke wide char spanning the end
1535 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1536 scr_kill_char (*line, screen.cur.col + count);
1537
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1539 {
1503 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1505 } 1542 }
1506 1543
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1545
1510 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1548 {
1513 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1649 { 1685 {
1650 rvideo_state = on; 1686 rvideo_state = on;
1651 1687
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1655#endif 1691#endif
1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1657 1693
1658 XGCValues gcvalue; 1694 XGCValues gcvalue;
1659 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
1803 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1804 { 1840 {
1805 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1806 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1807 } 1843 }
1808// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 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); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811 1847
1812 num_scr_allow = 0; 1848 num_scr_allow = 0;
1813 1849
… …
1872void 1908void
1873rxvt_term::bell_cb (ev::timer &w, int revents) 1909rxvt_term::bell_cb (ev::timer &w, int revents)
1874{ 1910{
1875 rvideo_bell = false; 1911 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode); 1912 scr_rvideo_mode (rvideo_mode);
1913 refresh_check ();
1877} 1914}
1878#endif 1915#endif
1879 1916
1880/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1881void 1918void
… …
1890 XMapWindow (dpy, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1891# endif 1928# endif
1892 1929
1893# if ENABLE_FRILLS 1930# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell)) 1931 if (option (Opt_urgentOnBell))
1895 { 1932 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 1933# endif
1903 1934
1904 if (option (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1905 { 1936 {
1906 rvideo_bell = true; 1937 rvideo_bell = true;
… …
1909 1940
1910 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1942 }
1912 else 1943 else
1913 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1914#endif 1946#endif
1915} 1947}
1916 1948
1917/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1918/* ARGSUSED */ 1950/* ARGSUSED */
1919void 1951void
1920rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1921{ 1953{
1922#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1923 int nrows, row_start; 1955 int nrows, row_start;
1924 FILE *fd; 1956 FILE *fd = popen_printer ();
1925 1957
1926 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1927 return; 1959 return;
1928 1960
1929 if (fullhist) 1961 if (fullhist)
1930 { 1962 {
1931 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1937 row_start = view_start; 1969 row_start = view_start;
1938 } 1970 }
1939 1971
1940 wctomb (0, 0); 1972 wctomb (0, 0);
1941 1973
1942 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1943 { 1975 {
1944 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1945 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1946 1978
1947 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1976 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1977 */ 2009 */
1978void 2010void
1979rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1980{ 2012{
1981 unsigned char have_bg,
1982 showcursor; /* show the cursor */
1983 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1984 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1985 int i; /* tmp */ 2015 int i; /* tmp */
1986#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1987 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
1996 return; 2026 return;
1997 2027
1998 /* 2028 /*
1999 * A: set up vars 2029 * A: set up vars
2000 */ 2030 */
2001 have_bg = 0;
2002 refresh_count = 0; 2031 refresh_count = 0;
2003 2032
2033 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0;
2004#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2005 have_bg |= bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2006#endif 2037#endif
2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2008 2039
2009 /* 2040 /*
2010 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2011 */ 2042 */
2012 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2013 2051
2014 /* 2052 /*
2015 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2016 */ 2054 */
2017 { 2055 {
2018 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2019 2057
2020 showcursor = (screen.flags & Screen_VisibleCursor);
2021#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2022 if (hidden_cursor) 2059 if (hidden_cursor)
2023 showcursor = 0; 2060 showcursor = 0;
2024#endif 2061#endif
2025 2062
… …
2053 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2054#else 2091#else
2055 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2056#endif 2093#endif
2057 2094
2058 if (showcursor && focus) 2095 if (focus)
2059 { 2096 {
2060 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2061 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2062 else 2099 else
2063 { 2100 {
… …
2098 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2099 } 2136 }
2100 } 2137 }
2101 } 2138 }
2102 2139
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 2140#ifndef NO_SLOW_LINK_SUPPORT
2109 /* 2141 /*
2110 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2111 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2112 */ 2144 */
… …
2201 continue; 2233 continue;
2202 2234
2203 // redraw one or more characters 2235 // redraw one or more characters
2204 2236
2205 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2206 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2207 --col; 2239 --col;
2208 2240
2209 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2210 text_t *text = stp + col; 2242 text_t *text = stp + col;
2211 int count = 1; 2243 int count = 1;
2212 2244
2213 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2214 drp[col] = rend; 2246 drp[col] = rend;
… …
2218 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2219 { 2251 {
2220 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2221 { 2253 {
2222 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2223 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2224 count++; 2257 count++;
2225 i++; 2258 i++;
2226 2259
2227 continue; 2260 continue;
2228 } 2261 }
… …
2248 2281
2249 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2250 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2251 2284
2252 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2253 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2254 count++, i--; 2287 count++, i--;
2255 2288
2256 /* 2289 /*
2257 * Determine the attributes for the string 2290 * Determine the attributes for the string
2258 */ 2291 */
2259 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2260 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2261 2294
2262 // only do special processing if any attributes are set, which is unlikely 2295 // 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)) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2264 { 2297 {
2265 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2266 2299
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2287 2320
2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2289 fore = Color_UL; 2322 fore = Color_UL;
2290#endif 2323#endif
2291 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2292 if (invert) 2345 if (invert)
2293 { 2346 {
2294#ifdef OPTION_HC
2295 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2296 || !ISSET_PIXCOLOR (Color_HC))
2297#endif
2298 /* invert the column if no highlightColor is set or it is the
2299 * current cursor column */
2300 ::swap (fore, back); 2347 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2305 2348
2306#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2307# ifndef OPTION_HC
2308 if (ISSET_PIXCOLOR (Color_RV))
2309 back = Color_RV;
2310# endif
2311 if (fore == back) 2350 if (fore == back)
2312 { 2351 {
2313 fore = Color_bg; 2352 fore = Color_bg;
2314 back = Color_fg; 2353 back = Color_fg;
2315 } 2354 }
… …
2351 /* 2390 /*
2352 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2353 */ 2392 */
2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2355 2394
2356 if (have_bg && back == Color_bg) 2395 if (expect_true (have_bg && back == Color_bg))
2357 { 2396 {
2358 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2359 2398
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2400 if (text[i] != ' ')
… …
2368 did_clear: ; 2407 did_clear: ;
2369 } 2408 }
2370 else 2409 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2411
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2413 {
2375#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2417 else
2379#endif 2418#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2419 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2420
2382 XDrawLine (dpy, drawBuffer, gc, 2421 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2424 }
2386 } /* for (col....) */ 2425 } /* for (col....) */
2387 } /* for (row....) */ 2426 } /* for (row....) */
2388
2389#if ENABLE_OVERLAY
2390 scr_swap_overlay ();
2391#endif
2392 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2393 2427
2394 /* 2428 /*
2395 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2396 */ 2430 */
2397 if (showcursor) 2431 if (showcursor)
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2460 else
2427#endif 2461#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2463
2430 XDrawRectangle (dpy, drawBuffer, gc, 2464 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2465 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2466 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2467 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2469 }
2436 } 2470 }
2437 2471
2438 /* 2472 /*
2439 * H: cleanup selection 2473 * H: cleanup selection
2440 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2441 scr_reverse_selection (); 2480 scr_reverse_selection ();
2442 2481
2482 screen.flags = old_screen_flags;
2443 num_scr = 0; 2483 num_scr = 0;
2444 num_scr_allow = 1; 2484 num_scr_allow = 1;
2445} 2485}
2446 2486
2447void 2487void
… …
2468 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2469 } 2509 }
2470} 2510}
2471 2511
2472void 2512void
2473rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2474{ 2514{
2515 bool transparent = false;
2516
2475#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2477#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & isTransparent)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2478 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2479 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2480 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2481 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2482 2543
2483# if HAVE_SCROLLBARS
2484 if (scrollBar.win) 2544 if (scrollBar.win)
2485 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2550 scrollBar.state = STATE_IDLE;
2488 scrollbar_show (0); 2551 scrollBar.show (0);
2489 } 2552 }
2490# endif
2491 2553
2554 if (refresh)
2555 {
2492 scr_clear (); 2556 scr_clear ();
2493 scr_touch (true); 2557 scr_touch (true);
2558 }
2494 want_refresh = 1; 2559 want_refresh = 1;
2495
2496#endif
2497} 2560}
2498 2561
2499/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2500void 2563void
2501rxvt_term::scr_clear (bool really) NOTHROW 2564rxvt_term::scr_clear (bool really) NOTHROW
… …
2568 { 2631 {
2569#if !ENABLE_MINIMAL 2632#if !ENABLE_MINIMAL
2570 if (selection.rect) 2633 if (selection.rect)
2571 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2572 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2573 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2574 else 2637 else
2575#endif 2638#endif
2576 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2577 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2578 RS_RVid); 2641 RS_Sel | RS_RVid);
2579 } 2642 }
2580} 2643}
2581 2644
2582/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2583/* 2646/*
… …
2588void 2651void
2589rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2590{ 2653{
2591 int row, wrote; 2654 int row, wrote;
2592 unsigned int width, towrite; 2655 unsigned int width, towrite;
2593 char r1[] = "\n"; 2656 const char r1[] = "\n";
2594 2657
2595 for (row = saveLines - nsaved; 2658 for (row = saveLines + top_row;
2596 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2597 { 2660 {
2598 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
2599 : ncol; 2662 : ncol;
2600 for (towrite = width; towrite; towrite -= wrote) 2663 for (towrite = width; towrite; towrite -= wrote)
… …
2644/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2645/* 2708/*
2646 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2647 */ 2710 */
2648void 2711void
2649rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2650{ 2713{
2651 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2652 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2653 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2654 data[i] = C0_CR; 2717 data[i] = C0_CR;
2655 2718
2719 if (priv_modes & PrivMode_BracketPaste)
2720 tt_printf ("\e[200~");
2721
2656 tt_write (data, len); 2722 tt_write (data, len);
2723
2724 if (priv_modes & PrivMode_BracketPaste)
2725 tt_printf ("\e[201~");
2726}
2727
2728void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{
2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2732 return;
2733
2734 tt_paste (data, len);
2657} 2735}
2658 2736
2659/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2660/* 2738/*
2661 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
… …
2718 &ct2.nitems, &bytes_after, 2796 &ct2.nitems, &bytes_after,
2719 &ct2.value) != Success) 2797 &ct2.value) != Success)
2720 goto bailout; 2798 goto bailout;
2721 2799
2722 // realloc should be compatible to XFree, here, and elsewhere, too 2800 // realloc should be compatible to XFree, here, and elsewhere, too
2723 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2801 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2724 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2802 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2725 ct.nitems += ct2.nitems; 2803 ct.nitems += ct2.nitems;
2726 2804
2727 XFree (ct2.value); 2805 XFree (ct2.value);
2728 } 2806 }
… …
2777 incr_ev.start (10); 2855 incr_ev.start (10);
2778 2856
2779 while (incr_buf_fill + ct.nitems > incr_buf_size) 2857 while (incr_buf_fill + ct.nitems > incr_buf_size)
2780 { 2858 {
2781 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2859 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2782 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2860 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2783 } 2861 }
2784 2862
2785 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2863 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2786 incr_buf_fill += ct.nitems; 2864 incr_buf_fill += ct.nitems;
2787 2865
… …
2870 selection_wait = Sel_normal; 2948 selection_wait = Sel_normal;
2871 2949
2872#if X_HAVE_UTF8_STRING 2950#if X_HAVE_UTF8_STRING
2873 selection_type = Sel_UTF8String; 2951 selection_type = Sel_UTF8String;
2874 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2952 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2875 return; 2953 return;
2876#else 2954#else
2877 selection_type = Sel_CompoundText; 2955 selection_type = Sel_CompoundText;
2878 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2956 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2879 return; 2957 return;
2880#endif 2958#endif
2881 } 2959 }
2882 2960
2883 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2961 selection_wait = Sel_none; /* don't loop in selection_paste () */
2884 selection_paste (display->root, XA_CUT_BUFFER0, false); 2962 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2912/* 2990/*
2913 * Clear all selected text 2991 * Clear all selected text
2914 * EXT: SelectionClear 2992 * EXT: SelectionClear
2915 */ 2993 */
2916void 2994void
2917rxvt_term::selection_clear () NOTHROW 2995rxvt_term::selection_clear (bool clipboard) NOTHROW
2918{ 2996{
2997 if (!clipboard)
2998 {
2919 want_refresh = 1; 2999 want_refresh = 1;
2920 free (selection.text); 3000 free (selection.text);
2921 selection.text = NULL; 3001 selection.text = NULL;
2922 selection.len = 0; 3002 selection.len = 0;
2923 CLEAR_SELECTION (); 3003 CLEAR_SELECTION ();
2924 3004
2925 if (display->selection_owner == this) 3005 if (display->selection_owner == this)
2926 display->selection_owner = 0; 3006 display->selection_owner = 0;
3007 }
3008 else
3009 {
3010 free (selection.clip_text);
3011 selection.clip_text = NULL;
3012 selection.clip_len = 0;
3013
3014 if (display->clipboard_owner == this)
3015 display->clipboard_owner = 0;
3016 }
2927} 3017}
2928 3018
2929/* ------------------------------------------------------------------------- */ 3019/* ------------------------------------------------------------------------- */
2930/* 3020/*
2931 * Copy a selection into the cut buffer 3021 * Copy a selection into the cut buffer
2932 * EXT: button 1 or 3 release 3022 * EXT: button 1 or 3 release
2933 */ 3023 */
2934void 3024void
2935rxvt_term::selection_make (Time tm) 3025rxvt_term::selection_make (Time tm)
2936{ 3026{
2937 int i; 3027 int size;
2938 wchar_t *new_selection_text; 3028 wchar_t *new_selection_text;
2939 text_t *t; 3029 text_t *t;
2940 3030
2941 switch (selection.op) 3031 switch (selection.op)
2942 { 3032 {
… …
2958 return; /* nothing selected, go away */ 3048 return; /* nothing selected, go away */
2959 3049
2960 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3050 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2961 return; 3051 return;
2962 3052
2963 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3053 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2964 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3054 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2965 3055
2966 int ofs = 0; 3056 int ofs = 0;
2967 int extra = 0; 3057 int extra = 0;
2968 3058
2969 int col = selection.beg.col; 3059 int col = selection.beg.col;
… …
2975 { 3065 {
2976#if !ENABLE_MINIMAL 3066#if !ENABLE_MINIMAL
2977 if (selection.rect) 3067 if (selection.rect)
2978 { 3068 {
2979 col = selection.beg.col; 3069 col = selection.beg.col;
2980 end_col = ncol + 1; 3070 end_col = selection.end.col;
2981 } 3071 }
2982 else 3072 else
2983#endif 3073#endif
2984 end_col = ROW(row).l; 3074 end_col = ROW(row).l;
2985 3075
2986 col = max (col, 0); 3076 col = max (col, 0);
2987 3077
2988 if (row == selection.end.row 3078 if (row == selection.end.row)
2989#if !ENABLE_MINIMAL
2990 || selection.rect
2991#endif
2992 )
2993 min_it (end_col, selection.end.col); 3079 min_it (end_col, selection.end.col);
2994 3080
2995 t = ROW(row).t + col; 3081 t = ROW(row).t + col;
2996 3082
2997 for (; col < end_col; col++) 3083 for (; col < end_col; col++)
… …
3005 3091
3006 extra -= (len - 1); 3092 extra -= (len - 1);
3007 3093
3008 if (extra < 0) 3094 if (extra < 0)
3009 { 3095 {
3010 extra += i; 3096 extra += size;
3011 i += i; 3097 size += size;
3012 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3098 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3013 } 3099 }
3014 3100
3015 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3101 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3016 } 3102 }
3017#endif 3103#endif
… …
3029 3115
3030 new_selection_text[ofs++] = C0_LF; 3116 new_selection_text[ofs++] = C0_LF;
3031 } 3117 }
3032 else 3118 else
3033#endif 3119#endif
3034 if (!ROW(row).is_longer () && row != selection.end.row) 3120 if (!ROW(row).is_longer ()
3121 && (row != selection.end.row || end_col != selection.end.col)
3122 && (row != selection.beg.row || selection.beg.col < ncol))
3035 new_selection_text[ofs++] = C0_LF; 3123 new_selection_text[ofs++] = C0_LF;
3036 } 3124 }
3037
3038 if (end_col != selection.end.col)
3039 new_selection_text[ofs++] = C0_LF;
3040 3125
3041 new_selection_text[ofs] = 0; 3126 new_selection_text[ofs] = 0;
3042 3127
3043 if (ofs == 0) 3128 if (ofs == 0)
3044 { 3129 {
… …
3057 3142
3058 selection_grab (tm); 3143 selection_grab (tm);
3059} 3144}
3060 3145
3061bool 3146bool
3062rxvt_term::selection_grab (Time tm) NOTHROW 3147rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3063{ 3148{
3149 Atom sel;
3150
3151 if (!clipboard)
3152 {
3064 selection_time = tm; 3153 selection_time = tm;
3154 sel = XA_PRIMARY;
3155 }
3156 else
3157 {
3158 clipboard_time = tm;
3159 sel = xa[XA_CLIPBOARD];
3160 }
3065 3161
3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3162 XSetSelectionOwner (dpy, sel, vt, tm);
3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3163 if (XGetSelectionOwner (dpy, sel) == vt)
3068 { 3164 {
3069 display->set_selection_owner (this); 3165 display->set_selection_owner (this, clipboard);
3070 return true; 3166 return true;
3071 } 3167 }
3072 else 3168 else
3073 { 3169 {
3074 selection_clear (); 3170 selection_clear (clipboard);
3075 return false; 3171 return false;
3076 } 3172 }
3077 3173
3078#if 0 3174#if 0
3079 XTextProperty ct; 3175 XTextProperty ct;
… …
3574 else if (rq.target == xa[XA_MULTIPLE]) 3670 else if (rq.target == xa[XA_MULTIPLE])
3575 { 3671 {
3576 /* TODO: Handle MULTIPLE */ 3672 /* TODO: Handle MULTIPLE */
3577 } 3673 }
3578#endif 3674#endif
3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3675 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3580 { 3676 {
3581 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3677 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3582 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3678 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3679 ev.property = rq.property;
3680 }
3681 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3682 {
3683 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3684 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3583 ev.property = rq.property; 3685 ev.property = rq.property;
3584 } 3686 }
3585 else if (rq.target == XA_STRING 3687 else if (rq.target == XA_STRING
3586 || rq.target == xa[XA_TEXT] 3688 || rq.target == xa[XA_TEXT]
3587 || rq.target == xa[XA_COMPOUND_TEXT] 3689 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3620 { 3722 {
3621 target = xa[XA_COMPOUND_TEXT]; 3723 target = xa[XA_COMPOUND_TEXT];
3622 style = enc_compound_text; 3724 style = enc_compound_text;
3623 } 3725 }
3624 3726
3625 if (selection.text) 3727 if (rq.selection == XA_PRIMARY && selection.text)
3626 { 3728 {
3627 cl = selection.text; 3729 cl = selection.text;
3628 selectlen = selection.len; 3730 selectlen = selection.len;
3731 }
3732 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3733 {
3734 cl = selection.clip_text;
3735 selectlen = selection.clip_len;
3629 } 3736 }
3630 else 3737 else
3631 { 3738 {
3632 cl = L""; 3739 cl = L"";
3633 selectlen = 0; 3740 selectlen = 0;
… …
3701 h += 2; min_it (h, nrow); 3808 h += 2; min_it (h, nrow);
3702 3809
3703 x -= 1; clamp_it (x, 0, ncol - w); 3810 x -= 1; clamp_it (x, 0, ncol - w);
3704 y -= 1; clamp_it (y, 0, nrow - h); 3811 y -= 1; clamp_it (y, 0, nrow - h);
3705 3812
3706 ov_x = x; ov_y = y; 3813 ov.x = x; ov.y = y;
3707 ov_w = w; ov_h = h; 3814 ov.w = w; ov.h = h;
3708 3815
3709 ov_text = new text_t *[h]; 3816 ov.text = new text_t *[h];
3710 ov_rend = new rend_t *[h]; 3817 ov.rend = new rend_t *[h];
3711 3818
3712 for (y = 0; y < h; y++) 3819 for (y = 0; y < h; y++)
3713 { 3820 {
3714 text_t *tp = ov_text[y] = new text_t[w]; 3821 text_t *tp = ov.text[y] = new text_t[w];
3715 rend_t *rp = ov_rend[y] = new rend_t[w]; 3822 rend_t *rp = ov.rend[y] = new rend_t[w];
3716 3823
3717 text_t t0, t1, t2; 3824 text_t t0, t1, t2;
3718 rend_t r = OVERLAY_RSTYLE; 3825 rend_t r = OVERLAY_RSTYLE;
3719 3826
3720 if (y == 0) 3827 if (y == 0)
… …
3739} 3846}
3740 3847
3741void 3848void
3742rxvt_term::scr_overlay_off () NOTHROW 3849rxvt_term::scr_overlay_off () NOTHROW
3743{ 3850{
3744 if (!ov_text) 3851 if (!ov.text)
3745 return; 3852 return;
3746 3853
3747 want_refresh = 1; 3854 want_refresh = 1;
3748 3855
3749 for (int y = 0; y < ov_h; y++) 3856 for (int y = 0; y < ov.h; y++)
3750 { 3857 {
3751 delete [] ov_text[y]; 3858 delete [] ov.text[y];
3752 delete [] ov_rend[y]; 3859 delete [] ov.rend[y];
3753 } 3860 }
3754 3861
3755 delete [] ov_text; ov_text = 0; 3862 delete [] ov.text; ov.text = 0;
3756 delete [] ov_rend; ov_rend = 0; 3863 delete [] ov.rend; ov.rend = 0;
3757} 3864}
3758 3865
3759void 3866void
3760rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3867rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3761{ 3868{
3762 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3869 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3763 return; 3870 return;
3764 3871
3765 x++, y++; 3872 x++, y++;
3766 3873
3767 ov_text[y][x] = text; 3874 ov.text[y][x] = text;
3768 ov_rend[y][x] = rend; 3875 ov.rend[y][x] = rend;
3769} 3876}
3770 3877
3771void 3878void
3772rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3879rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3773{ 3880{
… …
3792} 3899}
3793 3900
3794void 3901void
3795rxvt_term::scr_swap_overlay () NOTHROW 3902rxvt_term::scr_swap_overlay () NOTHROW
3796{ 3903{
3797 if (!ov_text) 3904 if (!ov.text)
3798 return; 3905 return;
3799 3906
3907 // hide cursor if it is within the overlay area
3908 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3909 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3910 screen.flags &= ~Screen_VisibleCursor;
3911
3800 // swap screen mem with overlay 3912 // swap screen mem with overlay
3801 for (int y = ov_h; y--; ) 3913 for (int y = ov.h; y--; )
3802 { 3914 {
3803 text_t *t1 = ov_text[y]; 3915 text_t *t1 = ov.text[y];
3804 rend_t *r1 = ov_rend[y]; 3916 rend_t *r1 = ov.rend[y];
3805 3917
3806 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3918 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; 3919 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3808 3920
3809 for (int x = ov_w; x--; ) 3921 for (int x = ov.w; x--; )
3810 { 3922 {
3811 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3923 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3812 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3924 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3813 } 3925 }
3814 } 3926 }

Diff Legend

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