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.262 by root, Mon Feb 20 22:42:01 2006 UTC vs.
Revision 1.365 by sf-exg, Thu Jan 27 17:37:19 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
36 34
35static inline void
37inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
… …
47 46
48/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 51 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 52 view_start = 0
54#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 87
89/* 88/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 90 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 91#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 92 if (mapped) \
104 XClearArea (dpy, drawBuffer, x, y, \ 93 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 94 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 95 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 96
114/* ------------------------------------------------------------------------- * 97/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 98 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 99 * ------------------------------------------------------------------------- */
117 100
… …
150 133
151 l.l = 0; 134 l.l = 0;
152 l.f = 0; 135 l.f = 0;
153} 136}
154 137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
150
151 // found start, nuke
152 do {
153 l.t[col] = ' ';
154 l.r[col] = rend;
155 col++;
156 } while (col < ncol && l.t[col] == NOCHAR);
157}
158
155/* ------------------------------------------------------------------------- * 159/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 160 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
158 162
159void 163void
160rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
161{ 165{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 166 view_start = 0;
167 num_scr = 0; 167 num_scr = 0;
168 168
169 if (ncol == 0) 169 if (ncol == 0)
170 ncol = 80; 170 ncol = 80;
… …
172 if (nrow == 0) 172 if (nrow == 0)
173 nrow = 24; 173 nrow = 24;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 177
181 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
183 { 180 {
184 //TODO//FIXME 181 //TODO//FIXME
… …
237 selection.text = NULL; 234 selection.text = NULL;
238 selection.len = 0; 235 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
241 selection.clicks = 0; 238 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false; 239 selection.clip_text = NULL;
240 selection.clip_len = 0;
243 } 241 }
244 else 242 else
245 { 243 {
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 275 }
278 276
279 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 279
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
285 283
286 if (top_row) 284 if (top_row)
287 { 285 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
290 289
291 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 292
294 do 293 do
295 { 294 {
296 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 297 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 299
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 { 301 {
… …
330 int qcol = 0; 327 int qcol = 0;
331 328
332 // see below for cursor adjustment rationale 329 // see below for cursor adjustment rationale
333 if (p == ocur.row) 330 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 331 screen.cur.row = q - (total_rows - nrow);
335 332
336 // fill a single destination line 333 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 334 while (lofs < llen && qcol < ncol)
338 { 335 {
339 int prow = lofs / prev_ncol; 336 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
… …
366 } 363 }
367 while (p != pend && q > 0); 364 while (p != pend && q > 0);
368 365
369 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
370 top_row = q - term_start; 367 top_row = q - term_start;
371 368
372 // make sure all terminal lines exist 369 // make sure all terminal lines exist
373 while (top_row > 0) 370 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 372 }
376 else 373 else
377 { 374 {
378 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
379 376
380 for (int row = min (nrow, prev_nrow); row--; ) 377 for (int row = min (nrow, prev_nrow); row--; )
381 { 378 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 380 line_t &qline = row_buf [row];
384 381
… …
398 delete old_ta; 395 delete old_ta;
399 delete old_ra; 396 delete old_ra;
400 397
401 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
403 401
404 free (tabs); 402 free (tabs);
405 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0;
406 407
407 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
408 409
409 prev_nrow = nrow; 410 prev_nrow = nrow;
410 prev_ncol = ncol; 411 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 412
420 tt_winch (); 413 tt_winch ();
421 414
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 416}
… …
435 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
436 429
437 free (row_buf); 430 free (row_buf);
438 free (swap_buf); 431 free (swap_buf);
439 free (drawn_buf); 432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
440 free (tabs); 435 free (tabs);
441 436 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 437 }
444} 438}
445 439
446/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
447/* 441/*
448 * Hard reset 442 * Hard/Soft reset
449 */ 443 */
450void 444void
451rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
452{ 446{
453 scr_release (); 447 scr_release ();
454 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
455 scr_reset (); 451 scr_reset ();
456 452
457 scr_clear (true); 453 scr_clear (true);
458 scr_refresh (); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
459} 471}
460 472
461/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
501 } 513 }
502 514
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
509#endif
510} 520}
511 521
512void 522void
513rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
514{ 524{
515 if (!OPTION (Opt_secondaryScreen)) 525 if (!option (Opt_secondaryScreen))
516 return; 526 return;
517 527
518 for (int i = prev_nrow; i--; ) 528 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 529 ::swap (ROW(i), swap_buf [i]);
520 530
… …
539 want_refresh = 1; 549 want_refresh = 1;
540 view_start = 0; 550 view_start = 0;
541 551
542 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
543 553
544 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
545 555
546#if NSCREENS 556#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
548 { 558 {
549 num_scr = 0; 559 num_scr = 0;
550 560
551 scr_swap_screen (); 561 scr_swap_screen ();
552 562
… …
555 screen.flags |= Screen_VisibleCursor; 565 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 566 swap.flags |= Screen_VisibleCursor;
557 } 567 }
558 else 568 else
559#endif 569#endif
560 if (OPTION (Opt_secondaryScroll)) 570 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 571 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 572}
563 573
564// clear WrapNext indicator, solidifying position on next line 574// clear WrapNext indicator, solidifying position on next line
565void 575void
… …
598/* 608/*
599 * Change the rendition style for following text 609 * Change the rendition style for following text
600 */ 610 */
601void 611void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 612rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 613{
604 if (set) 614 if (set)
605 rstyle |= style; 615 rstyle |= style;
606 else if (style == ~RS_None) 616 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 617 rstyle = DEFAULT_RSTYLE;
608 else 618 else
609 rstyle &= ~style; 619 rstyle &= ~style;
610 } 620}
611 621
612/* ------------------------------------------------------------------------- */ 622/* ------------------------------------------------------------------------- */
613/* 623/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 624 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 625 * count positive ==> scroll up
… …
624 want_refresh = 1; 634 want_refresh = 1;
625 num_scr += count; 635 num_scr += count;
626 636
627 if (count > 0 637 if (count > 0
628 && row1 == 0 638 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 639 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 640 {
631 top_row = max (top_row - count, -saveLines); 641 top_row = max (top_row - count, -saveLines);
632 642
633 // scroll everything up 'count' lines 643 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 644 term_start = (term_start + count) % total_rows;
… …
666 line_t &l2 = ROW(i); 676 line_t &l2 = ROW(i);
667 677
668 ::swap (l1, l2); 678 ::swap (l1, l2);
669 l2.touch (); 679 l2.touch ();
670 } 680 }
671 681
672 // move and/or clear selection, if any 682 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
674 { 684 {
675 selection.beg.row -= count; 685 selection.beg.row -= count;
676 selection.end.row -= count; 686 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 694 selection.op = SELECTION_CLEAR;
685 } 695 }
686 } 696 }
687 697
688 // finally move the view window, if desired 698 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 699 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 700 && view_start != 0
691 && view_start != -saveLines) 701 && view_start != -saveLines)
692 scr_page (UP, count); 702 scr_page (UP, count);
693 703
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 704 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 722 {
713 /* move selected region too */ 723 /* move selected region too */
714 selection.beg.row -= count; 724 selection.beg.row -= count;
715 selection.end.row -= count; 725 selection.end.row -= count;
716 selection.mark.row -= count; 726 selection.mark.row -= count;
717 727
718 selection_check (0); 728 selection_check (0);
719 } 729 }
720 } 730 }
721 731
722 // use a simple and robust scrolling algorithm, this 732 // use a simple and robust scrolling algorithm, this
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
776 } 786 }
777 } 787 }
778 788
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 792 int row = screen.cur.row;
785 793
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 795
788 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
789 797
790 while (str < strend) 798 while (str < strend)
791 { 799 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 801
794 if (c < 0x20) 802 if (expect_false (c < 0x20))
795 if (c == C0_LF) 803 if (c == C0_LF)
796 { 804 {
797 max_it (line->l, screen.cur.col); 805 max_it (line->l, screen.cur.col);
798 806
799 screen.flags &= ~Screen_WrapNext; 807 screen.flags &= ~Screen_WrapNext;
… …
818 { 826 {
819 scr_tab (1, true); 827 scr_tab (1, true);
820 continue; 828 continue;
821 } 829 }
822 830
831 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 832 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 834 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 ))
826 { 836 {
827 checksel = 0; 837 checksel = 0;
828 /* 838 /*
829 * If we wrote anywhere in the selected area, kill the selection 839 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 840 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 841 * should be a similar check.
832 */ 842 */
833 CLEAR_SELECTION (); 843 CLEAR_SELECTION ();
834 } 844 }
835 845
836 if (screen.flags & Screen_WrapNext) 846 if (expect_false (screen.flags & Screen_WrapNext))
837 { 847 {
838 scr_do_wrap (); 848 scr_do_wrap ();
839 849
840 line->l = ncol; 850 line->l = ncol;
841 line->is_longer (1); 851 line->is_longer (1);
842 852
843 row = screen.cur.row; 853 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 854 line = &ROW(row); /* _must_ refresh */
845 } 855 }
846 856
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 857 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 859 c = 0xfffd;
850 860
851 // rely on wcwidth to tell us the character width, do wcwidth before 861 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 862 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 863 // drawing characters below as they might be invalid in the current
854 // locale. 864 // locale.
855 int width = WCWIDTH (c); 865 int width = WCWIDTH (c);
856 866
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 868 {
859 // vt100 special graphics and line drawing 869 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 870 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 871 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 872 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 885 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 886 width = 1; // vt100 line drawing characters are always single-width
877 } 887 }
878 } 888 }
879 889
880 if (screen.flags & Screen_Insert) 890 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 891 scr_insdel_chars (width, INSERT);
882 892
883 if (width != 0) 893 if (width != 0)
884 { 894 {
885#if !UNICODE_3 895#if !UNICODE_3
… …
890# else 900# else
891 c = 0xfffd; 901 c = 0xfffd;
892# endif 902# endif
893#endif 903#endif
894 904
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
895 // nuke the character at this position, if required 921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
896 if (line->t[screen.cur.col] == NOCHAR 925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
897 || (screen.cur.col < ncol - 1 926 scr_kill_char (*line, screen.cur.col);
898 && line->t[screen.cur.col + 1] == NOCHAR))
899 {
900 int col = screen.cur.col;
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' ';
923 // and try the same character next loop iteration
924 --str;
925 }
926 927
927 line->touch (); 928 line->touch ();
928 929
929 do 930 do
930 { 931 {
931 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 933 line->r[screen.cur.col] = rend;
933 934
934 if (screen.cur.col < ncol - 1) 935 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 936 screen.cur.col++;
936 else 937 else
937 { 938 {
938 line->l = ncol; 939 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
941 break; 942
943 goto end_of_line;
942 } 944 }
943 945
944 c = NOCHAR; 946 c = NOCHAR;
945 } 947 }
946 while (--width > 0); 948 while (expect_false (--width > 0));
947 949
948 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
950 { 952 {
951 line->touch (); 953 line->t[c] = ' ';
954 line->r[c] = rend;
955 }
952 956
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 957end_of_line:
958 ;
959 }
960#if ENABLE_COMBINING
961 else // width == 0
962 {
963 if (c != 0xfeff) // ignore BOM
964 {
965 // handle combining characters
966 // we just tag the accent on the previous on-screen character.
967 // this is arguably not correct, but also arguably not wrong.
968 // we don't handle double-width characters nicely yet.
969 line_t *linep;
970 text_t *tp;
971 rend_t *rp;
972
973 if (screen.cur.col > 0)
954 { 974 {
955 line->t[c] = ' ';
956 line->r[c] = rend; 975 linep = line;
976 tp = line->t + screen.cur.col - 1;
977 rp = line->r + screen.cur.col - 1;
957 } 978 }
979 else if (screen.cur.row > 0
980 && ROW(screen.cur.row - 1).is_longer ())
981 {
982 linep = &ROW(screen.cur.row - 1);
983 tp = line->t + ncol - 1;
984 rp = line->r + ncol - 1;
985 }
986 else
987 continue;
988
989 linep->touch ();
990
991 while (*tp == NOCHAR && tp > linep->t)
992 tp--, rp--;
993
994 // first try to find a precomposed character
995 unicode_t n = rxvt_compose (*tp, c);
996 if (n == NOCHAR)
997 n = rxvt_composite.compose (*tp, c);
998
999 *tp = n;
1000 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 1001 }
959 } 1002 }
960 else // width == 0
961 {
962#if ENABLE_COMBINING
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 1003#endif
1000 }
1001 } 1004 }
1002 1005
1003 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1004 1007
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1007#endif
1008} 1009}
1009 1010
1010/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1011/* 1012/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
1014 */ 1015 */
1015void 1016void
1016rxvt_term::scr_backspace () NOTHROW 1017rxvt_term::scr_backspace () NOTHROW
1017{ 1018{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1021 { 1020 {
1022 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1023 { 1022 {
1024#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1025 --screen.cur.row;
1027 return; 1026
1027 want_refresh = 1;
1028#endif 1028#endif
1029 } 1029 }
1030 } 1030 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1033 else
1032 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1035}
1036 1036
1037/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
1038/* 1038/*
1039 * Process Horizontal Tab 1039 * Process Horizontal Tab
… …
1062 x = i; 1062 x = i;
1063 1063
1064 if (!--count) 1064 if (!--count)
1065 break; 1065 break;
1066 } 1066 }
1067 else 1067 else
1068 ht &= l.t[i] == ' ' 1068 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1069 && RS_SAME (l.r[i], base_rend);
1070 1070
1071 if (count) 1071 if (count)
1072 x = ncol - 1; 1072 x = ncol - 1;
1073 1073
1074 // store horizontal tab commands as characters inside the text 1074 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1076 if (ht && option (Opt_pastableTabs))
1077 { 1077 {
1078 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1079 1079
1080 l.touch (x); 1080 l.touch (x);
1081 1081
… …
1188 } 1188 }
1189 } 1189 }
1190 else 1190 else
1191 { 1191 {
1192 if (screen.flags & Screen_Relative) 1192 if (screen.flags & Screen_Relative)
1193 {
1193 { /* relative origin mode */ 1194 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1195 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1196 min_it (screen.cur.row, screen.bscroll);
1196 } 1197 }
1197 else 1198 else
1198 screen.cur.row = row; 1199 screen.cur.row = row;
… …
1231/* 1232/*
1232 * Erase part or whole of a line 1233 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1234 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1235 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1236 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1237 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1238 */
1237void 1239void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1240rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1241{
1240 unsigned int col, num; 1242 unsigned int col, num;
… …
1249 line.touch (); 1251 line.touch ();
1250 line.is_longer (0); 1252 line.is_longer (0);
1251 1253
1252 switch (mode) 1254 switch (mode)
1253 { 1255 {
1256 case 3:
1257 if (screen.flags & Screen_WrapNext)
1258 return;
1259
1260 /* fall through */
1261
1254 case 0: /* erase to end of line */ 1262 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1263 col = screen.cur.col;
1256 num = ncol - col; 1264 num = ncol - col;
1257 min_it (line.l, col); 1265 min_it (line.l, col);
1266
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1267 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1268 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1269 CLEAR_SELECTION ();
1261 break; 1270 break;
1271
1262 case 1: /* erase to beginning of line */ 1272 case 1: /* erase to beginning of line */
1263 col = 0; 1273 col = 0;
1264 num = screen.cur.col + 1; 1274 num = screen.cur.col + 1;
1275
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1276 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1277 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1268 break; 1279 break;
1280
1269 case 2: /* erase whole line */ 1281 case 2: /* erase whole line */
1270 col = 0; 1282 col = 0;
1271 num = ncol; 1283 num = ncol;
1272 line.l = 0; 1284 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1285 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1332 return; 1344 return;
1333 1345
1334 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1335 1347
1336 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1351 {
1340 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1353
1354 if (mapped)
1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False);
1342 } 1358 }
1343 else 1359 else
1344 { 1360 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped)
1364 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1351 } 1374 }
1352 1375
1353 for (; num--; row++) 1376 for (; num--; row++)
1354 { 1377 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1382 }
1358} 1383}
1359 1384
1360#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1361void 1386void
… …
1435 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1436 */ 1461 */
1437void 1462void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1464{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1465 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1445 1467
1446 if (count <= 0) 1468 if (count <= 0)
1447 return; 1469 return;
… …
1449 scr_do_wrap (); 1471 scr_do_wrap ();
1450 1472
1451 selection_check (1); 1473 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1474 min_it (count, ncol - screen.cur.col);
1453 1475
1454 row = screen.cur.row; 1476 int row = screen.cur.row;
1455 1477
1456 line_t *line = &ROW(row); 1478 line_t *line = &ROW(row);
1457 1479
1458 line->touch (); 1480 line->touch ();
1459 line->is_longer (0); 1481 line->is_longer (0);
1460 1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1486
1461 switch (insdel) 1487 switch (insdel)
1462 { 1488 {
1463 case INSERT: 1489 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1490 line->l = min (line->l + count, ncol);
1491
1492 if (line->t[screen.cur.col] == NOCHAR)
1493 scr_kill_char (*line, screen.cur.col);
1494
1495 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1496 {
1466 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1498 line->r[col] = line->r[col - count];
1468 } 1499 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1500
1472 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1503 {
1475 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1505 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1506 CLEAR_SELECTION ();
1478 else 1507 else
1508 {
1479 { /* shift selection */ 1509 /* shift selection */
1480 selection.beg.col += count; 1510 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1511 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1512 selection.end.col += count;
1483 } 1513 }
1484 } 1514 }
… …
1489 case ERASE: 1519 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1521 selection_check (1);
1492 screen.cur.col -= count; 1522 screen.cur.col -= count;
1493 1523
1494 line->l = max (line->l - count, 0); 1524 // nuke wide char after the end
1525 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1526 scr_kill_char (*line, screen.cur.col + count);
1527
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1529 break;
1497 1530
1498 case DELETE: 1531 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1500 1533
1534 // nuke wide char spanning the end
1535 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1536 scr_kill_char (*line, screen.cur.col + count);
1537
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1539 {
1503 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1505 } 1542 }
1506 1543
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1545
1510 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1548 {
1513 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1623 */ 1659 */
1624void 1660void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1661rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1662{
1627 if (mode < 0) 1663 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1664 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1665 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1666 tabs [screen.cur.col] = !!mode;
1631} 1667}
1632 1668
1633/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1684 if (rvideo_state != on)
1649 { 1685 {
1650 rvideo_state = on; 1686 rvideo_state = on;
1651 1687
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1689#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1691#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1693
1661 XGCValues gcvalue; 1694 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
1871 return true; 1904 return true;
1872} 1905}
1873 1906
1874#ifndef NO_BELL 1907#ifndef NO_BELL
1875void 1908void
1876rxvt_term::bell_cb (time_watcher &w) 1909rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1910{
1878 rvideo_bell = false; 1911 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1912 scr_rvideo_mode (rvideo_mode);
1913 refresh_check ();
1880} 1914}
1881#endif 1915#endif
1882 1916
1883/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1884void 1918void
… …
1886{ 1920{
1887#ifndef NO_BELL 1921#ifndef NO_BELL
1888 1922
1889# ifndef NO_MAPALERT 1923# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1924# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1925 if (option (Opt_mapAlert))
1892# endif 1926# endif
1893 XMapWindow (dpy, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1894# endif 1928# endif
1895 1929
1930# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell))
1932 set_urgency (1);
1933# endif
1934
1896 if (OPTION (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1897 { 1936 {
1898 rvideo_bell = true; 1937 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1938 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1939 flush ();
1901 1940
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1942 }
1904 else 1943 else
1905 XBell (dpy, 0); 1944 XBell (dpy, 0);
1906 1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1907#endif 1946#endif
1908} 1947}
1909 1948
1910/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1950/* ARGSUSED */
1912void 1951void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1953{
1915#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1916 int nrows, row_start; 1955 int nrows, row_start;
1917 FILE *fd; 1956 FILE *fd = popen_printer ();
1918 1957
1919 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1920 return; 1959 return;
1921 1960
1922 if (fullhist) 1961 if (fullhist)
1923 { 1962 {
1924 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1930 row_start = view_start; 1969 row_start = view_start;
1931 } 1970 }
1932 1971
1933 wctomb (0, 0); 1972 wctomb (0, 0);
1934 1973
1935 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1936 { 1975 {
1937 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1938 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1939 1978
1940 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1969 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1970 */ 2009 */
1971void 2010void
1972rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1973{ 2012{
1974 unsigned char have_bg,
1975 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1978 int i; /* tmp */ 2015 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 2018#endif
1982 rend_t *crp; // cursor rendition pointer 2019 rend_t *crp; // cursor rendition pointer
2020 rend_t ccol1, /* Cursor colour */
2021 ccol2; /* Cursor colour2 */
1983 2022
1984 want_refresh = 0; /* screen is current */ 2023 want_refresh = 0; /* screen is current */
1985 2024
1986 if (refresh_type == NO_REFRESH || !mapped) 2025 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 2026 return;
1988 2027
1989 /* 2028 /*
1990 * A: set up vars 2029 * A: set up vars
1991 */ 2030 */
1992 have_bg = 0;
1993 refresh_count = 0; 2031 refresh_count = 0;
1994 2032
1995#if XPM_BACKGROUND 2033 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP
1996 have_bg |= bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2037#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2039
2003 /* 2040 /*
2004 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2005 */ 2042 */
2006 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2007 2051
2008 /* 2052 /*
2009 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2010 */ 2054 */
2011 { 2055 {
2012 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2057
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2059 if (hidden_cursor)
2019 showcursor = 0; 2060 showcursor = 0;
2020#endif 2061#endif
2021 2062
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2067 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2068 col--;
2028 2069
2029 crp = &ROW(screen.cur.row).r[col]; 2070 crp = &ROW(screen.cur.row).r[col];
2030 2071
2031 if (showcursor && focus) 2072#ifndef NO_CURSORCOLOR
2073 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor;
2076 else
2077#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2079 ccol1 = fgcolor_of (rstyle);
2080#else
2081 ccol1 = Color_fg;
2082#endif
2083
2084#ifndef NO_CURSORCOLOR
2085 if (ISSET_PIXCOLOR (Color_cursor2))
2086 ccol2 = Color_cursor2;
2087 else
2088#endif
2089#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2090 ccol2 = bgcolor_of (rstyle);
2091#else
2092 ccol2 = Color_bg;
2093#endif
2094
2095 if (focus)
2032 { 2096 {
2033 if (OPTION (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2035 else 2099 else
2036 { 2100 {
2037 *crp ^= RS_RVid; 2101 *crp ^= RS_RVid;
2038
2039#ifndef NO_CURSORCOLOR
2040 cc1 = *crp & (RS_fgMask | RS_bgMask);
2041 if (ISSET_PIXCOLOR (Color_cursor))
2042 ccol1 = Color_cursor;
2043 else
2044#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045 ccol1 = fgcolor_of (rstyle);
2046#else
2047 ccol1 = Color_fg;
2048#endif
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057 *crp = SET_FGCOLOR (*crp, ccol1); 2102 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2103 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2104 }
2061 } 2105 }
2062 } 2106 }
2063 2107
2064 /* make sure no outline cursor is left around */ 2108 /* make sure no outline cursor is left around */
… …
2091 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2092 } 2136 }
2093 } 2137 }
2094 } 2138 }
2095 2139
2096 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2097#if ENABLE_OVERLAY
2098 scr_swap_overlay ();
2099#endif
2100
2101#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2102 /* 2141 /*
2103 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2105 */ 2144 */
… …
2194 continue; 2233 continue;
2195 2234
2196 // redraw one or more characters 2235 // redraw one or more characters
2197 2236
2198 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2199 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2200 --col; 2239 --col;
2201 2240
2202 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2203 text_t *text = stp + col; 2242 text_t *text = stp + col;
2204 int count = 1; 2243 int count = 1;
2205 2244
2206 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2207 drp[col] = rend; 2246 drp[col] = rend;
… …
2211 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2212 { 2251 {
2213 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2214 { 2253 {
2215 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2216 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2217 count++; 2257 count++;
2218 i++; 2258 i++;
2219 2259
2220 continue; 2260 continue;
2221 } 2261 }
… …
2241 2281
2242 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2243 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2244 2284
2245 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2246 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2247 count++, i--; 2287 count++, i--;
2248 2288
2249 /* 2289 /*
2250 * Determine the attributes for the string 2290 * Determine the attributes for the string
2251 */ 2291 */
2252 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2253 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2254 2294
2255 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2256 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2257 { 2297 {
2258#if ENABLE_STYLES
2259 // "careful" (too wide) character handling
2260
2261 // include previous careful character(s) if possible, looks nicer (best effort...)
2262 while (text > stp
2263 && srp[text - stp - 1] & RS_Careful
2264 && RS_SAME (rend, srp[text - stp - 1]))
2265 text--, count++, xpixel -= fwidth;
2266
2267 // force redraw after "careful" characters to avoid pixel droppings
2268 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2269 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2270
2271 // force redraw before "careful" characters to avoid pixel droppings
2272 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2273 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2274#endif
2275
2276 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2277 2299
2278#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2279 if (rend & RS_Bold
2280 && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
2281 { 2302 {
2282 if (ISSET_PIXCOLOR (Color_BD)) 2303 if (ISSET_PIXCOLOR (Color_BD))
2283 fore = Color_BD; 2304 fore = Color_BD;
2284# if !ENABLE_STYLES 2305# if !ENABLE_STYLES
2285 else 2306 else
2286 invert = !invert; 2307 invert = !invert;
2287# endif 2308# endif
2288 } 2309 }
2289 2310
2290 if (rend & RS_Italic 2311 if (rend & RS_Italic && fore == Color_fg)
2291 && fore == Color_fg)
2292 { 2312 {
2293 if (ISSET_PIXCOLOR (Color_IT)) 2313 if (ISSET_PIXCOLOR (Color_IT))
2294 fore = Color_IT; 2314 fore = Color_IT;
2295# if !ENABLE_STYLES 2315# if !ENABLE_STYLES
2296 else 2316 else
2297 invert = !invert; 2317 invert = !invert;
2298# endif 2318# endif
2299 } 2319 }
2300 2320
2301 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2302 fore = Color_UL; 2322 fore = Color_UL;
2323#endif
2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2303#endif 2343#endif
2304 2344
2305 if (invert) 2345 if (invert)
2306 { 2346 {
2307 ::swap (fore, back); 2347 ::swap (fore, back);
2308 2348
2309#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312
2313 if (fore == back) 2350 if (fore == back)
2314 { 2351 {
2315 fore = Color_bg; 2352 fore = Color_bg;
2316 back = Color_fg; 2353 back = Color_fg;
2317 } 2354 }
… …
2319 } 2356 }
2320 2357
2321#ifdef TEXT_BLINK 2358#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2360 {
2324 if (!text_blink_ev.active) 2361 if (!text_blink_ev.is_active ())
2325 { 2362 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2363 text_blink_ev.again ();
2327 hidden_text = 0; 2364 hidden_text = 0;
2328 } 2365 }
2329 else if (hidden_text) 2366 else if (hidden_text)
2330 fore = back; 2367 fore = back;
2331 } 2368 }
2332#endif 2369#endif
2370
2371#if ENABLE_STYLES
2372 // "careful" (too wide) character handling
2373
2374 // include previous careful character(s) if possible, looks nicer (best effort...)
2375 while (text > stp
2376 && srp[text - stp - 1] & RS_Careful
2377 && RS_SAME (rend, srp[text - stp - 1]))
2378 text--, count++, xpixel -= fwidth;
2379
2380 // force redraw after "careful" characters to avoid pixel droppings
2381 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2382 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2383
2384 // force redraw before "careful" characters to avoid pixel droppings
2385 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2386 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2387#endif
2333 } 2388 }
2334 2389
2335 /* 2390 /*
2336 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2337 */ 2392 */
2338 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2339 2394
2340 if (back == fore) 2395 if (expect_true (have_bg && back == Color_bg))
2341 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2342 else if (back == Color_bg && have_bg)
2343 { 2396 {
2344 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2345 2398
2346 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2347 if (text[i] != ' ') 2400 if (text[i] != ' ')
2348 { 2401 {
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2402 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2350 goto did_clear; 2403 goto did_clear;
2351 } 2404 }
2352 2405
2353 CLEAR_CHARS (xpixel, ypixel, count); 2406 CLEAR_CHARS (xpixel, ypixel, count);
2354 did_clear: ; 2407 did_clear: ;
2355 } 2408 }
2356 else 2409 else
2357 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2358 2411
2359 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2360 { 2413 {
2361#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2362 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2363 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2364 else 2417 else
2365#endif 2418#endif
2366 XSetForeground (dpy, gc, pix_colors[fore]); 2419 XSetForeground (dpy, gc, pix_colors[fore]);
2367 2420
2368 XDrawLine (dpy, drawBuffer, gc, 2421 XDrawLine (dpy, vt, gc,
2369 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2370 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2371 } 2424 }
2372 } /* for (col....) */ 2425 } /* for (col....) */
2373 } /* for (row....) */ 2426 } /* for (row....) */
2374 2427
2375#if ENABLE_OVERLAY
2376 scr_swap_overlay ();
2377#endif
2378 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2379
2380 /* 2428 /*
2381 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2382 */ 2430 */
2383 if (showcursor) 2431 if (showcursor)
2384 { 2432 {
2385 if (focus) 2433 if (focus)
2386 { 2434 {
2387 if (OPTION (Opt_cursorUnderline)) 2435 if (option (Opt_cursorUnderline))
2388 *crp ^= RS_Uline; 2436 *crp ^= RS_Uline;
2389 else 2437 else
2390 { 2438 {
2391 *crp ^= RS_RVid; 2439 *crp ^= RS_RVid;
2392#ifndef NO_CURSORCOLOR 2440#ifndef NO_CURSORCOLOR
… …
2407 cursorwidth++; 2455 cursorwidth++;
2408 2456
2409#ifndef NO_CURSORCOLOR 2457#ifndef NO_CURSORCOLOR
2410 if (ISSET_PIXCOLOR (Color_cursor)) 2458 if (ISSET_PIXCOLOR (Color_cursor))
2411 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2460 else
2412#endif 2461#endif
2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2413 2463
2414 XDrawRectangle (dpy, drawBuffer, gc, 2464 XDrawRectangle (dpy, vt, gc,
2415 Col2Pixel (col), 2465 Col2Pixel (col),
2416 Row2Pixel (oldcursor.row), 2466 Row2Pixel (oldcursor.row),
2417 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2467 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2418 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2419 } 2469 }
2420 } 2470 }
2421 2471
2422 /* 2472 /*
2423 * H: cleanup selection 2473 * H: cleanup selection
2424 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2425 scr_reverse_selection (); 2480 scr_reverse_selection ();
2426 2481
2482 screen.flags = old_screen_flags;
2427 num_scr = 0; 2483 num_scr = 0;
2428 num_scr_allow = 1; 2484 num_scr_allow = 1;
2429} 2485}
2430 2486
2431void 2487void
… …
2452 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2453 } 2509 }
2454} 2510}
2455 2511
2456void 2512void
2457rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2458{ 2514{
2459 if (1 2515 bool transparent = false;
2460#if TRANSPARENT 2516
2461 && !am_transparent 2517#ifdef HAVE_BG_PIXMAP
2518 if (bg_pixmap != None)
2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & isTransparent)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2525
2526 transparent = true;
2527 }
2528 else
2462#endif 2529# endif
2463#if XPM_BACKGROUND
2464 && !bgPixmap.pixmap
2465#endif
2466 ) 2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2534 }
2535 else
2536#endif
2467 { 2537 {
2468 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2469 XClearWindow (dpy, parent[0]);
2470 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2471#if HAVE_SCROLLBARS 2540 }
2541
2542 XClearWindow (dpy, parent[0]);
2543
2472 if (scrollBar.win) 2544 if (scrollBar.win)
2473 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2474 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2475 scrollBar.setIdle (); 2550 scrollBar.state = STATE_IDLE;
2476 scrollbar_show (0); 2551 scrollBar.show (0);
2477 } 2552 }
2478#endif 2553
2554 if (refresh)
2479 } 2555 {
2480
2481 scr_clear (); 2556 scr_clear ();
2482 scr_touch (true); 2557 scr_touch (true);
2558 }
2483 want_refresh = 1; 2559 want_refresh = 1;
2484} 2560}
2485 2561
2486/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2487void 2563void
… …
2555 { 2631 {
2556#if !ENABLE_MINIMAL 2632#if !ENABLE_MINIMAL
2557 if (selection.rect) 2633 if (selection.rect)
2558 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2559 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2560 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2561 else 2637 else
2562#endif 2638#endif
2563 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2564 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2565 RS_RVid); 2641 RS_Sel | RS_RVid);
2566 } 2642 }
2567} 2643}
2568 2644
2569/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2570/* 2646/*
… …
2575void 2651void
2576rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2577{ 2653{
2578 int row, wrote; 2654 int row, wrote;
2579 unsigned int width, towrite; 2655 unsigned int width, towrite;
2580 char r1[] = "\n"; 2656 const char r1[] = "\n";
2581 2657
2582 for (row = saveLines - nsaved; 2658 for (row = saveLines + top_row;
2583 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2584 { 2660 {
2585 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
2586 : ncol; 2662 : ncol;
2587 for (towrite = width; towrite; towrite -= wrote) 2663 for (towrite = width; towrite; towrite -= wrote)
… …
2631/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2632/* 2708/*
2633 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2634 */ 2710 */
2635void 2711void
2636rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2637{ 2713{
2638 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2639 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2640 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2641 data[i] = C0_CR; 2717 data[i] = C0_CR;
2642 2718
2719 if (priv_modes & PrivMode_BracketPaste)
2720 tt_printf ("\e[200~");
2721
2643 tt_write (data, len); 2722 tt_write (data, len);
2723
2724 if (priv_modes & PrivMode_BracketPaste)
2725 tt_printf ("\e[201~");
2726}
2727
2728void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{
2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2732 return;
2733
2734 tt_paste (data, len);
2644} 2735}
2645 2736
2646/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2647/* 2738/*
2648 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
… …
2705 &ct2.nitems, &bytes_after, 2796 &ct2.nitems, &bytes_after,
2706 &ct2.value) != Success) 2797 &ct2.value) != Success)
2707 goto bailout; 2798 goto bailout;
2708 2799
2709 // realloc should be compatible to XFree, here, and elsewhere, too 2800 // realloc should be compatible to XFree, here, and elsewhere, too
2710 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2801 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2711 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2802 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2712 ct.nitems += ct2.nitems; 2803 ct.nitems += ct2.nitems;
2713 2804
2714 XFree (ct2.value); 2805 XFree (ct2.value);
2715 } 2806 }
… …
2723 if (!delete_prop) 2814 if (!delete_prop)
2724 XDeleteProperty (dpy, win, prop); 2815 XDeleteProperty (dpy, win, prop);
2725 2816
2726 selection_wait = Sel_incr; 2817 selection_wait = Sel_incr;
2727 incr_buf_fill = 0; 2818 incr_buf_fill = 0;
2728 incr_ev.start (NOW + 10); 2819 incr_ev.start (10);
2729 2820
2730 goto bailout; 2821 goto bailout;
2731 } 2822 }
2732 2823
2733 if (ct.nitems == 0) 2824 if (ct.nitems == 0)
… …
2742 ct.nitems = incr_buf_fill; 2833 ct.nitems = incr_buf_fill;
2743 incr_buf = 0; 2834 incr_buf = 0;
2744 incr_buf_size = 0; 2835 incr_buf_size = 0;
2745 incr_ev.stop (); 2836 incr_ev.stop ();
2746 } 2837 }
2747 else 2838 else
2748 { 2839 {
2749 if (selection_wait == Sel_normal 2840 if (selection_wait == Sel_normal
2750 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2841 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2751 { 2842 {
2752 /* 2843 /*
… …
2759 goto bailout; 2850 goto bailout;
2760 } 2851 }
2761 } 2852 }
2762 else if (selection_wait == Sel_incr) 2853 else if (selection_wait == Sel_incr)
2763 { 2854 {
2764 incr_ev.start (NOW + 10); 2855 incr_ev.start (10);
2765 2856
2766 while (incr_buf_fill + ct.nitems > incr_buf_size) 2857 while (incr_buf_fill + ct.nitems > incr_buf_size)
2767 { 2858 {
2768 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2859 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2769 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2860 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2770 } 2861 }
2771 2862
2772 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2863 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2773 incr_buf_fill += ct.nitems; 2864 incr_buf_fill += ct.nitems;
2774 2865
… …
2809 if (selection_wait == Sel_normal) 2900 if (selection_wait == Sel_normal)
2810 selection_wait = Sel_none; 2901 selection_wait = Sel_none;
2811} 2902}
2812 2903
2813void 2904void
2814rxvt_term::incr_cb (time_watcher &w) NOTHROW 2905rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2815{ 2906{
2816 selection_wait = Sel_none; 2907 selection_wait = Sel_none;
2817 2908
2818 incr_buf_size = 0; 2909 incr_buf_size = 0;
2819 free (incr_buf); 2910 free (incr_buf);
… …
2830 selection_paste (win, prop, true); 2921 selection_paste (win, prop, true);
2831} 2922}
2832 2923
2833/* ------------------------------------------------------------------------- */ 2924/* ------------------------------------------------------------------------- */
2834/* 2925/*
2835 * Request the current selection: 2926 * Request the current selection:
2836 * Order: > internal selection if available 2927 * Order: > internal selection if available
2837 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2928 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2838 * > CUT_BUFFER0 2929 * > CUT_BUFFER0
2839 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2930 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2840 * will auto fallback to CUT_BUFFER0 2931 * will auto fallback to CUT_BUFFER0
… …
2842 */ 2933 */
2843void 2934void
2844rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2935rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2845{ 2936{
2846 if (selection.text && selnum == Sel_Primary) 2937 if (selection.text && selnum == Sel_Primary)
2938 {
2847 { /* internal selection */ 2939 /* internal selection */
2848 char *str = rxvt_wcstombs (selection.text, selection.len); 2940 char *str = rxvt_wcstombs (selection.text, selection.len);
2849 paste (str, strlen (str)); 2941 paste (str, strlen (str));
2850 free (str); 2942 free (str);
2851 return; 2943 return;
2852 } 2944 }
… …
2856 selection_wait = Sel_normal; 2948 selection_wait = Sel_normal;
2857 2949
2858#if X_HAVE_UTF8_STRING 2950#if X_HAVE_UTF8_STRING
2859 selection_type = Sel_UTF8String; 2951 selection_type = Sel_UTF8String;
2860 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2952 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2861 return; 2953 return;
2862#else 2954#else
2863 selection_type = Sel_CompoundText; 2955 selection_type = Sel_CompoundText;
2864 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2956 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2865 return; 2957 return;
2866#endif 2958#endif
2867 } 2959 }
2868 2960
2869 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2961 selection_wait = Sel_none; /* don't loop in selection_paste () */
2870 selection_paste (display->root, XA_CUT_BUFFER0, false); 2962 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2898/* 2990/*
2899 * Clear all selected text 2991 * Clear all selected text
2900 * EXT: SelectionClear 2992 * EXT: SelectionClear
2901 */ 2993 */
2902void 2994void
2903rxvt_term::selection_clear () NOTHROW 2995rxvt_term::selection_clear (bool clipboard) NOTHROW
2904{ 2996{
2997 if (!clipboard)
2998 {
2905 want_refresh = 1; 2999 want_refresh = 1;
2906 free (selection.text); 3000 free (selection.text);
2907 selection.text = NULL; 3001 selection.text = NULL;
2908 selection.len = 0; 3002 selection.len = 0;
2909 CLEAR_SELECTION (); 3003 CLEAR_SELECTION ();
2910 3004
2911 if (display->selection_owner == this) 3005 if (display->selection_owner == this)
2912 display->selection_owner = 0; 3006 display->selection_owner = 0;
3007 }
3008 else
3009 {
3010 free (selection.clip_text);
3011 selection.clip_text = NULL;
3012 selection.clip_len = 0;
3013
3014 if (display->clipboard_owner == this)
3015 display->clipboard_owner = 0;
3016 }
2913} 3017}
2914 3018
2915/* ------------------------------------------------------------------------- */ 3019/* ------------------------------------------------------------------------- */
2916/* 3020/*
2917 * Copy a selection into the cut buffer 3021 * Copy a selection into the cut buffer
2918 * EXT: button 1 or 3 release 3022 * EXT: button 1 or 3 release
2919 */ 3023 */
2920void 3024void
2921rxvt_term::selection_make (Time tm) 3025rxvt_term::selection_make (Time tm)
2922{ 3026{
2923 int i; 3027 int size;
2924 wchar_t *new_selection_text; 3028 wchar_t *new_selection_text;
2925 text_t *t; 3029 text_t *t;
2926 3030
2927 switch (selection.op) 3031 switch (selection.op)
2928 { 3032 {
… …
2944 return; /* nothing selected, go away */ 3048 return; /* nothing selected, go away */
2945 3049
2946 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3050 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2947 return; 3051 return;
2948 3052
2949 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3053 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2950 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3054 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2951 3055
2952 int ofs = 0; 3056 int ofs = 0;
2953 int extra = 0; 3057 int extra = 0;
2954 3058
2955 int col = selection.beg.col; 3059 int col = selection.beg.col;
… …
2961 { 3065 {
2962#if !ENABLE_MINIMAL 3066#if !ENABLE_MINIMAL
2963 if (selection.rect) 3067 if (selection.rect)
2964 { 3068 {
2965 col = selection.beg.col; 3069 col = selection.beg.col;
2966 end_col = ncol + 1; 3070 end_col = selection.end.col;
2967 } 3071 }
2968 else 3072 else
2969#endif 3073#endif
2970 end_col = ROW(row).l; 3074 end_col = ROW(row).l;
2971 3075
2972 col = max (col, 0); 3076 col = max (col, 0);
2973 3077
2974 if (row == selection.end.row 3078 if (row == selection.end.row)
2975#if !ENABLE_MINIMAL
2976 || selection.rect
2977#endif
2978 )
2979 min_it (end_col, selection.end.col); 3079 min_it (end_col, selection.end.col);
2980 3080
2981 t = ROW(row).t + col; 3081 t = ROW(row).t + col;
2982 3082
2983 for (; col < end_col; col++) 3083 for (; col < end_col; col++)
… …
2991 3091
2992 extra -= (len - 1); 3092 extra -= (len - 1);
2993 3093
2994 if (extra < 0) 3094 if (extra < 0)
2995 { 3095 {
2996 extra += i; 3096 extra += size;
2997 i += i; 3097 size += size;
2998 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3098 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2999 } 3099 }
3000 3100
3001 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3101 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3002 } 3102 }
3003#endif 3103#endif
… …
3015 3115
3016 new_selection_text[ofs++] = C0_LF; 3116 new_selection_text[ofs++] = C0_LF;
3017 } 3117 }
3018 else 3118 else
3019#endif 3119#endif
3020 if (!ROW(row).is_longer () && row != selection.end.row) 3120 if (!ROW(row).is_longer ()
3121 && (row != selection.end.row || end_col != selection.end.col)
3122 && (row != selection.beg.row || selection.beg.col < ncol))
3021 new_selection_text[ofs++] = C0_LF; 3123 new_selection_text[ofs++] = C0_LF;
3022 } 3124 }
3023
3024 if (end_col != selection.end.col)
3025 new_selection_text[ofs++] = C0_LF;
3026 3125
3027 new_selection_text[ofs] = 0; 3126 new_selection_text[ofs] = 0;
3028 3127
3029 if (ofs == 0) 3128 if (ofs == 0)
3030 { 3129 {
… …
3043 3142
3044 selection_grab (tm); 3143 selection_grab (tm);
3045} 3144}
3046 3145
3047bool 3146bool
3048rxvt_term::selection_grab (Time tm) NOTHROW 3147rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3049{ 3148{
3149 Atom sel;
3150
3151 if (!clipboard)
3152 {
3050 selection_time = tm; 3153 selection_time = tm;
3154 sel = XA_PRIMARY;
3155 }
3156 else
3157 {
3158 clipboard_time = tm;
3159 sel = xa[XA_CLIPBOARD];
3160 }
3051 3161
3052 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3162 XSetSelectionOwner (dpy, sel, vt, tm);
3053 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3163 if (XGetSelectionOwner (dpy, sel) == vt)
3054 { 3164 {
3055 display->set_selection_owner (this); 3165 display->set_selection_owner (this, clipboard);
3056 return true; 3166 return true;
3057 } 3167 }
3058 else 3168 else
3059 { 3169 {
3060 selection_clear (); 3170 selection_clear (clipboard);
3061 return false; 3171 return false;
3062 } 3172 }
3063 3173
3064#if 0 3174#if 0
3065 XTextProperty ct; 3175 XTextProperty ct;
… …
3118 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3228 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3119 3229
3120 while (selection.mark.col > 0 3230 while (selection.mark.col > 0
3121 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3231 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3122 --selection.mark.col; 3232 --selection.mark.col;
3123 3233
3124 if (selection.op) 3234 if (selection.op)
3235 {
3125 { /* clear the old selection */ 3236 /* clear the old selection */
3126 selection.beg.row = selection.end.row = selection.mark.row; 3237 selection.beg.row = selection.end.row = selection.mark.row;
3127 selection.beg.col = selection.end.col = selection.mark.col; 3238 selection.beg.col = selection.end.col = selection.mark.col;
3128 } 3239 }
3129 3240
3130 selection.op = SELECTION_INIT; 3241 selection.op = SELECTION_INIT;
… …
3319 * a point/word/line which is either the start or end of the selection 3430 * a point/word/line which is either the start or end of the selection
3320 * and it was decided by whichever point/word/line was `fixed' at the 3431 * and it was decided by whichever point/word/line was `fixed' at the
3321 * time of the most recent button3 press 3432 * time of the most recent button3 press
3322 */ 3433 */
3323 if (button3 && buttonpress) 3434 if (button3 && buttonpress)
3435 {
3324 { /* button3 press */ 3436 /* button3 press */
3325 /* 3437 /*
3326 * first determine which edge of the selection we are closest to 3438 * first determine which edge of the selection we are closest to
3327 */ 3439 */
3328 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3440 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3329 || (!ROWCOL_IS_AFTER (pos, selection.end) 3441 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3347 selection.mark.row = selection.beg.row; 3459 selection.mark.row = selection.beg.row;
3348 selection.mark.col = selection.beg.col; 3460 selection.mark.col = selection.beg.col;
3349 } 3461 }
3350 } 3462 }
3351 else 3463 else
3464 {
3352 { /* button1 drag or button3 drag */ 3465 /* button1 drag or button3 drag */
3353 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3466 if (ROWCOL_IS_AFTER (selection.mark, pos))
3354 { 3467 {
3355 if (selection.mark.row == selection.end.row 3468 if (selection.mark.row == selection.end.row
3356 && selection.mark.col == selection.end.col 3469 && selection.mark.col == selection.end.col
3357 && clickchange 3470 && clickchange
… …
3400 selection_delimit_word (DN, &selection.end, &selection.end); 3513 selection_delimit_word (DN, &selection.end, &selection.end);
3401 } 3514 }
3402 else if (selection.clicks == 3) 3515 else if (selection.clicks == 3)
3403 { 3516 {
3404#if ENABLE_FRILLS 3517#if ENABLE_FRILLS
3405 if (OPTION (Opt_tripleclickwords)) 3518 if (option (Opt_tripleclickwords))
3406 { 3519 {
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3520 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 3521
3409 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3522 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3410 { 3523 {
… …
3438 selection.end.row++; 3551 selection.end.row++;
3439 } 3552 }
3440 } 3553 }
3441 3554
3442 if (button3 && buttonpress) 3555 if (button3 && buttonpress)
3556 {
3443 { /* mark may need to be changed */ 3557 /* mark may need to be changed */
3444 if (closeto == LEFT) 3558 if (closeto == LEFT)
3445 { 3559 {
3446 selection.mark.row = selection.end.row; 3560 selection.mark.row = selection.end.row;
3447 selection.mark.col = selection.end.col - (selection.clicks == 2); 3561 selection.mark.col = selection.end.col - (selection.clicks == 2);
3448 } 3562 }
… …
3556 else if (rq.target == xa[XA_MULTIPLE]) 3670 else if (rq.target == xa[XA_MULTIPLE])
3557 { 3671 {
3558 /* TODO: Handle MULTIPLE */ 3672 /* TODO: Handle MULTIPLE */
3559 } 3673 }
3560#endif 3674#endif
3561 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3675 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3562 { 3676 {
3563 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3677 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3564 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3678 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3679 ev.property = rq.property;
3680 }
3681 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3682 {
3683 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3684 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3565 ev.property = rq.property; 3685 ev.property = rq.property;
3566 } 3686 }
3567 else if (rq.target == XA_STRING 3687 else if (rq.target == XA_STRING
3568 || rq.target == xa[XA_TEXT] 3688 || rq.target == xa[XA_TEXT]
3569 || rq.target == xa[XA_COMPOUND_TEXT] 3689 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3602 { 3722 {
3603 target = xa[XA_COMPOUND_TEXT]; 3723 target = xa[XA_COMPOUND_TEXT];
3604 style = enc_compound_text; 3724 style = enc_compound_text;
3605 } 3725 }
3606 3726
3607 if (selection.text) 3727 if (rq.selection == XA_PRIMARY && selection.text)
3608 { 3728 {
3609 cl = selection.text; 3729 cl = selection.text;
3610 selectlen = selection.len; 3730 selectlen = selection.len;
3731 }
3732 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3733 {
3734 cl = selection.clip_text;
3735 selectlen = selection.clip_len;
3611 } 3736 }
3612 else 3737 else
3613 { 3738 {
3614 cl = L""; 3739 cl = L"";
3615 selectlen = 0; 3740 selectlen = 0;
… …
3647 XFree (ct.value); 3772 XFree (ct.value);
3648 } 3773 }
3649 3774
3650 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3775 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3651} 3776}
3652
3653/* ------------------------------------------------------------------------- *
3654 * MOUSE ROUTINES *
3655 * ------------------------------------------------------------------------- */
3656
3657/*
3658 * return col/row values corresponding to x/y pixel values
3659 */
3660void
3661rxvt_term::pixel_position (int *x, int *y) NOTHROW
3662{
3663 *x = Pixel2Col (*x);
3664 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3665 *y = Pixel2Row (*y);
3666 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3667}
3668 3777
3669/* ------------------------------------------------------------------------- */ 3778/* ------------------------------------------------------------------------- */
3670#ifdef USE_XIM 3779#ifdef USE_XIM
3671void 3780void
3672rxvt_term::im_set_position (XPoint &pos) NOTHROW 3781rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3699 h += 2; min_it (h, nrow); 3808 h += 2; min_it (h, nrow);
3700 3809
3701 x -= 1; clamp_it (x, 0, ncol - w); 3810 x -= 1; clamp_it (x, 0, ncol - w);
3702 y -= 1; clamp_it (y, 0, nrow - h); 3811 y -= 1; clamp_it (y, 0, nrow - h);
3703 3812
3704 ov_x = x; ov_y = y; 3813 ov.x = x; ov.y = y;
3705 ov_w = w; ov_h = h; 3814 ov.w = w; ov.h = h;
3706 3815
3707 ov_text = new text_t *[h]; 3816 ov.text = new text_t *[h];
3708 ov_rend = new rend_t *[h]; 3817 ov.rend = new rend_t *[h];
3709 3818
3710 for (y = 0; y < h; y++) 3819 for (y = 0; y < h; y++)
3711 { 3820 {
3712 text_t *tp = ov_text[y] = new text_t[w]; 3821 text_t *tp = ov.text[y] = new text_t[w];
3713 rend_t *rp = ov_rend[y] = new rend_t[w]; 3822 rend_t *rp = ov.rend[y] = new rend_t[w];
3714 3823
3715 text_t t0, t1, t2; 3824 text_t t0, t1, t2;
3716 rend_t r = OVERLAY_RSTYLE; 3825 rend_t r = OVERLAY_RSTYLE;
3717 3826
3718 if (y == 0) 3827 if (y == 0)
… …
3737} 3846}
3738 3847
3739void 3848void
3740rxvt_term::scr_overlay_off () NOTHROW 3849rxvt_term::scr_overlay_off () NOTHROW
3741{ 3850{
3742 if (!ov_text) 3851 if (!ov.text)
3743 return; 3852 return;
3744 3853
3745 want_refresh = 1; 3854 want_refresh = 1;
3746 3855
3747 for (int y = 0; y < ov_h; y++) 3856 for (int y = 0; y < ov.h; y++)
3748 { 3857 {
3749 delete [] ov_text[y]; 3858 delete [] ov.text[y];
3750 delete [] ov_rend[y]; 3859 delete [] ov.rend[y];
3751 } 3860 }
3752 3861
3753 delete [] ov_text; ov_text = 0; 3862 delete [] ov.text; ov.text = 0;
3754 delete [] ov_rend; ov_rend = 0; 3863 delete [] ov.rend; ov.rend = 0;
3755} 3864}
3756 3865
3757void 3866void
3758rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3867rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3759{ 3868{
3760 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3869 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3761 return; 3870 return;
3762 3871
3763 x++, y++; 3872 x++, y++;
3764 3873
3765 ov_text[y][x] = text; 3874 ov.text[y][x] = text;
3766 ov_rend[y][x] = rend; 3875 ov.rend[y][x] = rend;
3767} 3876}
3768 3877
3769void 3878void
3770rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3879rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3771{ 3880{
… …
3790} 3899}
3791 3900
3792void 3901void
3793rxvt_term::scr_swap_overlay () NOTHROW 3902rxvt_term::scr_swap_overlay () NOTHROW
3794{ 3903{
3795 if (!ov_text) 3904 if (!ov.text)
3796 return; 3905 return;
3797 3906
3907 // hide cursor if it is within the overlay area
3908 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3909 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3910 screen.flags &= ~Screen_VisibleCursor;
3911
3798 // swap screen mem with overlay 3912 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3913 for (int y = ov.h; y--; )
3800 { 3914 {
3801 text_t *t1 = ov_text[y]; 3915 text_t *t1 = ov.text[y];
3802 rend_t *r1 = ov_rend[y]; 3916 rend_t *r1 = ov.rend[y];
3803 3917
3804 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3918 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3805 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3919 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3806 3920
3807 for (int x = ov_w; x--; ) 3921 for (int x = ov.w; x--; )
3808 { 3922 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3923 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3924 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3811 } 3925 }
3812 } 3926 }

Diff Legend

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