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.306 by root, Sun Jun 15 10:15:39 2008 UTC vs.
Revision 1.378 by sf-exg, Thu Mar 24 23:55:31 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 85
87/* 86/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 88 */
92#define CLEAR_ROWS(row, num) \
93 if (mapped) \
94 XClearArea (dpy, vt, 0, \
95 Row2Pixel (row), (unsigned int)width, \
96 (unsigned int)Height2Pixel (num), False)
97
98#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
99 if (mapped) \ 90 if (mapped) \
100 XClearArea (dpy, vt, x, y, \ 91 XClearArea (dpy, vt, x, y, \
101 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
102 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
103 94
104#define ERASE_ROWS(row, num) \
105 XFillRectangle (dpy, vt, gc, \
106 0, Row2Pixel (row), \
107 (unsigned int)width, \
108 (unsigned int)Height2Pixel (num))
109
110/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
111 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
112 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
113 98
114/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
… …
146 131
147 l.l = 0; 132 l.l = 0;
148 l.f = 0; 133 l.f = 0;
149} 134}
150 135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
151/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
152 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
153 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
154 160
155void 161void
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/* ------------------------------------------------------------------------- */
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1337 return; 1342 return;
1338 1343
1339 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1340 1345
1341 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1349 {
1345 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1346 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);
1347 } 1356 }
1348 else 1357 else
1349 { 1358 {
1350 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1360
1361 if (mapped)
1362 {
1351 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1352 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1353 ERASE_ROWS (row, num); 1365 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start),
1367 (unsigned int)width,
1368 (unsigned int)Height2Pixel (num));
1354 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 }
1356 } 1372 }
1357 1373
1358 for (; num--; row++) 1374 for (; num--; row++)
1359 { 1375 {
1360 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1377
1378 if (row - view_start < nrow)
1361 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1362 } 1380 }
1363} 1381}
1364 1382
1365#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1366void 1384void
… …
1440 * Insert/Delete <count> characters from the current position 1458 * Insert/Delete <count> characters from the current position
1441 */ 1459 */
1442void 1460void
1443rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1461rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1444{ 1462{
1445 int col, row;
1446 rend_t tr;
1447
1448 want_refresh = 1; 1463 want_refresh = 1;
1449 ZERO_SCROLLBACK (); 1464 ZERO_SCROLLBACK ();
1450 1465
1451 if (count <= 0) 1466 if (count <= 0)
1452 return; 1467 return;
… …
1454 scr_do_wrap (); 1469 scr_do_wrap ();
1455 1470
1456 selection_check (1); 1471 selection_check (1);
1457 min_it (count, ncol - screen.cur.col); 1472 min_it (count, ncol - screen.cur.col);
1458 1473
1459 row = screen.cur.row; 1474 int row = screen.cur.row;
1460 1475
1461 line_t *line = &ROW(row); 1476 line_t *line = &ROW(row);
1462 1477
1463 line->touch (); 1478 line->touch ();
1464 line->is_longer (0); 1479 line->is_longer (0);
1465 1480
1481 // nuke wide spanning the start
1482 if (line->t[screen.cur.col] == NOCHAR)
1483 scr_kill_char (*line, screen.cur.col);
1484
1466 switch (insdel) 1485 switch (insdel)
1467 { 1486 {
1468 case INSERT: 1487 case INSERT:
1469 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--)
1470 { 1494 {
1471 line->t[col] = line->t[col - count]; 1495 line->t[col] = line->t[col - count];
1472 line->r[col] = line->r[col - count]; 1496 line->r[col] = line->r[col - count];
1473 } 1497 }
1474
1475 line->l = min (line->l + count, ncol);
1476 1498
1477 if (selection.op && current_screen == selection.screen 1499 if (selection.op && current_screen == selection.screen
1478 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1500 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1479 { 1501 {
1480 if (selection.end.row != screen.cur.row 1502 if (selection.end.row != screen.cur.row
… …
1495 case ERASE: 1517 case ERASE:
1496 screen.cur.col += count; /* don't worry if > ncol */ 1518 screen.cur.col += count; /* don't worry if > ncol */
1497 selection_check (1); 1519 selection_check (1);
1498 screen.cur.col -= count; 1520 screen.cur.col -= count;
1499 1521
1500 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
1501 scr_blank_line (*line, screen.cur.col, count, rstyle); 1526 scr_blank_line (*line, screen.cur.col, count, rstyle);
1502 break; 1527 break;
1503 1528
1504 case DELETE: 1529 case DELETE:
1505 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1530 line->l = max (line->l - count, 0);
1506 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
1507 for (col = screen.cur.col; (col + count) < ncol; col++) 1536 for (int col = screen.cur.col; (col + count) < ncol; col++)
1508 { 1537 {
1509 line->t[col] = line->t[col + count]; 1538 line->t[col] = line->t[col + count];
1510 line->r[col] = line->r[col + count]; 1539 line->r[col] = line->r[col + count];
1511 } 1540 }
1512 1541
1513 line->l = max (line->l - count, 0);
1514 scr_blank_line (*line, ncol - count, count, tr); 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1515 1543
1516 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1517 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1518 { 1546 {
1519 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
… …
1655 { 1683 {
1656 rvideo_state = on; 1684 rvideo_state = on;
1657 1685
1658 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1659#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1660 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1661#endif 1689#endif
1662 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1663 1691
1664 XGCValues gcvalue; 1692 XGCValues gcvalue;
1665 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1809 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1810 { 1838 {
1811 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1812 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1813 } 1841 }
1814// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1815 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++)
1816 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);
1817 1845
1818 num_scr_allow = 0; 1846 num_scr_allow = 0;
1819 1847
… …
1897 XMapWindow (dpy, parent[0]); 1925 XMapWindow (dpy, parent[0]);
1898# endif 1926# endif
1899 1927
1900# if ENABLE_FRILLS 1928# if ENABLE_FRILLS
1901 if (option (Opt_urgentOnBell)) 1929 if (option (Opt_urgentOnBell))
1902 { 1930 set_urgency (1);
1903 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1904 {
1905 h->flags |= XUrgencyHint;
1906 XSetWMHints (dpy, parent[0], h);
1907 }
1908 }
1909# endif 1931# endif
1910 1932
1911 if (option (Opt_visualBell)) 1933 if (option (Opt_visualBell))
1912 { 1934 {
1913 rvideo_bell = true; 1935 rvideo_bell = true;
… …
1916 1938
1917 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1918 } 1940 }
1919 else 1941 else
1920 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1921#endif 1944#endif
1922} 1945}
1923 1946
1924/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1925/* ARGSUSED */ 1948/* ARGSUSED */
1926void 1949void
1927rxvt_term::scr_printscreen (int fullhist) NOTHROW 1950rxvt_term::scr_printscreen (int fullhist) NOTHROW
1928{ 1951{
1929#ifdef PRINTPIPE 1952#ifdef PRINTPIPE
1930 int nrows, row_start; 1953 int nrows, row_start;
1931 FILE *fd; 1954 FILE *fd = popen_printer ();
1932 1955
1933 if ((fd = popen_printer ()) == NULL) 1956 if (!fd)
1934 return; 1957 return;
1935 1958
1936 if (fullhist) 1959 if (fullhist)
1937 { 1960 {
1938 nrows = nrow - top_row; 1961 nrows = nrow - top_row;
… …
1944 row_start = view_start; 1967 row_start = view_start;
1945 } 1968 }
1946 1969
1947 wctomb (0, 0); 1970 wctomb (0, 0);
1948 1971
1949 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1950 { 1973 {
1951 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1952 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1953 1976
1954 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
… …
1983 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
1984 */ 2007 */
1985void 2008void
1986rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
1987{ 2010{
1988 unsigned char have_bg,
1989 showcursor; /* show the cursor */
1990 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
1991 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
1992 int i; /* tmp */ 2013 int i; /* tmp */
1993#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
1994 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2005 /* 2026 /*
2006 * A: set up vars 2027 * A: set up vars
2007 */ 2028 */
2008 refresh_count = 0; 2029 refresh_count = 0;
2009 2030
2031 unsigned int old_screen_flags = screen.flags;
2010 have_bg = 0; 2032 char have_bg = 0;
2011#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2012 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2013#endif 2035#endif
2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2015 2037
2016 /* 2038 /*
2017 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2018 */ 2040 */
2019 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;
2020 2049
2021 /* 2050 /*
2022 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2023 */ 2052 */
2024 { 2053 {
2025 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2026 2055
2027 showcursor = (screen.flags & Screen_VisibleCursor);
2028#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2029 if (hidden_cursor) 2057 if (hidden_cursor)
2030 showcursor = 0; 2058 showcursor = 0;
2031#endif 2059#endif
2032 2060
… …
2060 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2061#else 2089#else
2062 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2063#endif 2091#endif
2064 2092
2065 if (showcursor && focus) 2093 if (focus)
2066 { 2094 {
2067 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2068 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2069 else 2097 else
2070 { 2098 {
… …
2105 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2106 } 2134 }
2107 } 2135 }
2108 } 2136 }
2109 2137
2110 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2111#if ENABLE_OVERLAY
2112 scr_swap_overlay ();
2113#endif
2114
2115#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2116 /* 2139 /*
2117 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2118 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2119 */ 2142 */
… …
2208 continue; 2231 continue;
2209 2232
2210 // redraw one or more characters 2233 // redraw one or more characters
2211 2234
2212 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2213 while (stp[col] == NOCHAR && col > 0) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2214 --col; 2237 --col;
2215 2238
2216 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2217 text_t *text = stp + col; 2240 text_t *text = stp + col;
2218 int count = 1; 2241 int count = 1;
2219 2242
2220 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2221 drp[col] = rend; 2244 drp[col] = rend;
… …
2225 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2226 { 2249 {
2227 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2228 { 2251 {
2229 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2230 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2231 count++; 2255 count++;
2232 i++; 2256 i++;
2233 2257
2234 continue; 2258 continue;
2235 } 2259 }
… …
2255 2279
2256 col--; /* went one too far. move back */ 2280 col--; /* went one too far. move back */
2257 count -= i; /* dump any matching trailing chars */ 2281 count -= i; /* dump any matching trailing chars */
2258 2282
2259 // sometimes we optimize away the trailing NOCHAR's, add them back 2283 // sometimes we optimize away the trailing NOCHAR's, add them back
2260 while (i && text[count] == NOCHAR) 2284 while (expect_false (i && text[count] == NOCHAR))
2261 count++, i--; 2285 count++, i--;
2262 2286
2263 /* 2287 /*
2264 * Determine the attributes for the string 2288 * Determine the attributes for the string
2265 */ 2289 */
2266 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2267 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2268 2292
2269 // 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
2270 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)))
2271 { 2295 {
2272 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2273 2297
2274#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2275 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2294 2318
2295 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2296 fore = Color_UL; 2320 fore = Color_UL;
2297#endif 2321#endif
2298 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
2299 if (invert) 2343 if (invert)
2300 { 2344 {
2301#ifdef OPTION_HC
2302 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2303 || !ISSET_PIXCOLOR (Color_HC))
2304#endif
2305 /* invert the column if no highlightColor is set or it is the
2306 * current cursor column */
2307 ::swap (fore, back); 2345 ::swap (fore, back);
2308#ifdef OPTION_HC
2309 else if (ISSET_PIXCOLOR (Color_HC))
2310 back = Color_HC;
2311#endif
2312 2346
2313#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2314# ifndef OPTION_HC
2315 if (ISSET_PIXCOLOR (Color_RV))
2316 back = Color_RV;
2317# endif
2318 if (fore == back) 2348 if (fore == back)
2319 { 2349 {
2320 fore = Color_bg; 2350 fore = Color_bg;
2321 back = Color_fg; 2351 back = Color_fg;
2322 } 2352 }
… …
2358 /* 2388 /*
2359 * Actually do the drawing of the string here 2389 * Actually do the drawing of the string here
2360 */ 2390 */
2361 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2362 2392
2363 if (have_bg && back == Color_bg) 2393 if (expect_true (have_bg && back == Color_bg))
2364 { 2394 {
2365 // this is very ugly, maybe push it into ->draw? 2395 // this is very ugly, maybe push it into ->draw?
2366 2396
2367 for (i = 0; i < count; i++) /* don't draw empty strings */ 2397 for (i = 0; i < count; i++) /* don't draw empty strings */
2368 if (text[i] != ' ') 2398 if (text[i] != ' ')
… …
2375 did_clear: ; 2405 did_clear: ;
2376 } 2406 }
2377 else 2407 else
2378 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2379 2409
2380 if (rend & RS_Uline && font->descent > 1 && fore != back) 2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2381 { 2411 {
2382#if ENABLE_FRILLS 2412#if ENABLE_FRILLS
2383 if (ISSET_PIXCOLOR (Color_underline)) 2413 if (ISSET_PIXCOLOR (Color_underline))
2384 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2414 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2385 else 2415 else
… …
2390 xpixel, ypixel + font->ascent + 1, 2420 xpixel, ypixel + font->ascent + 1,
2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2392 } 2422 }
2393 } /* for (col....) */ 2423 } /* for (col....) */
2394 } /* for (row....) */ 2424 } /* for (row....) */
2395
2396#if ENABLE_OVERLAY
2397 scr_swap_overlay ();
2398#endif
2399 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2400 2425
2401 /* 2426 /*
2402 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2403 */ 2428 */
2404 if (showcursor) 2429 if (showcursor)
… …
2443 } 2468 }
2444 2469
2445 /* 2470 /*
2446 * H: cleanup selection 2471 * H: cleanup selection
2447 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2448 scr_reverse_selection (); 2478 scr_reverse_selection ();
2449 2479
2480 screen.flags = old_screen_flags;
2450 num_scr = 0; 2481 num_scr = 0;
2451 num_scr_allow = 1; 2482 num_scr_allow = 1;
2452} 2483}
2453 2484
2454void 2485void
… …
2475 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2476 } 2507 }
2477} 2508}
2478 2509
2479void 2510void
2480rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2481{ 2512{
2513 bool transparent = false;
2514
2482#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2483 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2484#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);
2485 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 {
2486 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
2487 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2488 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2489 2541
2490 if (scrollBar.win) 2542 if (scrollBar.win)
2491 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2492 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2493 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2494 scrollBar.show (0); 2549 scrollBar.show (0);
2495 } 2550 }
2496 2551
2497#endif 2552 if (refresh)
2498 2553 {
2499 /* bgPixmap.apply () does not do the following : */
2500 scr_clear (); 2554 scr_clear ();
2501 scr_touch (true); 2555 scr_touch (true);
2556 }
2502 want_refresh = 1; 2557 want_refresh = 1;
2503} 2558}
2504 2559
2505/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2506void 2561void
… …
2574 { 2629 {
2575#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2576 if (selection.rect) 2631 if (selection.rect)
2577 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2579 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2580 else 2635 else
2581#endif 2636#endif
2582 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2583 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2584 RS_RVid); 2639 RS_Sel | RS_RVid);
2585 } 2640 }
2586} 2641}
2587 2642
2588/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2589/* 2644/*
… …
2594void 2649void
2595rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2596{ 2651{
2597 int row, wrote; 2652 int row, wrote;
2598 unsigned int width, towrite; 2653 unsigned int width, towrite;
2599 char r1[] = "\n"; 2654 const char r1[] = "\n";
2600 2655
2601 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2602 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2603 { 2658 {
2604 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2650/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2651/* 2706/*
2652 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2653 */ 2708 */
2654void 2709void
2655rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2656{ 2711{
2657 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2658 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2659 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2660 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2666 2721
2667 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2669} 2724}
2670 2725
2671/* ------------------------------------------------------------------------- */
2672/*
2673 * Respond to a notification that a primary selection has been sent
2674 * EXT: SelectionNotify
2675 */
2676void 2726void
2677rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2678{ 2728{
2679 if (prop == None) /* check for failed XConvertSelection */ 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2680 {
2681 if ((selection_type & Sel_CompoundText))
2682 {
2683 int selnum = selection_type & Sel_whereMask;
2684
2685 selection_type = 0;
2686 if (selnum != Sel_direct)
2687 selection_request_other (XA_STRING, selnum);
2688 }
2689
2690 if ((selection_type & Sel_UTF8String))
2691 {
2692 int selnum = selection_type & Sel_whereMask;
2693
2694 selection_type = Sel_CompoundText;
2695 if (selnum != Sel_direct)
2696 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2697 else
2698 selection_type = 0;
2699 }
2700
2701 return;
2702 }
2703
2704 unsigned long bytes_after;
2705 XTextProperty ct;
2706
2707 if (XGetWindowProperty (dpy, win, prop,
2708 0, PROP_SIZE / 4,
2709 delete_prop, AnyPropertyType,
2710 &ct.encoding, &ct.format,
2711 &ct.nitems, &bytes_after,
2712 &ct.value) != Success)
2713 {
2714 ct.value = 0;
2715 goto bailout;
2716 }
2717
2718 if (ct.encoding == None)
2719 goto bailout;
2720
2721 if (bytes_after)
2722 {
2723 // fetch and append remaining data
2724 XTextProperty ct2;
2725
2726 if (XGetWindowProperty (dpy, win, prop,
2727 ct.nitems / 4, (bytes_after + 3) / 4,
2728 delete_prop, AnyPropertyType,
2729 &ct2.encoding, &ct2.format,
2730 &ct2.nitems, &bytes_after,
2731 &ct2.value) != Success)
2732 goto bailout;
2733
2734 // realloc should be compatible to XFree, here, and elsewhere, too
2735 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2736 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2737 ct.nitems += ct2.nitems;
2738
2739 XFree (ct2.value);
2740 }
2741
2742 if (ct.value == 0)
2743 goto bailout;
2744
2745 if (ct.encoding == xa[XA_INCR])
2746 {
2747 // INCR selection, start handshake
2748 if (!delete_prop)
2749 XDeleteProperty (dpy, win, prop);
2750
2751 selection_wait = Sel_incr;
2752 incr_buf_fill = 0;
2753 incr_ev.start (10);
2754
2755 goto bailout;
2756 }
2757
2758 if (ct.nitems == 0)
2759 {
2760 if (selection_wait == Sel_incr)
2761 {
2762 XFree (ct.value);
2763
2764 // finally complete, now paste the whole thing
2765 selection_wait = Sel_normal;
2766 ct.value = (unsigned char *)incr_buf;
2767 ct.nitems = incr_buf_fill;
2768 incr_buf = 0;
2769 incr_buf_size = 0;
2770 incr_ev.stop ();
2771 }
2772 else
2773 {
2774 if (selection_wait == Sel_normal
2775 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2776 {
2777 /*
2778 * pass through again trying CUT_BUFFER0 if we've come from
2779 * XConvertSelection () but nothing was presented
2780 */
2781 selection_paste (display->root, XA_CUT_BUFFER0, False);
2782 }
2783
2784 goto bailout;
2785 }
2786 }
2787 else if (selection_wait == Sel_incr)
2788 {
2789 incr_ev.start (10);
2790
2791 while (incr_buf_fill + ct.nitems > incr_buf_size)
2792 {
2793 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2794 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2795 }
2796
2797 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2798 incr_buf_fill += ct.nitems;
2799
2800 goto bailout;
2801 }
2802
2803 char **cl;
2804 int cr;
2805
2806#if !ENABLE_MINIMAL
2807 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2808 // so recode it manually
2809 if (ct.encoding == xa[XA_UTF8_STRING])
2810 {
2811 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2812 char *s = rxvt_wcstombs (w);
2813 free (w);
2814 // TODO: strlen == only the first element will be converted. well...
2815 paste (s, strlen (s));
2816 free (s);
2817 }
2818 else
2819#endif
2820 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2821 && cl)
2822 {
2823 for (int i = 0; i < cr; i++)
2824 paste (cl[i], strlen (cl[i]));
2825
2826 XFreeStringList (cl);
2827 }
2828 else
2829 paste ((char *)ct.value, ct.nitems); // paste raw
2830
2831bailout:
2832 XFree (ct.value);
2833
2834 if (selection_wait == Sel_normal)
2835 selection_wait = Sel_none;
2836}
2837
2838void
2839rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2840{
2841 selection_wait = Sel_none;
2842
2843 incr_buf_size = 0;
2844 free (incr_buf);
2845
2846 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2847}
2848
2849void
2850rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2851{
2852 if (prop == None || selection_wait != Sel_incr)
2853 return; 2730 return;
2854 2731
2855 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2856} 2733}
2857 2734
2858/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2859/* 2736/*
2860 * Request the current selection: 2737 * Request the current selection:
… …
2866 * EXT: button 2 release 2743 * EXT: button 2 release
2867 */ 2744 */
2868void 2745void
2869rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2870{ 2747{
2871 if (selection.text && selnum == Sel_Primary) 2748 if (!selection_req)
2872 {
2873 /* internal selection */
2874 char *str = rxvt_wcstombs (selection.text, selection.len);
2875 paste (str, strlen (str));
2876 free (str);
2877 return;
2878 } 2749 {
2879 else 2750 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2751 selection_req->run ();
2880 { 2752 }
2881 selection_request_time = tm;
2882 selection_wait = Sel_normal;
2883
2884#if X_HAVE_UTF8_STRING
2885 selection_type = Sel_UTF8String;
2886 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2887 return;
2888#else
2889 selection_type = Sel_CompoundText;
2890 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2891 return;
2892#endif
2893 }
2894
2895 selection_wait = Sel_none; /* don't loop in selection_paste () */
2896 selection_paste (display->root, XA_CUT_BUFFER0, false);
2897}
2898
2899int
2900rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2901{
2902 Atom sel;
2903
2904 selection_type |= selnum;
2905
2906 if (selnum == Sel_Primary)
2907 sel = XA_PRIMARY;
2908 else if (selnum == Sel_Secondary)
2909 sel = XA_SECONDARY;
2910 else
2911 sel = xa[XA_CLIPBOARD];
2912
2913 if (XGetSelectionOwner (dpy, sel) != None)
2914 {
2915 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2916 vt, selection_request_time);
2917 return 1;
2918 }
2919
2920 return 0;
2921} 2753}
2922 2754
2923/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2924/* 2756/*
2925 * Clear all selected text 2757 * Clear all selected text
2926 * EXT: SelectionClear 2758 * EXT: SelectionClear
2927 */ 2759 */
2928void 2760void
2929rxvt_term::selection_clear () NOTHROW 2761rxvt_term::selection_clear (bool clipboard) NOTHROW
2930{ 2762{
2763 if (!clipboard)
2764 {
2931 want_refresh = 1; 2765 want_refresh = 1;
2932 free (selection.text); 2766 free (selection.text);
2933 selection.text = NULL; 2767 selection.text = NULL;
2934 selection.len = 0; 2768 selection.len = 0;
2935 CLEAR_SELECTION (); 2769 CLEAR_SELECTION ();
2936 2770
2937 if (display->selection_owner == this) 2771 if (display->selection_owner == this)
2938 display->selection_owner = 0; 2772 display->selection_owner = 0;
2773 }
2774 else
2775 {
2776 free (selection.clip_text);
2777 selection.clip_text = NULL;
2778 selection.clip_len = 0;
2779
2780 if (display->clipboard_owner == this)
2781 display->clipboard_owner = 0;
2782 }
2939} 2783}
2940 2784
2941/* ------------------------------------------------------------------------- */ 2785/* ------------------------------------------------------------------------- */
2942/* 2786/*
2943 * Copy a selection into the cut buffer 2787 * Copy a selection into the cut buffer
2944 * EXT: button 1 or 3 release 2788 * EXT: button 1 or 3 release
2945 */ 2789 */
2946void 2790void
2947rxvt_term::selection_make (Time tm) 2791rxvt_term::selection_make (Time tm)
2948{ 2792{
2949 int i; 2793 int size;
2950 wchar_t *new_selection_text; 2794 wchar_t *new_selection_text;
2951 text_t *t; 2795 text_t *t;
2952 2796
2953 switch (selection.op) 2797 switch (selection.op)
2954 { 2798 {
… …
2970 return; /* nothing selected, go away */ 2814 return; /* nothing selected, go away */
2971 2815
2972 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2816 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2973 return; 2817 return;
2974 2818
2975 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2819 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2976 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2820 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2977 2821
2978 int ofs = 0; 2822 int ofs = 0;
2979 int extra = 0; 2823 int extra = 0;
2980 2824
2981 int col = selection.beg.col; 2825 int col = selection.beg.col;
… …
2987 { 2831 {
2988#if !ENABLE_MINIMAL 2832#if !ENABLE_MINIMAL
2989 if (selection.rect) 2833 if (selection.rect)
2990 { 2834 {
2991 col = selection.beg.col; 2835 col = selection.beg.col;
2992 end_col = ncol + 1; 2836 end_col = selection.end.col;
2993 } 2837 }
2994 else 2838 else
2995#endif 2839#endif
2996 end_col = ROW(row).l; 2840 end_col = ROW(row).l;
2997 2841
2998 col = max (col, 0); 2842 col = max (col, 0);
2999 2843
3000 if (row == selection.end.row 2844 if (row == selection.end.row)
3001#if !ENABLE_MINIMAL
3002 || selection.rect
3003#endif
3004 )
3005 min_it (end_col, selection.end.col); 2845 min_it (end_col, selection.end.col);
3006 2846
3007 t = ROW(row).t + col; 2847 t = ROW(row).t + col;
3008 2848
3009 for (; col < end_col; col++) 2849 for (; col < end_col; col++)
… …
3017 2857
3018 extra -= (len - 1); 2858 extra -= (len - 1);
3019 2859
3020 if (extra < 0) 2860 if (extra < 0)
3021 { 2861 {
3022 extra += i; 2862 extra += size;
3023 i += i; 2863 size += size;
3024 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2864 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3025 } 2865 }
3026 2866
3027 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2867 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3028 } 2868 }
3029#endif 2869#endif
… …
3041 2881
3042 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3043 } 2883 }
3044 else 2884 else
3045#endif 2885#endif
3046 if (!ROW(row).is_longer () && row != selection.end.row) 2886 if (!ROW(row).is_longer ()
2887 && (row != selection.end.row || end_col != selection.end.col)
2888 && (row != selection.beg.row || selection.beg.col < ncol))
3047 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3048 } 2890 }
3049
3050 if (end_col != selection.end.col)
3051 new_selection_text[ofs++] = C0_LF;
3052 2891
3053 new_selection_text[ofs] = 0; 2892 new_selection_text[ofs] = 0;
3054 2893
3055 if (ofs == 0) 2894 if (ofs == 0)
3056 { 2895 {
… …
3069 2908
3070 selection_grab (tm); 2909 selection_grab (tm);
3071} 2910}
3072 2911
3073bool 2912bool
3074rxvt_term::selection_grab (Time tm) NOTHROW 2913rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3075{ 2914{
2915 Atom sel;
2916
2917 if (!clipboard)
2918 {
3076 selection_time = tm; 2919 selection_time = tm;
2920 sel = XA_PRIMARY;
2921 }
2922 else
2923 {
2924 clipboard_time = tm;
2925 sel = xa[XA_CLIPBOARD];
2926 }
3077 2927
3078 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2928 XSetSelectionOwner (dpy, sel, vt, tm);
3079 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2929 if (XGetSelectionOwner (dpy, sel) == vt)
3080 { 2930 {
3081 display->set_selection_owner (this); 2931 display->set_selection_owner (this, clipboard);
3082 return true; 2932 return true;
3083 } 2933 }
3084 else 2934 else
3085 { 2935 {
3086 selection_clear (); 2936 selection_clear (clipboard);
3087 return false; 2937 return false;
3088 } 2938 }
3089 2939
3090#if 0 2940#if 0
3091 XTextProperty ct; 2941 XTextProperty ct;
… …
3586 else if (rq.target == xa[XA_MULTIPLE]) 3436 else if (rq.target == xa[XA_MULTIPLE])
3587 { 3437 {
3588 /* TODO: Handle MULTIPLE */ 3438 /* TODO: Handle MULTIPLE */
3589 } 3439 }
3590#endif 3440#endif
3591 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3592 { 3442 {
3593 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3594 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3444 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3445 ev.property = rq.property;
3446 }
3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3448 {
3449 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3450 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3595 ev.property = rq.property; 3451 ev.property = rq.property;
3596 } 3452 }
3597 else if (rq.target == XA_STRING 3453 else if (rq.target == XA_STRING
3598 || rq.target == xa[XA_TEXT] 3454 || rq.target == xa[XA_TEXT]
3599 || rq.target == xa[XA_COMPOUND_TEXT] 3455 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3632 { 3488 {
3633 target = xa[XA_COMPOUND_TEXT]; 3489 target = xa[XA_COMPOUND_TEXT];
3634 style = enc_compound_text; 3490 style = enc_compound_text;
3635 } 3491 }
3636 3492
3637 if (selection.text) 3493 if (rq.selection == XA_PRIMARY && selection.text)
3638 { 3494 {
3639 cl = selection.text; 3495 cl = selection.text;
3640 selectlen = selection.len; 3496 selectlen = selection.len;
3497 }
3498 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3499 {
3500 cl = selection.clip_text;
3501 selectlen = selection.clip_len;
3641 } 3502 }
3642 else 3503 else
3643 { 3504 {
3644 cl = L""; 3505 cl = L"";
3645 selectlen = 0; 3506 selectlen = 0;
… …
3713 h += 2; min_it (h, nrow); 3574 h += 2; min_it (h, nrow);
3714 3575
3715 x -= 1; clamp_it (x, 0, ncol - w); 3576 x -= 1; clamp_it (x, 0, ncol - w);
3716 y -= 1; clamp_it (y, 0, nrow - h); 3577 y -= 1; clamp_it (y, 0, nrow - h);
3717 3578
3718 ov_x = x; ov_y = y; 3579 ov.x = x; ov.y = y;
3719 ov_w = w; ov_h = h; 3580 ov.w = w; ov.h = h;
3720 3581
3721 ov_text = new text_t *[h]; 3582 ov.text = new text_t *[h];
3722 ov_rend = new rend_t *[h]; 3583 ov.rend = new rend_t *[h];
3723 3584
3724 for (y = 0; y < h; y++) 3585 for (y = 0; y < h; y++)
3725 { 3586 {
3726 text_t *tp = ov_text[y] = new text_t[w]; 3587 text_t *tp = ov.text[y] = new text_t[w];
3727 rend_t *rp = ov_rend[y] = new rend_t[w]; 3588 rend_t *rp = ov.rend[y] = new rend_t[w];
3728 3589
3729 text_t t0, t1, t2; 3590 text_t t0, t1, t2;
3730 rend_t r = OVERLAY_RSTYLE; 3591 rend_t r = OVERLAY_RSTYLE;
3731 3592
3732 if (y == 0) 3593 if (y == 0)
… …
3751} 3612}
3752 3613
3753void 3614void
3754rxvt_term::scr_overlay_off () NOTHROW 3615rxvt_term::scr_overlay_off () NOTHROW
3755{ 3616{
3756 if (!ov_text) 3617 if (!ov.text)
3757 return; 3618 return;
3758 3619
3759 want_refresh = 1; 3620 want_refresh = 1;
3760 3621
3761 for (int y = 0; y < ov_h; y++) 3622 for (int y = 0; y < ov.h; y++)
3762 { 3623 {
3763 delete [] ov_text[y]; 3624 delete [] ov.text[y];
3764 delete [] ov_rend[y]; 3625 delete [] ov.rend[y];
3765 } 3626 }
3766 3627
3767 delete [] ov_text; ov_text = 0; 3628 delete [] ov.text; ov.text = 0;
3768 delete [] ov_rend; ov_rend = 0; 3629 delete [] ov.rend; ov.rend = 0;
3769} 3630}
3770 3631
3771void 3632void
3772rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3633rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3773{ 3634{
3774 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3635 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3775 return; 3636 return;
3776 3637
3777 x++, y++; 3638 x++, y++;
3778 3639
3779 ov_text[y][x] = text; 3640 ov.text[y][x] = text;
3780 ov_rend[y][x] = rend; 3641 ov.rend[y][x] = rend;
3781} 3642}
3782 3643
3783void 3644void
3784rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3645rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3785{ 3646{
… …
3804} 3665}
3805 3666
3806void 3667void
3807rxvt_term::scr_swap_overlay () NOTHROW 3668rxvt_term::scr_swap_overlay () NOTHROW
3808{ 3669{
3809 if (!ov_text) 3670 if (!ov.text)
3810 return; 3671 return;
3811 3672
3673 // hide cursor if it is within the overlay area
3674 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3675 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3676 screen.flags &= ~Screen_VisibleCursor;
3677
3812 // swap screen mem with overlay 3678 // swap screen mem with overlay
3813 for (int y = ov_h; y--; ) 3679 for (int y = ov.h; y--; )
3814 { 3680 {
3815 text_t *t1 = ov_text[y]; 3681 text_t *t1 = ov.text[y];
3816 rend_t *r1 = ov_rend[y]; 3682 rend_t *r1 = ov.rend[y];
3817 3683
3818 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3684 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3819 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3685 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3820 3686
3821 for (int x = ov_w; x--; ) 3687 for (int x = ov.w; x--; )
3822 { 3688 {
3823 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3689 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3824 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3690 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3825 } 3691 }
3826 } 3692 }

Diff Legend

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