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.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC

… …
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN 28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */
31 30
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 32
34#include <inttypes.h> 33#include <inttypes.h>
35#include <wchar.h> 34#include <wchar.h>
… …
48 47
49/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
53 if (Options & Opt_scrollTtyOutput) \ 52 if (options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 53 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 154 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q; 155 unsigned int p, q;
157 int k; 156 int k;
158 rend_t setrstyle; 157 rend_t setrstyle;
159 158
160 D_SCREEN ((stderr, "rxvt_scr_reset ()")); 159#if ENABLE_OVERLAY
160 scr_overlay_off ();
161#endif
161 162
162 TermWin.view_start = 0; 163 TermWin.view_start = 0;
163 num_scr = 0; 164 num_scr = 0;
164 165
165 if (TermWin.ncol == 0) 166 if (TermWin.ncol == 0)
… …
222 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
223 screen.tlen[q] = swap.tlen[p] = 0; 224 screen.tlen[q] = swap.tlen[p] = 0;
224 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
225 } 226 }
226 227
227 MEMSET (charsets, 'B', sizeof (charsets)); 228 memset (charsets, 'B', sizeof (charsets));
228 TermWin.nscrolled = 0; /* no saved lines */ 229 TermWin.nscrolled = 0; /* no saved lines */
229 rstyle = DEFAULT_RSTYLE; 230 rstyle = DEFAULT_RSTYLE;
230 screen.flags = Screen_DefaultFlags; 231 screen.flags = Screen_DefaultFlags;
231 screen.cur.row = screen.cur.col = 0; 232 screen.cur.row = screen.cur.col = 0;
232 screen.charset = 0; 233 screen.charset = 0;
… …
479 * Hard reset 480 * Hard reset
480 */ 481 */
481void 482void
482rxvt_term::scr_poweron () 483rxvt_term::scr_poweron ()
483{ 484{
484 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
485
486 scr_release (); 485 scr_release ();
487 prev_nrow = prev_ncol = 0; 486 prev_nrow = prev_ncol = 0;
488 scr_reset (); 487 scr_reset ();
489 488
490 scr_clear (true); 489 scr_clear (true);
… …
501 */ 500 */
502void 501void
503rxvt_term::scr_cursor (int mode) 502rxvt_term::scr_cursor (int mode)
504{ 503{
505 screen_t *s; 504 screen_t *s;
506
507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
508 505
509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 506#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
510 if (current_screen == SECONDARY) 507 if (current_screen == SECONDARY)
511 s = &swap; 508 s = &swap;
512 else 509 else
… …
561 int offset; 558 int offset;
562#endif 559#endif
563 560
564 want_refresh = 1; 561 want_refresh = 1;
565 562
566 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
567
568 TermWin.view_start = 0; 563 TermWin.view_start = 0;
569 564
570 if (current_screen == scrn) 565 if (current_screen == scrn)
571 return scrn; 566 return scrn;
572 567
573 selection_check (2); /* check for boundary cross */ 568 selection_check (2); /* check for boundary cross */
574 569
575 SWAP_IT (current_screen, scrn, int); 570 SWAP_IT (current_screen, scrn, int);
576#if NSCREENS 571#if NSCREENS
577 if (Options & Opt_secondaryScreen) 572 if (options & Opt_secondaryScreen)
578 { 573 {
579 num_scr = 0; 574 num_scr = 0;
580 offset = TermWin.saveLines; 575 offset = TermWin.saveLines;
581 for (i = prev_nrow; i--;) 576 for (i = prev_nrow; i--;)
582 { 577 {
… …
600 screen.flags |= Screen_VisibleCursor; 595 screen.flags |= Screen_VisibleCursor;
601 swap.flags |= Screen_VisibleCursor; 596 swap.flags |= Screen_VisibleCursor;
602 } 597 }
603 else 598 else
604#endif 599#endif
605 if (Options & Opt_secondaryScroll) 600 if (options & Opt_secondaryScroll)
606 //if (current_screen == PRIMARY) 601 //if (current_screen == PRIMARY)
607 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
608 return scrn; 603 return scrn;
604}
605
606// clear WrapNext indicator, solidifying position on next line
607void
608rxvt_term::scr_do_wrap ()
609{
610 if (!(screen.flags & Screen_WrapNext))
611 return;
612
613 screen.flags &= ~Screen_WrapNext;
614
615 screen.cur.col = 0;
616
617 if (screen.cur.row == screen.bscroll)
618 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
619 else if (screen.cur.row < TermWin.nrow - 1)
620 screen.cur.row++;
609} 621}
610 622
611/* ------------------------------------------------------------------------- */ 623/* ------------------------------------------------------------------------- */
612/* 624/*
613 * Change the colour for following text 625 * Change the colour for following text
… …
652 664
653 if (count == 0 || (row1 > row2)) 665 if (count == 0 || (row1 > row2))
654 return 0; 666 return 0;
655 667
656 want_refresh = 1; 668 want_refresh = 1;
657 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
658 669
659 if (row1 == 0 && count > 0 670 if (row1 == 0 && count > 0
660 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 671 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
661 { 672 {
662 nscrolled = (long)TermWin.nscrolled + (long)count; 673 nscrolled = (long)TermWin.nscrolled + (long)count;
663 674
664 if (nscrolled > (long)TermWin.saveLines) 675 if (nscrolled > (long)TermWin.saveLines)
665 TermWin.nscrolled = TermWin.saveLines; 676 TermWin.nscrolled = TermWin.saveLines;
666 else 677 else
667 TermWin.nscrolled = (uint16_t)nscrolled; 678 TermWin.nscrolled = (uint16_t)nscrolled;
668 679
669 if ((Options & Opt_scrollWithBuffer) 680 if ((options & Opt_scrollWithBuffer)
670 && TermWin.view_start != 0 681 && TermWin.view_start != 0
671 && TermWin.view_start != TermWin.saveLines) 682 && TermWin.view_start != TermWin.saveLines)
672 scr_page (UP, count); 683 scr_page (UP, count);
673 } 684 }
674 else if (!spec) 685 else if (!spec)
… …
765 * Add text given in <str> of length <len> to screen struct 776 * Add text given in <str> of length <len> to screen struct
766 */ 777 */
767void 778void
768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 779rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
769{ 780{
770 unsigned char checksel, clearsel; 781 unsigned char checksel;
771 unicode_t c; 782 unicode_t c;
772 int i, row, last_col; 783 int i, row, last_col;
773 text_t *stp; 784 text_t *stp;
774 rend_t *srp; 785 rend_t *srp;
775 786
776 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
777 return; 788 return;
778 789
779 want_refresh = 1; 790 want_refresh = 1;
791 ZERO_SCROLLBACK ();
780 last_col = TermWin.ncol; 792 last_col = TermWin.ncol;
781 793
782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
783 ZERO_SCROLLBACK ();
784 if (nlines > 0) 794 if (nlines > 0)
785 { 795 {
786 nlines += screen.cur.row - screen.bscroll; 796 nlines += screen.cur.row - screen.bscroll;
787 if ((nlines > 0) 797 if ((nlines > 0)
788 && (screen.tscroll == 0) 798 && (screen.tscroll == 0)
… …
804 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 814 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
805#endif 815#endif
806 row = screen.cur.row + TermWin.saveLines; 816 row = screen.cur.row + TermWin.saveLines;
807 817
808 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 818 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
809 clearsel = 0;
810 819
811 stp = screen.text[row]; 820 stp = screen.text[row];
812 srp = screen.rend[row]; 821 srp = screen.rend[row];
813 822
814 while (len--) 823 while (len--)
… …
849 if (checksel /* see if we're writing within selection */ 858 if (checksel /* see if we're writing within selection */
850 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 859 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
851 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 860 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
852 { 861 {
853 checksel = 0; 862 checksel = 0;
854 clearsel = 1; 863 /*
864 * If we wrote anywhere in the selected area, kill the selection
865 * XXX: should we kill the mark too? Possibly, but maybe that
866 * should be a similar check.
867 */
868 CLEAR_SELECTION ();
855 } 869 }
856 870
857 if (screen.flags & Screen_WrapNext) 871 if (screen.flags & Screen_WrapNext)
858 { 872 {
859 screen.tlen[row] = -1; 873 screen.tlen[row] = -1;
860 if (screen.cur.row == screen.bscroll) 874
861 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
862 else if (screen.cur.row < (TermWin.nrow - 1))
863 row = (++screen.cur.row) + TermWin.saveLines; 875 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
864 876
865 stp = screen.text[row]; /* _must_ refresh */ 877 stp = screen.text[row]; /* _must_ refresh */
866 srp = screen.rend[row]; /* _must_ refresh */ 878 srp = screen.rend[row]; /* _must_ refresh */
867 screen.cur.col = 0;
868 screen.flags &= ~Screen_WrapNext;
869 } 879 }
870 880
871 if (screen.flags & Screen_Insert) 881 if (screen.flags & Screen_Insert)
872 scr_insdel_chars (1, INSERT); 882 scr_insdel_chars (1, INSERT);
873 883
… …
893 } 903 }
894 } 904 }
895 905
896 if (width != 0) 906 if (width != 0)
897 { 907 {
898#if !UNICODE_3 && ENABLE_COMBINING 908#if !UNICODE_3
899 // trim characters we can't store directly :( 909 // trim characters we can't store directly :(
900 if (c >= 0x10000) 910 if (c >= 0x10000)
911# if ENABLE_COMBINING
901 c = rxvt_composite.compose (c); // map to lower 16 bits 912 c = rxvt_composite.compose (c); // map to lower 16 bits
913# else
914 c = 0xfffd;
902#endif 915# endif
916#endif
903 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); 917 bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
904 rend_t rend = SET_FONT (rstyle, 918 rend_t rend = SET_FONT (rstyle,
905 c > 0x7f || bold || c < 0x20 919 c > 0x7f || bold || c < 0x20
906 ? TermWin.fontset->find_font (c, bold) 920 ? TermWin.fontset->find_font (c, bold)
907 : TermWin.ascii_map [c - 0x20]); 921 : TermWin.ascii_map [c - 0x20]);
908 922
… …
973 } 987 }
974 988
975 if (screen.tlen[row] != -1) /* XXX: think about this */ 989 if (screen.tlen[row] != -1) /* XXX: think about this */
976 MAX_IT (screen.tlen[row], screen.cur.col); 990 MAX_IT (screen.tlen[row], screen.cur.col);
977 991
978 /*
979 * If we wrote anywhere in the selected area, kill the selection
980 * XXX: should we kill the mark too? Possibly, but maybe that
981 * should be a similar check.
982 */
983 if (clearsel)
984 CLEAR_SELECTION ();
985
986#ifdef DEBUG_STRICT 992#ifdef DEBUG_STRICT
987 assert (screen.cur.row >= 0); 993 assert (screen.cur.row >= 0);
988#else /* drive with your eyes closed */ 994#else /* drive with your eyes closed */
989 MAX_IT (screen.cur.row, 0); 995 MAX_IT (screen.cur.row, 0);
990#endif 996#endif
… …
1007#ifdef TERMCAP_HAS_BW 1013#ifdef TERMCAP_HAS_BW
1008 screen.cur.col = TermWin.ncol - 1; 1014 screen.cur.col = TermWin.ncol - 1;
1009 screen.cur.row--; 1015 screen.cur.row--;
1010 return; 1016 return;
1011#endif 1017#endif
1012
1013 } 1018 }
1014 } 1019 }
1015 else if ((screen.flags & Screen_WrapNext) == 0) 1020 else if (!(screen.flags & Screen_WrapNext))
1016 scr_gotorc (0, -1, RELATIVE); 1021 scr_gotorc (0, -1, RELATIVE);
1017 1022
1018 screen.flags &= ~Screen_WrapNext; 1023 screen.flags &= ~Screen_WrapNext;
1019} 1024}
1020 1025
… …
1027void 1032void
1028rxvt_term::scr_tab (int count) 1033rxvt_term::scr_tab (int count)
1029{ 1034{
1030 int i, x; 1035 int i, x;
1031 1036
1032 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1033 want_refresh = 1; 1037 want_refresh = 1;
1034 i = x = screen.cur.col; 1038 i = x = screen.cur.col;
1035 1039
1036 if (count == 0) 1040 if (count == 0)
1037 return; 1041 return;
… …
1071 * Process DEC Back Index 1075 * Process DEC Back Index
1072 * XTERM_SEQ: ESC 6 1076 * XTERM_SEQ: ESC 6
1073 * Move cursor left in row. If we're at the left boundary, shift everything 1077 * Move cursor left in row. If we're at the left boundary, shift everything
1074 * in that row right. Clear left column. 1078 * in that row right. Clear left column.
1075 */ 1079 */
1076#ifndef NO_FRILLS 1080#if ENABLE_FRILLS
1077void 1081void
1078rxvt_term::scr_backindex () 1082rxvt_term::scr_backindex ()
1079{ 1083{
1080 if (screen.cur.col > 0) 1084 if (screen.cur.col > 0)
1081 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1082 else 1086 else
1083 { 1087 {
1084 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1088 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1085 return; /* um, yeah? */ 1089 return; /* um, yeah? */
1090
1086 scr_insdel_chars (1, INSERT); 1091 scr_insdel_chars (1, INSERT);
1087 } 1092 }
1088} 1093}
1089#endif 1094#endif
1090/* ------------------------------------------------------------------------- */ 1095/* ------------------------------------------------------------------------- */
… …
1092 * Process DEC Forward Index 1097 * Process DEC Forward Index
1093 * XTERM_SEQ: ESC 9 1098 * XTERM_SEQ: ESC 9
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1099 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1100 * in that row left. Clear right column.
1096 */ 1101 */
1097#ifndef NO_FRILLS 1102#if ENABLE_FRILLS
1098void 1103void
1099rxvt_term::scr_forwardindex () 1104rxvt_term::scr_forwardindex ()
1100{ 1105{
1101 int row; 1106 int row;
1102 1107
1103 if (screen.cur.col < TermWin.ncol - 1) 1108 if (screen.cur.col < TermWin.ncol - 1)
1104 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1109 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1105 else 1110 else
1106 { 1111 {
1107 row = screen.cur.row + TermWin.saveLines; 1112 row = screen.cur.row + TermWin.saveLines;
1113
1108 if (screen.tlen[row] == 0) 1114 if (screen.tlen[row] == 0)
1109 return; /* um, yeah? */ 1115 return; /* um, yeah? */
1110 else if (screen.tlen[row] == -1) 1116 else if (screen.tlen[row] == -1)
1111 screen.tlen[row] = TermWin.ncol; 1117 screen.tlen[row] = TermWin.ncol;
1118
1112 scr_gotorc (0, 0, R_RELATIVE); 1119 scr_gotorc (0, 0, R_RELATIVE);
1113 scr_insdel_chars (1, DELETE); 1120 scr_insdel_chars (1, DELETE);
1114 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1121 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1115 } 1122 }
1116} 1123}
… …
1124rxvt_term::scr_gotorc (int row, int col, int relative) 1131rxvt_term::scr_gotorc (int row, int col, int relative)
1125{ 1132{
1126 want_refresh = 1; 1133 want_refresh = 1;
1127 ZERO_SCROLLBACK (); 1134 ZERO_SCROLLBACK ();
1128 1135
1129 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1130
1131 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1136 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1132 MAX_IT (screen.cur.col, 0); 1137 MAX_IT (screen.cur.col, 0);
1133 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1138 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1134 1139
1135 screen.flags &= ~Screen_WrapNext; 1140 screen.flags &= ~Screen_WrapNext;
1141
1136 if (relative & R_RELATIVE) 1142 if (relative & R_RELATIVE)
1137 { 1143 {
1138 if (row > 0) 1144 if (row > 0)
1139 { 1145 {
1140 if (screen.cur.row <= screen.bscroll 1146 if (screen.cur.row <= screen.bscroll
… …
1160 MIN_IT (screen.cur.row, screen.bscroll); 1166 MIN_IT (screen.cur.row, screen.bscroll);
1161 } 1167 }
1162 else 1168 else
1163 screen.cur.row = row; 1169 screen.cur.row = row;
1164 } 1170 }
1171
1165 MAX_IT (screen.cur.row, 0); 1172 MAX_IT (screen.cur.row, 0);
1166 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1173 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1167
1168 while (screen.cur.col > 0
1169 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1170 screen.cur.col--;
1171} 1174}
1172 1175
1173/* ------------------------------------------------------------------------- */ 1176/* ------------------------------------------------------------------------- */
1174/* 1177/*
1175 * direction should be UP or DN 1178 * direction should be UP or DN
1176 */ 1179 */
1177void 1180void
1178rxvt_term::scr_index (enum page_dirn direction) 1181rxvt_term::scr_index (enum page_dirn direction)
1179{ 1182{
1180 int dirn; 1183 int dirn;
1181 1184
1182 want_refresh = 1; 1185 want_refresh = 1;
1186 ZERO_SCROLLBACK ();
1187
1183 dirn = ((direction == UP) ? 1 : -1); 1188 dirn = ((direction == UP) ? 1 : -1);
1184 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1185
1186 ZERO_SCROLLBACK ();
1187 1189
1188 screen.flags &= ~Screen_WrapNext; 1190 screen.flags &= ~Screen_WrapNext;
1191
1189 if ((screen.cur.row == screen.bscroll && direction == UP) 1192 if ((screen.cur.row == screen.bscroll && direction == UP)
1190 || (screen.cur.row == screen.tscroll && direction == DN)) 1193 || (screen.cur.row == screen.tscroll && direction == DN))
1191 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1194 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1192 else 1195 else
1193 screen.cur.row += dirn; 1196 screen.cur.row += dirn;
1197
1194 MAX_IT (screen.cur.row, 0); 1198 MAX_IT (screen.cur.row, 0);
1195 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1199 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1196 selection_check (0); 1200 selection_check (0);
1197} 1201}
1198 1202
… …
1207rxvt_term::scr_erase_line (int mode) 1211rxvt_term::scr_erase_line (int mode)
1208{ 1212{
1209 unsigned int row, col, num; 1213 unsigned int row, col, num;
1210 1214
1211 want_refresh = 1; 1215 want_refresh = 1;
1212 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1213 ZERO_SCROLLBACK (); 1216 ZERO_SCROLLBACK ();
1214 1217
1215 selection_check (1); 1218 selection_check (1);
1216
1217 screen.flags &= ~Screen_WrapNext;
1218 1219
1219 row = TermWin.saveLines + screen.cur.row; 1220 row = TermWin.saveLines + screen.cur.row;
1220 switch (mode) 1221 switch (mode)
1221 { 1222 {
1222 case 0: /* erase to end of line */ 1223 case 0: /* erase to end of line */
… …
1266 int32_t row, row_offset; 1267 int32_t row, row_offset;
1267 rend_t ren; 1268 rend_t ren;
1268 XGCValues gcvalue; 1269 XGCValues gcvalue;
1269 1270
1270 want_refresh = 1; 1271 want_refresh = 1;
1271 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1272 ZERO_SCROLLBACK (); 1272 ZERO_SCROLLBACK ();
1273
1273 row_offset = (int32_t)TermWin.saveLines; 1274 row_offset = (int32_t)TermWin.saveLines;
1274 1275
1275 switch (mode) 1276 switch (mode)
1276 { 1277 {
1277 case 0: /* erase to end of screen */ 1278 case 0: /* erase to end of screen */
… …
1314 CLEAR_ROWS (row, num); 1315 CLEAR_ROWS (row, num);
1315 } 1316 }
1316 else 1317 else
1317 { 1318 {
1318 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1319 ren = (rstyle & (RS_fgMask | RS_bgMask));
1319 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1320 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1321 ERASE_ROWS (row, num); 1322 ERASE_ROWS (row, num);
1322 gcvalue.foreground = PixColors[Color_fg]; 1323 gcvalue.foreground = pix_colors[Color_fg];
1323 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1324 } 1325 }
1325 1326
1326 for (; num--; row++) 1327 for (; num--; row++)
1327 { 1328 {
… …
1343{ 1344{
1344 int i, j, k; 1345 int i, j, k;
1345 rend_t *r1, fs; 1346 rend_t *r1, fs;
1346 1347
1347 want_refresh = 1; 1348 want_refresh = 1;
1349 ZERO_SCROLLBACK ();
1350
1348 num_scr_allow = 0; 1351 num_scr_allow = 0;
1349 ZERO_SCROLLBACK ();
1350 selection_check (3); 1352 selection_check (3);
1351 1353
1352 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1354 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1353 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1355 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1354 { 1356 {
… …
1381 if (insdel == DELETE) 1383 if (insdel == DELETE)
1382 return; 1384 return;
1383 else if (insdel == INSERT) 1385 else if (insdel == INSERT)
1384 count = end; 1386 count = end;
1385 } 1387 }
1386 screen.flags &= ~Screen_WrapNext; 1388
1389 scr_do_wrap ();
1387 1390
1388 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1391 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1389} 1392}
1390 1393
1391/* ------------------------------------------------------------------------- */ 1394/* ------------------------------------------------------------------------- */
… …
1405 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1406 1409
1407 if (count <= 0) 1410 if (count <= 0)
1408 return; 1411 return;
1409 1412
1413 scr_do_wrap ();
1414
1410 selection_check (1); 1415 selection_check (1);
1411 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1416 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1412 1417
1413 row = screen.cur.row + TermWin.saveLines; 1418 row = screen.cur.row + TermWin.saveLines;
1414 screen.flags &= ~Screen_WrapNext;
1415 1419
1416 stp = screen.text[row]; 1420 stp = screen.text[row];
1417 srp = screen.rend[row]; 1421 srp = screen.rend[row];
1418 slp = & (screen.tlen[row]); 1422 slp = &screen.tlen[row];
1419 1423
1420 switch (insdel) 1424 switch (insdel)
1421 { 1425 {
1422 case INSERT: 1426 case INSERT:
1423 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1427 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
… …
1544rxvt_term::scr_autowrap (int mode) 1548rxvt_term::scr_autowrap (int mode)
1545{ 1549{
1546 if (mode) 1550 if (mode)
1547 screen.flags |= Screen_Autowrap; 1551 screen.flags |= Screen_Autowrap;
1548 else 1552 else
1549 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1553 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1550} 1554}
1551 1555
1552/* ------------------------------------------------------------------------- */ 1556/* ------------------------------------------------------------------------- */
1553/* 1557/*
1554 * Set/unset margin origin mode 1558 * Set/unset margin origin mode
… …
1593 */ 1597 */
1594void 1598void
1595rxvt_term::scr_set_tab (int mode) 1599rxvt_term::scr_set_tab (int mode)
1596{ 1600{
1597 if (mode < 0) 1601 if (mode < 0)
1598 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1602 memset (tabs, 0, TermWin.ncol * sizeof (char));
1599 else if (screen.cur.col < TermWin.ncol) 1603 else if (screen.cur.col < TermWin.ncol)
1600 tabs[screen.cur.col] = (mode ? 1 : 0); 1604 tabs[screen.cur.col] = (mode ? 1 : 0);
1601} 1605}
1602 1606
1603/* ------------------------------------------------------------------------- */ 1607/* ------------------------------------------------------------------------- */
… …
1607 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1611 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1608 */ 1612 */
1609void 1613void
1610rxvt_term::scr_rvideo_mode (int mode) 1614rxvt_term::scr_rvideo_mode (int mode)
1611{ 1615{
1612 XGCValues gcvalue; 1616 XGCValues gcvalue;
1613 1617
1614 if (rvideo != mode) 1618 if (rvideo != mode)
1615 { 1619 {
1616 rvideo = mode; 1620 rvideo = mode;
1617 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1621 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1618#if defined(XPM_BACKGROUND) 1622#if defined(XPM_BACKGROUND)
1619 if (bgPixmap.pixmap == None) 1623 if (bgPixmap.pixmap == None)
1620#endif 1624#endif
1621#if defined(TRANSPARENT) 1625#if defined(TRANSPARENT)
1622 if (! (Options & Opt_transparent) || am_transparent == 0) 1626 if (! (options & Opt_transparent) || am_transparent == 0)
1623#endif 1627#endif
1624 XSetWindowBackground (display->display, TermWin.vt, 1628 XSetWindowBackground (display->display, TermWin.vt,
1625 PixColors[Color_bg]); 1629 pix_colors[Color_bg]);
1626 1630
1627 gcvalue.foreground = PixColors[Color_fg]; 1631 gcvalue.foreground = pix_colors[Color_fg];
1628 gcvalue.background = PixColors[Color_bg]; 1632 gcvalue.background = pix_colors[Color_bg];
1629 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1633 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1630 &gcvalue); 1634 &gcvalue);
1631 scr_clear (); 1635 scr_clear ();
1632 scr_touch (true); 1636 scr_touch (true);
1633 } 1637 }
… …
1778 { 1782 {
1779 MIN_IT (rc[i].col, TermWin.ncol - 1); 1783 MIN_IT (rc[i].col, TermWin.ncol - 1);
1780 MIN_IT (rc[i].row, TermWin.nrow - 1); 1784 MIN_IT (rc[i].row, TermWin.nrow - 1);
1781 } 1785 }
1782 1786
1783 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1784
1785 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1787 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1786 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1788 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1787 1789
1788 if (refresh) 1790 if (refresh)
1789 scr_refresh (SLOW_REFRESH); 1791 scr_refresh (SLOW_REFRESH);
… …
1809{ 1811{
1810 long p = 0; 1812 long p = 0;
1811 uint16_t oldviewstart; 1813 uint16_t oldviewstart;
1812 1814
1813 oldviewstart = TermWin.view_start; 1815 oldviewstart = TermWin.view_start;
1816
1814 if (y < len) 1817 if (y < len)
1815 { 1818 {
1816 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1819 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1817 p -= (long) (TermWin.nrow - 1); 1820 p -= (long) (TermWin.nrow - 1);
1818 p = max (p, 0); 1821 p = max (p, 0);
1819 } 1822 }
1823
1820 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1824 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1821 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1822 1825
1823 return scr_changeview (oldviewstart); 1826 return scr_changeview (oldviewstart);
1824} 1827}
1825 1828
1826/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
… …
1832rxvt_term::scr_page (enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines)
1833{ 1836{
1834 int n; 1837 int n;
1835 uint16_t oldviewstart; 1838 uint16_t oldviewstart;
1836 1839
1837 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1838#ifdef DEBUG_STRICT 1840#ifdef DEBUG_STRICT
1839 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1841 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1840#endif 1842#endif
1841 oldviewstart = TermWin.view_start; 1843 oldviewstart = TermWin.view_start;
1842 if (direction == UP) 1844 if (direction == UP)
… …
1869rxvt_term::scr_bell () 1871rxvt_term::scr_bell ()
1870{ 1872{
1871#ifndef NO_BELL 1873#ifndef NO_BELL
1872# ifndef NO_MAPALERT 1874# ifndef NO_MAPALERT
1873# ifdef MAPALERT_OPTION 1875# ifdef MAPALERT_OPTION
1874 if (Options & Opt_mapAlert) 1876 if (options & Opt_mapAlert)
1875# endif 1877# endif
1876 XMapWindow (display->display, TermWin.parent[0]); 1878 XMapWindow (display->display, TermWin.parent[0]);
1877# endif 1879# endif
1878 if (Options & Opt_visualBell) 1880 if (options & Opt_visualBell)
1879 { 1881 {
1880 scr_rvideo_mode (!rvideo); /* refresh also done */ 1882 scr_rvideo_mode (!rvideo); /* refresh also done */
1881 scr_rvideo_mode (!rvideo); /* refresh also done */ 1883 scr_rvideo_mode (!rvideo); /* refresh also done */
1882 } 1884 }
1883 else 1885 else
… …
1889/* ARGSUSED */ 1891/* ARGSUSED */
1890void 1892void
1891rxvt_term::scr_printscreen (int fullhist) 1893rxvt_term::scr_printscreen (int fullhist)
1892{ 1894{
1893#ifdef PRINTPIPE 1895#ifdef PRINTPIPE
1894 int i, r1, nrows, row_offset; 1896 int i, r1, nrows, row_offset;
1895 text_t *t; 1897 FILE *fd;
1896 FILE *fd;
1897 1898
1898 if ((fd = popen_printer ()) == NULL) 1899 if ((fd = popen_printer ()) == NULL)
1899 return; 1900 return;
1901
1900 nrows = TermWin.nrow; 1902 nrows = TermWin.nrow;
1901 row_offset = TermWin.saveLines; 1903 row_offset = TermWin.saveLines;
1904
1902 if (!fullhist) 1905 if (!fullhist)
1903 row_offset -= TermWin.view_start; 1906 row_offset -= TermWin.view_start;
1904 else 1907 else
1905 { 1908 {
1906 nrows += TermWin.nscrolled; 1909 nrows += TermWin.nscrolled;
1907 row_offset -= TermWin.nscrolled; 1910 row_offset -= TermWin.nscrolled;
1908 } 1911 }
1909 1912
1913 wctomb (0, 0);
1914
1910 for (r1 = 0; r1 < nrows; r1++) 1915 for (r1 = 0; r1 < nrows; r1++)
1911 { 1916 {
1912 t = screen.text[r1 + row_offset]; 1917 text_t *tp = screen.text[r1 + row_offset];
1913 for (i = TermWin.ncol - 1; i >= 0; i--) 1918 int len = screen.tlen[r1 + row_offset];
1914 if (!isspace (t[i])) 1919
1915 break; 1920 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1916 fprintf (fd, "%.*s\n", (i + 1), t); 1921 {
1922 char mb[MB_LEN_MAX];
1923 text_t t = *tp++;
1924 if (t == NOCHAR)
1925 continue;
1926
1927 len = wctomb (mb, t);
1928
1929 if (len <= 0)
1930 {
1931 mb[0] = ' ';
1932 len = 1;
1933 }
1934
1935 fwrite (mb, 1, len, fd);
1936 }
1937
1938 fputc ('\n', fd);
1917 } 1939 }
1940
1918 pclose_printer (fd); 1941 pclose_printer (fd);
1919#endif 1942#endif
1920} 1943}
1921 1944
1922/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
… …
1946 int i, /* tmp */ 1969 int i, /* tmp */
1947 row_offset; /* basic offset in screen structure */ 1970 row_offset; /* basic offset in screen structure */
1948#ifndef NO_CURSORCOLOR 1971#ifndef NO_CURSORCOLOR
1949 rend_t cc1; /* store colours at cursor position (s) */ 1972 rend_t cc1; /* store colours at cursor position (s) */
1950#endif 1973#endif
1951 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1974 rend_t *crp; // cursor rendition pointer
1952 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1953 1975
1954 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1976 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1955 return; 1977 return;
1956 1978
1957 /* 1979 /*
1958 * A: set up vars 1980 * A: set up vars
1959 */ 1981 */
1960 must_clear = 0; 1982 must_clear = 0;
1961
1962 refresh_count = 0; 1983 refresh_count = 0;
1963 1984
1964 row_offset = TermWin.saveLines - TermWin.view_start; 1985 row_offset = TermWin.saveLines - TermWin.view_start;
1965 1986
1966#ifdef XPM_BACKGROUND 1987#ifdef XPM_BACKGROUND
1967 must_clear |= (bgPixmap.pixmap != None); 1988 must_clear |= (bgPixmap.pixmap != None);
1968#endif 1989#endif
1969#ifdef TRANSPARENT 1990#ifdef TRANSPARENT
1970 must_clear |= ((Options & Opt_transparent) && am_transparent); 1991 must_clear |= ((options & Opt_transparent) && am_transparent);
1971#endif 1992#endif
1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1993 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1973 1994
1974 /* 1995 /*
1975 * B: reverse any characters which are selected 1996 * B: reverse any characters which are selected
1976 */ 1997 */
1977 scr_reverse_selection (); 1998 scr_reverse_selection ();
1999#if ENABLE_OVERLAY
2000 scr_swap_overlay ();
2001#endif
1978 2002
1979 /* 2003 /*
1980 * C: set the cursor character (s) 2004 * C: set the cursor character (s)
1981 */ 2005 */
1982 { 2006 {
… …
1990 showcursor = 0; 2014 showcursor = 0;
1991#endif 2015#endif
1992 2016
1993 if (showcursor) 2017 if (showcursor)
1994 { 2018 {
2019 int col = screen.cur.col;
2020
2021 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2022 col--;
2023
1995 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2024 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1996 2025
1997 if (showcursor && TermWin.focus) 2026 if (showcursor && TermWin.focus)
1998 { 2027 {
1999 *srp ^= RS_RVid; 2028 *crp ^= RS_RVid;
2000#ifndef NO_CURSORCOLOR 2029#ifndef NO_CURSORCOLOR
2001 cc1 = *srp & (RS_fgMask | RS_bgMask); 2030 cc1 = *crp & (RS_fgMask | RS_bgMask);
2002 if (ISSET_PIXCOLOR (Color_cursor)) 2031 if (ISSET_PIXCOLOR (Color_cursor))
2003 ccol1 = Color_cursor; 2032 ccol1 = Color_cursor;
2004 else 2033 else
2005#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2034#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2006 ccol1 = GET_FGCOLOR (rstyle); 2035 ccol1 = GET_FGCOLOR (rstyle);
… …
2013#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2014 ccol2 = GET_BGCOLOR (rstyle); 2043 ccol2 = GET_BGCOLOR (rstyle);
2015#else 2044#else
2016 ccol2 = Color_bg; 2045 ccol2 = Color_bg;
2017#endif 2046#endif
2018 *srp = SET_FGCOLOR (*srp, ccol1); 2047 *crp = SET_FGCOLOR (*crp, ccol1);
2019 *srp = SET_BGCOLOR (*srp, ccol2); 2048 *crp = SET_BGCOLOR (*crp, ccol2);
2020#endif 2049#endif
2021 } 2050 }
2022 } 2051 }
2023 2052
2024 /* make sure no outline cursor is left around */ 2053 /* make sure no outline cursor is left around */
… …
2051 oldcursor.col = screen.cur.col; 2080 oldcursor.col = screen.cur.col;
2052 } 2081 }
2053 } 2082 }
2054 } 2083 }
2055 2084
2085 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2086 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2056#ifndef NO_SLOW_LINK_SUPPORT 2087#ifndef NO_SLOW_LINK_SUPPORT
2057 /* 2088 /*
2058 * D: CopyArea pass - very useful for slower links 2089 * D: CopyArea pass - very useful for slower links
2059 * This has been deliberately kept simple. 2090 * This has been deliberately kept simple.
2060 */ 2091 */
… …
2063 && refresh_type == FAST_REFRESH && num_scr_allow && i 2094 && refresh_type == FAST_REFRESH && num_scr_allow && i
2064 && abs (i) < TermWin.nrow && !must_clear) 2095 && abs (i) < TermWin.nrow && !must_clear)
2065 { 2096 {
2066 int16_t nits; 2097 int16_t nits;
2067 int j; 2098 int j;
2068 rend_t *drp2;
2069 text_t *dtp2;
2070 int len, wlen; 2099 int len, wlen;
2071 2100
2072 j = TermWin.nrow; 2101 j = TermWin.nrow;
2073 wlen = len = -1; 2102 wlen = len = -1;
2074 row = i > 0 ? 0 : j - 1; 2103 row = i > 0 ? 0 : j - 1;
2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2104 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2076 { 2105 {
2077 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2106 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2078 { 2107 {
2079 stp = screen.text[row + row_offset]; 2108 text_t *stp = screen.text[row + row_offset];
2080 srp = screen.rend[row + row_offset]; 2109 rend_t *srp = screen.rend[row + row_offset];
2081 dtp = drawn_text[row]; 2110 text_t *dtp = drawn_text[row];
2082 dtp2 = drawn_text[row + i]; 2111 text_t *dtp2 = drawn_text[row + i];
2083 drp = drawn_rend[row]; 2112 rend_t *drp = drawn_rend[row];
2084 drp2 = drawn_rend[row + i]; 2113 rend_t *drp2 = drawn_rend[row + i];
2085 2114
2086 for (nits = 0, col = TermWin.ncol; col--; ) 2115 for (nits = 0, col = TermWin.ncol; col--; )
2087 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2116 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2088 nits--; 2117 nits--;
2089 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2118 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2109 { 2138 {
2110 /* also comes here at end if needed because of >= above */ 2139 /* also comes here at end if needed because of >= above */
2111 if (wlen < len) 2140 if (wlen < len)
2112 SWAP_IT (wlen, len, int); 2141 SWAP_IT (wlen, len, int);
2113 2142
2114 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2115 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2143 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2116 TermWin.gc, 0, Row2Pixel (len + i), 2144 TermWin.gc, 0, Row2Pixel (len + i),
2117 (unsigned int)TermWin_TotalWidth (), 2145 (unsigned int)TermWin_TotalWidth (),
2118 (unsigned int)Height2Pixel (wlen - len + 1), 2146 (unsigned int)Height2Pixel (wlen - len + 1),
2119 0, Row2Pixel (len)); 2147 0, Row2Pixel (len));
… …
2126 /* 2154 /*
2127 * E: main pass across every character 2155 * E: main pass across every character
2128 */ 2156 */
2129 for (row = 0; row < TermWin.nrow; row++) 2157 for (row = 0; row < TermWin.nrow; row++)
2130 { 2158 {
2131 stp = screen.text[row + row_offset]; 2159 text_t *stp = screen.text[row + row_offset];
2132 srp = screen.rend[row + row_offset]; 2160 rend_t *srp = screen.rend[row + row_offset];
2133 dtp = drawn_text[row]; 2161 text_t *dtp = drawn_text[row];
2134 drp = drawn_rend[row]; 2162 rend_t *drp = drawn_rend[row];
2135 2163
2136 /* 2164 /*
2137 * E2: OK, now the real pass 2165 * E2: OK, now the real pass
2138 */ 2166 */
2139 int ypixel = (int)Row2Pixel (row); 2167 int ypixel = (int)Row2Pixel (row);
… …
2169 if (stp[col] == NOCHAR) 2197 if (stp[col] == NOCHAR)
2170 { 2198 {
2171 dtp[col] = stp[col]; 2199 dtp[col] = stp[col];
2172 drp[col] = rend; 2200 drp[col] = rend;
2173 count++; 2201 count++;
2174
2175 if (i) // only possible skip if char unchanged
2176 i++; 2202 i++;
2177 2203
2178 continue; 2204 continue;
2179 } 2205 }
2180 2206
2181 if (rend != srp[col]) 2207 if (rend != srp[col])
… …
2184 count++; 2210 count++;
2185 2211
2186 if (stp[col] != dtp[col] 2212 if (stp[col] != dtp[col]
2187 || srp[col] != drp[col]) 2213 || srp[col] != drp[col])
2188 { 2214 {
2189 if (must_clear && (i++ > (count / 2))) 2215 if (must_clear && (i++ > count / 2))
2190 break; 2216 break;
2191 2217
2192 dtp[col] = stp[col]; 2218 dtp[col] = stp[col];
2193 drp[col] = rend; 2219 drp[col] = rend;
2194 i = 0; 2220 i = 0;
2195 } 2221 }
2196 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2222 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2197 break; 2223 break;
2198 } 2224 }
2199 2225
2200 col--; /* went one too far. move back */ 2226 col--; /* went one too far. move back */
2201 count -= i; /* dump any matching trailing chars */ 2227 count -= i; /* dump any matching trailing chars */
2228
2229 // sometimes we optimize away the trailing NOCHAR's, add them back
2230 while (i && text[count] == NOCHAR)
2231 count++, i--;
2202 2232
2203 /* 2233 /*
2204 * Determine the attributes for the string 2234 * Determine the attributes for the string
2205 */ 2235 */
2206 int fid = GET_FONT (rend); 2236 int fid = GET_FONT (rend);
… …
2210 rend = GET_ATTR (rend); 2240 rend = GET_ATTR (rend);
2211 2241
2212 rvid = !!(rend & RS_RVid); 2242 rvid = !!(rend & RS_RVid);
2213 2243
2214#ifndef NO_BOLD_UNDERLINE_REVERSE 2244#ifndef NO_BOLD_UNDERLINE_REVERSE
2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2245 if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold))
2216 { 2246 {
2217 if (ISSET_PIXCOLOR (Color_BD)) 2247 if (ISSET_PIXCOLOR (Color_BD))
2218 fore = Color_BD; 2248 fore = Color_BD;
2219 else 2249 else
2220 rvid = !rvid; 2250 rvid = !rvid;
… …
2292 */ 2322 */
2293 if (showcursor) 2323 if (showcursor)
2294 { 2324 {
2295 if (TermWin.focus) 2325 if (TermWin.focus)
2296 { 2326 {
2297 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2298 [screen.cur.col]);
2299 *srp ^= RS_RVid; 2327 *crp ^= RS_RVid;
2300#ifndef NO_CURSORCOLOR 2328#ifndef NO_CURSORCOLOR
2301 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2329 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2302#endif 2330#endif
2303 } 2331 }
2304 else if (oldcursor.row >= 0) 2332 else if (oldcursor.row >= 0)
2305 { 2333 {
2306#ifndef NO_CURSORCOLOR 2334#ifndef NO_CURSORCOLOR
2307 if (ISSET_PIXCOLOR (Color_cursor)) 2335 if (ISSET_PIXCOLOR (Color_cursor))
2308 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2336 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2309#endif 2337#endif
2310 int cursorwidth = 1; 2338 int cursorwidth = 1;
2311 while (oldcursor.col + cursorwidth < TermWin.ncol 2339 while (oldcursor.col + cursorwidth < TermWin.ncol
2312 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2340 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2313 cursorwidth++; 2341 cursorwidth++;
… …
2321 } 2349 }
2322 2350
2323 /* 2351 /*
2324 * H: cleanup selection 2352 * H: cleanup selection
2325 */ 2353 */
2354#if ENABLE_OVERLAY
2355 scr_swap_overlay ();
2356#endif
2326 scr_reverse_selection (); 2357 scr_reverse_selection ();
2327 2358
2328 if (refresh_type & SMOOTH_REFRESH) 2359 if (refresh_type & SMOOTH_REFRESH)
2329 XFlush (display->display); 2360 XFlush (display->display);
2330 2361
… …
2365 2396
2366 num_scr_allow = 0; 2397 num_scr_allow = 0;
2367 want_refresh = 1; 2398 want_refresh = 1;
2368 2399
2369#ifdef TRANSPARENT 2400#ifdef TRANSPARENT
2370 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2401 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2371 { 2402 {
2372 int i; 2403 int i;
2373 2404
2374 if (! (Options & Opt_transparent_all)) 2405 if (! (options & Opt_transparent_all))
2375 i = 0; 2406 i = 0;
2376 else 2407 else
2377 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2408 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2378 2409
2379 while (i--) 2410 while (i--)
… …
2456 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2487 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2457 */ 2488 */
2458void 2489void
2459rxvt_term::selection_check (int check_more) 2490rxvt_term::selection_check (int check_more)
2460{ 2491{
2461 row_col_t pos; 2492 row_col_t pos;
2462 2493
2463 if (!selection.op) 2494 if (!selection.op)
2464 return; 2495 return;
2465 2496
2466 pos.row = pos.col = 0; 2497 pos.row = pos.col = 0;
… …
2493rxvt_term::paste (const unsigned char *data, unsigned int len) 2524rxvt_term::paste (const unsigned char *data, unsigned int len)
2494{ 2525{
2495 unsigned int i, j, n; 2526 unsigned int i, j, n;
2496 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2527 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2497 2528
2498#if 0
2499 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2500 ZERO_SCROLLBACK (r);
2501#endif
2502
2503 /* convert normal newline chars into common keyboard Return key sequence */ 2529 /* convert normal newline chars into common keyboard Return key sequence */
2504 for (i = 0; i < len; i += PROP_SIZE) 2530 for (i = 0; i < len; i += PROP_SIZE)
2505 { 2531 {
2506 n = min (len - i, PROP_SIZE); 2532 n = min (len - i, PROP_SIZE);
2507 MEMCPY (ds, data + i, n); 2533 memcpy (ds, data + i, n);
2508 2534
2509 for (j = 0; j < n; j++) 2535 for (j = 0; j < n; j++)
2510 if (ds[j] == C0_LF) 2536 if (ds[j] == C0_LF)
2511 ds[j] = C0_CR; 2537 ds[j] = C0_CR;
2512 2538
… …
2525rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2551rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2526{ 2552{
2527 long nread = 0; 2553 long nread = 0;
2528 unsigned long bytes_after; 2554 unsigned long bytes_after;
2529 XTextProperty ct; 2555 XTextProperty ct;
2530
2531 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2532 2556
2533 if (prop == None) /* check for failed XConvertSelection */ 2557 if (prop == None) /* check for failed XConvertSelection */
2534 { 2558 {
2535 if ((selection_type & Sel_CompoundText)) 2559 if ((selection_type & Sel_CompoundText))
2536 { 2560 {
… …
2563 &ct.nitems, &bytes_after, 2587 &ct.nitems, &bytes_after,
2564 &ct.value) != Success) 2588 &ct.value) != Success)
2565 break; 2589 break;
2566 2590
2567 if (ct.encoding == 0) 2591 if (ct.encoding == 0)
2568 {
2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2570 break; 2592 break;
2571 } 2593
2572 else if (ct.encoding == xa[XA_INCR]) 2594 if (ct.encoding == xa[XA_INCR])
2573 { 2595 {
2574 // INCR selection, start handshake 2596 // INCR selection, start handshake
2575 XDeleteProperty (display->display, win, prop); 2597 XDeleteProperty (display->display, win, prop);
2576 selection_wait = Sel_incr; 2598 selection_wait = Sel_incr;
2577 incr_ev.start (NOW + 10); 2599 incr_ev.start (NOW + 10);
2578 break; 2600 break;
2579 } 2601 }
2580 2602
2581 if (ct.value == NULL) 2603 if (ct.value == NULL)
2582 {
2583 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2584 continue; 2604 continue;
2585 }
2586 2605
2587 if (ct.nitems == 0) 2606 if (ct.nitems == 0)
2588 { 2607 {
2589 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2590
2591 if (selection_wait == Sel_normal && nread == 0 2608 if (selection_wait == Sel_normal && nread == 0
2592 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2609 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2593 { 2610 {
2594 /* 2611 /*
2595 * pass through again trying CUT_BUFFER0 if we've come from 2612 * pass through again trying CUT_BUFFER0 if we've come from
2596 * XConvertSelection () but nothing was presented 2613 * XConvertSelection () but nothing was presented
2597 */ 2614 */
2598 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2599 selection_paste (display->root, XA_CUT_BUFFER0, False); 2615 selection_paste (display->root, XA_CUT_BUFFER0, False);
2600 } 2616 }
2601 2617
2602 nread = -1; /* discount any previous stuff */ 2618 nread = -1; /* discount any previous stuff */
2603 break; 2619 break;
… …
2608 char **cl; 2624 char **cl;
2609 int cr; 2625 int cr;
2610 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2626 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2611 { 2627 {
2612 for (int i = 0; i < cr; i++) 2628 for (int i = 0; i < cr; i++)
2613 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2629 paste ((unsigned char *)cl[i], strlen (cl[i]));
2614 2630
2615 XFreeStringList (cl); 2631 XFreeStringList (cl);
2616 } 2632 }
2617 else 2633 else
2618 paste (ct.value, ct.nitems); 2634 paste (ct.value, ct.nitems);
… …
2627 XFree (ct.value); 2643 XFree (ct.value);
2628 2644
2629 if (selection_wait == Sel_normal) 2645 if (selection_wait == Sel_normal)
2630 selection_wait = Sel_none; 2646 selection_wait = Sel_none;
2631 2647
2632 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2633 return (int)nread; 2648 return (int)nread;
2634} 2649}
2635 2650
2636void 2651void
2637rxvt_term::incr_cb (time_watcher &w) 2652rxvt_term::incr_cb (time_watcher &w)
… …
2670 * EXT: button 2 release 2685 * EXT: button 2 release
2671 */ 2686 */
2672void 2687void
2673rxvt_term::selection_request (Time tm, int x, int y) 2688rxvt_term::selection_request (Time tm, int x, int y)
2674{ 2689{
2675 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2676
2677 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2690 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2678 return; /* outside window */ 2691 return; /* outside window */
2679 2692
2680 if (selection.text) 2693 if (selection.text)
2681 { /* internal selection */ 2694 { /* internal selection */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2683 char *str = rxvt_wcstombs (selection.text, selection.len); 2695 char *str = rxvt_wcstombs (selection.text, selection.len);
2684 paste ((unsigned char *)str, strlen (str)); 2696 paste ((unsigned char *)str, strlen (str));
2685 free (str); 2697 free (str);
2686 return; 2698 return;
2687 } 2699 }
… …
2706 2718
2707 } 2719 }
2708 } 2720 }
2709 2721
2710 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2722 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2711 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2712 selection_paste (display->root, XA_CUT_BUFFER0, False); 2723 selection_paste (display->root, XA_CUT_BUFFER0, False);
2713} 2724}
2714 2725
2715int 2726int
2716rxvt_term::selection_request_other (Atom target, int selnum) 2727rxvt_term::selection_request_other (Atom target, int selnum)
… …
2729 else 2740 else
2730 sel = xa[XA_CLIPBOARD]; 2741 sel = xa[XA_CLIPBOARD];
2731 2742
2732 if (XGetSelectionOwner (display->display, sel) != None) 2743 if (XGetSelectionOwner (display->display, sel) != None)
2733 { 2744 {
2734 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2735 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2745 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2736 TermWin.vt, selection_request_time); 2746 TermWin.vt, selection_request_time);
2737 return 1; 2747 return 1;
2738 } 2748 }
2739 2749
… …
2746 * EXT: SelectionClear 2756 * EXT: SelectionClear
2747 */ 2757 */
2748void 2758void
2749rxvt_term::selection_clear () 2759rxvt_term::selection_clear ()
2750{ 2760{
2751 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2752
2753 want_refresh = 1; 2761 want_refresh = 1;
2754 free (selection.text); 2762 free (selection.text);
2755 selection.text = NULL; 2763 selection.text = NULL;
2756 selection.len = 0; 2764 selection.len = 0;
2757 CLEAR_SELECTION (); 2765 CLEAR_SELECTION ();
… …
2770{ 2778{
2771 int i, col, end_col, row, end_row; 2779 int i, col, end_col, row, end_row;
2772 wchar_t *new_selection_text; 2780 wchar_t *new_selection_text;
2773 text_t *t; 2781 text_t *t;
2774 2782
2775 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2776 switch (selection.op) 2783 switch (selection.op)
2777 { 2784 {
2778 case SELECTION_CONT: 2785 case SELECTION_CONT:
2779 break; 2786 break;
2780 case SELECTION_INIT: 2787 case SELECTION_INIT:
… …
2802 int ofs = 0; 2809 int ofs = 0;
2803 int extra = 0; 2810 int extra = 0;
2804 2811
2805 for (; row <= end_row; row++, col = 0) 2812 for (; row <= end_row; row++, col = 0)
2806 { 2813 {
2807 t = &(screen.text[row][col]); 2814 t = &screen.text[row][col];
2808 2815
2809 end_col = screen.tlen[row]; 2816 end_col = screen.tlen[row];
2810 2817
2811 if (end_col == -1) 2818 if (end_col == -1)
2812 end_col = TermWin.ncol; 2819 end_col = TermWin.ncol;
… …
2876 XFree (ct.value); 2883 XFree (ct.value);
2877 } 2884 }
2878#endif 2885#endif
2879 2886
2880 selection_time = tm; 2887 selection_time = tm;
2881 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2882} 2888}
2883 2889
2884/* ------------------------------------------------------------------------- */ 2890/* ------------------------------------------------------------------------- */
2885/* 2891/*
2886 * Mark or select text based upon number of clicks: 1, 2, or 3 2892 * Mark or select text based upon number of clicks: 1, 2, or 3
2887 * EXT: button 1 press 2893 * EXT: button 1 press
2888 */ 2894 */
2889void 2895void
2890rxvt_term::selection_click (int clicks, int x, int y) 2896rxvt_term::selection_click (int clicks, int x, int y)
2891{ 2897{
2892 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2893
2894 clicks = ((clicks - 1) % 3) + 1; 2898 clicks = ((clicks - 1) % 3) + 1;
2895 selection.clicks = clicks; /* save clicks so extend will work */ 2899 selection.clicks = clicks; /* save clicks so extend will work */
2896 2900
2897 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2901 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2898 2902
… …
2940 * We now only find out the boundary in one direction 2944 * We now only find out the boundary in one direction
2941 */ 2945 */
2942 2946
2943/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2947/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2944#define DELIMIT_TEXT(x) \ 2948#define DELIMIT_TEXT(x) \
2945 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 2949 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2946#define DELIMIT_REND(x) 1 2950#define DELIMIT_REND(x) 1
2947 2951
2948void 2952void
2949rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2953rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2950{ 2954{
… …
2968 2972
2969 row = mark->row + TermWin.saveLines; 2973 row = mark->row + TermWin.saveLines;
2970 col = mark->col; 2974 col = mark->col;
2971 MAX_IT (col, 0); 2975 MAX_IT (col, 0);
2972 /* find the edge of a word */ 2976 /* find the edge of a word */
2973 stp = & (screen.text[row][col]); 2977 stp = &screen.text[row][col];
2974 w1 = DELIMIT_TEXT (*stp); 2978 w1 = DELIMIT_TEXT (*stp);
2975 2979
2976 srp = (&screen.rend[row][col]); 2980 srp = &screen.rend[row][col];
2977 w2 = DELIMIT_REND (*srp); 2981 w2 = DELIMIT_REND (*srp);
2978 2982
2979 for (;;) 2983 for (;;)
2980 { 2984 {
2981 for (; col != bound.col; col += dirnadd) 2985 for (; col != bound.col; col += dirnadd)
… …
3015 } 3019 }
3016 break; 3020 break;
3017 } 3021 }
3018 3022
3019Old_Word_Selection_You_Die: 3023Old_Word_Selection_You_Die:
3020 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
3021
3022 if (dirn == DN) 3024 if (dirn == DN)
3023 col++; /* put us on one past the end */ 3025 col++; /* put us on one past the end */
3024 3026
3025 /* Poke the values back in */ 3027 /* Poke the values back in */
3026 ret->row = row - TermWin.saveLines; 3028 ret->row = row - TermWin.saveLines;
… …
3060 /* select nothing */ 3062 /* select nothing */
3061 selection.beg.row = selection.end.row = 0; 3063 selection.beg.row = selection.end.row = 0;
3062 selection.beg.col = selection.end.col = 0; 3064 selection.beg.col = selection.end.col = 0;
3063 selection.clicks = 4; 3065 selection.clicks = 4;
3064 want_refresh = 1; 3066 want_refresh = 1;
3065 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3066 return; 3067 return;
3067 } 3068 }
3068 3069
3069 if (selection.clicks == 4) 3070 if (selection.clicks == 4)
3070 selection.clicks = 1; 3071 selection.clicks = 1;
… …
3085 int end_col; 3086 int end_col;
3086 row_col_t pos; 3087 row_col_t pos;
3087 enum { 3088 enum {
3088 LEFT, RIGHT 3089 LEFT, RIGHT
3089 } closeto = RIGHT; 3090 } closeto = RIGHT;
3090
3091 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
3092 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3093 3091
3094 want_refresh = 1; 3092 want_refresh = 1;
3095 switch (selection.op) 3093 switch (selection.op)
3096 { 3094 {
3097 case SELECTION_INIT: 3095 case SELECTION_INIT:
… …
3119 && selection.beg.row == selection.end.row 3117 && selection.beg.row == selection.end.row
3120 && selection.beg.row != selection.mark.row) 3118 && selection.beg.row != selection.mark.row)
3121 { 3119 {
3122 selection.beg.col = selection.end.col = selection.mark.col; 3120 selection.beg.col = selection.end.col = selection.mark.col;
3123 selection.beg.row = selection.end.row = selection.mark.row; 3121 selection.beg.row = selection.end.row = selection.mark.row;
3124 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3125 } 3122 }
3126 3123
3127 pos.col = col; 3124 pos.col = col;
3128 pos.row = row; 3125 pos.row = row;
3129 3126
… …
3222 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3219 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3223 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3220 selection_delimit_word (DN, & (selection.end), & (selection.end));
3224 } 3221 }
3225 else if (selection.clicks == 3) 3222 else if (selection.clicks == 3)
3226 { 3223 {
3227#ifndef NO_FRILLS 3224#if ENABLE_FRILLS
3228 if ((Options & Opt_tripleclickwords)) 3225 if ((options & Opt_tripleclickwords))
3229 { 3226 {
3230 int end_row; 3227 int end_row;
3231 3228
3232 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3229 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3233 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3230 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3258 if (button3 && buttonpress) 3255 if (button3 && buttonpress)
3259 { /* mark may need to be changed */ 3256 { /* mark may need to be changed */
3260 if (closeto == LEFT) 3257 if (closeto == LEFT)
3261 { 3258 {
3262 selection.mark.row = selection.end.row; 3259 selection.mark.row = selection.end.row;
3263 selection.mark.col = selection.end.col 3260 selection.mark.col = selection.end.col - (selection.clicks == 2);
3264 - (selection.clicks == 2);
3265 } 3261 }
3266 else 3262 else
3267 { 3263 {
3268 selection.mark.row = selection.beg.row; 3264 selection.mark.row = selection.beg.row;
3269 selection.mark.col = selection.beg.col; 3265 selection.mark.col = selection.beg.col;
3270 } 3266 }
3271 } 3267 }
3272 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3273} 3268}
3274 3269
3275#ifndef NO_FRILLS 3270#if ENABLE_FRILLS
3276void 3271void
3277rxvt_term::selection_remove_trailing_spaces () 3272rxvt_term::selection_remove_trailing_spaces ()
3278{ 3273{
3279 int32_t end_col, end_row; 3274 int32_t end_col, end_row;
3280 text_t *stp; 3275 text_t *stp;
… …
3465} 3460}
3466 3461
3467/* ------------------------------------------------------------------------- */ 3462/* ------------------------------------------------------------------------- */
3468#ifdef USE_XIM 3463#ifdef USE_XIM
3469void 3464void
3470rxvt_term::im_set_position (XPoint *pos) 3465rxvt_term::im_set_position (XPoint &pos)
3471{ 3466{
3472 XWindowAttributes xwa; 3467 XWindowAttributes xwa;
3473 3468
3474 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3469 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3470
3475 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3471 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3476 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3472 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3477} 3473}
3478
3479#endif 3474#endif
3475
3476#if ENABLE_OVERLAY
3477void
3478rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3479{
3480 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3481 return;
3482
3483 want_refresh = 1;
3484
3485 scr_overlay_off ();
3486
3487 if (x < 0) x = TermWin.ncol - w;
3488 if (y < 0) y = TermWin.nrow - h;
3489
3490 // make space for border
3491 w += 2; MIN_IT (w, TermWin.ncol);
3492 h += 2; MIN_IT (h, TermWin.nrow);
3493
3494 x -= 1; MAX_IT (x, 0);
3495 y -= 1; MAX_IT (y, 0);
3496
3497 MIN_IT (x, TermWin.ncol - w);
3498 MIN_IT (y, TermWin.nrow - h);
3499
3500 ov_x = x; ov_y = y;
3501 ov_w = w; ov_h = h;
3502
3503 ov_text = new text_t *[h];
3504 ov_rend = new rend_t *[h];
3505
3506 for (y = 0; y < h; y++)
3507 {
3508 text_t *tp = ov_text[y] = new text_t[w];
3509 rend_t *rp = ov_rend[y] = new rend_t[w];
3510
3511 text_t t0, t1, t2;
3512 rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg);
3513
3514 if (y == 0)
3515 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3516 else if (y < h - 1)
3517 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3518 else
3519 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3520
3521 *tp++ = t0;
3522 *rp++ = r;
3523
3524 for (x = w - 2; x > 0; --x)
3525 {
3526 *tp++ = t1;
3527 *rp++ = r;
3528 }
3529
3530 *tp = t2;
3531 *rp = r;
3532 }
3533}
3534
3535void
3536rxvt_term::scr_overlay_off ()
3537{
3538 if (!ov_text)
3539 return;
3540
3541 want_refresh = 1;
3542
3543 for (int y = 0; y < ov_h; y++)
3544 {
3545 delete [] ov_text[y];
3546 delete [] ov_rend[y];
3547 }
3548
3549 delete [] ov_text; ov_text = 0;
3550 delete [] ov_rend; ov_rend = 0;
3551}
3552
3553void
3554rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3555{
3556 if (!ov_text || x >= ov_w - 2 || y >= ov_h)
3557 return;
3558
3559 x++, y++;
3560
3561 ov_text[y][x] = text;
3562 ov_rend[y][x] = rend;
3563}
3564
3565void
3566rxvt_term::scr_overlay_set (int x, int y, const char *s)
3567{
3568 while (*s)
3569 scr_overlay_set (x++, y, *s++);
3570}
3571
3572void
3573rxvt_term::scr_swap_overlay ()
3574{
3575 if (!ov_text)
3576 return;
3577
3578 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3579
3580 // swap screen mem with overlay
3581 for (int y = ov_h; y--; )
3582 {
3583 text_t *t1 = ov_text[y];
3584 rend_t *r1 = ov_rend[y];
3585
3586 text_t *t2 = screen.text[y + row_offset] + ov_x;
3587 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3588
3589 for (int x = ov_w; x--; )
3590 {
3591 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3592 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, TermWin.fontset->find_font (t, false));
3593 }
3594 }
3595}
3596
3597#endif
3480/* ------------------------------------------------------------------------- */ 3598/* ------------------------------------------------------------------------- */

Diff Legend

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