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.269 by ayin, Wed May 2 23:06:32 2007 UTC vs.
Revision 1.372 by sf-exg, Fri Feb 11 01:24:46 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-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.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
36 34
35static inline void
37inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
47 44
48/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 85
89/* 86/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 88 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 90 if (mapped) \
104 XClearArea (dpy, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 94
114/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
117 98
… …
150 131
151 l.l = 0; 132 l.l = 0;
152 l.f = 0; 133 l.f = 0;
153} 134}
154 135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
155/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
158 160
159void 161void
160rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
161{ 163{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 164 view_start = 0;
167 num_scr = 0; 165 num_scr = 0;
168 166
169 if (ncol == 0) 167 if (ncol == 0)
170 ncol = 80; 168 ncol = 80;
… …
172 if (nrow == 0) 170 if (nrow == 0)
173 nrow = 24; 171 nrow = 24;
174 172
175 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 174 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 175
181 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
183 { 178 {
184 //TODO//FIXME 179 //TODO//FIXME
… …
237 selection.text = NULL; 232 selection.text = NULL;
238 selection.len = 0; 233 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
241 selection.clicks = 0; 236 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false; 237 selection.clip_text = NULL;
238 selection.clip_len = 0;
243 } 239 }
244 else 240 else
245 { 241 {
246 /* 242 /*
247 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 273 }
278 274
279 line_t *old_buf = row_buf; 275 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 277
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 279 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 280 int q = total_rows; // rewrapped row
285 281
286 if (top_row) 282 if (top_row)
287 { 283 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
290 287
291 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 290
294 do 291 do
295 { 292 {
296 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 295 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 297
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 { 299 {
… …
330 int qcol = 0; 325 int qcol = 0;
331 326
332 // see below for cursor adjustment rationale 327 // see below for cursor adjustment rationale
333 if (p == ocur.row) 328 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 329 screen.cur.row = q - (total_rows - nrow);
335 330
336 // fill a single destination line 331 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 332 while (lofs < llen && qcol < ncol)
338 { 333 {
339 int prow = lofs / prev_ncol; 334 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 335 int pcol = lofs % prev_ncol;
… …
366 } 361 }
367 while (p != pend && q > 0); 362 while (p != pend && q > 0);
368 363
369 term_start = total_rows - nrow; 364 term_start = total_rows - nrow;
370 top_row = q - term_start; 365 top_row = q - term_start;
371 366
372 // make sure all terminal lines exist 367 // make sure all terminal lines exist
373 while (top_row > 0) 368 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 369 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 370 }
376 else 371 else
377 { 372 {
378 // if no scrollback exists (yet), wing, instead of wrap 373 // if no scrollback exists (yet), wing, instead of wrap
379 374
380 for (int row = min (nrow, prev_nrow); row--; ) 375 for (int row = min (nrow, prev_nrow); row--; )
381 { 376 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 378 line_t &qline = row_buf [row];
384 379
… …
398 delete old_ta; 393 delete old_ta;
399 delete old_ra; 394 delete old_ra;
400 395
401 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
403 399
404 free (tabs); 400 free (tabs);
405 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0;
406 405
407 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
408 407
409 prev_nrow = nrow; 408 prev_nrow = nrow;
410 prev_ncol = ncol; 409 prev_ncol = ncol;
411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419 410
420 tt_winch (); 411 tt_winch ();
421 412
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 414}
… …
435 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
436 427
437 free (row_buf); 428 free (row_buf);
438 free (swap_buf); 429 free (swap_buf);
439 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
440 free (tabs); 433 free (tabs);
441 434 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 435 }
444} 436}
445 437
446/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
447/* 439/*
448 * Hard reset 440 * Hard/Soft reset
449 */ 441 */
450void 442void
451rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
452{ 444{
453 scr_release (); 445 scr_release ();
454 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
455 scr_reset (); 449 scr_reset ();
456 450
457 scr_clear (true); 451 scr_clear (true);
458 scr_refresh (); 452 scr_refresh ();
453}
454
455void
456rxvt_term::scr_soft_reset ()
457{
458 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY
460 scr_overlay_off ();
461#endif
462
463 if (current_screen != PRIMARY)
464 scr_swap_screen ();
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
459} 469}
460 470
461/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
501 } 511 }
502 512
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
509#endif
510} 518}
511 519
512void 520void
513rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
514{ 522{
… …
539 want_refresh = 1; 547 want_refresh = 1;
540 view_start = 0; 548 view_start = 0;
541 549
542 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
543 551
544 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
545 553
546#if NSCREENS 554#if NSCREENS
547 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
548 { 556 {
549 num_scr = 0; 557 num_scr = 0;
… …
598/* 606/*
599 * Change the rendition style for following text 607 * Change the rendition style for following text
600 */ 608 */
601void 609void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 610rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 611{
604 if (set) 612 if (set)
605 rstyle |= style; 613 rstyle |= style;
606 else if (style == ~RS_None) 614 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 615 rstyle = DEFAULT_RSTYLE;
608 else 616 else
609 rstyle &= ~style; 617 rstyle &= ~style;
610 } 618}
611 619
612/* ------------------------------------------------------------------------- */ 620/* ------------------------------------------------------------------------- */
613/* 621/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 622 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 623 * count positive ==> scroll up
… …
666 line_t &l2 = ROW(i); 674 line_t &l2 = ROW(i);
667 675
668 ::swap (l1, l2); 676 ::swap (l1, l2);
669 l2.touch (); 677 l2.touch ();
670 } 678 }
671 679
672 // move and/or clear selection, if any 680 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 681 if (selection.op && current_screen == selection.screen)
674 { 682 {
675 selection.beg.row -= count; 683 selection.beg.row -= count;
676 selection.end.row -= count; 684 selection.end.row -= count;
… …
712 { 720 {
713 /* move selected region too */ 721 /* move selected region too */
714 selection.beg.row -= count; 722 selection.beg.row -= count;
715 selection.end.row -= count; 723 selection.end.row -= count;
716 selection.mark.row -= count; 724 selection.mark.row -= count;
717 725
718 selection_check (0); 726 selection_check (0);
719 } 727 }
720 } 728 }
721 729
722 // use a simple and robust scrolling algorithm, this 730 // use a simple and robust scrolling algorithm, this
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
776 } 784 }
777 } 785 }
778 786
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 790 int row = screen.cur.row;
785 791
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 793
788 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
789 795
790 while (str < strend) 796 while (str < strend)
791 { 797 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 799
794 if (c < 0x20) 800 if (expect_false (c < 0x20))
795 if (c == C0_LF) 801 if (c == C0_LF)
796 { 802 {
797 max_it (line->l, screen.cur.col); 803 max_it (line->l, screen.cur.col);
798 804
799 screen.flags &= ~Screen_WrapNext; 805 screen.flags &= ~Screen_WrapNext;
… …
818 { 824 {
819 scr_tab (1, true); 825 scr_tab (1, true);
820 continue; 826 continue;
821 } 827 }
822 828
829 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 830 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 832 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 ))
826 { 834 {
827 checksel = 0; 835 checksel = 0;
828 /* 836 /*
829 * If we wrote anywhere in the selected area, kill the selection 837 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 838 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 839 * should be a similar check.
832 */ 840 */
833 CLEAR_SELECTION (); 841 CLEAR_SELECTION ();
834 } 842 }
835 843
836 if (screen.flags & Screen_WrapNext) 844 if (expect_false (screen.flags & Screen_WrapNext))
837 { 845 {
838 scr_do_wrap (); 846 scr_do_wrap ();
839 847
840 line->l = ncol; 848 line->l = ncol;
841 line->is_longer (1); 849 line->is_longer (1);
842 850
843 row = screen.cur.row; 851 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 852 line = &ROW(row); /* _must_ refresh */
845 } 853 }
846 854
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 855 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 857 c = 0xfffd;
850 858
851 // rely on wcwidth to tell us the character width, do wcwidth before 859 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 860 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 861 // drawing characters below as they might be invalid in the current
854 // locale. 862 // locale.
855 int width = WCWIDTH (c); 863 int width = WCWIDTH (c);
856 864
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 866 {
859 // vt100 special graphics and line drawing 867 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 868 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 869 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 870 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 883 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 884 width = 1; // vt100 line drawing characters are always single-width
877 } 885 }
878 } 886 }
879 887
880 if (screen.flags & Screen_Insert) 888 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 889 scr_insdel_chars (width, INSERT);
882 890
883 if (width != 0) 891 if (width != 0)
884 { 892 {
885#if !UNICODE_3 893#if !UNICODE_3
… …
890# else 898# else
891 c = 0xfffd; 899 c = 0xfffd;
892# endif 900# endif
893#endif 901#endif
894 902
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904
905 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
907 {
908 if (screen.flags & Screen_Autowrap)
909 {
910 // ... artificially enlargen the previous one
911 c = NOCHAR;
912 // and try the same character next loop iteration
913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
917 }
918
895 // nuke the character at this position, if required 919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
896 if (line->t[screen.cur.col] == NOCHAR 923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
897 || (screen.cur.col < ncol - 1 924 scr_kill_char (*line, screen.cur.col);
898 && line->t[screen.cur.col + 1] == NOCHAR))
899 {
900 int col = screen.cur.col;
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' ';
923 // and try the same character next loop iteration
924 --str;
925 }
926 925
927 line->touch (); 926 line->touch ();
928 927
929 do 928 do
930 { 929 {
931 line->t[screen.cur.col] = c; 930 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 931 line->r[screen.cur.col] = rend;
933 932
934 if (screen.cur.col < ncol - 1) 933 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 934 screen.cur.col++;
936 else 935 else
937 { 936 {
938 line->l = ncol; 937 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
941 break; 940
941 goto end_of_line;
942 } 942 }
943 943
944 c = NOCHAR; 944 c = NOCHAR;
945 } 945 }
946 while (--width > 0); 946 while (expect_false (--width > 0));
947 947
948 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
950 { 950 {
951 line->touch (); 951 line->t[c] = ' ';
952 line->r[c] = rend;
953 }
952 954
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 955end_of_line:
956 ;
957 }
958#if ENABLE_COMBINING
959 else // width == 0
960 {
961 if (c != 0xfeff) // ignore BOM
962 {
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
954 { 972 {
955 line->t[c] = ' ';
956 line->r[c] = rend; 973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
957 } 976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 999 }
959 } 1000 }
960 else // width == 0
961 {
962#if ENABLE_COMBINING
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 1001#endif
1000 }
1001 } 1002 }
1002 1003
1003 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
1004 1005
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
1007#endif
1008} 1007}
1009 1008
1010/* ------------------------------------------------------------------------- */ 1009/* ------------------------------------------------------------------------- */
1011/* 1010/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1011 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1012 * XTERM_SEQ: CTRL-H
1014 */ 1013 */
1015void 1014void
1016rxvt_term::scr_backspace () NOTHROW 1015rxvt_term::scr_backspace () NOTHROW
1017{ 1016{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1017 if (screen.cur.col == 0)
1021 { 1018 {
1022 if (screen.cur.row > 0) 1019 if (screen.cur.row > 0)
1023 { 1020 {
1024#ifdef TERMCAP_HAS_BW 1021#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1022 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1023 --screen.cur.row;
1027 return; 1024
1025 want_refresh = 1;
1028#endif 1026#endif
1029 } 1027 }
1030 } 1028 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1031 else
1032 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1033}
1036 1034
1037/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1038/* 1036/*
1039 * Process Horizontal Tab 1037 * Process Horizontal Tab
… …
1062 x = i; 1060 x = i;
1063 1061
1064 if (!--count) 1062 if (!--count)
1065 break; 1063 break;
1066 } 1064 }
1067 else 1065 else
1068 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1070 1068
1071 if (count) 1069 if (count)
1072 x = ncol - 1; 1070 x = ncol - 1;
… …
1188 } 1186 }
1189 } 1187 }
1190 else 1188 else
1191 { 1189 {
1192 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1193 { /* relative origin mode */ 1192 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1196 } 1195 }
1197 else 1196 else
1198 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1231/* 1230/*
1232 * Erase part or whole of a line 1231 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1236 */
1237void 1237void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1239{
1240 unsigned int col, num; 1240 unsigned int col, num;
… …
1249 line.touch (); 1249 line.touch ();
1250 line.is_longer (0); 1250 line.is_longer (0);
1251 1251
1252 switch (mode) 1252 switch (mode)
1253 { 1253 {
1254 case 3:
1255 if (screen.flags & Screen_WrapNext)
1256 return;
1257
1258 /* fall through */
1259
1254 case 0: /* erase to end of line */ 1260 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1261 col = screen.cur.col;
1256 num = ncol - col; 1262 num = ncol - col;
1257 min_it (line.l, col); 1263 min_it (line.l, col);
1264
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1265 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1266 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1261 break; 1268 break;
1269
1262 case 1: /* erase to beginning of line */ 1270 case 1: /* erase to beginning of line */
1263 col = 0; 1271 col = 0;
1264 num = screen.cur.col + 1; 1272 num = screen.cur.col + 1;
1273
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1274 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1275 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1276 CLEAR_SELECTION ();
1268 break; 1277 break;
1278
1269 case 2: /* erase whole line */ 1279 case 2: /* erase whole line */
1270 col = 0; 1280 col = 0;
1271 num = ncol; 1281 num = ncol;
1272 line.l = 0; 1282 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1283 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1332 return; 1342 return;
1333 1343
1334 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1335 1345
1336 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1349 {
1340 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1351
1352 if (mapped)
1353 XClearArea (dpy, vt, 0,
1354 Row2Pixel (row - view_start), (unsigned int)width,
1355 (unsigned int)Height2Pixel (num), False);
1342 } 1356 }
1343 else 1357 else
1344 { 1358 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1360
1361 if (mapped)
1362 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1365 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start),
1367 (unsigned int)width,
1368 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 }
1351 } 1372 }
1352 1373
1353 for (; num--; row++) 1374 for (; num--; row++)
1354 { 1375 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1377
1378 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1380 }
1358} 1381}
1359 1382
1360#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1361void 1384void
… …
1435 * Insert/Delete <count> characters from the current position 1458 * Insert/Delete <count> characters from the current position
1436 */ 1459 */
1437void 1460void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1461rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1462{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1463 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1464 ZERO_SCROLLBACK ();
1445 1465
1446 if (count <= 0) 1466 if (count <= 0)
1447 return; 1467 return;
… …
1449 scr_do_wrap (); 1469 scr_do_wrap ();
1450 1470
1451 selection_check (1); 1471 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1472 min_it (count, ncol - screen.cur.col);
1453 1473
1454 row = screen.cur.row; 1474 int row = screen.cur.row;
1455 1475
1456 line_t *line = &ROW(row); 1476 line_t *line = &ROW(row);
1457 1477
1458 line->touch (); 1478 line->touch ();
1459 line->is_longer (0); 1479 line->is_longer (0);
1460 1480
1481 // nuke wide spanning the start
1482 if (line->t[screen.cur.col] == NOCHAR)
1483 scr_kill_char (*line, screen.cur.col);
1484
1461 switch (insdel) 1485 switch (insdel)
1462 { 1486 {
1463 case INSERT: 1487 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1488 line->l = min (line->l + count, ncol);
1489
1490 if (line->t[screen.cur.col] == NOCHAR)
1491 scr_kill_char (*line, screen.cur.col);
1492
1493 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1494 {
1466 line->t[col] = line->t[col - count]; 1495 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1496 line->r[col] = line->r[col - count];
1468 } 1497 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1498
1472 if (selection.op && current_screen == selection.screen 1499 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1500 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1501 {
1475 if (selection.end.row != screen.cur.row 1502 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1503 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1504 CLEAR_SELECTION ();
1478 else 1505 else
1506 {
1479 { /* shift selection */ 1507 /* shift selection */
1480 selection.beg.col += count; 1508 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1509 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1510 selection.end.col += count;
1483 } 1511 }
1484 } 1512 }
… …
1489 case ERASE: 1517 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1518 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1519 selection_check (1);
1492 screen.cur.col -= count; 1520 screen.cur.col -= count;
1493 1521
1494 line->l = max (line->l - count, 0); 1522 // nuke wide char after the end
1523 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1524 scr_kill_char (*line, screen.cur.col + count);
1525
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1526 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1527 break;
1497 1528
1498 case DELETE: 1529 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1530 line->l = max (line->l - count, 0);
1500 1531
1532 // nuke wide char spanning the end
1533 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1534 scr_kill_char (*line, screen.cur.col + count);
1535
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1536 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1537 {
1503 line->t[col] = line->t[col + count]; 1538 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1539 line->r[col] = line->r[col + count];
1505 } 1540 }
1506 1541
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1543
1510 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1546 {
1513 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
… …
1623 */ 1657 */
1624void 1658void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1659rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1660{
1627 if (mode < 0) 1661 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1662 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1663 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1664 tabs [screen.cur.col] = !!mode;
1631} 1665}
1632 1666
1633/* ------------------------------------------------------------------------- */ 1667/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1682 if (rvideo_state != on)
1649 { 1683 {
1650 rvideo_state = on; 1684 rvideo_state = on;
1651 1685
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1687#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1689#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1691
1661 XGCValues gcvalue; 1692 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1871 return true; 1902 return true;
1872} 1903}
1873 1904
1874#ifndef NO_BELL 1905#ifndef NO_BELL
1875void 1906void
1876rxvt_term::bell_cb (time_watcher &w) 1907rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1908{
1878 rvideo_bell = false; 1909 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1910 scr_rvideo_mode (rvideo_mode);
1911 refresh_check ();
1880} 1912}
1881#endif 1913#endif
1882 1914
1883/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1884void 1916void
… …
1890# ifdef MAPALERT_OPTION 1922# ifdef MAPALERT_OPTION
1891 if (option (Opt_mapAlert)) 1923 if (option (Opt_mapAlert))
1892# endif 1924# endif
1893 XMapWindow (dpy, parent[0]); 1925 XMapWindow (dpy, parent[0]);
1894# endif 1926# endif
1927
1895# if ENABLE_FRILLS 1928# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1929 if (option (Opt_urgentOnBell))
1897 { 1930 set_urgency (1);
1898 XWMHints *h;
1899
1900 h = XGetWMHints(dpy, parent[0]);
1901 if (h != NULL)
1902 {
1903 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h);
1905 }
1906 }
1907# endif 1931# endif
1908 1932
1909 if (option (Opt_visualBell)) 1933 if (option (Opt_visualBell))
1910 { 1934 {
1911 rvideo_bell = true; 1935 rvideo_bell = true;
1912 scr_rvideo_mode (rvideo_mode); 1936 scr_rvideo_mode (rvideo_mode);
1913 display->flush (); 1937 flush ();
1914 1938
1915 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1916 } 1940 }
1917 else 1941 else
1918 XBell (dpy, 0); 1942 XBell (dpy, 0);
1919 1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1920#endif 1944#endif
1921} 1945}
1922 1946
1923/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1924/* ARGSUSED */ 1948/* ARGSUSED */
1925void 1949void
1926rxvt_term::scr_printscreen (int fullhist) NOTHROW 1950rxvt_term::scr_printscreen (int fullhist) NOTHROW
1927{ 1951{
1928#ifdef PRINTPIPE 1952#ifdef PRINTPIPE
1929 int nrows, row_start; 1953 int nrows, row_start;
1930 FILE *fd; 1954 FILE *fd = popen_printer ();
1931 1955
1932 if ((fd = popen_printer ()) == NULL) 1956 if (!fd)
1933 return; 1957 return;
1934 1958
1935 if (fullhist) 1959 if (fullhist)
1936 { 1960 {
1937 nrows = nrow - top_row; 1961 nrows = nrow - top_row;
… …
1943 row_start = view_start; 1967 row_start = view_start;
1944 } 1968 }
1945 1969
1946 wctomb (0, 0); 1970 wctomb (0, 0);
1947 1971
1948 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1949 { 1973 {
1950 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1951 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1952 1976
1953 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1977 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1982 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
1983 */ 2007 */
1984void 2008void
1985rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
1986{ 2010{
1987 unsigned char have_bg,
1988 showcursor; /* show the cursor */
1989 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
1990 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
1991 int i; /* tmp */ 2013 int i; /* tmp */
1992#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
1993 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2002 return; 2024 return;
2003 2025
2004 /* 2026 /*
2005 * A: set up vars 2027 * A: set up vars
2006 */ 2028 */
2007 have_bg = 0;
2008 refresh_count = 0; 2029 refresh_count = 0;
2009 2030
2010#if XPM_BACKGROUND 2031 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP
2011 have_bg |= bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2012#endif
2013#if TRANSPARENT
2014 have_bg |= option (Opt_transparent) && am_transparent;
2015#endif 2035#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2037
2018 /* 2038 /*
2019 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2020 */ 2040 */
2021 scr_reverse_selection (); 2041 scr_reverse_selection ();
2042
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY
2045 scr_swap_overlay ();
2046#endif
2047
2048 char showcursor = screen.flags & Screen_VisibleCursor;
2022 2049
2023 /* 2050 /*
2024 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2025 */ 2052 */
2026 { 2053 {
2027 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2028 2055
2029 showcursor = (screen.flags & Screen_VisibleCursor);
2030#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2031 if (hidden_cursor) 2057 if (hidden_cursor)
2032 showcursor = 0; 2058 showcursor = 0;
2033#endif 2059#endif
2034 2060
… …
2062 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2063#else 2089#else
2064 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2065#endif 2091#endif
2066 2092
2067 if (showcursor && focus) 2093 if (focus)
2068 { 2094 {
2069 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2070 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2071 else 2097 else
2072 { 2098 {
… …
2107 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2108 } 2134 }
2109 } 2135 }
2110 } 2136 }
2111 2137
2112 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2113#if ENABLE_OVERLAY
2114 scr_swap_overlay ();
2115#endif
2116
2117#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2118 /* 2139 /*
2119 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2120 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2121 */ 2142 */
… …
2210 continue; 2231 continue;
2211 2232
2212 // redraw one or more characters 2233 // redraw one or more characters
2213 2234
2214 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2216 --col; 2237 --col;
2217 2238
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2219 text_t *text = stp + col; 2240 text_t *text = stp + col;
2220 int count = 1; 2241 int count = 1;
2221 2242
2222 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2223 drp[col] = rend; 2244 drp[col] = rend;
… …
2227 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2228 { 2249 {
2229 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2230 { 2251 {
2231 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2232 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2233 count++; 2255 count++;
2234 i++; 2256 i++;
2235 2257
2236 continue; 2258 continue;
2237 } 2259 }
… …
2257 2279
2258 col--; /* went one too far. move back */ 2280 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2281 count -= i; /* dump any matching trailing chars */
2260 2282
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2283 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2284 while (expect_false (i && text[count] == NOCHAR))
2263 count++, i--; 2285 count++, i--;
2264 2286
2265 /* 2287 /*
2266 * Determine the attributes for the string 2288 * Determine the attributes for the string
2267 */ 2289 */
2268 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2270 2292
2271 // only do special processing if any attributes are set, which is unlikely 2293 // only do special processing if any attributes are set, which is unlikely
2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2273 { 2295 {
2274 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2275 2297
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold
2278 && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
2279 { 2300 {
2280 if (ISSET_PIXCOLOR (Color_BD)) 2301 if (ISSET_PIXCOLOR (Color_BD))
2281 fore = Color_BD; 2302 fore = Color_BD;
2282# if !ENABLE_STYLES 2303# if !ENABLE_STYLES
2283 else 2304 else
2284 invert = !invert; 2305 invert = !invert;
2285# endif 2306# endif
2286 } 2307 }
2287 2308
2288 if (rend & RS_Italic 2309 if (rend & RS_Italic && fore == Color_fg)
2289 && fore == Color_fg)
2290 { 2310 {
2291 if (ISSET_PIXCOLOR (Color_IT)) 2311 if (ISSET_PIXCOLOR (Color_IT))
2292 fore = Color_IT; 2312 fore = Color_IT;
2293# if !ENABLE_STYLES 2313# if !ENABLE_STYLES
2294 else 2314 else
… …
2298 2318
2299 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2300 fore = Color_UL; 2320 fore = Color_UL;
2301#endif 2321#endif
2302 2322
2323#ifdef OPTION_HC
2324 if (rend & RS_Sel)
2325 {
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 && ISSET_PIXCOLOR (Color_HC))
2330 {
2331 if (ISSET_PIXCOLOR (Color_HTC))
2332 fore = Color_HTC;
2333 // if invert is 0 reverse video is set so we use bg color as fg color
2334 else if (!invert)
2335 fore = back;
2336
2337 back = Color_HC;
2338 invert = 0;
2339 }
2340 }
2341#endif
2342
2303 if (invert) 2343 if (invert)
2304 { 2344 {
2305#ifdef OPTION_HC
2306 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2307 || !ISSET_PIXCOLOR (Color_HC))
2308#endif
2309 /* invert the column if no highlightColor is set or it is the
2310 * current cursor column */
2311 ::swap (fore, back); 2345 ::swap (fore, back);
2312#ifdef OPTION_HC
2313 else if (ISSET_PIXCOLOR (Color_HC))
2314 back = Color_HC;
2315#endif
2316 2346
2317#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2318# ifndef OPTION_HC
2319 if (ISSET_PIXCOLOR (Color_RV))
2320 back = Color_RV;
2321# endif
2322 if (fore == back) 2348 if (fore == back)
2323 { 2349 {
2324 fore = Color_bg; 2350 fore = Color_bg;
2325 back = Color_fg; 2351 back = Color_fg;
2326 } 2352 }
… …
2328 } 2354 }
2329 2355
2330#ifdef TEXT_BLINK 2356#ifdef TEXT_BLINK
2331 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2357 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2332 { 2358 {
2333 if (!text_blink_ev.active) 2359 if (!text_blink_ev.is_active ())
2334 { 2360 {
2335 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2361 text_blink_ev.again ();
2336 hidden_text = 0; 2362 hidden_text = 0;
2337 } 2363 }
2338 else if (hidden_text) 2364 else if (hidden_text)
2339 fore = back; 2365 fore = back;
2340 } 2366 }
… …
2362 /* 2388 /*
2363 * Actually do the drawing of the string here 2389 * Actually do the drawing of the string here
2364 */ 2390 */
2365 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2366 2392
2367 if (have_bg && back == Color_bg) 2393 if (expect_true (have_bg && back == Color_bg))
2368 { 2394 {
2369 // this is very ugly, maybe push it into ->draw? 2395 // this is very ugly, maybe push it into ->draw?
2370 2396
2371 for (i = 0; i < count; i++) /* don't draw empty strings */ 2397 for (i = 0; i < count; i++) /* don't draw empty strings */
2372 if (text[i] != ' ') 2398 if (text[i] != ' ')
… …
2379 did_clear: ; 2405 did_clear: ;
2380 } 2406 }
2381 else 2407 else
2382 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2383 2409
2384 if (rend & RS_Uline && font->descent > 1 && fore != back) 2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2385 { 2411 {
2386#if ENABLE_FRILLS 2412#if ENABLE_FRILLS
2387 if (ISSET_PIXCOLOR (Color_underline)) 2413 if (ISSET_PIXCOLOR (Color_underline))
2388 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2414 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2389 else 2415 else
2390#endif 2416#endif
2391 XSetForeground (dpy, gc, pix_colors[fore]); 2417 XSetForeground (dpy, gc, pix_colors[fore]);
2392 2418
2393 XDrawLine (dpy, drawBuffer, gc, 2419 XDrawLine (dpy, vt, gc,
2394 xpixel, ypixel + font->ascent + 1, 2420 xpixel, ypixel + font->ascent + 1,
2395 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2396 } 2422 }
2397 } /* for (col....) */ 2423 } /* for (col....) */
2398 } /* for (row....) */ 2424 } /* for (row....) */
2399
2400#if ENABLE_OVERLAY
2401 scr_swap_overlay ();
2402#endif
2403 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2404 2425
2405 /* 2426 /*
2406 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2407 */ 2428 */
2408 if (showcursor) 2429 if (showcursor)
… …
2436 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2457 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2437 else 2458 else
2438#endif 2459#endif
2439 XSetForeground (dpy, gc, pix_colors[ccol1]); 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2440 2461
2441 XDrawRectangle (dpy, drawBuffer, gc, 2462 XDrawRectangle (dpy, vt, gc,
2442 Col2Pixel (col), 2463 Col2Pixel (col),
2443 Row2Pixel (oldcursor.row), 2464 Row2Pixel (oldcursor.row),
2444 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2465 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2445 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2446 } 2467 }
2447 } 2468 }
2448 2469
2449 /* 2470 /*
2450 * H: cleanup selection 2471 * H: cleanup selection
2451 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2452 scr_reverse_selection (); 2478 scr_reverse_selection ();
2453 2479
2480 screen.flags = old_screen_flags;
2454 num_scr = 0; 2481 num_scr = 0;
2455 num_scr_allow = 1; 2482 num_scr_allow = 1;
2456} 2483}
2457 2484
2458void 2485void
… …
2479 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2480 } 2507 }
2481} 2508}
2482 2509
2483void 2510void
2484rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2485{ 2512{
2486 if (1 2513 bool transparent = false;
2487#if TRANSPARENT 2514
2488 && !am_transparent 2515#ifdef HAVE_BG_PIXMAP
2516 if (bg_pixmap != None)
2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523
2524 transparent = true;
2525 }
2526 else
2489#endif 2527# endif
2490#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap
2492#endif
2493 ) 2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2494 { 2535 {
2495 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2496 XClearWindow (dpy, parent[0]);
2497 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2538 }
2539
2540 XClearWindow (dpy, parent[0]);
2541
2499 if (scrollBar.win) 2542 if (scrollBar.win)
2500 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2501 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2548 scrollBar.state = STATE_IDLE;
2503 scrollbar_show (0); 2549 scrollBar.show (0);
2504 } 2550 }
2505#endif 2551
2552 if (refresh)
2506 } 2553 {
2507
2508 scr_clear (); 2554 scr_clear ();
2509 scr_touch (true); 2555 scr_touch (true);
2556 }
2510 want_refresh = 1; 2557 want_refresh = 1;
2511} 2558}
2512 2559
2513/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2514void 2561void
… …
2582 { 2629 {
2583#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2584 if (selection.rect) 2631 if (selection.rect)
2585 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2586 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2587 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2588 else 2635 else
2589#endif 2636#endif
2590 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2591 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2592 RS_RVid); 2639 RS_Sel | RS_RVid);
2593 } 2640 }
2594} 2641}
2595 2642
2596/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2597/* 2644/*
… …
2602void 2649void
2603rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2604{ 2651{
2605 int row, wrote; 2652 int row, wrote;
2606 unsigned int width, towrite; 2653 unsigned int width, towrite;
2607 char r1[] = "\n"; 2654 const char r1[] = "\n";
2608 2655
2609 for (row = saveLines - nsaved; 2656 for (row = saveLines + top_row;
2610 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2611 { 2658 {
2612 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
2613 : ncol; 2660 : ncol;
2614 for (towrite = width; towrite; towrite -= wrote) 2661 for (towrite = width; towrite; towrite -= wrote)
… …
2658/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2659/* 2706/*
2660 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2661 */ 2708 */
2662void 2709void
2663rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2664{ 2711{
2665 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2666 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2667 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2668 data[i] = C0_CR; 2715 data[i] = C0_CR;
2669 2716
2717 if (priv_modes & PrivMode_BracketPaste)
2718 tt_printf ("\e[200~");
2719
2670 tt_write (data, len); 2720 tt_write (data, len);
2671}
2672 2721
2673/* ------------------------------------------------------------------------- */ 2722 if (priv_modes & PrivMode_BracketPaste)
2674/* 2723 tt_printf ("\e[201~");
2675 * Respond to a notification that a primary selection has been sent
2676 * EXT: SelectionNotify
2677 */
2678void
2679rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2680{
2681 if (prop == None) /* check for failed XConvertSelection */
2682 {
2683 if ((selection_type & Sel_CompoundText))
2684 {
2685 int selnum = selection_type & Sel_whereMask;
2686
2687 selection_type = 0;
2688 if (selnum != Sel_direct)
2689 selection_request_other (XA_STRING, selnum);
2690 }
2691
2692 if ((selection_type & Sel_UTF8String))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = Sel_CompoundText;
2697 if (selnum != Sel_direct)
2698 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2699 else
2700 selection_type = 0;
2701 }
2702
2703 return;
2704 }
2705
2706 unsigned long bytes_after;
2707 XTextProperty ct;
2708
2709 if (XGetWindowProperty (dpy, win, prop,
2710 0, PROP_SIZE / 4,
2711 delete_prop, AnyPropertyType,
2712 &ct.encoding, &ct.format,
2713 &ct.nitems, &bytes_after,
2714 &ct.value) != Success)
2715 {
2716 ct.value = 0;
2717 goto bailout;
2718 }
2719
2720 if (ct.encoding == None)
2721 goto bailout;
2722
2723 if (bytes_after)
2724 {
2725 // fetch and append remaining data
2726 XTextProperty ct2;
2727
2728 if (XGetWindowProperty (dpy, win, prop,
2729 ct.nitems / 4, (bytes_after + 3) / 4,
2730 delete_prop, AnyPropertyType,
2731 &ct2.encoding, &ct2.format,
2732 &ct2.nitems, &bytes_after,
2733 &ct2.value) != Success)
2734 goto bailout;
2735
2736 // realloc should be compatible to XFree, here, and elsewhere, too
2737 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2738 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2739 ct.nitems += ct2.nitems;
2740
2741 XFree (ct2.value);
2742 }
2743
2744 if (ct.value == 0)
2745 goto bailout;
2746
2747 if (ct.encoding == xa[XA_INCR])
2748 {
2749 // INCR selection, start handshake
2750 if (!delete_prop)
2751 XDeleteProperty (dpy, win, prop);
2752
2753 selection_wait = Sel_incr;
2754 incr_buf_fill = 0;
2755 incr_ev.start (NOW + 10);
2756
2757 goto bailout;
2758 }
2759
2760 if (ct.nitems == 0)
2761 {
2762 if (selection_wait == Sel_incr)
2763 {
2764 XFree (ct.value);
2765
2766 // finally complete, now paste the whole thing
2767 selection_wait = Sel_normal;
2768 ct.value = (unsigned char *)incr_buf;
2769 ct.nitems = incr_buf_fill;
2770 incr_buf = 0;
2771 incr_buf_size = 0;
2772 incr_ev.stop ();
2773 }
2774 else
2775 {
2776 if (selection_wait == Sel_normal
2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2778 {
2779 /*
2780 * pass through again trying CUT_BUFFER0 if we've come from
2781 * XConvertSelection () but nothing was presented
2782 */
2783 selection_paste (display->root, XA_CUT_BUFFER0, False);
2784 }
2785
2786 goto bailout;
2787 }
2788 }
2789 else if (selection_wait == Sel_incr)
2790 {
2791 incr_ev.start (NOW + 10);
2792
2793 while (incr_buf_fill + ct.nitems > incr_buf_size)
2794 {
2795 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2797 }
2798
2799 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2800 incr_buf_fill += ct.nitems;
2801
2802 goto bailout;
2803 }
2804
2805 char **cl;
2806 int cr;
2807
2808#if !ENABLE_MINIMAL
2809 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2810 // so recode it manually
2811 if (ct.encoding == xa[XA_UTF8_STRING])
2812 {
2813 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2814 char *s = rxvt_wcstombs (w);
2815 free (w);
2816 // TODO: strlen == only the first element will be converted. well...
2817 paste (s, strlen (s));
2818 free (s);
2819 }
2820 else
2821#endif
2822 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2823 && cl)
2824 {
2825 for (int i = 0; i < cr; i++)
2826 paste (cl[i], strlen (cl[i]));
2827
2828 XFreeStringList (cl);
2829 }
2830 else
2831 paste ((char *)ct.value, ct.nitems); // paste raw
2832
2833bailout:
2834 XFree (ct.value);
2835
2836 if (selection_wait == Sel_normal)
2837 selection_wait = Sel_none;
2838} 2724}
2839 2725
2840void 2726void
2841rxvt_term::incr_cb (time_watcher &w) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2842{ 2728{
2843 selection_wait = Sel_none; 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2844
2845 incr_buf_size = 0;
2846 free (incr_buf);
2847
2848 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2849}
2850
2851void
2852rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2853{
2854 if (prop == None || selection_wait != Sel_incr)
2855 return; 2730 return;
2856 2731
2857 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2858} 2733}
2859 2734
2860/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2861/* 2736/*
2862 * Request the current selection: 2737 * Request the current selection:
2863 * Order: > internal selection if available 2738 * Order: > internal selection if available
2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2865 * > CUT_BUFFER0 2740 * > CUT_BUFFER0
2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2867 * will auto fallback to CUT_BUFFER0 2742 * will auto fallback to CUT_BUFFER0
2868 * EXT: button 2 release 2743 * EXT: button 2 release
2869 */ 2744 */
2745
2746static void
2747selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr)
2748{
2749 if (data)
2750 {
2751 rxvt_term *term = (rxvt_term *)ptr;
2752 term->paste (data, len);
2753 }
2754 delete rs;
2755}
2756
2870void 2757void
2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2758rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2872{ 2759{
2873 if (selection.text && selnum == Sel_Primary) 2760 if (selection.text && selnum == Sel_Primary)
2761 {
2874 { /* internal selection */ 2762 /* internal selection */
2875 char *str = rxvt_wcstombs (selection.text, selection.len); 2763 char *str = rxvt_wcstombs (selection.text, selection.len);
2876 paste (str, strlen (str)); 2764 paste (str, strlen (str));
2877 free (str); 2765 free (str);
2878 return; 2766 return;
2879 } 2767 }
2880 else 2768 else
2881 { 2769 {
2882 selection_request_time = tm; 2770 new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this);
2883 selection_wait = Sel_normal;
2884
2885#if X_HAVE_UTF8_STRING
2886 selection_type = Sel_UTF8String;
2887 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2888 return;
2889#else
2890 selection_type = Sel_CompoundText;
2891 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2892 return;
2893#endif
2894 }
2895
2896 selection_wait = Sel_none; /* don't loop in selection_paste () */
2897 selection_paste (display->root, XA_CUT_BUFFER0, false);
2898}
2899
2900int
2901rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2902{
2903 Atom sel;
2904
2905 selection_type |= selnum;
2906
2907 if (selnum == Sel_Primary)
2908 sel = XA_PRIMARY;
2909 else if (selnum == Sel_Secondary)
2910 sel = XA_SECONDARY;
2911 else
2912 sel = xa[XA_CLIPBOARD];
2913
2914 if (XGetSelectionOwner (dpy, sel) != None)
2915 { 2771 }
2916 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2917 vt, selection_request_time);
2918 return 1;
2919 }
2920
2921 return 0;
2922} 2772}
2923 2773
2924/* ------------------------------------------------------------------------- */ 2774/* ------------------------------------------------------------------------- */
2925/* 2775/*
2926 * Clear all selected text 2776 * Clear all selected text
2927 * EXT: SelectionClear 2777 * EXT: SelectionClear
2928 */ 2778 */
2929void 2779void
2930rxvt_term::selection_clear () NOTHROW 2780rxvt_term::selection_clear (bool clipboard) NOTHROW
2931{ 2781{
2782 if (!clipboard)
2783 {
2932 want_refresh = 1; 2784 want_refresh = 1;
2933 free (selection.text); 2785 free (selection.text);
2934 selection.text = NULL; 2786 selection.text = NULL;
2935 selection.len = 0; 2787 selection.len = 0;
2936 CLEAR_SELECTION (); 2788 CLEAR_SELECTION ();
2937 2789
2938 if (display->selection_owner == this) 2790 if (display->selection_owner == this)
2939 display->selection_owner = 0; 2791 display->selection_owner = 0;
2792 }
2793 else
2794 {
2795 free (selection.clip_text);
2796 selection.clip_text = NULL;
2797 selection.clip_len = 0;
2798
2799 if (display->clipboard_owner == this)
2800 display->clipboard_owner = 0;
2801 }
2940} 2802}
2941 2803
2942/* ------------------------------------------------------------------------- */ 2804/* ------------------------------------------------------------------------- */
2943/* 2805/*
2944 * Copy a selection into the cut buffer 2806 * Copy a selection into the cut buffer
2945 * EXT: button 1 or 3 release 2807 * EXT: button 1 or 3 release
2946 */ 2808 */
2947void 2809void
2948rxvt_term::selection_make (Time tm) 2810rxvt_term::selection_make (Time tm)
2949{ 2811{
2950 int i; 2812 int size;
2951 wchar_t *new_selection_text; 2813 wchar_t *new_selection_text;
2952 text_t *t; 2814 text_t *t;
2953 2815
2954 switch (selection.op) 2816 switch (selection.op)
2955 { 2817 {
… …
2971 return; /* nothing selected, go away */ 2833 return; /* nothing selected, go away */
2972 2834
2973 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2835 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2974 return; 2836 return;
2975 2837
2976 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2838 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2977 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2839 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2978 2840
2979 int ofs = 0; 2841 int ofs = 0;
2980 int extra = 0; 2842 int extra = 0;
2981 2843
2982 int col = selection.beg.col; 2844 int col = selection.beg.col;
… …
2988 { 2850 {
2989#if !ENABLE_MINIMAL 2851#if !ENABLE_MINIMAL
2990 if (selection.rect) 2852 if (selection.rect)
2991 { 2853 {
2992 col = selection.beg.col; 2854 col = selection.beg.col;
2993 end_col = ncol + 1; 2855 end_col = selection.end.col;
2994 } 2856 }
2995 else 2857 else
2996#endif 2858#endif
2997 end_col = ROW(row).l; 2859 end_col = ROW(row).l;
2998 2860
2999 col = max (col, 0); 2861 col = max (col, 0);
3000 2862
3001 if (row == selection.end.row 2863 if (row == selection.end.row)
3002#if !ENABLE_MINIMAL
3003 || selection.rect
3004#endif
3005 )
3006 min_it (end_col, selection.end.col); 2864 min_it (end_col, selection.end.col);
3007 2865
3008 t = ROW(row).t + col; 2866 t = ROW(row).t + col;
3009 2867
3010 for (; col < end_col; col++) 2868 for (; col < end_col; col++)
… …
3018 2876
3019 extra -= (len - 1); 2877 extra -= (len - 1);
3020 2878
3021 if (extra < 0) 2879 if (extra < 0)
3022 { 2880 {
3023 extra += i; 2881 extra += size;
3024 i += i; 2882 size += size;
3025 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2883 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3026 } 2884 }
3027 2885
3028 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2886 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3029 } 2887 }
3030#endif 2888#endif
… …
3042 2900
3043 new_selection_text[ofs++] = C0_LF; 2901 new_selection_text[ofs++] = C0_LF;
3044 } 2902 }
3045 else 2903 else
3046#endif 2904#endif
3047 if (!ROW(row).is_longer () && row != selection.end.row) 2905 if (!ROW(row).is_longer ()
2906 && (row != selection.end.row || end_col != selection.end.col)
2907 && (row != selection.beg.row || selection.beg.col < ncol))
3048 new_selection_text[ofs++] = C0_LF; 2908 new_selection_text[ofs++] = C0_LF;
3049 } 2909 }
3050
3051 if (end_col != selection.end.col)
3052 new_selection_text[ofs++] = C0_LF;
3053 2910
3054 new_selection_text[ofs] = 0; 2911 new_selection_text[ofs] = 0;
3055 2912
3056 if (ofs == 0) 2913 if (ofs == 0)
3057 { 2914 {
… …
3070 2927
3071 selection_grab (tm); 2928 selection_grab (tm);
3072} 2929}
3073 2930
3074bool 2931bool
3075rxvt_term::selection_grab (Time tm) NOTHROW 2932rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3076{ 2933{
2934 Atom sel;
2935
2936 if (!clipboard)
2937 {
3077 selection_time = tm; 2938 selection_time = tm;
2939 sel = XA_PRIMARY;
2940 }
2941 else
2942 {
2943 clipboard_time = tm;
2944 sel = xa[XA_CLIPBOARD];
2945 }
3078 2946
3079 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2947 XSetSelectionOwner (dpy, sel, vt, tm);
3080 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2948 if (XGetSelectionOwner (dpy, sel) == vt)
3081 { 2949 {
3082 display->set_selection_owner (this); 2950 display->set_selection_owner (this, clipboard);
3083 return true; 2951 return true;
3084 } 2952 }
3085 else 2953 else
3086 { 2954 {
3087 selection_clear (); 2955 selection_clear (clipboard);
3088 return false; 2956 return false;
3089 } 2957 }
3090 2958
3091#if 0 2959#if 0
3092 XTextProperty ct; 2960 XTextProperty ct;
… …
3145 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3013 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3146 3014
3147 while (selection.mark.col > 0 3015 while (selection.mark.col > 0
3148 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3016 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3149 --selection.mark.col; 3017 --selection.mark.col;
3150 3018
3151 if (selection.op) 3019 if (selection.op)
3020 {
3152 { /* clear the old selection */ 3021 /* clear the old selection */
3153 selection.beg.row = selection.end.row = selection.mark.row; 3022 selection.beg.row = selection.end.row = selection.mark.row;
3154 selection.beg.col = selection.end.col = selection.mark.col; 3023 selection.beg.col = selection.end.col = selection.mark.col;
3155 } 3024 }
3156 3025
3157 selection.op = SELECTION_INIT; 3026 selection.op = SELECTION_INIT;
… …
3346 * a point/word/line which is either the start or end of the selection 3215 * a point/word/line which is either the start or end of the selection
3347 * and it was decided by whichever point/word/line was `fixed' at the 3216 * and it was decided by whichever point/word/line was `fixed' at the
3348 * time of the most recent button3 press 3217 * time of the most recent button3 press
3349 */ 3218 */
3350 if (button3 && buttonpress) 3219 if (button3 && buttonpress)
3220 {
3351 { /* button3 press */ 3221 /* button3 press */
3352 /* 3222 /*
3353 * first determine which edge of the selection we are closest to 3223 * first determine which edge of the selection we are closest to
3354 */ 3224 */
3355 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3225 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3356 || (!ROWCOL_IS_AFTER (pos, selection.end) 3226 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3374 selection.mark.row = selection.beg.row; 3244 selection.mark.row = selection.beg.row;
3375 selection.mark.col = selection.beg.col; 3245 selection.mark.col = selection.beg.col;
3376 } 3246 }
3377 } 3247 }
3378 else 3248 else
3249 {
3379 { /* button1 drag or button3 drag */ 3250 /* button1 drag or button3 drag */
3380 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3251 if (ROWCOL_IS_AFTER (selection.mark, pos))
3381 { 3252 {
3382 if (selection.mark.row == selection.end.row 3253 if (selection.mark.row == selection.end.row
3383 && selection.mark.col == selection.end.col 3254 && selection.mark.col == selection.end.col
3384 && clickchange 3255 && clickchange
… …
3465 selection.end.row++; 3336 selection.end.row++;
3466 } 3337 }
3467 } 3338 }
3468 3339
3469 if (button3 && buttonpress) 3340 if (button3 && buttonpress)
3341 {
3470 { /* mark may need to be changed */ 3342 /* mark may need to be changed */
3471 if (closeto == LEFT) 3343 if (closeto == LEFT)
3472 { 3344 {
3473 selection.mark.row = selection.end.row; 3345 selection.mark.row = selection.end.row;
3474 selection.mark.col = selection.end.col - (selection.clicks == 2); 3346 selection.mark.col = selection.end.col - (selection.clicks == 2);
3475 } 3347 }
… …
3583 else if (rq.target == xa[XA_MULTIPLE]) 3455 else if (rq.target == xa[XA_MULTIPLE])
3584 { 3456 {
3585 /* TODO: Handle MULTIPLE */ 3457 /* TODO: Handle MULTIPLE */
3586 } 3458 }
3587#endif 3459#endif
3588 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3460 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3589 { 3461 {
3590 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3462 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3591 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3463 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3464 ev.property = rq.property;
3465 }
3466 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3467 {
3468 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3469 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3592 ev.property = rq.property; 3470 ev.property = rq.property;
3593 } 3471 }
3594 else if (rq.target == XA_STRING 3472 else if (rq.target == XA_STRING
3595 || rq.target == xa[XA_TEXT] 3473 || rq.target == xa[XA_TEXT]
3596 || rq.target == xa[XA_COMPOUND_TEXT] 3474 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3629 { 3507 {
3630 target = xa[XA_COMPOUND_TEXT]; 3508 target = xa[XA_COMPOUND_TEXT];
3631 style = enc_compound_text; 3509 style = enc_compound_text;
3632 } 3510 }
3633 3511
3634 if (selection.text) 3512 if (rq.selection == XA_PRIMARY && selection.text)
3635 { 3513 {
3636 cl = selection.text; 3514 cl = selection.text;
3637 selectlen = selection.len; 3515 selectlen = selection.len;
3516 }
3517 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3518 {
3519 cl = selection.clip_text;
3520 selectlen = selection.clip_len;
3638 } 3521 }
3639 else 3522 else
3640 { 3523 {
3641 cl = L""; 3524 cl = L"";
3642 selectlen = 0; 3525 selectlen = 0;
… …
3674 XFree (ct.value); 3557 XFree (ct.value);
3675 } 3558 }
3676 3559
3677 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3560 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3678} 3561}
3679
3680/* ------------------------------------------------------------------------- *
3681 * MOUSE ROUTINES *
3682 * ------------------------------------------------------------------------- */
3683
3684/*
3685 * return col/row values corresponding to x/y pixel values
3686 */
3687void
3688rxvt_term::pixel_position (int *x, int *y) NOTHROW
3689{
3690 *x = Pixel2Col (*x);
3691 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3692 *y = Pixel2Row (*y);
3693 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3694}
3695 3562
3696/* ------------------------------------------------------------------------- */ 3563/* ------------------------------------------------------------------------- */
3697#ifdef USE_XIM 3564#ifdef USE_XIM
3698void 3565void
3699rxvt_term::im_set_position (XPoint &pos) NOTHROW 3566rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3726 h += 2; min_it (h, nrow); 3593 h += 2; min_it (h, nrow);
3727 3594
3728 x -= 1; clamp_it (x, 0, ncol - w); 3595 x -= 1; clamp_it (x, 0, ncol - w);
3729 y -= 1; clamp_it (y, 0, nrow - h); 3596 y -= 1; clamp_it (y, 0, nrow - h);
3730 3597
3731 ov_x = x; ov_y = y; 3598 ov.x = x; ov.y = y;
3732 ov_w = w; ov_h = h; 3599 ov.w = w; ov.h = h;
3733 3600
3734 ov_text = new text_t *[h]; 3601 ov.text = new text_t *[h];
3735 ov_rend = new rend_t *[h]; 3602 ov.rend = new rend_t *[h];
3736 3603
3737 for (y = 0; y < h; y++) 3604 for (y = 0; y < h; y++)
3738 { 3605 {
3739 text_t *tp = ov_text[y] = new text_t[w]; 3606 text_t *tp = ov.text[y] = new text_t[w];
3740 rend_t *rp = ov_rend[y] = new rend_t[w]; 3607 rend_t *rp = ov.rend[y] = new rend_t[w];
3741 3608
3742 text_t t0, t1, t2; 3609 text_t t0, t1, t2;
3743 rend_t r = OVERLAY_RSTYLE; 3610 rend_t r = OVERLAY_RSTYLE;
3744 3611
3745 if (y == 0) 3612 if (y == 0)
… …
3764} 3631}
3765 3632
3766void 3633void
3767rxvt_term::scr_overlay_off () NOTHROW 3634rxvt_term::scr_overlay_off () NOTHROW
3768{ 3635{
3769 if (!ov_text) 3636 if (!ov.text)
3770 return; 3637 return;
3771 3638
3772 want_refresh = 1; 3639 want_refresh = 1;
3773 3640
3774 for (int y = 0; y < ov_h; y++) 3641 for (int y = 0; y < ov.h; y++)
3775 { 3642 {
3776 delete [] ov_text[y]; 3643 delete [] ov.text[y];
3777 delete [] ov_rend[y]; 3644 delete [] ov.rend[y];
3778 } 3645 }
3779 3646
3780 delete [] ov_text; ov_text = 0; 3647 delete [] ov.text; ov.text = 0;
3781 delete [] ov_rend; ov_rend = 0; 3648 delete [] ov.rend; ov.rend = 0;
3782} 3649}
3783 3650
3784void 3651void
3785rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3652rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3786{ 3653{
3787 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3654 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3788 return; 3655 return;
3789 3656
3790 x++, y++; 3657 x++, y++;
3791 3658
3792 ov_text[y][x] = text; 3659 ov.text[y][x] = text;
3793 ov_rend[y][x] = rend; 3660 ov.rend[y][x] = rend;
3794} 3661}
3795 3662
3796void 3663void
3797rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3664rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3798{ 3665{
… …
3817} 3684}
3818 3685
3819void 3686void
3820rxvt_term::scr_swap_overlay () NOTHROW 3687rxvt_term::scr_swap_overlay () NOTHROW
3821{ 3688{
3822 if (!ov_text) 3689 if (!ov.text)
3823 return; 3690 return;
3824 3691
3692 // hide cursor if it is within the overlay area
3693 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3694 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3695 screen.flags &= ~Screen_VisibleCursor;
3696
3825 // swap screen mem with overlay 3697 // swap screen mem with overlay
3826 for (int y = ov_h; y--; ) 3698 for (int y = ov.h; y--; )
3827 { 3699 {
3828 text_t *t1 = ov_text[y]; 3700 text_t *t1 = ov.text[y];
3829 rend_t *r1 = ov_rend[y]; 3701 rend_t *r1 = ov.rend[y];
3830 3702
3831 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3703 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3832 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3704 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3833 3705
3834 for (int x = ov_w; x--; ) 3706 for (int x = ov.w; x--; )
3835 { 3707 {
3836 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3708 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3837 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3709 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3838 } 3710 }
3839 } 3711 }

Diff Legend

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