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.273 by ayin, Mon Aug 13 07:18:58 2007 UTC vs.
Revision 1.328 by root, Sun Mar 29 13:36:03 2009 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
35inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
36{ 36{
37 while (len--) 37 while (len--)
38 *start++ = value; 38 *start++ = value;
39} 39}
40 40
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 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) \ 84#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) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 86
87/* 87/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * 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 */ 89 */
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) \ 90#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 91 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 94 (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 95
112/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
115 99
… …
148 132
149 l.l = 0; 133 l.l = 0;
150 l.f = 0; 134 l.f = 0;
151} 135}
152 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
153/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
156 159
157void 160void
158rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
159{ 162{
160#if ENABLE_OVERLAY
161 scr_overlay_off ();
162#endif
163
164 rvideo_mode = false;
165 view_start = 0; 163 view_start = 0;
166 num_scr = 0; 164 num_scr = 0;
167 165
168 if (ncol == 0) 166 if (ncol == 0)
169 ncol = 80; 167 ncol = 80;
… …
171 if (nrow == 0) 169 if (nrow == 0)
172 nrow = 24; 170 nrow = 24;
173 171
174 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 173 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 174
180 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
182 { 177 {
183 //TODO//FIXME 178 //TODO//FIXME
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 270 }
276 271
277 line_t *old_buf = row_buf; 272 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 274
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 276 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 277 int q = total_rows; // rewrapped row
283 278
284 if (top_row) 279 if (top_row)
285 { 280 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
283 // TODO: maybe optimise when width didn't change
288 284
289 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 287
292 do 288 do
… …
328 int qcol = 0; 324 int qcol = 0;
329 325
330 // see below for cursor adjustment rationale 326 // see below for cursor adjustment rationale
331 if (p == ocur.row) 327 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow); 328 screen.cur.row = q - (total_rows - nrow);
333 329
334 // fill a single destination line 330 // fill a single destination line
335 while (lofs < llen && qcol < ncol) 331 while (lofs < llen && qcol < ncol)
336 { 332 {
337 int prow = lofs / prev_ncol; 333 int prow = lofs / prev_ncol;
338 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
… …
364 } 360 }
365 while (p != pend && q > 0); 361 while (p != pend && q > 0);
366 362
367 term_start = total_rows - nrow; 363 term_start = total_rows - nrow;
368 top_row = q - term_start; 364 top_row = q - term_start;
369 365
370 // make sure all terminal lines exist 366 // make sure all terminal lines exist
371 while (top_row > 0) 367 while (top_row > 0)
372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 368 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373 } 369 }
374 else 370 else
375 { 371 {
376 // if no scrollback exists (yet), wing, instead of wrap 372 // if no scrollback exists (yet), wing, instead of wrap
377 373
378 for (int row = min (nrow, prev_nrow); row--; ) 374 for (int row = min (nrow, prev_nrow); row--; )
379 { 375 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 377 line_t &qline = row_buf [row];
382 378
… …
396 delete old_ta; 392 delete old_ta;
397 delete old_ra; 393 delete old_ra;
398 394
399 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
401 398
402 free (tabs); 399 free (tabs);
403 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
404 404
405 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
406 406
407 prev_nrow = nrow; 407 prev_nrow = nrow;
408 prev_ncol = ncol; 408 prev_ncol = ncol;
409
410 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
411
412 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0;
414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417 409
418 tt_winch (); 410 tt_winch ();
419 411
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 413}
… …
433 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
434 426
435 free (row_buf); 427 free (row_buf);
436 free (swap_buf); 428 free (swap_buf);
437 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
438 free (tabs); 432 free (tabs);
439 433 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 434 }
442} 435}
443 436
444/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
445/* 438/*
446 * Hard reset 439 * Hard/Soft reset
447 */ 440 */
448void 441void
449rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
450{ 443{
451 scr_release (); 444 scr_release ();
452 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
453 scr_reset (); 448 scr_reset ();
454 449
455 scr_clear (true); 450 scr_clear (true);
456 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
457} 468}
458 469
459/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
596/* 607/*
597 * Change the rendition style for following text 608 * Change the rendition style for following text
598 */ 609 */
599void 610void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 611rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 612{
602 if (set) 613 if (set)
603 rstyle |= style; 614 rstyle |= style;
604 else if (style == ~RS_None) 615 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 616 rstyle = DEFAULT_RSTYLE;
606 else 617 else
607 rstyle &= ~style; 618 rstyle &= ~style;
608 } 619}
609 620
610/* ------------------------------------------------------------------------- */ 621/* ------------------------------------------------------------------------- */
611/* 622/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 623 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 624 * count positive ==> scroll up
… …
664 line_t &l2 = ROW(i); 675 line_t &l2 = ROW(i);
665 676
666 ::swap (l1, l2); 677 ::swap (l1, l2);
667 l2.touch (); 678 l2.touch ();
668 } 679 }
669 680
670 // move and/or clear selection, if any 681 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 682 if (selection.op && current_screen == selection.screen)
672 { 683 {
673 selection.beg.row -= count; 684 selection.beg.row -= count;
674 selection.end.row -= count; 685 selection.end.row -= count;
… …
710 { 721 {
711 /* move selected region too */ 722 /* move selected region too */
712 selection.beg.row -= count; 723 selection.beg.row -= count;
713 selection.end.row -= count; 724 selection.end.row -= count;
714 selection.mark.row -= count; 725 selection.mark.row -= count;
715 726
716 selection_check (0); 727 selection_check (0);
717 } 728 }
718 } 729 }
719 730
720 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
… …
787 798
788 while (str < strend) 799 while (str < strend)
789 { 800 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 802
792 if (c < 0x20) 803 if (expect_false (c < 0x20))
793 if (c == C0_LF) 804 if (c == C0_LF)
794 { 805 {
795 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
796 807
797 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
816 { 827 {
817 scr_tab (1, true); 828 scr_tab (1, true);
818 continue; 829 continue;
819 } 830 }
820 831
832 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 ))
824 { 837 {
825 checksel = 0; 838 checksel = 0;
826 /* 839 /*
827 * If we wrote anywhere in the selected area, kill the selection 840 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 841 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 842 * should be a similar check.
830 */ 843 */
831 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
832 } 845 }
833 846
834 if (screen.flags & Screen_WrapNext) 847 if (expect_false (screen.flags & Screen_WrapNext))
835 { 848 {
836 scr_do_wrap (); 849 scr_do_wrap ();
837 850
838 line->l = ncol; 851 line->l = ncol;
839 line->is_longer (1); 852 line->is_longer (1);
840 853
841 row = screen.cur.row; 854 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
843 } 856 }
844 857
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 860 c = 0xfffd;
848 861
849 // rely on wcwidth to tell us the character width, do wcwidth before 862 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 863 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
852 // locale. 865 // locale.
853 int width = WCWIDTH (c); 866 int width = WCWIDTH (c);
854 867
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 869 {
857 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 871 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
875 } 888 }
876 } 889 }
877 890
878 if (screen.flags & Screen_Insert) 891 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
880 893
881 if (width != 0) 894 if (width != 0)
882 { 895 {
883#if !UNICODE_3 896#if !UNICODE_3
… …
889 c = 0xfffd; 902 c = 0xfffd;
890# endif 903# endif
891#endif 904#endif
892 905
893 // nuke the character at this position, if required 906 // nuke the character at this position, if required
907 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 908 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 909 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
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 (expect_false (screen.cur.col > ncol - width && ncol >= width))
897 { 918 {
898 int col = screen.cur.col; 919 // ... 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 = ' '; 920 c = NOCHAR;
921 // and try the same character next loop iteration 921 // and try the same character next loop iteration
922 --str; 922 --str;
923 } 923 }
924 924
925 line->touch (); 925 line->touch ();
… …
927 do 927 do
928 { 928 {
929 line->t[screen.cur.col] = c; 929 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 930 line->r[screen.cur.col] = rend;
931 931
932 if (screen.cur.col < ncol - 1) 932 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 933 screen.cur.col++;
934 else 934 else
935 { 935 {
936 line->l = ncol; 936 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 937 if (screen.flags & Screen_Autowrap)
… …
939 break; 939 break;
940 } 940 }
941 941
942 c = NOCHAR; 942 c = NOCHAR;
943 } 943 }
944 while (--width > 0); 944 while (expect_false (--width > 0));
945 945
946 // pad with spaces when overwriting wide character with smaller one 946 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 947 if (expect_false (!width))
948 { 948 {
949 line->touch (); 949 line->touch ();
950 950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 952 {
953 line->t[c] = ' '; 953 line->t[c] = ' ';
954 line->r[c] = rend; 954 line->r[c] = rend;
955 } 955 }
956 } 956 }
957 } 957 }
958#if ENABLE_COMBINING
958 else // width == 0 959 else // width == 0
959 { 960 {
960#if ENABLE_COMBINING 961 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 { 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)
972 {
971 linep = line; 973 linep = line;
972 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
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));
974 } 999 }
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 } 1000 }
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 1001#endif
998 }
999 } 1002 }
1000 1003
1001 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
1002 1005
1003#ifdef DEBUG_STRICT 1006#ifdef DEBUG_STRICT
… …
1011 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
1012 */ 1015 */
1013void 1016void
1014rxvt_term::scr_backspace () NOTHROW 1017rxvt_term::scr_backspace () NOTHROW
1015{ 1018{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1019 { 1020 {
1020 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1021 { 1022 {
1022#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1025 --screen.cur.row;
1025 return; 1026
1027 want_refresh = 1;
1026#endif 1028#endif
1027 } 1029 }
1028 } 1030 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1031 else
1030 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1033}
1034 1034
1035/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1036/* 1036/*
1037 * Process Horizontal Tab 1037 * Process Horizontal Tab
… …
1060 x = i; 1060 x = i;
1061 1061
1062 if (!--count) 1062 if (!--count)
1063 break; 1063 break;
1064 } 1064 }
1065 else 1065 else
1066 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1068 1068
1069 if (count) 1069 if (count)
1070 x = ncol - 1; 1070 x = ncol - 1;
… …
1186 } 1186 }
1187 } 1187 }
1188 else 1188 else
1189 { 1189 {
1190 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1191 { /* relative origin mode */ 1192 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1194 } 1195 }
1195 else 1196 else
1196 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1229/* 1230/*
1230 * Erase part or whole of a line 1231 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1236 */
1235void 1237void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1239{
1238 unsigned int col, num; 1240 unsigned int col, num;
… …
1247 line.touch (); 1249 line.touch ();
1248 line.is_longer (0); 1250 line.is_longer (0);
1249 1251
1250 switch (mode) 1252 switch (mode)
1251 { 1253 {
1254 case 3:
1255 if (screen.flags & Screen_WrapNext)
1256 return;
1257
1258 /* fall through */
1259
1252 case 0: /* erase to end of line */ 1260 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1261 col = screen.cur.col;
1254 num = ncol - col; 1262 num = ncol - col;
1255 min_it (line.l, col); 1263 min_it (line.l, col);
1264
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1265 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1266 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1259 break; 1268 break;
1269
1260 case 1: /* erase to beginning of line */ 1270 case 1: /* erase to beginning of line */
1261 col = 0; 1271 col = 0;
1262 num = screen.cur.col + 1; 1272 num = screen.cur.col + 1;
1273
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1274 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1275 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1276 CLEAR_SELECTION ();
1266 break; 1277 break;
1278
1267 case 2: /* erase whole line */ 1279 case 2: /* erase whole line */
1268 col = 0; 1280 col = 0;
1269 num = ncol; 1281 num = ncol;
1270 line.l = 0; 1282 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1283 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1330 return; 1342 return;
1331 1343
1332 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1333 1345
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1334 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1352 {
1338 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1354
1355 if (mapped && !view_start)
1356 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False);
1340 } 1359 }
1341 else 1360 else
1342 { 1361 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1363
1364 if (mapped && !view_start)
1365 {
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1368 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start),
1370 (unsigned int)width,
1371 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1349 } 1375 }
1350 1376
1351 for (; num--; row++) 1377 for (; num--; row++)
1352 { 1378 {
1353 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1354 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1355 } 1383 }
1356} 1384}
1357 1385
1358#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1359void 1387void
… …
1433 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1434 */ 1462 */
1435void 1463void
1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437{ 1465{
1438 int col, row;
1439 rend_t tr;
1440
1441 want_refresh = 1; 1466 want_refresh = 1;
1442 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1443 1468
1444 if (count <= 0) 1469 if (count <= 0)
1445 return; 1470 return;
… …
1447 scr_do_wrap (); 1472 scr_do_wrap ();
1448 1473
1449 selection_check (1); 1474 selection_check (1);
1450 min_it (count, ncol - screen.cur.col); 1475 min_it (count, ncol - screen.cur.col);
1451 1476
1452 row = screen.cur.row; 1477 int row = screen.cur.row;
1453 1478
1454 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1455 1480
1456 line->touch (); 1481 line->touch ();
1457 line->is_longer (0); 1482 line->is_longer (0);
1458 1483
1484 // nuke wide spanning the start
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1459 switch (insdel) 1488 switch (insdel)
1460 { 1489 {
1461 case INSERT: 1490 case INSERT:
1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1491 line->l = min (line->l + count, ncol);
1492
1493 if (line->t[screen.cur.col] == NOCHAR)
1494 scr_kill_char (*line, screen.cur.col);
1495
1496 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463 { 1497 {
1464 line->t[col] = line->t[col - count]; 1498 line->t[col] = line->t[col - count];
1465 line->r[col] = line->r[col - count]; 1499 line->r[col] = line->r[col - count];
1466 } 1500 }
1467
1468 line->l = min (line->l + count, ncol);
1469 1501
1470 if (selection.op && current_screen == selection.screen 1502 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1503 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1504 {
1473 if (selection.end.row != screen.cur.row 1505 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1506 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1507 CLEAR_SELECTION ();
1476 else 1508 else
1509 {
1477 { /* shift selection */ 1510 /* shift selection */
1478 selection.beg.col += count; 1511 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1512 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1513 selection.end.col += count;
1481 } 1514 }
1482 } 1515 }
… …
1487 case ERASE: 1520 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1522 selection_check (1);
1490 screen.cur.col -= count; 1523 screen.cur.col -= count;
1491 1524
1492 line->l = max (line->l - count, 0); 1525 // nuke wide char after the end
1526 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1527 scr_kill_char (*line, screen.cur.col + count);
1528
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1530 break;
1495 1531
1496 case DELETE: 1532 case DELETE:
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 line->l = max (line->l - count, 0);
1498 1534
1535 // nuke wide char spanning the end
1536 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1537 scr_kill_char (*line, screen.cur.col + count);
1538
1499 for (col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1500 { 1540 {
1501 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1502 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1503 } 1543 }
1504 1544
1505 line->l = max (line->l - count, 0);
1506 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1507 1546
1508 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1549 {
1511 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
1621 */ 1660 */
1622void 1661void
1623rxvt_term::scr_set_tab (int mode) NOTHROW 1662rxvt_term::scr_set_tab (int mode) NOTHROW
1624{ 1663{
1625 if (mode < 0) 1664 if (mode < 0)
1626 memset (tabs, 0, ncol * sizeof (char)); 1665 memset (tabs, 0, ncol);
1627 else if (screen.cur.col < ncol) 1666 else if (screen.cur.col < ncol)
1628 tabs [screen.cur.col] = !!mode; 1667 tabs [screen.cur.col] = !!mode;
1629} 1668}
1630 1669
1631/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
… …
1648 rvideo_state = on; 1687 rvideo_state = on;
1649 1688
1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1651#ifdef HAVE_BG_PIXMAP 1690#ifdef HAVE_BG_PIXMAP
1652 if (bgPixmap.pixmap == None) 1691 if (bgPixmap.pixmap == None)
1653#endif
1654#if ENABLE_TRANSPARENCY
1655 if (!option (Opt_transparent) || am_transparent == 0)
1656#endif 1692#endif
1657 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1658 1694
1659 XGCValues gcvalue; 1695 XGCValues gcvalue;
1660 gcvalue.foreground = pix_colors[Color_fg]; 1696 gcvalue.foreground = pix_colors[Color_fg];
… …
1804 for (i = PART_BEG; i < RC_COUNT; i++) 1840 for (i = PART_BEG; i < RC_COUNT; i++)
1805 { 1841 {
1806 min_it (rc[i].col, ncol - 1); 1842 min_it (rc[i].col, ncol - 1);
1807 min_it (rc[i].row, nrow - 1); 1843 min_it (rc[i].row, nrow - 1);
1808 } 1844 }
1809 1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1810 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1811 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1812 1848
1813 num_scr_allow = 0; 1849 num_scr_allow = 0;
1814 1850
… …
1869 return true; 1905 return true;
1870} 1906}
1871 1907
1872#ifndef NO_BELL 1908#ifndef NO_BELL
1873void 1909void
1874rxvt_term::bell_cb (time_watcher &w) 1910rxvt_term::bell_cb (ev::timer &w, int revents)
1875{ 1911{
1876 rvideo_bell = false; 1912 rvideo_bell = false;
1877 scr_rvideo_mode (rvideo_mode); 1913 scr_rvideo_mode (rvideo_mode);
1914 refresh_check ();
1878} 1915}
1879#endif 1916#endif
1880 1917
1881/* ------------------------------------------------------------------------- */ 1918/* ------------------------------------------------------------------------- */
1882void 1919void
… …
1888# ifdef MAPALERT_OPTION 1925# ifdef MAPALERT_OPTION
1889 if (option (Opt_mapAlert)) 1926 if (option (Opt_mapAlert))
1890# endif 1927# endif
1891 XMapWindow (dpy, parent[0]); 1928 XMapWindow (dpy, parent[0]);
1892# endif 1929# endif
1930
1893# if ENABLE_FRILLS 1931# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell)) 1932 if (option (Opt_urgentOnBell))
1895 { 1933 set_urgency (1);
1896 XWMHints *h;
1897
1898 h = XGetWMHints(dpy, parent[0]);
1899 if (h != NULL)
1900 {
1901 h->flags |= XUrgencyHint;
1902 XSetWMHints(dpy, parent[0], h);
1903 }
1904 }
1905# endif 1934# endif
1906 1935
1907 if (option (Opt_visualBell)) 1936 if (option (Opt_visualBell))
1908 { 1937 {
1909 rvideo_bell = true; 1938 rvideo_bell = true;
1910 scr_rvideo_mode (rvideo_mode); 1939 scr_rvideo_mode (rvideo_mode);
1911 display->flush (); 1940 flush ();
1912 1941
1913 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1942 bell_ev.start (VISUAL_BELL_DURATION);
1914 } 1943 }
1915 else 1944 else
1916 XBell (dpy, 0); 1945 XBell (dpy, 0);
1917#endif 1946#endif
1918} 1947}
… …
1922void 1951void
1923rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1924{ 1953{
1925#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1926 int nrows, row_start; 1955 int nrows, row_start;
1927 FILE *fd; 1956 FILE *fd = popen_printer ();
1928 1957
1929 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1930 return; 1959 return;
1931 1960
1932 if (fullhist) 1961 if (fullhist)
1933 { 1962 {
1934 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1979 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1980 */ 2009 */
1981void 2010void
1982rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1983{ 2012{
1984 unsigned char have_bg,
1985 showcursor; /* show the cursor */
1986 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1987 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1988 int i; /* tmp */ 2015 int i; /* tmp */
1989#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1990 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
1999 return; 2026 return;
2000 2027
2001 /* 2028 /*
2002 * A: set up vars 2029 * A: set up vars
2003 */ 2030 */
2004 have_bg = 0;
2005 refresh_count = 0; 2031 refresh_count = 0;
2006 2032
2033 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0;
2007#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2008 have_bg |= bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2009#endif
2010#if ENABLE_TRANSPARENCY
2011 have_bg |= option (Opt_transparent) && am_transparent;
2012#endif 2037#endif
2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2014 2039
2015 /* 2040 /*
2016 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2017 */ 2042 */
2018 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2019 2051
2020 /* 2052 /*
2021 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2022 */ 2054 */
2023 { 2055 {
2024 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2025 2057
2026 showcursor = (screen.flags & Screen_VisibleCursor);
2027#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2028 if (hidden_cursor) 2059 if (hidden_cursor)
2029 showcursor = 0; 2060 showcursor = 0;
2030#endif 2061#endif
2031 2062
… …
2104 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2105 } 2136 }
2106 } 2137 }
2107 } 2138 }
2108 2139
2109 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2110#if ENABLE_OVERLAY
2111 scr_swap_overlay ();
2112#endif
2113
2114#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2115 /* 2141 /*
2116 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2117 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2118 */ 2144 */
… …
2207 continue; 2233 continue;
2208 2234
2209 // redraw one or more characters 2235 // redraw one or more characters
2210 2236
2211 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2212 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2213 --col; 2239 --col;
2214 2240
2215 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2216 text_t *text = stp + col; 2242 text_t *text = stp + col;
2217 int count = 1; 2243 int count = 1;
… …
2224 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2225 { 2251 {
2226 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2227 { 2253 {
2228 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2229 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2230 count++; 2257 count++;
2231 i++; 2258 i++;
2232 2259
2233 continue; 2260 continue;
2234 } 2261 }
… …
2254 2281
2255 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2256 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2257 2284
2258 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2259 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2260 count++, i--; 2287 count++, i--;
2261 2288
2262 /* 2289 /*
2263 * Determine the attributes for the string 2290 * Determine the attributes for the string
2264 */ 2291 */
2265 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2266 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2267 2294
2268 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2269 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2296 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2270 { 2297 {
2271 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2272 2299
2273#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2274 if (rend & RS_Bold
2275 && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
2276 { 2302 {
2277 if (ISSET_PIXCOLOR (Color_BD)) 2303 if (ISSET_PIXCOLOR (Color_BD))
2278 fore = Color_BD; 2304 fore = Color_BD;
2279# if !ENABLE_STYLES 2305# if !ENABLE_STYLES
2280 else 2306 else
2281 invert = !invert; 2307 invert = !invert;
2282# endif 2308# endif
2283 } 2309 }
2284 2310
2285 if (rend & RS_Italic 2311 if (rend & RS_Italic && fore == Color_fg)
2286 && fore == Color_fg)
2287 { 2312 {
2288 if (ISSET_PIXCOLOR (Color_IT)) 2313 if (ISSET_PIXCOLOR (Color_IT))
2289 fore = Color_IT; 2314 fore = Color_IT;
2290# if !ENABLE_STYLES 2315# if !ENABLE_STYLES
2291 else 2316 else
… …
2325 } 2350 }
2326 2351
2327#ifdef TEXT_BLINK 2352#ifdef TEXT_BLINK
2328 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2353 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2329 { 2354 {
2330 if (!text_blink_ev.active) 2355 if (!text_blink_ev.is_active ())
2331 { 2356 {
2332 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2357 text_blink_ev.again ();
2333 hidden_text = 0; 2358 hidden_text = 0;
2334 } 2359 }
2335 else if (hidden_text) 2360 else if (hidden_text)
2336 fore = back; 2361 fore = back;
2337 } 2362 }
… …
2359 /* 2384 /*
2360 * Actually do the drawing of the string here 2385 * Actually do the drawing of the string here
2361 */ 2386 */
2362 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2387 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2363 2388
2364 if (have_bg && back == Color_bg) 2389 if (expect_true (have_bg && back == Color_bg))
2365 { 2390 {
2366 // this is very ugly, maybe push it into ->draw? 2391 // this is very ugly, maybe push it into ->draw?
2367 2392
2368 for (i = 0; i < count; i++) /* don't draw empty strings */ 2393 for (i = 0; i < count; i++) /* don't draw empty strings */
2369 if (text[i] != ' ') 2394 if (text[i] != ' ')
… …
2376 did_clear: ; 2401 did_clear: ;
2377 } 2402 }
2378 else 2403 else
2379 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2404 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2380 2405
2381 if (rend & RS_Uline && font->descent > 1 && fore != back) 2406 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2382 { 2407 {
2383#if ENABLE_FRILLS 2408#if ENABLE_FRILLS
2384 if (ISSET_PIXCOLOR (Color_underline)) 2409 if (ISSET_PIXCOLOR (Color_underline))
2385 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2410 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2386 else 2411 else
2387#endif 2412#endif
2388 XSetForeground (dpy, gc, pix_colors[fore]); 2413 XSetForeground (dpy, gc, pix_colors[fore]);
2389 2414
2390 XDrawLine (dpy, drawBuffer, gc, 2415 XDrawLine (dpy, vt, gc,
2391 xpixel, ypixel + font->ascent + 1, 2416 xpixel, ypixel + font->ascent + 1,
2392 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2417 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2393 } 2418 }
2394 } /* for (col....) */ 2419 } /* for (col....) */
2395 } /* for (row....) */ 2420 } /* for (row....) */
2396
2397#if ENABLE_OVERLAY
2398 scr_swap_overlay ();
2399#endif
2400 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2401 2421
2402 /* 2422 /*
2403 * G: cleanup cursor and display outline cursor if necessary 2423 * G: cleanup cursor and display outline cursor if necessary
2404 */ 2424 */
2405 if (showcursor) 2425 if (showcursor)
… …
2433 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2453 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2434 else 2454 else
2435#endif 2455#endif
2436 XSetForeground (dpy, gc, pix_colors[ccol1]); 2456 XSetForeground (dpy, gc, pix_colors[ccol1]);
2437 2457
2438 XDrawRectangle (dpy, drawBuffer, gc, 2458 XDrawRectangle (dpy, vt, gc,
2439 Col2Pixel (col), 2459 Col2Pixel (col),
2440 Row2Pixel (oldcursor.row), 2460 Row2Pixel (oldcursor.row),
2441 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2461 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2442 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2462 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2443 } 2463 }
2444 } 2464 }
2445 2465
2446 /* 2466 /*
2447 * H: cleanup selection 2467 * H: cleanup selection
2448 */ 2468 */
2469#if ENABLE_OVERLAY
2470 scr_swap_overlay ();
2471#endif
2472 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2473
2449 scr_reverse_selection (); 2474 scr_reverse_selection ();
2450 2475
2476 screen.flags = old_screen_flags;
2451 num_scr = 0; 2477 num_scr = 0;
2452 num_scr_allow = 1; 2478 num_scr_allow = 1;
2453} 2479}
2454 2480
2455void 2481void
… …
2478} 2504}
2479 2505
2480void 2506void
2481rxvt_term::scr_recolour () NOTHROW 2507rxvt_term::scr_recolour () NOTHROW
2482{ 2508{
2483 if (1
2484#if ENABLE_TRANSPARENCY
2485 && !am_transparent
2486#endif
2487#ifdef HAVE_BG_PIXMAP 2509#ifdef HAVE_BG_PIXMAP
2488 && !bgPixmap.pixmap 2510 bgPixmap.apply ();
2489#endif 2511#else
2490 ) 2512
2491 {
2492 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2513 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2493 XClearWindow (dpy, parent[0]); 2514 XClearWindow (dpy, parent[0]);
2494 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2495#if HAVE_SCROLLBARS 2516
2496 if (scrollBar.win) 2517 if (scrollBar.win)
2497 { 2518 {
2498 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2499 scrollBar.setIdle (); 2520 scrollBar.state = STATE_IDLE;
2500 scrollbar_show (0); 2521 scrollBar.show (0);
2501 }
2502#endif
2503 } 2522 }
2504 2523
2524#endif
2525
2526 /* bgPixmap.apply () does not do the following : */
2505 scr_clear (); 2527 scr_clear ();
2506 scr_touch (true); 2528 scr_touch (true);
2507 want_refresh = 1; 2529 want_refresh = 1;
2508} 2530}
2509 2531
… …
2601{ 2623{
2602 int row, wrote; 2624 int row, wrote;
2603 unsigned int width, towrite; 2625 unsigned int width, towrite;
2604 char r1[] = "\n"; 2626 char r1[] = "\n";
2605 2627
2606 for (row = saveLines - nsaved; 2628 for (row = saveLines + top_row;
2607 row < saveLines + nrow - 1; row++) 2629 row < saveLines + nrow - 1; row++)
2608 { 2630 {
2609 width = row_buf[row].l >= 0 ? row_buf[row].l 2631 width = row_buf[row].l >= 0 ? row_buf[row].l
2610 : ncol; 2632 : ncol;
2611 for (towrite = width; towrite; towrite -= wrote) 2633 for (towrite = width; towrite; towrite -= wrote)
… …
2662 /* convert normal newline chars into common keyboard Return key sequence */ 2684 /* convert normal newline chars into common keyboard Return key sequence */
2663 for (unsigned int i = 0; i < len; i++) 2685 for (unsigned int i = 0; i < len; i++)
2664 if (data[i] == C0_LF) 2686 if (data[i] == C0_LF)
2665 data[i] = C0_CR; 2687 data[i] = C0_CR;
2666 2688
2689 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[200~");
2691
2667 tt_write (data, len); 2692 tt_write (data, len);
2693
2694 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~");
2668} 2696}
2669 2697
2670/* ------------------------------------------------------------------------- */ 2698/* ------------------------------------------------------------------------- */
2671/* 2699/*
2672 * Respond to a notification that a primary selection has been sent 2700 * Respond to a notification that a primary selection has been sent
… …
2747 if (!delete_prop) 2775 if (!delete_prop)
2748 XDeleteProperty (dpy, win, prop); 2776 XDeleteProperty (dpy, win, prop);
2749 2777
2750 selection_wait = Sel_incr; 2778 selection_wait = Sel_incr;
2751 incr_buf_fill = 0; 2779 incr_buf_fill = 0;
2752 incr_ev.start (NOW + 10); 2780 incr_ev.start (10);
2753 2781
2754 goto bailout; 2782 goto bailout;
2755 } 2783 }
2756 2784
2757 if (ct.nitems == 0) 2785 if (ct.nitems == 0)
… …
2766 ct.nitems = incr_buf_fill; 2794 ct.nitems = incr_buf_fill;
2767 incr_buf = 0; 2795 incr_buf = 0;
2768 incr_buf_size = 0; 2796 incr_buf_size = 0;
2769 incr_ev.stop (); 2797 incr_ev.stop ();
2770 } 2798 }
2771 else 2799 else
2772 { 2800 {
2773 if (selection_wait == Sel_normal 2801 if (selection_wait == Sel_normal
2774 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2802 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2775 { 2803 {
2776 /* 2804 /*
… …
2783 goto bailout; 2811 goto bailout;
2784 } 2812 }
2785 } 2813 }
2786 else if (selection_wait == Sel_incr) 2814 else if (selection_wait == Sel_incr)
2787 { 2815 {
2788 incr_ev.start (NOW + 10); 2816 incr_ev.start (10);
2789 2817
2790 while (incr_buf_fill + ct.nitems > incr_buf_size) 2818 while (incr_buf_fill + ct.nitems > incr_buf_size)
2791 { 2819 {
2792 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2820 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2793 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2821 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2833 if (selection_wait == Sel_normal) 2861 if (selection_wait == Sel_normal)
2834 selection_wait = Sel_none; 2862 selection_wait = Sel_none;
2835} 2863}
2836 2864
2837void 2865void
2838rxvt_term::incr_cb (time_watcher &w) NOTHROW 2866rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2839{ 2867{
2840 selection_wait = Sel_none; 2868 selection_wait = Sel_none;
2841 2869
2842 incr_buf_size = 0; 2870 incr_buf_size = 0;
2843 free (incr_buf); 2871 free (incr_buf);
… …
2854 selection_paste (win, prop, true); 2882 selection_paste (win, prop, true);
2855} 2883}
2856 2884
2857/* ------------------------------------------------------------------------- */ 2885/* ------------------------------------------------------------------------- */
2858/* 2886/*
2859 * Request the current selection: 2887 * Request the current selection:
2860 * Order: > internal selection if available 2888 * Order: > internal selection if available
2861 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2889 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2862 * > CUT_BUFFER0 2890 * > CUT_BUFFER0
2863 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2891 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2864 * will auto fallback to CUT_BUFFER0 2892 * will auto fallback to CUT_BUFFER0
… …
2866 */ 2894 */
2867void 2895void
2868rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2896rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2869{ 2897{
2870 if (selection.text && selnum == Sel_Primary) 2898 if (selection.text && selnum == Sel_Primary)
2899 {
2871 { /* internal selection */ 2900 /* internal selection */
2872 char *str = rxvt_wcstombs (selection.text, selection.len); 2901 char *str = rxvt_wcstombs (selection.text, selection.len);
2873 paste (str, strlen (str)); 2902 paste (str, strlen (str));
2874 free (str); 2903 free (str);
2875 return; 2904 return;
2876 } 2905 }
… …
3142 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3171 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3143 3172
3144 while (selection.mark.col > 0 3173 while (selection.mark.col > 0
3145 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3174 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3146 --selection.mark.col; 3175 --selection.mark.col;
3147 3176
3148 if (selection.op) 3177 if (selection.op)
3178 {
3149 { /* clear the old selection */ 3179 /* clear the old selection */
3150 selection.beg.row = selection.end.row = selection.mark.row; 3180 selection.beg.row = selection.end.row = selection.mark.row;
3151 selection.beg.col = selection.end.col = selection.mark.col; 3181 selection.beg.col = selection.end.col = selection.mark.col;
3152 } 3182 }
3153 3183
3154 selection.op = SELECTION_INIT; 3184 selection.op = SELECTION_INIT;
… …
3343 * a point/word/line which is either the start or end of the selection 3373 * a point/word/line which is either the start or end of the selection
3344 * and it was decided by whichever point/word/line was `fixed' at the 3374 * and it was decided by whichever point/word/line was `fixed' at the
3345 * time of the most recent button3 press 3375 * time of the most recent button3 press
3346 */ 3376 */
3347 if (button3 && buttonpress) 3377 if (button3 && buttonpress)
3378 {
3348 { /* button3 press */ 3379 /* button3 press */
3349 /* 3380 /*
3350 * first determine which edge of the selection we are closest to 3381 * first determine which edge of the selection we are closest to
3351 */ 3382 */
3352 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3383 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3353 || (!ROWCOL_IS_AFTER (pos, selection.end) 3384 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3371 selection.mark.row = selection.beg.row; 3402 selection.mark.row = selection.beg.row;
3372 selection.mark.col = selection.beg.col; 3403 selection.mark.col = selection.beg.col;
3373 } 3404 }
3374 } 3405 }
3375 else 3406 else
3407 {
3376 { /* button1 drag or button3 drag */ 3408 /* button1 drag or button3 drag */
3377 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3409 if (ROWCOL_IS_AFTER (selection.mark, pos))
3378 { 3410 {
3379 if (selection.mark.row == selection.end.row 3411 if (selection.mark.row == selection.end.row
3380 && selection.mark.col == selection.end.col 3412 && selection.mark.col == selection.end.col
3381 && clickchange 3413 && clickchange
… …
3462 selection.end.row++; 3494 selection.end.row++;
3463 } 3495 }
3464 } 3496 }
3465 3497
3466 if (button3 && buttonpress) 3498 if (button3 && buttonpress)
3499 {
3467 { /* mark may need to be changed */ 3500 /* mark may need to be changed */
3468 if (closeto == LEFT) 3501 if (closeto == LEFT)
3469 { 3502 {
3470 selection.mark.row = selection.end.row; 3503 selection.mark.row = selection.end.row;
3471 selection.mark.col = selection.end.col - (selection.clicks == 2); 3504 selection.mark.col = selection.end.col - (selection.clicks == 2);
3472 } 3505 }
… …
3671 XFree (ct.value); 3704 XFree (ct.value);
3672 } 3705 }
3673 3706
3674 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3707 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3675} 3708}
3676
3677/* ------------------------------------------------------------------------- *
3678 * MOUSE ROUTINES *
3679 * ------------------------------------------------------------------------- */
3680
3681/*
3682 * return col/row values corresponding to x/y pixel values
3683 */
3684void
3685rxvt_term::pixel_position (int *x, int *y) NOTHROW
3686{
3687 *x = Pixel2Col (*x);
3688 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3689 *y = Pixel2Row (*y);
3690 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3691}
3692 3709
3693/* ------------------------------------------------------------------------- */ 3710/* ------------------------------------------------------------------------- */
3694#ifdef USE_XIM 3711#ifdef USE_XIM
3695void 3712void
3696rxvt_term::im_set_position (XPoint &pos) NOTHROW 3713rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3723 h += 2; min_it (h, nrow); 3740 h += 2; min_it (h, nrow);
3724 3741
3725 x -= 1; clamp_it (x, 0, ncol - w); 3742 x -= 1; clamp_it (x, 0, ncol - w);
3726 y -= 1; clamp_it (y, 0, nrow - h); 3743 y -= 1; clamp_it (y, 0, nrow - h);
3727 3744
3728 ov_x = x; ov_y = y; 3745 ov.x = x; ov.y = y;
3729 ov_w = w; ov_h = h; 3746 ov.w = w; ov.h = h;
3730 3747
3731 ov_text = new text_t *[h]; 3748 ov.text = new text_t *[h];
3732 ov_rend = new rend_t *[h]; 3749 ov.rend = new rend_t *[h];
3733 3750
3734 for (y = 0; y < h; y++) 3751 for (y = 0; y < h; y++)
3735 { 3752 {
3736 text_t *tp = ov_text[y] = new text_t[w]; 3753 text_t *tp = ov.text[y] = new text_t[w];
3737 rend_t *rp = ov_rend[y] = new rend_t[w]; 3754 rend_t *rp = ov.rend[y] = new rend_t[w];
3738 3755
3739 text_t t0, t1, t2; 3756 text_t t0, t1, t2;
3740 rend_t r = OVERLAY_RSTYLE; 3757 rend_t r = OVERLAY_RSTYLE;
3741 3758
3742 if (y == 0) 3759 if (y == 0)
… …
3761} 3778}
3762 3779
3763void 3780void
3764rxvt_term::scr_overlay_off () NOTHROW 3781rxvt_term::scr_overlay_off () NOTHROW
3765{ 3782{
3766 if (!ov_text) 3783 if (!ov.text)
3767 return; 3784 return;
3768 3785
3769 want_refresh = 1; 3786 want_refresh = 1;
3770 3787
3771 for (int y = 0; y < ov_h; y++) 3788 for (int y = 0; y < ov.h; y++)
3772 { 3789 {
3773 delete [] ov_text[y]; 3790 delete [] ov.text[y];
3774 delete [] ov_rend[y]; 3791 delete [] ov.rend[y];
3775 } 3792 }
3776 3793
3777 delete [] ov_text; ov_text = 0; 3794 delete [] ov.text; ov.text = 0;
3778 delete [] ov_rend; ov_rend = 0; 3795 delete [] ov.rend; ov.rend = 0;
3779} 3796}
3780 3797
3781void 3798void
3782rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3799rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3783{ 3800{
3784 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3801 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3785 return; 3802 return;
3786 3803
3787 x++, y++; 3804 x++, y++;
3788 3805
3789 ov_text[y][x] = text; 3806 ov.text[y][x] = text;
3790 ov_rend[y][x] = rend; 3807 ov.rend[y][x] = rend;
3791} 3808}
3792 3809
3793void 3810void
3794rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3811rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3795{ 3812{
… …
3814} 3831}
3815 3832
3816void 3833void
3817rxvt_term::scr_swap_overlay () NOTHROW 3834rxvt_term::scr_swap_overlay () NOTHROW
3818{ 3835{
3819 if (!ov_text) 3836 if (!ov.text)
3820 return; 3837 return;
3821 3838
3839 // hide cursor if it is within the overlay area
3840 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3841 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3842 screen.flags &= ~Screen_VisibleCursor;
3843
3822 // swap screen mem with overlay 3844 // swap screen mem with overlay
3823 for (int y = ov_h; y--; ) 3845 for (int y = ov.h; y--; )
3824 { 3846 {
3825 text_t *t1 = ov_text[y]; 3847 text_t *t1 = ov.text[y];
3826 rend_t *r1 = ov_rend[y]; 3848 rend_t *r1 = ov.rend[y];
3827 3849
3828 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3850 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3829 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3851 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3830 3852
3831 for (int x = ov_w; x--; ) 3853 for (int x = ov.w; x--; )
3832 { 3854 {
3833 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3855 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3834 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3856 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3835 } 3857 }
3836 } 3858 }

Diff Legend

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