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.316 by root, Tue Nov 4 15:02:35 2008 UTC vs.
Revision 1.398 by sf-exg, Wed Nov 2 15:11:51 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-2007 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.
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
162{ 163{
163#if ENABLE_OVERLAY 164#if ENABLE_OVERLAY
164 scr_overlay_off (); 165 scr_overlay_off ();
165#endif 166#endif
166 167
167 rvideo_mode = false;
168 view_start = 0; 168 view_start = 0;
169 num_scr = 0; 169 num_scr = 0;
170 170
171 if (ncol == 0) 171 if (ncol == 0)
172 ncol = 80; 172 ncol = 80;
174 if (nrow == 0) 174 if (nrow == 0)
175 nrow = 24; 175 nrow = 24;
176 176
177 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 178 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 179
183 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
185 { 182 {
186 //TODO//FIXME 183 //TODO//FIXME
206 term_start = 0; 203 term_start = 0;
207 204
208 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
209 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
210 207
211 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
212 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
213 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
214 211
215 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
216 { 213 {
239 selection.text = NULL; 236 selection.text = NULL;
240 selection.len = 0; 237 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
243 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
244 } 243 }
245 else 244 else
246 { 245 {
247 /* 246 /*
248 * add or delete rows as appropriate 247 * add or delete rows as appropriate
276 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
277 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);
278 } 277 }
279 278
280 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
281 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
282 281
283 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
284 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
285 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
286 285
287 if (top_row) 286 if (top_row)
288 { 287 {
289 // 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
290 // 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
291 291
292 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 294
295 do 295 do
296 { 296 {
297 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 299 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 301
304 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 ())
305 { 303 {
399 delete old_ta; 397 delete old_ta;
400 delete old_ra; 398 delete old_ra;
401 399
402 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
404 403
405 free (tabs); 404 free (tabs);
406 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
407 409
408 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
409 411
410 prev_nrow = nrow; 412 prev_nrow = nrow;
411 prev_ncol = ncol; 413 prev_ncol = ncol;
412
413 tabs = (char *)rxvt_malloc (ncol);
414
415 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420 414
421 tt_winch (); 415 tt_winch ();
422 416
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 418}
436 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
437 431
438 free (row_buf); 432 free (row_buf);
439 free (swap_buf); 433 free (swap_buf);
440 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
441 free (tabs); 437 free (tabs);
442 438 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 439 }
445} 440}
446 441
447/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
448/* 443/*
449 * Hard reset 444 * Hard/Soft reset
450 */ 445 */
451void 446void
452rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
453{ 448{
454 scr_release (); 449 scr_release ();
455 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
456 scr_reset (); 453 scr_reset ();
457 454
458 scr_clear (true); 455 scr_clear (true);
459 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);
460} 473}
461 474
462/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
502 } 515 }
503 516
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
510#endif
511} 522}
512 523
513void 524void
514rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
515{ 526{
540 want_refresh = 1; 551 want_refresh = 1;
541 view_start = 0; 552 view_start = 0;
542 553
543 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
544 555
545 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
546 557
547#if NSCREENS 558#if NSCREENS
548 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
549 { 560 {
550 num_scr = 0; 561 num_scr = 0;
627 638
628 if (count > 0 639 if (count > 0
629 && row1 == 0 640 && row1 == 0
630 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
631 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
632 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
633
634 // scroll everything up 'count' lines
635 term_start = (term_start + count) % total_rows;
636 646
637 // sever bottommost line 647 // sever bottommost line
638 { 648 {
639 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
640 l.is_longer (0); 650 l.is_longer (0);
641 l.touch (); 651 l.touch ();
642 } 652 }
643 653
654 // scroll everything up 'count' lines
655 term_start = (term_start + count) % total_rows;
656
657 // now copy lines below the scroll region bottom to the
658 // bottom of the screen again, so they look as if they
659 // hadn't moved.
660 for (int i = nrow; --i > row2; )
661 {
662 line_t &l1 = ROW(i - count);
663 line_t &l2 = ROW(i);
664
665 ::swap (l1, l2);
666 l2.touch ();
667 }
668
644 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
645 for (int i = count; i--; ) 670 for (int i = count; i--; )
646 { 671 {
647 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
648 673
649 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
650 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
651 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 676 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
652 { 677 {
653 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
654 l.l = 0; 679 l.l = 0;
656 } 681 }
657 else 682 else
658 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
659 } 684 }
660 685
661 // now copy lines below the scroll region bottom to the
662 // bottom of the screen again, so they look as if they
663 // hadn't moved.
664 for (int i = nrow; --i > row2; )
665 {
666 line_t &l1 = ROW(i - count);
667 line_t &l2 = ROW(i);
668
669 ::swap (l1, l2);
670 l2.touch ();
671 }
672
673 // move and/or clear selection, if any
674 if (selection.op && current_screen == selection.screen)
675 {
676 selection.beg.row -= count;
677 selection.end.row -= count;
678 selection.mark.row -= count;
679
680 if (selection.beg.row < top_row
681 || selection.end.row < top_row
682 || selection.mark.row < top_row)
683 {
684 CLEAR_ALL_SELECTION ();
685 selection.op = SELECTION_CLEAR;
686 }
687 }
688
689 // finally move the view window, if desired 686 // finally move the view window, if desired
690 if (option (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
691 && view_start != 0 688 && view_start != 0
692 && view_start != -saveLines) 689 && view_start != -saveLines)
693 scr_page (UP, count); 690 scr_page (UP, count);
695 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
696 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 693 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
697 } 694 }
698 else 695 else
699 { 696 {
700 if (selection.op && current_screen == selection.screen)
701 {
702 if ((selection.beg.row < row1 && selection.end.row > row1)
703 || (selection.beg.row < row2 && selection.end.row > row2)
704 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
705 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
706 || (selection.end.row - count < row1 && selection.end.row >= row1)
707 || (selection.end.row - count > row2 && selection.end.row <= row2))
708 {
709 CLEAR_ALL_SELECTION ();
710 selection.op = SELECTION_CLEAR;
711 }
712 else if (selection.end.row >= row1 && selection.end.row <= row2)
713 {
714 /* move selected region too */
715 selection.beg.row -= count;
716 selection.end.row -= count;
717 selection.mark.row -= count;
718
719 selection_check (0);
720 }
721 }
722
723 // use a simple and robust scrolling algorithm, this 697 // use a simple and robust scrolling algorithm, this
724 // part of scr_scroll_text is not time-critical. 698 // part of scr_scroll_text is not time-critical.
725 699
700 // sever line above scroll region
701 if (row1)
702 {
703 line_t &l = ROW(row1 - 1);
704 l.is_longer (0);
705 l.touch ();
706 }
707
726 int rows = row2 - row1 + 1; 708 int rows = row2 - row1 + 1;
727 709
728 min_it (count, rows); 710 min_it (count, rows);
729 711
730 line_t *temp_buf = row_buf + total_rows; 712 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
731 713
732 for (int row = 0; row < rows; row++) 714 for (int row = 0; row < rows; row++)
733 { 715 {
734 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 716 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
735 717
737 scr_blank_screen_mem (temp_buf [row], rstyle); 719 scr_blank_screen_mem (temp_buf [row], rstyle);
738 } 720 }
739 721
740 for (int row = 0; row < rows; row++) 722 for (int row = 0; row < rows; row++)
741 ROW(row1 + row) = temp_buf [row]; 723 ROW(row1 + row) = temp_buf [row];
724
725 // sever bottommost line
726 {
727 line_t &l = ROW(row2);
728 l.is_longer (0);
729 l.touch ();
730 }
731 }
732
733 // move and/or clear selection, if any
734 if (selection.op && current_screen == selection.screen)
735 {
736 if ((selection.beg.row < row1 && selection.end.row > row1)
737 || (selection.beg.row < row2 && selection.end.row > row2)
738 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
739 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
740 || (selection.end.row - count < row1 && selection.end.row >= row1)
741 || (selection.end.row - count > row2 && selection.end.row <= row2))
742 CLEAR_ALL_SELECTION ();
743 else if (selection.end.row >= row1 && selection.end.row <= row2)
744 {
745 /* move selected region too */
746 selection.beg.row -= count;
747 selection.end.row -= count;
748 selection.mark.row -= count;
749
750 selection_check (0);
751 }
742 } 752 }
743 753
744 return count; 754 return count;
745} 755}
746 756
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 785 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 786 screen.cur.row -= minlines;
777 } 787 }
778 } 788 }
779 789
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 790 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 791 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 792 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 793 int row = screen.cur.row;
786 794
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 795 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 796
789 line_t *line = &ROW(row); 797 line_t *line = &ROW(row);
790 798
791 while (str < strend) 799 while (str < strend)
792 { 800 {
793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
794 802
795 if (expect_false (c < 0x20)) 803 if (ecb_unlikely (c < 0x20))
796 if (c == C0_LF) 804 if (c == C0_LF)
797 { 805 {
798 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
799 807
800 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
819 { 827 {
820 scr_tab (1, true); 828 scr_tab (1, true);
821 continue; 829 continue;
822 } 830 }
823 831
824 if (expect_false ( 832 if (ecb_unlikely (
825 checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
827 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 )) 836 ))
829 { 837 {
834 * should be a similar check. 842 * should be a similar check.
835 */ 843 */
836 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
837 } 845 }
838 846
839 if (expect_false (screen.flags & Screen_WrapNext)) 847 if (ecb_unlikely (screen.flags & Screen_WrapNext))
840 { 848 {
841 scr_do_wrap (); 849 scr_do_wrap ();
842 850
843 line->l = ncol; 851 line->l = ncol;
844 line->is_longer (1); 852 line->is_longer (1);
846 row = screen.cur.row; 854 row = screen.cur.row;
847 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
848 } 856 }
849 857
850 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 859 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
852 c = 0xfffd; 860 c = 0xfffd;
853 861
854 // rely on wcwidth to tell us the character width, do wcwidth before 862 // rely on wcwidth to tell us the character width, do wcwidth before
855 // further replacements, as wcwidth might return -1 for the line 863 // further replacements, as wcwidth might return -1 for the line
856 // drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
857 // locale. 865 // locale.
858 int width = WCWIDTH (c); 866 int width = WCWIDTH (c);
859 867
860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 868 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
861 { 869 {
862 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
863 // 5f-7e standard vt100 871 // 5f-7e standard vt100
864 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
865 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
878 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
879 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
880 } 888 }
881 } 889 }
882 890
883 if (expect_false (screen.flags & Screen_Insert)) 891 if (ecb_unlikely (screen.flags & Screen_Insert))
884 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
885 893
886 if (width != 0) 894 if (width != 0)
887 { 895 {
888#if !UNICODE_3 896#if !UNICODE_3
893# else 901# else
894 c = 0xfffd; 902 c = 0xfffd;
895# endif 903# endif
896#endif 904#endif
897 905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907
908 // if the character doesn't fit into the remaining columns...
909 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
910 {
911 if (screen.flags & Screen_Autowrap)
912 {
913 // ... artificially enlargen the previous one
914 c = NOCHAR;
915 // and try the same character next loop iteration
916 --str;
917 }
918 else
919 screen.cur.col = ncol - width;
920 }
921
898 // nuke the character at this position, if required 922 // nuke the character at this position, if required
899 if (expect_false ( 923 // due to wonderful coincidences everywhere else in this loop
924 // we never have to check for overwriting a wide char itself,
925 // only its tail.
900 line->t[screen.cur.col] == NOCHAR 926 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
901 || (screen.cur.col < ncol - 1
902 && line->t[screen.cur.col + 1] == NOCHAR)
903 ))
904 scr_kill_char (*line, screen.cur.col); 927 scr_kill_char (*line, screen.cur.col);
905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907
908 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 {
911 // ...output spaces
912 c = ' ';
913 // and try the same character next loop iteration
914 --str;
915 }
916 928
917 line->touch (); 929 line->touch ();
918 930
919 do 931 do
920 { 932 {
921 line->t[screen.cur.col] = c; 933 line->t[screen.cur.col] = c;
922 line->r[screen.cur.col] = rend; 934 line->r[screen.cur.col] = rend;
923 935
924 if (expect_true (screen.cur.col < ncol - 1)) 936 if (ecb_likely (screen.cur.col < ncol - 1))
925 screen.cur.col++; 937 screen.cur.col++;
926 else 938 else
927 { 939 {
928 line->l = ncol; 940 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 941 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 942 screen.flags |= Screen_WrapNext;
931 break; 943
944 goto end_of_line;
932 } 945 }
933 946
934 c = NOCHAR; 947 c = NOCHAR;
935 } 948 }
936 while (expect_false (--width > 0)); 949 while (ecb_unlikely (--width > 0));
937 950
938 // pad with spaces when overwriting wide character with smaller one 951 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 952 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
940 { 953 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 954 line->t[c] = ' ';
946 line->r[c] = rend; 955 line->r[c] = rend;
947 }
948 } 956 }
957
958end_of_line:
959 ;
949 } 960 }
950#if ENABLE_COMBINING 961#if ENABLE_COMBINING
951 else // width == 0 962 else // width == 0
952 { 963 {
953 if (c != 0xfeff) // ignore BOM 964 if (c != 0xfeff) // ignore BOM
993#endif 1004#endif
994 } 1005 }
995 1006
996 max_it (line->l, screen.cur.col); 1007 max_it (line->l, screen.cur.col);
997 1008
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1009 assert (screen.cur.row >= 0);
1000#endif
1001} 1010}
1002 1011
1003/* ------------------------------------------------------------------------- */ 1012/* ------------------------------------------------------------------------- */
1004/* 1013/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1014 * Process Backspace. Move back the cursor back a position, wrap if have to
1018 1027
1019 want_refresh = 1; 1028 want_refresh = 1;
1020#endif 1029#endif
1021 } 1030 }
1022 } 1031 }
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1023 else 1034 else
1024 scr_gotorc (0, -1, RELATIVE); 1035 scr_gotorc (0, -1, RELATIVE);
1025} 1036}
1026 1037
1027/* ------------------------------------------------------------------------- */ 1038/* ------------------------------------------------------------------------- */
1333 if (row >= nrow) /* Out Of Bounds */ 1344 if (row >= nrow) /* Out Of Bounds */
1334 return; 1345 return;
1335 1346
1336 min_it (num, nrow - row); 1347 min_it (num, nrow - row);
1337 1348
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1352 {
1343 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1344 1354
1345 if (mapped) 1355 if (mapped)
1346 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1349 } 1359 }
1350 else 1360 else
1351 { 1361 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1363
1364 if (mapped)
1365 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1369 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1370 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1371 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1362 } 1375 }
1363 1376
1364 for (; num--; row++) 1377 for (; num--; row++)
1365 { 1378 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1383 }
1369} 1384}
1370 1385
1371#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1372void 1387void
1525 { 1540 {
1526 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1527 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1528 } 1543 }
1529 1544
1530 scr_blank_line (*line, ncol - count, count, 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1531 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1532 1546
1533 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1535 { 1549 {
1536 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
1672 { 1686 {
1673 rvideo_state = on; 1687 rvideo_state = on;
1674 1688
1675 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1676#ifdef HAVE_BG_PIXMAP 1690#ifdef HAVE_BG_PIXMAP
1677 if (bgPixmap.pixmap == None) 1691 if (bg_pixmap == None)
1678#endif 1692#endif
1679 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1680 1694
1681 XGCValues gcvalue; 1695 XGCValues gcvalue;
1682 gcvalue.foreground = pix_colors[Color_fg]; 1696 gcvalue.foreground = pix_colors[Color_fg];
1826 for (i = PART_BEG; i < RC_COUNT; i++) 1840 for (i = PART_BEG; i < RC_COUNT; i++)
1827 { 1841 {
1828 min_it (rc[i].col, ncol - 1); 1842 min_it (rc[i].col, ncol - 1);
1829 min_it (rc[i].row, nrow - 1); 1843 min_it (rc[i].row, nrow - 1);
1830 } 1844 }
1831// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1845
1832 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1833 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1834 1848
1835 num_scr_allow = 0; 1849 num_scr_allow = 0;
1836 1850
1909 1923
1910# ifndef NO_MAPALERT 1924# ifndef NO_MAPALERT
1911# ifdef MAPALERT_OPTION 1925# ifdef MAPALERT_OPTION
1912 if (option (Opt_mapAlert)) 1926 if (option (Opt_mapAlert))
1913# endif 1927# endif
1914 XMapWindow (dpy, parent[0]); 1928 XMapWindow (dpy, parent);
1915# endif 1929# endif
1916 1930
1917# if ENABLE_FRILLS 1931# if ENABLE_FRILLS
1918 if (option (Opt_urgentOnBell)) 1932 if (option (Opt_urgentOnBell))
1919 set_urgency (1); 1933 set_urgency (1);
1927 1941
1928 bell_ev.start (VISUAL_BELL_DURATION); 1942 bell_ev.start (VISUAL_BELL_DURATION);
1929 } 1943 }
1930 else 1944 else
1931 XBell (dpy, 0); 1945 XBell (dpy, 0);
1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1932#endif 1947#endif
1933} 1948}
1934 1949
1935/* ------------------------------------------------------------------------- */ 1950/* ------------------------------------------------------------------------- */
1936/* ARGSUSED */
1937void 1951void
1938rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1939{ 1953{
1940#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1941 int nrows, row_start; 1955 int nrows, row_start;
1955 row_start = view_start; 1969 row_start = view_start;
1956 } 1970 }
1957 1971
1958 wctomb (0, 0); 1972 wctomb (0, 0);
1959 1973
1960 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1961 { 1975 {
1962 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1963 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1964 1978
1965 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
1994 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1995 */ 2009 */
1996void 2010void
1997rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1998{ 2012{
1999 unsigned char have_bg,
2000 showcursor; /* show the cursor */
2001 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
2002 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
2003 int i; /* tmp */ 2015 int i; /* tmp */
2004#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
2005 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
2016 /* 2028 /*
2017 * A: set up vars 2029 * A: set up vars
2018 */ 2030 */
2019 refresh_count = 0; 2031 refresh_count = 0;
2020 2032
2033 unsigned int old_screen_flags = screen.flags;
2021 have_bg = 0; 2034 char have_bg = 0;
2022#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2023 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2024#endif 2037#endif
2025 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2026 2039
2027 /* 2040 /*
2028 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2029 */ 2042 */
2030 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;
2031 2051
2032 /* 2052 /*
2033 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2034 */ 2054 */
2035 { 2055 {
2036 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2037 2057
2038 showcursor = (screen.flags & Screen_VisibleCursor);
2039#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2040 if (hidden_cursor) 2059 if (hidden_cursor)
2041 showcursor = 0; 2060 showcursor = 0;
2042#endif 2061#endif
2043 2062
2071 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2072#else 2091#else
2073 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2074#endif 2093#endif
2075 2094
2076 if (showcursor && focus) 2095 if (focus)
2077 { 2096 {
2078 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2079 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2080 else 2099 else
2081 { 2100 {
2116 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2117 } 2136 }
2118 } 2137 }
2119 } 2138 }
2120 2139
2121 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2122#if ENABLE_OVERLAY
2123 scr_swap_overlay ();
2124#endif
2125
2126#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2127 /* 2141 /*
2128 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2129 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2130 */ 2144 */
2219 continue; 2233 continue;
2220 2234
2221 // redraw one or more characters 2235 // redraw one or more characters
2222 2236
2223 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2224 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2225 --col; 2239 --col;
2226 2240
2227 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2228 text_t *text = stp + col; 2242 text_t *text = stp + col;
2229 int count = 1; 2243 int count = 1;
2230 2244
2231 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2232 drp[col] = rend; 2246 drp[col] = rend;
2236 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2237 { 2251 {
2238 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2239 { 2253 {
2240 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2241 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2242 count++; 2257 count++;
2243 i++; 2258 i++;
2244 2259
2245 continue; 2260 continue;
2246 } 2261 }
2266 2281
2267 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2268 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2269 2284
2270 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2271 while (expect_false (i && text[count] == NOCHAR)) 2286 while (ecb_unlikely (i && text[count] == NOCHAR))
2272 count++, i--; 2287 count++, i--;
2273 2288
2274 /* 2289 /*
2275 * Determine the attributes for the string 2290 * Determine the attributes for the string
2276 */ 2291 */
2277 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2278 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2279 2294
2280 // 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
2281 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2296 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2282 { 2297 {
2283 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2284 2299
2285#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2286 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
2305 2320
2306 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2307 fore = Color_UL; 2322 fore = Color_UL;
2308#endif 2323#endif
2309 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 }
2343#endif
2344
2310 if (invert) 2345 if (invert)
2311 { 2346 {
2312#ifdef OPTION_HC
2313 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2314 || !ISSET_PIXCOLOR (Color_HC))
2315#endif
2316 /* invert the column if no highlightColor is set or it is the
2317 * current cursor column */
2318 ::swap (fore, back); 2347 ::swap (fore, back);
2319#ifdef OPTION_HC
2320 else if (ISSET_PIXCOLOR (Color_HC))
2321 back = Color_HC;
2322#endif
2323 2348
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2325# ifndef OPTION_HC
2326 if (ISSET_PIXCOLOR (Color_RV))
2327 back = Color_RV;
2328# endif
2329 if (fore == back) 2350 if (fore == back)
2330 { 2351 {
2331 fore = Color_bg; 2352 fore = Color_bg;
2332 back = Color_fg; 2353 back = Color_fg;
2333 } 2354 }
2369 /* 2390 /*
2370 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2371 */ 2392 */
2372 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2373 2394
2374 if (expect_true (have_bg && back == Color_bg)) 2395 if (ecb_likely (have_bg && back == Color_bg))
2375 { 2396 {
2376 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2377 2398
2378 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2379 if (text[i] != ' ') 2400 if (text[i] != ' ')
2386 did_clear: ; 2407 did_clear: ;
2387 } 2408 }
2388 else 2409 else
2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2390 2411
2391 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2412 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2392 { 2413 {
2393#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2394 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2395 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2396 else 2417 else
2401 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2403 } 2424 }
2404 } /* for (col....) */ 2425 } /* for (col....) */
2405 } /* for (row....) */ 2426 } /* for (row....) */
2406
2407#if ENABLE_OVERLAY
2408 scr_swap_overlay ();
2409#endif
2410 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2411 2427
2412 /* 2428 /*
2413 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2414 */ 2430 */
2415 if (showcursor) 2431 if (showcursor)
2454 } 2470 }
2455 2471
2456 /* 2472 /*
2457 * H: cleanup selection 2473 * H: cleanup selection
2458 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2459 scr_reverse_selection (); 2480 scr_reverse_selection ();
2460 2481
2482 screen.flags = old_screen_flags;
2461 num_scr = 0; 2483 num_scr = 0;
2462 num_scr_allow = 1; 2484 num_scr_allow = 1;
2463} 2485}
2464 2486
2465void 2487void
2486 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2487 } 2509 }
2488} 2510}
2489 2511
2490void 2512void
2491rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2492{ 2514{
2515 bool transparent = false;
2516
2493#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2494 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2495#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2496 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2497 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2498 XClearWindow (dpy, parent[0]);
2499 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2542 XClearWindow (dpy, parent);
2500 2543
2501 if (scrollBar.win) 2544 if (scrollBar.win)
2502 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2503 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2504 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = SB_STATE_IDLE;
2505 scrollBar.show (0); 2551 scrollBar.show (0);
2506 } 2552 }
2507 2553
2508#endif 2554 if (refresh)
2509 2555 {
2510 /* bgPixmap.apply () does not do the following : */
2511 scr_clear (); 2556 scr_clear ();
2512 scr_touch (true); 2557 scr_touch (true);
2558 }
2513 want_refresh = 1; 2559 want_refresh = 1;
2514} 2560}
2515 2561
2516/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2517void 2563void
2585 { 2631 {
2586#if !ENABLE_MINIMAL 2632#if !ENABLE_MINIMAL
2587 if (selection.rect) 2633 if (selection.rect)
2588 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2589 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2590 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2591 else 2637 else
2592#endif 2638#endif
2593 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2594 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2595 RS_RVid); 2641 RS_Sel | RS_RVid);
2596 } 2642 }
2597} 2643}
2598 2644
2599/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2600/* 2646/*
2605void 2651void
2606rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2607{ 2653{
2608 int row, wrote; 2654 int row, wrote;
2609 unsigned int width, towrite; 2655 unsigned int width, towrite;
2610 char r1[] = "\n"; 2656 const char r1[] = "\n";
2611 2657
2612 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2613 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2614 { 2660 {
2615 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
2632 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2633 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2634void 2680void
2635rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2636{ 2682{
2637 row_col_t pos;
2638
2639 if (!selection.op) 2683 if (!selection.op)
2640 return; 2684 return;
2641 2685
2686 row_col_t pos;
2642 pos.row = pos.col = 0; 2687 pos.row = pos.col = 0;
2688
2643 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2644 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2645 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2646 || (check_more == 1 2692 || (check_more == 1
2647 && current_screen == selection.screen 2693 && current_screen == selection.screen
2653 || (check_more == 3 2699 || (check_more == 3
2654 && ROWCOL_IS_AFTER (selection.end, pos)) 2700 && ROWCOL_IS_AFTER (selection.end, pos))
2655 || (check_more == 4 /* screen width change */ 2701 || (check_more == 4 /* screen width change */
2656 && (selection.beg.row != selection.end.row 2702 && (selection.beg.row != selection.end.row
2657 || selection.end.col > ncol))) 2703 || selection.end.col > ncol)))
2658 CLEAR_SELECTION (); 2704 CLEAR_ALL_SELECTION ();
2659} 2705}
2660 2706
2661/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2662/* 2708/*
2663 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2664 */ 2710 */
2665void 2711void
2666rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2667{ 2713{
2668 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2669 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2670 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2671 data[i] = C0_CR; 2717 data[i] = C0_CR;
2677 2723
2678 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2679 tt_printf ("\e[201~"); 2725 tt_printf ("\e[201~");
2680} 2726}
2681 2727
2682/* ------------------------------------------------------------------------- */
2683/*
2684 * Respond to a notification that a primary selection has been sent
2685 * EXT: SelectionNotify
2686 */
2687void 2728void
2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2689{ 2730{
2690 if (prop == None) /* check for failed XConvertSelection */ 2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2691 {
2692 if ((selection_type & Sel_CompoundText))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = 0;
2697 if (selnum != Sel_direct)
2698 selection_request_other (XA_STRING, selnum);
2699 }
2700
2701 if ((selection_type & Sel_UTF8String))
2702 {
2703 int selnum = selection_type & Sel_whereMask;
2704
2705 selection_type = Sel_CompoundText;
2706 if (selnum != Sel_direct)
2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708 else
2709 selection_type = 0;
2710 }
2711
2712 return;
2713 }
2714
2715 unsigned long bytes_after;
2716 XTextProperty ct;
2717
2718 if (XGetWindowProperty (dpy, win, prop,
2719 0, PROP_SIZE / 4,
2720 delete_prop, AnyPropertyType,
2721 &ct.encoding, &ct.format,
2722 &ct.nitems, &bytes_after,
2723 &ct.value) != Success)
2724 {
2725 ct.value = 0;
2726 goto bailout;
2727 }
2728
2729 if (ct.encoding == None)
2730 goto bailout;
2731
2732 if (bytes_after)
2733 {
2734 // fetch and append remaining data
2735 XTextProperty ct2;
2736
2737 if (XGetWindowProperty (dpy, win, prop,
2738 ct.nitems / 4, (bytes_after + 3) / 4,
2739 delete_prop, AnyPropertyType,
2740 &ct2.encoding, &ct2.format,
2741 &ct2.nitems, &bytes_after,
2742 &ct2.value) != Success)
2743 goto bailout;
2744
2745 // realloc should be compatible to XFree, here, and elsewhere, too
2746 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2747 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2748 ct.nitems += ct2.nitems;
2749
2750 XFree (ct2.value);
2751 }
2752
2753 if (ct.value == 0)
2754 goto bailout;
2755
2756 if (ct.encoding == xa[XA_INCR])
2757 {
2758 // INCR selection, start handshake
2759 if (!delete_prop)
2760 XDeleteProperty (dpy, win, prop);
2761
2762 selection_wait = Sel_incr;
2763 incr_buf_fill = 0;
2764 incr_ev.start (10);
2765
2766 goto bailout;
2767 }
2768
2769 if (ct.nitems == 0)
2770 {
2771 if (selection_wait == Sel_incr)
2772 {
2773 XFree (ct.value);
2774
2775 // finally complete, now paste the whole thing
2776 selection_wait = Sel_normal;
2777 ct.value = (unsigned char *)incr_buf;
2778 ct.nitems = incr_buf_fill;
2779 incr_buf = 0;
2780 incr_buf_size = 0;
2781 incr_ev.stop ();
2782 }
2783 else
2784 {
2785 if (selection_wait == Sel_normal
2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2787 {
2788 /*
2789 * pass through again trying CUT_BUFFER0 if we've come from
2790 * XConvertSelection () but nothing was presented
2791 */
2792 selection_paste (display->root, XA_CUT_BUFFER0, False);
2793 }
2794
2795 goto bailout;
2796 }
2797 }
2798 else if (selection_wait == Sel_incr)
2799 {
2800 incr_ev.start (10);
2801
2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2803 {
2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2806 }
2807
2808 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2809 incr_buf_fill += ct.nitems;
2810
2811 goto bailout;
2812 }
2813
2814 char **cl;
2815 int cr;
2816
2817#if !ENABLE_MINIMAL
2818 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2819 // so recode it manually
2820 if (ct.encoding == xa[XA_UTF8_STRING])
2821 {
2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2823 char *s = rxvt_wcstombs (w);
2824 free (w);
2825 // TODO: strlen == only the first element will be converted. well...
2826 paste (s, strlen (s));
2827 free (s);
2828 }
2829 else
2830#endif
2831 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2832 && cl)
2833 {
2834 for (int i = 0; i < cr; i++)
2835 paste (cl[i], strlen (cl[i]));
2836
2837 XFreeStringList (cl);
2838 }
2839 else
2840 paste ((char *)ct.value, ct.nitems); // paste raw
2841
2842bailout:
2843 XFree (ct.value);
2844
2845 if (selection_wait == Sel_normal)
2846 selection_wait = Sel_none;
2847}
2848
2849void
2850rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2851{
2852 selection_wait = Sel_none;
2853
2854 incr_buf_size = 0;
2855 free (incr_buf);
2856
2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2858}
2859
2860void
2861rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2862{
2863 if (prop == None || selection_wait != Sel_incr)
2864 return; 2732 return;
2865 2733
2866 selection_paste (win, prop, true); 2734 tt_paste (data, len);
2867} 2735}
2868 2736
2869/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2870/* 2738/*
2871 * Request the current selection: 2739 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2872 * Order: > internal selection if available 2740 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2873 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2741 * as fallback
2874 * > CUT_BUFFER0
2875 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2876 * will auto fallback to CUT_BUFFER0
2877 * EXT: button 2 release 2742 * EXT: button 2 release
2878 */ 2743 */
2879void 2744void
2880rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2745rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2881{ 2746{
2882 if (selection.text && selnum == Sel_Primary) 2747 if (!selection_req)
2883 {
2884 /* internal selection */
2885 char *str = rxvt_wcstombs (selection.text, selection.len);
2886 paste (str, strlen (str));
2887 free (str);
2888 return;
2889 } 2748 {
2890 else 2749 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2750 selection_req->run ();
2891 { 2751 }
2892 selection_request_time = tm;
2893 selection_wait = Sel_normal;
2894
2895#if X_HAVE_UTF8_STRING
2896 selection_type = Sel_UTF8String;
2897 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2898 return;
2899#else
2900 selection_type = Sel_CompoundText;
2901 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2902 return;
2903#endif
2904 }
2905
2906 selection_wait = Sel_none; /* don't loop in selection_paste () */
2907 selection_paste (display->root, XA_CUT_BUFFER0, false);
2908}
2909
2910int
2911rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2912{
2913 Atom sel;
2914
2915 selection_type |= selnum;
2916
2917 if (selnum == Sel_Primary)
2918 sel = XA_PRIMARY;
2919 else if (selnum == Sel_Secondary)
2920 sel = XA_SECONDARY;
2921 else
2922 sel = xa[XA_CLIPBOARD];
2923
2924 if (XGetSelectionOwner (dpy, sel) != None)
2925 {
2926 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2927 vt, selection_request_time);
2928 return 1;
2929 }
2930
2931 return 0;
2932} 2752}
2933 2753
2934/* ------------------------------------------------------------------------- */ 2754/* ------------------------------------------------------------------------- */
2935/* 2755/*
2936 * Clear all selected text 2756 * Clear all selected text
2937 * EXT: SelectionClear 2757 * EXT: SelectionClear
2938 */ 2758 */
2939void 2759void
2940rxvt_term::selection_clear () NOTHROW 2760rxvt_term::selection_clear (bool clipboard) NOTHROW
2941{ 2761{
2762 if (!clipboard)
2763 {
2942 want_refresh = 1; 2764 want_refresh = 1;
2943 free (selection.text); 2765 free (selection.text);
2944 selection.text = NULL; 2766 selection.text = NULL;
2945 selection.len = 0; 2767 selection.len = 0;
2946 CLEAR_SELECTION (); 2768 CLEAR_SELECTION ();
2947 2769
2948 if (display->selection_owner == this) 2770 if (display->selection_owner == this)
2949 display->selection_owner = 0; 2771 display->selection_owner = 0;
2772 }
2773 else
2774 {
2775 free (selection.clip_text);
2776 selection.clip_text = NULL;
2777 selection.clip_len = 0;
2778
2779 if (display->clipboard_owner == this)
2780 display->clipboard_owner = 0;
2781 }
2950} 2782}
2951 2783
2952/* ------------------------------------------------------------------------- */ 2784/* ------------------------------------------------------------------------- */
2953/* 2785/*
2954 * Copy a selection into the cut buffer 2786 * Copy a selection into the cut buffer
2955 * EXT: button 1 or 3 release 2787 * EXT: button 1 or 3 release
2956 */ 2788 */
2957void 2789void
2958rxvt_term::selection_make (Time tm) 2790rxvt_term::selection_make (Time tm)
2959{ 2791{
2960 int i; 2792 int size;
2961 wchar_t *new_selection_text; 2793 wchar_t *new_selection_text;
2962 text_t *t; 2794 text_t *t;
2963 2795
2964 switch (selection.op) 2796 switch (selection.op)
2965 { 2797 {
2981 return; /* nothing selected, go away */ 2813 return; /* nothing selected, go away */
2982 2814
2983 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2815 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2984 return; 2816 return;
2985 2817
2986 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2818 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2987 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2819 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2988 2820
2989 int ofs = 0; 2821 int ofs = 0;
2990 int extra = 0; 2822 int extra = 0;
2991 2823
2992 int col = selection.beg.col; 2824 int col = selection.beg.col;
2998 { 2830 {
2999#if !ENABLE_MINIMAL 2831#if !ENABLE_MINIMAL
3000 if (selection.rect) 2832 if (selection.rect)
3001 { 2833 {
3002 col = selection.beg.col; 2834 col = selection.beg.col;
3003 end_col = ncol + 1; 2835 end_col = selection.end.col;
3004 } 2836 }
3005 else 2837 else
3006#endif 2838#endif
3007 end_col = ROW(row).l; 2839 end_col = ROW(row).l;
3008 2840
3009 col = max (col, 0); 2841 col = max (col, 0);
3010 2842
3011 if (row == selection.end.row 2843 if (row == selection.end.row)
3012#if !ENABLE_MINIMAL
3013 || selection.rect
3014#endif
3015 )
3016 min_it (end_col, selection.end.col); 2844 min_it (end_col, selection.end.col);
3017 2845
3018 t = ROW(row).t + col; 2846 t = ROW(row).t + col;
3019 2847
3020 for (; col < end_col; col++) 2848 for (; col < end_col; col++)
3028 2856
3029 extra -= (len - 1); 2857 extra -= (len - 1);
3030 2858
3031 if (extra < 0) 2859 if (extra < 0)
3032 { 2860 {
3033 extra += i; 2861 extra += size;
3034 i += i; 2862 size += size;
3035 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2863 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3036 } 2864 }
3037 2865
3038 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2866 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3039 } 2867 }
3040#endif 2868#endif
3052 2880
3053 new_selection_text[ofs++] = C0_LF; 2881 new_selection_text[ofs++] = C0_LF;
3054 } 2882 }
3055 else 2883 else
3056#endif 2884#endif
3057 if (!ROW(row).is_longer () && row != selection.end.row) 2885 if (!ROW(row).is_longer ()
2886 && (row != selection.end.row || end_col != selection.end.col)
2887 && (row != selection.beg.row || selection.beg.col < ncol))
3058 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
3059 } 2889 }
3060
3061 if (end_col != selection.end.col)
3062 new_selection_text[ofs++] = C0_LF;
3063 2890
3064 new_selection_text[ofs] = 0; 2891 new_selection_text[ofs] = 0;
3065 2892
3066 if (ofs == 0) 2893 if (ofs == 0)
3067 { 2894 {
3080 2907
3081 selection_grab (tm); 2908 selection_grab (tm);
3082} 2909}
3083 2910
3084bool 2911bool
3085rxvt_term::selection_grab (Time tm) NOTHROW 2912rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3086{ 2913{
2914 Atom sel;
2915
2916 if (!clipboard)
2917 {
3087 selection_time = tm; 2918 selection_time = tm;
2919 sel = XA_PRIMARY;
2920 }
2921 else
2922 {
2923 clipboard_time = tm;
2924 sel = xa[XA_CLIPBOARD];
2925 }
3088 2926
3089 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2927 XSetSelectionOwner (dpy, sel, vt, tm);
3090 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2928 if (XGetSelectionOwner (dpy, sel) == vt)
3091 { 2929 {
3092 display->set_selection_owner (this); 2930 display->set_selection_owner (this, clipboard);
3093 return true; 2931 return true;
3094 } 2932 }
3095 else 2933 else
3096 { 2934 {
3097 selection_clear (); 2935 selection_clear (clipboard);
3098 return false; 2936 return false;
3099 } 2937 }
3100 2938
3101#if 0 2939#if 0
3102 XTextProperty ct; 2940 XTextProperty ct;
3562 * EXT: SelectionRequest 3400 * EXT: SelectionRequest
3563 */ 3401 */
3564void 3402void
3565rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3566{ 3404{
3405 Atom property = rq.property == None ? rq.target : rq.property;
3567 XSelectionEvent ev; 3406 XSelectionEvent ev;
3568 3407
3569 ev.type = SelectionNotify; 3408 ev.type = SelectionNotify;
3570 ev.property = None; 3409 ev.property = None;
3571 ev.display = rq.display; 3410 ev.display = rq.display;
3586 *target++ = xa[XA_COMPOUND_TEXT]; 3425 *target++ = xa[XA_COMPOUND_TEXT];
3587#if X_HAVE_UTF8_STRING 3426#if X_HAVE_UTF8_STRING
3588 *target++ = xa[XA_UTF8_STRING]; 3427 *target++ = xa[XA_UTF8_STRING];
3589#endif 3428#endif
3590 3429
3591 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3430 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3592 32, PropModeReplace, 3431 32, PropModeReplace,
3593 (unsigned char *)target_list, target - target_list); 3432 (unsigned char *)target_list, target - target_list);
3594 ev.property = rq.property; 3433 ev.property = property;
3595 } 3434 }
3596#if TODO // TODO 3435#if TODO // TODO
3597 else if (rq.target == xa[XA_MULTIPLE]) 3436 else if (rq.target == xa[XA_MULTIPLE])
3598 { 3437 {
3599 /* TODO: Handle MULTIPLE */ 3438 /* TODO: Handle MULTIPLE */
3600 } 3439 }
3601#endif 3440#endif
3602 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3603 { 3442 {
3604 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3605 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3444 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3606 ev.property = rq.property; 3445 ev.property = property;
3446 }
3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3448 {
3449 XChangeProperty (dpy, rq.requestor, property, rq.target,
3450 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3451 ev.property = property;
3607 } 3452 }
3608 else if (rq.target == XA_STRING 3453 else if (rq.target == XA_STRING
3609 || rq.target == xa[XA_TEXT] 3454 || rq.target == xa[XA_TEXT]
3610 || rq.target == xa[XA_COMPOUND_TEXT] 3455 || rq.target == xa[XA_COMPOUND_TEXT]
3611 || rq.target == xa[XA_UTF8_STRING] 3456 || rq.target == xa[XA_UTF8_STRING]
3643 { 3488 {
3644 target = xa[XA_COMPOUND_TEXT]; 3489 target = xa[XA_COMPOUND_TEXT];
3645 style = enc_compound_text; 3490 style = enc_compound_text;
3646 } 3491 }
3647 3492
3648 if (selection.text) 3493 if (rq.selection == XA_PRIMARY && selection.text)
3649 { 3494 {
3650 cl = selection.text; 3495 cl = selection.text;
3651 selectlen = selection.len; 3496 selectlen = selection.len;
3497 }
3498 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3499 {
3500 cl = selection.clip_text;
3501 selectlen = selection.clip_len;
3652 } 3502 }
3653 else 3503 else
3654 { 3504 {
3655 cl = L""; 3505 cl = L"";
3656 selectlen = 0; 3506 selectlen = 0;
3677 ct.value = (unsigned char *)cl; 3527 ct.value = (unsigned char *)cl;
3678 ct.nitems = selectlen; 3528 ct.nitems = selectlen;
3679 ct.encoding = target; 3529 ct.encoding = target;
3680 } 3530 }
3681 3531
3682 XChangeProperty (dpy, rq.requestor, rq.property, 3532 XChangeProperty (dpy, rq.requestor, property,
3683 ct.encoding, 8, PropModeReplace, 3533 ct.encoding, 8, PropModeReplace,
3684 ct.value, (int)ct.nitems); 3534 ct.value, (int)ct.nitems);
3685 ev.property = rq.property; 3535 ev.property = property;
3686 3536
3687 if (freect) 3537 if (freect)
3688 XFree (ct.value); 3538 XFree (ct.value);
3689 } 3539 }
3690 3540
3724 h += 2; min_it (h, nrow); 3574 h += 2; min_it (h, nrow);
3725 3575
3726 x -= 1; clamp_it (x, 0, ncol - w); 3576 x -= 1; clamp_it (x, 0, ncol - w);
3727 y -= 1; clamp_it (y, 0, nrow - h); 3577 y -= 1; clamp_it (y, 0, nrow - h);
3728 3578
3729 ov_x = x; ov_y = y; 3579 ov.x = x; ov.y = y;
3730 ov_w = w; ov_h = h; 3580 ov.w = w; ov.h = h;
3731 3581
3732 ov_text = new text_t *[h]; 3582 ov.text = new text_t *[h];
3733 ov_rend = new rend_t *[h]; 3583 ov.rend = new rend_t *[h];
3734 3584
3735 for (y = 0; y < h; y++) 3585 for (y = 0; y < h; y++)
3736 { 3586 {
3737 text_t *tp = ov_text[y] = new text_t[w]; 3587 text_t *tp = ov.text[y] = new text_t[w];
3738 rend_t *rp = ov_rend[y] = new rend_t[w]; 3588 rend_t *rp = ov.rend[y] = new rend_t[w];
3739 3589
3740 text_t t0, t1, t2; 3590 text_t t0, t1, t2;
3741 rend_t r = OVERLAY_RSTYLE; 3591 rend_t r = OVERLAY_RSTYLE;
3742 3592
3743 if (y == 0) 3593 if (y == 0)
3762} 3612}
3763 3613
3764void 3614void
3765rxvt_term::scr_overlay_off () NOTHROW 3615rxvt_term::scr_overlay_off () NOTHROW
3766{ 3616{
3767 if (!ov_text) 3617 if (!ov.text)
3768 return; 3618 return;
3769 3619
3770 want_refresh = 1; 3620 want_refresh = 1;
3771 3621
3772 for (int y = 0; y < ov_h; y++) 3622 for (int y = 0; y < ov.h; y++)
3773 { 3623 {
3774 delete [] ov_text[y]; 3624 delete [] ov.text[y];
3775 delete [] ov_rend[y]; 3625 delete [] ov.rend[y];
3776 } 3626 }
3777 3627
3778 delete [] ov_text; ov_text = 0; 3628 delete [] ov.text; ov.text = 0;
3779 delete [] ov_rend; ov_rend = 0; 3629 delete [] ov.rend; ov.rend = 0;
3780} 3630}
3781 3631
3782void 3632void
3783rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3633rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3784{ 3634{
3785 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3635 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3786 return; 3636 return;
3787 3637
3788 x++, y++; 3638 x++, y++;
3789 3639
3790 ov_text[y][x] = text; 3640 ov.text[y][x] = text;
3791 ov_rend[y][x] = rend; 3641 ov.rend[y][x] = rend;
3792} 3642}
3793 3643
3794void 3644void
3795rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3645rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3796{ 3646{
3815} 3665}
3816 3666
3817void 3667void
3818rxvt_term::scr_swap_overlay () NOTHROW 3668rxvt_term::scr_swap_overlay () NOTHROW
3819{ 3669{
3820 if (!ov_text) 3670 if (!ov.text)
3821 return; 3671 return;
3822 3672
3673 // hide cursor if it is within the overlay area
3674 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3675 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3676 screen.flags &= ~Screen_VisibleCursor;
3677
3823 // swap screen mem with overlay 3678 // swap screen mem with overlay
3824 for (int y = ov_h; y--; ) 3679 for (int y = ov.h; y--; )
3825 { 3680 {
3826 text_t *t1 = ov_text[y]; 3681 text_t *t1 = ov.text[y];
3827 rend_t *r1 = ov_rend[y]; 3682 rend_t *r1 = ov.rend[y];
3828 3683
3829 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3684 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3830 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3685 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3831 3686
3832 for (int x = ov_w; x--; ) 3687 for (int x = ov.w; x--; )
3833 { 3688 {
3834 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3689 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3835 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3690 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3836 } 3691 }
3837 } 3692 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines