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.206 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.226 by root, Thu Jan 12 09:55:44 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.
… …
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch ();
130
129 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
131 133
132 text_t *et = l.t + col; 134 text_t *et = l.t + col;
133 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
143/* 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 */
144void 146void
145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
146{ 148{
147 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
148} 153}
149 154
150/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
151 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
152 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
189 194
190 if (!row_buf) 195 if (!row_buf)
191 { 196 {
192 /* 197 /*
193 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 199 */
196 nsaved = 0; /* no saved lines */ 200 nsaved = 0; /* no saved lines */
197 term_start = 0; 201 term_start = 0;
198 202
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 205
202 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
203 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 209
207 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
208 { 211 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
255 } 258 }
256 } 259 }
257#endif 260#endif
258 261
259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262 264
263 for (int row = min (nrow, prev_nrow); row--; ) 265 for (int row = min (nrow, prev_nrow); row--; )
264 { 266 {
265 lresize (drawn_buf[row]); 267 lresize (drawn_buf[row]);
… …
270 { 272 {
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 } 275 }
274 276
277 line_t *old_buf = row_buf;
275 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
276 279
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start - nsaved , prev_total_rows);
279 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
280 283
… …
290 { 293 {
291 p = MOD (p - 1, prev_total_rows); 294 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT 295#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif 297#endif
295
296 int plines = 1; 298 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 299 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 300
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300 { 302 {
… …
318 // re-assemble the full line by destination lines 320 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++) 321 for (int qrow = q; qlines--; qrow++)
320 { 322 {
321 qline = row_buf + qrow; 323 qline = row_buf + qrow;
322 lalloc (*qline); 324 lalloc (*qline);
325 qline->l = ncol;
323 qline->set_is_longer (); 326 qline->is_longer (1);
324 327
325 int qcol = 0; 328 int qcol = 0;
326 329
327 // fill a single destination line 330 // fill a single destination line
328 while (lofs < llen && qcol < ncol) 331 while (lofs < llen && qcol < ncol)
… …
353 qcol += len; 356 qcol += len;
354 } 357 }
355 } 358 }
356 359
357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 361 qline->is_longer (0);
359 if (qline->l < 0)
360 {
361 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
362 qline->l = 0;
363 }
364#endif
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
366 } 363 }
367 while (p != pend && q > 0); 364 while (p != pend && q > 0);
368 365
369 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
370 nsaved = term_start - q; 367 nsaved = term_start - q;
371 368
372 // make sure all terminal lines exist 369 // make sure all terminal lines exist
373 while (nsaved < 0) 370 while (nsaved < 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
375
376 } 372 }
377 else 373 else
378 { 374 {
379 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
380 376
… …
419 for (int col = ncol; col--; ) 415 for (int col = ncol; col--; )
420 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
421 417
422 tt_winch (); 418 tt_winch ();
423 419
424 PERL_INVOKE ((this, HOOK_RESET, DT_END)); 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
425} 421}
426 422
427/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
428/* 424/*
429 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
435 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
436 432
437 free (row_buf); 433 free (row_buf);
438 free (swap_buf); 434 free (swap_buf);
439 free (drawn_buf); 435 free (drawn_buf);
440 free (temp_buf);
441 free (tabs); 436 free (tabs);
442 437
443 row_buf = 0; // signal that we freed all the arrays 438 row_buf = 0; // signal that we freed all the arrays
444} 439}
445 440
… …
577 * Change the colour for following text 572 * Change the colour for following text
578 */ 573 */
579void 574void
580rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
581{ 576{
582 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
583 color = fgbg; 578 color = fgbg;
584 579
585 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
586 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
587 else 582 else
… …
623 && row2 == nrow - 1 618 && row2 == nrow - 1
624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
625 { 620 {
626 nsaved = min (nsaved + count, saveLines); 621 nsaved = min (nsaved + count, saveLines);
627 622
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
629 624
630 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
631 626
632 if (selection.op && current_screen == selection.screen) 627 if (selection.op && current_screen == selection.screen)
633 { 628 {
… …
644 } 639 }
645 } 640 }
646 641
647 for (int i = count; i--; ) 642 for (int i = count; i--; )
648 { 643 {
649 ROW(row2 - i).l = 0; 644 // basically thi is a slightly optimized scr_blank_screen_mem
650 scr_blank_screen_mem (ROW(row2 - i), rstyle); 645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
651 } 652 }
652 653
653 if (OPTION (Opt_scrollWithBuffer) 654 if (OPTION (Opt_scrollWithBuffer)
654 && view_start != 0 655 && view_start != 0
655 && view_start != saveLines) 656 && view_start != saveLines)
… …
685 686
686 int rows = row2 - row1 + 1; 687 int rows = row2 - row1 + 1;
687 688
688 min_it (count, rows); 689 min_it (count, rows);
689 690
691 line_t *temp_buf = row_buf + total_rows;
692
690 for (int row = 0; row < rows; row++) 693 for (int row = 0; row < rows; row++)
691 { 694 {
692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 695 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
693 696
694 if (!IN_RANGE_EXC (row + count, 0, rows)) 697 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
705/* ------------------------------------------------------------------------- */ 708/* ------------------------------------------------------------------------- */
706/* 709/*
707 * Add text given in <str> of length <len> to screen struct 710 * Add text given in <str> of length <len> to screen struct
708 */ 711 */
709void 712void
710rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
711{ 714{
712 if (len <= 0) /* sanity */ 715 if (len <= 0) /* sanity */
713 return; 716 return;
714 717
715 unsigned char checksel; 718 unsigned char checksel;
716 unicode_t c; 719 unicode_t c;
717 int last_col; 720 int ncol = this->ncol;
718 const unicode_t *strend = str + len; 721 const wchar_t *strend = str + len;
719 722
720 want_refresh = 1; 723 want_refresh = 1;
721 ZERO_SCROLLBACK (); 724 ZERO_SCROLLBACK ();
722 last_col = ncol;
723 725
724 if (nlines > 0) 726 if (minlines > 0)
725 { 727 {
726 nlines += screen.cur.row - screen.bscroll; 728 minlines += screen.cur.row - screen.bscroll;
729
727 if (nlines > 0 730 if (minlines > 0
728 && screen.tscroll == 0 731 && screen.tscroll == 0
729 && screen.bscroll == (nrow - 1)) 732 && screen.bscroll == nrow - 1)
730 { 733 {
731 /* _at least_ this many lines need to be scrolled */ 734 /* _at least_ this many lines need to be scrolled */
732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 735 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
733 screen.cur.row -= nlines; 736 screen.cur.row -= minlines;
734 } 737 }
735 } 738 }
736 739
737#ifdef DEBUG_STRICT 740#ifdef DEBUG_STRICT
738 assert (screen.cur.col < last_col); 741 assert (screen.cur.col < ncol);
739 assert (screen.cur.row < nrow 742 assert (screen.cur.row < nrow
740 && screen.cur.row >= -nsaved); 743 && screen.cur.row >= -nsaved);
741#endif 744#endif
742 int row = screen.cur.row; 745 int row = screen.cur.row;
743 746
… …
745 748
746 line_t *line = &ROW(row); 749 line_t *line = &ROW(row);
747 750
748 while (str < strend) 751 while (str < strend)
749 { 752 {
750 c = *str++; 753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
751 754
752 if (c < 0x20) 755 if (c < 0x20)
753 if (c == C0_LF) 756 if (c == C0_LF)
754 { 757 {
755 if (!line->is_longer ()) /* XXX: think about this */
756 max_it (line->l, screen.cur.col); 758 max_it (line->l, screen.cur.col);
757 759
758 screen.flags &= ~Screen_WrapNext; 760 screen.flags &= ~Screen_WrapNext;
759 761
760 if (screen.cur.row == screen.bscroll) 762 if (screen.cur.row == screen.bscroll)
761 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 763 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
765 line = &ROW(row); /* _must_ refresh */ 767 line = &ROW(row); /* _must_ refresh */
766 continue; 768 continue;
767 } 769 }
768 else if (c == C0_CR) 770 else if (c == C0_CR)
769 { 771 {
770 if (!line->is_longer ()) /* XXX: think about this */
771 max_it (line->l, screen.cur.col); 772 max_it (line->l, screen.cur.col);
772 773
773 screen.flags &= ~Screen_WrapNext; 774 screen.flags &= ~Screen_WrapNext;
774 screen.cur.col = 0; 775 screen.cur.col = 0;
775 continue; 776 continue;
776 } 777 }
… …
793 CLEAR_SELECTION (); 794 CLEAR_SELECTION ();
794 } 795 }
795 796
796 if (screen.flags & Screen_WrapNext) 797 if (screen.flags & Screen_WrapNext)
797 { 798 {
799 max_it (line->l, ncol);
798 line->set_is_longer (); 800 line->is_longer (1);
799 801
800 scr_do_wrap (); 802 scr_do_wrap ();
801 803
802 row = screen.cur.row; 804 row = screen.cur.row;
803 line = &ROW(row); /* _must_ refresh */ 805 line = &ROW(row); /* _must_ refresh */
… …
811 // do wcwidth before further replacements, as wcwidth might return -1 813 // do wcwidth before further replacements, as wcwidth might return -1
812 // for the line drawing characters below as they might be invalid in the current 814 // for the line drawing characters below as they might be invalid in the current
813 // locale. 815 // locale.
814 int width = c < 0x100 ? 1 : wcwidth (c); 816 int width = c < 0x100 ? 1 : wcwidth (c);
815 817
816 if (charsets[screen.charset] == '0') // DEC SPECIAL 818 if (charsets [screen.charset] == '0') // DEC SPECIAL
817 { 819 {
818 // vt100 special graphics and line drawing 820 // vt100 special graphics and line drawing
819 // 5f-7e standard vt100 821 // 5f-7e standard vt100
820 // 40-5e rxvt extension for extra curses acs chars 822 // 40-5e rxvt extension for extra curses acs chars
821 static uint16_t vt100_0[62] = { // 41 .. 7e 823 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 } 875 }
874 876
875 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 877 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
876 878
877 // if the character doesn't fit into the remaining columns... 879 // if the character doesn't fit into the remaining columns...
878 if (screen.cur.col > last_col - width && last_col >= width) 880 if (screen.cur.col > ncol - width && ncol >= width)
879 { 881 {
880 // ...output spaces 882 // ...output spaces
881 c = ' '; 883 c = ' ';
882 // and try the same character next loop iteration 884 // and try the same character next loop iteration
883 --str; 885 --str;
884 } 886 }
885 887
888 line->touch ();
889
886 do 890 do
887 { 891 {
888 line->t[screen.cur.col] = c; 892 line->t[screen.cur.col] = c;
889 line->r[screen.cur.col] = rend; 893 line->r[screen.cur.col] = rend;
890 894
891 if (screen.cur.col < last_col - 1) 895 if (screen.cur.col < ncol - 1)
892 screen.cur.col++; 896 screen.cur.col++;
893 else 897 else
894 { 898 {
895 line->l = last_col; 899 line->l = ncol;
896 if (screen.flags & Screen_Autowrap) 900 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 901 screen.flags |= Screen_WrapNext;
898 break; 902 break;
899 } 903 }
900 904
… …
902 } 906 }
903 while (--width > 0); 907 while (--width > 0);
904 908
905 // pad with spaces when overwriting wide character with smaller one 909 // pad with spaces when overwriting wide character with smaller one
906 if (!width) 910 if (!width)
911 {
912 line->touch ();
913
907 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
908 { 915 {
909 line->t[c] = ' '; 916 line->t[c] = ' ';
910 line->r[c] = rend; 917 line->r[c] = rend;
911 } 918 }
919 }
912 } 920 }
913 else // width == 0 921 else // width == 0
914 { 922 {
915#if ENABLE_COMBINING 923#if ENABLE_COMBINING
916 // handle combining characters 924 // handle combining characters
917 // we just tag the accent on the previous on-screen character. 925 // we just tag the accent on the previous on-screen character.
918 // this is arguably not correct, but also arguably not wrong. 926 // this is arguably not correct, but also arguably not wrong.
919 // we don't handle double-width characters nicely yet. 927 // we don't handle double-width characters nicely yet.
928 line_t *linep;
920 text_t *tp; 929 text_t *tp;
921 rend_t *rp; 930 rend_t *rp;
922 931
923 if (screen.cur.col > 0) 932 if (screen.cur.col > 0)
924 { 933 {
934 linep = line;
925 tp = line->t + screen.cur.col - 1; 935 tp = line->t + screen.cur.col - 1;
926 rp = line->r + screen.cur.col - 1; 936 rp = line->r + screen.cur.col - 1;
927
928 while (*tp == NOCHAR && tp > line->t)
929 tp--, rp--;
930 } 937 }
931 else if (screen.cur.row > 0 938 else if (screen.cur.row > 0
932 && ROW(screen.cur.row - 1).is_longer ()) 939 && ROW(screen.cur.row - 1).is_longer ())
933 { 940 {
934 line_t *line = &ROW(screen.cur.row - 1); 941 linep = &ROW(screen.cur.row - 1);
935
936 tp = line->t + last_col - 1; 942 tp = line->t + ncol - 1;
937 rp = line->r + last_col - 1; 943 rp = line->r + ncol - 1;
938
939 while (*tp == NOCHAR && tp > line->t)
940 tp--, rp--;
941 } 944 }
942 else 945 else
943 continue; 946 continue;
947
948 linep->touch ();
949
950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
944 952
945 // first try to find a precomposed character 953 // first try to find a precomposed character
946 unicode_t n = rxvt_compose (*tp, c); 954 unicode_t n = rxvt_compose (*tp, c);
947 if (n == NOCHAR) 955 if (n == NOCHAR)
948 n = rxvt_composite.compose (*tp, c); 956 n = rxvt_composite.compose (*tp, c);
… …
951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
952#endif 960#endif
953 } 961 }
954 } 962 }
955 963
956 if (!line->is_longer ()) /* XXX: think about this */
957 max_it (line->l, screen.cur.col); 964 max_it (line->l, screen.cur.col);
958 965
959#ifdef DEBUG_STRICT 966#ifdef DEBUG_STRICT
960 assert (screen.cur.row >= 0); 967 assert (screen.cur.row >= 0);
961#endif 968#endif
962} 969}
… …
1012 1019
1013 for (; ++i < ncol; ) 1020 for (; ++i < ncol; )
1014 if (tabs[i]) 1021 if (tabs[i])
1015 { 1022 {
1016 x = i; 1023 x = i;
1024
1017 if (!--count) 1025 if (!--count)
1018 break; 1026 break;
1019 } 1027 }
1020 else 1028 else
1021 ht &= l.t[i] == ' ' 1029 ht &= l.t[i] == ' '
… …
1028 // buffer so they can be selected and pasted. 1036 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1037 if (ht && OPTION (Opt_pastableTabs))
1030 { 1038 {
1031 base_rend = SET_FONT (base_rend, 0); 1039 base_rend = SET_FONT (base_rend, 0);
1032 1040
1033 if (!l.is_longer ()) /* XXX: think about this */ 1041 l.touch (x);
1034 max_it (l.l, x);
1035 1042
1036 i = screen.cur.col; 1043 i = screen.cur.col;
1037 1044
1038 l.t[i] = '\t'; 1045 l.t[i] = '\t';
1039 l.r[i] = base_rend; 1046 l.r[i] = base_rend;
… …
1093{ 1100{
1094 if (screen.cur.col < ncol - 1) 1101 if (screen.cur.col < ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1103 else
1097 { 1104 {
1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1105 line_t &l = ROW(screen.cur.row);
1099 ROW(screen.cur.row).l = ncol; 1106
1107 l.touch ();
1108 l.is_longer (0);
1100 1109
1101 scr_gotorc (0, 0, R_RELATIVE); 1110 scr_gotorc (0, 0, R_RELATIVE);
1102 scr_insdel_chars (1, DELETE); 1111 scr_insdel_chars (1, DELETE);
1103 scr_gotorc (0, ncol - 1, R_RELATIVE); 1112 scr_gotorc (0, ncol - 1, R_RELATIVE);
1104 } 1113 }
… …
1195 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1196 1205
1197 selection_check (1); 1206 selection_check (1);
1198 1207
1199 line_t &line = ROW(screen.cur.row); 1208 line_t &line = ROW(screen.cur.row);
1209
1210 line.touch ();
1211 line.is_longer (0);
1200 1212
1201 switch (mode) 1213 switch (mode)
1202 { 1214 {
1203 case 0: /* erase to end of line */ 1215 case 0: /* erase to end of line */
1204 col = screen.cur.col; 1216 col = screen.cur.col;
… …
1299 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1311 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1300 } 1312 }
1301 1313
1302 for (; num--; row++) 1314 for (; num--; row++)
1303 { 1315 {
1304 ROW (row).l = 0;
1305 scr_blank_screen_mem (ROW (row), rstyle); 1316 scr_blank_screen_mem (ROW(row), rstyle);
1306 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1317 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1307 } 1318 }
1308} 1319}
1309 1320
1310#if ENABLE_FRILLS 1321#if ENABLE_FRILLS
… …
1343 rend_t *r1 = line.r; 1354 rend_t *r1 = line.r;
1344 1355
1345 for (int j = ncol; j--; ) 1356 for (int j = ncol; j--; )
1346 *r1++ = fs; 1357 *r1++ = fs;
1347 1358
1348 line.l = ncol; /* make the `E's selectable */ 1359 line.is_longer (0);
1360 line.touch (ncol);
1349 } 1361 }
1350} 1362}
1351 1363
1352/* ------------------------------------------------------------------------- */ 1364/* ------------------------------------------------------------------------- */
1353/* 1365/*
… …
1401 min_it (count, ncol - screen.cur.col); 1413 min_it (count, ncol - screen.cur.col);
1402 1414
1403 row = screen.cur.row; 1415 row = screen.cur.row;
1404 1416
1405 line_t *line = &ROW(row); 1417 line_t *line = &ROW(row);
1418
1419 line->touch ();
1420 line->is_longer (0);
1406 1421
1407 switch (insdel) 1422 switch (insdel)
1408 { 1423 {
1409 case INSERT: 1424 case INSERT:
1410 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1411 { 1426 {
1412 line->t[col] = line->t[col - count]; 1427 line->t[col] = line->t[col - count];
1413 line->r[col] = line->r[col - count]; 1428 line->r[col] = line->r[col - count];
1414 } 1429 }
1415 1430
1416 if (!line->is_longer ()) 1431 line->l = min (line->l + count, ncol);
1417 {
1418 line->l += count;
1419 min_it (line->l, ncol);
1420 }
1421 1432
1422 if (selection.op && current_screen == selection.screen 1433 if (selection.op && current_screen == selection.screen
1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1424 { 1435 {
1425 if (selection.end.row != screen.cur.row 1436 if (selection.end.row != screen.cur.row
… …
1438 1449
1439 case ERASE: 1450 case ERASE:
1440 screen.cur.col += count; /* don't worry if > ncol */ 1451 screen.cur.col += count; /* don't worry if > ncol */
1441 selection_check (1); 1452 selection_check (1);
1442 screen.cur.col -= count; 1453 screen.cur.col -= count;
1454
1455 line->l = max (line->l - count, 0);
1443 scr_blank_line (*line, screen.cur.col, count, rstyle); 1456 scr_blank_line (*line, screen.cur.col, count, rstyle);
1444 break; 1457 break;
1445 1458
1446 case DELETE: 1459 case DELETE:
1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1450 { 1463 {
1451 line->t[col] = line->t[col + count]; 1464 line->t[col] = line->t[col + count];
1452 line->r[col] = line->r[col + count]; 1465 line->r[col] = line->r[col + count];
1453 } 1466 }
1454 1467
1468 line->l = max (line->l - count, 0);
1455 scr_blank_line (*line, ncol - count, count, tr); 1469 scr_blank_line (*line, ncol - count, count, tr);
1456
1457 if (line->is_longer ()) /* break line continuation */
1458 line->l = ncol;
1459
1460 line->l = max (line->l - count, 0);
1461 1470
1462 if (selection.op && current_screen == selection.screen 1471 if (selection.op && current_screen == selection.screen
1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1464 { 1473 {
1465 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
… …
1577rxvt_term::scr_set_tab (int mode) 1586rxvt_term::scr_set_tab (int mode)
1578{ 1587{
1579 if (mode < 0) 1588 if (mode < 0)
1580 memset (tabs, 0, ncol * sizeof (char)); 1589 memset (tabs, 0, ncol * sizeof (char));
1581 else if (screen.cur.col < ncol) 1590 else if (screen.cur.col < ncol)
1582 tabs[screen.cur.col] = (mode ? 1 : 0); 1591 tabs [screen.cur.col] = !!mode;
1583} 1592}
1584 1593
1585/* ------------------------------------------------------------------------- */ 1594/* ------------------------------------------------------------------------- */
1586/* 1595/*
1587 * Set reverse/normal video 1596 * Set reverse/normal video
… …
1634 * Set font style 1643 * Set font style
1635 */ 1644 */
1636void 1645void
1637rxvt_term::set_font_style () 1646rxvt_term::set_font_style ()
1638{ 1647{
1648#if 0
1639 switch (charsets[screen.charset]) 1649 switch (charsets [screen.charset])
1640 { 1650 {
1641 case '0': /* DEC Special Character & Line Drawing Set */ 1651 case '0': /* DEC Special Character & Line Drawing Set */
1642 break; 1652 break;
1643 case 'A': /* United Kingdom (UK) */ 1653 case 'A': /* United Kingdom (UK) */
1644 break; 1654 break;
… …
1651 case 'C': /* Finnish character set */ 1661 case 'C': /* Finnish character set */
1652 break; 1662 break;
1653 case 'K': /* German character set */ 1663 case 'K': /* German character set */
1654 break; 1664 break;
1655 } 1665 }
1666#endif
1656} 1667}
1657 1668
1658/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
1659/* 1670/*
1660 * Choose a font 1671 * Choose a font
… …
1825} 1836}
1826 1837
1827int 1838int
1828rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1829{ 1840{
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831
1832 if (view_start != oldviewstart) 1841 if (view_start != oldviewstart)
1833 { 1842 {
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844
1834 want_refresh = 1; 1845 want_refresh = 1;
1835 num_scr -= (view_start - oldviewstart); 1846 num_scr -= (view_start - oldviewstart);
1836 } 1847 }
1837 1848
1838 return (int) (view_start - oldviewstart); 1849 return (int)view_start - (int)oldviewstart;
1839} 1850}
1840 1851
1841/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1842void 1853void
1843rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
… …
1852# endif 1863# endif
1853 1864
1854 if (OPTION (Opt_visualBell)) 1865 if (OPTION (Opt_visualBell))
1855 { 1866 {
1856 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
1857 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1858 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1859 } 1871 }
1860 else 1872 else
1861 XBell (display->display, 0); 1873 XBell (display->display, 0);
… …
2047 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2048 } 2060 }
2049 } 2061 }
2050 } 2062 }
2051 2063
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2053#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2054 scr_swap_overlay (); 2066 scr_swap_overlay ();
2055#endif 2067#endif
2056 2068
2057#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2107 if (wlen < len) 2119 if (wlen < len)
2108 ::swap (wlen, len); 2120 ::swap (wlen, len);
2109 2121
2110 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2111 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2112 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2113 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2114 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2115 len = -1; 2127 len = -1;
2116 } 2128 }
2117 } 2129 }
… …
2320 } /* for (row....) */ 2332 } /* for (row....) */
2321 2333
2322#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2323 scr_swap_overlay (); 2335 scr_swap_overlay ();
2324#endif 2336#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2326 2338
2327 /* 2339 /*
2328 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2329 */ 2341 */
2330 if (showcursor) 2342 if (showcursor)
… …
2369 /* 2381 /*
2370 * H: cleanup selection 2382 * H: cleanup selection
2371 */ 2383 */
2372 scr_reverse_selection (); 2384 scr_reverse_selection ();
2373 2385
2374 if (refresh_type & SMOOTH_REFRESH)
2375 XFlush (display->display);
2376
2377 num_scr = 0; 2386 num_scr = 0;
2378 num_scr_allow = 1; 2387 num_scr_allow = 1;
2379} 2388}
2380 2389
2381void 2390void
2382rxvt_term::scr_remap_chars (const line_t &l) 2391rxvt_term::scr_remap_chars (line_t &l)
2383{ 2392{
2384 if (!l.t) 2393 if (!l.t)
2385 return; 2394 return;
2395
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2386 2397
2387 for (int i = ncol; i--; ) 2398 for (int i = ncol; i--; )
2388 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2389} 2400}
2390 2401
… …
2443 2454
2444 if (really) 2455 if (really)
2445 XClearWindow (display->display, vt); 2456 XClearWindow (display->display, vt);
2446} 2457}
2447 2458
2459void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2461{
2462 int view_end = -view_start + nrow;
2463 int row, col;
2464
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++)
2466 {
2467 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r;
2469
2470 for (col = beg_col; col < end_col; col++)
2471 srp[col] ^= rstyle1;
2472
2473 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2474 srp[col] ^= rstyle2;
2475
2476 if (++col < end_col)
2477 srp[col] ^= rstyle2;
2478 }
2479}
2480
2481void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2483{
2484 int view_end = -view_start + nrow;
2485 int row, col;
2486
2487 if (beg_row >= -view_start)
2488 {
2489 col = beg_col;
2490 row = beg_row;
2491 }
2492 else
2493 {
2494 col = 0;
2495 row = -view_start;
2496 }
2497
2498 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle;
2501
2502 if (row == end_row)
2503 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2504 srp[col] ^= rstyle;
2505}
2506
2448/* ------------------------------------------------------------------------- */ 2507/* ------------------------------------------------------------------------- */
2449void 2508void
2450rxvt_term::scr_reverse_selection () 2509rxvt_term::scr_reverse_selection ()
2451{ 2510{
2452 if (selection.op 2511 if (selection.op
2453 && current_screen == selection.screen 2512 && current_screen == selection.screen
2454 && selection.end.row >= -view_start) 2513 && selection.end.row >= -view_start)
2455 { 2514 {
2456 int view_end = -view_start + nrow;
2457 int row, col;
2458
2459#if ENABLE_FRILLS 2515#if ENABLE_FRILLS
2460 if (selection.rect) 2516 if (selection.rect)
2461 { 2517 scr_xor_rect (selection.beg.row, selection.beg.col,
2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2518 selection.end.row, selection.end.col,
2463 { 2519 RS_RVid, RS_RVid | RS_Uline);
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2466
2467 for (col = selection.beg.col; col < selection.end.col; col++)
2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2476 }
2477 else 2520 else
2478#endif 2521#endif
2479 { 2522 scr_xor_span (selection.beg.row, selection.beg.col,
2480 if (selection.beg.row >= -view_start) 2523 selection.end.row, selection.end.col,
2481 { 2524 RS_RVid);
2482 col = selection.beg.col;
2483 row = selection.beg.row;
2484 }
2485 else
2486 {
2487 col = 0;
2488 row = -view_start;
2489 }
2490
2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2493 srp[col] ^= RS_RVid;
2494
2495 if (row == selection.end.row)
2496 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2497 srp[col] ^= RS_RVid;
2498 }
2499 } 2525 }
2500} 2526}
2501 2527
2502/* ------------------------------------------------------------------------- */ 2528/* ------------------------------------------------------------------------- */
2503/* 2529/*
… …
2564/* ------------------------------------------------------------------------- */ 2590/* ------------------------------------------------------------------------- */
2565/* 2591/*
2566 * Paste a selection direct to the command fd 2592 * Paste a selection direct to the command fd
2567 */ 2593 */
2568void 2594void
2569rxvt_term::paste (unsigned char *data, unsigned int len) 2595rxvt_term::paste (char *data, unsigned int len)
2570{ 2596{
2571 /* convert normal newline chars into common keyboard Return key sequence */ 2597 /* convert normal newline chars into common keyboard Return key sequence */
2572 for (unsigned int i = 0; i < len; i++) 2598 for (unsigned int i = 0; i < len; i++)
2573 if (data[i] == C0_LF) 2599 if (data[i] == C0_LF)
2574 data[i] = C0_CR; 2600 data[i] = C0_CR;
… …
2718 { 2744 {
2719 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2720 char *s = rxvt_wcstombs (w); 2746 char *s = rxvt_wcstombs (w);
2721 free (w); 2747 free (w);
2722 // TODO: strlen == only the first element will be converted. well... 2748 // TODO: strlen == only the first element will be converted. well...
2723 paste ((unsigned char *)s, strlen (s)); 2749 paste (s, strlen (s));
2724 free (s); 2750 free (s);
2725 } 2751 }
2726 else 2752 else
2727#endif 2753#endif
2728 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2729 && cl) 2755 && cl)
2730 { 2756 {
2731 for (int i = 0; i < cr; i++) 2757 for (int i = 0; i < cr; i++)
2732 paste ((unsigned char *)cl[i], strlen (cl[i])); 2758 paste (cl[i], strlen (cl[i]));
2733 2759
2734 XFreeStringList (cl); 2760 XFreeStringList (cl);
2735 } 2761 }
2736 else 2762 else
2737 paste (ct.value, ct.nitems); // paste raw 2763 paste ((char *)ct.value, ct.nitems); // paste raw
2738 2764
2739bailout: 2765bailout:
2740 XFree (ct.value); 2766 XFree (ct.value);
2741 2767
2742 if (selection_wait == Sel_normal) 2768 if (selection_wait == Sel_normal)
… …
2780 return; /* outside window */ 2806 return; /* outside window */
2781 2807
2782 if (selection.text) 2808 if (selection.text)
2783 { /* internal selection */ 2809 { /* internal selection */
2784 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2785 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2786 free (str); 2812 free (str);
2787 return; 2813 return;
2788 } 2814 }
2789 else 2815 else
2790 { 2816 {
… …
2882 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2883 2909
2884 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2885 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2886 2912
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return; 2914 return;
2889 2915
2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2891 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2892 2918
… …
2906 col = selection.beg.col; 2932 col = selection.beg.col;
2907 end_col = ncol + 1; 2933 end_col = ncol + 1;
2908 } 2934 }
2909 else 2935 else
2910#endif 2936#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2937 end_col = ROW(row).l;
2912 2938
2913 col = max (col, 0); 2939 col = max (col, 0);
2914 2940
2915 if (row == selection.end.row 2941 if (row == selection.end.row
2916#if ENABLE_FRILLS 2942#if ENABLE_FRILLS
… …
2918#endif 2944#endif
2919 ) 2945 )
2920 min_it (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
2921 2947
2922 t = ROW(row).t + col; 2948 t = ROW(row).t + col;
2949
2923 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
2924 { 2951 {
2925 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
2926 t++; 2953 t++;
2927#if ENABLE_COMBINING 2954#if ENABLE_COMBINING
… …
2976 3003
2977 // we usually allocate much more than necessary, so realloc it smaller again 3004 // we usually allocate much more than necessary, so realloc it smaller again
2978 selection.len = ofs; 3005 selection.len = ofs;
2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3006 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2980 3007
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 3008 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return; 3009 return;
2983 3010
2984 selection_grab (tm); 3011 selection_grab (tm);
2985} 3012}
2986 3013
… …
2994 { 3021 {
2995 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
2996 return true; 3023 return true;
2997 } 3024 }
2998 else 3025 else
3026 {
3027 selection_clear ();
2999 return false; 3028 return false;
3029 }
3000 3030
3001#if 0 3031#if 0
3002 XTextProperty ct; 3032 XTextProperty ct;
3003 3033
3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3017void 3047void
3018rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
3019{ 3049{
3020 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
3021 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
3052
3053 if (clicks == 2 && !selection.rect
3054 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3055 {
3056 MEvent.clicks = 1; // what a mess
3057 selection.screen = current_screen;
3058 selection.op = SELECTION_CONT;
3059 return;
3060 }
3022 3061
3023 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3024 3063
3025 if (clicks == 2 || clicks == 3) 3064 if (clicks == 2 || clicks == 3)
3026 selection_extend_colrow (selection.mark.col, 3065 selection_extend_colrow (selection.mark.col,
… …
3136 } 3175 }
3137 } 3176 }
3138 break; 3177 break;
3139 } 3178 }
3140 3179
3141Old_Word_Selection_You_Die:
3142 if (dirn == DN) 3180 if (dirn == DN)
3143 col++; /* put us on one past the end */ 3181 col++; /* put us on one past the end */
3144 3182
3145 /* Poke the values back in */ 3183 /* Poke the values back in */
3146 ret->row = row; 3184 ret->row = row;
… …
3323 else if (selection.clicks == 2) 3361 else if (selection.clicks == 2)
3324 { 3362 {
3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3363 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3326 selection.end.col--; 3364 selection.end.col--;
3327 3365
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3330 selection_delimit_word (UP, &selection.beg, &selection.beg); 3366 selection_delimit_word (UP, &selection.beg, &selection.beg);
3331 selection_delimit_word (DN, &selection.end, &selection.end); 3367 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3333 } 3368 }
3334 else if (selection.clicks == 3) 3369 else if (selection.clicks == 3)
3335 { 3370 {
3336#if ENABLE_FRILLS 3371#if ENABLE_FRILLS
3337 if (OPTION (Opt_tripleclickwords)) 3372 if (OPTION (Opt_tripleclickwords))

Diff Legend

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