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.275 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.329 by root, Sat Dec 26 10:24:04 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
293 { 289 {
294 p = MOD (p - 1, prev_total_rows); 290 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 291 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 292 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 293 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 294
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 295 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 296 {
… …
328 int qcol = 0; 322 int qcol = 0;
329 323
330 // see below for cursor adjustment rationale 324 // see below for cursor adjustment rationale
331 if (p == ocur.row) 325 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow); 326 screen.cur.row = q - (total_rows - nrow);
333 327
334 // fill a single destination line 328 // fill a single destination line
335 while (lofs < llen && qcol < ncol) 329 while (lofs < llen && qcol < ncol)
336 { 330 {
337 int prow = lofs / prev_ncol; 331 int prow = lofs / prev_ncol;
338 int pcol = lofs % prev_ncol; 332 int pcol = lofs % prev_ncol;
… …
364 } 358 }
365 while (p != pend && q > 0); 359 while (p != pend && q > 0);
366 360
367 term_start = total_rows - nrow; 361 term_start = total_rows - nrow;
368 top_row = q - term_start; 362 top_row = q - term_start;
369 363
370 // make sure all terminal lines exist 364 // make sure all terminal lines exist
371 while (top_row > 0) 365 while (top_row > 0)
372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 366 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373 } 367 }
374 else 368 else
375 { 369 {
376 // if no scrollback exists (yet), wing, instead of wrap 370 // if no scrollback exists (yet), wing, instead of wrap
377 371
378 for (int row = min (nrow, prev_nrow); row--; ) 372 for (int row = min (nrow, prev_nrow); row--; )
379 { 373 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 374 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 375 line_t &qline = row_buf [row];
382 376
… …
396 delete old_ta; 390 delete old_ta;
397 delete old_ra; 391 delete old_ra;
398 392
399 clamp_it (screen.cur.row, 0, nrow - 1); 393 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 394 clamp_it (screen.cur.col, 0, ncol - 1);
395 }
401 396
402 free (tabs); 397 free (tabs);
403 } 398 tabs = (char *)rxvt_malloc (ncol);
399
400 for (int col = ncol; --col; )
401 tabs [col] = col % TABSIZE == 0;
404 402
405 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
406 404
407 prev_nrow = nrow; 405 prev_nrow = nrow;
408 prev_ncol = ncol; 406 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 407
418 tt_winch (); 408 tt_winch ();
419 409
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 410 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 411}
… …
433 delete ralloc; ralloc = 0; 423 delete ralloc; ralloc = 0;
434 424
435 free (row_buf); 425 free (row_buf);
436 free (swap_buf); 426 free (swap_buf);
437 free (drawn_buf); 427 free (drawn_buf);
428 row_buf = 0; // signal that we freed all the arrays above
429
438 free (tabs); 430 free (tabs);
439 431 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 432 }
442} 433}
443 434
444/* ------------------------------------------------------------------------- */ 435/* ------------------------------------------------------------------------- */
445/* 436/*
446 * Hard reset 437 * Hard/Soft reset
447 */ 438 */
448void 439void
449rxvt_term::scr_poweron () 440rxvt_term::scr_poweron ()
450{ 441{
451 scr_release (); 442 scr_release ();
452 prev_nrow = prev_ncol = 0; 443 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false;
445 scr_soft_reset ();
453 scr_reset (); 446 scr_reset ();
454 447
455 scr_clear (true); 448 scr_clear (true);
456 scr_refresh (); 449 scr_refresh ();
450}
451
452void
453rxvt_term::scr_soft_reset ()
454{
455 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY
457 scr_overlay_off ();
458#endif
459
460 if (current_screen != PRIMARY)
461 scr_swap_screen ();
462
463 scr_scroll_region (0, MAX_ROWS - 1);
464 scr_rendition (0, ~RS_None);
465 scr_insert_mode (0);
457} 466}
458 467
459/* ------------------------------------------------------------------------- * 468/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 469 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 470 * ------------------------------------------------------------------------- */
… …
499 } 508 }
500 509
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 510 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 511 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 512 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 513 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 514 assert (s->cur.col >= 0);
507#endif
508} 515}
509 516
510void 517void
511rxvt_term::scr_swap_screen () 518rxvt_term::scr_swap_screen ()
512{ 519{
… …
596/* 603/*
597 * Change the rendition style for following text 604 * Change the rendition style for following text
598 */ 605 */
599void 606void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 607rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 608{
602 if (set) 609 if (set)
603 rstyle |= style; 610 rstyle |= style;
604 else if (style == ~RS_None) 611 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 612 rstyle = DEFAULT_RSTYLE;
606 else 613 else
607 rstyle &= ~style; 614 rstyle &= ~style;
608 } 615}
609 616
610/* ------------------------------------------------------------------------- */ 617/* ------------------------------------------------------------------------- */
611/* 618/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 619 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 620 * count positive ==> scroll up
… …
664 line_t &l2 = ROW(i); 671 line_t &l2 = ROW(i);
665 672
666 ::swap (l1, l2); 673 ::swap (l1, l2);
667 l2.touch (); 674 l2.touch ();
668 } 675 }
669 676
670 // move and/or clear selection, if any 677 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 678 if (selection.op && current_screen == selection.screen)
672 { 679 {
673 selection.beg.row -= count; 680 selection.beg.row -= count;
674 selection.end.row -= count; 681 selection.end.row -= count;
… …
710 { 717 {
711 /* move selected region too */ 718 /* move selected region too */
712 selection.beg.row -= count; 719 selection.beg.row -= count;
713 selection.end.row -= count; 720 selection.end.row -= count;
714 selection.mark.row -= count; 721 selection.mark.row -= count;
715 722
716 selection_check (0); 723 selection_check (0);
717 } 724 }
718 } 725 }
719 726
720 // use a simple and robust scrolling algorithm, this 727 // use a simple and robust scrolling algorithm, this
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 779 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 780 screen.cur.row -= minlines;
774 } 781 }
775 } 782 }
776 783
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 784 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 785 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 786 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 787 int row = screen.cur.row;
783 788
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 789 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 790
786 line_t *line = &ROW(row); 791 line_t *line = &ROW(row);
787 792
788 while (str < strend) 793 while (str < strend)
789 { 794 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 796
792 if (c < 0x20) 797 if (expect_false (c < 0x20))
793 if (c == C0_LF) 798 if (c == C0_LF)
794 { 799 {
795 max_it (line->l, screen.cur.col); 800 max_it (line->l, screen.cur.col);
796 801
797 screen.flags &= ~Screen_WrapNext; 802 screen.flags &= ~Screen_WrapNext;
… …
816 { 821 {
817 scr_tab (1, true); 822 scr_tab (1, true);
818 continue; 823 continue;
819 } 824 }
820 825
826 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 827 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 829 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 ))
824 { 831 {
825 checksel = 0; 832 checksel = 0;
826 /* 833 /*
827 * If we wrote anywhere in the selected area, kill the selection 834 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 835 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 836 * should be a similar check.
830 */ 837 */
831 CLEAR_SELECTION (); 838 CLEAR_SELECTION ();
832 } 839 }
833 840
834 if (screen.flags & Screen_WrapNext) 841 if (expect_false (screen.flags & Screen_WrapNext))
835 { 842 {
836 scr_do_wrap (); 843 scr_do_wrap ();
837 844
838 line->l = ncol; 845 line->l = ncol;
839 line->is_longer (1); 846 line->is_longer (1);
840 847
841 row = screen.cur.row; 848 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 849 line = &ROW(row); /* _must_ refresh */
843 } 850 }
844 851
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 852 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 854 c = 0xfffd;
848 855
849 // rely on wcwidth to tell us the character width, do wcwidth before 856 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 857 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 858 // drawing characters below as they might be invalid in the current
852 // locale. 859 // locale.
853 int width = WCWIDTH (c); 860 int width = WCWIDTH (c);
854 861
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 863 {
857 // vt100 special graphics and line drawing 864 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 865 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 866 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 867 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 880 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 881 width = 1; // vt100 line drawing characters are always single-width
875 } 882 }
876 } 883 }
877 884
878 if (screen.flags & Screen_Insert) 885 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 886 scr_insdel_chars (width, INSERT);
880 887
881 if (width != 0) 888 if (width != 0)
882 { 889 {
883#if !UNICODE_3 890#if !UNICODE_3
… …
889 c = 0xfffd; 896 c = 0xfffd;
890# endif 897# endif
891#endif 898#endif
892 899
893 // nuke the character at this position, if required 900 // nuke the character at this position, if required
901 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 902 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 903 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 904 && line->t[screen.cur.col + 1] == NOCHAR)
905 ))
906 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909
910 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
897 { 912 {
898 int col = screen.cur.col; 913 // ... 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 = ' '; 914 c = NOCHAR;
921 // and try the same character next loop iteration 915 // and try the same character next loop iteration
922 --str; 916 --str;
923 } 917 }
924 918
925 line->touch (); 919 line->touch ();
… …
927 do 921 do
928 { 922 {
929 line->t[screen.cur.col] = c; 923 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 924 line->r[screen.cur.col] = rend;
931 925
932 if (screen.cur.col < ncol - 1) 926 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 927 screen.cur.col++;
934 else 928 else
935 { 929 {
936 line->l = ncol; 930 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 931 if (screen.flags & Screen_Autowrap)
… …
939 break; 933 break;
940 } 934 }
941 935
942 c = NOCHAR; 936 c = NOCHAR;
943 } 937 }
944 while (--width > 0); 938 while (expect_false (--width > 0));
945 939
946 // pad with spaces when overwriting wide character with smaller one 940 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 941 if (expect_false (!width))
948 { 942 {
949 line->touch (); 943 line->touch ();
950 944
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 946 {
953 line->t[c] = ' '; 947 line->t[c] = ' ';
954 line->r[c] = rend; 948 line->r[c] = rend;
955 } 949 }
956 } 950 }
957 } 951 }
952#if ENABLE_COMBINING
958 else // width == 0 953 else // width == 0
959 { 954 {
960#if ENABLE_COMBINING 955 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 { 956 {
957 // handle combining characters
958 // we just tag the accent on the previous on-screen character.
959 // this is arguably not correct, but also arguably not wrong.
960 // we don't handle double-width characters nicely yet.
961 line_t *linep;
962 text_t *tp;
963 rend_t *rp;
964
965 if (screen.cur.col > 0)
966 {
971 linep = line; 967 linep = line;
972 tp = line->t + screen.cur.col - 1; 968 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 969 rp = line->r + screen.cur.col - 1;
970 }
971 else if (screen.cur.row > 0
972 && ROW(screen.cur.row - 1).is_longer ())
973 {
974 linep = &ROW(screen.cur.row - 1);
975 tp = line->t + ncol - 1;
976 rp = line->r + ncol - 1;
977 }
978 else
979 continue;
980
981 linep->touch ();
982
983 while (*tp == NOCHAR && tp > linep->t)
984 tp--, rp--;
985
986 // first try to find a precomposed character
987 unicode_t n = rxvt_compose (*tp, c);
988 if (n == NOCHAR)
989 n = rxvt_composite.compose (*tp, c);
990
991 *tp = n;
992 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
974 } 993 }
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 } 994 }
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 995#endif
998 }
999 } 996 }
1000 997
1001 max_it (line->l, screen.cur.col); 998 max_it (line->l, screen.cur.col);
1002 999
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1000 assert (screen.cur.row >= 0);
1005#endif
1006} 1001}
1007 1002
1008/* ------------------------------------------------------------------------- */ 1003/* ------------------------------------------------------------------------- */
1009/* 1004/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1005 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1012 */ 1007 */
1013void 1008void
1014rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1015{ 1010{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1019 { 1012 {
1020 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1021 { 1014 {
1022#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1017 --screen.cur.row;
1025 return; 1018
1019 want_refresh = 1;
1026#endif 1020#endif
1027 } 1021 }
1028 } 1022 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1030 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1025}
1034 1026
1035/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1036/* 1028/*
1037 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1060 x = i; 1052 x = i;
1061 1053
1062 if (!--count) 1054 if (!--count)
1063 break; 1055 break;
1064 } 1056 }
1065 else 1057 else
1066 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1068 1060
1069 if (count) 1061 if (count)
1070 x = ncol - 1; 1062 x = ncol - 1;
… …
1186 } 1178 }
1187 } 1179 }
1188 else 1180 else
1189 { 1181 {
1190 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1191 { /* relative origin mode */ 1184 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1194 } 1187 }
1195 else 1188 else
1196 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1229/* 1222/*
1230 * Erase part or whole of a line 1223 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1226 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1227 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1228 */
1235void 1229void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1231{
1238 unsigned int col, num; 1232 unsigned int col, num;
… …
1247 line.touch (); 1241 line.touch ();
1248 line.is_longer (0); 1242 line.is_longer (0);
1249 1243
1250 switch (mode) 1244 switch (mode)
1251 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1252 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1253 col = screen.cur.col;
1254 num = ncol - col; 1254 num = ncol - col;
1255 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1259 break; 1260 break;
1261
1260 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1261 col = 0; 1263 col = 0;
1262 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1266 break; 1269 break;
1270
1267 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1268 col = 0; 1272 col = 0;
1269 num = ncol; 1273 num = ncol;
1270 line.l = 0; 1274 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1330 return; 1334 return;
1331 1335
1332 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1333 1337
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1334 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1344 {
1338 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1346
1347 if (mapped && !view_start)
1348 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False);
1340 } 1351 }
1341 else 1352 else
1342 { 1353 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1355
1356 if (mapped && !view_start)
1357 {
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1360 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start),
1362 (unsigned int)width,
1363 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1349 } 1367 }
1350 1368
1351 for (; num--; row++) 1369 for (; num--; row++)
1352 { 1370 {
1353 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (!view_start)
1354 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1355 } 1375 }
1356} 1376}
1357 1377
1358#if !ENABLE_MINIMAL 1378#if !ENABLE_MINIMAL
1359void 1379void
… …
1433 * Insert/Delete <count> characters from the current position 1453 * Insert/Delete <count> characters from the current position
1434 */ 1454 */
1435void 1455void
1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1456rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437{ 1457{
1438 int col, row;
1439 rend_t tr;
1440
1441 want_refresh = 1; 1458 want_refresh = 1;
1442 ZERO_SCROLLBACK (); 1459 ZERO_SCROLLBACK ();
1443 1460
1444 if (count <= 0) 1461 if (count <= 0)
1445 return; 1462 return;
… …
1447 scr_do_wrap (); 1464 scr_do_wrap ();
1448 1465
1449 selection_check (1); 1466 selection_check (1);
1450 min_it (count, ncol - screen.cur.col); 1467 min_it (count, ncol - screen.cur.col);
1451 1468
1452 row = screen.cur.row; 1469 int row = screen.cur.row;
1453 1470
1454 line_t *line = &ROW(row); 1471 line_t *line = &ROW(row);
1455 1472
1456 line->touch (); 1473 line->touch ();
1457 line->is_longer (0); 1474 line->is_longer (0);
1458 1475
1476 // nuke wide spanning the start
1477 if (line->t[screen.cur.col] == NOCHAR)
1478 scr_kill_char (*line, screen.cur.col);
1479
1459 switch (insdel) 1480 switch (insdel)
1460 { 1481 {
1461 case INSERT: 1482 case INSERT:
1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1483 line->l = min (line->l + count, ncol);
1484
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1488 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463 { 1489 {
1464 line->t[col] = line->t[col - count]; 1490 line->t[col] = line->t[col - count];
1465 line->r[col] = line->r[col - count]; 1491 line->r[col] = line->r[col - count];
1466 } 1492 }
1467
1468 line->l = min (line->l + count, ncol);
1469 1493
1470 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1496 {
1473 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1498 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1499 CLEAR_SELECTION ();
1476 else 1500 else
1501 {
1477 { /* shift selection */ 1502 /* shift selection */
1478 selection.beg.col += count; 1503 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1504 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1505 selection.end.col += count;
1481 } 1506 }
1482 } 1507 }
… …
1487 case ERASE: 1512 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1513 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1514 selection_check (1);
1490 screen.cur.col -= count; 1515 screen.cur.col -= count;
1491 1516
1492 line->l = max (line->l - count, 0); 1517 // nuke wide char after the end
1518 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1519 scr_kill_char (*line, screen.cur.col + count);
1520
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1522 break;
1495 1523
1496 case DELETE: 1524 case DELETE:
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 line->l = max (line->l - count, 0);
1498 1526
1527 // nuke wide char spanning the end
1528 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1529 scr_kill_char (*line, screen.cur.col + count);
1530
1499 for (col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1500 { 1532 {
1501 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1502 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1503 } 1535 }
1504 1536
1505 line->l = max (line->l - count, 0);
1506 scr_blank_line (*line, ncol - count, count, tr); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1507 1538
1508 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1541 {
1511 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1621 */ 1652 */
1622void 1653void
1623rxvt_term::scr_set_tab (int mode) NOTHROW 1654rxvt_term::scr_set_tab (int mode) NOTHROW
1624{ 1655{
1625 if (mode < 0) 1656 if (mode < 0)
1626 memset (tabs, 0, ncol * sizeof (char)); 1657 memset (tabs, 0, ncol);
1627 else if (screen.cur.col < ncol) 1658 else if (screen.cur.col < ncol)
1628 tabs [screen.cur.col] = !!mode; 1659 tabs [screen.cur.col] = !!mode;
1629} 1660}
1630 1661
1631/* ------------------------------------------------------------------------- */ 1662/* ------------------------------------------------------------------------- */
… …
1866 return true; 1897 return true;
1867} 1898}
1868 1899
1869#ifndef NO_BELL 1900#ifndef NO_BELL
1870void 1901void
1871rxvt_term::bell_cb (time_watcher &w) 1902rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1903{
1873 rvideo_bell = false; 1904 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1905 scr_rvideo_mode (rvideo_mode);
1906 refresh_check ();
1875} 1907}
1876#endif 1908#endif
1877 1909
1878/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
1879void 1911void
… …
1885# ifdef MAPALERT_OPTION 1917# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1918 if (option (Opt_mapAlert))
1887# endif 1919# endif
1888 XMapWindow (dpy, parent[0]); 1920 XMapWindow (dpy, parent[0]);
1889# endif 1921# endif
1922
1890# if ENABLE_FRILLS 1923# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell)) 1924 if (option (Opt_urgentOnBell))
1892 { 1925 set_urgency (1);
1893 XWMHints *h;
1894
1895 h = XGetWMHints(dpy, parent[0]);
1896 if (h != NULL)
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints(dpy, parent[0], h);
1900 }
1901 }
1902# endif 1926# endif
1903 1927
1904 if (option (Opt_visualBell)) 1928 if (option (Opt_visualBell))
1905 { 1929 {
1906 rvideo_bell = true; 1930 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode); 1931 scr_rvideo_mode (rvideo_mode);
1908 display->flush (); 1932 flush ();
1909 1933
1910 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1935 }
1912 else 1936 else
1913 XBell (dpy, 0); 1937 XBell (dpy, 0);
1914#endif 1938#endif
1915} 1939}
… …
1919void 1943void
1920rxvt_term::scr_printscreen (int fullhist) NOTHROW 1944rxvt_term::scr_printscreen (int fullhist) NOTHROW
1921{ 1945{
1922#ifdef PRINTPIPE 1946#ifdef PRINTPIPE
1923 int nrows, row_start; 1947 int nrows, row_start;
1924 FILE *fd; 1948 FILE *fd = popen_printer ();
1925 1949
1926 if ((fd = popen_printer ()) == NULL) 1950 if (!fd)
1927 return; 1951 return;
1928 1952
1929 if (fullhist) 1953 if (fullhist)
1930 { 1954 {
1931 nrows = nrow - top_row; 1955 nrows = nrow - top_row;
… …
1976 * screen.text/screen.rend contain what the screen will change to. 2000 * screen.text/screen.rend contain what the screen will change to.
1977 */ 2001 */
1978void 2002void
1979rxvt_term::scr_refresh () NOTHROW 2003rxvt_term::scr_refresh () NOTHROW
1980{ 2004{
1981 unsigned char have_bg,
1982 showcursor; /* show the cursor */
1983 int16_t col, row, /* column/row we're processing */ 2005 int16_t col, row, /* column/row we're processing */
1984 ocrow; /* old cursor row */ 2006 ocrow; /* old cursor row */
1985 int i; /* tmp */ 2007 int i; /* tmp */
1986#ifndef NO_CURSORCOLOR 2008#ifndef NO_CURSORCOLOR
1987 rend_t cc1; /* store colours at cursor position (s) */ 2009 rend_t cc1; /* store colours at cursor position (s) */
… …
1996 return; 2018 return;
1997 2019
1998 /* 2020 /*
1999 * A: set up vars 2021 * A: set up vars
2000 */ 2022 */
2001 have_bg = 0;
2002 refresh_count = 0; 2023 refresh_count = 0;
2003 2024
2025 unsigned int old_screen_flags = screen.flags;
2026 char have_bg = 0;
2004#ifdef HAVE_BG_PIXMAP 2027#ifdef HAVE_BG_PIXMAP
2005 have_bg |= bgPixmap.pixmap != None; 2028 have_bg = bgPixmap.pixmap != None;
2006#endif 2029#endif
2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2030 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2008 2031
2009 /* 2032 /*
2010 * B: reverse any characters which are selected 2033 * B: reverse any characters which are selected
2011 */ 2034 */
2012 scr_reverse_selection (); 2035 scr_reverse_selection ();
2036
2037 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2038#if ENABLE_OVERLAY
2039 scr_swap_overlay ();
2040#endif
2041
2042 char showcursor = screen.flags & Screen_VisibleCursor;
2013 2043
2014 /* 2044 /*
2015 * C: set the cursor character (s) 2045 * C: set the cursor character (s)
2016 */ 2046 */
2017 { 2047 {
2018 unsigned char setoldcursor; 2048 unsigned char setoldcursor;
2019 2049
2020 showcursor = (screen.flags & Screen_VisibleCursor);
2021#ifdef CURSOR_BLINK 2050#ifdef CURSOR_BLINK
2022 if (hidden_cursor) 2051 if (hidden_cursor)
2023 showcursor = 0; 2052 showcursor = 0;
2024#endif 2053#endif
2025 2054
… …
2098 oldcursor.col = screen.cur.col; 2127 oldcursor.col = screen.cur.col;
2099 } 2128 }
2100 } 2129 }
2101 } 2130 }
2102 2131
2103 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2104#if ENABLE_OVERLAY
2105 scr_swap_overlay ();
2106#endif
2107
2108#ifndef NO_SLOW_LINK_SUPPORT 2132#ifndef NO_SLOW_LINK_SUPPORT
2109 /* 2133 /*
2110 * D: CopyArea pass - very useful for slower links 2134 * D: CopyArea pass - very useful for slower links
2111 * This has been deliberately kept simple. 2135 * This has been deliberately kept simple.
2112 */ 2136 */
… …
2201 continue; 2225 continue;
2202 2226
2203 // redraw one or more characters 2227 // redraw one or more characters
2204 2228
2205 // seek to the beginning of wide characters 2229 // seek to the beginning of wide characters
2206 while (stp[col] == NOCHAR && col > 0) 2230 while (expect_false (stp[col] == NOCHAR && col > 0))
2207 --col; 2231 --col;
2208 2232
2209 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2210 text_t *text = stp + col; 2234 text_t *text = stp + col;
2211 int count = 1; 2235 int count = 1;
… …
2218 for (i = 0; ++col < ncol; ) 2242 for (i = 0; ++col < ncol; )
2219 { 2243 {
2220 if (stp[col] == NOCHAR) 2244 if (stp[col] == NOCHAR)
2221 { 2245 {
2222 dtp[col] = stp[col]; 2246 dtp[col] = stp[col];
2223 drp[col] = rend; 2247 drp[col] = srp[col];
2248
2224 count++; 2249 count++;
2225 i++; 2250 i++;
2226 2251
2227 continue; 2252 continue;
2228 } 2253 }
… …
2248 2273
2249 col--; /* went one too far. move back */ 2274 col--; /* went one too far. move back */
2250 count -= i; /* dump any matching trailing chars */ 2275 count -= i; /* dump any matching trailing chars */
2251 2276
2252 // sometimes we optimize away the trailing NOCHAR's, add them back 2277 // sometimes we optimize away the trailing NOCHAR's, add them back
2253 while (i && text[count] == NOCHAR) 2278 while (expect_false (i && text[count] == NOCHAR))
2254 count++, i--; 2279 count++, i--;
2255 2280
2256 /* 2281 /*
2257 * Determine the attributes for the string 2282 * Determine the attributes for the string
2258 */ 2283 */
2259 int fore = fgcolor_of (rend); // desired foreground 2284 int fore = fgcolor_of (rend); // desired foreground
2260 int back = bgcolor_of (rend); // desired background 2285 int back = bgcolor_of (rend); // desired background
2261 2286
2262 // only do special processing if any attributes are set, which is unlikely 2287 // only do special processing if any attributes are set, which is unlikely
2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2288 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2264 { 2289 {
2265 bool invert = rend & RS_RVid; 2290 bool invert = rend & RS_RVid;
2266 2291
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2292#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold
2269 && fore == Color_fg) 2293 if (rend & RS_Bold && fore == Color_fg)
2270 { 2294 {
2271 if (ISSET_PIXCOLOR (Color_BD)) 2295 if (ISSET_PIXCOLOR (Color_BD))
2272 fore = Color_BD; 2296 fore = Color_BD;
2273# if !ENABLE_STYLES 2297# if !ENABLE_STYLES
2274 else 2298 else
2275 invert = !invert; 2299 invert = !invert;
2276# endif 2300# endif
2277 } 2301 }
2278 2302
2279 if (rend & RS_Italic 2303 if (rend & RS_Italic && fore == Color_fg)
2280 && fore == Color_fg)
2281 { 2304 {
2282 if (ISSET_PIXCOLOR (Color_IT)) 2305 if (ISSET_PIXCOLOR (Color_IT))
2283 fore = Color_IT; 2306 fore = Color_IT;
2284# if !ENABLE_STYLES 2307# if !ENABLE_STYLES
2285 else 2308 else
… …
2319 } 2342 }
2320 2343
2321#ifdef TEXT_BLINK 2344#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2345 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2346 {
2324 if (!text_blink_ev.active) 2347 if (!text_blink_ev.is_active ())
2325 { 2348 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2349 text_blink_ev.again ();
2327 hidden_text = 0; 2350 hidden_text = 0;
2328 } 2351 }
2329 else if (hidden_text) 2352 else if (hidden_text)
2330 fore = back; 2353 fore = back;
2331 } 2354 }
… …
2353 /* 2376 /*
2354 * Actually do the drawing of the string here 2377 * Actually do the drawing of the string here
2355 */ 2378 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2379 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2380
2358 if (have_bg && back == Color_bg) 2381 if (expect_true (have_bg && back == Color_bg))
2359 { 2382 {
2360 // this is very ugly, maybe push it into ->draw? 2383 // this is very ugly, maybe push it into ->draw?
2361 2384
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2385 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2386 if (text[i] != ' ')
… …
2370 did_clear: ; 2393 did_clear: ;
2371 } 2394 }
2372 else 2395 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2396 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2397
2375 if (rend & RS_Uline && font->descent > 1 && fore != back) 2398 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2399 {
2377#if ENABLE_FRILLS 2400#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2401 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2402 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2403 else
2381#endif 2404#endif
2382 XSetForeground (dpy, gc, pix_colors[fore]); 2405 XSetForeground (dpy, gc, pix_colors[fore]);
2383 2406
2384 XDrawLine (dpy, drawBuffer, gc, 2407 XDrawLine (dpy, vt, gc,
2385 xpixel, ypixel + font->ascent + 1, 2408 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2409 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2410 }
2388 } /* for (col....) */ 2411 } /* for (col....) */
2389 } /* for (row....) */ 2412 } /* for (row....) */
2390
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395 2413
2396 /* 2414 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2415 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2416 */
2399 if (showcursor) 2417 if (showcursor)
… …
2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2445 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else 2446 else
2429#endif 2447#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]); 2448 XSetForeground (dpy, gc, pix_colors[ccol1]);
2431 2449
2432 XDrawRectangle (dpy, drawBuffer, gc, 2450 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2451 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2452 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2453 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2454 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2437 } 2455 }
2438 } 2456 }
2439 2457
2440 /* 2458 /*
2441 * H: cleanup selection 2459 * H: cleanup selection
2442 */ 2460 */
2461#if ENABLE_OVERLAY
2462 scr_swap_overlay ();
2463#endif
2464 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2465
2443 scr_reverse_selection (); 2466 scr_reverse_selection ();
2444 2467
2468 screen.flags = old_screen_flags;
2445 num_scr = 0; 2469 num_scr = 0;
2446 num_scr_allow = 1; 2470 num_scr_allow = 1;
2447} 2471}
2448 2472
2449void 2473void
… …
2475rxvt_term::scr_recolour () NOTHROW 2499rxvt_term::scr_recolour () NOTHROW
2476{ 2500{
2477#ifdef HAVE_BG_PIXMAP 2501#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2502 bgPixmap.apply ();
2479#else 2503#else
2504
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]); 2506 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483# if HAVE_SCROLLBARS 2508
2484 if (scrollBar.win) 2509 if (scrollBar.win)
2485 { 2510 {
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2512 scrollBar.state = STATE_IDLE;
2488 scrollbar_show (0); 2513 scrollBar.show (0);
2489 } 2514 }
2515
2490# endif 2516#endif
2491#endif 2517
2492 2518 /* bgPixmap.apply () does not do the following : */
2493 scr_clear (); 2519 scr_clear ();
2494 scr_touch (true); 2520 scr_touch (true);
2495 want_refresh = 1; 2521 want_refresh = 1;
2496} 2522}
2497 2523
… …
2589{ 2615{
2590 int row, wrote; 2616 int row, wrote;
2591 unsigned int width, towrite; 2617 unsigned int width, towrite;
2592 char r1[] = "\n"; 2618 char r1[] = "\n";
2593 2619
2594 for (row = saveLines - nsaved; 2620 for (row = saveLines + top_row;
2595 row < saveLines + nrow - 1; row++) 2621 row < saveLines + nrow - 1; row++)
2596 { 2622 {
2597 width = row_buf[row].l >= 0 ? row_buf[row].l 2623 width = row_buf[row].l >= 0 ? row_buf[row].l
2598 : ncol; 2624 : ncol;
2599 for (towrite = width; towrite; towrite -= wrote) 2625 for (towrite = width; towrite; towrite -= wrote)
… …
2650 /* convert normal newline chars into common keyboard Return key sequence */ 2676 /* convert normal newline chars into common keyboard Return key sequence */
2651 for (unsigned int i = 0; i < len; i++) 2677 for (unsigned int i = 0; i < len; i++)
2652 if (data[i] == C0_LF) 2678 if (data[i] == C0_LF)
2653 data[i] = C0_CR; 2679 data[i] = C0_CR;
2654 2680
2681 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[200~");
2683
2655 tt_write (data, len); 2684 tt_write (data, len);
2685
2686 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~");
2656} 2688}
2657 2689
2658/* ------------------------------------------------------------------------- */ 2690/* ------------------------------------------------------------------------- */
2659/* 2691/*
2660 * Respond to a notification that a primary selection has been sent 2692 * Respond to a notification that a primary selection has been sent
… …
2735 if (!delete_prop) 2767 if (!delete_prop)
2736 XDeleteProperty (dpy, win, prop); 2768 XDeleteProperty (dpy, win, prop);
2737 2769
2738 selection_wait = Sel_incr; 2770 selection_wait = Sel_incr;
2739 incr_buf_fill = 0; 2771 incr_buf_fill = 0;
2740 incr_ev.start (NOW + 10); 2772 incr_ev.start (10);
2741 2773
2742 goto bailout; 2774 goto bailout;
2743 } 2775 }
2744 2776
2745 if (ct.nitems == 0) 2777 if (ct.nitems == 0)
… …
2754 ct.nitems = incr_buf_fill; 2786 ct.nitems = incr_buf_fill;
2755 incr_buf = 0; 2787 incr_buf = 0;
2756 incr_buf_size = 0; 2788 incr_buf_size = 0;
2757 incr_ev.stop (); 2789 incr_ev.stop ();
2758 } 2790 }
2759 else 2791 else
2760 { 2792 {
2761 if (selection_wait == Sel_normal 2793 if (selection_wait == Sel_normal
2762 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2763 { 2795 {
2764 /* 2796 /*
… …
2771 goto bailout; 2803 goto bailout;
2772 } 2804 }
2773 } 2805 }
2774 else if (selection_wait == Sel_incr) 2806 else if (selection_wait == Sel_incr)
2775 { 2807 {
2776 incr_ev.start (NOW + 10); 2808 incr_ev.start (10);
2777 2809
2778 while (incr_buf_fill + ct.nitems > incr_buf_size) 2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2779 { 2811 {
2780 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2781 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2821 if (selection_wait == Sel_normal) 2853 if (selection_wait == Sel_normal)
2822 selection_wait = Sel_none; 2854 selection_wait = Sel_none;
2823} 2855}
2824 2856
2825void 2857void
2826rxvt_term::incr_cb (time_watcher &w) NOTHROW 2858rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2827{ 2859{
2828 selection_wait = Sel_none; 2860 selection_wait = Sel_none;
2829 2861
2830 incr_buf_size = 0; 2862 incr_buf_size = 0;
2831 free (incr_buf); 2863 free (incr_buf);
… …
2842 selection_paste (win, prop, true); 2874 selection_paste (win, prop, true);
2843} 2875}
2844 2876
2845/* ------------------------------------------------------------------------- */ 2877/* ------------------------------------------------------------------------- */
2846/* 2878/*
2847 * Request the current selection: 2879 * Request the current selection:
2848 * Order: > internal selection if available 2880 * Order: > internal selection if available
2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2850 * > CUT_BUFFER0 2882 * > CUT_BUFFER0
2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2883 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2852 * will auto fallback to CUT_BUFFER0 2884 * will auto fallback to CUT_BUFFER0
… …
2854 */ 2886 */
2855void 2887void
2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2857{ 2889{
2858 if (selection.text && selnum == Sel_Primary) 2890 if (selection.text && selnum == Sel_Primary)
2891 {
2859 { /* internal selection */ 2892 /* internal selection */
2860 char *str = rxvt_wcstombs (selection.text, selection.len); 2893 char *str = rxvt_wcstombs (selection.text, selection.len);
2861 paste (str, strlen (str)); 2894 paste (str, strlen (str));
2862 free (str); 2895 free (str);
2863 return; 2896 return;
2864 } 2897 }
… …
3130 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3163 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3131 3164
3132 while (selection.mark.col > 0 3165 while (selection.mark.col > 0
3133 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3166 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3134 --selection.mark.col; 3167 --selection.mark.col;
3135 3168
3136 if (selection.op) 3169 if (selection.op)
3170 {
3137 { /* clear the old selection */ 3171 /* clear the old selection */
3138 selection.beg.row = selection.end.row = selection.mark.row; 3172 selection.beg.row = selection.end.row = selection.mark.row;
3139 selection.beg.col = selection.end.col = selection.mark.col; 3173 selection.beg.col = selection.end.col = selection.mark.col;
3140 } 3174 }
3141 3175
3142 selection.op = SELECTION_INIT; 3176 selection.op = SELECTION_INIT;
… …
3331 * a point/word/line which is either the start or end of the selection 3365 * a point/word/line which is either the start or end of the selection
3332 * and it was decided by whichever point/word/line was `fixed' at the 3366 * and it was decided by whichever point/word/line was `fixed' at the
3333 * time of the most recent button3 press 3367 * time of the most recent button3 press
3334 */ 3368 */
3335 if (button3 && buttonpress) 3369 if (button3 && buttonpress)
3370 {
3336 { /* button3 press */ 3371 /* button3 press */
3337 /* 3372 /*
3338 * first determine which edge of the selection we are closest to 3373 * first determine which edge of the selection we are closest to
3339 */ 3374 */
3340 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3375 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3341 || (!ROWCOL_IS_AFTER (pos, selection.end) 3376 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3359 selection.mark.row = selection.beg.row; 3394 selection.mark.row = selection.beg.row;
3360 selection.mark.col = selection.beg.col; 3395 selection.mark.col = selection.beg.col;
3361 } 3396 }
3362 } 3397 }
3363 else 3398 else
3399 {
3364 { /* button1 drag or button3 drag */ 3400 /* button1 drag or button3 drag */
3365 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3401 if (ROWCOL_IS_AFTER (selection.mark, pos))
3366 { 3402 {
3367 if (selection.mark.row == selection.end.row 3403 if (selection.mark.row == selection.end.row
3368 && selection.mark.col == selection.end.col 3404 && selection.mark.col == selection.end.col
3369 && clickchange 3405 && clickchange
… …
3450 selection.end.row++; 3486 selection.end.row++;
3451 } 3487 }
3452 } 3488 }
3453 3489
3454 if (button3 && buttonpress) 3490 if (button3 && buttonpress)
3491 {
3455 { /* mark may need to be changed */ 3492 /* mark may need to be changed */
3456 if (closeto == LEFT) 3493 if (closeto == LEFT)
3457 { 3494 {
3458 selection.mark.row = selection.end.row; 3495 selection.mark.row = selection.end.row;
3459 selection.mark.col = selection.end.col - (selection.clicks == 2); 3496 selection.mark.col = selection.end.col - (selection.clicks == 2);
3460 } 3497 }
… …
3659 XFree (ct.value); 3696 XFree (ct.value);
3660 } 3697 }
3661 3698
3662 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3699 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3663} 3700}
3664
3665/* ------------------------------------------------------------------------- *
3666 * MOUSE ROUTINES *
3667 * ------------------------------------------------------------------------- */
3668
3669/*
3670 * return col/row values corresponding to x/y pixel values
3671 */
3672void
3673rxvt_term::pixel_position (int *x, int *y) NOTHROW
3674{
3675 *x = Pixel2Col (*x);
3676 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3677 *y = Pixel2Row (*y);
3678 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3679}
3680 3701
3681/* ------------------------------------------------------------------------- */ 3702/* ------------------------------------------------------------------------- */
3682#ifdef USE_XIM 3703#ifdef USE_XIM
3683void 3704void
3684rxvt_term::im_set_position (XPoint &pos) NOTHROW 3705rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3711 h += 2; min_it (h, nrow); 3732 h += 2; min_it (h, nrow);
3712 3733
3713 x -= 1; clamp_it (x, 0, ncol - w); 3734 x -= 1; clamp_it (x, 0, ncol - w);
3714 y -= 1; clamp_it (y, 0, nrow - h); 3735 y -= 1; clamp_it (y, 0, nrow - h);
3715 3736
3716 ov_x = x; ov_y = y; 3737 ov.x = x; ov.y = y;
3717 ov_w = w; ov_h = h; 3738 ov.w = w; ov.h = h;
3718 3739
3719 ov_text = new text_t *[h]; 3740 ov.text = new text_t *[h];
3720 ov_rend = new rend_t *[h]; 3741 ov.rend = new rend_t *[h];
3721 3742
3722 for (y = 0; y < h; y++) 3743 for (y = 0; y < h; y++)
3723 { 3744 {
3724 text_t *tp = ov_text[y] = new text_t[w]; 3745 text_t *tp = ov.text[y] = new text_t[w];
3725 rend_t *rp = ov_rend[y] = new rend_t[w]; 3746 rend_t *rp = ov.rend[y] = new rend_t[w];
3726 3747
3727 text_t t0, t1, t2; 3748 text_t t0, t1, t2;
3728 rend_t r = OVERLAY_RSTYLE; 3749 rend_t r = OVERLAY_RSTYLE;
3729 3750
3730 if (y == 0) 3751 if (y == 0)
… …
3749} 3770}
3750 3771
3751void 3772void
3752rxvt_term::scr_overlay_off () NOTHROW 3773rxvt_term::scr_overlay_off () NOTHROW
3753{ 3774{
3754 if (!ov_text) 3775 if (!ov.text)
3755 return; 3776 return;
3756 3777
3757 want_refresh = 1; 3778 want_refresh = 1;
3758 3779
3759 for (int y = 0; y < ov_h; y++) 3780 for (int y = 0; y < ov.h; y++)
3760 { 3781 {
3761 delete [] ov_text[y]; 3782 delete [] ov.text[y];
3762 delete [] ov_rend[y]; 3783 delete [] ov.rend[y];
3763 } 3784 }
3764 3785
3765 delete [] ov_text; ov_text = 0; 3786 delete [] ov.text; ov.text = 0;
3766 delete [] ov_rend; ov_rend = 0; 3787 delete [] ov.rend; ov.rend = 0;
3767} 3788}
3768 3789
3769void 3790void
3770rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3791rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3771{ 3792{
3772 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3793 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3773 return; 3794 return;
3774 3795
3775 x++, y++; 3796 x++, y++;
3776 3797
3777 ov_text[y][x] = text; 3798 ov.text[y][x] = text;
3778 ov_rend[y][x] = rend; 3799 ov.rend[y][x] = rend;
3779} 3800}
3780 3801
3781void 3802void
3782rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3803rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3783{ 3804{
… …
3802} 3823}
3803 3824
3804void 3825void
3805rxvt_term::scr_swap_overlay () NOTHROW 3826rxvt_term::scr_swap_overlay () NOTHROW
3806{ 3827{
3807 if (!ov_text) 3828 if (!ov.text)
3808 return; 3829 return;
3809 3830
3831 // hide cursor if it is within the overlay area
3832 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3833 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3834 screen.flags &= ~Screen_VisibleCursor;
3835
3810 // swap screen mem with overlay 3836 // swap screen mem with overlay
3811 for (int y = ov_h; y--; ) 3837 for (int y = ov.h; y--; )
3812 { 3838 {
3813 text_t *t1 = ov_text[y]; 3839 text_t *t1 = ov.text[y];
3814 rend_t *r1 = ov_rend[y]; 3840 rend_t *r1 = ov.rend[y];
3815 3841
3816 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3842 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3817 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3843 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3818 3844
3819 for (int x = ov_w; x--; ) 3845 for (int x = ov.w; x--; )
3820 { 3846 {
3821 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3847 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3822 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3848 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3823 } 3849 }
3824 } 3850 }

Diff Legend

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