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.260 by root, Sat Feb 18 15:24:39 2006 UTC vs.
Revision 1.347 by sf-exg, Sat Aug 28 11:03:04 2010 UTC

1/*--------------------------------*-C-*--------------------------------------* 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
… …
47 46
48/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 51 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 52 view_start = 0
54#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#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) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 87
89/* 88/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * 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 */ 90 */
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) \ 91#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 92 if (mapped) \
104 XClearArea (dpy, drawBuffer, x, y, \ 93 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 94 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 95 (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 96
114/* ------------------------------------------------------------------------- * 97/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 98 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 99 * ------------------------------------------------------------------------- */
117 100
… …
150 133
151 l.l = 0; 134 l.l = 0;
152 l.f = 0; 135 l.f = 0;
153} 136}
154 137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
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{
515 if (!OPTION (Opt_secondaryScreen)) 523 if (!option (Opt_secondaryScreen))
516 return; 524 return;
517 525
518 for (int i = prev_nrow; i--; ) 526 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 527 ::swap (ROW(i), swap_buf [i]);
520 528
… …
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;
550 558
551 scr_swap_screen (); 559 scr_swap_screen ();
552 560
… …
555 screen.flags |= Screen_VisibleCursor; 563 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 564 swap.flags |= Screen_VisibleCursor;
557 } 565 }
558 else 566 else
559#endif 567#endif
560 if (OPTION (Opt_secondaryScroll)) 568 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 569 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 570}
563 571
564// clear WrapNext indicator, solidifying position on next line 572// clear WrapNext indicator, solidifying position on next line
565void 573void
… …
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
… …
624 want_refresh = 1; 632 want_refresh = 1;
625 num_scr += count; 633 num_scr += count;
626 634
627 if (count > 0 635 if (count > 0
628 && row1 == 0 636 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 637 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 638 {
631 top_row = max (top_row - count, -saveLines); 639 top_row = max (top_row - count, -saveLines);
632 640
633 // scroll everything up 'count' lines 641 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 642 term_start = (term_start + count) % total_rows;
… …
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;
… …
684 selection.op = SELECTION_CLEAR; 692 selection.op = SELECTION_CLEAR;
685 } 693 }
686 } 694 }
687 695
688 // finally move the view window, if desired 696 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 697 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 698 && view_start != 0
691 && view_start != -saveLines) 699 && view_start != -saveLines)
692 scr_page (UP, count); 700 scr_page (UP, count);
693 701
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 702 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
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
… …
891 c = 0xfffd; 899 c = 0xfffd;
892# endif 900# endif
893#endif 901#endif
894 902
895 // nuke the character at this position, if required 903 // nuke the character at this position, if required
904 if (expect_false (
896 if (line->t[screen.cur.col] == NOCHAR 905 line->t[screen.cur.col] == NOCHAR
897 || (screen.cur.col < ncol - 1 906 || (screen.cur.col < ncol - 1
898 && line->t[screen.cur.col + 1] == NOCHAR)) 907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
899 { 915 {
900 int col = screen.cur.col; 916 // ... artificially enlargen the previous one
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 = ' '; 917 c = NOCHAR;
923 // and try the same character next loop iteration 918 // and try the same character next loop iteration
924 --str; 919 --str;
925 } 920 }
926 921
927 line->touch (); 922 line->touch ();
… …
929 do 924 do
930 { 925 {
931 line->t[screen.cur.col] = c; 926 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 927 line->r[screen.cur.col] = rend;
933 928
934 if (screen.cur.col < ncol - 1) 929 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 930 screen.cur.col++;
936 else 931 else
937 { 932 {
938 line->l = ncol; 933 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 934 if (screen.flags & Screen_Autowrap)
… …
941 break; 936 break;
942 } 937 }
943 938
944 c = NOCHAR; 939 c = NOCHAR;
945 } 940 }
946 while (--width > 0); 941 while (expect_false (--width > 0));
947 942
948 // pad with spaces when overwriting wide character with smaller one 943 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 944 if (expect_false (!width))
950 { 945 {
951 line->touch (); 946 line->touch ();
952 947
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 { 949 {
955 line->t[c] = ' '; 950 line->t[c] = ' ';
956 line->r[c] = rend; 951 line->r[c] = rend;
957 } 952 }
958 } 953 }
959 } 954 }
955#if ENABLE_COMBINING
960 else // width == 0 956 else // width == 0
961 { 957 {
962#if ENABLE_COMBINING 958 if (c != 0xfeff) // ignore BOM
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 { 959 {
960 // handle combining characters
961 // we just tag the accent on the previous on-screen character.
962 // this is arguably not correct, but also arguably not wrong.
963 // we don't handle double-width characters nicely yet.
964 line_t *linep;
965 text_t *tp;
966 rend_t *rp;
967
968 if (screen.cur.col > 0)
969 {
973 linep = line; 970 linep = line;
974 tp = line->t + screen.cur.col - 1; 971 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1; 972 rp = line->r + screen.cur.col - 1;
973 }
974 else if (screen.cur.row > 0
975 && ROW(screen.cur.row - 1).is_longer ())
976 {
977 linep = &ROW(screen.cur.row - 1);
978 tp = line->t + ncol - 1;
979 rp = line->r + ncol - 1;
980 }
981 else
982 continue;
983
984 linep->touch ();
985
986 while (*tp == NOCHAR && tp > linep->t)
987 tp--, rp--;
988
989 // first try to find a precomposed character
990 unicode_t n = rxvt_compose (*tp, c);
991 if (n == NOCHAR)
992 n = rxvt_composite.compose (*tp, c);
993
994 *tp = n;
995 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976 } 996 }
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 } 997 }
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 998#endif
1000 }
1001 } 999 }
1002 1000
1003 max_it (line->l, screen.cur.col); 1001 max_it (line->l, screen.cur.col);
1004 1002
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
1007#endif
1008} 1004}
1009 1005
1010/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1011/* 1007/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1014 */ 1010 */
1015void 1011void
1016rxvt_term::scr_backspace () NOTHROW 1012rxvt_term::scr_backspace () NOTHROW
1017{ 1013{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
1021 { 1015 {
1022 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
1023 { 1017 {
1024#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1019 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1020 --screen.cur.row;
1027 return; 1021
1022 want_refresh = 1;
1028#endif 1023#endif
1029 } 1024 }
1030 } 1025 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1026 else
1032 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1028}
1036 1029
1037/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1038/* 1031/*
1039 * Process Horizontal Tab 1032 * Process Horizontal Tab
… …
1062 x = i; 1055 x = i;
1063 1056
1064 if (!--count) 1057 if (!--count)
1065 break; 1058 break;
1066 } 1059 }
1067 else 1060 else
1068 ht &= l.t[i] == ' ' 1061 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1062 && RS_SAME (l.r[i], base_rend);
1070 1063
1071 if (count) 1064 if (count)
1072 x = ncol - 1; 1065 x = ncol - 1;
1073 1066
1074 // store horizontal tab commands as characters inside the text 1067 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1068 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1069 if (ht && option (Opt_pastableTabs))
1077 { 1070 {
1078 base_rend = SET_FONT (base_rend, 0); 1071 base_rend = SET_FONT (base_rend, 0);
1079 1072
1080 l.touch (x); 1073 l.touch (x);
1081 1074
… …
1188 } 1181 }
1189 } 1182 }
1190 else 1183 else
1191 { 1184 {
1192 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1193 { /* relative origin mode */ 1187 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1196 } 1190 }
1197 else 1191 else
1198 screen.cur.row = row; 1192 screen.cur.row = row;
… …
1231/* 1225/*
1232 * Erase part or whole of a line 1226 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1231 */
1237void 1232void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1234{
1240 unsigned int col, num; 1235 unsigned int col, num;
… …
1249 line.touch (); 1244 line.touch ();
1250 line.is_longer (0); 1245 line.is_longer (0);
1251 1246
1252 switch (mode) 1247 switch (mode)
1253 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1254 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1256 col = screen.cur.col;
1256 num = ncol - col; 1257 num = ncol - col;
1257 min_it (line.l, col); 1258 min_it (line.l, col);
1259
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1261 break; 1263 break;
1264
1262 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1263 col = 0; 1266 col = 0;
1264 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1268 break; 1272 break;
1273
1269 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1270 col = 0; 1275 col = 0;
1271 num = ncol; 1276 num = ncol;
1272 line.l = 0; 1277 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1332 return; 1337 return;
1333 1338
1334 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1335 1340
1336 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1344 {
1340 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1346
1347 if (mapped)
1348 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False);
1342 } 1351 }
1343 else 1352 else
1344 { 1353 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1355
1356 if (mapped)
1357 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1360 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start),
1362 (unsigned int)width,
1363 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1351 } 1367 }
1352 1368
1353 for (; num--; row++) 1369 for (; num--; row++)
1354 { 1370 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1375 }
1358} 1376}
1359 1377
1360#if !ENABLE_MINIMAL 1378#if !ENABLE_MINIMAL
1361void 1379void
… …
1435 * Insert/Delete <count> characters from the current position 1453 * Insert/Delete <count> characters from the current position
1436 */ 1454 */
1437void 1455void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1456rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1457{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1458 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1459 ZERO_SCROLLBACK ();
1445 1460
1446 if (count <= 0) 1461 if (count <= 0)
1447 return; 1462 return;
… …
1449 scr_do_wrap (); 1464 scr_do_wrap ();
1450 1465
1451 selection_check (1); 1466 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1467 min_it (count, ncol - screen.cur.col);
1453 1468
1454 row = screen.cur.row; 1469 int row = screen.cur.row;
1455 1470
1456 line_t *line = &ROW(row); 1471 line_t *line = &ROW(row);
1457 1472
1458 line->touch (); 1473 line->touch ();
1459 line->is_longer (0); 1474 line->is_longer (0);
1460 1475
1476 // nuke wide spanning the start
1477 if (line->t[screen.cur.col] == NOCHAR)
1478 scr_kill_char (*line, screen.cur.col);
1479
1461 switch (insdel) 1480 switch (insdel)
1462 { 1481 {
1463 case INSERT: 1482 case INSERT:
1464 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--)
1465 { 1489 {
1466 line->t[col] = line->t[col - count]; 1490 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1491 line->r[col] = line->r[col - count];
1468 } 1492 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1493
1472 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1496 {
1475 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1498 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1499 CLEAR_SELECTION ();
1478 else 1500 else
1501 {
1479 { /* shift selection */ 1502 /* shift selection */
1480 selection.beg.col += count; 1503 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1504 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1505 selection.end.col += count;
1483 } 1506 }
1484 } 1507 }
… …
1489 case ERASE: 1512 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1513 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1514 selection_check (1);
1492 screen.cur.col -= count; 1515 screen.cur.col -= count;
1493 1516
1494 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
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1522 break;
1497 1523
1498 case DELETE: 1524 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 line->l = max (line->l - count, 0);
1500 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
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1532 {
1503 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1505 } 1535 }
1506 1536
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1538
1510 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1541 {
1513 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1623 */ 1652 */
1624void 1653void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1654rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1655{
1627 if (mode < 0) 1656 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1657 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1658 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1659 tabs [screen.cur.col] = !!mode;
1631} 1660}
1632 1661
1633/* ------------------------------------------------------------------------- */ 1662/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1677 if (rvideo_state != on)
1649 { 1678 {
1650 rvideo_state = on; 1679 rvideo_state = on;
1651 1680
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1682#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1683 if (bgPixmap.pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1684#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1686
1661 XGCValues gcvalue; 1687 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1688 gcvalue.foreground = pix_colors[Color_fg];
… …
1871 return true; 1897 return true;
1872} 1898}
1873 1899
1874#ifndef NO_BELL 1900#ifndef NO_BELL
1875void 1901void
1876rxvt_term::bell_cb (time_watcher &w) 1902rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1903{
1878 rvideo_bell = false; 1904 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1905 scr_rvideo_mode (rvideo_mode);
1906 refresh_check ();
1880} 1907}
1881#endif 1908#endif
1882 1909
1883/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
1884void 1911void
… …
1886{ 1913{
1887#ifndef NO_BELL 1914#ifndef NO_BELL
1888 1915
1889# ifndef NO_MAPALERT 1916# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1917# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1918 if (option (Opt_mapAlert))
1892# endif 1919# endif
1893 XMapWindow (dpy, parent[0]); 1920 XMapWindow (dpy, parent[0]);
1894# endif 1921# endif
1895 1922
1923# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell))
1925 set_urgency (1);
1926# endif
1927
1896 if (OPTION (Opt_visualBell)) 1928 if (option (Opt_visualBell))
1897 { 1929 {
1898 rvideo_bell = true; 1930 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1931 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1932 flush ();
1901 1933
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1935 }
1904 else 1936 else
1905 XBell (dpy, 0); 1937 XBell (dpy, 0);
1906 1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1907#endif 1939#endif
1908} 1940}
1909 1941
1910/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1943/* ARGSUSED */
1912void 1944void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1945rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1946{
1915#ifdef PRINTPIPE 1947#ifdef PRINTPIPE
1916 int nrows, row_start; 1948 int nrows, row_start;
1917 FILE *fd; 1949 FILE *fd = popen_printer ();
1918 1950
1919 if ((fd = popen_printer ()) == NULL) 1951 if (!fd)
1920 return; 1952 return;
1921 1953
1922 if (fullhist) 1954 if (fullhist)
1923 { 1955 {
1924 nrows = nrow - top_row; 1956 nrows = nrow - top_row;
… …
1930 row_start = view_start; 1962 row_start = view_start;
1931 } 1963 }
1932 1964
1933 wctomb (0, 0); 1965 wctomb (0, 0);
1934 1966
1935 for (int r1 = 0; r1 < nrows; r1++) 1967 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1936 { 1968 {
1937 text_t *tp = ROW(r1).t; 1969 text_t *tp = ROW(r1).t;
1938 int len = ROW(r1).l; 1970 int len = ROW(r1).l;
1939 1971
1940 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
… …
1969 * screen.text/screen.rend contain what the screen will change to. 2001 * screen.text/screen.rend contain what the screen will change to.
1970 */ 2002 */
1971void 2003void
1972rxvt_term::scr_refresh () NOTHROW 2004rxvt_term::scr_refresh () NOTHROW
1973{ 2005{
1974 unsigned char have_bg,
1975 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 2006 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 2007 ocrow; /* old cursor row */
1978 int i; /* tmp */ 2008 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 2010 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 2011#endif
1982 rend_t *crp; // cursor rendition pointer 2012 rend_t *crp; // cursor rendition pointer
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
1983 2015
1984 want_refresh = 0; /* screen is current */ 2016 want_refresh = 0; /* screen is current */
1985 2017
1986 if (refresh_type == NO_REFRESH || !mapped) 2018 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 2019 return;
1988 2020
1989 /* 2021 /*
1990 * A: set up vars 2022 * A: set up vars
1991 */ 2023 */
1992 have_bg = 0;
1993 refresh_count = 0; 2024 refresh_count = 0;
1994 2025
1995#if XPM_BACKGROUND 2026 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP
1996 have_bg |= bgPixmap.pixmap != None; 2029 have_bg = bgPixmap.pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2030#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2032
2003 /* 2033 /*
2004 * B: reverse any characters which are selected 2034 * B: reverse any characters which are selected
2005 */ 2035 */
2006 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;
2007 2044
2008 /* 2045 /*
2009 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
2010 */ 2047 */
2011 { 2048 {
2012 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2050
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2051#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2052 if (hidden_cursor)
2019 showcursor = 0; 2053 showcursor = 0;
2020#endif 2054#endif
2021 2055
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2060 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2061 col--;
2028 2062
2029 crp = &ROW(screen.cur.row).r[col]; 2063 crp = &ROW(screen.cur.row).r[col];
2030 2064
2031 if (showcursor && focus) 2065#ifndef NO_CURSORCOLOR
2066 cc1 = *crp & (RS_fgMask | RS_bgMask);
2067 if (ISSET_PIXCOLOR (Color_cursor))
2068 ccol1 = Color_cursor;
2069 else
2070#endif
2071#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2072 ccol1 = fgcolor_of (rstyle);
2073#else
2074 ccol1 = Color_fg;
2075#endif
2076
2077#ifndef NO_CURSORCOLOR
2078 if (ISSET_PIXCOLOR (Color_cursor2))
2079 ccol2 = Color_cursor2;
2080 else
2081#endif
2082#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2083 ccol2 = bgcolor_of (rstyle);
2084#else
2085 ccol2 = Color_bg;
2086#endif
2087
2088 if (focus)
2032 { 2089 {
2033 if (OPTION (Opt_cursorUnderline)) 2090 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2091 *crp ^= RS_Uline;
2035 else 2092 else
2036 { 2093 {
2037 *crp ^= RS_RVid; 2094 *crp ^= RS_RVid;
2038
2039#ifndef NO_CURSORCOLOR
2040 cc1 = *crp & (RS_fgMask | RS_bgMask);
2041 if (ISSET_PIXCOLOR (Color_cursor))
2042 ccol1 = Color_cursor;
2043 else
2044#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045 ccol1 = fgcolor_of (rstyle);
2046#else
2047 ccol1 = Color_fg;
2048#endif
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057 *crp = SET_FGCOLOR (*crp, ccol1); 2095 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2096 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2097 }
2061 } 2098 }
2062 } 2099 }
2063 2100
2064 /* make sure no outline cursor is left around */ 2101 /* make sure no outline cursor is left around */
… …
2091 oldcursor.col = screen.cur.col; 2128 oldcursor.col = screen.cur.col;
2092 } 2129 }
2093 } 2130 }
2094 } 2131 }
2095 2132
2096 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2097#if ENABLE_OVERLAY
2098 scr_swap_overlay ();
2099#endif
2100
2101#ifndef NO_SLOW_LINK_SUPPORT 2133#ifndef NO_SLOW_LINK_SUPPORT
2102 /* 2134 /*
2103 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2105 */ 2137 */
2106 if (!display->is_local 2138 if (!display->is_local
2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2139 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108 && abs (num_scr) < nrow && !have_bg) 2140 && abs (num_scr) < nrow && !have_bg)
2109 { 2141 {
2110 int16_t nits; 2142 int16_t nits;
2143 int i = num_scr;
2111 int j; 2144 int j;
2112 int len, wlen; 2145 int len, wlen;
2113 dLocal (int, num_scr); 2146 dLocal (int, num_scr);
2114 2147
2115 j = nrow; 2148 j = nrow;
2116 wlen = len = -1; 2149 wlen = len = -1;
2117 row = i > 0 ? 0 : j - 1; 2150 row = i > 0 ? 0 : j - 1;
2151
2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2152 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119 { 2153 {
2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2154 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121 { 2155 {
2122 line_t s = ROW(view_start + row); 2156 line_t s = ROW(view_start + row);
… …
2143 wlen = row; 2177 wlen = row;
2144 continue; 2178 continue;
2145 } 2179 }
2146 } 2180 }
2147 2181
2148 if (len != -1) 2182 if (len >= 0)
2149 { 2183 {
2150 /* also comes here at end if needed because of >= above */ 2184 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2185 if (wlen < len)
2152 ::swap (wlen, len); 2186 ::swap (wlen, len);
2153 2187
… …
2192 continue; 2226 continue;
2193 2227
2194 // redraw one or more characters 2228 // redraw one or more characters
2195 2229
2196 // seek to the beginning of wide characters 2230 // seek to the beginning of wide characters
2197 while (stp[col] == NOCHAR && col > 0) 2231 while (expect_false (stp[col] == NOCHAR && col > 0))
2198 --col; 2232 --col;
2199 2233
2200 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2234 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2201 text_t *text = stp + col; 2235 text_t *text = stp + col;
2202 int count = 1; 2236 int count = 1;
2203 2237
2204 dtp[col] = stp[col]; 2238 dtp[col] = stp[col];
2205 drp[col] = rend; 2239 drp[col] = rend;
… …
2209 for (i = 0; ++col < ncol; ) 2243 for (i = 0; ++col < ncol; )
2210 { 2244 {
2211 if (stp[col] == NOCHAR) 2245 if (stp[col] == NOCHAR)
2212 { 2246 {
2213 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2214 drp[col] = rend; 2248 drp[col] = srp[col];
2249
2215 count++; 2250 count++;
2216 i++; 2251 i++;
2217 2252
2218 continue; 2253 continue;
2219 } 2254 }
… …
2239 2274
2240 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2241 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2242 2277
2243 // sometimes we optimize away the trailing NOCHAR's, add them back 2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2244 while (i && text[count] == NOCHAR) 2279 while (expect_false (i && text[count] == NOCHAR))
2245 count++, i--; 2280 count++, i--;
2246 2281
2247 /* 2282 /*
2248 * Determine the attributes for the string 2283 * Determine the attributes for the string
2249 */ 2284 */
2250 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2251 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2252 2287
2253 // 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
2254 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2289 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2255 { 2290 {
2256#if ENABLE_STYLES
2257 // "careful" (too wide) character handling
2258
2259 // include previous careful character(s) if possible, looks nicer (best effort...)
2260 while (text > stp
2261 && srp[text - stp - 1] & RS_Careful
2262 && RS_SAME (rend, srp[text - stp - 1]))
2263 text--, count++, xpixel -= fwidth;
2264
2265 // force redraw after "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2267 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2268
2269 // force redraw before "careful" characters to avoid pixel droppings
2270 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2271 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2272#endif
2273
2274 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2275 2292
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold
2278 && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
2279 { 2295 {
2280 if (ISSET_PIXCOLOR (Color_BD)) 2296 if (ISSET_PIXCOLOR (Color_BD))
2281 fore = Color_BD; 2297 fore = Color_BD;
2282# if !ENABLE_STYLES 2298# if !ENABLE_STYLES
2283 else 2299 else
2284 invert = !invert; 2300 invert = !invert;
2285# endif 2301# endif
2286 } 2302 }
2287 2303
2288 if (rend & RS_Italic 2304 if (rend & RS_Italic && fore == Color_fg)
2289 && fore == Color_fg)
2290 { 2305 {
2291 if (ISSET_PIXCOLOR (Color_IT)) 2306 if (ISSET_PIXCOLOR (Color_IT))
2292 fore = Color_IT; 2307 fore = Color_IT;
2293# if !ENABLE_STYLES 2308# if !ENABLE_STYLES
2294 else 2309 else
2295 invert = !invert; 2310 invert = !invert;
2296# endif 2311# endif
2297 } 2312 }
2298 2313
2299 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2300 fore = Color_UL; 2315 fore = Color_UL;
2316#endif
2317
2318#ifdef OPTION_HC
2319 if (rend & RS_Sel)
2320 {
2321 /* invert the column if no highlightColor is set or it is the
2322 * current cursor column */
2323 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 && ISSET_PIXCOLOR (Color_HC))
2325 {
2326 if (ISSET_PIXCOLOR (Color_HTC))
2327 fore = Color_HTC;
2328 // if invert is 0 reverse video is set so we use bg color as fg color
2329 else if (!invert)
2330 fore = back;
2331
2332 back = Color_HC;
2333 invert = 0;
2334 }
2335 }
2301#endif 2336#endif
2302 2337
2303 if (invert) 2338 if (invert)
2304 { 2339 {
2305 ::swap (fore, back); 2340 ::swap (fore, back);
2306 2341
2307#ifndef NO_BOLD_UNDERLINE_REVERSE 2342#ifndef NO_BOLD_UNDERLINE_REVERSE
2308 if (ISSET_PIXCOLOR (Color_RV))
2309 back = Color_RV;
2310
2311 if (fore == back) 2343 if (fore == back)
2312 { 2344 {
2313 fore = Color_bg; 2345 fore = Color_bg;
2314 back = Color_fg; 2346 back = Color_fg;
2315 } 2347 }
… …
2317 } 2349 }
2318 2350
2319#ifdef TEXT_BLINK 2351#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2352 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2353 {
2322 if (!text_blink_ev.active) 2354 if (!text_blink_ev.is_active ())
2323 { 2355 {
2324 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2356 text_blink_ev.again ();
2325 hidden_text = 0; 2357 hidden_text = 0;
2326 } 2358 }
2327 else if (hidden_text) 2359 else if (hidden_text)
2328 fore = back; 2360 fore = back;
2329 } 2361 }
2330#endif 2362#endif
2363
2364#if ENABLE_STYLES
2365 // "careful" (too wide) character handling
2366
2367 // include previous careful character(s) if possible, looks nicer (best effort...)
2368 while (text > stp
2369 && srp[text - stp - 1] & RS_Careful
2370 && RS_SAME (rend, srp[text - stp - 1]))
2371 text--, count++, xpixel -= fwidth;
2372
2373 // force redraw after "careful" characters to avoid pixel droppings
2374 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2375 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2376
2377 // force redraw before "careful" characters to avoid pixel droppings
2378 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2379 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2380#endif
2331 } 2381 }
2332 2382
2333 /* 2383 /*
2334 * Actually do the drawing of the string here 2384 * Actually do the drawing of the string here
2335 */ 2385 */
2336 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2337 2387
2338 if (back == fore) 2388 if (expect_true (have_bg && back == Color_bg))
2339 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2340 else if (back == Color_bg && have_bg)
2341 { 2389 {
2342 // this is very ugly, maybe push it into ->draw? 2390 // this is very ugly, maybe push it into ->draw?
2343 2391
2344 for (i = 0; i < count; i++) /* don't draw empty strings */ 2392 for (i = 0; i < count; i++) /* don't draw empty strings */
2345 if (text[i] != ' ') 2393 if (text[i] != ' ')
2346 { 2394 {
2347 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2395 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2348 goto did_clear; 2396 goto did_clear;
2349 } 2397 }
2350 2398
2351 CLEAR_CHARS (xpixel, ypixel, count); 2399 CLEAR_CHARS (xpixel, ypixel, count);
2352 did_clear: ; 2400 did_clear: ;
2353 } 2401 }
2354 else 2402 else
2355 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2356 2404
2357 if (rend & RS_Uline && font->descent > 1 && fore != back) 2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2358 { 2406 {
2359#if ENABLE_FRILLS 2407#if ENABLE_FRILLS
2360 if (ISSET_PIXCOLOR (Color_underline)) 2408 if (ISSET_PIXCOLOR (Color_underline))
2361 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2409 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2362 else 2410 else
2363#endif 2411#endif
2364 XSetForeground (dpy, gc, pix_colors[fore]); 2412 XSetForeground (dpy, gc, pix_colors[fore]);
2365 2413
2366 XDrawLine (dpy, drawBuffer, gc, 2414 XDrawLine (dpy, vt, gc,
2367 xpixel, ypixel + font->ascent + 1, 2415 xpixel, ypixel + font->ascent + 1,
2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2369 } 2417 }
2370 } /* for (col....) */ 2418 } /* for (col....) */
2371 } /* for (row....) */ 2419 } /* for (row....) */
2372 2420
2373#if ENABLE_OVERLAY
2374 scr_swap_overlay ();
2375#endif
2376 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2377
2378 /* 2421 /*
2379 * G: cleanup cursor and display outline cursor if necessary 2422 * G: cleanup cursor and display outline cursor if necessary
2380 */ 2423 */
2381 if (showcursor) 2424 if (showcursor)
2382 { 2425 {
2383 if (focus) 2426 if (focus)
2384 { 2427 {
2385 if (OPTION (Opt_cursorUnderline)) 2428 if (option (Opt_cursorUnderline))
2386 *crp ^= RS_Uline; 2429 *crp ^= RS_Uline;
2387 else 2430 else
2388 { 2431 {
2389 *crp ^= RS_RVid; 2432 *crp ^= RS_RVid;
2390#ifndef NO_CURSORCOLOR 2433#ifndef NO_CURSORCOLOR
… …
2405 cursorwidth++; 2448 cursorwidth++;
2406 2449
2407#ifndef NO_CURSORCOLOR 2450#ifndef NO_CURSORCOLOR
2408 if (ISSET_PIXCOLOR (Color_cursor)) 2451 if (ISSET_PIXCOLOR (Color_cursor))
2409 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2452 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2453 else
2410#endif 2454#endif
2455 XSetForeground (dpy, gc, pix_colors[ccol1]);
2411 2456
2412 XDrawRectangle (dpy, drawBuffer, gc, 2457 XDrawRectangle (dpy, vt, gc,
2413 Col2Pixel (col), 2458 Col2Pixel (col),
2414 Row2Pixel (oldcursor.row), 2459 Row2Pixel (oldcursor.row),
2415 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2460 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2461 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2417 } 2462 }
2418 } 2463 }
2419 2464
2420 /* 2465 /*
2421 * H: cleanup selection 2466 * H: cleanup selection
2422 */ 2467 */
2468#if ENABLE_OVERLAY
2469 scr_swap_overlay ();
2470#endif
2471 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2472
2423 scr_reverse_selection (); 2473 scr_reverse_selection ();
2424 2474
2475 screen.flags = old_screen_flags;
2425 num_scr = 0; 2476 num_scr = 0;
2426 num_scr_allow = 1; 2477 num_scr_allow = 1;
2427} 2478}
2428 2479
2429void 2480void
… …
2452} 2503}
2453 2504
2454void 2505void
2455rxvt_term::scr_recolour () NOTHROW 2506rxvt_term::scr_recolour () NOTHROW
2456{ 2507{
2457 if (1 2508#ifdef HAVE_BG_PIXMAP
2458#if TRANSPARENT 2509 bgPixmap.apply ();
2459 && !am_transparent 2510#else
2460#endif 2511
2461#if XPM_BACKGROUND
2462 && !bgPixmap.pixmap
2463#endif
2464 )
2465 {
2466 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2512 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2467 XClearWindow (dpy, parent[0]); 2513 XClearWindow (dpy, parent[0]);
2468 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2514 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2469#if HAVE_SCROLLBARS 2515
2470 if (scrollBar.win) 2516 if (scrollBar.win)
2471 { 2517 {
2472 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2518 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2473 scrollBar.setIdle (); 2519 scrollBar.state = STATE_IDLE;
2474 scrollbar_show (0); 2520 scrollBar.show (0);
2475 }
2476#endif
2477 } 2521 }
2478 2522
2523#endif
2524
2525 /* bgPixmap.apply () does not do the following : */
2479 scr_clear (); 2526 scr_clear ();
2480 scr_touch (true); 2527 scr_touch (true);
2481 want_refresh = 1; 2528 want_refresh = 1;
2482} 2529}
2483 2530
… …
2553 { 2600 {
2554#if !ENABLE_MINIMAL 2601#if !ENABLE_MINIMAL
2555 if (selection.rect) 2602 if (selection.rect)
2556 scr_xor_rect (selection.beg.row, selection.beg.col, 2603 scr_xor_rect (selection.beg.row, selection.beg.col,
2557 selection.end.row, selection.end.col, 2604 selection.end.row, selection.end.col,
2558 RS_RVid, RS_RVid | RS_Uline); 2605 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2559 else 2606 else
2560#endif 2607#endif
2561 scr_xor_span (selection.beg.row, selection.beg.col, 2608 scr_xor_span (selection.beg.row, selection.beg.col,
2562 selection.end.row, selection.end.col, 2609 selection.end.row, selection.end.col,
2563 RS_RVid); 2610 RS_Sel | RS_RVid);
2564 } 2611 }
2565} 2612}
2566 2613
2567/* ------------------------------------------------------------------------- */ 2614/* ------------------------------------------------------------------------- */
2568/* 2615/*
… …
2575{ 2622{
2576 int row, wrote; 2623 int row, wrote;
2577 unsigned int width, towrite; 2624 unsigned int width, towrite;
2578 char r1[] = "\n"; 2625 char r1[] = "\n";
2579 2626
2580 for (row = saveLines - nsaved; 2627 for (row = saveLines + top_row;
2581 row < saveLines + nrow - 1; row++) 2628 row < saveLines + nrow - 1; row++)
2582 { 2629 {
2583 width = row_buf[row].l >= 0 ? row_buf[row].l 2630 width = row_buf[row].l >= 0 ? row_buf[row].l
2584 : ncol; 2631 : ncol;
2585 for (towrite = width; towrite; towrite -= wrote) 2632 for (towrite = width; towrite; towrite -= wrote)
… …
2629/* ------------------------------------------------------------------------- */ 2676/* ------------------------------------------------------------------------- */
2630/* 2677/*
2631 * Paste a selection direct to the command fd 2678 * Paste a selection direct to the command fd
2632 */ 2679 */
2633void 2680void
2634rxvt_term::paste (char *data, unsigned int len) NOTHROW 2681rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2635{ 2682{
2636 /* convert normal newline chars into common keyboard Return key sequence */ 2683 /* convert normal newline chars into common keyboard Return key sequence */
2637 for (unsigned int i = 0; i < len; i++) 2684 for (unsigned int i = 0; i < len; i++)
2638 if (data[i] == C0_LF) 2685 if (data[i] == C0_LF)
2639 data[i] = C0_CR; 2686 data[i] = C0_CR;
2640 2687
2688 if (priv_modes & PrivMode_BracketPaste)
2689 tt_printf ("\e[200~");
2690
2641 tt_write (data, len); 2691 tt_write (data, len);
2692
2693 if (priv_modes & PrivMode_BracketPaste)
2694 tt_printf ("\e[201~");
2695}
2696
2697void
2698rxvt_term::paste (char *data, unsigned int len) NOTHROW
2699{
2700 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2701 return;
2702
2703 tt_paste (data, len);
2642} 2704}
2643 2705
2644/* ------------------------------------------------------------------------- */ 2706/* ------------------------------------------------------------------------- */
2645/* 2707/*
2646 * Respond to a notification that a primary selection has been sent 2708 * Respond to a notification that a primary selection has been sent
… …
2721 if (!delete_prop) 2783 if (!delete_prop)
2722 XDeleteProperty (dpy, win, prop); 2784 XDeleteProperty (dpy, win, prop);
2723 2785
2724 selection_wait = Sel_incr; 2786 selection_wait = Sel_incr;
2725 incr_buf_fill = 0; 2787 incr_buf_fill = 0;
2726 incr_ev.start (NOW + 10); 2788 incr_ev.start (10);
2727 2789
2728 goto bailout; 2790 goto bailout;
2729 } 2791 }
2730 2792
2731 if (ct.nitems == 0) 2793 if (ct.nitems == 0)
… …
2740 ct.nitems = incr_buf_fill; 2802 ct.nitems = incr_buf_fill;
2741 incr_buf = 0; 2803 incr_buf = 0;
2742 incr_buf_size = 0; 2804 incr_buf_size = 0;
2743 incr_ev.stop (); 2805 incr_ev.stop ();
2744 } 2806 }
2745 else 2807 else
2746 { 2808 {
2747 if (selection_wait == Sel_normal 2809 if (selection_wait == Sel_normal
2748 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2810 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2749 { 2811 {
2750 /* 2812 /*
… …
2757 goto bailout; 2819 goto bailout;
2758 } 2820 }
2759 } 2821 }
2760 else if (selection_wait == Sel_incr) 2822 else if (selection_wait == Sel_incr)
2761 { 2823 {
2762 incr_ev.start (NOW + 10); 2824 incr_ev.start (10);
2763 2825
2764 while (incr_buf_fill + ct.nitems > incr_buf_size) 2826 while (incr_buf_fill + ct.nitems > incr_buf_size)
2765 { 2827 {
2766 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2828 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2767 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2829 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2807 if (selection_wait == Sel_normal) 2869 if (selection_wait == Sel_normal)
2808 selection_wait = Sel_none; 2870 selection_wait = Sel_none;
2809} 2871}
2810 2872
2811void 2873void
2812rxvt_term::incr_cb (time_watcher &w) NOTHROW 2874rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2813{ 2875{
2814 selection_wait = Sel_none; 2876 selection_wait = Sel_none;
2815 2877
2816 incr_buf_size = 0; 2878 incr_buf_size = 0;
2817 free (incr_buf); 2879 free (incr_buf);
… …
2828 selection_paste (win, prop, true); 2890 selection_paste (win, prop, true);
2829} 2891}
2830 2892
2831/* ------------------------------------------------------------------------- */ 2893/* ------------------------------------------------------------------------- */
2832/* 2894/*
2833 * Request the current selection: 2895 * Request the current selection:
2834 * Order: > internal selection if available 2896 * Order: > internal selection if available
2835 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2897 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2836 * > CUT_BUFFER0 2898 * > CUT_BUFFER0
2837 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2899 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2838 * will auto fallback to CUT_BUFFER0 2900 * will auto fallback to CUT_BUFFER0
… …
2840 */ 2902 */
2841void 2903void
2842rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2904rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2843{ 2905{
2844 if (selection.text && selnum == Sel_Primary) 2906 if (selection.text && selnum == Sel_Primary)
2907 {
2845 { /* internal selection */ 2908 /* internal selection */
2846 char *str = rxvt_wcstombs (selection.text, selection.len); 2909 char *str = rxvt_wcstombs (selection.text, selection.len);
2847 paste (str, strlen (str)); 2910 paste (str, strlen (str));
2848 free (str); 2911 free (str);
2849 return; 2912 return;
2850 } 2913 }
… …
2854 selection_wait = Sel_normal; 2917 selection_wait = Sel_normal;
2855 2918
2856#if X_HAVE_UTF8_STRING 2919#if X_HAVE_UTF8_STRING
2857 selection_type = Sel_UTF8String; 2920 selection_type = Sel_UTF8String;
2858 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2921 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2859 return; 2922 return;
2860#else 2923#else
2861 selection_type = Sel_CompoundText; 2924 selection_type = Sel_CompoundText;
2862 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2925 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2863 return; 2926 return;
2864#endif 2927#endif
2865 } 2928 }
2866 2929
2867 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2930 selection_wait = Sel_none; /* don't loop in selection_paste () */
2868 selection_paste (display->root, XA_CUT_BUFFER0, false); 2931 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2896/* 2959/*
2897 * Clear all selected text 2960 * Clear all selected text
2898 * EXT: SelectionClear 2961 * EXT: SelectionClear
2899 */ 2962 */
2900void 2963void
2901rxvt_term::selection_clear () NOTHROW 2964rxvt_term::selection_clear (bool clipboard) NOTHROW
2902{ 2965{
2966 if (!clipboard)
2967 {
2903 want_refresh = 1; 2968 want_refresh = 1;
2904 free (selection.text); 2969 free (selection.text);
2905 selection.text = NULL; 2970 selection.text = NULL;
2906 selection.len = 0; 2971 selection.len = 0;
2907 CLEAR_SELECTION (); 2972 CLEAR_SELECTION ();
2908 2973
2909 if (display->selection_owner == this) 2974 if (display->selection_owner == this)
2910 display->selection_owner = 0; 2975 display->selection_owner = 0;
2976 }
2977 else
2978 {
2979 free (selection.clip_text);
2980 selection.clip_text = NULL;
2981 selection.clip_len = 0;
2982
2983 if (display->clipboard_owner == this)
2984 display->clipboard_owner = 0;
2985 }
2911} 2986}
2912 2987
2913/* ------------------------------------------------------------------------- */ 2988/* ------------------------------------------------------------------------- */
2914/* 2989/*
2915 * Copy a selection into the cut buffer 2990 * Copy a selection into the cut buffer
… …
3041 3116
3042 selection_grab (tm); 3117 selection_grab (tm);
3043} 3118}
3044 3119
3045bool 3120bool
3046rxvt_term::selection_grab (Time tm) NOTHROW 3121rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3047{ 3122{
3123 Atom sel;
3124
3125 if (!clipboard)
3126 {
3048 selection_time = tm; 3127 selection_time = tm;
3128 sel = XA_PRIMARY;
3129 }
3130 else
3131 {
3132 clipboard_time = tm;
3133 sel = xa[XA_CLIPBOARD];
3134 }
3049 3135
3050 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3136 XSetSelectionOwner (dpy, sel, vt, tm);
3051 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3137 if (XGetSelectionOwner (dpy, sel) == vt)
3052 { 3138 {
3053 display->set_selection_owner (this); 3139 display->set_selection_owner (this, clipboard);
3054 return true; 3140 return true;
3055 } 3141 }
3056 else 3142 else
3057 { 3143 {
3058 selection_clear (); 3144 selection_clear (clipboard);
3059 return false; 3145 return false;
3060 } 3146 }
3061 3147
3062#if 0 3148#if 0
3063 XTextProperty ct; 3149 XTextProperty ct;
… …
3116 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3202 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3117 3203
3118 while (selection.mark.col > 0 3204 while (selection.mark.col > 0
3119 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3205 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3120 --selection.mark.col; 3206 --selection.mark.col;
3121 3207
3122 if (selection.op) 3208 if (selection.op)
3209 {
3123 { /* clear the old selection */ 3210 /* clear the old selection */
3124 selection.beg.row = selection.end.row = selection.mark.row; 3211 selection.beg.row = selection.end.row = selection.mark.row;
3125 selection.beg.col = selection.end.col = selection.mark.col; 3212 selection.beg.col = selection.end.col = selection.mark.col;
3126 } 3213 }
3127 3214
3128 selection.op = SELECTION_INIT; 3215 selection.op = SELECTION_INIT;
… …
3317 * a point/word/line which is either the start or end of the selection 3404 * a point/word/line which is either the start or end of the selection
3318 * and it was decided by whichever point/word/line was `fixed' at the 3405 * and it was decided by whichever point/word/line was `fixed' at the
3319 * time of the most recent button3 press 3406 * time of the most recent button3 press
3320 */ 3407 */
3321 if (button3 && buttonpress) 3408 if (button3 && buttonpress)
3409 {
3322 { /* button3 press */ 3410 /* button3 press */
3323 /* 3411 /*
3324 * first determine which edge of the selection we are closest to 3412 * first determine which edge of the selection we are closest to
3325 */ 3413 */
3326 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3414 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3327 || (!ROWCOL_IS_AFTER (pos, selection.end) 3415 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3345 selection.mark.row = selection.beg.row; 3433 selection.mark.row = selection.beg.row;
3346 selection.mark.col = selection.beg.col; 3434 selection.mark.col = selection.beg.col;
3347 } 3435 }
3348 } 3436 }
3349 else 3437 else
3438 {
3350 { /* button1 drag or button3 drag */ 3439 /* button1 drag or button3 drag */
3351 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3440 if (ROWCOL_IS_AFTER (selection.mark, pos))
3352 { 3441 {
3353 if (selection.mark.row == selection.end.row 3442 if (selection.mark.row == selection.end.row
3354 && selection.mark.col == selection.end.col 3443 && selection.mark.col == selection.end.col
3355 && clickchange 3444 && clickchange
… …
3398 selection_delimit_word (DN, &selection.end, &selection.end); 3487 selection_delimit_word (DN, &selection.end, &selection.end);
3399 } 3488 }
3400 else if (selection.clicks == 3) 3489 else if (selection.clicks == 3)
3401 { 3490 {
3402#if ENABLE_FRILLS 3491#if ENABLE_FRILLS
3403 if (OPTION (Opt_tripleclickwords)) 3492 if (option (Opt_tripleclickwords))
3404 { 3493 {
3405 selection_delimit_word (UP, &selection.beg, &selection.beg); 3494 selection_delimit_word (UP, &selection.beg, &selection.beg);
3406 3495
3407 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3496 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3408 { 3497 {
… …
3436 selection.end.row++; 3525 selection.end.row++;
3437 } 3526 }
3438 } 3527 }
3439 3528
3440 if (button3 && buttonpress) 3529 if (button3 && buttonpress)
3530 {
3441 { /* mark may need to be changed */ 3531 /* mark may need to be changed */
3442 if (closeto == LEFT) 3532 if (closeto == LEFT)
3443 { 3533 {
3444 selection.mark.row = selection.end.row; 3534 selection.mark.row = selection.end.row;
3445 selection.mark.col = selection.end.col - (selection.clicks == 2); 3535 selection.mark.col = selection.end.col - (selection.clicks == 2);
3446 } 3536 }
… …
3554 else if (rq.target == xa[XA_MULTIPLE]) 3644 else if (rq.target == xa[XA_MULTIPLE])
3555 { 3645 {
3556 /* TODO: Handle MULTIPLE */ 3646 /* TODO: Handle MULTIPLE */
3557 } 3647 }
3558#endif 3648#endif
3559 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3560 { 3650 {
3561 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3562 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3652 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3653 ev.property = rq.property;
3654 }
3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3656 {
3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3658 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3563 ev.property = rq.property; 3659 ev.property = rq.property;
3564 } 3660 }
3565 else if (rq.target == XA_STRING 3661 else if (rq.target == XA_STRING
3566 || rq.target == xa[XA_TEXT] 3662 || rq.target == xa[XA_TEXT]
3567 || rq.target == xa[XA_COMPOUND_TEXT] 3663 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3600 { 3696 {
3601 target = xa[XA_COMPOUND_TEXT]; 3697 target = xa[XA_COMPOUND_TEXT];
3602 style = enc_compound_text; 3698 style = enc_compound_text;
3603 } 3699 }
3604 3700
3605 if (selection.text) 3701 if (rq.selection == XA_PRIMARY && selection.text)
3606 { 3702 {
3607 cl = selection.text; 3703 cl = selection.text;
3608 selectlen = selection.len; 3704 selectlen = selection.len;
3705 }
3706 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3707 {
3708 cl = selection.clip_text;
3709 selectlen = selection.clip_len;
3609 } 3710 }
3610 else 3711 else
3611 { 3712 {
3612 cl = L""; 3713 cl = L"";
3613 selectlen = 0; 3714 selectlen = 0;
… …
3645 XFree (ct.value); 3746 XFree (ct.value);
3646 } 3747 }
3647 3748
3648 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3749 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3649} 3750}
3650
3651/* ------------------------------------------------------------------------- *
3652 * MOUSE ROUTINES *
3653 * ------------------------------------------------------------------------- */
3654
3655/*
3656 * return col/row values corresponding to x/y pixel values
3657 */
3658void
3659rxvt_term::pixel_position (int *x, int *y) NOTHROW
3660{
3661 *x = Pixel2Col (*x);
3662 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3663 *y = Pixel2Row (*y);
3664 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3665}
3666 3751
3667/* ------------------------------------------------------------------------- */ 3752/* ------------------------------------------------------------------------- */
3668#ifdef USE_XIM 3753#ifdef USE_XIM
3669void 3754void
3670rxvt_term::im_set_position (XPoint &pos) NOTHROW 3755rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3697 h += 2; min_it (h, nrow); 3782 h += 2; min_it (h, nrow);
3698 3783
3699 x -= 1; clamp_it (x, 0, ncol - w); 3784 x -= 1; clamp_it (x, 0, ncol - w);
3700 y -= 1; clamp_it (y, 0, nrow - h); 3785 y -= 1; clamp_it (y, 0, nrow - h);
3701 3786
3702 ov_x = x; ov_y = y; 3787 ov.x = x; ov.y = y;
3703 ov_w = w; ov_h = h; 3788 ov.w = w; ov.h = h;
3704 3789
3705 ov_text = new text_t *[h]; 3790 ov.text = new text_t *[h];
3706 ov_rend = new rend_t *[h]; 3791 ov.rend = new rend_t *[h];
3707 3792
3708 for (y = 0; y < h; y++) 3793 for (y = 0; y < h; y++)
3709 { 3794 {
3710 text_t *tp = ov_text[y] = new text_t[w]; 3795 text_t *tp = ov.text[y] = new text_t[w];
3711 rend_t *rp = ov_rend[y] = new rend_t[w]; 3796 rend_t *rp = ov.rend[y] = new rend_t[w];
3712 3797
3713 text_t t0, t1, t2; 3798 text_t t0, t1, t2;
3714 rend_t r = OVERLAY_RSTYLE; 3799 rend_t r = OVERLAY_RSTYLE;
3715 3800
3716 if (y == 0) 3801 if (y == 0)
… …
3735} 3820}
3736 3821
3737void 3822void
3738rxvt_term::scr_overlay_off () NOTHROW 3823rxvt_term::scr_overlay_off () NOTHROW
3739{ 3824{
3740 if (!ov_text) 3825 if (!ov.text)
3741 return; 3826 return;
3742 3827
3743 want_refresh = 1; 3828 want_refresh = 1;
3744 3829
3745 for (int y = 0; y < ov_h; y++) 3830 for (int y = 0; y < ov.h; y++)
3746 { 3831 {
3747 delete [] ov_text[y]; 3832 delete [] ov.text[y];
3748 delete [] ov_rend[y]; 3833 delete [] ov.rend[y];
3749 } 3834 }
3750 3835
3751 delete [] ov_text; ov_text = 0; 3836 delete [] ov.text; ov.text = 0;
3752 delete [] ov_rend; ov_rend = 0; 3837 delete [] ov.rend; ov.rend = 0;
3753} 3838}
3754 3839
3755void 3840void
3756rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3841rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3757{ 3842{
3758 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3843 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3759 return; 3844 return;
3760 3845
3761 x++, y++; 3846 x++, y++;
3762 3847
3763 ov_text[y][x] = text; 3848 ov.text[y][x] = text;
3764 ov_rend[y][x] = rend; 3849 ov.rend[y][x] = rend;
3765} 3850}
3766 3851
3767void 3852void
3768rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3853rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3769{ 3854{
… …
3788} 3873}
3789 3874
3790void 3875void
3791rxvt_term::scr_swap_overlay () NOTHROW 3876rxvt_term::scr_swap_overlay () NOTHROW
3792{ 3877{
3793 if (!ov_text) 3878 if (!ov.text)
3794 return; 3879 return;
3795 3880
3881 // hide cursor if it is within the overlay area
3882 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3883 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3884 screen.flags &= ~Screen_VisibleCursor;
3885
3796 // swap screen mem with overlay 3886 // swap screen mem with overlay
3797 for (int y = ov_h; y--; ) 3887 for (int y = ov.h; y--; )
3798 { 3888 {
3799 text_t *t1 = ov_text[y]; 3889 text_t *t1 = ov.text[y];
3800 rend_t *r1 = ov_rend[y]; 3890 rend_t *r1 = ov.rend[y];
3801 3891
3802 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3892 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3803 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3893 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3804 3894
3805 for (int x = ov_w; x--; ) 3895 for (int x = ov.w; x--; )
3806 { 3896 {
3807 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3897 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3808 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3898 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3809 } 3899 }
3810 } 3900 }

Diff Legend

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