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