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

Diff Legend

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