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.283 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.344 by sf-exg, Wed Jul 21 09:00:43 2010 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-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
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.
… …
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 seperate 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 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
153/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
156 160
157void 161void
158rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
159{ 163{
160#if ENABLE_OVERLAY
161 scr_overlay_off ();
162#endif
163
164 rvideo_mode = false;
165 view_start = 0; 164 view_start = 0;
166 num_scr = 0; 165 num_scr = 0;
167 166
168 if (ncol == 0) 167 if (ncol == 0)
169 ncol = 80; 168 ncol = 80;
… …
171 if (nrow == 0) 170 if (nrow == 0)
172 nrow = 24; 171 nrow = 24;
173 172
174 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 174 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 175
180 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
182 { 178 {
183 //TODO//FIXME 179 //TODO//FIXME
… …
236 selection.text = NULL; 232 selection.text = NULL;
237 selection.len = 0; 233 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
240 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
241 } 239 }
242 else 240 else
243 { 241 {
244 /* 242 /*
245 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
283 281
284 if (top_row) 282 if (top_row)
285 { 283 {
286 // 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
287 // 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
288 287
289 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 290
292 do 291 do
293 { 292 {
294 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 295 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 297
301 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 ())
302 { 299 {
… …
396 delete old_ta; 393 delete old_ta;
397 delete old_ra; 394 delete old_ra;
398 395
399 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
401 399
402 free (tabs); 400 free (tabs);
403 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; --col; )
404 tabs [col] = col % TABSIZE == 0;
404 405
405 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
406 407
407 prev_nrow = nrow; 408 prev_nrow = nrow;
408 prev_ncol = ncol; 409 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 410
418 tt_winch (); 411 tt_winch ();
419 412
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 414}
… …
433 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
434 427
435 free (row_buf); 428 free (row_buf);
436 free (swap_buf); 429 free (swap_buf);
437 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
438 free (tabs); 433 free (tabs);
439 434 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 435 }
442} 436}
443 437
444/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
445/* 439/*
446 * Hard reset 440 * Hard/Soft reset
447 */ 441 */
448void 442void
449rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
450{ 444{
451 scr_release (); 445 scr_release ();
452 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
453 scr_reset (); 449 scr_reset ();
454 450
455 scr_clear (true); 451 scr_clear (true);
456 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);
457} 469}
458 470
459/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
499 } 511 }
500 512
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
507#endif
508} 518}
509 519
510void 520void
511rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
512{ 522{
… …
537 want_refresh = 1; 547 want_refresh = 1;
538 view_start = 0; 548 view_start = 0;
539 549
540 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
541 551
542 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
543 553
544#if NSCREENS 554#if NSCREENS
545 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
546 { 556 {
547 num_scr = 0; 557 num_scr = 0;
… …
596/* 606/*
597 * Change the rendition style for following text 607 * Change the rendition style for following text
598 */ 608 */
599void 609void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 610rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 611{
602 if (set) 612 if (set)
603 rstyle |= style; 613 rstyle |= style;
604 else if (style == ~RS_None) 614 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 615 rstyle = DEFAULT_RSTYLE;
606 else 616 else
607 rstyle &= ~style; 617 rstyle &= ~style;
608 } 618}
609 619
610/* ------------------------------------------------------------------------- */ 620/* ------------------------------------------------------------------------- */
611/* 621/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 622 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 623 * count positive ==> scroll up
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
774 } 784 }
775 } 785 }
776 786
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 790 int row = screen.cur.row;
783 791
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 793
786 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
787 795
788 while (str < strend) 796 while (str < strend)
789 { 797 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 799
792 if (c < 0x20) 800 if (expect_false (c < 0x20))
793 if (c == C0_LF) 801 if (c == C0_LF)
794 { 802 {
795 max_it (line->l, screen.cur.col); 803 max_it (line->l, screen.cur.col);
796 804
797 screen.flags &= ~Screen_WrapNext; 805 screen.flags &= ~Screen_WrapNext;
… …
816 { 824 {
817 scr_tab (1, true); 825 scr_tab (1, true);
818 continue; 826 continue;
819 } 827 }
820 828
829 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 830 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 832 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 ))
824 { 834 {
825 checksel = 0; 835 checksel = 0;
826 /* 836 /*
827 * If we wrote anywhere in the selected area, kill the selection 837 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 838 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 839 * should be a similar check.
830 */ 840 */
831 CLEAR_SELECTION (); 841 CLEAR_SELECTION ();
832 } 842 }
833 843
834 if (screen.flags & Screen_WrapNext) 844 if (expect_false (screen.flags & Screen_WrapNext))
835 { 845 {
836 scr_do_wrap (); 846 scr_do_wrap ();
837 847
838 line->l = ncol; 848 line->l = ncol;
839 line->is_longer (1); 849 line->is_longer (1);
… …
841 row = screen.cur.row; 851 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 852 line = &ROW(row); /* _must_ refresh */
843 } 853 }
844 854
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 855 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 857 c = 0xfffd;
848 858
849 // 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
850 // further replacements, as wcwidth might return -1 for the line 860 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 861 // drawing characters below as they might be invalid in the current
852 // locale. 862 // locale.
853 int width = WCWIDTH (c); 863 int width = WCWIDTH (c);
854 864
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 866 {
857 // vt100 special graphics and line drawing 867 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 868 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 869 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 870 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 883 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 884 width = 1; // vt100 line drawing characters are always single-width
875 } 885 }
876 } 886 }
877 887
878 if (screen.flags & Screen_Insert) 888 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 889 scr_insdel_chars (width, INSERT);
880 890
881 if (width != 0) 891 if (width != 0)
882 { 892 {
883#if !UNICODE_3 893#if !UNICODE_3
… …
889 c = 0xfffd; 899 c = 0xfffd;
890# endif 900# endif
891#endif 901#endif
892 902
893 // nuke the character at this position, if required 903 // nuke the character at this position, if required
904 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 905 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 906 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
897 { 915 {
898 int col = screen.cur.col; 916 // ... artificially enlargen the previous one
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 = ' '; 917 c = NOCHAR;
921 // and try the same character next loop iteration 918 // and try the same character next loop iteration
922 --str; 919 --str;
923 } 920 }
924 921
925 line->touch (); 922 line->touch ();
… …
927 do 924 do
928 { 925 {
929 line->t[screen.cur.col] = c; 926 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 927 line->r[screen.cur.col] = rend;
931 928
932 if (screen.cur.col < ncol - 1) 929 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 930 screen.cur.col++;
934 else 931 else
935 { 932 {
936 line->l = ncol; 933 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 934 if (screen.flags & Screen_Autowrap)
… …
939 break; 936 break;
940 } 937 }
941 938
942 c = NOCHAR; 939 c = NOCHAR;
943 } 940 }
944 while (--width > 0); 941 while (expect_false (--width > 0));
945 942
946 // pad with spaces when overwriting wide character with smaller one 943 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 944 if (expect_false (!width))
948 { 945 {
949 line->touch (); 946 line->touch ();
950 947
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 949 {
953 line->t[c] = ' '; 950 line->t[c] = ' ';
954 line->r[c] = rend; 951 line->r[c] = rend;
955 } 952 }
956 } 953 }
957 } 954 }
955#if ENABLE_COMBINING
958 else // width == 0 956 else // width == 0
959 { 957 {
960#if ENABLE_COMBINING 958 if (c != 0xfeff) // ignore BOM
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 { 959 {
960 // handle combining characters
961 // we just tag the accent on the previous on-screen character.
962 // this is arguably not correct, but also arguably not wrong.
963 // we don't handle double-width characters nicely yet.
964 line_t *linep;
965 text_t *tp;
966 rend_t *rp;
967
968 if (screen.cur.col > 0)
969 {
971 linep = line; 970 linep = line;
972 tp = line->t + screen.cur.col - 1; 971 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 972 rp = line->r + screen.cur.col - 1;
973 }
974 else if (screen.cur.row > 0
975 && ROW(screen.cur.row - 1).is_longer ())
976 {
977 linep = &ROW(screen.cur.row - 1);
978 tp = line->t + ncol - 1;
979 rp = line->r + ncol - 1;
980 }
981 else
982 continue;
983
984 linep->touch ();
985
986 while (*tp == NOCHAR && tp > linep->t)
987 tp--, rp--;
988
989 // first try to find a precomposed character
990 unicode_t n = rxvt_compose (*tp, c);
991 if (n == NOCHAR)
992 n = rxvt_composite.compose (*tp, c);
993
994 *tp = n;
995 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
974 } 996 }
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 } 997 }
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 998#endif
998 }
999 } 999 }
1000 1000
1001 max_it (line->l, screen.cur.col); 1001 max_it (line->l, screen.cur.col);
1002 1002
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
1005#endif
1006} 1004}
1007 1005
1008/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1009/* 1007/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1012 */ 1010 */
1013void 1011void
1014rxvt_term::scr_backspace () NOTHROW 1012rxvt_term::scr_backspace () NOTHROW
1015{ 1013{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
1019 { 1015 {
1020 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
1021 { 1017 {
1022#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1019 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1020 --screen.cur.row;
1025 return; 1021
1022 want_refresh = 1;
1026#endif 1023#endif
1027 } 1024 }
1028 } 1025 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1026 else
1030 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1028}
1034 1029
1035/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1036/* 1031/*
1037 * Process Horizontal Tab 1032 * Process Horizontal Tab
… …
1186 } 1181 }
1187 } 1182 }
1188 else 1183 else
1189 { 1184 {
1190 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1191 { /* relative origin mode */ 1187 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1194 } 1190 }
1195 else 1191 else
1196 screen.cur.row = row; 1192 screen.cur.row = row;
… …
1229/* 1225/*
1230 * Erase part or whole of a line 1226 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1231 */
1235void 1232void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1234{
1238 unsigned int col, num; 1235 unsigned int col, num;
… …
1247 line.touch (); 1244 line.touch ();
1248 line.is_longer (0); 1245 line.is_longer (0);
1249 1246
1250 switch (mode) 1247 switch (mode)
1251 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1252 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1256 col = screen.cur.col;
1254 num = ncol - col; 1257 num = ncol - col;
1255 min_it (line.l, col); 1258 min_it (line.l, col);
1259
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1259 break; 1263 break;
1264
1260 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1261 col = 0; 1266 col = 0;
1262 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1266 break; 1272 break;
1273
1267 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1268 col = 0; 1275 col = 0;
1269 num = ncol; 1276 num = ncol;
1270 line.l = 0; 1277 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1330 return; 1337 return;
1331 1338
1332 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1333 1340
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1334 if (rstyle & (RS_RVid | RS_Uline)) 1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1345 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1346 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1347 {
1338 ren = DEFAULT_RSTYLE; 1348 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1349
1350 if (mapped && !view_start)
1351 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False);
1340 } 1354 }
1341 else 1355 else
1342 { 1356 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1357 ren = rstyle & (RS_fgMask | RS_bgMask);
1358
1359 if (mapped && !view_start)
1360 {
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1362 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1363 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start),
1365 (unsigned int)width,
1366 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1367 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 }
1349 } 1370 }
1350 1371
1351 for (; num--; row++) 1372 for (; num--; row++)
1352 { 1373 {
1353 scr_blank_screen_mem (ROW(row), rstyle); 1374 scr_blank_screen_mem (ROW(row), rstyle);
1375
1376 if (!view_start)
1354 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1377 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1355 } 1378 }
1356} 1379}
1357 1380
1358#if !ENABLE_MINIMAL 1381#if !ENABLE_MINIMAL
1359void 1382void
… …
1433 * Insert/Delete <count> characters from the current position 1456 * Insert/Delete <count> characters from the current position
1434 */ 1457 */
1435void 1458void
1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1459rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437{ 1460{
1438 int col, row;
1439 rend_t tr;
1440
1441 want_refresh = 1; 1461 want_refresh = 1;
1442 ZERO_SCROLLBACK (); 1462 ZERO_SCROLLBACK ();
1443 1463
1444 if (count <= 0) 1464 if (count <= 0)
1445 return; 1465 return;
… …
1447 scr_do_wrap (); 1467 scr_do_wrap ();
1448 1468
1449 selection_check (1); 1469 selection_check (1);
1450 min_it (count, ncol - screen.cur.col); 1470 min_it (count, ncol - screen.cur.col);
1451 1471
1452 row = screen.cur.row; 1472 int row = screen.cur.row;
1453 1473
1454 line_t *line = &ROW(row); 1474 line_t *line = &ROW(row);
1455 1475
1456 line->touch (); 1476 line->touch ();
1457 line->is_longer (0); 1477 line->is_longer (0);
1458 1478
1479 // nuke wide spanning the start
1480 if (line->t[screen.cur.col] == NOCHAR)
1481 scr_kill_char (*line, screen.cur.col);
1482
1459 switch (insdel) 1483 switch (insdel)
1460 { 1484 {
1461 case INSERT: 1485 case INSERT:
1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1486 line->l = min (line->l + count, ncol);
1487
1488 if (line->t[screen.cur.col] == NOCHAR)
1489 scr_kill_char (*line, screen.cur.col);
1490
1491 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463 { 1492 {
1464 line->t[col] = line->t[col - count]; 1493 line->t[col] = line->t[col - count];
1465 line->r[col] = line->r[col - count]; 1494 line->r[col] = line->r[col - count];
1466 } 1495 }
1467
1468 line->l = min (line->l + count, ncol);
1469 1496
1470 if (selection.op && current_screen == selection.screen 1497 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1499 {
1473 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1501 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1502 CLEAR_SELECTION ();
1476 else 1503 else
1504 {
1477 { /* shift selection */ 1505 /* shift selection */
1478 selection.beg.col += count; 1506 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1507 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1508 selection.end.col += count;
1481 } 1509 }
1482 } 1510 }
… …
1487 case ERASE: 1515 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1516 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1517 selection_check (1);
1490 screen.cur.col -= count; 1518 screen.cur.col -= count;
1491 1519
1492 line->l = max (line->l - count, 0); 1520 // nuke wide char after the end
1521 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col + count);
1523
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1524 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1525 break;
1495 1526
1496 case DELETE: 1527 case DELETE:
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1528 line->l = max (line->l - count, 0);
1498 1529
1530 // nuke wide char spanning the end
1531 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1532 scr_kill_char (*line, screen.cur.col + count);
1533
1499 for (col = screen.cur.col; (col + count) < ncol; col++) 1534 for (int col = screen.cur.col; (col + count) < ncol; col++)
1500 { 1535 {
1501 line->t[col] = line->t[col + count]; 1536 line->t[col] = line->t[col + count];
1502 line->r[col] = line->r[col + count]; 1537 line->r[col] = line->r[col + count];
1503 } 1538 }
1504 1539
1505 line->l = max (line->l - count, 0);
1506 scr_blank_line (*line, ncol - count, count, tr); 1540 scr_blank_line (*line, ncol - count, count, rstyle);
1507 1541
1508 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1544 {
1511 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
… …
1801 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1802 { 1836 {
1803 min_it (rc[i].col, ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1804 min_it (rc[i].row, nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1805 } 1839 }
1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1840
1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1841 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1809 1843
1810 num_scr_allow = 0; 1844 num_scr_allow = 0;
1811 1845
… …
1870void 1904void
1871rxvt_term::bell_cb (ev::timer &w, int revents) 1905rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1906{
1873 rvideo_bell = false; 1907 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1908 scr_rvideo_mode (rvideo_mode);
1909 refresh_check ();
1875} 1910}
1876#endif 1911#endif
1877 1912
1878/* ------------------------------------------------------------------------- */ 1913/* ------------------------------------------------------------------------- */
1879void 1914void
… …
1888 XMapWindow (dpy, parent[0]); 1923 XMapWindow (dpy, parent[0]);
1889# endif 1924# endif
1890 1925
1891# if ENABLE_FRILLS 1926# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1927 if (option (Opt_urgentOnBell))
1893 { 1928 set_urgency (1);
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif 1929# endif
1901 1930
1902 if (option (Opt_visualBell)) 1931 if (option (Opt_visualBell))
1903 { 1932 {
1904 rvideo_bell = true; 1933 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1934 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1935 flush ();
1907 1936
1908 bell_ev.start (VISUAL_BELL_DURATION); 1937 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1938 }
1910 else 1939 else
1911 XBell (dpy, 0); 1940 XBell (dpy, 0);
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1912#endif 1942#endif
1913} 1943}
1914 1944
1915/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1916/* ARGSUSED */ 1946/* ARGSUSED */
1917void 1947void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1948rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1949{
1920#ifdef PRINTPIPE 1950#ifdef PRINTPIPE
1921 int nrows, row_start; 1951 int nrows, row_start;
1922 FILE *fd; 1952 FILE *fd = popen_printer ();
1923 1953
1924 if ((fd = popen_printer ()) == NULL) 1954 if (!fd)
1925 return; 1955 return;
1926 1956
1927 if (fullhist) 1957 if (fullhist)
1928 { 1958 {
1929 nrows = nrow - top_row; 1959 nrows = nrow - top_row;
… …
1935 row_start = view_start; 1965 row_start = view_start;
1936 } 1966 }
1937 1967
1938 wctomb (0, 0); 1968 wctomb (0, 0);
1939 1969
1940 for (int r1 = 0; r1 < nrows; r1++) 1970 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1941 { 1971 {
1942 text_t *tp = ROW(r1).t; 1972 text_t *tp = ROW(r1).t;
1943 int len = ROW(r1).l; 1973 int len = ROW(r1).l;
1944 1974
1945 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1975 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1974 * screen.text/screen.rend contain what the screen will change to. 2004 * screen.text/screen.rend contain what the screen will change to.
1975 */ 2005 */
1976void 2006void
1977rxvt_term::scr_refresh () NOTHROW 2007rxvt_term::scr_refresh () NOTHROW
1978{ 2008{
1979 unsigned char have_bg,
1980 showcursor; /* show the cursor */
1981 int16_t col, row, /* column/row we're processing */ 2009 int16_t col, row, /* column/row we're processing */
1982 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
1983 int i; /* tmp */ 2011 int i; /* tmp */
1984#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
1985 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
… …
1994 return; 2022 return;
1995 2023
1996 /* 2024 /*
1997 * A: set up vars 2025 * A: set up vars
1998 */ 2026 */
1999 have_bg = 0;
2000 refresh_count = 0; 2027 refresh_count = 0;
2001 2028
2029 unsigned int old_screen_flags = screen.flags;
2030 char have_bg = 0;
2002#ifdef HAVE_BG_PIXMAP 2031#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2032 have_bg = bgPixmap.pixmap != None;
2004#endif 2033#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2035
2007 /* 2036 /*
2008 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
2009 */ 2038 */
2010 scr_reverse_selection (); 2039 scr_reverse_selection ();
2040
2041 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2042#if ENABLE_OVERLAY
2043 scr_swap_overlay ();
2044#endif
2045
2046 char showcursor = screen.flags & Screen_VisibleCursor;
2011 2047
2012 /* 2048 /*
2013 * C: set the cursor character (s) 2049 * C: set the cursor character (s)
2014 */ 2050 */
2015 { 2051 {
2016 unsigned char setoldcursor; 2052 unsigned char setoldcursor;
2017 2053
2018 showcursor = (screen.flags & Screen_VisibleCursor);
2019#ifdef CURSOR_BLINK 2054#ifdef CURSOR_BLINK
2020 if (hidden_cursor) 2055 if (hidden_cursor)
2021 showcursor = 0; 2056 showcursor = 0;
2022#endif 2057#endif
2023 2058
… …
2051 ccol2 = bgcolor_of (rstyle); 2086 ccol2 = bgcolor_of (rstyle);
2052#else 2087#else
2053 ccol2 = Color_bg; 2088 ccol2 = Color_bg;
2054#endif 2089#endif
2055 2090
2056 if (showcursor && focus) 2091 if (focus)
2057 { 2092 {
2058 if (option (Opt_cursorUnderline)) 2093 if (option (Opt_cursorUnderline))
2059 *crp ^= RS_Uline; 2094 *crp ^= RS_Uline;
2060 else 2095 else
2061 { 2096 {
… …
2096 oldcursor.col = screen.cur.col; 2131 oldcursor.col = screen.cur.col;
2097 } 2132 }
2098 } 2133 }
2099 } 2134 }
2100 2135
2101 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2102#if ENABLE_OVERLAY
2103 scr_swap_overlay ();
2104#endif
2105
2106#ifndef NO_SLOW_LINK_SUPPORT 2136#ifndef NO_SLOW_LINK_SUPPORT
2107 /* 2137 /*
2108 * D: CopyArea pass - very useful for slower links 2138 * D: CopyArea pass - very useful for slower links
2109 * This has been deliberately kept simple. 2139 * This has been deliberately kept simple.
2110 */ 2140 */
… …
2199 continue; 2229 continue;
2200 2230
2201 // redraw one or more characters 2231 // redraw one or more characters
2202 2232
2203 // seek to the beginning of wide characters 2233 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2234 while (expect_false (stp[col] == NOCHAR && col > 0))
2205 --col; 2235 --col;
2206 2236
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2208 text_t *text = stp + col; 2238 text_t *text = stp + col;
2209 int count = 1; 2239 int count = 1;
2210 2240
2211 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2212 drp[col] = rend; 2242 drp[col] = rend;
… …
2216 for (i = 0; ++col < ncol; ) 2246 for (i = 0; ++col < ncol; )
2217 { 2247 {
2218 if (stp[col] == NOCHAR) 2248 if (stp[col] == NOCHAR)
2219 { 2249 {
2220 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2221 drp[col] = rend; 2251 drp[col] = srp[col];
2252
2222 count++; 2253 count++;
2223 i++; 2254 i++;
2224 2255
2225 continue; 2256 continue;
2226 } 2257 }
… …
2246 2277
2247 col--; /* went one too far. move back */ 2278 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2279 count -= i; /* dump any matching trailing chars */
2249 2280
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2281 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2282 while (expect_false (i && text[count] == NOCHAR))
2252 count++, i--; 2283 count++, i--;
2253 2284
2254 /* 2285 /*
2255 * Determine the attributes for the string 2286 * Determine the attributes for the string
2256 */ 2287 */
2257 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2259 2290
2260 // only do special processing if any attributes are set, which is unlikely 2291 // only do special processing if any attributes are set, which is unlikely
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2262 { 2293 {
2263 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2264 2295
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
2268 { 2298 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2299 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2300 fore = Color_BD;
2271# if !ENABLE_STYLES 2301# if !ENABLE_STYLES
2272 else 2302 else
2273 invert = !invert; 2303 invert = !invert;
2274# endif 2304# endif
2275 } 2305 }
2276 2306
2277 if (rend & RS_Italic 2307 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2308 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2309 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2310 fore = Color_IT;
2282# if !ENABLE_STYLES 2311# if !ENABLE_STYLES
2283 else 2312 else
… …
2287 2316
2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2289 fore = Color_UL; 2318 fore = Color_UL;
2290#endif 2319#endif
2291 2320
2321#ifdef OPTION_HC
2322 if (rend & RS_Sel)
2323 {
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 && ISSET_PIXCOLOR (Color_HC))
2328 {
2329 if (ISSET_PIXCOLOR (Color_HTC))
2330 fore = Color_HTC;
2331 // if invert is 0 reverse video is set so we use bg color as fg color
2332 else if (!invert)
2333 fore = back;
2334
2335 back = Color_HC;
2336 invert = 0;
2337 }
2338 }
2339#endif
2340
2292 if (invert) 2341 if (invert)
2293 { 2342 {
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); 2343 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2305 2344
2306#ifndef NO_BOLD_UNDERLINE_REVERSE 2345#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) 2346 if (fore == back)
2312 { 2347 {
2313 fore = Color_bg; 2348 fore = Color_bg;
2314 back = Color_fg; 2349 back = Color_fg;
2315 } 2350 }
… …
2317 } 2352 }
2318 2353
2319#ifdef TEXT_BLINK 2354#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2355 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2356 {
2322 if (!text_blink_ev.active) 2357 if (!text_blink_ev.is_active ())
2323 { 2358 {
2324 text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL); 2359 text_blink_ev.again ();
2325 hidden_text = 0; 2360 hidden_text = 0;
2326 } 2361 }
2327 else if (hidden_text) 2362 else if (hidden_text)
2328 fore = back; 2363 fore = back;
2329 } 2364 }
… …
2351 /* 2386 /*
2352 * Actually do the drawing of the string here 2387 * Actually do the drawing of the string here
2353 */ 2388 */
2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2389 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2355 2390
2356 if (have_bg && back == Color_bg) 2391 if (expect_true (have_bg && back == Color_bg))
2357 { 2392 {
2358 // this is very ugly, maybe push it into ->draw? 2393 // this is very ugly, maybe push it into ->draw?
2359 2394
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2395 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2396 if (text[i] != ' ')
… …
2368 did_clear: ; 2403 did_clear: ;
2369 } 2404 }
2370 else 2405 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2406 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2407
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2408 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2409 {
2375#if ENABLE_FRILLS 2410#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2411 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2412 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2413 else
2379#endif 2414#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2415 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2416
2382 XDrawLine (dpy, drawBuffer, gc, 2417 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2418 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2419 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2420 }
2386 } /* for (col....) */ 2421 } /* for (col....) */
2387 } /* for (row....) */ 2422 } /* for (row....) */
2388
2389#if ENABLE_OVERLAY
2390 scr_swap_overlay ();
2391#endif
2392 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2393 2423
2394 /* 2424 /*
2395 * G: cleanup cursor and display outline cursor if necessary 2425 * G: cleanup cursor and display outline cursor if necessary
2396 */ 2426 */
2397 if (showcursor) 2427 if (showcursor)
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2455 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2456 else
2427#endif 2457#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2458 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2459
2430 XDrawRectangle (dpy, drawBuffer, gc, 2460 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2461 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2462 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2463 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2464 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2465 }
2436 } 2466 }
2437 2467
2438 /* 2468 /*
2439 * H: cleanup selection 2469 * H: cleanup selection
2440 */ 2470 */
2471#if ENABLE_OVERLAY
2472 scr_swap_overlay ();
2473#endif
2474 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2475
2441 scr_reverse_selection (); 2476 scr_reverse_selection ();
2442 2477
2478 screen.flags = old_screen_flags;
2443 num_scr = 0; 2479 num_scr = 0;
2444 num_scr_allow = 1; 2480 num_scr_allow = 1;
2445} 2481}
2446 2482
2447void 2483void
… …
2473rxvt_term::scr_recolour () NOTHROW 2509rxvt_term::scr_recolour () NOTHROW
2474{ 2510{
2475#ifdef HAVE_BG_PIXMAP 2511#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2512 bgPixmap.apply ();
2477#else 2513#else
2514
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2515 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]); 2516 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2481# if HAVE_SCROLLBARS 2518
2482 if (scrollBar.win) 2519 if (scrollBar.win)
2483 { 2520 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2522 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2523 scrollBar.show (0);
2487 } 2524 }
2525
2488# endif 2526#endif
2527
2528 /* bgPixmap.apply () does not do the following : */
2489 scr_clear (); 2529 scr_clear ();
2490 scr_touch (true); 2530 scr_touch (true);
2491 want_refresh = 1; 2531 want_refresh = 1;
2492#endif
2493
2494} 2532}
2495 2533
2496/* ------------------------------------------------------------------------- */ 2534/* ------------------------------------------------------------------------- */
2497void 2535void
2498rxvt_term::scr_clear (bool really) NOTHROW 2536rxvt_term::scr_clear (bool really) NOTHROW
… …
2565 { 2603 {
2566#if !ENABLE_MINIMAL 2604#if !ENABLE_MINIMAL
2567 if (selection.rect) 2605 if (selection.rect)
2568 scr_xor_rect (selection.beg.row, selection.beg.col, 2606 scr_xor_rect (selection.beg.row, selection.beg.col,
2569 selection.end.row, selection.end.col, 2607 selection.end.row, selection.end.col,
2570 RS_RVid, RS_RVid | RS_Uline); 2608 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2571 else 2609 else
2572#endif 2610#endif
2573 scr_xor_span (selection.beg.row, selection.beg.col, 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2574 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2575 RS_RVid); 2613 RS_Sel | RS_RVid);
2576 } 2614 }
2577} 2615}
2578 2616
2579/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2580/* 2618/*
… …
2587{ 2625{
2588 int row, wrote; 2626 int row, wrote;
2589 unsigned int width, towrite; 2627 unsigned int width, towrite;
2590 char r1[] = "\n"; 2628 char r1[] = "\n";
2591 2629
2592 for (row = saveLines - nsaved; 2630 for (row = saveLines + top_row;
2593 row < saveLines + nrow - 1; row++) 2631 row < saveLines + nrow - 1; row++)
2594 { 2632 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l 2633 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol; 2634 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote) 2635 for (towrite = width; towrite; towrite -= wrote)
… …
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2686 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2687 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2688 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2689 data[i] = C0_CR;
2652 2690
2691 if (priv_modes & PrivMode_BracketPaste)
2692 tt_printf ("\e[200~");
2693
2653 tt_write (data, len); 2694 tt_write (data, len);
2695
2696 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[201~");
2654} 2698}
2655 2699
2656/* ------------------------------------------------------------------------- */ 2700/* ------------------------------------------------------------------------- */
2657/* 2701/*
2658 * Respond to a notification that a primary selection has been sent 2702 * Respond to a notification that a primary selection has been sent
… …
2852 */ 2896 */
2853void 2897void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2898rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2899{
2856 if (selection.text && selnum == Sel_Primary) 2900 if (selection.text && selnum == Sel_Primary)
2901 {
2857 { /* internal selection */ 2902 /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len); 2903 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str)); 2904 paste (str, strlen (str));
2860 free (str); 2905 free (str);
2861 return; 2906 return;
2862 } 2907 }
… …
2866 selection_wait = Sel_normal; 2911 selection_wait = Sel_normal;
2867 2912
2868#if X_HAVE_UTF8_STRING 2913#if X_HAVE_UTF8_STRING
2869 selection_type = Sel_UTF8String; 2914 selection_type = Sel_UTF8String;
2870 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2871 return; 2916 return;
2872#else 2917#else
2873 selection_type = Sel_CompoundText; 2918 selection_type = Sel_CompoundText;
2874 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2875 return; 2920 return;
2876#endif 2921#endif
2877 } 2922 }
2878 2923
2879 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2924 selection_wait = Sel_none; /* don't loop in selection_paste () */
2880 selection_paste (display->root, XA_CUT_BUFFER0, false); 2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2908/* 2953/*
2909 * Clear all selected text 2954 * Clear all selected text
2910 * EXT: SelectionClear 2955 * EXT: SelectionClear
2911 */ 2956 */
2912void 2957void
2913rxvt_term::selection_clear () NOTHROW 2958rxvt_term::selection_clear (bool clipboard) NOTHROW
2914{ 2959{
2960 if (!clipboard)
2961 {
2915 want_refresh = 1; 2962 want_refresh = 1;
2916 free (selection.text); 2963 free (selection.text);
2917 selection.text = NULL; 2964 selection.text = NULL;
2918 selection.len = 0; 2965 selection.len = 0;
2919 CLEAR_SELECTION (); 2966 CLEAR_SELECTION ();
2920 2967
2921 if (display->selection_owner == this) 2968 if (display->selection_owner == this)
2922 display->selection_owner = 0; 2969 display->selection_owner = 0;
2970 }
2971 else
2972 {
2973 free (selection.clip_text);
2974 selection.clip_text = NULL;
2975 selection.clip_len = 0;
2976
2977 if (display->clipboard_owner == this)
2978 display->clipboard_owner = 0;
2979 }
2923} 2980}
2924 2981
2925/* ------------------------------------------------------------------------- */ 2982/* ------------------------------------------------------------------------- */
2926/* 2983/*
2927 * Copy a selection into the cut buffer 2984 * Copy a selection into the cut buffer
… …
3053 3110
3054 selection_grab (tm); 3111 selection_grab (tm);
3055} 3112}
3056 3113
3057bool 3114bool
3058rxvt_term::selection_grab (Time tm) NOTHROW 3115rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3059{ 3116{
3117 Atom sel;
3118
3119 if (!clipboard)
3120 {
3060 selection_time = tm; 3121 selection_time = tm;
3122 sel = XA_PRIMARY;
3123 }
3124 else
3125 {
3126 clipboard_time = tm;
3127 sel = xa[XA_CLIPBOARD];
3128 }
3061 3129
3062 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3130 XSetSelectionOwner (dpy, sel, vt, tm);
3063 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3131 if (XGetSelectionOwner (dpy, sel) == vt)
3064 { 3132 {
3065 display->set_selection_owner (this); 3133 display->set_selection_owner (this, clipboard);
3066 return true; 3134 return true;
3067 } 3135 }
3068 else 3136 else
3069 { 3137 {
3070 selection_clear (); 3138 selection_clear (clipboard);
3071 return false; 3139 return false;
3072 } 3140 }
3073 3141
3074#if 0 3142#if 0
3075 XTextProperty ct; 3143 XTextProperty ct;
… …
3130 while (selection.mark.col > 0 3198 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3199 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3200 --selection.mark.col;
3133 3201
3134 if (selection.op) 3202 if (selection.op)
3203 {
3135 { /* clear the old selection */ 3204 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3205 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3206 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3207 }
3139 3208
3140 selection.op = SELECTION_INIT; 3209 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3398 * a point/word/line which is either the start or end of the selection
3330 * and it was decided by whichever point/word/line was `fixed' at the 3399 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3400 * time of the most recent button3 press
3332 */ 3401 */
3333 if (button3 && buttonpress) 3402 if (button3 && buttonpress)
3403 {
3334 { /* button3 press */ 3404 /* button3 press */
3335 /* 3405 /*
3336 * first determine which edge of the selection we are closest to 3406 * first determine which edge of the selection we are closest to
3337 */ 3407 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3408 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3409 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3427 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3428 selection.mark.col = selection.beg.col;
3359 } 3429 }
3360 } 3430 }
3361 else 3431 else
3432 {
3362 { /* button1 drag or button3 drag */ 3433 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3434 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3435 {
3365 if (selection.mark.row == selection.end.row 3436 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3437 && selection.mark.col == selection.end.col
3367 && clickchange 3438 && clickchange
… …
3448 selection.end.row++; 3519 selection.end.row++;
3449 } 3520 }
3450 } 3521 }
3451 3522
3452 if (button3 && buttonpress) 3523 if (button3 && buttonpress)
3524 {
3453 { /* mark may need to be changed */ 3525 /* mark may need to be changed */
3454 if (closeto == LEFT) 3526 if (closeto == LEFT)
3455 { 3527 {
3456 selection.mark.row = selection.end.row; 3528 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3529 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3530 }
… …
3566 else if (rq.target == xa[XA_MULTIPLE]) 3638 else if (rq.target == xa[XA_MULTIPLE])
3567 { 3639 {
3568 /* TODO: Handle MULTIPLE */ 3640 /* TODO: Handle MULTIPLE */
3569 } 3641 }
3570#endif 3642#endif
3571 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3643 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3572 { 3644 {
3573 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3645 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3574 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3646 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3647 ev.property = rq.property;
3648 }
3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3650 {
3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3652 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3575 ev.property = rq.property; 3653 ev.property = rq.property;
3576 } 3654 }
3577 else if (rq.target == XA_STRING 3655 else if (rq.target == XA_STRING
3578 || rq.target == xa[XA_TEXT] 3656 || rq.target == xa[XA_TEXT]
3579 || rq.target == xa[XA_COMPOUND_TEXT] 3657 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3612 { 3690 {
3613 target = xa[XA_COMPOUND_TEXT]; 3691 target = xa[XA_COMPOUND_TEXT];
3614 style = enc_compound_text; 3692 style = enc_compound_text;
3615 } 3693 }
3616 3694
3617 if (selection.text) 3695 if (rq.selection == XA_PRIMARY && selection.text)
3618 { 3696 {
3619 cl = selection.text; 3697 cl = selection.text;
3620 selectlen = selection.len; 3698 selectlen = selection.len;
3699 }
3700 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3701 {
3702 cl = selection.clip_text;
3703 selectlen = selection.clip_len;
3621 } 3704 }
3622 else 3705 else
3623 { 3706 {
3624 cl = L""; 3707 cl = L"";
3625 selectlen = 0; 3708 selectlen = 0;
… …
3693 h += 2; min_it (h, nrow); 3776 h += 2; min_it (h, nrow);
3694 3777
3695 x -= 1; clamp_it (x, 0, ncol - w); 3778 x -= 1; clamp_it (x, 0, ncol - w);
3696 y -= 1; clamp_it (y, 0, nrow - h); 3779 y -= 1; clamp_it (y, 0, nrow - h);
3697 3780
3698 ov_x = x; ov_y = y; 3781 ov.x = x; ov.y = y;
3699 ov_w = w; ov_h = h; 3782 ov.w = w; ov.h = h;
3700 3783
3701 ov_text = new text_t *[h]; 3784 ov.text = new text_t *[h];
3702 ov_rend = new rend_t *[h]; 3785 ov.rend = new rend_t *[h];
3703 3786
3704 for (y = 0; y < h; y++) 3787 for (y = 0; y < h; y++)
3705 { 3788 {
3706 text_t *tp = ov_text[y] = new text_t[w]; 3789 text_t *tp = ov.text[y] = new text_t[w];
3707 rend_t *rp = ov_rend[y] = new rend_t[w]; 3790 rend_t *rp = ov.rend[y] = new rend_t[w];
3708 3791
3709 text_t t0, t1, t2; 3792 text_t t0, t1, t2;
3710 rend_t r = OVERLAY_RSTYLE; 3793 rend_t r = OVERLAY_RSTYLE;
3711 3794
3712 if (y == 0) 3795 if (y == 0)
… …
3731} 3814}
3732 3815
3733void 3816void
3734rxvt_term::scr_overlay_off () NOTHROW 3817rxvt_term::scr_overlay_off () NOTHROW
3735{ 3818{
3736 if (!ov_text) 3819 if (!ov.text)
3737 return; 3820 return;
3738 3821
3739 want_refresh = 1; 3822 want_refresh = 1;
3740 3823
3741 for (int y = 0; y < ov_h; y++) 3824 for (int y = 0; y < ov.h; y++)
3742 { 3825 {
3743 delete [] ov_text[y]; 3826 delete [] ov.text[y];
3744 delete [] ov_rend[y]; 3827 delete [] ov.rend[y];
3745 } 3828 }
3746 3829
3747 delete [] ov_text; ov_text = 0; 3830 delete [] ov.text; ov.text = 0;
3748 delete [] ov_rend; ov_rend = 0; 3831 delete [] ov.rend; ov.rend = 0;
3749} 3832}
3750 3833
3751void 3834void
3752rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3835rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3753{ 3836{
3754 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3837 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3755 return; 3838 return;
3756 3839
3757 x++, y++; 3840 x++, y++;
3758 3841
3759 ov_text[y][x] = text; 3842 ov.text[y][x] = text;
3760 ov_rend[y][x] = rend; 3843 ov.rend[y][x] = rend;
3761} 3844}
3762 3845
3763void 3846void
3764rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3847rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3765{ 3848{
… …
3784} 3867}
3785 3868
3786void 3869void
3787rxvt_term::scr_swap_overlay () NOTHROW 3870rxvt_term::scr_swap_overlay () NOTHROW
3788{ 3871{
3789 if (!ov_text) 3872 if (!ov.text)
3790 return; 3873 return;
3791 3874
3875 // hide cursor if it is within the overlay area
3876 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3877 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3878 screen.flags &= ~Screen_VisibleCursor;
3879
3792 // swap screen mem with overlay 3880 // swap screen mem with overlay
3793 for (int y = ov_h; y--; ) 3881 for (int y = ov.h; y--; )
3794 { 3882 {
3795 text_t *t1 = ov_text[y]; 3883 text_t *t1 = ov.text[y];
3796 rend_t *r1 = ov_rend[y]; 3884 rend_t *r1 = ov.rend[y];
3797 3885
3798 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3886 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3799 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3887 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3800 3888
3801 for (int x = ov_w; x--; ) 3889 for (int x = ov.w; x--; )
3802 { 3890 {
3803 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3891 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3804 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3892 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3805 } 3893 }
3806 } 3894 }

Diff Legend

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