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.254 by root, Sat Jan 28 14:23:16 2006 UTC vs.
Revision 1.380 by sf-exg, Thu Apr 7 12:19:41 2011 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 <schmorp@schmorp.de>
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 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 48#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 49 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 50 view_start = 0
54#define CLEAR_SELECTION() \ 51#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 52 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 53 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 54#define CLEAR_ALL_SELECTION() \
… …
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 (xdisp, 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 (xdisp, 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 (xdisp, 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
… …
172 if (nrow == 0) 174 if (nrow == 0)
173 nrow = 24; 175 nrow = 24;
174 176
175 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 178 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 179
181 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
183 { 182 {
184 //TODO//FIXME 183 //TODO//FIXME
… …
237 selection.text = NULL; 236 selection.text = NULL;
238 selection.len = 0; 237 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
241 selection.clicks = 0; 240 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false; 241 selection.clip_text = NULL;
242 selection.clip_len = 0;
243 } 243 }
244 else 244 else
245 { 245 {
246 /* 246 /*
247 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 277 }
278 278
279 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 281
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
285 285
286 if (top_row) 286 if (top_row)
287 { 287 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 // TODO: maybe optimise when width didn't change
290 291
291 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 294
294 do 295 do
295 { 296 {
296 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 299 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 301
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 { 303 {
… …
330 int qcol = 0; 329 int qcol = 0;
331 330
332 // see below for cursor adjustment rationale 331 // see below for cursor adjustment rationale
333 if (p == ocur.row) 332 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 333 screen.cur.row = q - (total_rows - nrow);
335 334
336 // fill a single destination line 335 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 336 while (lofs < llen && qcol < ncol)
338 { 337 {
339 int prow = lofs / prev_ncol; 338 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 339 int pcol = lofs % prev_ncol;
… …
366 } 365 }
367 while (p != pend && q > 0); 366 while (p != pend && q > 0);
368 367
369 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
370 top_row = q - term_start; 369 top_row = q - term_start;
371 370
372 // make sure all terminal lines exist 371 // make sure all terminal lines exist
373 while (top_row > 0) 372 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 373 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 374 }
376 else 375 else
377 { 376 {
378 // if no scrollback exists (yet), wing, instead of wrap 377 // if no scrollback exists (yet), wing, instead of wrap
379 378
380 for (int row = min (nrow, prev_nrow); row--; ) 379 for (int row = min (nrow, prev_nrow); row--; )
381 { 380 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 382 line_t &qline = row_buf [row];
384 383
… …
398 delete old_ta; 397 delete old_ta;
399 delete old_ra; 398 delete old_ra;
400 399
401 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
403 403
404 free (tabs); 404 free (tabs);
405 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
406 409
407 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
408 411
409 prev_nrow = nrow; 412 prev_nrow = nrow;
410 prev_ncol = ncol; 413 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 414
420 tt_winch (); 415 tt_winch ();
421 416
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 418}
… …
435 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
436 431
437 free (row_buf); 432 free (row_buf);
438 free (swap_buf); 433 free (swap_buf);
439 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
440 free (tabs); 437 free (tabs);
441 438 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 439 }
444} 440}
445 441
446/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
447/* 443/*
448 * Hard reset 444 * Hard/Soft reset
449 */ 445 */
450void 446void
451rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
452{ 448{
453 scr_release (); 449 scr_release ();
454 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
455 scr_reset (); 453 scr_reset ();
456 454
457 scr_clear (true); 455 scr_clear (true);
458 scr_refresh (); 456 scr_refresh ();
457}
458
459void
460rxvt_term::scr_soft_reset ()
461{
462 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY
464 scr_overlay_off ();
465#endif
466
467 if (current_screen != PRIMARY)
468 scr_swap_screen ();
469
470 scr_scroll_region (0, MAX_ROWS - 1);
471 scr_rendition (0, ~RS_None);
472 scr_insert_mode (0);
459} 473}
460 474
461/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
501 } 515 }
502 516
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
509#endif
510} 522}
511 523
512void 524void
513rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
514{ 526{
515 if (!OPTION (Opt_secondaryScreen)) 527 if (!option (Opt_secondaryScreen))
516 return; 528 return;
517 529
518 for (int i = prev_nrow; i--; ) 530 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 531 ::swap (ROW(i), swap_buf [i]);
520 532
… …
539 want_refresh = 1; 551 want_refresh = 1;
540 view_start = 0; 552 view_start = 0;
541 553
542 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
543 555
544 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
545 557
546#if NSCREENS 558#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
548 { 560 {
549 num_scr = 0; 561 num_scr = 0;
550 562
551 scr_swap_screen (); 563 scr_swap_screen ();
552 564
… …
555 screen.flags |= Screen_VisibleCursor; 567 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 568 swap.flags |= Screen_VisibleCursor;
557 } 569 }
558 else 570 else
559#endif 571#endif
560 if (OPTION (Opt_secondaryScroll)) 572 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 573 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 574}
563 575
564// clear WrapNext indicator, solidifying position on next line 576// clear WrapNext indicator, solidifying position on next line
565void 577void
… …
598/* 610/*
599 * Change the rendition style for following text 611 * Change the rendition style for following text
600 */ 612 */
601void 613void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 614rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 615{
604 if (set) 616 if (set)
605 rstyle |= style; 617 rstyle |= style;
606 else if (style == ~RS_None) 618 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 619 rstyle = DEFAULT_RSTYLE;
608 else 620 else
609 rstyle &= ~style; 621 rstyle &= ~style;
610 } 622}
611 623
612/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
613/* 625/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 626 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 627 * count positive ==> scroll up
… …
624 want_refresh = 1; 636 want_refresh = 1;
625 num_scr += count; 637 num_scr += count;
626 638
627 if (count > 0 639 if (count > 0
628 && row1 == 0 640 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 642 {
631 top_row = max (top_row - count, -saveLines); 643 top_row = max (top_row - count, -saveLines);
632 644
633 // scroll everything up 'count' lines 645 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 646 term_start = (term_start + count) % total_rows;
… …
645 { 657 {
646 line_t &l = ROW(nrow - 1 - i); 658 line_t &l = ROW(nrow - 1 - i);
647 659
648 // optimize if already cleared, can be significant on slow machines 660 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 661 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) 662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 663 {
652 scr_blank_line (l, 0, l.l, rstyle); 664 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 665 l.l = 0;
654 l.f = 0; 666 l.f = 0;
655 } 667 }
… …
666 line_t &l2 = ROW(i); 678 line_t &l2 = ROW(i);
667 679
668 ::swap (l1, l2); 680 ::swap (l1, l2);
669 l2.touch (); 681 l2.touch ();
670 } 682 }
671 683
672 // move and/or clear selection, if any 684 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 685 if (selection.op && current_screen == selection.screen)
674 { 686 {
675 selection.beg.row -= count; 687 selection.beg.row -= count;
676 selection.end.row -= count; 688 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 696 selection.op = SELECTION_CLEAR;
685 } 697 }
686 } 698 }
687 699
688 // finally move the view window, if desired 700 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 701 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 702 && view_start != 0
691 && view_start != -saveLines) 703 && view_start != -saveLines)
692 scr_page (UP, count); 704 scr_page (UP, count);
693 705
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 706 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 724 {
713 /* move selected region too */ 725 /* move selected region too */
714 selection.beg.row -= count; 726 selection.beg.row -= count;
715 selection.end.row -= count; 727 selection.end.row -= count;
716 selection.mark.row -= count; 728 selection.mark.row -= count;
717 729
718 selection_check (0); 730 selection_check (0);
719 } 731 }
720 } 732 }
721 733
722 // use a simple and robust scrolling algorithm, this 734 // use a simple and robust scrolling algorithm, this
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 787 screen.cur.row -= minlines;
776 } 788 }
777 } 789 }
778 790
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 791 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 792 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 793 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 794 int row = screen.cur.row;
785 795
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 796 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 797
788 line_t *line = &ROW(row); 798 line_t *line = &ROW(row);
789 799
790 while (str < strend) 800 while (str < strend)
791 { 801 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 803
794 if (c < 0x20) 804 if (expect_false (c < 0x20))
795 if (c == C0_LF) 805 if (c == C0_LF)
796 { 806 {
797 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
798 808
799 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
… …
818 { 828 {
819 scr_tab (1, true); 829 scr_tab (1, true);
820 continue; 830 continue;
821 } 831 }
822 832
833 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 834 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 836 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 ))
826 { 838 {
827 checksel = 0; 839 checksel = 0;
828 /* 840 /*
829 * If we wrote anywhere in the selected area, kill the selection 841 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 842 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 843 * should be a similar check.
832 */ 844 */
833 CLEAR_SELECTION (); 845 CLEAR_SELECTION ();
834 } 846 }
835 847
836 if (screen.flags & Screen_WrapNext) 848 if (expect_false (screen.flags & Screen_WrapNext))
837 { 849 {
838 scr_do_wrap (); 850 scr_do_wrap ();
839 851
840 line->l = ncol; 852 line->l = ncol;
841 line->is_longer (1); 853 line->is_longer (1);
842 854
843 row = screen.cur.row; 855 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 856 line = &ROW(row); /* _must_ refresh */
845 } 857 }
846 858
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 859 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 861 c = 0xfffd;
850 862
851 // rely on wcwidth to tell us the character width, do wcwidth before 863 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 864 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 865 // drawing characters below as they might be invalid in the current
854 // locale. 866 // locale.
855 int width = WCWIDTH (c); 867 int width = WCWIDTH (c);
856 868
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 870 {
859 // vt100 special graphics and line drawing 871 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 872 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 873 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 874 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 887 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 888 width = 1; // vt100 line drawing characters are always single-width
877 } 889 }
878 } 890 }
879 891
880 if (screen.flags & Screen_Insert) 892 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 893 scr_insdel_chars (width, INSERT);
882 894
883 if (width != 0) 895 if (width != 0)
884 { 896 {
885#if !UNICODE_3 897#if !UNICODE_3
… …
890# else 902# else
891 c = 0xfffd; 903 c = 0xfffd;
892# endif 904# endif
893#endif 905#endif
894 906
907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908
909 // if the character doesn't fit into the remaining columns...
910 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
911 {
912 if (screen.flags & Screen_Autowrap)
913 {
914 // ... artificially enlargen the previous one
915 c = NOCHAR;
916 // and try the same character next loop iteration
917 --str;
918 }
919 else
920 screen.cur.col = ncol - width;
921 }
922
895 // nuke the character at this position, if required 923 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself,
926 // only its tail.
896 if (line->t[screen.cur.col] == NOCHAR 927 if (expect_false (line->t[screen.cur.col] == NOCHAR))
897 || (screen.cur.col < ncol - 1 928 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 929
927 line->touch (); 930 line->touch ();
928 931
929 do 932 do
930 { 933 {
931 line->t[screen.cur.col] = c; 934 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 935 line->r[screen.cur.col] = rend;
933 936
934 if (screen.cur.col < ncol - 1) 937 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 938 screen.cur.col++;
936 else 939 else
937 { 940 {
938 line->l = ncol; 941 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 943 screen.flags |= Screen_WrapNext;
941 break; 944
945 goto end_of_line;
942 } 946 }
943 947
944 c = NOCHAR; 948 c = NOCHAR;
945 } 949 }
946 while (--width > 0); 950 while (expect_false (--width > 0));
947 951
948 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 953 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
950 { 954 {
951 line->touch (); 955 line->t[c] = ' ';
956 line->r[c] = rend;
957 }
952 958
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 959end_of_line:
960 ;
961 }
962#if ENABLE_COMBINING
963 else // width == 0
964 {
965 if (c != 0xfeff) // ignore BOM
966 {
967 // handle combining characters
968 // we just tag the accent on the previous on-screen character.
969 // this is arguably not correct, but also arguably not wrong.
970 // we don't handle double-width characters nicely yet.
971 line_t *linep;
972 text_t *tp;
973 rend_t *rp;
974
975 if (screen.cur.col > 0)
954 { 976 {
955 line->t[c] = ' ';
956 line->r[c] = rend; 977 linep = line;
978 tp = line->t + screen.cur.col - 1;
979 rp = line->r + screen.cur.col - 1;
957 } 980 }
981 else if (screen.cur.row > 0
982 && ROW(screen.cur.row - 1).is_longer ())
983 {
984 linep = &ROW(screen.cur.row - 1);
985 tp = line->t + ncol - 1;
986 rp = line->r + ncol - 1;
987 }
988 else
989 continue;
990
991 linep->touch ();
992
993 while (*tp == NOCHAR && tp > linep->t)
994 tp--, rp--;
995
996 // first try to find a precomposed character
997 unicode_t n = rxvt_compose (*tp, c);
998 if (n == NOCHAR)
999 n = rxvt_composite.compose (*tp, c);
1000
1001 *tp = n;
1002 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 1003 }
959 } 1004 }
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 1005#endif
1000 }
1001 } 1006 }
1002 1007
1003 max_it (line->l, screen.cur.col); 1008 max_it (line->l, screen.cur.col);
1004 1009
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1010 assert (screen.cur.row >= 0);
1007#endif
1008} 1011}
1009 1012
1010/* ------------------------------------------------------------------------- */ 1013/* ------------------------------------------------------------------------- */
1011/* 1014/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1015 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1016 * XTERM_SEQ: CTRL-H
1014 */ 1017 */
1015void 1018void
1016rxvt_term::scr_backspace () NOTHROW 1019rxvt_term::scr_backspace () NOTHROW
1017{ 1020{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1021 if (screen.cur.col == 0)
1021 { 1022 {
1022 if (screen.cur.row > 0) 1023 if (screen.cur.row > 0)
1023 { 1024 {
1024#ifdef TERMCAP_HAS_BW 1025#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1026 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1027 --screen.cur.row;
1027 return; 1028
1029 want_refresh = 1;
1028#endif 1030#endif
1029 } 1031 }
1030 } 1032 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1033 else if (screen.flags & Screen_WrapNext)
1034 screen.flags &= ~Screen_WrapNext;
1035 else
1032 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1037}
1036 1038
1037/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
1038/* 1040/*
1039 * Process Horizontal Tab 1041 * Process Horizontal Tab
… …
1062 x = i; 1064 x = i;
1063 1065
1064 if (!--count) 1066 if (!--count)
1065 break; 1067 break;
1066 } 1068 }
1067 else 1069 else
1068 ht &= l.t[i] == ' ' 1070 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1071 && RS_SAME (l.r[i], base_rend);
1070 1072
1071 if (count) 1073 if (count)
1072 x = ncol - 1; 1074 x = ncol - 1;
1073 1075
1074 // store horizontal tab commands as characters inside the text 1076 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1077 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1078 if (ht && option (Opt_pastableTabs))
1077 { 1079 {
1078 base_rend = SET_FONT (base_rend, 0); 1080 base_rend = SET_FONT (base_rend, 0);
1079 1081
1080 l.touch (x); 1082 l.touch (x);
1081 1083
… …
1114 * Process DEC Back Index 1116 * Process DEC Back Index
1115 * XTERM_SEQ: ESC 6 1117 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1118 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1119 * in that row right. Clear left column.
1118 */ 1120 */
1119#if ENABLE_FRILLS 1121#if !ENABLE_MINIMAL
1120void 1122void
1121rxvt_term::scr_backindex () NOTHROW 1123rxvt_term::scr_backindex () NOTHROW
1122{ 1124{
1123 if (screen.cur.col > 0) 1125 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1126 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1131 * Process DEC Forward Index 1133 * Process DEC Forward Index
1132 * XTERM_SEQ: ESC 9 1134 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1135 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1136 * in that row left. Clear right column.
1135 */ 1137 */
1136#if ENABLE_FRILLS 1138#if !ENABLE_MINIMAL
1137void 1139void
1138rxvt_term::scr_forwardindex () NOTHROW 1140rxvt_term::scr_forwardindex () NOTHROW
1139{ 1141{
1140 if (screen.cur.col < ncol - 1) 1142 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1143 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1188 } 1190 }
1189 } 1191 }
1190 else 1192 else
1191 { 1193 {
1192 if (screen.flags & Screen_Relative) 1194 if (screen.flags & Screen_Relative)
1195 {
1193 { /* relative origin mode */ 1196 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1197 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1198 min_it (screen.cur.row, screen.bscroll);
1196 } 1199 }
1197 else 1200 else
1198 screen.cur.row = row; 1201 screen.cur.row = row;
… …
1231/* 1234/*
1232 * Erase part or whole of a line 1235 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1236 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1237 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1238 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1239 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1240 */
1237void 1241void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1242rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1243{
1240 unsigned int col, num; 1244 unsigned int col, num;
… …
1249 line.touch (); 1253 line.touch ();
1250 line.is_longer (0); 1254 line.is_longer (0);
1251 1255
1252 switch (mode) 1256 switch (mode)
1253 { 1257 {
1258 case 3:
1259 if (screen.flags & Screen_WrapNext)
1260 return;
1261
1262 /* fall through */
1263
1254 case 0: /* erase to end of line */ 1264 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1265 col = screen.cur.col;
1256 num = ncol - col; 1266 num = ncol - col;
1257 min_it (line.l, col); 1267 min_it (line.l, col);
1268
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1261 break; 1272 break;
1273
1262 case 1: /* erase to beginning of line */ 1274 case 1: /* erase to beginning of line */
1263 col = 0; 1275 col = 0;
1264 num = screen.cur.col + 1; 1276 num = screen.cur.col + 1;
1277
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1278 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1279 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1280 CLEAR_SELECTION ();
1268 break; 1281 break;
1282
1269 case 2: /* erase whole line */ 1283 case 2: /* erase whole line */
1270 col = 0; 1284 col = 0;
1271 num = ncol; 1285 num = ncol;
1272 line.l = 0; 1286 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1287 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1332 return; 1346 return;
1333 1347
1334 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1335 1349
1336 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1353 {
1340 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1355
1356 if (mapped)
1357 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width,
1359 (unsigned int)Height2Pixel (num), False);
1342 } 1360 }
1343 else 1361 else
1344 { 1362 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1364
1365 if (mapped)
1366 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1369 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start),
1371 (unsigned int)width,
1372 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1373 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1374 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 }
1351 } 1376 }
1352 1377
1353 for (; num--; row++) 1378 for (; num--; row++)
1354 { 1379 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381
1382 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1384 }
1358} 1385}
1359 1386
1360#if ENABLE_FRILLS 1387#if !ENABLE_MINIMAL
1361void 1388void
1362rxvt_term::scr_erase_savelines () NOTHROW 1389rxvt_term::scr_erase_savelines () NOTHROW
1363{ 1390{
1364 want_refresh = 1; 1391 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1392 ZERO_SCROLLBACK ();
… …
1435 * Insert/Delete <count> characters from the current position 1462 * Insert/Delete <count> characters from the current position
1436 */ 1463 */
1437void 1464void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1465rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1466{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1467 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1445 1469
1446 if (count <= 0) 1470 if (count <= 0)
1447 return; 1471 return;
… …
1449 scr_do_wrap (); 1473 scr_do_wrap ();
1450 1474
1451 selection_check (1); 1475 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1476 min_it (count, ncol - screen.cur.col);
1453 1477
1454 row = screen.cur.row; 1478 int row = screen.cur.row;
1455 1479
1456 line_t *line = &ROW(row); 1480 line_t *line = &ROW(row);
1457 1481
1458 line->touch (); 1482 line->touch ();
1459 line->is_longer (0); 1483 line->is_longer (0);
1460 1484
1485 // nuke wide spanning the start
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1461 switch (insdel) 1489 switch (insdel)
1462 { 1490 {
1463 case INSERT: 1491 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1492 line->l = min (line->l + count, ncol);
1493
1494 if (line->t[screen.cur.col] == NOCHAR)
1495 scr_kill_char (*line, screen.cur.col);
1496
1497 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1498 {
1466 line->t[col] = line->t[col - count]; 1499 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1500 line->r[col] = line->r[col - count];
1468 } 1501 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1502
1472 if (selection.op && current_screen == selection.screen 1503 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1505 {
1475 if (selection.end.row != screen.cur.row 1506 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1507 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1508 CLEAR_SELECTION ();
1478 else 1509 else
1510 {
1479 { /* shift selection */ 1511 /* shift selection */
1480 selection.beg.col += count; 1512 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1513 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1514 selection.end.col += count;
1483 } 1515 }
1484 } 1516 }
… …
1489 case ERASE: 1521 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1522 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1523 selection_check (1);
1492 screen.cur.col -= count; 1524 screen.cur.col -= count;
1493 1525
1494 line->l = max (line->l - count, 0); 1526 // nuke wide char after the end
1527 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1528 scr_kill_char (*line, screen.cur.col + count);
1529
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1530 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1531 break;
1497 1532
1498 case DELETE: 1533 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 line->l = max (line->l - count, 0);
1500 1535
1536 // nuke wide char spanning the end
1537 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1538 scr_kill_char (*line, screen.cur.col + count);
1539
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1540 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1541 {
1503 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1505 } 1544 }
1506 1545
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1547
1510 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1550 {
1513 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
… …
1623 */ 1661 */
1624void 1662void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1663rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1664{
1627 if (mode < 0) 1665 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1666 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1667 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1668 tabs [screen.cur.col] = !!mode;
1631} 1669}
1632 1670
1633/* ------------------------------------------------------------------------- */ 1671/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1686 if (rvideo_state != on)
1649 { 1687 {
1650 rvideo_state = on; 1688 rvideo_state = on;
1651 1689
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1691#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1655#endif 1693#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1695
1661 XGCValues gcvalue; 1696 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1698 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1699 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1700
1666 scr_clear (); 1701 scr_clear ();
1667 scr_touch (true); 1702 scr_touch (true);
1668 } 1703 }
1669} 1704}
… …
1754{ 1789{
1755 bool found = false; 1790 bool found = false;
1756 1791
1757 for (int i = 0; i < nrow; i++) 1792 for (int i = 0; i < nrow; i++)
1758 { 1793 {
1759 int col = 0;
1760 rend_t *drp = drawn_buf[i].r; 1794 rend_t *drp = drawn_buf[i].r;
1761 1795
1762 for (; col < ncol; col++, drp++) 1796 for (int col = 0; col < ncol; col++, drp++)
1763 if ((*drp & mask) == value) 1797 if ((*drp & mask) == value)
1764 { 1798 {
1765 found = true; 1799 found = true;
1766 *drp = ~value; 1800 *drp = ~value;
1767 } 1801 }
… …
1872 return true; 1906 return true;
1873} 1907}
1874 1908
1875#ifndef NO_BELL 1909#ifndef NO_BELL
1876void 1910void
1877rxvt_term::bell_cb (time_watcher &w) 1911rxvt_term::bell_cb (ev::timer &w, int revents)
1878{ 1912{
1879 rvideo_bell = false; 1913 rvideo_bell = false;
1880 scr_rvideo_mode (rvideo_mode); 1914 scr_rvideo_mode (rvideo_mode);
1915 refresh_check ();
1881} 1916}
1882#endif 1917#endif
1883 1918
1884/* ------------------------------------------------------------------------- */ 1919/* ------------------------------------------------------------------------- */
1885void 1920void
… …
1887{ 1922{
1888#ifndef NO_BELL 1923#ifndef NO_BELL
1889 1924
1890# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1891# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1892 if (OPTION (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1893# endif 1928# endif
1894 XMapWindow (xdisp, parent[0]); 1929 XMapWindow (dpy, parent);
1895# endif 1930# endif
1896 1931
1932# if ENABLE_FRILLS
1933 if (option (Opt_urgentOnBell))
1934 set_urgency (1);
1935# endif
1936
1897 if (OPTION (Opt_visualBell)) 1937 if (option (Opt_visualBell))
1898 { 1938 {
1899 rvideo_bell = true; 1939 rvideo_bell = true;
1900 scr_rvideo_mode (rvideo_mode); 1940 scr_rvideo_mode (rvideo_mode);
1901 display->flush (); 1941 flush ();
1902 1942
1903 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1904 } 1944 }
1905 else 1945 else
1906 XBell (xdisp, 0); 1946 XBell (dpy, 0);
1907 1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1908#endif 1948#endif
1909} 1949}
1910 1950
1911/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1912/* ARGSUSED */ 1952/* ARGSUSED */
1913void 1953void
1914rxvt_term::scr_printscreen (int fullhist) NOTHROW 1954rxvt_term::scr_printscreen (int fullhist) NOTHROW
1915{ 1955{
1916#ifdef PRINTPIPE 1956#ifdef PRINTPIPE
1917 int nrows, row_start; 1957 int nrows, row_start;
1918 FILE *fd; 1958 FILE *fd = popen_printer ();
1919 1959
1920 if ((fd = popen_printer ()) == NULL) 1960 if (!fd)
1921 return; 1961 return;
1922 1962
1923 if (fullhist) 1963 if (fullhist)
1924 { 1964 {
1925 nrows = nrow - top_row; 1965 nrows = nrow - top_row;
… …
1931 row_start = view_start; 1971 row_start = view_start;
1932 } 1972 }
1933 1973
1934 wctomb (0, 0); 1974 wctomb (0, 0);
1935 1975
1936 for (int r1 = 0; r1 < nrows; r1++) 1976 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1937 { 1977 {
1938 text_t *tp = ROW(r1).t; 1978 text_t *tp = ROW(r1).t;
1939 int len = ROW(r1).l; 1979 int len = ROW(r1).l;
1940 1980
1941 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1970 * screen.text/screen.rend contain what the screen will change to. 2010 * screen.text/screen.rend contain what the screen will change to.
1971 */ 2011 */
1972void 2012void
1973rxvt_term::scr_refresh () NOTHROW 2013rxvt_term::scr_refresh () NOTHROW
1974{ 2014{
1975 unsigned char must_clear, /* use draw_string not draw_image_string */
1976 showcursor; /* show the cursor */
1977 int16_t col, row, /* column/row we're processing */ 2015 int16_t col, row, /* column/row we're processing */
1978 ocrow; /* old cursor row */ 2016 ocrow; /* old cursor row */
1979 int i; /* tmp */ 2017 int i; /* tmp */
1980#ifndef NO_CURSORCOLOR 2018#ifndef NO_CURSORCOLOR
1981 rend_t cc1; /* store colours at cursor position (s) */ 2019 rend_t cc1; /* store colours at cursor position (s) */
1982#endif 2020#endif
1983 rend_t *crp; // cursor rendition pointer 2021 rend_t *crp; // cursor rendition pointer
2022 rend_t ccol1, /* Cursor colour */
2023 ccol2; /* Cursor colour2 */
1984 2024
1985 want_refresh = 0; /* screen is current */ 2025 want_refresh = 0; /* screen is current */
1986 2026
1987 if (refresh_type == NO_REFRESH || !mapped) 2027 if (refresh_type == NO_REFRESH || !mapped)
1988 return; 2028 return;
1989 2029
1990 /* 2030 /*
1991 * A: set up vars 2031 * A: set up vars
1992 */ 2032 */
1993 must_clear = 0;
1994 refresh_count = 0; 2033 refresh_count = 0;
1995 2034
1996#if XPM_BACKGROUND 2035 unsigned int old_screen_flags = screen.flags;
1997 must_clear |= bgPixmap.pixmap != None; 2036 char have_bg = 0;
1998#endif 2037#ifdef HAVE_BG_PIXMAP
1999#if TRANSPARENT 2038 have_bg = bg_pixmap != None;
2000 must_clear |= OPTION (Opt_transparent) && am_transparent;
2001#endif 2039#endif
2002 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2003 2041
2004 /* 2042 /*
2005 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
2006 */ 2044 */
2007 scr_reverse_selection (); 2045 scr_reverse_selection ();
2046
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY
2049 scr_swap_overlay ();
2050#endif
2051
2052 char showcursor = screen.flags & Screen_VisibleCursor;
2008 2053
2009 /* 2054 /*
2010 * C: set the cursor character (s) 2055 * C: set the cursor character (s)
2011 */ 2056 */
2012 { 2057 {
2013 unsigned char setoldcursor; 2058 unsigned char setoldcursor;
2014 rend_t ccol1, /* Cursor colour */
2015 ccol2; /* Cursor colour2 */
2016 2059
2017 showcursor = (screen.flags & Screen_VisibleCursor);
2018#ifdef CURSOR_BLINK 2060#ifdef CURSOR_BLINK
2019 if (hidden_cursor) 2061 if (hidden_cursor)
2020 showcursor = 0; 2062 showcursor = 0;
2021#endif 2063#endif
2022 2064
… …
2027 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2069 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2028 col--; 2070 col--;
2029 2071
2030 crp = &ROW(screen.cur.row).r[col]; 2072 crp = &ROW(screen.cur.row).r[col];
2031 2073
2032 if (showcursor && focus) 2074#ifndef NO_CURSORCOLOR
2075 cc1 = *crp & (RS_fgMask | RS_bgMask);
2076 if (ISSET_PIXCOLOR (Color_cursor))
2077 ccol1 = Color_cursor;
2078 else
2079#endif
2080#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2081 ccol1 = fgcolor_of (rstyle);
2082#else
2083 ccol1 = Color_fg;
2084#endif
2085
2086#ifndef NO_CURSORCOLOR
2087 if (ISSET_PIXCOLOR (Color_cursor2))
2088 ccol2 = Color_cursor2;
2089 else
2090#endif
2091#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2092 ccol2 = bgcolor_of (rstyle);
2093#else
2094 ccol2 = Color_bg;
2095#endif
2096
2097 if (focus)
2033 { 2098 {
2034 if (OPTION (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2035 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2036 else 2101 else
2037 { 2102 {
2038 *crp ^= RS_RVid; 2103 *crp ^= RS_RVid;
2039
2040#ifndef NO_CURSORCOLOR
2041 cc1 = *crp & (RS_fgMask | RS_bgMask);
2042 if (ISSET_PIXCOLOR (Color_cursor))
2043 ccol1 = Color_cursor;
2044 else
2045#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2046 ccol1 = fgcolor_of (rstyle);
2047#else
2048 ccol1 = Color_fg;
2049#endif
2050 if (ISSET_PIXCOLOR (Color_cursor2))
2051 ccol2 = Color_cursor2;
2052 else
2053#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2054 ccol2 = bgcolor_of (rstyle);
2055#else
2056 ccol2 = Color_bg;
2057#endif
2058 *crp = SET_FGCOLOR (*crp, ccol1); 2104 *crp = SET_FGCOLOR (*crp, ccol1);
2059 *crp = SET_BGCOLOR (*crp, ccol2); 2105 *crp = SET_BGCOLOR (*crp, ccol2);
2060#endif
2061 } 2106 }
2062 } 2107 }
2063 } 2108 }
2064 2109
2065 /* make sure no outline cursor is left around */ 2110 /* make sure no outline cursor is left around */
… …
2092 oldcursor.col = screen.cur.col; 2137 oldcursor.col = screen.cur.col;
2093 } 2138 }
2094 } 2139 }
2095 } 2140 }
2096 2141
2097 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2098#if ENABLE_OVERLAY
2099 scr_swap_overlay ();
2100#endif
2101
2102#ifndef NO_SLOW_LINK_SUPPORT 2142#ifndef NO_SLOW_LINK_SUPPORT
2103 /* 2143 /*
2104 * D: CopyArea pass - very useful for slower links 2144 * D: CopyArea pass - very useful for slower links
2105 * This has been deliberately kept simple. 2145 * This has been deliberately kept simple.
2106 */ 2146 */
2107 if (!display->is_local 2147 if (!display->is_local
2108 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2148 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2109 && abs (num_scr) < nrow && !must_clear) 2149 && abs (num_scr) < nrow && !have_bg)
2110 { 2150 {
2111 int16_t nits; 2151 int16_t nits;
2152 int i = num_scr;
2112 int j; 2153 int j;
2113 int len, wlen; 2154 int len, wlen;
2114 dLocal (int, num_scr); 2155 dLocal (int, num_scr);
2115 2156
2116 j = nrow; 2157 j = nrow;
2117 wlen = len = -1; 2158 wlen = len = -1;
2118 row = i > 0 ? 0 : j - 1; 2159 row = i > 0 ? 0 : j - 1;
2160
2119 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2161 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2120 { 2162 {
2121 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2163 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2122 { 2164 {
2123 line_t s = ROW(view_start + row); 2165 line_t s = ROW(view_start + row);
… …
2144 wlen = row; 2186 wlen = row;
2145 continue; 2187 continue;
2146 } 2188 }
2147 } 2189 }
2148 2190
2149 if (len != -1) 2191 if (len >= 0)
2150 { 2192 {
2151 /* also comes here at end if needed because of >= above */ 2193 /* also comes here at end if needed because of >= above */
2152 if (wlen < len) 2194 if (wlen < len)
2153 ::swap (wlen, len); 2195 ::swap (wlen, len);
2154 2196
2197 XGCValues gcv;
2198
2199 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2155 XCopyArea (xdisp, vt, vt, 2200 XCopyArea (dpy, vt, vt,
2156 gc, 0, Row2Pixel (len + i), 2201 gc, 0, Row2Pixel (len + i),
2157 (unsigned int)this->width, 2202 (unsigned int)this->width,
2158 (unsigned int)Height2Pixel (wlen - len + 1), 2203 (unsigned int)Height2Pixel (wlen - len + 1),
2159 0, Row2Pixel (len)); 2204 0, Row2Pixel (len));
2205 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2206
2160 len = -1; 2207 len = -1;
2161 } 2208 }
2162 } 2209 }
2163 } 2210 }
2164#endif 2211#endif
… …
2188 continue; 2235 continue;
2189 2236
2190 // redraw one or more characters 2237 // redraw one or more characters
2191 2238
2192 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2193 while (stp[col] == NOCHAR && col > 0) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2194 --col; 2241 --col;
2195 2242
2196 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2197 text_t *text = stp + col; 2244 text_t *text = stp + col;
2198 int count = 1; 2245 int count = 1;
2199 2246
2200 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2201 drp[col] = rend; 2248 drp[col] = rend;
… …
2205 for (i = 0; ++col < ncol; ) 2252 for (i = 0; ++col < ncol; )
2206 { 2253 {
2207 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2208 { 2255 {
2209 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2210 drp[col] = rend; 2257 drp[col] = srp[col];
2258
2211 count++; 2259 count++;
2212 i++; 2260 i++;
2213 2261
2214 continue; 2262 continue;
2215 } 2263 }
… …
2220 count++; 2268 count++;
2221 2269
2222 if (stp[col] != dtp[col] 2270 if (stp[col] != dtp[col]
2223 || !RS_SAME (srp[col], drp[col])) 2271 || !RS_SAME (srp[col], drp[col]))
2224 { 2272 {
2225 if (must_clear && (i++ > count / 2)) 2273 if (have_bg && (i++ > count / 2))
2226 break; 2274 break;
2227 2275
2228 dtp[col] = stp[col]; 2276 dtp[col] = stp[col];
2229 drp[col] = rend; 2277 drp[col] = rend;
2230 i = 0; 2278 i = 0;
2231 } 2279 }
2232 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2280 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2233 break; 2281 break;
2234 } 2282 }
2235 2283
2236 col--; /* went one too far. move back */ 2284 col--; /* went one too far. move back */
2237 count -= i; /* dump any matching trailing chars */ 2285 count -= i; /* dump any matching trailing chars */
2238 2286
2239 // sometimes we optimize away the trailing NOCHAR's, add them back 2287 // sometimes we optimize away the trailing NOCHAR's, add them back
2240 while (i && text[count] == NOCHAR) 2288 while (expect_false (i && text[count] == NOCHAR))
2241 count++, i--; 2289 count++, i--;
2242 2290
2243 /* 2291 /*
2244 * Determine the attributes for the string 2292 * Determine the attributes for the string
2245 */ 2293 */
2246 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2247 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2248 2296
2249 // only do special processing if any attributes are set, which is unlikely 2297 // only do special processing if any attributes are set, which is unlikely
2250 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2251 { 2299 {
2252#if ENABLE_STYLES
2253 // "careful" (too wide) character handling
2254
2255 // include previous careful character(s) if possible, looks nicer (best effort...)
2256 while (text > stp
2257 && srp[text - stp - 1] & RS_Careful
2258 && RS_SAME (rend, srp[text - stp - 1]))
2259 text--, count++, xpixel -= fwidth;
2260
2261 // force redraw after "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2263 drp[col + i + 1] = ~srp[col + i + 1];
2264
2265 // force redraw before "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2267 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2268#endif
2269
2270 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2271 2301
2272#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2273 if (rend & RS_Bold
2274 && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
2275 { 2304 {
2276 if (ISSET_PIXCOLOR (Color_BD)) 2305 if (ISSET_PIXCOLOR (Color_BD))
2277 fore = Color_BD; 2306 fore = Color_BD;
2278# if !ENABLE_STYLES 2307# if !ENABLE_STYLES
2279 else 2308 else
2280 invert = !invert; 2309 invert = !invert;
2281# endif 2310# endif
2282 } 2311 }
2283 2312
2284 if (rend & RS_Italic 2313 if (rend & RS_Italic && fore == Color_fg)
2285 && fore == Color_fg)
2286 { 2314 {
2287 if (ISSET_PIXCOLOR (Color_IT)) 2315 if (ISSET_PIXCOLOR (Color_IT))
2288 fore = Color_IT; 2316 fore = Color_IT;
2289# if !ENABLE_STYLES 2317# if !ENABLE_STYLES
2290 else 2318 else
2291 invert = !invert; 2319 invert = !invert;
2292# endif 2320# endif
2293 } 2321 }
2294 2322
2295 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2296 fore = Color_UL; 2324 fore = Color_UL;
2325#endif
2326
2327#ifdef OPTION_HC
2328 if (rend & RS_Sel)
2329 {
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2333 && ISSET_PIXCOLOR (Color_HC))
2334 {
2335 if (ISSET_PIXCOLOR (Color_HTC))
2336 fore = Color_HTC;
2337 // if invert is 0 reverse video is set so we use bg color as fg color
2338 else if (!invert)
2339 fore = back;
2340
2341 back = Color_HC;
2342 invert = 0;
2343 }
2344 }
2297#endif 2345#endif
2298 2346
2299 if (invert) 2347 if (invert)
2300 { 2348 {
2301 ::swap (fore, back); 2349 ::swap (fore, back);
2302 2350
2303#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#ifndef NO_BOLD_UNDERLINE_REVERSE
2304 if (ISSET_PIXCOLOR (Color_RV))
2305 back = Color_RV;
2306
2307 if (fore == back) 2352 if (fore == back)
2308 { 2353 {
2309 fore = Color_bg; 2354 fore = Color_bg;
2310 back = Color_fg; 2355 back = Color_fg;
2311 } 2356 }
… …
2313 } 2358 }
2314 2359
2315#ifdef TEXT_BLINK 2360#ifdef TEXT_BLINK
2316 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2361 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2317 { 2362 {
2318 if (!text_blink_ev.active) 2363 if (!text_blink_ev.is_active ())
2319 { 2364 {
2320 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2365 text_blink_ev.again ();
2321 hidden_text = 0; 2366 hidden_text = 0;
2322 } 2367 }
2323 else if (hidden_text) 2368 else if (hidden_text)
2324 fore = back; 2369 fore = back;
2325 } 2370 }
2326#endif 2371#endif
2372
2373#if ENABLE_STYLES
2374 // "careful" (too wide) character handling
2375
2376 // include previous careful character(s) if possible, looks nicer (best effort...)
2377 while (text > stp
2378 && srp[text - stp - 1] & RS_Careful
2379 && RS_SAME (rend, srp[text - stp - 1]))
2380 text--, count++, xpixel -= fwidth;
2381
2382 // force redraw after "careful" characters to avoid pixel droppings
2383 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2384 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2385
2386 // force redraw before "careful" characters to avoid pixel droppings
2387 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2388 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2389#endif
2327 } 2390 }
2328 2391
2329 /* 2392 /*
2330 * Actually do the drawing of the string here 2393 * Actually do the drawing of the string here
2331 */ 2394 */
2332 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2395 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2333 2396
2334 if (back == fore) 2397 if (expect_true (have_bg && back == Color_bg))
2335 font->clear_rect (*drawable, xpixel, ypixel,
2336 fwidth * count, fheight,
2337 back);
2338 else if (back == Color_bg)
2339 { 2398 {
2340 if (must_clear) 2399 // this is very ugly, maybe push it into ->draw?
2341 {
2342 CLEAR_CHARS (xpixel, ypixel, count);
2343 2400
2344 for (i = 0; i < count; i++) /* don't draw empty strings */ 2401 for (i = 0; i < count; i++) /* don't draw empty strings */
2345 if (text[i] != ' ') 2402 if (text[i] != ' ')
2346 { 2403 {
2347 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2404 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2348 break; 2405 goto did_clear;
2349 }
2350 } 2406 }
2351 else 2407
2352 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2408 CLEAR_CHARS (xpixel, ypixel, count);
2409 did_clear: ;
2353 } 2410 }
2354 else 2411 else
2355 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2412 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2356 2413
2357 if (rend & RS_Uline && font->descent > 1 && fore != back) 2414 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2358 { 2415 {
2359#if ENABLE_FRILLS 2416#if ENABLE_FRILLS
2360 if (ISSET_PIXCOLOR (Color_underline)) 2417 if (ISSET_PIXCOLOR (Color_underline))
2361 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2418 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2362 else 2419 else
2363#endif 2420#endif
2364 XSetForeground (xdisp, gc, pix_colors[fore]); 2421 XSetForeground (dpy, gc, pix_colors[fore]);
2365 2422
2366 XDrawLine (xdisp, drawBuffer, gc, 2423 XDrawLine (dpy, vt, gc,
2367 xpixel, ypixel + font->ascent + 1, 2424 xpixel, ypixel + font->ascent + 1,
2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2425 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2369 } 2426 }
2370 } /* for (col....) */ 2427 } /* for (col....) */
2371 } /* for (row....) */ 2428 } /* for (row....) */
2372 2429
2373#if ENABLE_OVERLAY
2374 scr_swap_overlay ();
2375#endif
2376 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2377
2378 /* 2430 /*
2379 * G: cleanup cursor and display outline cursor if necessary 2431 * G: cleanup cursor and display outline cursor if necessary
2380 */ 2432 */
2381 if (showcursor) 2433 if (showcursor)
2382 { 2434 {
2383 if (focus) 2435 if (focus)
2384 { 2436 {
2385 if (OPTION (Opt_cursorUnderline)) 2437 if (option (Opt_cursorUnderline))
2386 *crp ^= RS_Uline; 2438 *crp ^= RS_Uline;
2387 else 2439 else
2388 { 2440 {
2389 *crp ^= RS_RVid; 2441 *crp ^= RS_RVid;
2390#ifndef NO_CURSORCOLOR 2442#ifndef NO_CURSORCOLOR
… …
2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2456 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2405 cursorwidth++; 2457 cursorwidth++;
2406 2458
2407#ifndef NO_CURSORCOLOR 2459#ifndef NO_CURSORCOLOR
2408 if (ISSET_PIXCOLOR (Color_cursor)) 2460 if (ISSET_PIXCOLOR (Color_cursor))
2409 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2461 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2462 else
2410#endif 2463#endif
2464 XSetForeground (dpy, gc, pix_colors[ccol1]);
2411 2465
2412 XDrawRectangle (xdisp, drawBuffer, gc, 2466 XDrawRectangle (dpy, vt, gc,
2413 Col2Pixel (col), 2467 Col2Pixel (col),
2414 Row2Pixel (oldcursor.row), 2468 Row2Pixel (oldcursor.row),
2415 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2469 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2470 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2417 } 2471 }
2418 } 2472 }
2419 2473
2420 /* 2474 /*
2421 * H: cleanup selection 2475 * H: cleanup selection
2422 */ 2476 */
2477#if ENABLE_OVERLAY
2478 scr_swap_overlay ();
2479#endif
2480 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2481
2423 scr_reverse_selection (); 2482 scr_reverse_selection ();
2424 2483
2484 screen.flags = old_screen_flags;
2425 num_scr = 0; 2485 num_scr = 0;
2426 num_scr_allow = 1; 2486 num_scr_allow = 1;
2427} 2487}
2428 2488
2429void 2489void
… …
2450 scr_remap_chars (swap_buf [i]); 2510 scr_remap_chars (swap_buf [i]);
2451 } 2511 }
2452} 2512}
2453 2513
2454void 2514void
2455rxvt_term::scr_recolour () NOTHROW 2515rxvt_term::scr_recolour (bool refresh) NOTHROW
2456{ 2516{
2457 if (1 2517 bool transparent = false;
2458#if TRANSPARENT 2518
2459 && !am_transparent 2519#ifdef HAVE_BG_PIXMAP
2520 if (bg_pixmap != None)
2521 {
2522# ifdef ENABLE_TRANSPARENCY
2523 if (bg_flags & BG_IS_TRANSPARENT)
2524 {
2525 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2527
2528 transparent = true;
2529 }
2530 else
2460#endif 2531# endif
2461#if XPM_BACKGROUND
2462 && !bgPixmap.pixmap
2463#endif
2464 ) 2532 {
2533 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2534 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2535 }
2465 { 2536 }
2537 else
2538#endif
2539 {
2466 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2467 XClearWindow (xdisp, parent[0]);
2468 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2469#if HAVE_SCROLLBARS 2542 }
2543
2544 XClearWindow (dpy, parent);
2545
2470 if (scrollBar.win) 2546 if (scrollBar.win)
2471 { 2547 {
2548 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else
2472 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2473 scrollBar.setIdle (); 2552 scrollBar.state = STATE_IDLE;
2474 scrollbar_show (0); 2553 scrollBar.show (0);
2475 } 2554 }
2476#endif 2555
2556 if (refresh)
2477 } 2557 {
2478
2479 scr_clear (); 2558 scr_clear ();
2480 scr_touch (true); 2559 scr_touch (true);
2560 }
2481 want_refresh = 1; 2561 want_refresh = 1;
2482} 2562}
2483 2563
2484/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2485void 2565void
… …
2490 2570
2491 num_scr_allow = 0; 2571 num_scr_allow = 0;
2492 want_refresh = 1; 2572 want_refresh = 1;
2493 2573
2494 if (really) 2574 if (really)
2495 XClearWindow (xdisp, vt); 2575 XClearWindow (dpy, vt);
2496} 2576}
2497 2577
2498void 2578void
2499rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2579rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2500{ 2580{
… …
2549{ 2629{
2550 if (selection.op 2630 if (selection.op
2551 && current_screen == selection.screen 2631 && current_screen == selection.screen
2552 && selection.end.row >= view_start) 2632 && selection.end.row >= view_start)
2553 { 2633 {
2554#if ENABLE_FRILLS 2634#if !ENABLE_MINIMAL
2555 if (selection.rect) 2635 if (selection.rect)
2556 scr_xor_rect (selection.beg.row, selection.beg.col, 2636 scr_xor_rect (selection.beg.row, selection.beg.col,
2557 selection.end.row, selection.end.col, 2637 selection.end.row, selection.end.col,
2558 RS_RVid, RS_RVid | RS_Uline); 2638 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2559 else 2639 else
2560#endif 2640#endif
2561 scr_xor_span (selection.beg.row, selection.beg.col, 2641 scr_xor_span (selection.beg.row, selection.beg.col,
2562 selection.end.row, selection.end.col, 2642 selection.end.row, selection.end.col,
2563 RS_RVid); 2643 RS_Sel | RS_RVid);
2564 } 2644 }
2565} 2645}
2566 2646
2567/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2568/* 2648/*
… …
2573void 2653void
2574rxvt_term::scr_dump (int fd) NOTHROW 2654rxvt_term::scr_dump (int fd) NOTHROW
2575{ 2655{
2576 int row, wrote; 2656 int row, wrote;
2577 unsigned int width, towrite; 2657 unsigned int width, towrite;
2578 char r1[] = "\n"; 2658 const char r1[] = "\n";
2579 2659
2580 for (row = saveLines - nsaved; 2660 for (row = saveLines + top_row;
2581 row < saveLines + nrow - 1; row++) 2661 row < saveLines + nrow - 1; row++)
2582 { 2662 {
2583 width = row_buf[row].l >= 0 ? row_buf[row].l 2663 width = row_buf[row].l >= 0 ? row_buf[row].l
2584 : ncol; 2664 : ncol;
2585 for (towrite = width; towrite; towrite -= wrote) 2665 for (towrite = width; towrite; towrite -= wrote)
… …
2629/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2630/* 2710/*
2631 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2632 */ 2712 */
2633void 2713void
2634rxvt_term::paste (char *data, unsigned int len) NOTHROW 2714rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2635{ 2715{
2636 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2637 for (unsigned int i = 0; i < len; i++) 2717 for (unsigned int i = 0; i < len; i++)
2638 if (data[i] == C0_LF) 2718 if (data[i] == C0_LF)
2639 data[i] = C0_CR; 2719 data[i] = C0_CR;
2640 2720
2721 if (priv_modes & PrivMode_BracketPaste)
2722 tt_printf ("\e[200~");
2723
2641 tt_write (data, len); 2724 tt_write (data, len);
2642}
2643 2725
2644/* ------------------------------------------------------------------------- */ 2726 if (priv_modes & PrivMode_BracketPaste)
2645/* 2727 tt_printf ("\e[201~");
2646 * Respond to a notification that a primary selection has been sent
2647 * EXT: SelectionNotify
2648 */
2649void
2650rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2651{
2652 if (prop == None) /* check for failed XConvertSelection */
2653 {
2654 if ((selection_type & Sel_CompoundText))
2655 {
2656 int selnum = selection_type & Sel_whereMask;
2657
2658 selection_type = 0;
2659 if (selnum != Sel_direct)
2660 selection_request_other (XA_STRING, selnum);
2661 }
2662
2663 if ((selection_type & Sel_UTF8String))
2664 {
2665 int selnum = selection_type & Sel_whereMask;
2666
2667 selection_type = Sel_CompoundText;
2668 if (selnum != Sel_direct)
2669 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2670 else
2671 selection_type = 0;
2672 }
2673
2674 return;
2675 }
2676
2677 unsigned long bytes_after;
2678 XTextProperty ct;
2679
2680 if (XGetWindowProperty (xdisp, win, prop,
2681 0, PROP_SIZE / 4,
2682 delete_prop, AnyPropertyType,
2683 &ct.encoding, &ct.format,
2684 &ct.nitems, &bytes_after,
2685 &ct.value) != Success)
2686 {
2687 ct.value = 0;
2688 goto bailout;
2689 }
2690
2691 if (ct.encoding == None)
2692 goto bailout;
2693
2694 if (bytes_after)
2695 {
2696 // fetch and append remaining data
2697 XTextProperty ct2;
2698
2699 if (XGetWindowProperty (xdisp, win, prop,
2700 ct.nitems / 4, (bytes_after + 3) / 4,
2701 delete_prop, AnyPropertyType,
2702 &ct2.encoding, &ct2.format,
2703 &ct2.nitems, &bytes_after,
2704 &ct2.value) != Success)
2705 goto bailout;
2706
2707 // realloc should be compatible to XFree, here, and elsewhere, too
2708 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2709 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2710 ct.nitems += ct2.nitems;
2711
2712 XFree (ct2.value);
2713 }
2714
2715 if (ct.value == 0)
2716 goto bailout;
2717
2718 if (ct.encoding == xa[XA_INCR])
2719 {
2720 // INCR selection, start handshake
2721 if (!delete_prop)
2722 XDeleteProperty (xdisp, win, prop);
2723
2724 selection_wait = Sel_incr;
2725 incr_buf_fill = 0;
2726 incr_ev.start (NOW + 10);
2727
2728 goto bailout;
2729 }
2730
2731 if (ct.nitems == 0)
2732 {
2733 if (selection_wait == Sel_incr)
2734 {
2735 XFree (ct.value);
2736
2737 // finally complete, now paste the whole thing
2738 selection_wait = Sel_normal;
2739 ct.value = (unsigned char *)incr_buf;
2740 ct.nitems = incr_buf_fill;
2741 incr_buf = 0;
2742 incr_buf_size = 0;
2743 incr_ev.stop ();
2744 }
2745 else
2746 {
2747 if (selection_wait == Sel_normal
2748 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2749 {
2750 /*
2751 * pass through again trying CUT_BUFFER0 if we've come from
2752 * XConvertSelection () but nothing was presented
2753 */
2754 selection_paste (display->root, XA_CUT_BUFFER0, False);
2755 }
2756
2757 goto bailout;
2758 }
2759 }
2760 else if (selection_wait == Sel_incr)
2761 {
2762 incr_ev.start (NOW + 10);
2763
2764 while (incr_buf_fill + ct.nitems > incr_buf_size)
2765 {
2766 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2767 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2768 }
2769
2770 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2771 incr_buf_fill += ct.nitems;
2772
2773 goto bailout;
2774 }
2775
2776 char **cl;
2777 int cr;
2778
2779#if ENABLE_FRILLS
2780 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2781 // so recode it manually
2782 if (ct.encoding == xa[XA_UTF8_STRING])
2783 {
2784 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2785 char *s = rxvt_wcstombs (w);
2786 free (w);
2787 // TODO: strlen == only the first element will be converted. well...
2788 paste (s, strlen (s));
2789 free (s);
2790 }
2791 else
2792#endif
2793 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2794 && cl)
2795 {
2796 for (int i = 0; i < cr; i++)
2797 paste (cl[i], strlen (cl[i]));
2798
2799 XFreeStringList (cl);
2800 }
2801 else
2802 paste ((char *)ct.value, ct.nitems); // paste raw
2803
2804bailout:
2805 XFree (ct.value);
2806
2807 if (selection_wait == Sel_normal)
2808 selection_wait = Sel_none;
2809} 2728}
2810 2729
2811void 2730void
2812rxvt_term::incr_cb (time_watcher &w) NOTHROW 2731rxvt_term::paste (char *data, unsigned int len) NOTHROW
2813{ 2732{
2814 selection_wait = Sel_none; 2733 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2815
2816 incr_buf_size = 0;
2817 free (incr_buf);
2818
2819 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2820}
2821
2822void
2823rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2824{
2825 if (prop == None || selection_wait != Sel_incr)
2826 return; 2734 return;
2827 2735
2828 selection_paste (win, prop, true); 2736 tt_paste (data, len);
2829} 2737}
2830 2738
2831/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2832/* 2740/*
2833 * Request the current selection: 2741 * Request the current selection:
2834 * Order: > internal selection if available 2742 * Order: > internal selection if available
2835 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2743 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2836 * > CUT_BUFFER0 2744 * > CUT_BUFFER0
2837 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2745 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2838 * will auto fallback to CUT_BUFFER0 2746 * will auto fallback to CUT_BUFFER0
2839 * EXT: button 2 release 2747 * EXT: button 2 release
2840 */ 2748 */
2841void 2749void
2842rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2750rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2843{ 2751{
2844 if (selection.text && selnum == Sel_Primary) 2752 if (!selection_req)
2845 { /* internal selection */
2846 char *str = rxvt_wcstombs (selection.text, selection.len);
2847 paste (str, strlen (str));
2848 free (str);
2849 return;
2850 } 2753 {
2851 else 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2755 selection_req->run ();
2852 { 2756 }
2853 selection_request_time = tm;
2854 selection_wait = Sel_normal;
2855
2856#if X_HAVE_UTF8_STRING
2857 selection_type = Sel_UTF8String;
2858 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2859 return;
2860#else
2861 selection_type = Sel_CompoundText;
2862 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2863 return;
2864#endif
2865 }
2866
2867 selection_wait = Sel_none; /* don't loop in selection_paste () */
2868 selection_paste (display->root, XA_CUT_BUFFER0, false);
2869}
2870
2871int
2872rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2873{
2874 Atom sel;
2875
2876 selection_type |= selnum;
2877
2878 if (selnum == Sel_Primary)
2879 sel = XA_PRIMARY;
2880 else if (selnum == Sel_Secondary)
2881 sel = XA_SECONDARY;
2882 else
2883 sel = xa[XA_CLIPBOARD];
2884
2885 if (XGetSelectionOwner (xdisp, sel) != None)
2886 {
2887 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2888 vt, selection_request_time);
2889 return 1;
2890 }
2891
2892 return 0;
2893} 2757}
2894 2758
2895/* ------------------------------------------------------------------------- */ 2759/* ------------------------------------------------------------------------- */
2896/* 2760/*
2897 * Clear all selected text 2761 * Clear all selected text
2898 * EXT: SelectionClear 2762 * EXT: SelectionClear
2899 */ 2763 */
2900void 2764void
2901rxvt_term::selection_clear () NOTHROW 2765rxvt_term::selection_clear (bool clipboard) NOTHROW
2902{ 2766{
2767 if (!clipboard)
2768 {
2903 want_refresh = 1; 2769 want_refresh = 1;
2904 free (selection.text); 2770 free (selection.text);
2905 selection.text = NULL; 2771 selection.text = NULL;
2906 selection.len = 0; 2772 selection.len = 0;
2907 CLEAR_SELECTION (); 2773 CLEAR_SELECTION ();
2908 2774
2909 if (display->selection_owner == this) 2775 if (display->selection_owner == this)
2910 display->selection_owner = 0; 2776 display->selection_owner = 0;
2777 }
2778 else
2779 {
2780 free (selection.clip_text);
2781 selection.clip_text = NULL;
2782 selection.clip_len = 0;
2783
2784 if (display->clipboard_owner == this)
2785 display->clipboard_owner = 0;
2786 }
2911} 2787}
2912 2788
2913/* ------------------------------------------------------------------------- */ 2789/* ------------------------------------------------------------------------- */
2914/* 2790/*
2915 * Copy a selection into the cut buffer 2791 * Copy a selection into the cut buffer
2916 * EXT: button 1 or 3 release 2792 * EXT: button 1 or 3 release
2917 */ 2793 */
2918void 2794void
2919rxvt_term::selection_make (Time tm) 2795rxvt_term::selection_make (Time tm)
2920{ 2796{
2921 int i; 2797 int size;
2922 wchar_t *new_selection_text; 2798 wchar_t *new_selection_text;
2923 text_t *t; 2799 text_t *t;
2924 2800
2925 switch (selection.op) 2801 switch (selection.op)
2926 { 2802 {
… …
2942 return; /* nothing selected, go away */ 2818 return; /* nothing selected, go away */
2943 2819
2944 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2820 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2945 return; 2821 return;
2946 2822
2947 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2823 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2948 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2824 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2949 2825
2950 int ofs = 0; 2826 int ofs = 0;
2951 int extra = 0; 2827 int extra = 0;
2952 2828
2953 int col = selection.beg.col; 2829 int col = selection.beg.col;
… …
2955 2831
2956 int end_col; 2832 int end_col;
2957 2833
2958 for (; row <= selection.end.row; row++, col = 0) 2834 for (; row <= selection.end.row; row++, col = 0)
2959 { 2835 {
2960#if ENABLE_FRILLS 2836#if !ENABLE_MINIMAL
2961 if (selection.rect) 2837 if (selection.rect)
2962 { 2838 {
2963 col = selection.beg.col; 2839 col = selection.beg.col;
2964 end_col = ncol + 1; 2840 end_col = selection.end.col;
2965 } 2841 }
2966 else 2842 else
2967#endif 2843#endif
2968 end_col = ROW(row).l; 2844 end_col = ROW(row).l;
2969 2845
2970 col = max (col, 0); 2846 col = max (col, 0);
2971 2847
2972 if (row == selection.end.row 2848 if (row == selection.end.row)
2973#if ENABLE_FRILLS
2974 || selection.rect
2975#endif
2976 )
2977 min_it (end_col, selection.end.col); 2849 min_it (end_col, selection.end.col);
2978 2850
2979 t = ROW(row).t + col; 2851 t = ROW(row).t + col;
2980 2852
2981 for (; col < end_col; col++) 2853 for (; col < end_col; col++)
… …
2989 2861
2990 extra -= (len - 1); 2862 extra -= (len - 1);
2991 2863
2992 if (extra < 0) 2864 if (extra < 0)
2993 { 2865 {
2994 extra += i; 2866 extra += size;
2995 i += i; 2867 size += size;
2996 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2868 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2997 } 2869 }
2998 2870
2999 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2871 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3000 } 2872 }
3001#endif 2873#endif
3002 else 2874 else
3003 new_selection_text[ofs++] = *t++; 2875 new_selection_text[ofs++] = *t++;
3004 } 2876 }
3005 2877
3006#if ENABLE_FRILLS 2878#if !ENABLE_MINIMAL
3007 if (selection.rect) 2879 if (selection.rect)
3008 { 2880 {
3009 while (ofs 2881 while (ofs
3010 && new_selection_text[ofs - 1] != C0_LF 2882 && new_selection_text[ofs - 1] != C0_LF
3011 && unicode::is_space (new_selection_text[ofs - 1])) 2883 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3013 2885
3014 new_selection_text[ofs++] = C0_LF; 2886 new_selection_text[ofs++] = C0_LF;
3015 } 2887 }
3016 else 2888 else
3017#endif 2889#endif
3018 if (!ROW(row).is_longer () && row != selection.end.row) 2890 if (!ROW(row).is_longer ()
2891 && (row != selection.end.row || end_col != selection.end.col)
2892 && (row != selection.beg.row || selection.beg.col < ncol))
3019 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3020 } 2894 }
3021
3022 if (end_col != selection.end.col)
3023 new_selection_text[ofs++] = C0_LF;
3024 2895
3025 new_selection_text[ofs] = 0; 2896 new_selection_text[ofs] = 0;
3026 2897
3027 if (ofs == 0) 2898 if (ofs == 0)
3028 { 2899 {
… …
3041 2912
3042 selection_grab (tm); 2913 selection_grab (tm);
3043} 2914}
3044 2915
3045bool 2916bool
3046rxvt_term::selection_grab (Time tm) NOTHROW 2917rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3047{ 2918{
2919 Atom sel;
2920
2921 if (!clipboard)
2922 {
3048 selection_time = tm; 2923 selection_time = tm;
3049 2924 sel = XA_PRIMARY;
3050 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3051 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3052 { 2925 }
2926 else
2927 {
2928 clipboard_time = tm;
2929 sel = xa[XA_CLIPBOARD];
2930 }
2931
2932 XSetSelectionOwner (dpy, sel, vt, tm);
2933 if (XGetSelectionOwner (dpy, sel) == vt)
2934 {
3053 display->set_selection_owner (this); 2935 display->set_selection_owner (this, clipboard);
3054 return true; 2936 return true;
3055 } 2937 }
3056 else 2938 else
3057 { 2939 {
3058 selection_clear (); 2940 selection_clear (clipboard);
3059 return false; 2941 return false;
3060 } 2942 }
3061 2943
3062#if 0 2944#if 0
3063 XTextProperty ct; 2945 XTextProperty ct;
3064 2946
3065 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 2947 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3066 { 2948 {
3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2949 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3068 XFree (ct.value); 2950 XFree (ct.value);
3069 } 2951 }
3070#endif 2952#endif
… …
3116 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2998 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3117 2999
3118 while (selection.mark.col > 0 3000 while (selection.mark.col > 0
3119 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3001 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3120 --selection.mark.col; 3002 --selection.mark.col;
3121 3003
3122 if (selection.op) 3004 if (selection.op)
3005 {
3123 { /* clear the old selection */ 3006 /* clear the old selection */
3124 selection.beg.row = selection.end.row = selection.mark.row; 3007 selection.beg.row = selection.end.row = selection.mark.row;
3125 selection.beg.col = selection.end.col = selection.mark.col; 3008 selection.beg.col = selection.end.col = selection.mark.col;
3126 } 3009 }
3127 3010
3128 selection.op = SELECTION_INIT; 3011 selection.op = SELECTION_INIT;
… …
3317 * a point/word/line which is either the start or end of the selection 3200 * 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 3201 * and it was decided by whichever point/word/line was `fixed' at the
3319 * time of the most recent button3 press 3202 * time of the most recent button3 press
3320 */ 3203 */
3321 if (button3 && buttonpress) 3204 if (button3 && buttonpress)
3205 {
3322 { /* button3 press */ 3206 /* button3 press */
3323 /* 3207 /*
3324 * first determine which edge of the selection we are closest to 3208 * first determine which edge of the selection we are closest to
3325 */ 3209 */
3326 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3210 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3327 || (!ROWCOL_IS_AFTER (pos, selection.end) 3211 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3345 selection.mark.row = selection.beg.row; 3229 selection.mark.row = selection.beg.row;
3346 selection.mark.col = selection.beg.col; 3230 selection.mark.col = selection.beg.col;
3347 } 3231 }
3348 } 3232 }
3349 else 3233 else
3234 {
3350 { /* button1 drag or button3 drag */ 3235 /* button1 drag or button3 drag */
3351 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3236 if (ROWCOL_IS_AFTER (selection.mark, pos))
3352 { 3237 {
3353 if (selection.mark.row == selection.end.row 3238 if (selection.mark.row == selection.end.row
3354 && selection.mark.col == selection.end.col 3239 && selection.mark.col == selection.end.col
3355 && clickchange 3240 && clickchange
… …
3372 3257
3373 if (selection.clicks == 1) 3258 if (selection.clicks == 1)
3374 { 3259 {
3375 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3260 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3376 && !ROW(selection.beg.row).is_longer () 3261 && !ROW(selection.beg.row).is_longer ()
3377#if ENABLE_FRILLS 3262#if !ENABLE_MINIMAL
3378 && !selection.rect 3263 && !selection.rect
3379#endif 3264#endif
3380 ) 3265 )
3381 selection.beg.col = ncol; 3266 selection.beg.col = ncol;
3382 3267
3383 if ( 3268 if (
3384 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3269 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3385 && !ROW(selection.end.row).is_longer () 3270 && !ROW(selection.end.row).is_longer ()
3386#if ENABLE_FRILLS 3271#if !ENABLE_MINIMAL
3387 && !selection.rect 3272 && !selection.rect
3388#endif 3273#endif
3389 ) 3274 )
3390 selection.end.col = ncol; 3275 selection.end.col = ncol;
3391 } 3276 }
… …
3398 selection_delimit_word (DN, &selection.end, &selection.end); 3283 selection_delimit_word (DN, &selection.end, &selection.end);
3399 } 3284 }
3400 else if (selection.clicks == 3) 3285 else if (selection.clicks == 3)
3401 { 3286 {
3402#if ENABLE_FRILLS 3287#if ENABLE_FRILLS
3403 if (OPTION (Opt_tripleclickwords)) 3288 if (option (Opt_tripleclickwords))
3404 { 3289 {
3405 selection_delimit_word (UP, &selection.beg, &selection.beg); 3290 selection_delimit_word (UP, &selection.beg, &selection.beg);
3406 3291
3407 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3292 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3408 { 3293 {
3409 if (!ROW(end_row).is_longer ()) 3294 if (!ROW(end_row).is_longer ())
3410 { 3295 {
3411 selection.end.row = end_row; 3296 selection.end.row = end_row;
3412 selection.end.col = ROW(end_row).l; 3297 selection.end.col = ROW(end_row).l;
3298# if !ENABLE_MINIMAL
3413 selection_remove_trailing_spaces (); 3299 selection_remove_trailing_spaces ();
3300# endif
3414 break; 3301 break;
3415 } 3302 }
3416 } 3303 }
3417 } 3304 }
3418 else 3305 else
… …
3434 selection.end.row++; 3321 selection.end.row++;
3435 } 3322 }
3436 } 3323 }
3437 3324
3438 if (button3 && buttonpress) 3325 if (button3 && buttonpress)
3326 {
3439 { /* mark may need to be changed */ 3327 /* mark may need to be changed */
3440 if (closeto == LEFT) 3328 if (closeto == LEFT)
3441 { 3329 {
3442 selection.mark.row = selection.end.row; 3330 selection.mark.row = selection.end.row;
3443 selection.mark.col = selection.end.col - (selection.clicks == 2); 3331 selection.mark.col = selection.end.col - (selection.clicks == 2);
3444 } 3332 }
… …
3447 selection.mark.row = selection.beg.row; 3335 selection.mark.row = selection.beg.row;
3448 selection.mark.col = selection.beg.col; 3336 selection.mark.col = selection.beg.col;
3449 } 3337 }
3450 } 3338 }
3451 3339
3452#if ENABLE_FRILLS 3340#if !ENABLE_MINIMAL
3453 if (selection.rect && selection.beg.col > selection.end.col) 3341 if (selection.rect && selection.beg.col > selection.end.col)
3454 ::swap (selection.beg.col, selection.end.col); 3342 ::swap (selection.beg.col, selection.end.col);
3455#endif 3343#endif
3456} 3344}
3457 3345
3458#if ENABLE_FRILLS 3346#if !ENABLE_MINIMAL
3459void 3347void
3460rxvt_term::selection_remove_trailing_spaces () NOTHROW 3348rxvt_term::selection_remove_trailing_spaces () NOTHROW
3461{ 3349{
3462 int32_t end_col, end_row; 3350 int32_t end_col, end_row;
3463 text_t *stp; 3351 text_t *stp;
… …
3541 *target++ = xa[XA_COMPOUND_TEXT]; 3429 *target++ = xa[XA_COMPOUND_TEXT];
3542#if X_HAVE_UTF8_STRING 3430#if X_HAVE_UTF8_STRING
3543 *target++ = xa[XA_UTF8_STRING]; 3431 *target++ = xa[XA_UTF8_STRING];
3544#endif 3432#endif
3545 3433
3546 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3434 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3547 32, PropModeReplace, 3435 32, PropModeReplace,
3548 (unsigned char *)target_list, target - target_list); 3436 (unsigned char *)target_list, target - target_list);
3549 ev.property = rq.property; 3437 ev.property = rq.property;
3550 } 3438 }
3551#if TODO // TODO 3439#if TODO // TODO
3552 else if (rq.target == xa[XA_MULTIPLE]) 3440 else if (rq.target == xa[XA_MULTIPLE])
3553 { 3441 {
3554 /* TODO: Handle MULTIPLE */ 3442 /* TODO: Handle MULTIPLE */
3555 } 3443 }
3556#endif 3444#endif
3557 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3445 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3558 { 3446 {
3559 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3447 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3560 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3448 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3449 ev.property = rq.property;
3450 }
3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3452 {
3453 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3454 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3561 ev.property = rq.property; 3455 ev.property = rq.property;
3562 } 3456 }
3563 else if (rq.target == XA_STRING 3457 else if (rq.target == XA_STRING
3564 || rq.target == xa[XA_TEXT] 3458 || rq.target == xa[XA_TEXT]
3565 || rq.target == xa[XA_COMPOUND_TEXT] 3459 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3588 style = enc_string; 3482 style = enc_string;
3589 else if (target == xa[XA_TEXT]) 3483 else if (target == xa[XA_TEXT])
3590 style = enc_text; 3484 style = enc_text;
3591 else if (target == xa[XA_COMPOUND_TEXT]) 3485 else if (target == xa[XA_COMPOUND_TEXT])
3592 style = enc_compound_text; 3486 style = enc_compound_text;
3593#if ENABLE_FRILLS 3487#if !ENABLE_MINIMAL
3594 else if (target == xa[XA_UTF8_STRING]) 3488 else if (target == xa[XA_UTF8_STRING])
3595 style = enc_utf8; 3489 style = enc_utf8;
3596#endif 3490#endif
3597 else 3491 else
3598 { 3492 {
3599 target = xa[XA_COMPOUND_TEXT]; 3493 target = xa[XA_COMPOUND_TEXT];
3600 style = enc_compound_text; 3494 style = enc_compound_text;
3601 } 3495 }
3602 3496
3603 if (selection.text) 3497 if (rq.selection == XA_PRIMARY && selection.text)
3604 { 3498 {
3605 cl = selection.text; 3499 cl = selection.text;
3606 selectlen = selection.len; 3500 selectlen = selection.len;
3607 } 3501 }
3502 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3503 {
3504 cl = selection.clip_text;
3505 selectlen = selection.clip_len;
3506 }
3608 else 3507 else
3609 { 3508 {
3610 cl = L""; 3509 cl = L"";
3611 selectlen = 0; 3510 selectlen = 0;
3612 } 3511 }
3613 3512
3614#if ENABLE_FRILLS 3513#if !ENABLE_MINIMAL
3615 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3514 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3616 // so recode it manually 3515 // so recode it manually
3617 if (style == enc_utf8) 3516 if (style == enc_utf8)
3618 { 3517 {
3619 freect = 1; 3518 freect = 1;
… …
3622 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3521 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3623 ct.nitems = strlen ((char *)ct.value); 3522 ct.nitems = strlen ((char *)ct.value);
3624 } 3523 }
3625 else 3524 else
3626#endif 3525#endif
3627 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3526 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3628 freect = 1; 3527 freect = 1;
3629 else 3528 else
3630 { 3529 {
3631 /* if we failed to convert then send it raw */ 3530 /* if we failed to convert then send it raw */
3632 ct.value = (unsigned char *)cl; 3531 ct.value = (unsigned char *)cl;
3633 ct.nitems = selectlen; 3532 ct.nitems = selectlen;
3634 ct.encoding = target; 3533 ct.encoding = target;
3635 } 3534 }
3636 3535
3637 XChangeProperty (xdisp, rq.requestor, rq.property, 3536 XChangeProperty (dpy, rq.requestor, rq.property,
3638 ct.encoding, 8, PropModeReplace, 3537 ct.encoding, 8, PropModeReplace,
3639 ct.value, (int)ct.nitems); 3538 ct.value, (int)ct.nitems);
3640 ev.property = rq.property; 3539 ev.property = rq.property;
3641 3540
3642 if (freect) 3541 if (freect)
3643 XFree (ct.value); 3542 XFree (ct.value);
3644 } 3543 }
3645 3544
3646 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3545 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3647}
3648
3649/* ------------------------------------------------------------------------- *
3650 * MOUSE ROUTINES *
3651 * ------------------------------------------------------------------------- */
3652
3653/*
3654 * return col/row values corresponding to x/y pixel values
3655 */
3656void
3657rxvt_term::pixel_position (int *x, int *y) NOTHROW
3658{
3659 *x = Pixel2Col (*x);
3660 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3661 *y = Pixel2Row (*y);
3662 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3663} 3546}
3664 3547
3665/* ------------------------------------------------------------------------- */ 3548/* ------------------------------------------------------------------------- */
3666#ifdef USE_XIM 3549#ifdef USE_XIM
3667void 3550void
3668rxvt_term::im_set_position (XPoint &pos) NOTHROW 3551rxvt_term::im_set_position (XPoint &pos) NOTHROW
3669{ 3552{
3670 XWindowAttributes xwa; 3553 XWindowAttributes xwa;
3671 3554
3672 XGetWindowAttributes (xdisp, vt, &xwa); 3555 XGetWindowAttributes (dpy, vt, &xwa);
3673 3556
3674 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3557 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3675 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3558 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3676} 3559}
3677#endif 3560#endif
… …
3695 h += 2; min_it (h, nrow); 3578 h += 2; min_it (h, nrow);
3696 3579
3697 x -= 1; clamp_it (x, 0, ncol - w); 3580 x -= 1; clamp_it (x, 0, ncol - w);
3698 y -= 1; clamp_it (y, 0, nrow - h); 3581 y -= 1; clamp_it (y, 0, nrow - h);
3699 3582
3700 ov_x = x; ov_y = y; 3583 ov.x = x; ov.y = y;
3701 ov_w = w; ov_h = h; 3584 ov.w = w; ov.h = h;
3702 3585
3703 ov_text = new text_t *[h]; 3586 ov.text = new text_t *[h];
3704 ov_rend = new rend_t *[h]; 3587 ov.rend = new rend_t *[h];
3705 3588
3706 for (y = 0; y < h; y++) 3589 for (y = 0; y < h; y++)
3707 { 3590 {
3708 text_t *tp = ov_text[y] = new text_t[w]; 3591 text_t *tp = ov.text[y] = new text_t[w];
3709 rend_t *rp = ov_rend[y] = new rend_t[w]; 3592 rend_t *rp = ov.rend[y] = new rend_t[w];
3710 3593
3711 text_t t0, t1, t2; 3594 text_t t0, t1, t2;
3712 rend_t r = OVERLAY_RSTYLE; 3595 rend_t r = OVERLAY_RSTYLE;
3713 3596
3714 if (y == 0) 3597 if (y == 0)
… …
3733} 3616}
3734 3617
3735void 3618void
3736rxvt_term::scr_overlay_off () NOTHROW 3619rxvt_term::scr_overlay_off () NOTHROW
3737{ 3620{
3738 if (!ov_text) 3621 if (!ov.text)
3739 return; 3622 return;
3740 3623
3741 want_refresh = 1; 3624 want_refresh = 1;
3742 3625
3743 for (int y = 0; y < ov_h; y++) 3626 for (int y = 0; y < ov.h; y++)
3744 { 3627 {
3745 delete [] ov_text[y]; 3628 delete [] ov.text[y];
3746 delete [] ov_rend[y]; 3629 delete [] ov.rend[y];
3747 } 3630 }
3748 3631
3749 delete [] ov_text; ov_text = 0; 3632 delete [] ov.text; ov.text = 0;
3750 delete [] ov_rend; ov_rend = 0; 3633 delete [] ov.rend; ov.rend = 0;
3751} 3634}
3752 3635
3753void 3636void
3754rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3637rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3755{ 3638{
3756 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3639 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3757 return; 3640 return;
3758 3641
3759 x++, y++; 3642 x++, y++;
3760 3643
3761 ov_text[y][x] = text; 3644 ov.text[y][x] = text;
3762 ov_rend[y][x] = rend; 3645 ov.rend[y][x] = rend;
3763} 3646}
3764 3647
3765void 3648void
3766rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3649rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3767{ 3650{
… …
3786} 3669}
3787 3670
3788void 3671void
3789rxvt_term::scr_swap_overlay () NOTHROW 3672rxvt_term::scr_swap_overlay () NOTHROW
3790{ 3673{
3791 if (!ov_text) 3674 if (!ov.text)
3792 return; 3675 return;
3793 3676
3677 // hide cursor if it is within the overlay area
3678 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3679 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3680 screen.flags &= ~Screen_VisibleCursor;
3681
3794 // swap screen mem with overlay 3682 // swap screen mem with overlay
3795 for (int y = ov_h; y--; ) 3683 for (int y = ov.h; y--; )
3796 { 3684 {
3797 text_t *t1 = ov_text[y]; 3685 text_t *t1 = ov.text[y];
3798 rend_t *r1 = ov_rend[y]; 3686 rend_t *r1 = ov.rend[y];
3799 3687
3800 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3688 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3801 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3689 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3802 3690
3803 for (int x = ov_w; x--; ) 3691 for (int x = ov.w; x--; )
3804 { 3692 {
3805 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3693 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3806 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3694 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3807 } 3695 }
3808 } 3696 }

Diff Legend

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