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

Diff Legend

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