… | |
… | |
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 | |
… | |
… | |
146 | { |
130 | { |
147 | scr_blank_line (l, 0, ncol, efs); |
131 | scr_blank_line (l, 0, ncol, efs); |
148 | |
132 | |
149 | l.l = 0; |
133 | l.l = 0; |
150 | l.f = 0; |
134 | l.f = 0; |
|
|
135 | } |
|
|
136 | |
|
|
137 | // nuke a single wide character at the given column |
|
|
138 | void |
|
|
139 | rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW |
|
|
140 | { |
|
|
141 | // find begin |
|
|
142 | while (col > 0 && l.t[col] == NOCHAR) |
|
|
143 | col--; |
|
|
144 | |
|
|
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
|
|
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
|
|
147 | |
|
|
148 | // found begin, nuke |
|
|
149 | do { |
|
|
150 | l.t[col] = ' '; |
|
|
151 | l.r[col] = rend; |
|
|
152 | col++; |
|
|
153 | } while (col < ncol && l.t[col] == NOCHAR); |
151 | } |
154 | } |
152 | |
155 | |
153 | /* ------------------------------------------------------------------------- * |
156 | /* ------------------------------------------------------------------------- * |
154 | * SCREEN INITIALISATION * |
157 | * SCREEN INITIALISATION * |
155 | * ------------------------------------------------------------------------- */ |
158 | * ------------------------------------------------------------------------- */ |
… | |
… | |
787 | |
790 | |
788 | while (str < strend) |
791 | while (str < strend) |
789 | { |
792 | { |
790 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
793 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
791 | |
794 | |
792 | if (c < 0x20) |
795 | if (expect_false (c < 0x20)) |
793 | if (c == C0_LF) |
796 | if (c == C0_LF) |
794 | { |
797 | { |
795 | max_it (line->l, screen.cur.col); |
798 | max_it (line->l, screen.cur.col); |
796 | |
799 | |
797 | screen.flags &= ~Screen_WrapNext; |
800 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
816 | { |
819 | { |
817 | scr_tab (1, true); |
820 | scr_tab (1, true); |
818 | continue; |
821 | continue; |
819 | } |
822 | } |
820 | |
823 | |
|
|
824 | if (expect_false ( |
821 | if (checksel /* see if we're writing within selection */ |
825 | checksel /* see if we're writing within selection */ |
822 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
826 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
823 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
827 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
828 | )) |
824 | { |
829 | { |
825 | checksel = 0; |
830 | checksel = 0; |
826 | /* |
831 | /* |
827 | * If we wrote anywhere in the selected area, kill the selection |
832 | * If we wrote anywhere in the selected area, kill the selection |
828 | * XXX: should we kill the mark too? Possibly, but maybe that |
833 | * XXX: should we kill the mark too? Possibly, but maybe that |
829 | * should be a similar check. |
834 | * should be a similar check. |
830 | */ |
835 | */ |
831 | CLEAR_SELECTION (); |
836 | CLEAR_SELECTION (); |
832 | } |
837 | } |
833 | |
838 | |
834 | if (screen.flags & Screen_WrapNext) |
839 | if (expect_false (screen.flags & Screen_WrapNext)) |
835 | { |
840 | { |
836 | scr_do_wrap (); |
841 | scr_do_wrap (); |
837 | |
842 | |
838 | line->l = ncol; |
843 | line->l = ncol; |
839 | line->is_longer (1); |
844 | line->is_longer (1); |
… | |
… | |
841 | row = screen.cur.row; |
846 | row = screen.cur.row; |
842 | line = &ROW(row); /* _must_ refresh */ |
847 | line = &ROW(row); /* _must_ refresh */ |
843 | } |
848 | } |
844 | |
849 | |
845 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
850 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
846 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
851 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
847 | c = 0xfffd; |
852 | c = 0xfffd; |
848 | |
853 | |
849 | // rely on wcwidth to tell us the character width, do wcwidth before |
854 | // rely on wcwidth to tell us the character width, do wcwidth before |
850 | // further replacements, as wcwidth might return -1 for the line |
855 | // further replacements, as wcwidth might return -1 for the line |
851 | // drawing characters below as they might be invalid in the current |
856 | // drawing characters below as they might be invalid in the current |
852 | // locale. |
857 | // locale. |
853 | int width = WCWIDTH (c); |
858 | int width = WCWIDTH (c); |
854 | |
859 | |
855 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
860 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
856 | { |
861 | { |
857 | // vt100 special graphics and line drawing |
862 | // vt100 special graphics and line drawing |
858 | // 5f-7e standard vt100 |
863 | // 5f-7e standard vt100 |
859 | // 40-5e rxvt extension for extra curses acs chars |
864 | // 40-5e rxvt extension for extra curses acs chars |
860 | static uint16_t vt100_0[62] = { // 41 .. 7e |
865 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
873 | c = vt100_0[c - 0x41]; |
878 | c = vt100_0[c - 0x41]; |
874 | width = 1; // vt100 line drawing characters are always single-width |
879 | width = 1; // vt100 line drawing characters are always single-width |
875 | } |
880 | } |
876 | } |
881 | } |
877 | |
882 | |
878 | if (screen.flags & Screen_Insert) |
883 | if (expect_false (screen.flags & Screen_Insert)) |
879 | scr_insdel_chars (width, INSERT); |
884 | scr_insdel_chars (width, INSERT); |
880 | |
885 | |
881 | if (width != 0) |
886 | if (width != 0) |
882 | { |
887 | { |
883 | #if !UNICODE_3 |
888 | #if !UNICODE_3 |
… | |
… | |
889 | c = 0xfffd; |
894 | c = 0xfffd; |
890 | # endif |
895 | # endif |
891 | #endif |
896 | #endif |
892 | |
897 | |
893 | // nuke the character at this position, if required |
898 | // nuke the character at this position, if required |
|
|
899 | if (expect_false ( |
894 | if (line->t[screen.cur.col] == NOCHAR |
900 | line->t[screen.cur.col] == NOCHAR |
895 | || (screen.cur.col < ncol - 1 |
901 | || (screen.cur.col < ncol - 1 |
896 | && line->t[screen.cur.col + 1] == NOCHAR)) |
902 | && line->t[screen.cur.col + 1] == NOCHAR) |
897 | { |
903 | )) |
898 | int col = screen.cur.col; |
904 | scr_kill_char (*line, screen.cur.col); |
899 | |
|
|
900 | // find begin |
|
|
901 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
902 | col--; |
|
|
903 | |
|
|
904 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
905 | |
|
|
906 | // found begin, nuke |
|
|
907 | do { |
|
|
908 | line->t[col] = ' '; |
|
|
909 | line->r[col] = rend; |
|
|
910 | col++; |
|
|
911 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
912 | } |
|
|
913 | |
905 | |
914 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
906 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
915 | |
907 | |
916 | // if the character doesn't fit into the remaining columns... |
908 | // if the character doesn't fit into the remaining columns... |
917 | if (screen.cur.col > ncol - width && ncol >= width) |
909 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
918 | { |
910 | { |
919 | // ...output spaces |
911 | // ...output spaces |
920 | c = ' '; |
912 | c = ' '; |
921 | // and try the same character next loop iteration |
913 | // and try the same character next loop iteration |
922 | --str; |
914 | --str; |
… | |
… | |
927 | do |
919 | do |
928 | { |
920 | { |
929 | line->t[screen.cur.col] = c; |
921 | line->t[screen.cur.col] = c; |
930 | line->r[screen.cur.col] = rend; |
922 | line->r[screen.cur.col] = rend; |
931 | |
923 | |
932 | if (screen.cur.col < ncol - 1) |
924 | if (expect_true (screen.cur.col < ncol - 1)) |
933 | screen.cur.col++; |
925 | screen.cur.col++; |
934 | else |
926 | else |
935 | { |
927 | { |
936 | line->l = ncol; |
928 | line->l = ncol; |
937 | if (screen.flags & Screen_Autowrap) |
929 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
939 | break; |
931 | break; |
940 | } |
932 | } |
941 | |
933 | |
942 | c = NOCHAR; |
934 | c = NOCHAR; |
943 | } |
935 | } |
944 | while (--width > 0); |
936 | while (expect_false (--width > 0)); |
945 | |
937 | |
946 | // pad with spaces when overwriting wide character with smaller one |
938 | // pad with spaces when overwriting wide character with smaller one |
947 | if (!width) |
939 | if (expect_false (!width)) |
948 | { |
940 | { |
949 | line->touch (); |
941 | line->touch (); |
950 | |
942 | |
951 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
943 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
952 | { |
944 | { |
953 | line->t[c] = ' '; |
945 | line->t[c] = ' '; |
954 | line->r[c] = rend; |
946 | line->r[c] = rend; |
955 | } |
947 | } |
956 | } |
948 | } |
957 | } |
949 | } |
|
|
950 | #if ENABLE_COMBINING |
958 | else // width == 0 |
951 | else // width == 0 |
959 | { |
952 | { |
960 | #if ENABLE_COMBINING |
953 | 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 | { |
954 | { |
|
|
955 | // handle combining characters |
|
|
956 | // we just tag the accent on the previous on-screen character. |
|
|
957 | // this is arguably not correct, but also arguably not wrong. |
|
|
958 | // we don't handle double-width characters nicely yet. |
|
|
959 | line_t *linep; |
|
|
960 | text_t *tp; |
|
|
961 | rend_t *rp; |
|
|
962 | |
|
|
963 | if (screen.cur.col > 0) |
|
|
964 | { |
971 | linep = line; |
965 | linep = line; |
972 | tp = line->t + screen.cur.col - 1; |
966 | tp = line->t + screen.cur.col - 1; |
973 | rp = line->r + screen.cur.col - 1; |
967 | rp = line->r + screen.cur.col - 1; |
|
|
968 | } |
|
|
969 | else if (screen.cur.row > 0 |
|
|
970 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
971 | { |
|
|
972 | linep = &ROW(screen.cur.row - 1); |
|
|
973 | tp = line->t + ncol - 1; |
|
|
974 | rp = line->r + ncol - 1; |
|
|
975 | } |
|
|
976 | else |
|
|
977 | continue; |
|
|
978 | |
|
|
979 | linep->touch (); |
|
|
980 | |
|
|
981 | while (*tp == NOCHAR && tp > linep->t) |
|
|
982 | tp--, rp--; |
|
|
983 | |
|
|
984 | // first try to find a precomposed character |
|
|
985 | unicode_t n = rxvt_compose (*tp, c); |
|
|
986 | if (n == NOCHAR) |
|
|
987 | n = rxvt_composite.compose (*tp, c); |
|
|
988 | |
|
|
989 | *tp = n; |
|
|
990 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
974 | } |
991 | } |
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 | } |
992 | } |
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 |
993 | #endif |
998 | } |
|
|
999 | } |
994 | } |
1000 | |
995 | |
1001 | max_it (line->l, screen.cur.col); |
996 | max_it (line->l, screen.cur.col); |
1002 | |
997 | |
1003 | #ifdef DEBUG_STRICT |
998 | #ifdef DEBUG_STRICT |
… | |
… | |
1011 | * XTERM_SEQ: CTRL-H |
1006 | * XTERM_SEQ: CTRL-H |
1012 | */ |
1007 | */ |
1013 | void |
1008 | void |
1014 | rxvt_term::scr_backspace () NOTHROW |
1009 | rxvt_term::scr_backspace () NOTHROW |
1015 | { |
1010 | { |
1016 | want_refresh = 1; |
|
|
1017 | |
|
|
1018 | if (screen.cur.col == 0) |
1011 | if (screen.cur.col == 0) |
1019 | { |
1012 | { |
1020 | if (screen.cur.row > 0) |
1013 | if (screen.cur.row > 0) |
1021 | { |
1014 | { |
1022 | #ifdef TERMCAP_HAS_BW |
1015 | #ifdef TERMCAP_HAS_BW |
1023 | screen.cur.col = ncol - 1; |
1016 | screen.cur.col = ncol - 1; |
1024 | screen.cur.row--; |
1017 | --screen.cur.row; |
1025 | return; |
1018 | |
|
|
1019 | want_refresh = 1; |
1026 | #endif |
1020 | #endif |
1027 | } |
1021 | } |
1028 | } |
1022 | } |
1029 | else if (!(screen.flags & Screen_WrapNext)) |
1023 | else |
1030 | scr_gotorc (0, -1, RELATIVE); |
1024 | scr_gotorc (0, -1, RELATIVE); |
1031 | |
|
|
1032 | screen.flags &= ~Screen_WrapNext; |
|
|
1033 | } |
1025 | } |
1034 | |
1026 | |
1035 | /* ------------------------------------------------------------------------- */ |
1027 | /* ------------------------------------------------------------------------- */ |
1036 | /* |
1028 | /* |
1037 | * Process Horizontal Tab |
1029 | * Process Horizontal Tab |
… | |
… | |
1230 | /* |
1222 | /* |
1231 | * Erase part or whole of a line |
1223 | * Erase part or whole of a line |
1232 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1224 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1233 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1225 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1234 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1226 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1227 | * extension: clear to right unless wrapped: ESC [ 3 K |
1235 | */ |
1228 | */ |
1236 | void |
1229 | void |
1237 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1230 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1238 | { |
1231 | { |
1239 | unsigned int col, num; |
1232 | unsigned int col, num; |
… | |
… | |
1248 | line.touch (); |
1241 | line.touch (); |
1249 | line.is_longer (0); |
1242 | line.is_longer (0); |
1250 | |
1243 | |
1251 | switch (mode) |
1244 | switch (mode) |
1252 | { |
1245 | { |
|
|
1246 | case 3: |
|
|
1247 | if (screen.flags & Screen_WrapNext) |
|
|
1248 | return; |
|
|
1249 | |
|
|
1250 | /* fall through */ |
|
|
1251 | |
1253 | case 0: /* erase to end of line */ |
1252 | case 0: /* erase to end of line */ |
1254 | col = screen.cur.col; |
1253 | col = screen.cur.col; |
1255 | num = ncol - col; |
1254 | num = ncol - col; |
1256 | min_it (line.l, col); |
1255 | min_it (line.l, col); |
|
|
1256 | |
1257 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1257 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1258 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1258 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1259 | CLEAR_SELECTION (); |
1259 | CLEAR_SELECTION (); |
1260 | break; |
1260 | break; |
|
|
1261 | |
1261 | case 1: /* erase to beginning of line */ |
1262 | case 1: /* erase to beginning of line */ |
1262 | col = 0; |
1263 | col = 0; |
1263 | num = screen.cur.col + 1; |
1264 | num = screen.cur.col + 1; |
|
|
1265 | |
1264 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1266 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1265 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1267 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1266 | CLEAR_SELECTION (); |
1268 | CLEAR_SELECTION (); |
1267 | break; |
1269 | break; |
|
|
1270 | |
1268 | case 2: /* erase whole line */ |
1271 | case 2: /* erase whole line */ |
1269 | col = 0; |
1272 | col = 0; |
1270 | num = ncol; |
1273 | num = ncol; |
1271 | line.l = 0; |
1274 | line.l = 0; |
1272 | if (selection.beg.row <= screen.cur.row |
1275 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1330 | if (row >= nrow) /* Out Of Bounds */ |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1331 | return; |
1334 | return; |
1332 | |
1335 | |
1333 | min_it (num, nrow - row); |
1336 | min_it (num, nrow - row); |
1334 | |
1337 | |
|
|
1338 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
1335 | if (rstyle & (RS_RVid | RS_Uline)) |
1339 | if (rstyle & (RS_RVid | RS_Uline)) |
1336 | ren = (rend_t) ~RS_None; |
1340 | ren = (rend_t) ~RS_None; |
1337 | else if (GET_BASEBG (rstyle) == Color_bg) |
1341 | else if (GET_BASEBG (rstyle) == Color_bg) |
1338 | { |
1342 | { |
1339 | ren = DEFAULT_RSTYLE; |
1343 | ren = DEFAULT_RSTYLE; |
1340 | CLEAR_ROWS (row, num); |
1344 | |
|
|
1345 | if (mapped) |
|
|
1346 | XClearArea (dpy, vt, 0, |
|
|
1347 | Row2Pixel (row), (unsigned int)width, |
|
|
1348 | (unsigned int)Height2Pixel (num), False); |
1341 | } |
1349 | } |
1342 | else |
1350 | else |
1343 | { |
1351 | { |
1344 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1352 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1353 | |
1345 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1354 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1346 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1355 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1347 | ERASE_ROWS (row, num); |
1356 | XFillRectangle (dpy, vt, gc, |
|
|
1357 | 0, Row2Pixel (row), |
|
|
1358 | (unsigned int)width, |
|
|
1359 | (unsigned int)Height2Pixel (num)); |
1348 | gcvalue.foreground = pix_colors[Color_fg]; |
1360 | gcvalue.foreground = pix_colors[Color_fg]; |
1349 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1350 | } |
1362 | } |
1351 | |
1363 | |
1352 | for (; num--; row++) |
1364 | for (; num--; row++) |
… | |
… | |
1434 | * Insert/Delete <count> characters from the current position |
1446 | * Insert/Delete <count> characters from the current position |
1435 | */ |
1447 | */ |
1436 | void |
1448 | void |
1437 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1449 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1438 | { |
1450 | { |
1439 | int col, row; |
|
|
1440 | rend_t tr; |
|
|
1441 | |
|
|
1442 | want_refresh = 1; |
1451 | want_refresh = 1; |
1443 | ZERO_SCROLLBACK (); |
1452 | ZERO_SCROLLBACK (); |
1444 | |
1453 | |
1445 | if (count <= 0) |
1454 | if (count <= 0) |
1446 | return; |
1455 | return; |
… | |
… | |
1448 | scr_do_wrap (); |
1457 | scr_do_wrap (); |
1449 | |
1458 | |
1450 | selection_check (1); |
1459 | selection_check (1); |
1451 | min_it (count, ncol - screen.cur.col); |
1460 | min_it (count, ncol - screen.cur.col); |
1452 | |
1461 | |
1453 | row = screen.cur.row; |
1462 | int row = screen.cur.row; |
1454 | |
1463 | |
1455 | line_t *line = &ROW(row); |
1464 | line_t *line = &ROW(row); |
1456 | |
1465 | |
1457 | line->touch (); |
1466 | line->touch (); |
1458 | line->is_longer (0); |
1467 | line->is_longer (0); |
1459 | |
1468 | |
1460 | switch (insdel) |
1469 | switch (insdel) |
1461 | { |
1470 | { |
1462 | case INSERT: |
1471 | case INSERT: |
1463 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1472 | line->l = min (line->l + count, ncol); |
|
|
1473 | |
|
|
1474 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1464 | { |
1475 | { |
1465 | line->t[col] = line->t[col - count]; |
1476 | line->t[col] = line->t[col - count]; |
1466 | line->r[col] = line->r[col - count]; |
1477 | line->r[col] = line->r[col - count]; |
1467 | } |
1478 | } |
1468 | |
|
|
1469 | line->l = min (line->l + count, ncol); |
|
|
1470 | |
1479 | |
1471 | if (selection.op && current_screen == selection.screen |
1480 | if (selection.op && current_screen == selection.screen |
1472 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1481 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1473 | { |
1482 | { |
1474 | if (selection.end.row != screen.cur.row |
1483 | if (selection.end.row != screen.cur.row |
… | |
… | |
1489 | case ERASE: |
1498 | case ERASE: |
1490 | screen.cur.col += count; /* don't worry if > ncol */ |
1499 | screen.cur.col += count; /* don't worry if > ncol */ |
1491 | selection_check (1); |
1500 | selection_check (1); |
1492 | screen.cur.col -= count; |
1501 | screen.cur.col -= count; |
1493 | |
1502 | |
1494 | line->l = max (line->l - count, 0); |
|
|
1495 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1503 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1496 | break; |
1504 | break; |
1497 | |
1505 | |
1498 | case DELETE: |
1506 | case DELETE: |
|
|
1507 | { |
|
|
1508 | line->l = max (line->l - count, 0); |
|
|
1509 | |
1499 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1510 | rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1500 | |
1511 | |
1501 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1512 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1502 | { |
1513 | { |
1503 | line->t[col] = line->t[col + count]; |
1514 | line->t[col] = line->t[col + count]; |
1504 | line->r[col] = line->r[col + count]; |
1515 | line->r[col] = line->r[col + count]; |
1505 | } |
1516 | } |
1506 | |
1517 | |
1507 | line->l = max (line->l - count, 0); |
1518 | // nuke wide char at the end |
|
|
1519 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1520 | scr_kill_char (*line, screen.cur.col); |
|
|
1521 | |
1508 | scr_blank_line (*line, ncol - count, count, tr); |
1522 | scr_blank_line (*line, ncol - count, count, tr); |
1509 | |
1523 | |
1510 | if (selection.op && current_screen == selection.screen |
1524 | if (selection.op && current_screen == selection.screen |
1511 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1525 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1512 | { |
1526 | { |
1513 | if (selection.end.row != screen.cur.row |
1527 | if (selection.end.row != screen.cur.row |
1514 | || (screen.cur.col >= selection.beg.col - count) |
1528 | || (screen.cur.col >= selection.beg.col - count) |
1515 | || selection.end.col >= ncol) |
1529 | || selection.end.col >= ncol) |
1516 | CLEAR_SELECTION (); |
1530 | CLEAR_SELECTION (); |
1517 | else |
1531 | else |
1518 | { |
1532 | { |
1519 | /* shift selection */ |
1533 | /* shift selection */ |
1520 | selection.beg.col -= count; |
1534 | selection.beg.col -= count; |
1521 | selection.mark.col -= count; /* XXX: yes? */ |
1535 | selection.mark.col -= count; /* XXX: yes? */ |
1522 | selection.end.col -= count; |
1536 | selection.end.col -= count; |
1523 | } |
1537 | } |
|
|
1538 | } |
1524 | } |
1539 | } |
1525 | |
1540 | |
1526 | break; |
1541 | break; |
1527 | } |
1542 | } |
1528 | } |
1543 | } |
… | |
… | |
1891 | XMapWindow (dpy, parent[0]); |
1906 | XMapWindow (dpy, parent[0]); |
1892 | # endif |
1907 | # endif |
1893 | |
1908 | |
1894 | # if ENABLE_FRILLS |
1909 | # if ENABLE_FRILLS |
1895 | if (option (Opt_urgentOnBell)) |
1910 | if (option (Opt_urgentOnBell)) |
1896 | { |
1911 | set_urgency (1); |
1897 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
|
|
1898 | { |
|
|
1899 | h->flags |= XUrgencyHint; |
|
|
1900 | XSetWMHints (dpy, parent[0], h); |
|
|
1901 | } |
|
|
1902 | } |
|
|
1903 | # endif |
1912 | # endif |
1904 | |
1913 | |
1905 | if (option (Opt_visualBell)) |
1914 | if (option (Opt_visualBell)) |
1906 | { |
1915 | { |
1907 | rvideo_bell = true; |
1916 | rvideo_bell = true; |
… | |
… | |
1920 | void |
1929 | void |
1921 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1930 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1922 | { |
1931 | { |
1923 | #ifdef PRINTPIPE |
1932 | #ifdef PRINTPIPE |
1924 | int nrows, row_start; |
1933 | int nrows, row_start; |
1925 | FILE *fd; |
1934 | FILE *fd = popen_printer (); |
1926 | |
1935 | |
1927 | if ((fd = popen_printer ()) == NULL) |
1936 | if (!fd) |
1928 | return; |
1937 | return; |
1929 | |
1938 | |
1930 | if (fullhist) |
1939 | if (fullhist) |
1931 | { |
1940 | { |
1932 | nrows = nrow - top_row; |
1941 | nrows = nrow - top_row; |
… | |
… | |
1997 | return; |
2006 | return; |
1998 | |
2007 | |
1999 | /* |
2008 | /* |
2000 | * A: set up vars |
2009 | * A: set up vars |
2001 | */ |
2010 | */ |
|
|
2011 | refresh_count = 0; |
|
|
2012 | |
2002 | have_bg = 0; |
2013 | have_bg = 0; |
2003 | refresh_count = 0; |
|
|
2004 | |
|
|
2005 | #ifdef HAVE_BG_PIXMAP |
2014 | #ifdef HAVE_BG_PIXMAP |
2006 | have_bg |= bgPixmap.pixmap != None; |
2015 | have_bg = bgPixmap.pixmap != None; |
2007 | #endif |
2016 | #endif |
2008 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2017 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2009 | |
2018 | |
2010 | /* |
2019 | /* |
2011 | * B: reverse any characters which are selected |
2020 | * B: reverse any characters which are selected |
… | |
… | |
2202 | continue; |
2211 | continue; |
2203 | |
2212 | |
2204 | // redraw one or more characters |
2213 | // redraw one or more characters |
2205 | |
2214 | |
2206 | // seek to the beginning of wide characters |
2215 | // seek to the beginning of wide characters |
2207 | while (stp[col] == NOCHAR && col > 0) |
2216 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2208 | --col; |
2217 | --col; |
2209 | |
2218 | |
2210 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2219 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2211 | text_t *text = stp + col; |
2220 | text_t *text = stp + col; |
2212 | int count = 1; |
2221 | int count = 1; |
… | |
… | |
2249 | |
2258 | |
2250 | col--; /* went one too far. move back */ |
2259 | col--; /* went one too far. move back */ |
2251 | count -= i; /* dump any matching trailing chars */ |
2260 | count -= i; /* dump any matching trailing chars */ |
2252 | |
2261 | |
2253 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2262 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2254 | while (i && text[count] == NOCHAR) |
2263 | while (expect_false (i && text[count] == NOCHAR)) |
2255 | count++, i--; |
2264 | count++, i--; |
2256 | |
2265 | |
2257 | /* |
2266 | /* |
2258 | * Determine the attributes for the string |
2267 | * Determine the attributes for the string |
2259 | */ |
2268 | */ |
2260 | int fore = fgcolor_of (rend); // desired foreground |
2269 | int fore = fgcolor_of (rend); // desired foreground |
2261 | int back = bgcolor_of (rend); // desired background |
2270 | int back = bgcolor_of (rend); // desired background |
2262 | |
2271 | |
2263 | // only do special processing if any attributes are set, which is unlikely |
2272 | // only do special processing if any attributes are set, which is unlikely |
2264 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2273 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2265 | { |
2274 | { |
2266 | bool invert = rend & RS_RVid; |
2275 | bool invert = rend & RS_RVid; |
2267 | |
2276 | |
2268 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2277 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2269 | if (rend & RS_Bold && fore == Color_fg) |
2278 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2352 | /* |
2361 | /* |
2353 | * Actually do the drawing of the string here |
2362 | * Actually do the drawing of the string here |
2354 | */ |
2363 | */ |
2355 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2364 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2356 | |
2365 | |
2357 | if (have_bg && back == Color_bg) |
2366 | if (expect_true (have_bg && back == Color_bg)) |
2358 | { |
2367 | { |
2359 | // this is very ugly, maybe push it into ->draw? |
2368 | // this is very ugly, maybe push it into ->draw? |
2360 | |
2369 | |
2361 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2370 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2362 | if (text[i] != ' ') |
2371 | if (text[i] != ' ') |
… | |
… | |
2369 | did_clear: ; |
2378 | did_clear: ; |
2370 | } |
2379 | } |
2371 | else |
2380 | else |
2372 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2381 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2373 | |
2382 | |
2374 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2383 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2375 | { |
2384 | { |
2376 | #if ENABLE_FRILLS |
2385 | #if ENABLE_FRILLS |
2377 | if (ISSET_PIXCOLOR (Color_underline)) |
2386 | if (ISSET_PIXCOLOR (Color_underline)) |
2378 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2387 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2379 | else |
2388 | else |
2380 | #endif |
2389 | #endif |
2381 | XSetForeground (dpy, gc, pix_colors[fore]); |
2390 | XSetForeground (dpy, gc, pix_colors[fore]); |
2382 | |
2391 | |
2383 | XDrawLine (dpy, drawBuffer, gc, |
2392 | XDrawLine (dpy, vt, gc, |
2384 | xpixel, ypixel + font->ascent + 1, |
2393 | xpixel, ypixel + font->ascent + 1, |
2385 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2394 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2386 | } |
2395 | } |
2387 | } /* for (col....) */ |
2396 | } /* for (col....) */ |
2388 | } /* for (row....) */ |
2397 | } /* for (row....) */ |
… | |
… | |
2426 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2435 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2427 | else |
2436 | else |
2428 | #endif |
2437 | #endif |
2429 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2438 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2430 | |
2439 | |
2431 | XDrawRectangle (dpy, drawBuffer, gc, |
2440 | XDrawRectangle (dpy, vt, gc, |
2432 | Col2Pixel (col), |
2441 | Col2Pixel (col), |
2433 | Row2Pixel (oldcursor.row), |
2442 | Row2Pixel (oldcursor.row), |
2434 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2443 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2435 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2444 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2436 | } |
2445 | } |
… | |
… | |
2479 | |
2488 | |
2480 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2489 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2481 | XClearWindow (dpy, parent[0]); |
2490 | XClearWindow (dpy, parent[0]); |
2482 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2491 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2483 | |
2492 | |
2484 | # if HAVE_SCROLLBARS |
|
|
2485 | if (scrollBar.win) |
2493 | if (scrollBar.win) |
2486 | { |
2494 | { |
2487 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2495 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2488 | scrollBar.setIdle (); |
2496 | scrollBar.state = STATE_IDLE; |
2489 | scrollbar_show (0); |
2497 | scrollBar.show (0); |
2490 | } |
2498 | } |
|
|
2499 | |
2491 | # endif |
2500 | #endif |
2492 | |
2501 | |
|
|
2502 | /* bgPixmap.apply () does not do the following : */ |
2493 | scr_clear (); |
2503 | scr_clear (); |
2494 | scr_touch (true); |
2504 | scr_touch (true); |
2495 | want_refresh = 1; |
2505 | want_refresh = 1; |
2496 | |
|
|
2497 | #endif |
|
|
2498 | } |
2506 | } |
2499 | |
2507 | |
2500 | /* ------------------------------------------------------------------------- */ |
2508 | /* ------------------------------------------------------------------------- */ |
2501 | void |
2509 | void |
2502 | rxvt_term::scr_clear (bool really) NOTHROW |
2510 | rxvt_term::scr_clear (bool really) NOTHROW |
… | |
… | |
2591 | { |
2599 | { |
2592 | int row, wrote; |
2600 | int row, wrote; |
2593 | unsigned int width, towrite; |
2601 | unsigned int width, towrite; |
2594 | char r1[] = "\n"; |
2602 | char r1[] = "\n"; |
2595 | |
2603 | |
2596 | for (row = saveLines - nsaved; |
2604 | for (row = saveLines + top_row; |
2597 | row < saveLines + nrow - 1; row++) |
2605 | row < saveLines + nrow - 1; row++) |
2598 | { |
2606 | { |
2599 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2607 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2600 | : ncol; |
2608 | : ncol; |
2601 | for (towrite = width; towrite; towrite -= wrote) |
2609 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2652 | /* convert normal newline chars into common keyboard Return key sequence */ |
2660 | /* convert normal newline chars into common keyboard Return key sequence */ |
2653 | for (unsigned int i = 0; i < len; i++) |
2661 | for (unsigned int i = 0; i < len; i++) |
2654 | if (data[i] == C0_LF) |
2662 | if (data[i] == C0_LF) |
2655 | data[i] = C0_CR; |
2663 | data[i] = C0_CR; |
2656 | |
2664 | |
|
|
2665 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2666 | tt_printf ("\e[200~"); |
|
|
2667 | |
2657 | tt_write (data, len); |
2668 | tt_write (data, len); |
|
|
2669 | |
|
|
2670 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2671 | tt_printf ("\e[201~"); |
2658 | } |
2672 | } |
2659 | |
2673 | |
2660 | /* ------------------------------------------------------------------------- */ |
2674 | /* ------------------------------------------------------------------------- */ |
2661 | /* |
2675 | /* |
2662 | * Respond to a notification that a primary selection has been sent |
2676 | * Respond to a notification that a primary selection has been sent |