… | |
… | |
132 | |
132 | |
133 | l.l = 0; |
133 | l.l = 0; |
134 | l.f = 0; |
134 | l.f = 0; |
135 | } |
135 | } |
136 | |
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 start, nuke |
|
|
149 | do { |
|
|
150 | l.t[col] = ' '; |
|
|
151 | l.r[col] = rend; |
|
|
152 | col++; |
|
|
153 | } while (col < ncol && l.t[col] == NOCHAR); |
|
|
154 | } |
|
|
155 | |
137 | /* ------------------------------------------------------------------------- * |
156 | /* ------------------------------------------------------------------------- * |
138 | * SCREEN INITIALISATION * |
157 | * SCREEN INITIALISATION * |
139 | * ------------------------------------------------------------------------- */ |
158 | * ------------------------------------------------------------------------- */ |
140 | |
159 | |
141 | void |
160 | void |
142 | rxvt_term::scr_reset () |
161 | rxvt_term::scr_reset () |
143 | { |
162 | { |
144 | #if ENABLE_OVERLAY |
|
|
145 | scr_overlay_off (); |
|
|
146 | #endif |
|
|
147 | |
|
|
148 | rvideo_mode = false; |
|
|
149 | view_start = 0; |
163 | view_start = 0; |
150 | num_scr = 0; |
164 | num_scr = 0; |
151 | |
165 | |
152 | if (ncol == 0) |
166 | if (ncol == 0) |
153 | ncol = 80; |
167 | ncol = 80; |
… | |
… | |
155 | if (nrow == 0) |
169 | if (nrow == 0) |
156 | nrow = 24; |
170 | nrow = 24; |
157 | |
171 | |
158 | if (ncol == prev_ncol && nrow == prev_nrow) |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
159 | return; |
173 | return; |
160 | |
|
|
161 | if (current_screen != PRIMARY) |
|
|
162 | scr_swap_screen (); |
|
|
163 | |
174 | |
164 | // we need at least two lines for wrapping to work correctly |
175 | // we need at least two lines for wrapping to work correctly |
165 | while (nrow + saveLines < 2) |
176 | while (nrow + saveLines < 2) |
166 | { |
177 | { |
167 | //TODO//FIXME |
178 | //TODO//FIXME |
… | |
… | |
380 | delete old_ta; |
391 | delete old_ta; |
381 | delete old_ra; |
392 | delete old_ra; |
382 | |
393 | |
383 | clamp_it (screen.cur.row, 0, nrow - 1); |
394 | clamp_it (screen.cur.row, 0, nrow - 1); |
384 | clamp_it (screen.cur.col, 0, ncol - 1); |
395 | clamp_it (screen.cur.col, 0, ncol - 1); |
385 | |
|
|
386 | free (tabs); |
|
|
387 | } |
396 | } |
388 | |
397 | |
389 | CLEAR_ALL_SELECTION (); |
398 | CLEAR_ALL_SELECTION (); |
390 | |
399 | |
391 | prev_nrow = nrow; |
400 | prev_nrow = nrow; |
392 | prev_ncol = ncol; |
401 | prev_ncol = ncol; |
393 | |
|
|
394 | tabs = (char *)rxvt_malloc (ncol); |
|
|
395 | |
|
|
396 | for (int col = ncol; --col; ) |
|
|
397 | tabs [col] = col % TABSIZE == 0; |
|
|
398 | |
|
|
399 | if (current_screen != PRIMARY) |
|
|
400 | scr_swap_screen (); |
|
|
401 | |
402 | |
402 | tt_winch (); |
403 | tt_winch (); |
403 | |
404 | |
404 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
405 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
405 | } |
406 | } |
… | |
… | |
417 | delete ralloc; ralloc = 0; |
418 | delete ralloc; ralloc = 0; |
418 | |
419 | |
419 | free (row_buf); |
420 | free (row_buf); |
420 | free (swap_buf); |
421 | free (swap_buf); |
421 | free (drawn_buf); |
422 | free (drawn_buf); |
|
|
423 | row_buf = 0; // signal that we freed all the arrays above |
|
|
424 | |
422 | free (tabs); |
425 | free (tabs); |
423 | |
426 | tabs = 0; |
424 | row_buf = 0; // signal that we freed all the arrays |
|
|
425 | } |
427 | } |
426 | } |
428 | } |
427 | |
429 | |
428 | /* ------------------------------------------------------------------------- */ |
430 | /* ------------------------------------------------------------------------- */ |
429 | /* |
431 | /* |
430 | * Hard reset |
432 | * Hard/Soft reset |
431 | */ |
433 | */ |
432 | void |
434 | void |
433 | rxvt_term::scr_poweron () |
435 | rxvt_term::scr_poweron () |
434 | { |
436 | { |
435 | scr_release (); |
437 | scr_release (); |
436 | prev_nrow = prev_ncol = 0; |
438 | prev_nrow = prev_ncol = 0; |
|
|
439 | scr_soft_reset (); |
437 | scr_reset (); |
440 | scr_reset (); |
438 | |
441 | |
439 | scr_clear (true); |
442 | scr_clear (true); |
440 | scr_refresh (); |
443 | scr_refresh (); |
|
|
444 | } |
|
|
445 | |
|
|
446 | void |
|
|
447 | rxvt_term::scr_soft_reset () |
|
|
448 | { |
|
|
449 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
450 | #if ENABLE_OVERLAY |
|
|
451 | scr_overlay_off (); |
|
|
452 | #endif |
|
|
453 | |
|
|
454 | rvideo_mode = false; |
|
|
455 | |
|
|
456 | if (current_screen != PRIMARY) |
|
|
457 | scr_swap_screen (); |
|
|
458 | |
|
|
459 | free (tabs); |
|
|
460 | tabs = (char *)rxvt_malloc (ncol); |
|
|
461 | |
|
|
462 | for (int col = ncol; --col; ) |
|
|
463 | tabs [col] = col % TABSIZE == 0; |
|
|
464 | |
|
|
465 | if (current_screen != PRIMARY) |
|
|
466 | scr_swap_screen (); |
|
|
467 | |
|
|
468 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
469 | scr_rendition (0, ~RS_None); |
|
|
470 | scr_insert_mode (0); |
441 | } |
471 | } |
442 | |
472 | |
443 | /* ------------------------------------------------------------------------- * |
473 | /* ------------------------------------------------------------------------- * |
444 | * PROCESS SCREEN COMMANDS * |
474 | * PROCESS SCREEN COMMANDS * |
445 | * ------------------------------------------------------------------------- */ |
475 | * ------------------------------------------------------------------------- */ |
… | |
… | |
771 | |
801 | |
772 | while (str < strend) |
802 | while (str < strend) |
773 | { |
803 | { |
774 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
804 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
775 | |
805 | |
776 | if (c < 0x20) |
806 | if (expect_false (c < 0x20)) |
777 | if (c == C0_LF) |
807 | if (c == C0_LF) |
778 | { |
808 | { |
779 | max_it (line->l, screen.cur.col); |
809 | max_it (line->l, screen.cur.col); |
780 | |
810 | |
781 | screen.flags &= ~Screen_WrapNext; |
811 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
800 | { |
830 | { |
801 | scr_tab (1, true); |
831 | scr_tab (1, true); |
802 | continue; |
832 | continue; |
803 | } |
833 | } |
804 | |
834 | |
|
|
835 | if (expect_false ( |
805 | if (checksel /* see if we're writing within selection */ |
836 | checksel /* see if we're writing within selection */ |
806 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
837 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
807 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
838 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
839 | )) |
808 | { |
840 | { |
809 | checksel = 0; |
841 | checksel = 0; |
810 | /* |
842 | /* |
811 | * If we wrote anywhere in the selected area, kill the selection |
843 | * If we wrote anywhere in the selected area, kill the selection |
812 | * XXX: should we kill the mark too? Possibly, but maybe that |
844 | * XXX: should we kill the mark too? Possibly, but maybe that |
813 | * should be a similar check. |
845 | * should be a similar check. |
814 | */ |
846 | */ |
815 | CLEAR_SELECTION (); |
847 | CLEAR_SELECTION (); |
816 | } |
848 | } |
817 | |
849 | |
818 | if (screen.flags & Screen_WrapNext) |
850 | if (expect_false (screen.flags & Screen_WrapNext)) |
819 | { |
851 | { |
820 | scr_do_wrap (); |
852 | scr_do_wrap (); |
821 | |
853 | |
822 | line->l = ncol; |
854 | line->l = ncol; |
823 | line->is_longer (1); |
855 | line->is_longer (1); |
… | |
… | |
825 | row = screen.cur.row; |
857 | row = screen.cur.row; |
826 | line = &ROW(row); /* _must_ refresh */ |
858 | line = &ROW(row); /* _must_ refresh */ |
827 | } |
859 | } |
828 | |
860 | |
829 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
861 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
830 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
862 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
831 | c = 0xfffd; |
863 | c = 0xfffd; |
832 | |
864 | |
833 | // rely on wcwidth to tell us the character width, do wcwidth before |
865 | // rely on wcwidth to tell us the character width, do wcwidth before |
834 | // further replacements, as wcwidth might return -1 for the line |
866 | // further replacements, as wcwidth might return -1 for the line |
835 | // drawing characters below as they might be invalid in the current |
867 | // drawing characters below as they might be invalid in the current |
836 | // locale. |
868 | // locale. |
837 | int width = WCWIDTH (c); |
869 | int width = WCWIDTH (c); |
838 | |
870 | |
839 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
871 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
840 | { |
872 | { |
841 | // vt100 special graphics and line drawing |
873 | // vt100 special graphics and line drawing |
842 | // 5f-7e standard vt100 |
874 | // 5f-7e standard vt100 |
843 | // 40-5e rxvt extension for extra curses acs chars |
875 | // 40-5e rxvt extension for extra curses acs chars |
844 | static uint16_t vt100_0[62] = { // 41 .. 7e |
876 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
857 | c = vt100_0[c - 0x41]; |
889 | c = vt100_0[c - 0x41]; |
858 | width = 1; // vt100 line drawing characters are always single-width |
890 | width = 1; // vt100 line drawing characters are always single-width |
859 | } |
891 | } |
860 | } |
892 | } |
861 | |
893 | |
862 | if (screen.flags & Screen_Insert) |
894 | if (expect_false (screen.flags & Screen_Insert)) |
863 | scr_insdel_chars (width, INSERT); |
895 | scr_insdel_chars (width, INSERT); |
864 | |
896 | |
865 | if (width != 0) |
897 | if (width != 0) |
866 | { |
898 | { |
867 | #if !UNICODE_3 |
899 | #if !UNICODE_3 |
… | |
… | |
873 | c = 0xfffd; |
905 | c = 0xfffd; |
874 | # endif |
906 | # endif |
875 | #endif |
907 | #endif |
876 | |
908 | |
877 | // nuke the character at this position, if required |
909 | // nuke the character at this position, if required |
|
|
910 | if (expect_false ( |
878 | if (line->t[screen.cur.col] == NOCHAR |
911 | line->t[screen.cur.col] == NOCHAR |
879 | || (screen.cur.col < ncol - 1 |
912 | || (screen.cur.col < ncol - 1 |
880 | && line->t[screen.cur.col + 1] == NOCHAR)) |
913 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
914 | )) |
|
|
915 | scr_kill_char (*line, screen.cur.col); |
|
|
916 | |
|
|
917 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
918 | |
|
|
919 | // if the character doesn't fit into the remaining columns... |
|
|
920 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
881 | { |
921 | { |
882 | int col = screen.cur.col; |
922 | // ... artificially enlargen the previous one |
883 | |
|
|
884 | // find begin |
|
|
885 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
886 | col--; |
|
|
887 | |
|
|
888 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
889 | |
|
|
890 | // found begin, nuke |
|
|
891 | do { |
|
|
892 | line->t[col] = ' '; |
|
|
893 | line->r[col] = rend; |
|
|
894 | col++; |
|
|
895 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
896 | } |
|
|
897 | |
|
|
898 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
899 | |
|
|
900 | // if the character doesn't fit into the remaining columns... |
|
|
901 | if (screen.cur.col > ncol - width && ncol >= width) |
|
|
902 | { |
|
|
903 | // ...output spaces |
|
|
904 | c = ' '; |
923 | c = NOCHAR; |
905 | // and try the same character next loop iteration |
924 | // and try the same character next loop iteration |
906 | --str; |
925 | --str; |
907 | } |
926 | } |
908 | |
927 | |
909 | line->touch (); |
928 | line->touch (); |
… | |
… | |
911 | do |
930 | do |
912 | { |
931 | { |
913 | line->t[screen.cur.col] = c; |
932 | line->t[screen.cur.col] = c; |
914 | line->r[screen.cur.col] = rend; |
933 | line->r[screen.cur.col] = rend; |
915 | |
934 | |
916 | if (screen.cur.col < ncol - 1) |
935 | if (expect_true (screen.cur.col < ncol - 1)) |
917 | screen.cur.col++; |
936 | screen.cur.col++; |
918 | else |
937 | else |
919 | { |
938 | { |
920 | line->l = ncol; |
939 | line->l = ncol; |
921 | if (screen.flags & Screen_Autowrap) |
940 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
923 | break; |
942 | break; |
924 | } |
943 | } |
925 | |
944 | |
926 | c = NOCHAR; |
945 | c = NOCHAR; |
927 | } |
946 | } |
928 | while (--width > 0); |
947 | while (expect_false (--width > 0)); |
929 | |
948 | |
930 | // pad with spaces when overwriting wide character with smaller one |
949 | // pad with spaces when overwriting wide character with smaller one |
931 | if (!width) |
950 | if (expect_false (!width)) |
932 | { |
951 | { |
933 | line->touch (); |
952 | line->touch (); |
934 | |
953 | |
935 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
954 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
936 | { |
955 | { |
937 | line->t[c] = ' '; |
956 | line->t[c] = ' '; |
938 | line->r[c] = rend; |
957 | line->r[c] = rend; |
939 | } |
958 | } |
940 | } |
959 | } |
941 | } |
960 | } |
|
|
961 | #if ENABLE_COMBINING |
942 | else // width == 0 |
962 | else // width == 0 |
943 | { |
963 | { |
944 | #if ENABLE_COMBINING |
964 | if (c != 0xfeff) // ignore BOM |
945 | // handle combining characters |
|
|
946 | // we just tag the accent on the previous on-screen character. |
|
|
947 | // this is arguably not correct, but also arguably not wrong. |
|
|
948 | // we don't handle double-width characters nicely yet. |
|
|
949 | line_t *linep; |
|
|
950 | text_t *tp; |
|
|
951 | rend_t *rp; |
|
|
952 | |
|
|
953 | if (screen.cur.col > 0) |
|
|
954 | { |
965 | { |
|
|
966 | // handle combining characters |
|
|
967 | // we just tag the accent on the previous on-screen character. |
|
|
968 | // this is arguably not correct, but also arguably not wrong. |
|
|
969 | // we don't handle double-width characters nicely yet. |
|
|
970 | line_t *linep; |
|
|
971 | text_t *tp; |
|
|
972 | rend_t *rp; |
|
|
973 | |
|
|
974 | if (screen.cur.col > 0) |
|
|
975 | { |
955 | linep = line; |
976 | linep = line; |
956 | tp = line->t + screen.cur.col - 1; |
977 | tp = line->t + screen.cur.col - 1; |
957 | rp = line->r + screen.cur.col - 1; |
978 | rp = line->r + screen.cur.col - 1; |
|
|
979 | } |
|
|
980 | else if (screen.cur.row > 0 |
|
|
981 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
982 | { |
|
|
983 | linep = &ROW(screen.cur.row - 1); |
|
|
984 | tp = line->t + ncol - 1; |
|
|
985 | rp = line->r + ncol - 1; |
|
|
986 | } |
|
|
987 | else |
|
|
988 | continue; |
|
|
989 | |
|
|
990 | linep->touch (); |
|
|
991 | |
|
|
992 | while (*tp == NOCHAR && tp > linep->t) |
|
|
993 | tp--, rp--; |
|
|
994 | |
|
|
995 | // first try to find a precomposed character |
|
|
996 | unicode_t n = rxvt_compose (*tp, c); |
|
|
997 | if (n == NOCHAR) |
|
|
998 | n = rxvt_composite.compose (*tp, c); |
|
|
999 | |
|
|
1000 | *tp = n; |
|
|
1001 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
958 | } |
1002 | } |
959 | else if (screen.cur.row > 0 |
|
|
960 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
961 | { |
|
|
962 | linep = &ROW(screen.cur.row - 1); |
|
|
963 | tp = line->t + ncol - 1; |
|
|
964 | rp = line->r + ncol - 1; |
|
|
965 | } |
1003 | } |
966 | else |
|
|
967 | continue; |
|
|
968 | |
|
|
969 | linep->touch (); |
|
|
970 | |
|
|
971 | while (*tp == NOCHAR && tp > linep->t) |
|
|
972 | tp--, rp--; |
|
|
973 | |
|
|
974 | // first try to find a precomposed character |
|
|
975 | unicode_t n = rxvt_compose (*tp, c); |
|
|
976 | if (n == NOCHAR) |
|
|
977 | n = rxvt_composite.compose (*tp, c); |
|
|
978 | |
|
|
979 | *tp = n; |
|
|
980 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
981 | #endif |
1004 | #endif |
982 | } |
|
|
983 | } |
1005 | } |
984 | |
1006 | |
985 | max_it (line->l, screen.cur.col); |
1007 | max_it (line->l, screen.cur.col); |
986 | |
1008 | |
987 | #ifdef DEBUG_STRICT |
1009 | #ifdef DEBUG_STRICT |
… | |
… | |
1435 | * Insert/Delete <count> characters from the current position |
1457 | * Insert/Delete <count> characters from the current position |
1436 | */ |
1458 | */ |
1437 | void |
1459 | void |
1438 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1460 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1439 | { |
1461 | { |
1440 | int col, row; |
|
|
1441 | rend_t tr; |
|
|
1442 | |
|
|
1443 | want_refresh = 1; |
1462 | want_refresh = 1; |
1444 | ZERO_SCROLLBACK (); |
1463 | ZERO_SCROLLBACK (); |
1445 | |
1464 | |
1446 | if (count <= 0) |
1465 | if (count <= 0) |
1447 | return; |
1466 | return; |
… | |
… | |
1449 | scr_do_wrap (); |
1468 | scr_do_wrap (); |
1450 | |
1469 | |
1451 | selection_check (1); |
1470 | selection_check (1); |
1452 | min_it (count, ncol - screen.cur.col); |
1471 | min_it (count, ncol - screen.cur.col); |
1453 | |
1472 | |
1454 | row = screen.cur.row; |
1473 | int row = screen.cur.row; |
1455 | |
1474 | |
1456 | line_t *line = &ROW(row); |
1475 | line_t *line = &ROW(row); |
1457 | |
1476 | |
1458 | line->touch (); |
1477 | line->touch (); |
1459 | line->is_longer (0); |
1478 | line->is_longer (0); |
1460 | |
1479 | |
|
|
1480 | // nuke wide spanning the start |
|
|
1481 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1482 | scr_kill_char (*line, screen.cur.col); |
|
|
1483 | |
1461 | switch (insdel) |
1484 | switch (insdel) |
1462 | { |
1485 | { |
1463 | case INSERT: |
1486 | case INSERT: |
1464 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1487 | line->l = min (line->l + count, ncol); |
|
|
1488 | |
|
|
1489 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1490 | scr_kill_char (*line, screen.cur.col); |
|
|
1491 | |
|
|
1492 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1465 | { |
1493 | { |
1466 | line->t[col] = line->t[col - count]; |
1494 | line->t[col] = line->t[col - count]; |
1467 | line->r[col] = line->r[col - count]; |
1495 | line->r[col] = line->r[col - count]; |
1468 | } |
1496 | } |
1469 | |
|
|
1470 | line->l = min (line->l + count, ncol); |
|
|
1471 | |
1497 | |
1472 | if (selection.op && current_screen == selection.screen |
1498 | if (selection.op && current_screen == selection.screen |
1473 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1499 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1474 | { |
1500 | { |
1475 | if (selection.end.row != screen.cur.row |
1501 | if (selection.end.row != screen.cur.row |
… | |
… | |
1490 | case ERASE: |
1516 | case ERASE: |
1491 | screen.cur.col += count; /* don't worry if > ncol */ |
1517 | screen.cur.col += count; /* don't worry if > ncol */ |
1492 | selection_check (1); |
1518 | selection_check (1); |
1493 | screen.cur.col -= count; |
1519 | screen.cur.col -= count; |
1494 | |
1520 | |
1495 | line->l = max (line->l - count, 0); |
1521 | // nuke wide char after the end |
|
|
1522 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1523 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1524 | |
1496 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1525 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1497 | break; |
1526 | break; |
1498 | |
1527 | |
1499 | case DELETE: |
1528 | case DELETE: |
1500 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1529 | line->l = max (line->l - count, 0); |
1501 | |
1530 | |
|
|
1531 | // nuke wide char spanning the end |
|
|
1532 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1533 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1534 | |
1502 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1535 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1503 | { |
1536 | { |
1504 | line->t[col] = line->t[col + count]; |
1537 | line->t[col] = line->t[col + count]; |
1505 | line->r[col] = line->r[col + count]; |
1538 | line->r[col] = line->r[col + count]; |
1506 | } |
1539 | } |
1507 | |
1540 | |
1508 | line->l = max (line->l - count, 0); |
|
|
1509 | scr_blank_line (*line, ncol - count, count, tr); |
1541 | scr_blank_line (*line, ncol - count, count, |
|
|
1542 | line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask)); |
1510 | |
1543 | |
1511 | if (selection.op && current_screen == selection.screen |
1544 | if (selection.op && current_screen == selection.screen |
1512 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1513 | { |
1546 | { |
1514 | if (selection.end.row != screen.cur.row |
1547 | if (selection.end.row != screen.cur.row |
… | |
… | |
1892 | XMapWindow (dpy, parent[0]); |
1925 | XMapWindow (dpy, parent[0]); |
1893 | # endif |
1926 | # endif |
1894 | |
1927 | |
1895 | # if ENABLE_FRILLS |
1928 | # if ENABLE_FRILLS |
1896 | if (option (Opt_urgentOnBell)) |
1929 | if (option (Opt_urgentOnBell)) |
1897 | { |
1930 | set_urgency (1); |
1898 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
|
|
1899 | { |
|
|
1900 | h->flags |= XUrgencyHint; |
|
|
1901 | XSetWMHints (dpy, parent[0], h); |
|
|
1902 | } |
|
|
1903 | } |
|
|
1904 | # endif |
1931 | # endif |
1905 | |
1932 | |
1906 | if (option (Opt_visualBell)) |
1933 | if (option (Opt_visualBell)) |
1907 | { |
1934 | { |
1908 | rvideo_bell = true; |
1935 | rvideo_bell = true; |
… | |
… | |
2203 | continue; |
2230 | continue; |
2204 | |
2231 | |
2205 | // redraw one or more characters |
2232 | // redraw one or more characters |
2206 | |
2233 | |
2207 | // seek to the beginning of wide characters |
2234 | // seek to the beginning of wide characters |
2208 | while (stp[col] == NOCHAR && col > 0) |
2235 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2209 | --col; |
2236 | --col; |
2210 | |
2237 | |
2211 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2238 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2212 | text_t *text = stp + col; |
2239 | text_t *text = stp + col; |
2213 | int count = 1; |
2240 | int count = 1; |
… | |
… | |
2250 | |
2277 | |
2251 | col--; /* went one too far. move back */ |
2278 | col--; /* went one too far. move back */ |
2252 | count -= i; /* dump any matching trailing chars */ |
2279 | count -= i; /* dump any matching trailing chars */ |
2253 | |
2280 | |
2254 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2281 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2255 | while (i && text[count] == NOCHAR) |
2282 | while (expect_false (i && text[count] == NOCHAR)) |
2256 | count++, i--; |
2283 | count++, i--; |
2257 | |
2284 | |
2258 | /* |
2285 | /* |
2259 | * Determine the attributes for the string |
2286 | * Determine the attributes for the string |
2260 | */ |
2287 | */ |
2261 | int fore = fgcolor_of (rend); // desired foreground |
2288 | int fore = fgcolor_of (rend); // desired foreground |
2262 | int back = bgcolor_of (rend); // desired background |
2289 | int back = bgcolor_of (rend); // desired background |
2263 | |
2290 | |
2264 | // only do special processing if any attributes are set, which is unlikely |
2291 | // only do special processing if any attributes are set, which is unlikely |
2265 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2292 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2266 | { |
2293 | { |
2267 | bool invert = rend & RS_RVid; |
2294 | bool invert = rend & RS_RVid; |
2268 | |
2295 | |
2269 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2296 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2270 | if (rend & RS_Bold && fore == Color_fg) |
2297 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2353 | /* |
2380 | /* |
2354 | * Actually do the drawing of the string here |
2381 | * Actually do the drawing of the string here |
2355 | */ |
2382 | */ |
2356 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2383 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2357 | |
2384 | |
2358 | if (have_bg && back == Color_bg) |
2385 | if (expect_true (have_bg && back == Color_bg)) |
2359 | { |
2386 | { |
2360 | // this is very ugly, maybe push it into ->draw? |
2387 | // this is very ugly, maybe push it into ->draw? |
2361 | |
2388 | |
2362 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2389 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2363 | if (text[i] != ' ') |
2390 | if (text[i] != ' ') |
… | |
… | |
2370 | did_clear: ; |
2397 | did_clear: ; |
2371 | } |
2398 | } |
2372 | else |
2399 | else |
2373 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2400 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2374 | |
2401 | |
2375 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2402 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2376 | { |
2403 | { |
2377 | #if ENABLE_FRILLS |
2404 | #if ENABLE_FRILLS |
2378 | if (ISSET_PIXCOLOR (Color_underline)) |
2405 | if (ISSET_PIXCOLOR (Color_underline)) |
2379 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2406 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2380 | else |
2407 | else |