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.195 by root, Mon Dec 26 23:02:34 2005 UTC vs.
Revision 1.211 by root, Fri Jan 6 01:16:58 2006 UTC

… …
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;
… …
289 { 292 {
290 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT 294#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 295 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif 296#endif
294
295 int plines = 1; 297 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 299
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 301 {
… …
317 // re-assemble the full line by destination lines 319 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 320 for (int qrow = q; qlines--; qrow++)
319 { 321 {
320 qline = row_buf + qrow; 322 qline = row_buf + qrow;
321 lalloc (*qline); 323 lalloc (*qline);
324 qline->l = ncol;
322 qline->set_is_longer (); 325 qline->is_longer (1);
323 326
324 int qcol = 0; 327 int qcol = 0;
325 328
326 // fill a single destination line 329 // fill a single destination line
327 while (lofs < llen && qcol < ncol) 330 while (lofs < llen && qcol < ncol)
… …
351 lofs += len; 354 lofs += len;
352 qcol += len; 355 qcol += len;
353 } 356 }
354 } 357 }
355 358
356 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 359 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
357 printf ("qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D 360 qline->is_longer (0);
358 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
359 } 362 }
360 while (p != pend && q > 0); 363 while (p != pend && q > 0);
361 364
362 term_start = total_rows - nrow; 365 term_start = total_rows - nrow;
363 nsaved = term_start - q; 366 nsaved = term_start - q;
364 367
365 // make sure all terminal lines exist 368 // make sure all terminal lines exist
366 while (nsaved < 0) 369 while (nsaved < 0)
367 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 370 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
368
369 } 371 }
370 else 372 else
371 { 373 {
372 // if no scrollback exists (yet), wing, instead of wrap 374 // if no scrollback exists (yet), wing, instead of wrap
373 375
… …
411 413
412 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
413 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
414 416
415 tt_winch (); 417 tt_winch ();
418
419 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416} 420}
417 421
418/* ------------------------------------------------------------------------- */ 422/* ------------------------------------------------------------------------- */
419/* 423/*
420 * Free everything. That way malloc debugging can find leakage. 424 * Free everything. That way malloc debugging can find leakage.
… …
524 528
525 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
526 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
527 531
528#if NSCREENS 532#if NSCREENS
529 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
530 { 534 {
531 num_scr = 0; 535 num_scr = 0;
532 536
533 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
534 ::swap (ROW(i), swap_buf [i]); 538 ::swap (ROW(i), swap_buf [i]);
… …
538 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
539 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
540 } 544 }
541 else 545 else
542#endif 546#endif
543 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
544 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
545 549
546 return scrn; 550 return scrn;
547} 551}
548 552
… …
610 num_scr += count; 614 num_scr += count;
611 615
612 if (count > 0 616 if (count > 0
613 && row1 == 0 617 && row1 == 0
614 && row2 == nrow - 1 618 && row2 == nrow - 1
615 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
616 { 620 {
617 nsaved = min (nsaved + count, saveLines); 621 nsaved = min (nsaved + count, saveLines);
622
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
624
618 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
619 626
620 if (selection.op && current_screen == selection.screen) 627 if (selection.op && current_screen == selection.screen)
621 { 628 {
622 selection.beg.row -= count; 629 selection.beg.row -= count;
… …
636 { 643 {
637 ROW(row2 - i).l = 0; 644 ROW(row2 - i).l = 0;
638 scr_blank_screen_mem (ROW(row2 - i), rstyle); 645 scr_blank_screen_mem (ROW(row2 - i), rstyle);
639 } 646 }
640 647
641 if ((options & Opt_scrollWithBuffer) 648 if (OPTION (Opt_scrollWithBuffer)
642 && view_start != 0 649 && view_start != 0
643 && view_start != saveLines) 650 && view_start != saveLines)
644 scr_page (UP, count); 651 scr_page (UP, count);
645 } 652 }
646 else 653 else
… …
700 if (len <= 0) /* sanity */ 707 if (len <= 0) /* sanity */
701 return; 708 return;
702 709
703 unsigned char checksel; 710 unsigned char checksel;
704 unicode_t c; 711 unicode_t c;
705 int last_col; 712 int ncol = this->ncol;
706 const unicode_t *strend = str + len; 713 const unicode_t *strend = str + len;
707 714
708 want_refresh = 1; 715 want_refresh = 1;
709 ZERO_SCROLLBACK (); 716 ZERO_SCROLLBACK ();
710 last_col = ncol;
711 717
712 if (nlines > 0) 718 if (nlines > 0)
713 { 719 {
714 nlines += screen.cur.row - screen.bscroll; 720 nlines += screen.cur.row - screen.bscroll;
721
715 if (nlines > 0 722 if (nlines > 0
716 && screen.tscroll == 0 723 && screen.tscroll == 0
717 && screen.bscroll == (nrow - 1)) 724 && screen.bscroll == nrow - 1)
718 { 725 {
719 /* _at least_ this many lines need to be scrolled */ 726 /* _at least_ this many lines need to be scrolled */
720 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 727 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
721 screen.cur.row -= nlines; 728 screen.cur.row -= nlines;
722 } 729 }
723 } 730 }
724 731
725#ifdef DEBUG_STRICT 732#ifdef DEBUG_STRICT
726 assert (screen.cur.col < last_col); 733 assert (screen.cur.col < ncol);
727 assert (screen.cur.row < nrow 734 assert (screen.cur.row < nrow
728 && screen.cur.row >= -nsaved); 735 && screen.cur.row >= -nsaved);
729#endif 736#endif
730 int row = screen.cur.row; 737 int row = screen.cur.row;
731 738
… …
738 c = *str++; 745 c = *str++;
739 746
740 if (c < 0x20) 747 if (c < 0x20)
741 if (c == C0_LF) 748 if (c == C0_LF)
742 { 749 {
743 if (!line->is_longer ()) /* XXX: think about this */
744 max_it (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
745 751
746 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
747 753
748 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
749 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
753 line = &ROW(row); /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
754 continue; 760 continue;
755 } 761 }
756 else if (c == C0_CR) 762 else if (c == C0_CR)
757 { 763 {
758 if (!line->is_longer ()) /* XXX: think about this */
759 max_it (line->l, screen.cur.col); 764 max_it (line->l, screen.cur.col);
760 765
761 screen.flags &= ~Screen_WrapNext; 766 screen.flags &= ~Screen_WrapNext;
762 screen.cur.col = 0; 767 screen.cur.col = 0;
763 continue; 768 continue;
764 } 769 }
… …
781 CLEAR_SELECTION (); 786 CLEAR_SELECTION ();
782 } 787 }
783 788
784 if (screen.flags & Screen_WrapNext) 789 if (screen.flags & Screen_WrapNext)
785 { 790 {
791 max_it (line->l, ncol);
786 line->set_is_longer (); 792 line->is_longer (1);
787 793
788 scr_do_wrap (); 794 scr_do_wrap ();
789 795
790 row = screen.cur.row; 796 row = screen.cur.row;
791 line = &ROW(row); /* _must_ refresh */ 797 line = &ROW(row); /* _must_ refresh */
… …
799 // do wcwidth before further replacements, as wcwidth might return -1 805 // do wcwidth before further replacements, as wcwidth might return -1
800 // for the line drawing characters below as they might be invalid in the current 806 // for the line drawing characters below as they might be invalid in the current
801 // locale. 807 // locale.
802 int width = c < 0x100 ? 1 : wcwidth (c); 808 int width = c < 0x100 ? 1 : wcwidth (c);
803 809
804 if (charsets[screen.charset] == '0') // DEC SPECIAL 810 if (charsets [screen.charset] == '0') // DEC SPECIAL
805 { 811 {
806 // vt100 special graphics and line drawing 812 // vt100 special graphics and line drawing
807 // 5f-7e standard vt100 813 // 5f-7e standard vt100
808 // 40-5e rxvt extension for extra curses acs chars 814 // 40-5e rxvt extension for extra curses acs chars
809 static uint16_t vt100_0[62] = { // 41 .. 7e 815 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
861 } 867 }
862 868
863 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
864 870
865 // if the character doesn't fit into the remaining columns... 871 // if the character doesn't fit into the remaining columns...
866 if (screen.cur.col > last_col - width && last_col >= width) 872 if (screen.cur.col > ncol - width && ncol >= width)
867 { 873 {
868 // ...output spaces 874 // ...output spaces
869 c = ' '; 875 c = ' ';
870 // and try the same character next loop iteration 876 // and try the same character next loop iteration
871 --str; 877 --str;
872 } 878 }
873 879
880 line->touch ();
881
874 do 882 do
875 { 883 {
876 line->t[screen.cur.col] = c; 884 line->t[screen.cur.col] = c;
877 line->r[screen.cur.col] = rend; 885 line->r[screen.cur.col] = rend;
878 886
879 if (screen.cur.col < last_col - 1) 887 if (screen.cur.col < ncol - 1)
880 screen.cur.col++; 888 screen.cur.col++;
881 else 889 else
882 { 890 {
883 line->l = last_col; 891 line->l = ncol;
884 if (screen.flags & Screen_Autowrap) 892 if (screen.flags & Screen_Autowrap)
885 screen.flags |= Screen_WrapNext; 893 screen.flags |= Screen_WrapNext;
886 break; 894 break;
887 } 895 }
888 896
… …
890 } 898 }
891 while (--width > 0); 899 while (--width > 0);
892 900
893 // pad with spaces when overwriting wide character with smaller one 901 // pad with spaces when overwriting wide character with smaller one
894 if (!width) 902 if (!width)
903 {
904 line->touch ();
905
895 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 906 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
896 { 907 {
897 line->t[c] = ' '; 908 line->t[c] = ' ';
898 line->r[c] = rend; 909 line->r[c] = rend;
899 } 910 }
911 }
900 } 912 }
901 else // width == 0 913 else // width == 0
902 { 914 {
903#if ENABLE_COMBINING 915#if ENABLE_COMBINING
904 // handle combining characters 916 // handle combining characters
905 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
906 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
907 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
920 line_t *linep;
908 text_t *tp; 921 text_t *tp;
909 rend_t *rp; 922 rend_t *rp;
910 923
911 if (screen.cur.col > 0) 924 if (screen.cur.col > 0)
912 { 925 {
926 linep = line;
913 tp = line->t + screen.cur.col - 1; 927 tp = line->t + screen.cur.col - 1;
914 rp = line->r + screen.cur.col - 1; 928 rp = line->r + screen.cur.col - 1;
915
916 while (*tp == NOCHAR && tp > line->t)
917 tp--, rp--;
918 } 929 }
919 else if (screen.cur.row > 0 930 else if (screen.cur.row > 0
920 && ROW(screen.cur.row - 1).is_longer ()) 931 && ROW(screen.cur.row - 1).is_longer ())
921 { 932 {
922 line_t *line = &ROW(screen.cur.row - 1); 933 linep = &ROW(screen.cur.row - 1);
923
924 tp = line->t + last_col - 1; 934 tp = line->t + ncol - 1;
925 rp = line->r + last_col - 1; 935 rp = line->r + ncol - 1;
926
927 while (*tp == NOCHAR && tp > line->t)
928 tp--, rp--;
929 } 936 }
930 else 937 else
931 continue; 938 continue;
939
940 linep->touch ();
941
942 while (*tp == NOCHAR && tp > linep->t)
943 tp--, rp--;
932 944
933 // first try to find a precomposed character 945 // first try to find a precomposed character
934 unicode_t n = rxvt_compose (*tp, c); 946 unicode_t n = rxvt_compose (*tp, c);
935 if (n == NOCHAR) 947 if (n == NOCHAR)
936 n = rxvt_composite.compose (*tp, c); 948 n = rxvt_composite.compose (*tp, c);
… …
939 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
940#endif 952#endif
941 } 953 }
942 } 954 }
943 955
944 if (!line->is_longer ()) /* XXX: think about this */
945 max_it (line->l, screen.cur.col); 956 max_it (line->l, screen.cur.col);
946 957
947#ifdef DEBUG_STRICT 958#ifdef DEBUG_STRICT
948 assert (screen.cur.row >= 0); 959 assert (screen.cur.row >= 0);
949#endif 960#endif
950} 961}
… …
1000 1011
1001 for (; ++i < ncol; ) 1012 for (; ++i < ncol; )
1002 if (tabs[i]) 1013 if (tabs[i])
1003 { 1014 {
1004 x = i; 1015 x = i;
1016
1005 if (!--count) 1017 if (!--count)
1006 break; 1018 break;
1007 } 1019 }
1008 else 1020 else
1009 ht &= l.t[i] == ' ' 1021 ht &= l.t[i] == ' '
… …
1012 if (count) 1024 if (count)
1013 x = ncol - 1; 1025 x = ncol - 1;
1014 1026
1015 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1016 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1017 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1018 { 1030 {
1019 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1020 1032
1021 if (!l.is_longer ()) /* XXX: think about this */ 1033 l.touch (x);
1022 max_it (l.l, x);
1023 1034
1024 i = screen.cur.col; 1035 i = screen.cur.col;
1025 1036
1026 l.t[i] = '\t'; 1037 l.t[i] = '\t';
1027 l.r[i] = base_rend; 1038 l.r[i] = base_rend;
… …
1081{ 1092{
1082 if (screen.cur.col < ncol - 1) 1093 if (screen.cur.col < ncol - 1)
1083 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1084 else 1095 else
1085 { 1096 {
1086 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1097 line_t &l = ROW(screen.cur.row);
1087 ROW(screen.cur.row).l = ncol; 1098
1099 l.touch ();
1100 l.is_longer (0);
1088 1101
1089 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1090 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1091 scr_gotorc (0, ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1092 } 1105 }
… …
1183 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1184 1197
1185 selection_check (1); 1198 selection_check (1);
1186 1199
1187 line_t &line = ROW(screen.cur.row); 1200 line_t &line = ROW(screen.cur.row);
1201
1202 line.touch ();
1203 line.is_longer (0);
1188 1204
1189 switch (mode) 1205 switch (mode)
1190 { 1206 {
1191 case 0: /* erase to end of line */ 1207 case 0: /* erase to end of line */
1192 col = screen.cur.col; 1208 col = screen.cur.col;
… …
1278 CLEAR_ROWS (row, num); 1294 CLEAR_ROWS (row, num);
1279 } 1295 }
1280 else 1296 else
1281 { 1297 {
1282 ren = rstyle & (RS_fgMask | RS_bgMask); 1298 ren = rstyle & (RS_fgMask | RS_bgMask);
1283 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1284 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1300 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1285 ERASE_ROWS (row, num); 1301 ERASE_ROWS (row, num);
1286 gcvalue.foreground = pix_colors[Color_fg]; 1302 gcvalue.foreground = pix_colors[Color_fg];
1287 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1303 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1288 } 1304 }
1289 1305
1290 for (; num--; row++) 1306 for (; num--; row++)
1291 { 1307 {
1292 ROW (row).l = 0; 1308 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1293 scr_blank_screen_mem (ROW (row), rstyle); 1311 scr_blank_screen_mem (l, rstyle);
1294 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1312 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1295 } 1313 }
1296} 1314}
1297 1315
1298#if ENABLE_FRILLS 1316#if ENABLE_FRILLS
… …
1331 rend_t *r1 = line.r; 1349 rend_t *r1 = line.r;
1332 1350
1333 for (int j = ncol; j--; ) 1351 for (int j = ncol; j--; )
1334 *r1++ = fs; 1352 *r1++ = fs;
1335 1353
1336 line.l = ncol; /* make the `E's selectable */ 1354 line.is_longer (0);
1355 line.touch (ncol);
1337 } 1356 }
1338} 1357}
1339 1358
1340/* ------------------------------------------------------------------------- */ 1359/* ------------------------------------------------------------------------- */
1341/* 1360/*
… …
1389 min_it (count, ncol - screen.cur.col); 1408 min_it (count, ncol - screen.cur.col);
1390 1409
1391 row = screen.cur.row; 1410 row = screen.cur.row;
1392 1411
1393 line_t *line = &ROW(row); 1412 line_t *line = &ROW(row);
1413
1414 line->touch ();
1415 line->is_longer (0);
1394 1416
1395 switch (insdel) 1417 switch (insdel)
1396 { 1418 {
1397 case INSERT: 1419 case INSERT:
1398 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1420 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1399 { 1421 {
1400 line->t[col] = line->t[col - count]; 1422 line->t[col] = line->t[col - count];
1401 line->r[col] = line->r[col - count]; 1423 line->r[col] = line->r[col - count];
1402 } 1424 }
1403 1425
1404 if (!line->is_longer ()) 1426 line->l = min (line->l + count, ncol);
1405 {
1406 line->l += count;
1407 min_it (line->l, ncol);
1408 }
1409 1427
1410 if (selection.op && current_screen == selection.screen 1428 if (selection.op && current_screen == selection.screen
1411 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1429 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1412 { 1430 {
1413 if (selection.end.row != screen.cur.row 1431 if (selection.end.row != screen.cur.row
… …
1426 1444
1427 case ERASE: 1445 case ERASE:
1428 screen.cur.col += count; /* don't worry if > ncol */ 1446 screen.cur.col += count; /* don't worry if > ncol */
1429 selection_check (1); 1447 selection_check (1);
1430 screen.cur.col -= count; 1448 screen.cur.col -= count;
1449
1450 line->l = max (line->l - count, 0);
1431 scr_blank_line (*line, screen.cur.col, count, rstyle); 1451 scr_blank_line (*line, screen.cur.col, count, rstyle);
1432 break; 1452 break;
1433 1453
1434 case DELETE: 1454 case DELETE:
1435 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1455 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1438 { 1458 {
1439 line->t[col] = line->t[col + count]; 1459 line->t[col] = line->t[col + count];
1440 line->r[col] = line->r[col + count]; 1460 line->r[col] = line->r[col + count];
1441 } 1461 }
1442 1462
1463 line->l = max (line->l - count, 0);
1443 scr_blank_line (*line, ncol - count, count, tr); 1464 scr_blank_line (*line, ncol - count, count, tr);
1444
1445 if (line->is_longer ()) /* break line continuation */
1446 line->l = ncol;
1447
1448 line->l = max (line->l - count, 0);
1449 1465
1450 if (selection.op && current_screen == selection.screen 1466 if (selection.op && current_screen == selection.screen
1451 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1452 { 1468 {
1453 if (selection.end.row != screen.cur.row 1469 if (selection.end.row != screen.cur.row
… …
1565rxvt_term::scr_set_tab (int mode) 1581rxvt_term::scr_set_tab (int mode)
1566{ 1582{
1567 if (mode < 0) 1583 if (mode < 0)
1568 memset (tabs, 0, ncol * sizeof (char)); 1584 memset (tabs, 0, ncol * sizeof (char));
1569 else if (screen.cur.col < ncol) 1585 else if (screen.cur.col < ncol)
1570 tabs[screen.cur.col] = (mode ? 1 : 0); 1586 tabs [screen.cur.col] = !!mode;
1571} 1587}
1572 1588
1573/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1574/* 1590/*
1575 * Set reverse/normal video 1591 * Set reverse/normal video
… …
1587 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1603 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1588#if XPM_BACKGROUND 1604#if XPM_BACKGROUND
1589 if (bgPixmap.pixmap == None) 1605 if (bgPixmap.pixmap == None)
1590#endif 1606#endif
1591#if TRANSPARENT 1607#if TRANSPARENT
1592 if (! (options & Opt_transparent) || am_transparent == 0) 1608 if (! OPTION (Opt_transparent) || am_transparent == 0)
1593#endif 1609#endif
1594 XSetWindowBackground (display->display, vt, 1610 XSetWindowBackground (display->display, vt,
1595 pix_colors[Color_bg]); 1611 pix_colors[Color_bg]);
1596 1612
1597 gcvalue.foreground = pix_colors[Color_fg]; 1613 gcvalue.foreground = pix_colors[Color_fg];
… …
1622 * Set font style 1638 * Set font style
1623 */ 1639 */
1624void 1640void
1625rxvt_term::set_font_style () 1641rxvt_term::set_font_style ()
1626{ 1642{
1643#if 0
1627 switch (charsets[screen.charset]) 1644 switch (charsets [screen.charset])
1628 { 1645 {
1629 case '0': /* DEC Special Character & Line Drawing Set */ 1646 case '0': /* DEC Special Character & Line Drawing Set */
1630 break; 1647 break;
1631 case 'A': /* United Kingdom (UK) */ 1648 case 'A': /* United Kingdom (UK) */
1632 break; 1649 break;
… …
1639 case 'C': /* Finnish character set */ 1656 case 'C': /* Finnish character set */
1640 break; 1657 break;
1641 case 'K': /* German character set */ 1658 case 'K': /* German character set */
1642 break; 1659 break;
1643 } 1660 }
1661#endif
1644} 1662}
1645 1663
1646/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
1647/* 1665/*
1648 * Choose a font 1666 * Choose a font
… …
1815int 1833int
1816rxvt_term::scr_changeview (unsigned int oldviewstart) 1834rxvt_term::scr_changeview (unsigned int oldviewstart)
1817{ 1835{
1818 if (view_start != oldviewstart) 1836 if (view_start != oldviewstart)
1819 { 1837 {
1838 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839
1820 want_refresh = 1; 1840 want_refresh = 1;
1821 num_scr -= (view_start - oldviewstart); 1841 num_scr -= (view_start - oldviewstart);
1822 } 1842 }
1823 1843
1824 return (int) (view_start - oldviewstart); 1844 return (int)view_start - (int)oldviewstart;
1825} 1845}
1826 1846
1827/* ------------------------------------------------------------------------- */ 1847/* ------------------------------------------------------------------------- */
1828void 1848void
1829rxvt_term::scr_bell () 1849rxvt_term::scr_bell ()
1830{ 1850{
1831#ifndef NO_BELL 1851#ifndef NO_BELL
1832 1852
1833# ifndef NO_MAPALERT 1853# ifndef NO_MAPALERT
1834# ifdef MAPALERT_OPTION 1854# ifdef MAPALERT_OPTION
1835 if (options & Opt_mapAlert) 1855 if (OPTION (Opt_mapAlert))
1836# endif 1856# endif
1837 XMapWindow (display->display, parent[0]); 1857 XMapWindow (display->display, parent[0]);
1838# endif 1858# endif
1839 1859
1840 if (options & Opt_visualBell) 1860 if (OPTION (Opt_visualBell))
1841 { 1861 {
1842 scr_rvideo_mode (!rvideo); /* refresh also done */ 1862 scr_rvideo_mode (!rvideo); /* refresh also done */
1843 rxvt_usleep (VISUAL_BELL_DURATION); 1863 rxvt_usleep (VISUAL_BELL_DURATION);
1844 scr_rvideo_mode (!rvideo); /* refresh also done */ 1864 scr_rvideo_mode (!rvideo); /* refresh also done */
1845 } 1865 }
… …
1936 1956
1937#if XPM_BACKGROUND 1957#if XPM_BACKGROUND
1938 must_clear |= bgPixmap.pixmap != None; 1958 must_clear |= bgPixmap.pixmap != None;
1939#endif 1959#endif
1940#if TRANSPARENT 1960#if TRANSPARENT
1941 must_clear |= (options & Opt_transparent) && am_transparent; 1961 must_clear |= OPTION (Opt_transparent) && am_transparent;
1942#endif 1962#endif
1943 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1944 1964
1945 /* 1965 /*
1946 * B: reverse any characters which are selected 1966 * B: reverse any characters which are selected
… …
1970 1990
1971 crp = &ROW(screen.cur.row).r[col]; 1991 crp = &ROW(screen.cur.row).r[col];
1972 1992
1973 if (showcursor && focus) 1993 if (showcursor && focus)
1974 { 1994 {
1975 if (options & Opt_cursorUnderline) 1995 if (OPTION (Opt_cursorUnderline))
1976 *crp ^= RS_Uline; 1996 *crp ^= RS_Uline;
1977 else 1997 else
1978 { 1998 {
1979 *crp ^= RS_RVid; 1999 *crp ^= RS_RVid;
1980 2000
… …
1982 cc1 = *crp & (RS_fgMask | RS_bgMask); 2002 cc1 = *crp & (RS_fgMask | RS_bgMask);
1983 if (ISSET_PIXCOLOR (Color_cursor)) 2003 if (ISSET_PIXCOLOR (Color_cursor))
1984 ccol1 = Color_cursor; 2004 ccol1 = Color_cursor;
1985 else 2005 else
1986#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2006#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1987 ccol1 = GET_FGCOLOR (rstyle); 2007 ccol1 = fgcolor_of (rstyle);
1988#else 2008#else
1989 ccol1 = Color_fg; 2009 ccol1 = Color_fg;
1990#endif 2010#endif
1991 if (ISSET_PIXCOLOR (Color_cursor2)) 2011 if (ISSET_PIXCOLOR (Color_cursor2))
1992 ccol2 = Color_cursor2; 2012 ccol2 = Color_cursor2;
1993 else 2013 else
1994#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1995 ccol2 = GET_BGCOLOR (rstyle); 2015 ccol2 = bgcolor_of (rstyle);
1996#else 2016#else
1997 ccol2 = Color_bg; 2017 ccol2 = Color_bg;
1998#endif 2018#endif
1999 *crp = SET_FGCOLOR (*crp, ccol1); 2019 *crp = SET_FGCOLOR (*crp, ccol1);
2000 *crp = SET_BGCOLOR (*crp, ccol2); 2020 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2033 oldcursor.col = screen.cur.col; 2053 oldcursor.col = screen.cur.col;
2034 } 2054 }
2035 } 2055 }
2036 } 2056 }
2037 2057
2058 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2038#if ENABLE_OVERLAY 2059#if ENABLE_OVERLAY
2039 scr_swap_overlay (); 2060 scr_swap_overlay ();
2040#endif 2061#endif
2041 2062
2042#ifndef NO_SLOW_LINK_SUPPORT 2063#ifndef NO_SLOW_LINK_SUPPORT
… …
2092 if (wlen < len) 2113 if (wlen < len)
2093 ::swap (wlen, len); 2114 ::swap (wlen, len);
2094 2115
2095 XCopyArea (display->display, vt, vt, 2116 XCopyArea (display->display, vt, vt,
2096 gc, 0, Row2Pixel (len + i), 2117 gc, 0, Row2Pixel (len + i),
2097 (unsigned int)TermWin_TotalWidth (), 2118 (unsigned int)this->width,
2098 (unsigned int)Height2Pixel (wlen - len + 1), 2119 (unsigned int)Height2Pixel (wlen - len + 1),
2099 0, Row2Pixel (len)); 2120 0, Row2Pixel (len));
2100 len = -1; 2121 len = -1;
2101 } 2122 }
2102 } 2123 }
… …
2181 count++, i--; 2202 count++, i--;
2182 2203
2183 /* 2204 /*
2184 * Determine the attributes for the string 2205 * Determine the attributes for the string
2185 */ 2206 */
2186 int fore = GET_FGCOLOR (rend); // desired foreground 2207 int fore = fgcolor_of (rend); // desired foreground
2187 int back = GET_BGCOLOR (rend); // desired background 2208 int back = bgcolor_of (rend); // desired background
2188 2209
2189 // only do special processing if any attributes are set, which is rare 2210 // only do special processing if any attributes are set, which is unlikely
2190 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2211 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2191 { 2212 {
2192#if ENABLE_STYLES 2213#if ENABLE_STYLES
2193 // force redraw after "careful" characters to avoid pixel droppings 2214 // force redraw after "careful" characters to avoid pixel droppings
2194 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2215 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2305 } /* for (row....) */ 2326 } /* for (row....) */
2306 2327
2307#if ENABLE_OVERLAY 2328#if ENABLE_OVERLAY
2308 scr_swap_overlay (); 2329 scr_swap_overlay ();
2309#endif 2330#endif
2331 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2310 2332
2311 /* 2333 /*
2312 * G: cleanup cursor and display outline cursor if necessary 2334 * G: cleanup cursor and display outline cursor if necessary
2313 */ 2335 */
2314 if (showcursor) 2336 if (showcursor)
2315 { 2337 {
2316 if (focus) 2338 if (focus)
2317 { 2339 {
2318 if (options & Opt_cursorUnderline) 2340 if (OPTION (Opt_cursorUnderline))
2319 *crp ^= RS_Uline; 2341 *crp ^= RS_Uline;
2320 else 2342 else
2321 { 2343 {
2322 *crp ^= RS_RVid; 2344 *crp ^= RS_RVid;
2323#ifndef NO_CURSORCOLOR 2345#ifndef NO_CURSORCOLOR
… …
2361 num_scr = 0; 2383 num_scr = 0;
2362 num_scr_allow = 1; 2384 num_scr_allow = 1;
2363} 2385}
2364 2386
2365void 2387void
2366rxvt_term::scr_remap_chars (const line_t &l) 2388rxvt_term::scr_remap_chars (line_t &l)
2367{ 2389{
2368 if (!l.t) 2390 if (!l.t)
2369 return; 2391 return;
2392
2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant
2370 2394
2371 for (int i = ncol; i--; ) 2395 for (int i = ncol; i--; )
2372 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2396 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2373} 2397}
2374 2398
… …
2442 2466
2443#if ENABLE_FRILLS 2467#if ENABLE_FRILLS
2444 if (selection.rect) 2468 if (selection.rect)
2445 { 2469 {
2446 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2470 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2471 {
2472 text_t *stp = ROW(row).t;
2473 rend_t *srp = ROW(row).r;
2474
2447 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2475 for (col = selection.beg.col; col < selection.end.col; col++)
2448 srp[col] ^= RS_RVid; 2476 srp[col] ^= RS_RVid;
2477
2478 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2479 srp[col] ^= RS_RVid | RS_Uline;
2480
2481 if (++col < selection.end.col)
2482 srp[col] ^= RS_RVid | RS_Uline;
2483 }
2449 } 2484 }
2450 else 2485 else
2451#endif 2486#endif
2452 { 2487 {
2453 if (selection.beg.row >= -view_start) 2488 if (selection.beg.row >= -view_start)
… …
2537/* ------------------------------------------------------------------------- */ 2572/* ------------------------------------------------------------------------- */
2538/* 2573/*
2539 * Paste a selection direct to the command fd 2574 * Paste a selection direct to the command fd
2540 */ 2575 */
2541void 2576void
2542rxvt_term::paste (unsigned char *data, unsigned int len) 2577rxvt_term::paste (char *data, unsigned int len)
2543{ 2578{
2544 /* convert normal newline chars into common keyboard Return key sequence */ 2579 /* convert normal newline chars into common keyboard Return key sequence */
2545 for (unsigned int i = 0; i < len; i++) 2580 for (unsigned int i = 0; i < len; i++)
2546 if (data[i] == C0_LF) 2581 if (data[i] == C0_LF)
2547 data[i] = C0_CR; 2582 data[i] = C0_CR;
… …
2691 { 2726 {
2692 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2727 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2693 char *s = rxvt_wcstombs (w); 2728 char *s = rxvt_wcstombs (w);
2694 free (w); 2729 free (w);
2695 // TODO: strlen == only the first element will be converted. well... 2730 // TODO: strlen == only the first element will be converted. well...
2696 paste ((unsigned char *)s, strlen (s)); 2731 paste (s, strlen (s));
2697 free (s); 2732 free (s);
2698 } 2733 }
2699 else 2734 else
2700#endif 2735#endif
2701 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2736 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2702 && cl) 2737 && cl)
2703 { 2738 {
2704 for (int i = 0; i < cr; i++) 2739 for (int i = 0; i < cr; i++)
2705 paste ((unsigned char *)cl[i], strlen (cl[i])); 2740 paste (cl[i], strlen (cl[i]));
2706 2741
2707 XFreeStringList (cl); 2742 XFreeStringList (cl);
2708 } 2743 }
2709 else 2744 else
2710 paste (ct.value, ct.nitems); // paste raw 2745 paste ((char *)ct.value, ct.nitems); // paste raw
2711 2746
2712bailout: 2747bailout:
2713 XFree (ct.value); 2748 XFree (ct.value);
2714 2749
2715 if (selection_wait == Sel_normal) 2750 if (selection_wait == Sel_normal)
… …
2753 return; /* outside window */ 2788 return; /* outside window */
2754 2789
2755 if (selection.text) 2790 if (selection.text)
2756 { /* internal selection */ 2791 { /* internal selection */
2757 char *str = rxvt_wcstombs (selection.text, selection.len); 2792 char *str = rxvt_wcstombs (selection.text, selection.len);
2758 paste ((unsigned char *)str, strlen (str)); 2793 paste (str, strlen (str));
2759 free (str); 2794 free (str);
2760 return; 2795 return;
2761 } 2796 }
2762 else 2797 else
2763 { 2798 {
… …
2855 selection.op = SELECTION_DONE; 2890 selection.op = SELECTION_DONE;
2856 2891
2857 if (selection.clicks == 4) 2892 if (selection.clicks == 4)
2858 return; /* nothing selected, go away */ 2893 return; /* nothing selected, go away */
2859 2894
2895 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2896 return;
2897
2860 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2898 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2861 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2899 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2862 2900
2863 int ofs = 0; 2901 int ofs = 0;
2864 int extra = 0; 2902 int extra = 0;
… …
2876 col = selection.beg.col; 2914 col = selection.beg.col;
2877 end_col = ncol + 1; 2915 end_col = ncol + 1;
2878 } 2916 }
2879 else 2917 else
2880#endif 2918#endif
2881 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2919 end_col = ROW(row).l;
2882 2920
2883 col = max (col, 0); 2921 col = max (col, 0);
2884 2922
2885 if (row == selection.end.row || selection.rect) 2923 if (row == selection.end.row
2924#if ENABLE_FRILLS
2925 || selection.rect
2926#endif
2927 )
2886 end_col = min (end_col, selection.end.col); 2928 min_it (end_col, selection.end.col);
2887 2929
2888 t = ROW(row).t + col; 2930 t = ROW(row).t + col;
2931
2889 for (; col < end_col; col++) 2932 for (; col < end_col; col++)
2890 { 2933 {
2891 if (*t == NOCHAR) 2934 if (*t == NOCHAR)
2892 t++; 2935 t++;
2893#if ENABLE_COMBINING 2936#if ENABLE_COMBINING
… …
2909#endif 2952#endif
2910 else 2953 else
2911 new_selection_text[ofs++] = *t++; 2954 new_selection_text[ofs++] = *t++;
2912 } 2955 }
2913 2956
2957#if ENABLE_FRILLS
2958 if (selection.rect)
2959 {
2960 while (ofs
2961 && new_selection_text[ofs - 1] != C0_LF
2962 && unicode::is_space (new_selection_text[ofs - 1]))
2963 --ofs;
2964
2965 new_selection_text[ofs++] = C0_LF;
2966 }
2967 else
2968#endif
2914 if (!ROW(row).is_longer () && row != selection.end.row) 2969 if (!ROW(row).is_longer () && row != selection.end.row)
2915 new_selection_text[ofs++] = C0_LF; 2970 new_selection_text[ofs++] = C0_LF;
2916 } 2971 }
2917 2972
2918 if (end_col != selection.end.col) 2973 if (end_col != selection.end.col)
2919 new_selection_text[ofs++] = C0_LF; 2974 new_selection_text[ofs++] = C0_LF;
2920 2975
… …
2930 2985
2931 // we usually allocate much more than necessary, so realloc it smaller again 2986 // we usually allocate much more than necessary, so realloc it smaller again
2932 selection.len = ofs; 2987 selection.len = ofs;
2933 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2988 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2934 2989
2990 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2991 return;
2992
2993 selection_grab (tm);
2994}
2995
2996bool
2997rxvt_term::selection_grab (Time tm)
2998{
2999 selection_time = tm;
3000
2935 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3001 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2936 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3002 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3003 {
2937 display->set_selection_owner (this); 3004 display->set_selection_owner (this);
3005 return true;
3006 }
2938 else 3007 else
2939 rxvt_warn ("can't get primary selection, ignoring.\n"); 3008 return false;
2940 3009
2941#if 0 3010#if 0
2942 XTextProperty ct; 3011 XTextProperty ct;
2943 3012
2944 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3013 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2945 { 3014 {
2946 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3015 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2947 XFree (ct.value); 3016 XFree (ct.value);
2948 } 3017 }
2949#endif 3018#endif
2950
2951 selection_time = tm;
2952} 3019}
2953 3020
2954/* ------------------------------------------------------------------------- */ 3021/* ------------------------------------------------------------------------- */
2955/* 3022/*
2956 * Mark or select text based upon number of clicks: 1, 2, or 3 3023 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3078 } 3145 }
3079 } 3146 }
3080 break; 3147 break;
3081 } 3148 }
3082 3149
3083Old_Word_Selection_You_Die:
3084 if (dirn == DN) 3150 if (dirn == DN)
3085 col++; /* put us on one past the end */ 3151 col++; /* put us on one past the end */
3086 3152
3087 /* Poke the values back in */ 3153 /* Poke the values back in */
3088 ret->row = row; 3154 ret->row = row;
… …
3265 else if (selection.clicks == 2) 3331 else if (selection.clicks == 2)
3266 { 3332 {
3267 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3268 selection.end.col--; 3334 selection.end.col--;
3269 3335
3336 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 {
3270 selection_delimit_word (UP, &selection.beg, &selection.beg); 3338 selection_delimit_word (UP, &selection.beg, &selection.beg);
3271 selection_delimit_word (DN, &selection.end, &selection.end); 3339 selection_delimit_word (DN, &selection.end, &selection.end);
3340 }
3272 } 3341 }
3273 else if (selection.clicks == 3) 3342 else if (selection.clicks == 3)
3274 { 3343 {
3275#if ENABLE_FRILLS 3344#if ENABLE_FRILLS
3276 if (options & Opt_tripleclickwords) 3345 if (OPTION (Opt_tripleclickwords))
3277 { 3346 {
3278 selection_delimit_word (UP, &selection.beg, &selection.beg); 3347 selection_delimit_word (UP, &selection.beg, &selection.beg);
3279 3348
3280 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3349 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3281 { 3350 {
… …
3342 { 3411 {
3343 stp = ROW(end_row).t; 3412 stp = ROW(end_row).t;
3344 3413
3345 while (--end_col >= 0) 3414 while (--end_col >= 0)
3346 { 3415 {
3347 if (stp[end_col] != ' ' 3416 if (stp[end_col] != NOCHAR
3348 && stp[end_col] != '\t' 3417 && !unicode::is_space (stp[end_col]))
3349 && stp[end_col] != NOCHAR)
3350 break; 3418 break;
3351 } 3419 }
3352 3420
3353 if (end_col >= 0 3421 if (end_col >= 0
3354 || !ROW(end_row - 1).is_longer ()) 3422 || !ROW(end_row - 1).is_longer ())
… …
3553 3621
3554#if ENABLE_OVERLAY 3622#if ENABLE_OVERLAY
3555void 3623void
3556rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3624rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3557{ 3625{
3558 if (nrow < 3 || ncol < 3) 3626 if (nrow < 1 || ncol < 1)
3559 return; 3627 return;
3560 3628
3561 want_refresh = 1; 3629 want_refresh = 1;
3562 3630
3563 scr_overlay_off (); 3631 scr_overlay_off ();
… …
3670 for (int y = ov_h; y--; ) 3738 for (int y = ov_h; y--; )
3671 { 3739 {
3672 text_t *t1 = ov_text[y]; 3740 text_t *t1 = ov_text[y];
3673 rend_t *r1 = ov_rend[y]; 3741 rend_t *r1 = ov_rend[y];
3674 3742
3675 text_t *t2 = ROW(y - view_start).t + ov_x; 3743 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3676 rend_t *r2 = ROW(y - view_start).r + ov_x; 3744 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3677 3745
3678 for (int x = ov_w; x--; ) 3746 for (int x = ov_w; x--; )
3679 { 3747 {
3680 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3748 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3681 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3749 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