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 | |
… | |
… | |
596 | /* |
580 | /* |
597 | * Change the rendition style for following text |
581 | * Change the rendition style for following text |
598 | */ |
582 | */ |
599 | void |
583 | void |
600 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
584 | rxvt_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 |
… | |
… | |
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); |
… | |
… | |
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 | */ |
1013 | void |
1004 | void |
1014 | rxvt_term::scr_backspace () NOTHROW |
1005 | rxvt_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 |
… | |
… | |
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 | */ |
1235 | void |
1225 | void |
1236 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1226 | rxvt_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 | } |
… | |
… | |
1866 | return true; |
1876 | return true; |
1867 | } |
1877 | } |
1868 | |
1878 | |
1869 | #ifndef NO_BELL |
1879 | #ifndef NO_BELL |
1870 | void |
1880 | void |
1871 | rxvt_term::bell_cb (time_watcher &w) |
1881 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1872 | { |
1882 | { |
1873 | rvideo_bell = false; |
1883 | rvideo_bell = false; |
1874 | scr_rvideo_mode (rvideo_mode); |
1884 | scr_rvideo_mode (rvideo_mode); |
|
|
1885 | refresh_check (); |
1875 | } |
1886 | } |
1876 | #endif |
1887 | #endif |
1877 | |
1888 | |
1878 | /* ------------------------------------------------------------------------- */ |
1889 | /* ------------------------------------------------------------------------- */ |
1879 | void |
1890 | void |
… | |
… | |
1888 | XMapWindow (dpy, parent[0]); |
1899 | XMapWindow (dpy, parent[0]); |
1889 | # endif |
1900 | # endif |
1890 | |
1901 | |
1891 | # if ENABLE_FRILLS |
1902 | # if ENABLE_FRILLS |
1892 | if (option (Opt_urgentOnBell)) |
1903 | if (option (Opt_urgentOnBell)) |
1893 | { |
1904 | 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 |
1905 | # endif |
1901 | |
1906 | |
1902 | if (option (Opt_visualBell)) |
1907 | if (option (Opt_visualBell)) |
1903 | { |
1908 | { |
1904 | rvideo_bell = true; |
1909 | rvideo_bell = true; |
1905 | scr_rvideo_mode (rvideo_mode); |
1910 | scr_rvideo_mode (rvideo_mode); |
1906 | display->flush (); |
1911 | flush (); |
1907 | |
1912 | |
1908 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1913 | bell_ev.start (VISUAL_BELL_DURATION); |
1909 | } |
1914 | } |
1910 | else |
1915 | else |
1911 | XBell (dpy, 0); |
1916 | XBell (dpy, 0); |
1912 | #endif |
1917 | #endif |
1913 | } |
1918 | } |
… | |
… | |
1917 | void |
1922 | void |
1918 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1923 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1919 | { |
1924 | { |
1920 | #ifdef PRINTPIPE |
1925 | #ifdef PRINTPIPE |
1921 | int nrows, row_start; |
1926 | int nrows, row_start; |
1922 | FILE *fd; |
1927 | FILE *fd = popen_printer (); |
1923 | |
1928 | |
1924 | if ((fd = popen_printer ()) == NULL) |
1929 | if (!fd) |
1925 | return; |
1930 | return; |
1926 | |
1931 | |
1927 | if (fullhist) |
1932 | if (fullhist) |
1928 | { |
1933 | { |
1929 | nrows = nrow - top_row; |
1934 | nrows = nrow - top_row; |
… | |
… | |
1994 | return; |
1999 | return; |
1995 | |
2000 | |
1996 | /* |
2001 | /* |
1997 | * A: set up vars |
2002 | * A: set up vars |
1998 | */ |
2003 | */ |
|
|
2004 | refresh_count = 0; |
|
|
2005 | |
1999 | have_bg = 0; |
2006 | have_bg = 0; |
2000 | refresh_count = 0; |
|
|
2001 | |
|
|
2002 | #ifdef HAVE_BG_PIXMAP |
2007 | #ifdef HAVE_BG_PIXMAP |
2003 | have_bg |= bgPixmap.pixmap != None; |
2008 | have_bg = bgPixmap.pixmap != None; |
2004 | #endif |
2009 | #endif |
2005 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2010 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2006 | |
2011 | |
2007 | /* |
2012 | /* |
2008 | * B: reverse any characters which are selected |
2013 | * B: reverse any characters which are selected |
… | |
… | |
2199 | continue; |
2204 | continue; |
2200 | |
2205 | |
2201 | // redraw one or more characters |
2206 | // redraw one or more characters |
2202 | |
2207 | |
2203 | // seek to the beginning of wide characters |
2208 | // seek to the beginning of wide characters |
2204 | while (stp[col] == NOCHAR && col > 0) |
2209 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2205 | --col; |
2210 | --col; |
2206 | |
2211 | |
2207 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2212 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2208 | text_t *text = stp + col; |
2213 | text_t *text = stp + col; |
2209 | int count = 1; |
2214 | int count = 1; |
… | |
… | |
2246 | |
2251 | |
2247 | col--; /* went one too far. move back */ |
2252 | col--; /* went one too far. move back */ |
2248 | count -= i; /* dump any matching trailing chars */ |
2253 | count -= i; /* dump any matching trailing chars */ |
2249 | |
2254 | |
2250 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2255 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2251 | while (i && text[count] == NOCHAR) |
2256 | while (expect_false (i && text[count] == NOCHAR)) |
2252 | count++, i--; |
2257 | count++, i--; |
2253 | |
2258 | |
2254 | /* |
2259 | /* |
2255 | * Determine the attributes for the string |
2260 | * Determine the attributes for the string |
2256 | */ |
2261 | */ |
2257 | int fore = fgcolor_of (rend); // desired foreground |
2262 | int fore = fgcolor_of (rend); // desired foreground |
2258 | int back = bgcolor_of (rend); // desired background |
2263 | int back = bgcolor_of (rend); // desired background |
2259 | |
2264 | |
2260 | // only do special processing if any attributes are set, which is unlikely |
2265 | // 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)) |
2266 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2262 | { |
2267 | { |
2263 | bool invert = rend & RS_RVid; |
2268 | bool invert = rend & RS_RVid; |
2264 | |
2269 | |
2265 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2270 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2266 | if (rend & RS_Bold |
|
|
2267 | && fore == Color_fg) |
2271 | if (rend & RS_Bold && fore == Color_fg) |
2268 | { |
2272 | { |
2269 | if (ISSET_PIXCOLOR (Color_BD)) |
2273 | if (ISSET_PIXCOLOR (Color_BD)) |
2270 | fore = Color_BD; |
2274 | fore = Color_BD; |
2271 | # if !ENABLE_STYLES |
2275 | # if !ENABLE_STYLES |
2272 | else |
2276 | else |
2273 | invert = !invert; |
2277 | invert = !invert; |
2274 | # endif |
2278 | # endif |
2275 | } |
2279 | } |
2276 | |
2280 | |
2277 | if (rend & RS_Italic |
2281 | if (rend & RS_Italic && fore == Color_fg) |
2278 | && fore == Color_fg) |
|
|
2279 | { |
2282 | { |
2280 | if (ISSET_PIXCOLOR (Color_IT)) |
2283 | if (ISSET_PIXCOLOR (Color_IT)) |
2281 | fore = Color_IT; |
2284 | fore = Color_IT; |
2282 | # if !ENABLE_STYLES |
2285 | # if !ENABLE_STYLES |
2283 | else |
2286 | else |
… | |
… | |
2317 | } |
2320 | } |
2318 | |
2321 | |
2319 | #ifdef TEXT_BLINK |
2322 | #ifdef TEXT_BLINK |
2320 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2323 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2321 | { |
2324 | { |
2322 | if (!text_blink_ev.active) |
2325 | if (!text_blink_ev.is_active ()) |
2323 | { |
2326 | { |
2324 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2327 | text_blink_ev.again (); |
2325 | hidden_text = 0; |
2328 | hidden_text = 0; |
2326 | } |
2329 | } |
2327 | else if (hidden_text) |
2330 | else if (hidden_text) |
2328 | fore = back; |
2331 | fore = back; |
2329 | } |
2332 | } |
… | |
… | |
2351 | /* |
2354 | /* |
2352 | * Actually do the drawing of the string here |
2355 | * Actually do the drawing of the string here |
2353 | */ |
2356 | */ |
2354 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2357 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2355 | |
2358 | |
2356 | if (have_bg && back == Color_bg) |
2359 | if (expect_true (have_bg && back == Color_bg)) |
2357 | { |
2360 | { |
2358 | // this is very ugly, maybe push it into ->draw? |
2361 | // this is very ugly, maybe push it into ->draw? |
2359 | |
2362 | |
2360 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2363 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2361 | if (text[i] != ' ') |
2364 | if (text[i] != ' ') |
… | |
… | |
2368 | did_clear: ; |
2371 | did_clear: ; |
2369 | } |
2372 | } |
2370 | else |
2373 | else |
2371 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2374 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2372 | |
2375 | |
2373 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2376 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2374 | { |
2377 | { |
2375 | #if ENABLE_FRILLS |
2378 | #if ENABLE_FRILLS |
2376 | if (ISSET_PIXCOLOR (Color_underline)) |
2379 | if (ISSET_PIXCOLOR (Color_underline)) |
2377 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2380 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2378 | else |
2381 | else |
2379 | #endif |
2382 | #endif |
2380 | XSetForeground (dpy, gc, pix_colors[fore]); |
2383 | XSetForeground (dpy, gc, pix_colors[fore]); |
2381 | |
2384 | |
2382 | XDrawLine (dpy, drawBuffer, gc, |
2385 | XDrawLine (dpy, vt, gc, |
2383 | xpixel, ypixel + font->ascent + 1, |
2386 | xpixel, ypixel + font->ascent + 1, |
2384 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2387 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2385 | } |
2388 | } |
2386 | } /* for (col....) */ |
2389 | } /* for (col....) */ |
2387 | } /* for (row....) */ |
2390 | } /* for (row....) */ |
… | |
… | |
2425 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2428 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2426 | else |
2429 | else |
2427 | #endif |
2430 | #endif |
2428 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2431 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2429 | |
2432 | |
2430 | XDrawRectangle (dpy, drawBuffer, gc, |
2433 | XDrawRectangle (dpy, vt, gc, |
2431 | Col2Pixel (col), |
2434 | Col2Pixel (col), |
2432 | Row2Pixel (oldcursor.row), |
2435 | Row2Pixel (oldcursor.row), |
2433 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2436 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2434 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2437 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2435 | } |
2438 | } |
… | |
… | |
2473 | rxvt_term::scr_recolour () NOTHROW |
2476 | rxvt_term::scr_recolour () NOTHROW |
2474 | { |
2477 | { |
2475 | #ifdef HAVE_BG_PIXMAP |
2478 | #ifdef HAVE_BG_PIXMAP |
2476 | bgPixmap.apply (); |
2479 | bgPixmap.apply (); |
2477 | #else |
2480 | #else |
|
|
2481 | |
2478 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2482 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2479 | XClearWindow (dpy, parent[0]); |
2483 | XClearWindow (dpy, parent[0]); |
2480 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2484 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2481 | # if HAVE_SCROLLBARS |
2485 | |
2482 | if (scrollBar.win) |
2486 | if (scrollBar.win) |
2483 | { |
2487 | { |
2484 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2488 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2485 | scrollBar.setIdle (); |
2489 | scrollBar.state = STATE_IDLE; |
2486 | scrollbar_show (0); |
2490 | scrollBar.show (0); |
2487 | } |
2491 | } |
|
|
2492 | |
2488 | # endif |
2493 | #endif |
|
|
2494 | |
|
|
2495 | /* bgPixmap.apply () does not do the following : */ |
2489 | scr_clear (); |
2496 | scr_clear (); |
2490 | scr_touch (true); |
2497 | scr_touch (true); |
2491 | want_refresh = 1; |
2498 | want_refresh = 1; |
2492 | #endif |
|
|
2493 | |
|
|
2494 | } |
2499 | } |
2495 | |
2500 | |
2496 | /* ------------------------------------------------------------------------- */ |
2501 | /* ------------------------------------------------------------------------- */ |
2497 | void |
2502 | void |
2498 | rxvt_term::scr_clear (bool really) NOTHROW |
2503 | rxvt_term::scr_clear (bool really) NOTHROW |
… | |
… | |
2587 | { |
2592 | { |
2588 | int row, wrote; |
2593 | int row, wrote; |
2589 | unsigned int width, towrite; |
2594 | unsigned int width, towrite; |
2590 | char r1[] = "\n"; |
2595 | char r1[] = "\n"; |
2591 | |
2596 | |
2592 | for (row = saveLines - nsaved; |
2597 | for (row = saveLines + top_row; |
2593 | row < saveLines + nrow - 1; row++) |
2598 | row < saveLines + nrow - 1; row++) |
2594 | { |
2599 | { |
2595 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2600 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2596 | : ncol; |
2601 | : ncol; |
2597 | for (towrite = width; towrite; towrite -= wrote) |
2602 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2648 | /* convert normal newline chars into common keyboard Return key sequence */ |
2653 | /* convert normal newline chars into common keyboard Return key sequence */ |
2649 | for (unsigned int i = 0; i < len; i++) |
2654 | for (unsigned int i = 0; i < len; i++) |
2650 | if (data[i] == C0_LF) |
2655 | if (data[i] == C0_LF) |
2651 | data[i] = C0_CR; |
2656 | data[i] = C0_CR; |
2652 | |
2657 | |
|
|
2658 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2659 | tt_printf ("\e[200~"); |
|
|
2660 | |
2653 | tt_write (data, len); |
2661 | tt_write (data, len); |
|
|
2662 | |
|
|
2663 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2664 | tt_printf ("\e[201~"); |
2654 | } |
2665 | } |
2655 | |
2666 | |
2656 | /* ------------------------------------------------------------------------- */ |
2667 | /* ------------------------------------------------------------------------- */ |
2657 | /* |
2668 | /* |
2658 | * Respond to a notification that a primary selection has been sent |
2669 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2733 | if (!delete_prop) |
2744 | if (!delete_prop) |
2734 | XDeleteProperty (dpy, win, prop); |
2745 | XDeleteProperty (dpy, win, prop); |
2735 | |
2746 | |
2736 | selection_wait = Sel_incr; |
2747 | selection_wait = Sel_incr; |
2737 | incr_buf_fill = 0; |
2748 | incr_buf_fill = 0; |
2738 | incr_ev.start (NOW + 10); |
2749 | incr_ev.start (10); |
2739 | |
2750 | |
2740 | goto bailout; |
2751 | goto bailout; |
2741 | } |
2752 | } |
2742 | |
2753 | |
2743 | if (ct.nitems == 0) |
2754 | if (ct.nitems == 0) |
… | |
… | |
2769 | goto bailout; |
2780 | goto bailout; |
2770 | } |
2781 | } |
2771 | } |
2782 | } |
2772 | else if (selection_wait == Sel_incr) |
2783 | else if (selection_wait == Sel_incr) |
2773 | { |
2784 | { |
2774 | incr_ev.start (NOW + 10); |
2785 | incr_ev.start (10); |
2775 | |
2786 | |
2776 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2787 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2777 | { |
2788 | { |
2778 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2789 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2779 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2790 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2819 | if (selection_wait == Sel_normal) |
2830 | if (selection_wait == Sel_normal) |
2820 | selection_wait = Sel_none; |
2831 | selection_wait = Sel_none; |
2821 | } |
2832 | } |
2822 | |
2833 | |
2823 | void |
2834 | void |
2824 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2835 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2825 | { |
2836 | { |
2826 | selection_wait = Sel_none; |
2837 | selection_wait = Sel_none; |
2827 | |
2838 | |
2828 | incr_buf_size = 0; |
2839 | incr_buf_size = 0; |
2829 | free (incr_buf); |
2840 | free (incr_buf); |
… | |
… | |
2852 | */ |
2863 | */ |
2853 | void |
2864 | void |
2854 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2865 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2855 | { |
2866 | { |
2856 | if (selection.text && selnum == Sel_Primary) |
2867 | if (selection.text && selnum == Sel_Primary) |
|
|
2868 | { |
2857 | { /* internal selection */ |
2869 | /* internal selection */ |
2858 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2870 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2859 | paste (str, strlen (str)); |
2871 | paste (str, strlen (str)); |
2860 | free (str); |
2872 | free (str); |
2861 | return; |
2873 | return; |
2862 | } |
2874 | } |
… | |
… | |
3130 | while (selection.mark.col > 0 |
3142 | while (selection.mark.col > 0 |
3131 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3143 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3132 | --selection.mark.col; |
3144 | --selection.mark.col; |
3133 | |
3145 | |
3134 | if (selection.op) |
3146 | if (selection.op) |
|
|
3147 | { |
3135 | { /* clear the old selection */ |
3148 | /* clear the old selection */ |
3136 | selection.beg.row = selection.end.row = selection.mark.row; |
3149 | selection.beg.row = selection.end.row = selection.mark.row; |
3137 | selection.beg.col = selection.end.col = selection.mark.col; |
3150 | selection.beg.col = selection.end.col = selection.mark.col; |
3138 | } |
3151 | } |
3139 | |
3152 | |
3140 | selection.op = SELECTION_INIT; |
3153 | selection.op = SELECTION_INIT; |
… | |
… | |
3329 | * a point/word/line which is either the start or end of the selection |
3342 | * 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 |
3343 | * and it was decided by whichever point/word/line was `fixed' at the |
3331 | * time of the most recent button3 press |
3344 | * time of the most recent button3 press |
3332 | */ |
3345 | */ |
3333 | if (button3 && buttonpress) |
3346 | if (button3 && buttonpress) |
|
|
3347 | { |
3334 | { /* button3 press */ |
3348 | /* button3 press */ |
3335 | /* |
3349 | /* |
3336 | * first determine which edge of the selection we are closest to |
3350 | * first determine which edge of the selection we are closest to |
3337 | */ |
3351 | */ |
3338 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3352 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3339 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3353 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3357 | selection.mark.row = selection.beg.row; |
3371 | selection.mark.row = selection.beg.row; |
3358 | selection.mark.col = selection.beg.col; |
3372 | selection.mark.col = selection.beg.col; |
3359 | } |
3373 | } |
3360 | } |
3374 | } |
3361 | else |
3375 | else |
|
|
3376 | { |
3362 | { /* button1 drag or button3 drag */ |
3377 | /* button1 drag or button3 drag */ |
3363 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3378 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3364 | { |
3379 | { |
3365 | if (selection.mark.row == selection.end.row |
3380 | if (selection.mark.row == selection.end.row |
3366 | && selection.mark.col == selection.end.col |
3381 | && selection.mark.col == selection.end.col |
3367 | && clickchange |
3382 | && clickchange |
… | |
… | |
3448 | selection.end.row++; |
3463 | selection.end.row++; |
3449 | } |
3464 | } |
3450 | } |
3465 | } |
3451 | |
3466 | |
3452 | if (button3 && buttonpress) |
3467 | if (button3 && buttonpress) |
|
|
3468 | { |
3453 | { /* mark may need to be changed */ |
3469 | /* mark may need to be changed */ |
3454 | if (closeto == LEFT) |
3470 | if (closeto == LEFT) |
3455 | { |
3471 | { |
3456 | selection.mark.row = selection.end.row; |
3472 | selection.mark.row = selection.end.row; |
3457 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3473 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3458 | } |
3474 | } |