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.280 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.312 by root, Tue Nov 4 13:30:41 2008 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 86
87/* 87/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 89 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 91 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 95
112/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
115 99
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 258 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 259 }
276 260
277 line_t *old_buf = row_buf; 261 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 263
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 265 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 266 int q = total_rows; // rewrapped row
283 267
284 if (top_row) 268 if (top_row)
… …
328 int qcol = 0; 312 int qcol = 0;
329 313
330 // see below for cursor adjustment rationale 314 // see below for cursor adjustment rationale
331 if (p == ocur.row) 315 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow); 316 screen.cur.row = q - (total_rows - nrow);
333 317
334 // fill a single destination line 318 // fill a single destination line
335 while (lofs < llen && qcol < ncol) 319 while (lofs < llen && qcol < ncol)
336 { 320 {
337 int prow = lofs / prev_ncol; 321 int prow = lofs / prev_ncol;
338 int pcol = lofs % prev_ncol; 322 int pcol = lofs % prev_ncol;
… …
364 } 348 }
365 while (p != pend && q > 0); 349 while (p != pend && q > 0);
366 350
367 term_start = total_rows - nrow; 351 term_start = total_rows - nrow;
368 top_row = q - term_start; 352 top_row = q - term_start;
369 353
370 // make sure all terminal lines exist 354 // make sure all terminal lines exist
371 while (top_row > 0) 355 while (top_row > 0)
372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 356 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373 } 357 }
374 else 358 else
375 { 359 {
376 // if no scrollback exists (yet), wing, instead of wrap 360 // if no scrollback exists (yet), wing, instead of wrap
377 361
378 for (int row = min (nrow, prev_nrow); row--; ) 362 for (int row = min (nrow, prev_nrow); row--; )
379 { 363 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 365 line_t &qline = row_buf [row];
382 366
… …
596/* 580/*
597 * Change the rendition style for following text 581 * Change the rendition style for following text
598 */ 582 */
599void 583void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 584rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 585{
602 if (set) 586 if (set)
603 rstyle |= style; 587 rstyle |= style;
604 else if (style == ~RS_None) 588 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 589 rstyle = DEFAULT_RSTYLE;
606 else 590 else
607 rstyle &= ~style; 591 rstyle &= ~style;
608 } 592}
609 593
610/* ------------------------------------------------------------------------- */ 594/* ------------------------------------------------------------------------- */
611/* 595/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 596 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 597 * count positive ==> scroll up
… …
664 line_t &l2 = ROW(i); 648 line_t &l2 = ROW(i);
665 649
666 ::swap (l1, l2); 650 ::swap (l1, l2);
667 l2.touch (); 651 l2.touch ();
668 } 652 }
669 653
670 // move and/or clear selection, if any 654 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
672 { 656 {
673 selection.beg.row -= count; 657 selection.beg.row -= count;
674 selection.end.row -= count; 658 selection.end.row -= count;
… …
710 { 694 {
711 /* move selected region too */ 695 /* move selected region too */
712 selection.beg.row -= count; 696 selection.beg.row -= count;
713 selection.end.row -= count; 697 selection.end.row -= count;
714 selection.mark.row -= count; 698 selection.mark.row -= count;
715 699
716 selection_check (0); 700 selection_check (0);
717 } 701 }
718 } 702 }
719 703
720 // use a simple and robust scrolling algorithm, this 704 // use a simple and robust scrolling algorithm, this
… …
787 771
788 while (str < strend) 772 while (str < strend)
789 { 773 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 775
792 if (c < 0x20) 776 if (expect_false (c < 0x20))
793 if (c == C0_LF) 777 if (c == C0_LF)
794 { 778 {
795 max_it (line->l, screen.cur.col); 779 max_it (line->l, screen.cur.col);
796 780
797 screen.flags &= ~Screen_WrapNext; 781 screen.flags &= ~Screen_WrapNext;
… …
816 { 800 {
817 scr_tab (1, true); 801 scr_tab (1, true);
818 continue; 802 continue;
819 } 803 }
820 804
805 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 806 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 808 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 ))
824 { 810 {
825 checksel = 0; 811 checksel = 0;
826 /* 812 /*
827 * If we wrote anywhere in the selected area, kill the selection 813 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 814 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 815 * should be a similar check.
830 */ 816 */
831 CLEAR_SELECTION (); 817 CLEAR_SELECTION ();
832 } 818 }
833 819
834 if (screen.flags & Screen_WrapNext) 820 if (expect_false (screen.flags & Screen_WrapNext))
835 { 821 {
836 scr_do_wrap (); 822 scr_do_wrap ();
837 823
838 line->l = ncol; 824 line->l = ncol;
839 line->is_longer (1); 825 line->is_longer (1);
840 826
841 row = screen.cur.row; 827 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
843 } 829 }
844 830
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 831 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 833 c = 0xfffd;
848 834
849 // rely on wcwidth to tell us the character width, do wcwidth before 835 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 836 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 837 // drawing characters below as they might be invalid in the current
852 // locale. 838 // locale.
853 int width = WCWIDTH (c); 839 int width = WCWIDTH (c);
854 840
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 842 {
857 // vt100 special graphics and line drawing 843 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 844 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 845 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 846 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 859 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 860 width = 1; // vt100 line drawing characters are always single-width
875 } 861 }
876 } 862 }
877 863
878 if (screen.flags & Screen_Insert) 864 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 865 scr_insdel_chars (width, INSERT);
880 866
881 if (width != 0) 867 if (width != 0)
882 { 868 {
883#if !UNICODE_3 869#if !UNICODE_3
… …
889 c = 0xfffd; 875 c = 0xfffd;
890# endif 876# endif
891#endif 877#endif
892 878
893 // nuke the character at this position, if required 879 // nuke the character at this position, if required
880 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 881 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 882 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
897 { 885 {
898 int col = screen.cur.col; 886 int col = screen.cur.col;
899 887
900 // find begin 888 // find begin
901 while (col > 0 && line->t[col] == NOCHAR) 889 while (col > 0 && line->t[col] == NOCHAR)
… …
912 } 900 }
913 901
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 903
916 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
917 if (screen.cur.col > ncol - width && ncol >= width) 905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 906 {
919 // ...output spaces 907 // ...output spaces
920 c = ' '; 908 c = ' ';
921 // and try the same character next loop iteration 909 // and try the same character next loop iteration
922 --str; 910 --str;
… …
927 do 915 do
928 { 916 {
929 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
931 919
932 if (screen.cur.col < ncol - 1) 920 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 921 screen.cur.col++;
934 else 922 else
935 { 923 {
936 line->l = ncol; 924 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
… …
939 break; 927 break;
940 } 928 }
941 929
942 c = NOCHAR; 930 c = NOCHAR;
943 } 931 }
944 while (--width > 0); 932 while (expect_false (--width > 0));
945 933
946 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 935 if (expect_false (!width))
948 { 936 {
949 line->touch (); 937 line->touch ();
950 938
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 940 {
953 line->t[c] = ' '; 941 line->t[c] = ' ';
954 line->r[c] = rend; 942 line->r[c] = rend;
955 } 943 }
956 } 944 }
957 } 945 }
946#if ENABLE_COMBINING
958 else // width == 0 947 else // width == 0
959 { 948 {
960#if ENABLE_COMBINING 949 if (c != 0xfeff) // ignore BOM
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 { 950 {
951 // handle combining characters
952 // we just tag the accent on the previous on-screen character.
953 // this is arguably not correct, but also arguably not wrong.
954 // we don't handle double-width characters nicely yet.
955 line_t *linep;
956 text_t *tp;
957 rend_t *rp;
958
959 if (screen.cur.col > 0)
960 {
971 linep = line; 961 linep = line;
972 tp = line->t + screen.cur.col - 1; 962 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 963 rp = line->r + screen.cur.col - 1;
964 }
965 else if (screen.cur.row > 0
966 && ROW(screen.cur.row - 1).is_longer ())
967 {
968 linep = &ROW(screen.cur.row - 1);
969 tp = line->t + ncol - 1;
970 rp = line->r + ncol - 1;
971 }
972 else
973 continue;
974
975 linep->touch ();
976
977 while (*tp == NOCHAR && tp > linep->t)
978 tp--, rp--;
979
980 // first try to find a precomposed character
981 unicode_t n = rxvt_compose (*tp, c);
982 if (n == NOCHAR)
983 n = rxvt_composite.compose (*tp, c);
984
985 *tp = n;
986 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
974 } 987 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 } 988 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 989#endif
998 }
999 } 990 }
1000 991
1001 max_it (line->l, screen.cur.col); 992 max_it (line->l, screen.cur.col);
1002 993
1003#ifdef DEBUG_STRICT 994#ifdef DEBUG_STRICT
… …
1011 * XTERM_SEQ: CTRL-H 1002 * XTERM_SEQ: CTRL-H
1012 */ 1003 */
1013void 1004void
1014rxvt_term::scr_backspace () NOTHROW 1005rxvt_term::scr_backspace () NOTHROW
1015{ 1006{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1007 if (screen.cur.col == 0)
1019 { 1008 {
1020 if (screen.cur.row > 0) 1009 if (screen.cur.row > 0)
1021 { 1010 {
1022#ifdef TERMCAP_HAS_BW 1011#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1012 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1013 --screen.cur.row;
1025 return; 1014
1015 want_refresh = 1;
1026#endif 1016#endif
1027 } 1017 }
1028 } 1018 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1019 else
1030 scr_gotorc (0, -1, RELATIVE); 1020 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1021}
1034 1022
1035/* ------------------------------------------------------------------------- */ 1023/* ------------------------------------------------------------------------- */
1036/* 1024/*
1037 * Process Horizontal Tab 1025 * Process Horizontal Tab
… …
1060 x = i; 1048 x = i;
1061 1049
1062 if (!--count) 1050 if (!--count)
1063 break; 1051 break;
1064 } 1052 }
1065 else 1053 else
1066 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1055 && RS_SAME (l.r[i], base_rend);
1068 1056
1069 if (count) 1057 if (count)
1070 x = ncol - 1; 1058 x = ncol - 1;
… …
1186 } 1174 }
1187 } 1175 }
1188 else 1176 else
1189 { 1177 {
1190 if (screen.flags & Screen_Relative) 1178 if (screen.flags & Screen_Relative)
1179 {
1191 { /* relative origin mode */ 1180 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1181 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1182 min_it (screen.cur.row, screen.bscroll);
1194 } 1183 }
1195 else 1184 else
1196 screen.cur.row = row; 1185 screen.cur.row = row;
… …
1229/* 1218/*
1230 * Erase part or whole of a line 1219 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1222 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1223 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1224 */
1235void 1225void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1226rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1227{
1238 unsigned int col, num; 1228 unsigned int col, num;
… …
1247 line.touch (); 1237 line.touch ();
1248 line.is_longer (0); 1238 line.is_longer (0);
1249 1239
1250 switch (mode) 1240 switch (mode)
1251 { 1241 {
1242 case 3:
1243 if (screen.flags & Screen_WrapNext)
1244 return;
1245
1246 /* fall through */
1247
1252 case 0: /* erase to end of line */ 1248 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1249 col = screen.cur.col;
1254 num = ncol - col; 1250 num = ncol - col;
1255 min_it (line.l, col); 1251 min_it (line.l, col);
1252
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1255 CLEAR_SELECTION ();
1259 break; 1256 break;
1257
1260 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
1261 col = 0; 1259 col = 0;
1262 num = screen.cur.col + 1; 1260 num = screen.cur.col + 1;
1261
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1262 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1263 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1264 CLEAR_SELECTION ();
1266 break; 1265 break;
1266
1267 case 2: /* erase whole line */ 1267 case 2: /* erase whole line */
1268 col = 0; 1268 col = 0;
1269 num = ncol; 1269 num = ncol;
1270 line.l = 0; 1270 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1271 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1329 if (row >= nrow) /* Out Of Bounds */
1330 return; 1330 return;
1331 1331
1332 min_it (num, nrow - row); 1332 min_it (num, nrow - row);
1333 1333
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1334 if (rstyle & (RS_RVid | RS_Uline)) 1335 if (rstyle & (RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1336 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1337 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1338 {
1338 ren = DEFAULT_RSTYLE; 1339 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1340
1341 if (mapped)
1342 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False);
1340 } 1345 }
1341 else 1346 else
1342 { 1347 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1348 ren = rstyle & (RS_fgMask | RS_bgMask);
1349
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1351 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1352 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row),
1354 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1356 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1357 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1349 } 1358 }
1350 1359
1351 for (; num--; row++) 1360 for (; num--; row++)
… …
1472 { 1481 {
1473 if (selection.end.row != screen.cur.row 1482 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1483 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1484 CLEAR_SELECTION ();
1476 else 1485 else
1486 {
1477 { /* shift selection */ 1487 /* shift selection */
1478 selection.beg.col += count; 1488 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1489 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1490 selection.end.col += count;
1481 } 1491 }
1482 } 1492 }
… …
1487 case ERASE: 1497 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1498 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1499 selection_check (1);
1490 screen.cur.col -= count; 1500 screen.cur.col -= count;
1491 1501
1492 line->l = max (line->l - count, 0);
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1502 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1503 break;
1495 1504
1496 case DELETE: 1505 case DELETE:
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1506 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1866 return true; 1875 return true;
1867} 1876}
1868 1877
1869#ifndef NO_BELL 1878#ifndef NO_BELL
1870void 1879void
1871rxvt_term::bell_cb (time_watcher &w) 1880rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1881{
1873 rvideo_bell = false; 1882 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1883 scr_rvideo_mode (rvideo_mode);
1884 refresh_check ();
1875} 1885}
1876#endif 1886#endif
1877 1887
1878/* ------------------------------------------------------------------------- */ 1888/* ------------------------------------------------------------------------- */
1879void 1889void
… …
1888 XMapWindow (dpy, parent[0]); 1898 XMapWindow (dpy, parent[0]);
1889# endif 1899# endif
1890 1900
1891# if ENABLE_FRILLS 1901# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1902 if (option (Opt_urgentOnBell))
1893 { 1903 set_urgency (1);
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif 1904# endif
1901 1905
1902 if (option (Opt_visualBell)) 1906 if (option (Opt_visualBell))
1903 { 1907 {
1904 rvideo_bell = true; 1908 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1909 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1910 flush ();
1907 1911
1908 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1912 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1913 }
1910 else 1914 else
1911 XBell (dpy, 0); 1915 XBell (dpy, 0);
1912#endif 1916#endif
1913} 1917}
… …
1917void 1921void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1922rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1923{
1920#ifdef PRINTPIPE 1924#ifdef PRINTPIPE
1921 int nrows, row_start; 1925 int nrows, row_start;
1922 FILE *fd; 1926 FILE *fd = popen_printer ();
1923 1927
1924 if ((fd = popen_printer ()) == NULL) 1928 if (!fd)
1925 return; 1929 return;
1926 1930
1927 if (fullhist) 1931 if (fullhist)
1928 { 1932 {
1929 nrows = nrow - top_row; 1933 nrows = nrow - top_row;
… …
1994 return; 1998 return;
1995 1999
1996 /* 2000 /*
1997 * A: set up vars 2001 * A: set up vars
1998 */ 2002 */
2003 refresh_count = 0;
2004
1999 have_bg = 0; 2005 have_bg = 0;
2000 refresh_count = 0;
2001
2002#ifdef HAVE_BG_PIXMAP 2006#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2007 have_bg = bgPixmap.pixmap != None;
2004#endif 2008#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2010
2007 /* 2011 /*
2008 * B: reverse any characters which are selected 2012 * B: reverse any characters which are selected
… …
2199 continue; 2203 continue;
2200 2204
2201 // redraw one or more characters 2205 // redraw one or more characters
2202 2206
2203 // seek to the beginning of wide characters 2207 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2208 while (expect_false (stp[col] == NOCHAR && col > 0))
2205 --col; 2209 --col;
2206 2210
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2208 text_t *text = stp + col; 2212 text_t *text = stp + col;
2209 int count = 1; 2213 int count = 1;
… …
2246 2250
2247 col--; /* went one too far. move back */ 2251 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2252 count -= i; /* dump any matching trailing chars */
2249 2253
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2254 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2255 while (expect_false (i && text[count] == NOCHAR))
2252 count++, i--; 2256 count++, i--;
2253 2257
2254 /* 2258 /*
2255 * Determine the attributes for the string 2259 * Determine the attributes for the string
2256 */ 2260 */
2257 int fore = fgcolor_of (rend); // desired foreground 2261 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2262 int back = bgcolor_of (rend); // desired background
2259 2263
2260 // only do special processing if any attributes are set, which is unlikely 2264 // only do special processing if any attributes are set, which is unlikely
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2265 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2262 { 2266 {
2263 bool invert = rend & RS_RVid; 2267 bool invert = rend & RS_RVid;
2264 2268
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2269#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2270 if (rend & RS_Bold && fore == Color_fg)
2268 { 2271 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2272 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2273 fore = Color_BD;
2271# if !ENABLE_STYLES 2274# if !ENABLE_STYLES
2272 else 2275 else
2273 invert = !invert; 2276 invert = !invert;
2274# endif 2277# endif
2275 } 2278 }
2276 2279
2277 if (rend & RS_Italic 2280 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2281 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2282 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2283 fore = Color_IT;
2282# if !ENABLE_STYLES 2284# if !ENABLE_STYLES
2283 else 2285 else
… …
2317 } 2319 }
2318 2320
2319#ifdef TEXT_BLINK 2321#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2323 {
2322 if (!text_blink_ev.active) 2324 if (!text_blink_ev.is_active ())
2323 { 2325 {
2324 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2326 text_blink_ev.again ();
2325 hidden_text = 0; 2327 hidden_text = 0;
2326 } 2328 }
2327 else if (hidden_text) 2329 else if (hidden_text)
2328 fore = back; 2330 fore = back;
2329 } 2331 }
… …
2351 /* 2353 /*
2352 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2353 */ 2355 */
2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2355 2357
2356 if (have_bg && back == Color_bg) 2358 if (expect_true (have_bg && back == Color_bg))
2357 { 2359 {
2358 // this is very ugly, maybe push it into ->draw? 2360 // this is very ugly, maybe push it into ->draw?
2359 2361
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2363 if (text[i] != ' ')
… …
2368 did_clear: ; 2370 did_clear: ;
2369 } 2371 }
2370 else 2372 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2374
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2375 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2376 {
2375#if ENABLE_FRILLS 2377#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2378 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2380 else
2379#endif 2381#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2383
2382 XDrawLine (dpy, drawBuffer, gc, 2384 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2387 }
2386 } /* for (col....) */ 2388 } /* for (col....) */
2387 } /* for (row....) */ 2389 } /* for (row....) */
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2428 else
2427#endif 2429#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2431
2430 XDrawRectangle (dpy, drawBuffer, gc, 2432 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2433 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2437 }
… …
2473rxvt_term::scr_recolour () NOTHROW 2475rxvt_term::scr_recolour () NOTHROW
2474{ 2476{
2475#ifdef HAVE_BG_PIXMAP 2477#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2478 bgPixmap.apply ();
2477#else 2479#else
2480
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]); 2482 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2481# if HAVE_SCROLLBARS 2484
2482 if (scrollBar.win) 2485 if (scrollBar.win)
2483 { 2486 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2488 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2489 scrollBar.show (0);
2487 } 2490 }
2491
2488# endif 2492#endif
2493
2494 /* bgPixmap.apply () does not do the following : */
2489 scr_clear (); 2495 scr_clear ();
2490 scr_touch (true); 2496 scr_touch (true);
2491 want_refresh = 1; 2497 want_refresh = 1;
2492#endif
2493
2494} 2498}
2495 2499
2496/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2497void 2501void
2498rxvt_term::scr_clear (bool really) NOTHROW 2502rxvt_term::scr_clear (bool really) NOTHROW
… …
2587{ 2591{
2588 int row, wrote; 2592 int row, wrote;
2589 unsigned int width, towrite; 2593 unsigned int width, towrite;
2590 char r1[] = "\n"; 2594 char r1[] = "\n";
2591 2595
2592 for (row = saveLines - nsaved; 2596 for (row = saveLines + top_row;
2593 row < saveLines + nrow - 1; row++) 2597 row < saveLines + nrow - 1; row++)
2594 { 2598 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l 2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol; 2600 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote) 2601 for (towrite = width; towrite; towrite -= wrote)
… …
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2652 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2653 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2654 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2655 data[i] = C0_CR;
2652 2656
2657 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[200~");
2659
2653 tt_write (data, len); 2660 tt_write (data, len);
2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~");
2654} 2664}
2655 2665
2656/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2657/* 2667/*
2658 * Respond to a notification that a primary selection has been sent 2668 * Respond to a notification that a primary selection has been sent
… …
2733 if (!delete_prop) 2743 if (!delete_prop)
2734 XDeleteProperty (dpy, win, prop); 2744 XDeleteProperty (dpy, win, prop);
2735 2745
2736 selection_wait = Sel_incr; 2746 selection_wait = Sel_incr;
2737 incr_buf_fill = 0; 2747 incr_buf_fill = 0;
2738 incr_ev.start (NOW + 10); 2748 incr_ev.start (10);
2739 2749
2740 goto bailout; 2750 goto bailout;
2741 } 2751 }
2742 2752
2743 if (ct.nitems == 0) 2753 if (ct.nitems == 0)
… …
2752 ct.nitems = incr_buf_fill; 2762 ct.nitems = incr_buf_fill;
2753 incr_buf = 0; 2763 incr_buf = 0;
2754 incr_buf_size = 0; 2764 incr_buf_size = 0;
2755 incr_ev.stop (); 2765 incr_ev.stop ();
2756 } 2766 }
2757 else 2767 else
2758 { 2768 {
2759 if (selection_wait == Sel_normal 2769 if (selection_wait == Sel_normal
2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2761 { 2771 {
2762 /* 2772 /*
… …
2769 goto bailout; 2779 goto bailout;
2770 } 2780 }
2771 } 2781 }
2772 else if (selection_wait == Sel_incr) 2782 else if (selection_wait == Sel_incr)
2773 { 2783 {
2774 incr_ev.start (NOW + 10); 2784 incr_ev.start (10);
2775 2785
2776 while (incr_buf_fill + ct.nitems > incr_buf_size) 2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2777 { 2787 {
2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2819 if (selection_wait == Sel_normal) 2829 if (selection_wait == Sel_normal)
2820 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2821} 2831}
2822 2832
2823void 2833void
2824rxvt_term::incr_cb (time_watcher &w) NOTHROW 2834rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2825{ 2835{
2826 selection_wait = Sel_none; 2836 selection_wait = Sel_none;
2827 2837
2828 incr_buf_size = 0; 2838 incr_buf_size = 0;
2829 free (incr_buf); 2839 free (incr_buf);
… …
2840 selection_paste (win, prop, true); 2850 selection_paste (win, prop, true);
2841} 2851}
2842 2852
2843/* ------------------------------------------------------------------------- */ 2853/* ------------------------------------------------------------------------- */
2844/* 2854/*
2845 * Request the current selection: 2855 * Request the current selection:
2846 * Order: > internal selection if available 2856 * Order: > internal selection if available
2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2857 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2848 * > CUT_BUFFER0 2858 * > CUT_BUFFER0
2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2859 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2850 * will auto fallback to CUT_BUFFER0 2860 * will auto fallback to CUT_BUFFER0
… …
2852 */ 2862 */
2853void 2863void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2865{
2856 if (selection.text && selnum == Sel_Primary) 2866 if (selection.text && selnum == Sel_Primary)
2867 {
2857 { /* internal selection */ 2868 /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len); 2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str)); 2870 paste (str, strlen (str));
2860 free (str); 2871 free (str);
2861 return; 2872 return;
2862 } 2873 }
… …
3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3139 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3129 3140
3130 while (selection.mark.col > 0 3141 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3142 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3143 --selection.mark.col;
3133 3144
3134 if (selection.op) 3145 if (selection.op)
3146 {
3135 { /* clear the old selection */ 3147 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3148 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3149 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3150 }
3139 3151
3140 selection.op = SELECTION_INIT; 3152 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3341 * a point/word/line which is either the start or end of the selection
3330 * and it was decided by whichever point/word/line was `fixed' at the 3342 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3343 * time of the most recent button3 press
3332 */ 3344 */
3333 if (button3 && buttonpress) 3345 if (button3 && buttonpress)
3346 {
3334 { /* button3 press */ 3347 /* button3 press */
3335 /* 3348 /*
3336 * first determine which edge of the selection we are closest to 3349 * first determine which edge of the selection we are closest to
3337 */ 3350 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3351 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3352 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3370 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3371 selection.mark.col = selection.beg.col;
3359 } 3372 }
3360 } 3373 }
3361 else 3374 else
3375 {
3362 { /* button1 drag or button3 drag */ 3376 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3377 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3378 {
3365 if (selection.mark.row == selection.end.row 3379 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3380 && selection.mark.col == selection.end.col
3367 && clickchange 3381 && clickchange
… …
3448 selection.end.row++; 3462 selection.end.row++;
3449 } 3463 }
3450 } 3464 }
3451 3465
3452 if (button3 && buttonpress) 3466 if (button3 && buttonpress)
3467 {
3453 { /* mark may need to be changed */ 3468 /* mark may need to be changed */
3454 if (closeto == LEFT) 3469 if (closeto == LEFT)
3455 { 3470 {
3456 selection.mark.row = selection.end.row; 3471 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3472 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3473 }
… …
3657 XFree (ct.value); 3672 XFree (ct.value);
3658 } 3673 }
3659 3674
3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3675 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3661} 3676}
3662
3663/* ------------------------------------------------------------------------- *
3664 * MOUSE ROUTINES *
3665 * ------------------------------------------------------------------------- */
3666 3677
3667/* ------------------------------------------------------------------------- */ 3678/* ------------------------------------------------------------------------- */
3668#ifdef USE_XIM 3679#ifdef USE_XIM
3669void 3680void
3670rxvt_term::im_set_position (XPoint &pos) NOTHROW 3681rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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