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.278 by root, Mon Sep 17 08:31:54 2007 UTC vs.
Revision 1.332 by sf-exg, Mon Jan 18 10:05:55 2010 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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);
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{
… …
537 want_refresh = 1; 544 want_refresh = 1;
538 view_start = 0; 545 view_start = 0;
539 546
540 selection_check (2); /* check for boundary cross */ 547 selection_check (2); /* check for boundary cross */
541 548
542 int i = current_screen; current_screen = scrn; scrn = i; 549 current_screen = scrn;
543 550
544#if NSCREENS 551#if NSCREENS
545 if (option (Opt_secondaryScreen)) 552 if (option (Opt_secondaryScreen))
546 { 553 {
547 num_scr = 0; 554 num_scr = 0;
… …
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
… …
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
… …
1888 XMapWindow (dpy, parent[0]); 1920 XMapWindow (dpy, parent[0]);
1889# endif 1921# endif
1890 1922
1891# if ENABLE_FRILLS 1923# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1924 if (option (Opt_urgentOnBell))
1893 { 1925 set_urgency (1);
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif 1926# endif
1901 1927
1902 if (option (Opt_visualBell)) 1928 if (option (Opt_visualBell))
1903 { 1929 {
1904 rvideo_bell = true; 1930 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1931 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1932 flush ();
1907 1933
1908 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1935 }
1910 else 1936 else
1911 XBell (dpy, 0); 1937 XBell (dpy, 0);
1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1912#endif 1939#endif
1913} 1940}
1914 1941
1915/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1916/* ARGSUSED */ 1943/* ARGSUSED */
1917void 1944void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1945rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1946{
1920#ifdef PRINTPIPE 1947#ifdef PRINTPIPE
1921 int nrows, row_start; 1948 int nrows, row_start;
1922 FILE *fd; 1949 FILE *fd = popen_printer ();
1923 1950
1924 if ((fd = popen_printer ()) == NULL) 1951 if (!fd)
1925 return; 1952 return;
1926 1953
1927 if (fullhist) 1954 if (fullhist)
1928 { 1955 {
1929 nrows = nrow - top_row; 1956 nrows = nrow - top_row;
… …
1935 row_start = view_start; 1962 row_start = view_start;
1936 } 1963 }
1937 1964
1938 wctomb (0, 0); 1965 wctomb (0, 0);
1939 1966
1940 for (int r1 = 0; r1 < nrows; r1++) 1967 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1941 { 1968 {
1942 text_t *tp = ROW(r1).t; 1969 text_t *tp = ROW(r1).t;
1943 int len = ROW(r1).l; 1970 int len = ROW(r1).l;
1944 1971
1945 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1972 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1974 * screen.text/screen.rend contain what the screen will change to. 2001 * screen.text/screen.rend contain what the screen will change to.
1975 */ 2002 */
1976void 2003void
1977rxvt_term::scr_refresh () NOTHROW 2004rxvt_term::scr_refresh () NOTHROW
1978{ 2005{
1979 unsigned char have_bg,
1980 showcursor; /* show the cursor */
1981 int16_t col, row, /* column/row we're processing */ 2006 int16_t col, row, /* column/row we're processing */
1982 ocrow; /* old cursor row */ 2007 ocrow; /* old cursor row */
1983 int i; /* tmp */ 2008 int i; /* tmp */
1984#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
1985 rend_t cc1; /* store colours at cursor position (s) */ 2010 rend_t cc1; /* store colours at cursor position (s) */
… …
1994 return; 2019 return;
1995 2020
1996 /* 2021 /*
1997 * A: set up vars 2022 * A: set up vars
1998 */ 2023 */
1999 have_bg = 0;
2000 refresh_count = 0; 2024 refresh_count = 0;
2001 2025
2026 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0;
2002#ifdef HAVE_BG_PIXMAP 2028#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2029 have_bg = bgPixmap.pixmap != None;
2004#endif 2030#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2032
2007 /* 2033 /*
2008 * B: reverse any characters which are selected 2034 * B: reverse any characters which are selected
2009 */ 2035 */
2010 scr_reverse_selection (); 2036 scr_reverse_selection ();
2037
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY
2040 scr_swap_overlay ();
2041#endif
2042
2043 char showcursor = screen.flags & Screen_VisibleCursor;
2011 2044
2012 /* 2045 /*
2013 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
2014 */ 2047 */
2015 { 2048 {
2016 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2017 2050
2018 showcursor = (screen.flags & Screen_VisibleCursor);
2019#ifdef CURSOR_BLINK 2051#ifdef CURSOR_BLINK
2020 if (hidden_cursor) 2052 if (hidden_cursor)
2021 showcursor = 0; 2053 showcursor = 0;
2022#endif 2054#endif
2023 2055
… …
2096 oldcursor.col = screen.cur.col; 2128 oldcursor.col = screen.cur.col;
2097 } 2129 }
2098 } 2130 }
2099 } 2131 }
2100 2132
2101 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2102#if ENABLE_OVERLAY
2103 scr_swap_overlay ();
2104#endif
2105
2106#ifndef NO_SLOW_LINK_SUPPORT 2133#ifndef NO_SLOW_LINK_SUPPORT
2107 /* 2134 /*
2108 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2109 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2110 */ 2137 */
… …
2199 continue; 2226 continue;
2200 2227
2201 // redraw one or more characters 2228 // redraw one or more characters
2202 2229
2203 // seek to the beginning of wide characters 2230 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2231 while (expect_false (stp[col] == NOCHAR && col > 0))
2205 --col; 2232 --col;
2206 2233
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2208 text_t *text = stp + col; 2235 text_t *text = stp + col;
2209 int count = 1; 2236 int count = 1;
… …
2216 for (i = 0; ++col < ncol; ) 2243 for (i = 0; ++col < ncol; )
2217 { 2244 {
2218 if (stp[col] == NOCHAR) 2245 if (stp[col] == NOCHAR)
2219 { 2246 {
2220 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2221 drp[col] = rend; 2248 drp[col] = srp[col];
2249
2222 count++; 2250 count++;
2223 i++; 2251 i++;
2224 2252
2225 continue; 2253 continue;
2226 } 2254 }
… …
2246 2274
2247 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2249 2277
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2279 while (expect_false (i && text[count] == NOCHAR))
2252 count++, i--; 2280 count++, i--;
2253 2281
2254 /* 2282 /*
2255 * Determine the attributes for the string 2283 * Determine the attributes for the string
2256 */ 2284 */
2257 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2259 2287
2260 // only do special processing if any attributes are set, which is unlikely 2288 // only do special processing if any attributes are set, which is unlikely
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2262 { 2290 {
2263 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2264 2292
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
2268 { 2295 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2296 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2297 fore = Color_BD;
2271# if !ENABLE_STYLES 2298# if !ENABLE_STYLES
2272 else 2299 else
2273 invert = !invert; 2300 invert = !invert;
2274# endif 2301# endif
2275 } 2302 }
2276 2303
2277 if (rend & RS_Italic 2304 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2305 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2306 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2307 fore = Color_IT;
2282# if !ENABLE_STYLES 2308# if !ENABLE_STYLES
2283 else 2309 else
… …
2317 } 2343 }
2318 2344
2319#ifdef TEXT_BLINK 2345#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2346 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2347 {
2322 if (!text_blink_ev.active) 2348 if (!text_blink_ev.is_active ())
2323 { 2349 {
2324 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2350 text_blink_ev.again ();
2325 hidden_text = 0; 2351 hidden_text = 0;
2326 } 2352 }
2327 else if (hidden_text) 2353 else if (hidden_text)
2328 fore = back; 2354 fore = back;
2329 } 2355 }
… …
2351 /* 2377 /*
2352 * Actually do the drawing of the string here 2378 * Actually do the drawing of the string here
2353 */ 2379 */
2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2355 2381
2356 if (have_bg && back == Color_bg) 2382 if (expect_true (have_bg && back == Color_bg))
2357 { 2383 {
2358 // this is very ugly, maybe push it into ->draw? 2384 // this is very ugly, maybe push it into ->draw?
2359 2385
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2386 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2387 if (text[i] != ' ')
… …
2368 did_clear: ; 2394 did_clear: ;
2369 } 2395 }
2370 else 2396 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2398
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2400 {
2375#if ENABLE_FRILLS 2401#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2402 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2403 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2404 else
2379#endif 2405#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2406 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2407
2382 XDrawLine (dpy, drawBuffer, gc, 2408 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2409 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2411 }
2386 } /* for (col....) */ 2412 } /* for (col....) */
2387 } /* for (row....) */ 2413 } /* for (row....) */
2388
2389#if ENABLE_OVERLAY
2390 scr_swap_overlay ();
2391#endif
2392 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2393 2414
2394 /* 2415 /*
2395 * G: cleanup cursor and display outline cursor if necessary 2416 * G: cleanup cursor and display outline cursor if necessary
2396 */ 2417 */
2397 if (showcursor) 2418 if (showcursor)
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2447 else
2427#endif 2448#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2449 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2450
2430 XDrawRectangle (dpy, drawBuffer, gc, 2451 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2452 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2453 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2454 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2456 }
2436 } 2457 }
2437 2458
2438 /* 2459 /*
2439 * H: cleanup selection 2460 * H: cleanup selection
2440 */ 2461 */
2462#if ENABLE_OVERLAY
2463 scr_swap_overlay ();
2464#endif
2465 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2466
2441 scr_reverse_selection (); 2467 scr_reverse_selection ();
2442 2468
2469 screen.flags = old_screen_flags;
2443 num_scr = 0; 2470 num_scr = 0;
2444 num_scr_allow = 1; 2471 num_scr_allow = 1;
2445} 2472}
2446 2473
2447void 2474void
… …
2473rxvt_term::scr_recolour () NOTHROW 2500rxvt_term::scr_recolour () NOTHROW
2474{ 2501{
2475#ifdef HAVE_BG_PIXMAP 2502#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2503 bgPixmap.apply ();
2477#else 2504#else
2505
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]); 2507 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2481# if HAVE_SCROLLBARS 2509
2482 if (scrollBar.win) 2510 if (scrollBar.win)
2483 { 2511 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2513 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2514 scrollBar.show (0);
2487 } 2515 }
2516
2488# endif 2517#endif
2489#endif 2518
2490 2519 /* bgPixmap.apply () does not do the following : */
2491 scr_clear (); 2520 scr_clear ();
2492 scr_touch (true); 2521 scr_touch (true);
2493 want_refresh = 1; 2522 want_refresh = 1;
2494} 2523}
2495 2524
… …
2587{ 2616{
2588 int row, wrote; 2617 int row, wrote;
2589 unsigned int width, towrite; 2618 unsigned int width, towrite;
2590 char r1[] = "\n"; 2619 char r1[] = "\n";
2591 2620
2592 for (row = saveLines - nsaved; 2621 for (row = saveLines + top_row;
2593 row < saveLines + nrow - 1; row++) 2622 row < saveLines + nrow - 1; row++)
2594 { 2623 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l 2624 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol; 2625 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote) 2626 for (towrite = width; towrite; towrite -= wrote)
… …
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2677 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2678 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2679 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2680 data[i] = C0_CR;
2652 2681
2682 if (priv_modes & PrivMode_BracketPaste)
2683 tt_printf ("\e[200~");
2684
2653 tt_write (data, len); 2685 tt_write (data, len);
2686
2687 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~");
2654} 2689}
2655 2690
2656/* ------------------------------------------------------------------------- */ 2691/* ------------------------------------------------------------------------- */
2657/* 2692/*
2658 * Respond to a notification that a primary selection has been sent 2693 * Respond to a notification that a primary selection has been sent
… …
2733 if (!delete_prop) 2768 if (!delete_prop)
2734 XDeleteProperty (dpy, win, prop); 2769 XDeleteProperty (dpy, win, prop);
2735 2770
2736 selection_wait = Sel_incr; 2771 selection_wait = Sel_incr;
2737 incr_buf_fill = 0; 2772 incr_buf_fill = 0;
2738 incr_ev.start (NOW + 10); 2773 incr_ev.start (10);
2739 2774
2740 goto bailout; 2775 goto bailout;
2741 } 2776 }
2742 2777
2743 if (ct.nitems == 0) 2778 if (ct.nitems == 0)
… …
2752 ct.nitems = incr_buf_fill; 2787 ct.nitems = incr_buf_fill;
2753 incr_buf = 0; 2788 incr_buf = 0;
2754 incr_buf_size = 0; 2789 incr_buf_size = 0;
2755 incr_ev.stop (); 2790 incr_ev.stop ();
2756 } 2791 }
2757 else 2792 else
2758 { 2793 {
2759 if (selection_wait == Sel_normal 2794 if (selection_wait == Sel_normal
2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2795 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2761 { 2796 {
2762 /* 2797 /*
… …
2769 goto bailout; 2804 goto bailout;
2770 } 2805 }
2771 } 2806 }
2772 else if (selection_wait == Sel_incr) 2807 else if (selection_wait == Sel_incr)
2773 { 2808 {
2774 incr_ev.start (NOW + 10); 2809 incr_ev.start (10);
2775 2810
2776 while (incr_buf_fill + ct.nitems > incr_buf_size) 2811 while (incr_buf_fill + ct.nitems > incr_buf_size)
2777 { 2812 {
2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2813 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2819 if (selection_wait == Sel_normal) 2854 if (selection_wait == Sel_normal)
2820 selection_wait = Sel_none; 2855 selection_wait = Sel_none;
2821} 2856}
2822 2857
2823void 2858void
2824rxvt_term::incr_cb (time_watcher &w) NOTHROW 2859rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2825{ 2860{
2826 selection_wait = Sel_none; 2861 selection_wait = Sel_none;
2827 2862
2828 incr_buf_size = 0; 2863 incr_buf_size = 0;
2829 free (incr_buf); 2864 free (incr_buf);
… …
2840 selection_paste (win, prop, true); 2875 selection_paste (win, prop, true);
2841} 2876}
2842 2877
2843/* ------------------------------------------------------------------------- */ 2878/* ------------------------------------------------------------------------- */
2844/* 2879/*
2845 * Request the current selection: 2880 * Request the current selection:
2846 * Order: > internal selection if available 2881 * Order: > internal selection if available
2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2882 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2848 * > CUT_BUFFER0 2883 * > CUT_BUFFER0
2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2884 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2850 * will auto fallback to CUT_BUFFER0 2885 * will auto fallback to CUT_BUFFER0
… …
2852 */ 2887 */
2853void 2888void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2889rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2890{
2856 if (selection.text && selnum == Sel_Primary) 2891 if (selection.text && selnum == Sel_Primary)
2892 {
2857 { /* internal selection */ 2893 /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len); 2894 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str)); 2895 paste (str, strlen (str));
2860 free (str); 2896 free (str);
2861 return; 2897 return;
2862 } 2898 }
… …
3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3164 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3129 3165
3130 while (selection.mark.col > 0 3166 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3167 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3168 --selection.mark.col;
3133 3169
3134 if (selection.op) 3170 if (selection.op)
3171 {
3135 { /* clear the old selection */ 3172 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3173 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3174 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3175 }
3139 3176
3140 selection.op = SELECTION_INIT; 3177 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3366 * a point/word/line which is either the start or end of the selection
3330 * and it was decided by whichever point/word/line was `fixed' at the 3367 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3368 * time of the most recent button3 press
3332 */ 3369 */
3333 if (button3 && buttonpress) 3370 if (button3 && buttonpress)
3371 {
3334 { /* button3 press */ 3372 /* button3 press */
3335 /* 3373 /*
3336 * first determine which edge of the selection we are closest to 3374 * first determine which edge of the selection we are closest to
3337 */ 3375 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3376 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3377 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3395 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3396 selection.mark.col = selection.beg.col;
3359 } 3397 }
3360 } 3398 }
3361 else 3399 else
3400 {
3362 { /* button1 drag or button3 drag */ 3401 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3402 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3403 {
3365 if (selection.mark.row == selection.end.row 3404 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3405 && selection.mark.col == selection.end.col
3367 && clickchange 3406 && clickchange
… …
3448 selection.end.row++; 3487 selection.end.row++;
3449 } 3488 }
3450 } 3489 }
3451 3490
3452 if (button3 && buttonpress) 3491 if (button3 && buttonpress)
3492 {
3453 { /* mark may need to be changed */ 3493 /* mark may need to be changed */
3454 if (closeto == LEFT) 3494 if (closeto == LEFT)
3455 { 3495 {
3456 selection.mark.row = selection.end.row; 3496 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3497 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3498 }
… …
3657 XFree (ct.value); 3697 XFree (ct.value);
3658 } 3698 }
3659 3699
3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3700 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3661} 3701}
3662
3663/* ------------------------------------------------------------------------- *
3664 * MOUSE ROUTINES *
3665 * ------------------------------------------------------------------------- */
3666
3667/*
3668 * return col/row values corresponding to x/y pixel values
3669 */
3670void
3671rxvt_term::pixel_position (int *x, int *y) NOTHROW
3672{
3673 *x = Pixel2Col (*x);
3674 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3675 *y = Pixel2Row (*y);
3676 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3677}
3678 3702
3679/* ------------------------------------------------------------------------- */ 3703/* ------------------------------------------------------------------------- */
3680#ifdef USE_XIM 3704#ifdef USE_XIM
3681void 3705void
3682rxvt_term::im_set_position (XPoint &pos) NOTHROW 3706rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3709 h += 2; min_it (h, nrow); 3733 h += 2; min_it (h, nrow);
3710 3734
3711 x -= 1; clamp_it (x, 0, ncol - w); 3735 x -= 1; clamp_it (x, 0, ncol - w);
3712 y -= 1; clamp_it (y, 0, nrow - h); 3736 y -= 1; clamp_it (y, 0, nrow - h);
3713 3737
3714 ov_x = x; ov_y = y; 3738 ov.x = x; ov.y = y;
3715 ov_w = w; ov_h = h; 3739 ov.w = w; ov.h = h;
3716 3740
3717 ov_text = new text_t *[h]; 3741 ov.text = new text_t *[h];
3718 ov_rend = new rend_t *[h]; 3742 ov.rend = new rend_t *[h];
3719 3743
3720 for (y = 0; y < h; y++) 3744 for (y = 0; y < h; y++)
3721 { 3745 {
3722 text_t *tp = ov_text[y] = new text_t[w]; 3746 text_t *tp = ov.text[y] = new text_t[w];
3723 rend_t *rp = ov_rend[y] = new rend_t[w]; 3747 rend_t *rp = ov.rend[y] = new rend_t[w];
3724 3748
3725 text_t t0, t1, t2; 3749 text_t t0, t1, t2;
3726 rend_t r = OVERLAY_RSTYLE; 3750 rend_t r = OVERLAY_RSTYLE;
3727 3751
3728 if (y == 0) 3752 if (y == 0)
… …
3747} 3771}
3748 3772
3749void 3773void
3750rxvt_term::scr_overlay_off () NOTHROW 3774rxvt_term::scr_overlay_off () NOTHROW
3751{ 3775{
3752 if (!ov_text) 3776 if (!ov.text)
3753 return; 3777 return;
3754 3778
3755 want_refresh = 1; 3779 want_refresh = 1;
3756 3780
3757 for (int y = 0; y < ov_h; y++) 3781 for (int y = 0; y < ov.h; y++)
3758 { 3782 {
3759 delete [] ov_text[y]; 3783 delete [] ov.text[y];
3760 delete [] ov_rend[y]; 3784 delete [] ov.rend[y];
3761 } 3785 }
3762 3786
3763 delete [] ov_text; ov_text = 0; 3787 delete [] ov.text; ov.text = 0;
3764 delete [] ov_rend; ov_rend = 0; 3788 delete [] ov.rend; ov.rend = 0;
3765} 3789}
3766 3790
3767void 3791void
3768rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3769{ 3793{
3770 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3794 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3771 return; 3795 return;
3772 3796
3773 x++, y++; 3797 x++, y++;
3774 3798
3775 ov_text[y][x] = text; 3799 ov.text[y][x] = text;
3776 ov_rend[y][x] = rend; 3800 ov.rend[y][x] = rend;
3777} 3801}
3778 3802
3779void 3803void
3780rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3781{ 3805{
… …
3800} 3824}
3801 3825
3802void 3826void
3803rxvt_term::scr_swap_overlay () NOTHROW 3827rxvt_term::scr_swap_overlay () NOTHROW
3804{ 3828{
3805 if (!ov_text) 3829 if (!ov.text)
3806 return; 3830 return;
3807 3831
3832 // hide cursor if it is within the overlay area
3833 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3834 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3835 screen.flags &= ~Screen_VisibleCursor;
3836
3808 // swap screen mem with overlay 3837 // swap screen mem with overlay
3809 for (int y = ov_h; y--; ) 3838 for (int y = ov.h; y--; )
3810 { 3839 {
3811 text_t *t1 = ov_text[y]; 3840 text_t *t1 = ov.text[y];
3812 rend_t *r1 = ov_rend[y]; 3841 rend_t *r1 = ov.rend[y];
3813 3842
3814 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3843 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3815 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3844 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3816 3845
3817 for (int x = ov_w; x--; ) 3846 for (int x = ov.w; x--; )
3818 { 3847 {
3819 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3848 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3820 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3821 } 3850 }
3822 } 3851 }

Diff Legend

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