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.189 by root, Thu Dec 22 15:28:15 2005 UTC vs.
Revision 1.216 by root, Mon Jan 9 18:51:19 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
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-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 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.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
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 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
280 if (nsaved) 286 if (nsaved)
281 { 287 {
282 // 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
283 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
284 290
285 while (p != pend && q > 0) 291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293
294 do
286 { 295 {
287 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
288#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
289 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
290#endif 299#endif
291 300 int plines = 1;
292 int llen = old_buf [MOD (p, prev_total_rows)].l; 301 int llen = old_buf [MOD (p, prev_total_rows)].l;
293 302
294 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
295 { 304 {
296 p = MOD (p - 1, prev_total_rows); 305 p = MOD (p - 1, prev_total_rows);
297 306
307 plines++;
298 llen += prev_ncol; 308 llen += prev_ncol;
299 } 309 }
300 310
301 int qlines = max (0, (llen - 1) / ncol) + 1; 311 int qlines = max (0, (llen - 1) / ncol) + 1;
302 312
… …
312 // re-assemble the full line by destination lines 322 // re-assemble the full line by destination lines
313 for (int qrow = q; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
314 { 324 {
315 qline = row_buf + qrow; 325 qline = row_buf + qrow;
316 lalloc (*qline); 326 lalloc (*qline);
327 qline->l = ncol;
317 qline->set_is_longer (); 328 qline->is_longer (1);
318 329
319 int qcol = 0; 330 int qcol = 0;
320 331
321 // fill a single destination line 332 // fill a single destination line
322 while (lofs < llen && qcol < ncol) 333 while (lofs < llen && qcol < ncol)
323 { 334 {
324 int prow = lofs / prev_ncol; 335 int prow = lofs / prev_ncol;
325 int pcol = lofs % prev_ncol; 336 int pcol = lofs % prev_ncol;
326 337
327 line_t &pline = old_buf [MOD (p + prow, prev_total_rows)]; 338 prow = MOD (p + prow, prev_total_rows);
339
340 // we only adjust the cursor _row_ and put it into
341 // the topmost line of "long line" it was in, as
342 // this seems to upset applications/shells/readline
343 // least.
344 if (prow == ocur.row)
345 screen.cur.row = q - (total_rows - nrow);
346
347 line_t &pline = old_buf [prow];
328 348
329 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
330 350
331 assert (len); 351 assert (len);
332 assert (pline.t); 352 assert (pline.t);
… …
337 lofs += len; 357 lofs += len;
338 qcol += len; 358 qcol += len;
339 } 359 }
340 } 360 }
341 361
342 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 362 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
363 qline->is_longer (0);
343 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
344 } 365 }
366 while (p != pend && q > 0);
345 367
346 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
347 view_start = 0;
348 nsaved = term_start - q; 369 nsaved = term_start - q;
349 370
350 // make sure all terminal lines exist 371 // make sure all terminal lines exist
351 while (nsaved < 0) 372 while (nsaved < 0)
352 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
353
354 } 374 }
355 else 375 else
356 { 376 {
357 // if no scrollback exists (yet), wing, instead of wrap 377 // if no scrollback exists (yet), wing, instead of wrap
358 378
… …
369 { 389 {
370 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
371 } 391 }
372 392
373 term_start = 0; 393 term_start = 0;
374 view_start = 0;
375 } 394 }
376 395
377#ifdef DEBUG_STRICT 396#ifdef DEBUG_STRICT //TODO: remove
378 for (int i = -nsaved; i < nrow; i++) 397 for (int i = -nsaved; i < nrow; i++)
379 assert (ROW (i).t); 398 assert (ROW (i).t);
380#endif 399#endif
381 400
382 free (old_buf); 401 free (old_buf);
… …
397 416
398 for (int col = ncol; col--; ) 417 for (int col = ncol; col--; )
399 tabs [col] = col % TABSIZE == 0; 418 tabs [col] = col % TABSIZE == 0;
400 419
401 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
402} 423}
403 424
404/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
405/* 426/*
406 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
… …
510 531
511 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
512 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
513 534
514#if NSCREENS 535#if NSCREENS
515 if (options & Opt_secondaryScreen) 536 if (OPTION (Opt_secondaryScreen))
516 { 537 {
517 num_scr = 0; 538 num_scr = 0;
518 539
519 for (int i = prev_nrow; i--; ) 540 for (int i = prev_nrow; i--; )
520 ::swap (ROW(i), swap_buf [i]); 541 ::swap (ROW(i), swap_buf [i]);
… …
524 screen.flags |= Screen_VisibleCursor; 545 screen.flags |= Screen_VisibleCursor;
525 swap.flags |= Screen_VisibleCursor; 546 swap.flags |= Screen_VisibleCursor;
526 } 547 }
527 else 548 else
528#endif 549#endif
529 if (options & Opt_secondaryScroll) 550 if (OPTION (Opt_secondaryScroll))
530 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 551 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
531 552
532 return scrn; 553 return scrn;
533} 554}
534 555
… …
596 num_scr += count; 617 num_scr += count;
597 618
598 if (count > 0 619 if (count > 0
599 && row1 == 0 620 && row1 == 0
600 && row2 == nrow - 1 621 && row2 == nrow - 1
601 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
602 { 623 {
603 nsaved = min (nsaved + count, saveLines); 624 nsaved = min (nsaved + count, saveLines);
625
626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
627
604 term_start = (term_start + count) % total_rows; 628 term_start = (term_start + count) % total_rows;
605 629
606 if (selection.op && current_screen == selection.screen) 630 if (selection.op && current_screen == selection.screen)
607 { 631 {
608 selection.beg.row -= count; 632 selection.beg.row -= count;
609 selection.end.row -= count; 633 selection.end.row -= count;
610 selection.mark.row -= count; 634 selection.mark.row -= count;
611 635
612 selection_check (0); 636 if (selection.beg.row < -nsaved
637 || selection.end.row < -nsaved
638 || selection.mark.row < -nsaved)
639 {
640 CLEAR_ALL_SELECTION ();
641 selection.op = SELECTION_CLEAR;
642 }
613 } 643 }
614 644
615 for (int i = count; i--; ) 645 for (int i = count; i--; )
616 scr_blank_screen_mem (ROW(row2 - i), rstyle); 646 {
647 // basically thi is a slightly optimized scr_blank_screen_mem
648 // it is worth the effort on slower machines
649 line_t &l = ROW(row2 - i);
650
651 scr_blank_line (l, 0, l.l, rstyle);
652
653 l.l = 0;
654 l.f = 0;
655 }
617 656
618 if ((options & Opt_scrollWithBuffer) 657 if (OPTION (Opt_scrollWithBuffer)
619 && view_start != 0 658 && view_start != 0
620 && view_start != saveLines) 659 && view_start != saveLines)
621 scr_page (UP, count); 660 scr_page (UP, count);
622 } 661 }
623 else 662 else
624 { 663 {
625 if (selection.op && current_screen == selection.screen) 664 if (selection.op && current_screen == selection.screen)
626 { 665 {
627 int i = selection.beg.row; 666 if ((selection.beg.row < row1 && selection.end.row > row1)
628 int j = selection.end.row; 667 || (selection.beg.row < row2 && selection.end.row > row2)
629
630 if ((i < row1 && j > row1)
631 || (i < row2 && j > row2)
632 || (i - count < row1 && i >= row1) 668 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
633 || (i - count > row2 && i <= row2) 669 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
634 || (j - count < row1 && j >= row1) 670 || (selection.end.row - count < row1 && selection.end.row >= row1)
635 || (j - count > row2 && j <= row2)) 671 || (selection.end.row - count > row2 && selection.end.row <= row2))
636 { 672 {
637 CLEAR_ALL_SELECTION (); 673 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 674 selection.op = SELECTION_CLEAR;
639 } 675 }
640 else if (j >= row1 && j <= row2) 676 else if (selection.end.row >= row1 && selection.end.row <= row2)
641 { 677 {
642 /* move selected region too */ 678 /* move selected region too */
643 selection.beg.row -= count; 679 selection.beg.row -= count;
644 selection.end.row -= count; 680 selection.end.row -= count;
645 selection.mark.row -= count; 681 selection.mark.row -= count;
… …
673/* ------------------------------------------------------------------------- */ 709/* ------------------------------------------------------------------------- */
674/* 710/*
675 * Add text given in <str> of length <len> to screen struct 711 * Add text given in <str> of length <len> to screen struct
676 */ 712 */
677void 713void
678rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 714rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
679{ 715{
680 if (len <= 0) /* sanity */ 716 if (len <= 0) /* sanity */
681 return; 717 return;
682 718
683 unsigned char checksel; 719 unsigned char checksel;
684 unicode_t c; 720 unicode_t c;
685 int row, last_col; 721 int ncol = this->ncol;
686 const unicode_t *strend = str + len; 722 const wchar_t *strend = str + len;
687 723
688 want_refresh = 1; 724 want_refresh = 1;
689 ZERO_SCROLLBACK (); 725 ZERO_SCROLLBACK ();
690 last_col = ncol;
691 726
692 if (nlines > 0) 727 if (minlines > 0)
693 { 728 {
694 nlines += screen.cur.row - screen.bscroll; 729 minlines += screen.cur.row - screen.bscroll;
730
695 if (nlines > 0 731 if (minlines > 0
696 && screen.tscroll == 0 732 && screen.tscroll == 0
697 && screen.bscroll == (nrow - 1)) 733 && screen.bscroll == nrow - 1)
698 { 734 {
699 /* _at least_ this many lines need to be scrolled */ 735 /* _at least_ this many lines need to be scrolled */
700 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 736 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
701 screen.cur.row -= nlines; 737 screen.cur.row -= minlines;
702 } 738 }
703 } 739 }
704 740
705#ifdef DEBUG_STRICT 741#ifdef DEBUG_STRICT
706 assert (screen.cur.col < last_col); 742 assert (screen.cur.col < ncol);
707 assert (screen.cur.row < nrow 743 assert (screen.cur.row < nrow
708 && screen.cur.row >= -nsaved); 744 && screen.cur.row >= -nsaved);
709#endif 745#endif
710 row = screen.cur.row; 746 int row = screen.cur.row;
711 747
712 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 748 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
713 749
714 line_t *line = &ROW(row); 750 line_t *line = &ROW(row);
715 751
716 while (str < strend) 752 while (str < strend)
717 { 753 {
718 c = *str++; 754 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
719 755
720 if (c < 0x20) 756 if (c < 0x20)
721 if (c == C0_LF) 757 if (c == C0_LF)
722 { 758 {
723 if (!line->is_longer ()) /* XXX: think about this */
724 max_it (line->l, screen.cur.col); 759 max_it (line->l, screen.cur.col);
725 760
726 screen.flags &= ~Screen_WrapNext; 761 screen.flags &= ~Screen_WrapNext;
727 762
728 if (screen.cur.row == screen.bscroll) 763 if (screen.cur.row == screen.bscroll)
729 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 764 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
733 line = &ROW(row); /* _must_ refresh */ 768 line = &ROW(row); /* _must_ refresh */
734 continue; 769 continue;
735 } 770 }
736 else if (c == C0_CR) 771 else if (c == C0_CR)
737 { 772 {
738 if (!line->is_longer ()) /* XXX: think about this */
739 max_it (line->l, screen.cur.col); 773 max_it (line->l, screen.cur.col);
740 774
741 screen.flags &= ~Screen_WrapNext; 775 screen.flags &= ~Screen_WrapNext;
742 screen.cur.col = 0; 776 screen.cur.col = 0;
743 continue; 777 continue;
744 } 778 }
… …
761 CLEAR_SELECTION (); 795 CLEAR_SELECTION ();
762 } 796 }
763 797
764 if (screen.flags & Screen_WrapNext) 798 if (screen.flags & Screen_WrapNext)
765 { 799 {
800 max_it (line->l, ncol);
766 line->set_is_longer (); 801 line->is_longer (1);
767 802
768 scr_do_wrap (); 803 scr_do_wrap ();
769 804
770 row = screen.cur.row; 805 row = screen.cur.row;
771 line = &ROW(row); /* _must_ refresh */ 806 line = &ROW(row); /* _must_ refresh */
… …
779 // do wcwidth before further replacements, as wcwidth might return -1 814 // do wcwidth before further replacements, as wcwidth might return -1
780 // for the line drawing characters below as they might be invalid in the current 815 // for the line drawing characters below as they might be invalid in the current
781 // locale. 816 // locale.
782 int width = c < 0x100 ? 1 : wcwidth (c); 817 int width = c < 0x100 ? 1 : wcwidth (c);
783 818
784 if (charsets[screen.charset] == '0') // DEC SPECIAL 819 if (charsets [screen.charset] == '0') // DEC SPECIAL
785 { 820 {
786 // vt100 special graphics and line drawing 821 // vt100 special graphics and line drawing
787 // 5f-7e standard vt100 822 // 5f-7e standard vt100
788 // 40-5e rxvt extension for extra curses acs chars 823 // 40-5e rxvt extension for extra curses acs chars
789 static uint16_t vt100_0[62] = { // 41 .. 7e 824 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
841 } 876 }
842 877
843 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 878 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
844 879
845 // if the character doesn't fit into the remaining columns... 880 // if the character doesn't fit into the remaining columns...
846 if (screen.cur.col > last_col - width && last_col >= width) 881 if (screen.cur.col > ncol - width && ncol >= width)
847 { 882 {
848 // ...output spaces 883 // ...output spaces
849 c = ' '; 884 c = ' ';
850 // and try the same character next loop iteration 885 // and try the same character next loop iteration
851 --str; 886 --str;
852 } 887 }
853 888
889 line->touch ();
890
854 do 891 do
855 { 892 {
856 line->t[screen.cur.col] = c; 893 line->t[screen.cur.col] = c;
857 line->r[screen.cur.col] = rend; 894 line->r[screen.cur.col] = rend;
858 895
859 if (screen.cur.col < last_col - 1) 896 if (screen.cur.col < ncol - 1)
860 screen.cur.col++; 897 screen.cur.col++;
861 else 898 else
862 { 899 {
863 line->l = last_col; 900 line->l = ncol;
864 if (screen.flags & Screen_Autowrap) 901 if (screen.flags & Screen_Autowrap)
865 screen.flags |= Screen_WrapNext; 902 screen.flags |= Screen_WrapNext;
866 break; 903 break;
867 } 904 }
868 905
… …
870 } 907 }
871 while (--width > 0); 908 while (--width > 0);
872 909
873 // pad with spaces when overwriting wide character with smaller one 910 // pad with spaces when overwriting wide character with smaller one
874 if (!width) 911 if (!width)
912 {
913 line->touch ();
914
875 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 915 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
876 { 916 {
877 line->t[c] = ' '; 917 line->t[c] = ' ';
878 line->r[c] = rend; 918 line->r[c] = rend;
879 } 919 }
920 }
880 } 921 }
881 else // width == 0 922 else // width == 0
882 { 923 {
883#if ENABLE_COMBINING 924#if ENABLE_COMBINING
884 // handle combining characters 925 // handle combining characters
885 // we just tag the accent on the previous on-screen character. 926 // we just tag the accent on the previous on-screen character.
886 // this is arguably not correct, but also arguably not wrong. 927 // this is arguably not correct, but also arguably not wrong.
887 // we don't handle double-width characters nicely yet. 928 // we don't handle double-width characters nicely yet.
929 line_t *linep;
888 text_t *tp; 930 text_t *tp;
889 rend_t *rp; 931 rend_t *rp;
890 932
891 if (screen.cur.col > 0) 933 if (screen.cur.col > 0)
892 { 934 {
935 linep = line;
893 tp = line->t + screen.cur.col - 1; 936 tp = line->t + screen.cur.col - 1;
894 rp = line->r + screen.cur.col - 1; 937 rp = line->r + screen.cur.col - 1;
895
896 while (*tp == NOCHAR && tp > line->t)
897 tp--, rp--;
898 } 938 }
899 else if (screen.cur.row > 0 939 else if (screen.cur.row > 0
900 && ROW(screen.cur.row - 1).is_longer ()) 940 && ROW(screen.cur.row - 1).is_longer ())
901 { 941 {
902 line_t *line = &ROW(screen.cur.row - 1); 942 linep = &ROW(screen.cur.row - 1);
903
904 tp = line->t + last_col - 1; 943 tp = line->t + ncol - 1;
905 rp = line->r + last_col - 1; 944 rp = line->r + ncol - 1;
906
907 while (*tp == NOCHAR && tp > line->t)
908 tp--, rp--;
909 } 945 }
910 else 946 else
911 continue; 947 continue;
948
949 linep->touch ();
950
951 while (*tp == NOCHAR && tp > linep->t)
952 tp--, rp--;
912 953
913 // first try to find a precomposed character 954 // first try to find a precomposed character
914 unicode_t n = rxvt_compose (*tp, c); 955 unicode_t n = rxvt_compose (*tp, c);
915 if (n == NOCHAR) 956 if (n == NOCHAR)
916 n = rxvt_composite.compose (*tp, c); 957 n = rxvt_composite.compose (*tp, c);
… …
919 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 960 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
920#endif 961#endif
921 } 962 }
922 } 963 }
923 964
924 if (!line->is_longer ()) /* XXX: think about this */
925 max_it (line->l, screen.cur.col); 965 max_it (line->l, screen.cur.col);
926 966
927#ifdef DEBUG_STRICT 967#ifdef DEBUG_STRICT
928 assert (screen.cur.row >= 0); 968 assert (screen.cur.row >= 0);
929#endif 969#endif
930} 970}
… …
972 1012
973 if (count == 0) 1013 if (count == 0)
974 return; 1014 return;
975 else if (count > 0) 1015 else if (count > 0)
976 { 1016 {
977 int row = screen.cur.row;
978
979 line_t &l = ROW(row); 1017 line_t &l = ROW(screen.cur.row);
980 rend_t base_rend = l.r[i]; 1018 rend_t base_rend = l.r[i];
981 ht &= l.t[i] == ' '; 1019 ht &= l.t[i] == ' ';
982 1020
983 for (; ++i < ncol; ) 1021 for (; ++i < ncol; )
984 if (tabs[i]) 1022 if (tabs[i])
985 { 1023 {
986 x = i; 1024 x = i;
1025
987 if (!--count) 1026 if (!--count)
988 break; 1027 break;
989 } 1028 }
990 else 1029 else
991 ht &= l.t[i] == ' ' 1030 ht &= l.t[i] == ' '
… …
994 if (count) 1033 if (count)
995 x = ncol - 1; 1034 x = ncol - 1;
996 1035
997 // store horizontal tab commands as characters inside the text 1036 // store horizontal tab commands as characters inside the text
998 // buffer so they can be selected and pasted. 1037 // buffer so they can be selected and pasted.
999 if (ht && options & Opt_pastableTabs) 1038 if (ht && OPTION (Opt_pastableTabs))
1000 { 1039 {
1001 base_rend = SET_FONT (base_rend, 0); 1040 base_rend = SET_FONT (base_rend, 0);
1002 1041
1003 if (!l.is_longer ()) /* XXX: think about this */ 1042 l.touch (x);
1004 max_it (l.l, x);
1005 1043
1006 i = screen.cur.col; 1044 i = screen.cur.col;
1007 1045
1008 l.t[i] = '\t'; 1046 l.t[i] = '\t';
1009 l.r[i] = base_rend; 1047 l.r[i] = base_rend;
… …
1059 */ 1097 */
1060#if ENABLE_FRILLS 1098#if ENABLE_FRILLS
1061void 1099void
1062rxvt_term::scr_forwardindex () 1100rxvt_term::scr_forwardindex ()
1063{ 1101{
1064 int row;
1065
1066 if (screen.cur.col < ncol - 1) 1102 if (screen.cur.col < ncol - 1)
1067 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1068 else 1104 else
1069 { 1105 {
1070 row = screen.cur.row; 1106 line_t &l = ROW(screen.cur.row);
1071 1107
1072 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1108 l.touch ();
1073 ROW(row).l = ncol; 1109 l.is_longer (0);
1074 1110
1075 scr_gotorc (0, 0, R_RELATIVE); 1111 scr_gotorc (0, 0, R_RELATIVE);
1076 scr_insdel_chars (1, DELETE); 1112 scr_insdel_chars (1, DELETE);
1077 scr_gotorc (0, ncol - 1, R_RELATIVE); 1113 scr_gotorc (0, ncol - 1, R_RELATIVE);
1078 } 1114 }
… …
1161 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1197 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1162 */ 1198 */
1163void 1199void
1164rxvt_term::scr_erase_line (int mode) 1200rxvt_term::scr_erase_line (int mode)
1165{ 1201{
1166 unsigned int row, col, num; 1202 unsigned int col, num;
1167 1203
1168 want_refresh = 1; 1204 want_refresh = 1;
1169 ZERO_SCROLLBACK (); 1205 ZERO_SCROLLBACK ();
1170 1206
1171 selection_check (1); 1207 selection_check (1);
1172 1208
1173 row = screen.cur.row; 1209 line_t &line = ROW(screen.cur.row);
1210
1211 line.touch ();
1212 line.is_longer (0);
1174 1213
1175 switch (mode) 1214 switch (mode)
1176 { 1215 {
1177 case 0: /* erase to end of line */ 1216 case 0: /* erase to end of line */
1178 col = screen.cur.col; 1217 col = screen.cur.col;
1179 num = ncol - col; 1218 num = ncol - col;
1180 min_it (ROW(row).l, col); 1219 min_it (line.l, col);
1181 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1220 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1182 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1221 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1183 CLEAR_SELECTION (); 1222 CLEAR_SELECTION ();
1184 break; 1223 break;
1185 case 1: /* erase to beginning of line */ 1224 case 1: /* erase to beginning of line */
… …
1190 CLEAR_SELECTION (); 1229 CLEAR_SELECTION ();
1191 break; 1230 break;
1192 case 2: /* erase whole line */ 1231 case 2: /* erase whole line */
1193 col = 0; 1232 col = 0;
1194 num = ncol; 1233 num = ncol;
1195 ROW(row).l = 0; 1234 line.l = 0;
1196 if (selection.beg.row <= screen.cur.row 1235 if (selection.beg.row <= screen.cur.row
1197 && selection.end.row >= screen.cur.row) 1236 && selection.end.row >= screen.cur.row)
1198 CLEAR_SELECTION (); 1237 CLEAR_SELECTION ();
1199 break; 1238 break;
1200 default: 1239 default:
1201 return; 1240 return;
1202 } 1241 }
1203 1242
1204 scr_blank_line (ROW(row), col, num, rstyle); 1243 scr_blank_line (line, col, num, rstyle);
1205} 1244}
1206 1245
1207/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
1208/* 1247/*
1209 * Erase part of whole of the screen 1248 * Erase part of whole of the screen
… …
1264 CLEAR_ROWS (row, num); 1303 CLEAR_ROWS (row, num);
1265 } 1304 }
1266 else 1305 else
1267 { 1306 {
1268 ren = rstyle & (RS_fgMask | RS_bgMask); 1307 ren = rstyle & (RS_fgMask | RS_bgMask);
1269 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1308 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1270 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1309 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1271 ERASE_ROWS (row, num); 1310 ERASE_ROWS (row, num);
1272 gcvalue.foreground = pix_colors[Color_fg]; 1311 gcvalue.foreground = pix_colors[Color_fg];
1273 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1274 } 1313 }
1275 1314
1276 for (; num--; row++) 1315 for (; num--; row++)
1277 { 1316 {
1278 scr_blank_screen_mem (ROW (row), rstyle); 1317 scr_blank_screen_mem (ROW(row), rstyle);
1279 ROW (row).l = 0;
1280 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1318 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1281 } 1319 }
1282} 1320}
1283 1321
1284#if ENABLE_FRILLS 1322#if ENABLE_FRILLS
… …
1317 rend_t *r1 = line.r; 1355 rend_t *r1 = line.r;
1318 1356
1319 for (int j = ncol; j--; ) 1357 for (int j = ncol; j--; )
1320 *r1++ = fs; 1358 *r1++ = fs;
1321 1359
1322 line.l = ncol; /* make the `E's selectable */ 1360 line.is_longer (0);
1361 line.touch (ncol);
1323 } 1362 }
1324} 1363}
1325 1364
1326/* ------------------------------------------------------------------------- */ 1365/* ------------------------------------------------------------------------- */
1327/* 1366/*
… …
1375 min_it (count, ncol - screen.cur.col); 1414 min_it (count, ncol - screen.cur.col);
1376 1415
1377 row = screen.cur.row; 1416 row = screen.cur.row;
1378 1417
1379 line_t *line = &ROW(row); 1418 line_t *line = &ROW(row);
1419
1420 line->touch ();
1421 line->is_longer (0);
1380 1422
1381 switch (insdel) 1423 switch (insdel)
1382 { 1424 {
1383 case INSERT: 1425 case INSERT:
1384 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1426 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1385 { 1427 {
1386 line->t[col] = line->t[col - count]; 1428 line->t[col] = line->t[col - count];
1387 line->r[col] = line->r[col - count]; 1429 line->r[col] = line->r[col - count];
1388 } 1430 }
1389 1431
1390 if (!line->is_longer ()) 1432 line->l = min (line->l + count, ncol);
1391 {
1392 line->l += count;
1393 min_it (line->l, ncol);
1394 }
1395 1433
1396 if (selection.op && current_screen == selection.screen 1434 if (selection.op && current_screen == selection.screen
1397 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1435 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1398 { 1436 {
1399 if (selection.end.row != screen.cur.row 1437 if (selection.end.row != screen.cur.row
… …
1412 1450
1413 case ERASE: 1451 case ERASE:
1414 screen.cur.col += count; /* don't worry if > ncol */ 1452 screen.cur.col += count; /* don't worry if > ncol */
1415 selection_check (1); 1453 selection_check (1);
1416 screen.cur.col -= count; 1454 screen.cur.col -= count;
1455
1456 line->l = max (line->l - count, 0);
1417 scr_blank_line (*line, screen.cur.col, count, rstyle); 1457 scr_blank_line (*line, screen.cur.col, count, rstyle);
1418 break; 1458 break;
1419 1459
1420 case DELETE: 1460 case DELETE:
1421 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1461 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1424 { 1464 {
1425 line->t[col] = line->t[col + count]; 1465 line->t[col] = line->t[col + count];
1426 line->r[col] = line->r[col + count]; 1466 line->r[col] = line->r[col + count];
1427 } 1467 }
1428 1468
1469 line->l = max (line->l - count, 0);
1429 scr_blank_line (*line, ncol - count, count, tr); 1470 scr_blank_line (*line, ncol - count, count, tr);
1430
1431 if (line->is_longer ()) /* break line continuation */
1432 line->l = ncol;
1433
1434 line->l = max (line->l - count, 0);
1435 1471
1436 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1437 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1438 { 1474 {
1439 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
… …
1551rxvt_term::scr_set_tab (int mode) 1587rxvt_term::scr_set_tab (int mode)
1552{ 1588{
1553 if (mode < 0) 1589 if (mode < 0)
1554 memset (tabs, 0, ncol * sizeof (char)); 1590 memset (tabs, 0, ncol * sizeof (char));
1555 else if (screen.cur.col < ncol) 1591 else if (screen.cur.col < ncol)
1556 tabs[screen.cur.col] = (mode ? 1 : 0); 1592 tabs [screen.cur.col] = !!mode;
1557} 1593}
1558 1594
1559/* ------------------------------------------------------------------------- */ 1595/* ------------------------------------------------------------------------- */
1560/* 1596/*
1561 * Set reverse/normal video 1597 * Set reverse/normal video
… …
1573 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1609 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1574#if XPM_BACKGROUND 1610#if XPM_BACKGROUND
1575 if (bgPixmap.pixmap == None) 1611 if (bgPixmap.pixmap == None)
1576#endif 1612#endif
1577#if TRANSPARENT 1613#if TRANSPARENT
1578 if (! (options & Opt_transparent) || am_transparent == 0) 1614 if (! OPTION (Opt_transparent) || am_transparent == 0)
1579#endif 1615#endif
1580 XSetWindowBackground (display->display, vt, 1616 XSetWindowBackground (display->display, vt,
1581 pix_colors[Color_bg]); 1617 pix_colors[Color_bg]);
1582 1618
1583 gcvalue.foreground = pix_colors[Color_fg]; 1619 gcvalue.foreground = pix_colors[Color_fg];
… …
1608 * Set font style 1644 * Set font style
1609 */ 1645 */
1610void 1646void
1611rxvt_term::set_font_style () 1647rxvt_term::set_font_style ()
1612{ 1648{
1649#if 0
1613 switch (charsets[screen.charset]) 1650 switch (charsets [screen.charset])
1614 { 1651 {
1615 case '0': /* DEC Special Character & Line Drawing Set */ 1652 case '0': /* DEC Special Character & Line Drawing Set */
1616 break; 1653 break;
1617 case 'A': /* United Kingdom (UK) */ 1654 case 'A': /* United Kingdom (UK) */
1618 break; 1655 break;
… …
1625 case 'C': /* Finnish character set */ 1662 case 'C': /* Finnish character set */
1626 break; 1663 break;
1627 case 'K': /* German character set */ 1664 case 'K': /* German character set */
1628 break; 1665 break;
1629 } 1666 }
1667#endif
1630} 1668}
1631 1669
1632/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
1633/* 1671/*
1634 * Choose a font 1672 * Choose a font
… …
1801int 1839int
1802rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (unsigned int oldviewstart)
1803{ 1841{
1804 if (view_start != oldviewstart) 1842 if (view_start != oldviewstart)
1805 { 1843 {
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1845
1806 want_refresh = 1; 1846 want_refresh = 1;
1807 num_scr -= (view_start - oldviewstart); 1847 num_scr -= (view_start - oldviewstart);
1808 } 1848 }
1809 1849
1810 return (int) (view_start - oldviewstart); 1850 return (int)view_start - (int)oldviewstart;
1811} 1851}
1812 1852
1813/* ------------------------------------------------------------------------- */ 1853/* ------------------------------------------------------------------------- */
1814void 1854void
1815rxvt_term::scr_bell () 1855rxvt_term::scr_bell ()
1816{ 1856{
1817#ifndef NO_BELL 1857#ifndef NO_BELL
1818 1858
1819# ifndef NO_MAPALERT 1859# ifndef NO_MAPALERT
1820# ifdef MAPALERT_OPTION 1860# ifdef MAPALERT_OPTION
1821 if (options & Opt_mapAlert) 1861 if (OPTION (Opt_mapAlert))
1822# endif 1862# endif
1823 XMapWindow (display->display, parent[0]); 1863 XMapWindow (display->display, parent[0]);
1824# endif 1864# endif
1825 1865
1826 if (options & Opt_visualBell) 1866 if (OPTION (Opt_visualBell))
1827 { 1867 {
1828 scr_rvideo_mode (!rvideo); /* refresh also done */ 1868 scr_rvideo_mode (!rvideo); /* refresh also done */
1829 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1830 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1831 } 1871 }
… …
1922 1962
1923#if XPM_BACKGROUND 1963#if XPM_BACKGROUND
1924 must_clear |= bgPixmap.pixmap != None; 1964 must_clear |= bgPixmap.pixmap != None;
1925#endif 1965#endif
1926#if TRANSPARENT 1966#if TRANSPARENT
1927 must_clear |= (options & Opt_transparent) && am_transparent; 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1928#endif 1968#endif
1929 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1930 1970
1931 /* 1971 /*
1932 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
1956 1996
1957 crp = &ROW(screen.cur.row).r[col]; 1997 crp = &ROW(screen.cur.row).r[col];
1958 1998
1959 if (showcursor && focus) 1999 if (showcursor && focus)
1960 { 2000 {
1961 if (options & Opt_cursorUnderline) 2001 if (OPTION (Opt_cursorUnderline))
1962 *crp ^= RS_Uline; 2002 *crp ^= RS_Uline;
1963 else 2003 else
1964 { 2004 {
1965 *crp ^= RS_RVid; 2005 *crp ^= RS_RVid;
1966 2006
… …
1968 cc1 = *crp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
1969 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
1970 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
1971 else 2011 else
1972#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1973 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
1974#else 2014#else
1975 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
1976#endif 2016#endif
1977 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
1978 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
1979 else 2019 else
1980#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1981 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
1982#else 2022#else
1983 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
1984#endif 2024#endif
1985 *crp = SET_FGCOLOR (*crp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
1986 *crp = SET_BGCOLOR (*crp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2019 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2020 } 2060 }
2021 } 2061 }
2022 } 2062 }
2023 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2024#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2025 scr_swap_overlay (); 2066 scr_swap_overlay ();
2026#endif 2067#endif
2027 2068
2028#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2078 if (wlen < len) 2119 if (wlen < len)
2079 ::swap (wlen, len); 2120 ::swap (wlen, len);
2080 2121
2081 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2082 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2083 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2084 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2085 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2086 len = -1; 2127 len = -1;
2087 } 2128 }
2088 } 2129 }
… …
2167 count++, i--; 2208 count++, i--;
2168 2209
2169 /* 2210 /*
2170 * Determine the attributes for the string 2211 * Determine the attributes for the string
2171 */ 2212 */
2172 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2173 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2174 2215
2175 // only do special processing if any attributes are set, which is rare 2216 // only do special processing if any attributes are set, which is unlikely
2176 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2177 { 2218 {
2178#if ENABLE_STYLES 2219#if ENABLE_STYLES
2179 // force redraw after "careful" characters to avoid pixel droppings 2220 // force redraw after "careful" characters to avoid pixel droppings
2180 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2291 } /* for (row....) */ 2332 } /* for (row....) */
2292 2333
2293#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2294 scr_swap_overlay (); 2335 scr_swap_overlay ();
2295#endif 2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2296 2338
2297 /* 2339 /*
2298 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2299 */ 2341 */
2300 if (showcursor) 2342 if (showcursor)
2301 { 2343 {
2302 if (focus) 2344 if (focus)
2303 { 2345 {
2304 if (options & Opt_cursorUnderline) 2346 if (OPTION (Opt_cursorUnderline))
2305 *crp ^= RS_Uline; 2347 *crp ^= RS_Uline;
2306 else 2348 else
2307 { 2349 {
2308 *crp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2309#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
… …
2347 num_scr = 0; 2389 num_scr = 0;
2348 num_scr_allow = 1; 2390 num_scr_allow = 1;
2349} 2391}
2350 2392
2351void 2393void
2352rxvt_term::scr_remap_chars (const line_t &l) 2394rxvt_term::scr_remap_chars (line_t &l)
2353{ 2395{
2354 if (!l.t) 2396 if (!l.t)
2355 return; 2397 return;
2398
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2356 2400
2357 for (int i = ncol; i--; ) 2401 for (int i = ncol; i--; )
2358 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2359} 2403}
2360 2404
… …
2428 2472
2429#if ENABLE_FRILLS 2473#if ENABLE_FRILLS
2430 if (selection.rect) 2474 if (selection.rect)
2431 { 2475 {
2432 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2476 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2477 {
2478 text_t *stp = ROW(row).t;
2479 rend_t *srp = ROW(row).r;
2480
2433 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2481 for (col = selection.beg.col; col < selection.end.col; col++)
2434 srp[col] ^= RS_RVid; 2482 srp[col] ^= RS_RVid;
2483
2484 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2485 srp[col] ^= RS_RVid | RS_Uline;
2486
2487 if (++col < selection.end.col)
2488 srp[col] ^= RS_RVid | RS_Uline;
2489 }
2435 } 2490 }
2436 else 2491 else
2437#endif 2492#endif
2438 { 2493 {
2439 if (selection.beg.row >= -view_start) 2494 if (selection.beg.row >= -view_start)
… …
2442 row = selection.beg.row; 2497 row = selection.beg.row;
2443 } 2498 }
2444 else 2499 else
2445 { 2500 {
2446 col = 0; 2501 col = 0;
2447 row = view_start; 2502 row = -view_start;
2448 } 2503 }
2449 2504
2450 for (; row < min (selection.end.row, view_end); row++, col = 0) 2505 for (; row < min (selection.end.row, view_end); row++, col = 0)
2451 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2506 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2452 srp[col] ^= RS_RVid; 2507 srp[col] ^= RS_RVid;
… …
2523/* ------------------------------------------------------------------------- */ 2578/* ------------------------------------------------------------------------- */
2524/* 2579/*
2525 * Paste a selection direct to the command fd 2580 * Paste a selection direct to the command fd
2526 */ 2581 */
2527void 2582void
2528rxvt_term::paste (unsigned char *data, unsigned int len) 2583rxvt_term::paste (char *data, unsigned int len)
2529{ 2584{
2530 /* convert normal newline chars into common keyboard Return key sequence */ 2585 /* convert normal newline chars into common keyboard Return key sequence */
2531 for (unsigned int i = 0; i < len; i++) 2586 for (unsigned int i = 0; i < len; i++)
2532 if (data[i] == C0_LF) 2587 if (data[i] == C0_LF)
2533 data[i] = C0_CR; 2588 data[i] = C0_CR;
… …
2677 { 2732 {
2678 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2733 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2679 char *s = rxvt_wcstombs (w); 2734 char *s = rxvt_wcstombs (w);
2680 free (w); 2735 free (w);
2681 // TODO: strlen == only the first element will be converted. well... 2736 // TODO: strlen == only the first element will be converted. well...
2682 paste ((unsigned char *)s, strlen (s)); 2737 paste (s, strlen (s));
2683 free (s); 2738 free (s);
2684 } 2739 }
2685 else 2740 else
2686#endif 2741#endif
2687 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2742 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2688 && cl) 2743 && cl)
2689 { 2744 {
2690 for (int i = 0; i < cr; i++) 2745 for (int i = 0; i < cr; i++)
2691 paste ((unsigned char *)cl[i], strlen (cl[i])); 2746 paste (cl[i], strlen (cl[i]));
2692 2747
2693 XFreeStringList (cl); 2748 XFreeStringList (cl);
2694 } 2749 }
2695 else 2750 else
2696 paste (ct.value, ct.nitems); // paste raw 2751 paste ((char *)ct.value, ct.nitems); // paste raw
2697 2752
2698bailout: 2753bailout:
2699 XFree (ct.value); 2754 XFree (ct.value);
2700 2755
2701 if (selection_wait == Sel_normal) 2756 if (selection_wait == Sel_normal)
… …
2739 return; /* outside window */ 2794 return; /* outside window */
2740 2795
2741 if (selection.text) 2796 if (selection.text)
2742 { /* internal selection */ 2797 { /* internal selection */
2743 char *str = rxvt_wcstombs (selection.text, selection.len); 2798 char *str = rxvt_wcstombs (selection.text, selection.len);
2744 paste ((unsigned char *)str, strlen (str)); 2799 paste (str, strlen (str));
2745 free (str); 2800 free (str);
2746 return; 2801 return;
2747 } 2802 }
2748 else 2803 else
2749 { 2804 {
… …
2841 selection.op = SELECTION_DONE; 2896 selection.op = SELECTION_DONE;
2842 2897
2843 if (selection.clicks == 4) 2898 if (selection.clicks == 4)
2844 return; /* nothing selected, go away */ 2899 return; /* nothing selected, go away */
2845 2900
2901 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2902 return;
2903
2846 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2904 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2847 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2905 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2848 2906
2849 int ofs = 0; 2907 int ofs = 0;
2850 int extra = 0; 2908 int extra = 0;
… …
2862 col = selection.beg.col; 2920 col = selection.beg.col;
2863 end_col = ncol + 1; 2921 end_col = ncol + 1;
2864 } 2922 }
2865 else 2923 else
2866#endif 2924#endif
2867 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2925 end_col = ROW(row).l;
2868 2926
2869 col = max (col, 0); 2927 col = max (col, 0);
2870 2928
2871 if (row == selection.end.row || selection.rect) 2929 if (row == selection.end.row
2930#if ENABLE_FRILLS
2931 || selection.rect
2932#endif
2933 )
2872 end_col = min (end_col, selection.end.col); 2934 min_it (end_col, selection.end.col);
2873 2935
2874 t = ROW(row).t + col; 2936 t = ROW(row).t + col;
2937
2875 for (; col < end_col; col++) 2938 for (; col < end_col; col++)
2876 { 2939 {
2877 if (*t == NOCHAR) 2940 if (*t == NOCHAR)
2878 t++; 2941 t++;
2879#if ENABLE_COMBINING 2942#if ENABLE_COMBINING
… …
2895#endif 2958#endif
2896 else 2959 else
2897 new_selection_text[ofs++] = *t++; 2960 new_selection_text[ofs++] = *t++;
2898 } 2961 }
2899 2962
2963#if ENABLE_FRILLS
2964 if (selection.rect)
2965 {
2966 while (ofs
2967 && new_selection_text[ofs - 1] != C0_LF
2968 && unicode::is_space (new_selection_text[ofs - 1]))
2969 --ofs;
2970
2971 new_selection_text[ofs++] = C0_LF;
2972 }
2973 else
2974#endif
2900 if (!ROW(row).is_longer () && row != selection.end.row) 2975 if (!ROW(row).is_longer () && row != selection.end.row)
2901 new_selection_text[ofs++] = C0_LF; 2976 new_selection_text[ofs++] = C0_LF;
2902 } 2977 }
2903 2978
2904 if (end_col != selection.end.col) 2979 if (end_col != selection.end.col)
2905 new_selection_text[ofs++] = C0_LF; 2980 new_selection_text[ofs++] = C0_LF;
2906 2981
… …
2916 2991
2917 // we usually allocate much more than necessary, so realloc it smaller again 2992 // we usually allocate much more than necessary, so realloc it smaller again
2918 selection.len = ofs; 2993 selection.len = ofs;
2919 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2994 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2920 2995
2996 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2997 return;
2998
2999 selection_grab (tm);
3000}
3001
3002bool
3003rxvt_term::selection_grab (Time tm)
3004{
3005 selection_time = tm;
3006
2921 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3007 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2922 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3008 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3009 {
2923 display->set_selection_owner (this); 3010 display->set_selection_owner (this);
3011 return true;
3012 }
2924 else 3013 else
2925 rxvt_warn ("can't get primary selection, ignoring.\n"); 3014 return false;
2926 3015
2927#if 0 3016#if 0
2928 XTextProperty ct; 3017 XTextProperty ct;
2929 3018
2930 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3019 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2931 { 3020 {
2932 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3021 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2933 XFree (ct.value); 3022 XFree (ct.value);
2934 } 3023 }
2935#endif 3024#endif
2936
2937 selection_time = tm;
2938} 3025}
2939 3026
2940/* ------------------------------------------------------------------------- */ 3027/* ------------------------------------------------------------------------- */
2941/* 3028/*
2942 * Mark or select text based upon number of clicks: 1, 2, or 3 3029 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3064 } 3151 }
3065 } 3152 }
3066 break; 3153 break;
3067 } 3154 }
3068 3155
3069Old_Word_Selection_You_Die:
3070 if (dirn == DN) 3156 if (dirn == DN)
3071 col++; /* put us on one past the end */ 3157 col++; /* put us on one past the end */
3072 3158
3073 /* Poke the values back in */ 3159 /* Poke the values back in */
3074 ret->row = row; 3160 ret->row = row;
… …
3251 else if (selection.clicks == 2) 3337 else if (selection.clicks == 2)
3252 { 3338 {
3253 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3339 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3254 selection.end.col--; 3340 selection.end.col--;
3255 3341
3342 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3343 {
3256 selection_delimit_word (UP, &selection.beg, &selection.beg); 3344 selection_delimit_word (UP, &selection.beg, &selection.beg);
3257 selection_delimit_word (DN, &selection.end, &selection.end); 3345 selection_delimit_word (DN, &selection.end, &selection.end);
3346 }
3258 } 3347 }
3259 else if (selection.clicks == 3) 3348 else if (selection.clicks == 3)
3260 { 3349 {
3261#if ENABLE_FRILLS 3350#if ENABLE_FRILLS
3262 if (options & Opt_tripleclickwords) 3351 if (OPTION (Opt_tripleclickwords))
3263 { 3352 {
3264 selection_delimit_word (UP, &selection.beg, &selection.beg); 3353 selection_delimit_word (UP, &selection.beg, &selection.beg);
3265 3354
3266 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3355 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3267 { 3356 {
… …
3328 { 3417 {
3329 stp = ROW(end_row).t; 3418 stp = ROW(end_row).t;
3330 3419
3331 while (--end_col >= 0) 3420 while (--end_col >= 0)
3332 { 3421 {
3333 if (stp[end_col] != ' ' 3422 if (stp[end_col] != NOCHAR
3334 && stp[end_col] != '\t' 3423 && !unicode::is_space (stp[end_col]))
3335 && stp[end_col] != NOCHAR)
3336 break; 3424 break;
3337 } 3425 }
3338 3426
3339 if (end_col >= 0 3427 if (end_col >= 0
3340 || !ROW(end_row - 1).is_longer ()) 3428 || !ROW(end_row - 1).is_longer ())
… …
3539 3627
3540#if ENABLE_OVERLAY 3628#if ENABLE_OVERLAY
3541void 3629void
3542rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3630rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3543{ 3631{
3544 if (nrow < 3 || ncol < 3) 3632 if (nrow < 1 || ncol < 1)
3545 return; 3633 return;
3546 3634
3547 want_refresh = 1; 3635 want_refresh = 1;
3548 3636
3549 scr_overlay_off (); 3637 scr_overlay_off ();
… …
3656 for (int y = ov_h; y--; ) 3744 for (int y = ov_h; y--; )
3657 { 3745 {
3658 text_t *t1 = ov_text[y]; 3746 text_t *t1 = ov_text[y];
3659 rend_t *r1 = ov_rend[y]; 3747 rend_t *r1 = ov_rend[y];
3660 3748
3661 text_t *t2 = ROW(y - view_start).t + ov_x; 3749 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3662 rend_t *r2 = ROW(y - view_start).r + ov_x; 3750 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3663 3751
3664 for (int x = ov_w; x--; ) 3752 for (int x = ov_w; x--; )
3665 { 3753 {
3666 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3754 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3667 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3755 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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