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

Diff Legend

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