… | |
… | |
23 | /* |
23 | /* |
24 | * This file handles _all_ screen updates and selections |
24 | * This file handles _all_ screen updates and selections |
25 | */ |
25 | */ |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #define INTERN_SCREEN |
|
|
29 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
30 | |
29 | |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
32 | |
31 | |
33 | #include <inttypes.h> |
32 | #include <inttypes.h> |
… | |
… | |
112 | (unsigned int)Height2Pixel (num)) |
111 | (unsigned int)Height2Pixel (num)) |
113 | |
112 | |
114 | /* ------------------------------------------------------------------------- * |
113 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
114 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
115 | * ------------------------------------------------------------------------- */ |
|
|
116 | |
117 | /* Fill part/all of a line with blanks. */ |
117 | /* Fill part/all of a line with blanks. */ |
118 | void |
118 | void |
119 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
119 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
120 | { |
120 | { |
121 | efs &= ~RS_baseattrMask; |
121 | efs &= ~RS_baseattrMask; |
122 | efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); |
122 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
123 | |
123 | |
124 | while (width--) |
124 | while (width--) |
125 | { |
125 | { |
126 | *et++ = ' '; |
126 | *et++ = ' '; |
127 | *er++ = efs; |
127 | *er++ = efs; |
… | |
… | |
417 | } |
417 | } |
418 | |
418 | |
419 | void |
419 | void |
420 | rxvt_term::scr_reset_realloc () |
420 | rxvt_term::scr_reset_realloc () |
421 | { |
421 | { |
422 | uint16_t total_rows, nrow; |
422 | unsigned int total_rows, nrow; |
423 | |
423 | |
424 | nrow = TermWin.nrow; |
424 | nrow = TermWin.nrow; |
425 | total_rows = nrow + TermWin.saveLines; |
425 | total_rows = nrow + TermWin.saveLines; |
426 | /* *INDENT-OFF* */ |
426 | /* *INDENT-OFF* */ |
427 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
427 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
… | |
… | |
444 | * Free everything. That way malloc debugging can find leakage. |
444 | * Free everything. That way malloc debugging can find leakage. |
445 | */ |
445 | */ |
446 | void |
446 | void |
447 | rxvt_term::scr_release () |
447 | rxvt_term::scr_release () |
448 | { |
448 | { |
449 | uint16_t total_rows; |
449 | unsigned int total_rows; |
450 | int i; |
450 | int i; |
451 | |
451 | |
452 | total_rows = TermWin.nrow + TermWin.saveLines; |
452 | total_rows = TermWin.nrow + TermWin.saveLines; |
453 | |
453 | |
454 | delete talloc; talloc = 0; |
454 | delete talloc; talloc = 0; |
… | |
… | |
511 | s = &screen; |
511 | s = &screen; |
512 | |
512 | |
513 | switch (mode) |
513 | switch (mode) |
514 | { |
514 | { |
515 | case SAVE: |
515 | case SAVE: |
516 | s->s_cur.row = s->cur.row; |
516 | s->s_cur.row = screen.cur.row; |
517 | s->s_cur.col = s->cur.col; |
517 | s->s_cur.col = screen.cur.col; |
518 | s->s_rstyle = rstyle; |
518 | s->s_rstyle = rstyle; |
519 | s->s_charset = s->charset; |
519 | s->s_charset = screen.charset; |
520 | s->s_charset_char = charsets[s->charset]; |
520 | s->s_charset_char = charsets[screen.charset]; |
521 | break; |
521 | break; |
522 | |
522 | |
523 | case RESTORE: |
523 | case RESTORE: |
524 | want_refresh = 1; |
524 | want_refresh = 1; |
525 | s->cur.row = s->s_cur.row; |
525 | screen.cur.row = s->s_cur.row; |
526 | s->cur.col = s->s_cur.col; |
526 | screen.cur.col = s->s_cur.col; |
527 | s->flags &= ~Screen_WrapNext; |
527 | screen.flags &= ~Screen_WrapNext; |
528 | rstyle = s->s_rstyle; |
528 | rstyle = s->s_rstyle; |
529 | s->charset = s->s_charset; |
529 | screen.charset = s->s_charset; |
530 | charsets[s->charset] = s->s_charset_char; |
530 | charsets[screen.charset] = s->s_charset_char; |
531 | set_font_style (); |
531 | set_font_style (); |
532 | break; |
532 | break; |
533 | } |
533 | } |
534 | |
534 | |
535 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
535 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
… | |
… | |
566 | return scrn; |
566 | return scrn; |
567 | |
567 | |
568 | selection_check (2); /* check for boundary cross */ |
568 | selection_check (2); /* check for boundary cross */ |
569 | |
569 | |
570 | SWAP_IT (current_screen, scrn, int); |
570 | SWAP_IT (current_screen, scrn, int); |
|
|
571 | |
|
|
572 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
|
|
573 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
|
|
574 | # ifdef DEBUG_STRICT |
|
|
575 | assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow); |
|
|
576 | assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol); |
|
|
577 | # else /* drive with your eyes closed */ |
|
|
578 | MAX_IT (screen.cur.row, 0); |
|
|
579 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
|
|
580 | MAX_IT (screen.cur.col, 0); |
|
|
581 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
582 | # endif |
|
|
583 | |
571 | #if NSCREENS |
584 | #if NSCREENS |
572 | if (options & Opt_secondaryScreen) |
585 | if (options & Opt_secondaryScreen) |
573 | { |
586 | { |
574 | num_scr = 0; |
587 | num_scr = 0; |
575 | offset = TermWin.saveLines; |
588 | offset = TermWin.saveLines; |
|
|
589 | |
576 | for (i = prev_nrow; i--;) |
590 | for (i = prev_nrow; i--;) |
577 | { |
591 | { |
578 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
592 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
579 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
593 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
580 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
594 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
581 | } |
595 | } |
582 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
596 | |
583 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
|
|
584 | # ifdef DEBUG_STRICT |
|
|
585 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
|
|
586 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
|
|
587 | # else /* drive with your eyes closed */ |
|
|
588 | MAX_IT (screen.cur.row, 0); |
|
|
589 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
|
|
590 | MAX_IT (screen.cur.col, 0); |
|
|
591 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
592 | # endif |
|
|
593 | SWAP_IT (screen.charset, swap.charset, int16_t); |
597 | SWAP_IT (screen.charset, swap.charset, int16_t); |
594 | SWAP_IT (screen.flags, swap.flags, int); |
598 | SWAP_IT (screen.flags, swap.flags, int); |
595 | screen.flags |= Screen_VisibleCursor; |
599 | screen.flags |= Screen_VisibleCursor; |
596 | swap.flags |= Screen_VisibleCursor; |
600 | swap.flags |= Screen_VisibleCursor; |
597 | } |
601 | } |
598 | else |
602 | else |
599 | #endif |
603 | #endif |
600 | if (options & Opt_secondaryScroll) |
604 | if (options & Opt_secondaryScroll) |
601 | //if (current_screen == PRIMARY) |
605 | //if (current_screen == PRIMARY) |
602 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
606 | scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); |
|
|
607 | |
603 | return scrn; |
608 | return scrn; |
604 | } |
609 | } |
605 | |
610 | |
606 | // clear WrapNext indicator, solidifying position on next line |
611 | // clear WrapNext indicator, solidifying position on next line |
607 | void |
612 | void |
… | |
… | |
625 | * Change the colour for following text |
630 | * Change the colour for following text |
626 | */ |
631 | */ |
627 | void |
632 | void |
628 | rxvt_term::scr_color (unsigned int color, int fgbg) |
633 | rxvt_term::scr_color (unsigned int color, int fgbg) |
629 | { |
634 | { |
630 | color &= RS_fgMask; |
635 | if (color > maxTermCOLOR) |
|
|
636 | color = fgbg; |
|
|
637 | |
631 | if (fgbg == Color_fg) |
638 | if (fgbg == Color_fg) |
632 | rstyle = SET_FGCOLOR (rstyle, color); |
639 | rstyle = SET_FGCOLOR (rstyle, color); |
633 | else |
640 | else |
634 | rstyle = SET_BGCOLOR (rstyle, color); |
641 | rstyle = SET_BGCOLOR (rstyle, color); |
635 | } |
642 | } |
… | |
… | |
673 | nscrolled = (long)TermWin.nscrolled + (long)count; |
680 | nscrolled = (long)TermWin.nscrolled + (long)count; |
674 | |
681 | |
675 | if (nscrolled > (long)TermWin.saveLines) |
682 | if (nscrolled > (long)TermWin.saveLines) |
676 | TermWin.nscrolled = TermWin.saveLines; |
683 | TermWin.nscrolled = TermWin.saveLines; |
677 | else |
684 | else |
678 | TermWin.nscrolled = (uint16_t)nscrolled; |
685 | TermWin.nscrolled = (unsigned int)nscrolled; |
679 | |
686 | |
680 | if ((options & Opt_scrollWithBuffer) |
687 | if ((options & Opt_scrollWithBuffer) |
681 | && TermWin.view_start != 0 |
688 | && TermWin.view_start != 0 |
682 | && TermWin.view_start != TermWin.saveLines) |
689 | && TermWin.view_start != TermWin.saveLines) |
683 | scr_page (UP, count); |
690 | scr_page (UP, count); |
… | |
… | |
826 | |
833 | |
827 | if (c < 0x20) |
834 | if (c < 0x20) |
828 | switch (c) |
835 | switch (c) |
829 | { |
836 | { |
830 | case C0_HT: |
837 | case C0_HT: |
831 | scr_tab (1); |
838 | scr_tab (1, true); |
832 | continue; |
839 | continue; |
833 | |
840 | |
834 | case C0_LF: |
841 | case C0_LF: |
835 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
842 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
836 | MAX_IT (screen.tlen[row], screen.cur.col); |
843 | MAX_IT (screen.tlen[row], screen.cur.col); |
… | |
… | |
876 | |
883 | |
877 | stp = screen.text[row]; /* _must_ refresh */ |
884 | stp = screen.text[row]; /* _must_ refresh */ |
878 | srp = screen.rend[row]; /* _must_ refresh */ |
885 | srp = screen.rend[row]; /* _must_ refresh */ |
879 | } |
886 | } |
880 | |
887 | |
881 | if (screen.flags & Screen_Insert) |
|
|
882 | scr_insdel_chars (1, INSERT); |
|
|
883 | |
|
|
884 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
888 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
885 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
889 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
886 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
890 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
887 | int width = c < 0x100 ? 1 : wcwidth (c); |
891 | int width = c < 0x100 ? 1 : wcwidth (c); |
888 | |
892 | |
889 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
893 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
890 | { |
894 | { |
891 | // vt100 special graphics and line drawing |
895 | // vt100 special graphics and line drawing |
|
|
896 | // 5f-7e standard vt100 |
|
|
897 | // 40-5e rxvt extension for extra curses acs chars |
892 | static uint16_t vt100_0[32] = { // 5f .. 7e |
898 | static uint16_t vt100_0[63] = { // 40 .. 7e |
|
|
899 | 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! |
|
|
900 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f |
|
|
901 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 |
|
|
902 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f |
893 | 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, |
903 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
894 | 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, |
904 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
895 | 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, |
905 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
896 | 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, |
906 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
897 | }; |
907 | }; |
898 | |
908 | |
899 | if (c >= 0x5f && c <= 0x7e) |
909 | if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) |
900 | { |
910 | { |
901 | c = vt100_0[c - 0x5f]; |
911 | c = vt100_0[c - 0x40]; |
902 | width = 1; |
912 | width = 1; |
903 | } |
913 | } |
904 | } |
914 | } |
905 | |
915 | |
|
|
916 | if (screen.flags & Screen_Insert) |
|
|
917 | scr_insdel_chars (width, INSERT); |
|
|
918 | |
906 | if (width != 0) |
919 | if (width != 0) |
907 | { |
920 | { |
|
|
921 | // some utf-8 decoders decode surrogate characters. |
|
|
922 | if (0xd800 <= c && c <= 0xdfff) |
|
|
923 | c = 0xfffd; |
|
|
924 | |
908 | #if !UNICODE_3 |
925 | #if !UNICODE_3 |
909 | // trim characters we can't store directly :( |
926 | // trim characters we can't store directly :( |
910 | if (c >= 0x10000) |
927 | if (c >= 0x10000) |
911 | # if ENABLE_COMBINING |
928 | # if ENABLE_COMBINING |
912 | c = rxvt_composite.compose (c); // map to lower 16 bits |
929 | c = rxvt_composite.compose (c); // map to lower 16 bits |
913 | # else |
930 | # else |
914 | c = 0xfffd; |
931 | c = 0xfffd; |
915 | # endif |
932 | # endif |
916 | #endif |
933 | #endif |
917 | bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0); |
934 | |
918 | rend_t rend = SET_FONT (rstyle, |
935 | // nuke the character at this position, if required |
919 | c > 0x7f || bold || c < 0x20 |
936 | if (stp[screen.cur.col] == NOCHAR |
920 | ? TermWin.fontset->find_font (c, bold) |
937 | || (screen.cur.col < TermWin.ncol - 1 |
921 | : TermWin.ascii_map [c - 0x20]); |
938 | && stp[screen.cur.col + 1] == NOCHAR)) |
|
|
939 | { |
|
|
940 | int col = screen.cur.col; |
|
|
941 | |
|
|
942 | // find begin |
|
|
943 | while (col > 0 && stp[col] == NOCHAR) |
|
|
944 | col--; |
|
|
945 | |
|
|
946 | rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); |
|
|
947 | |
|
|
948 | // found begin, nuke |
|
|
949 | do { |
|
|
950 | stp[col] = ' '; |
|
|
951 | srp[col] = rend; |
|
|
952 | col++; |
|
|
953 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
|
|
954 | } |
|
|
955 | |
|
|
956 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
922 | |
957 | |
923 | do |
958 | do |
924 | { |
959 | { |
925 | stp[screen.cur.col] = c; |
960 | stp[screen.cur.col] = c; |
926 | srp[screen.cur.col] = rend; |
961 | srp[screen.cur.col] = rend; |
… | |
… | |
959 | |
994 | |
960 | if (screen.cur.col > 0) |
995 | if (screen.cur.col > 0) |
961 | { |
996 | { |
962 | tp = stp + screen.cur.col - 1; |
997 | tp = stp + screen.cur.col - 1; |
963 | rp = srp + screen.cur.col - 1; |
998 | rp = srp + screen.cur.col - 1; |
|
|
999 | |
|
|
1000 | while (*tp == NOCHAR && tp > stp) |
|
|
1001 | tp--, rp--; |
964 | } |
1002 | } |
965 | else if (screen.cur.row > 0 |
1003 | else if (screen.cur.row > 0 |
966 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
1004 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
967 | { |
1005 | { |
968 | tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
1006 | int line = screen.cur.row - 1 + TermWin.saveLines; |
969 | rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
1007 | |
|
|
1008 | tp = screen.text[line] + last_col - 1; |
|
|
1009 | rp = screen.rend[line] + last_col - 1; |
|
|
1010 | |
|
|
1011 | while (*tp == NOCHAR && tp > screen.text[line]) |
|
|
1012 | tp--, rp--; |
970 | } |
1013 | } |
971 | else |
1014 | else |
972 | continue; |
1015 | continue; |
973 | |
|
|
974 | // handle double-width-chars by making them look extremely ugly |
|
|
975 | if (*tp == NOCHAR) |
|
|
976 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
|
|
977 | |
1016 | |
978 | // first try to find a precomposed character |
1017 | // first try to find a precomposed character |
979 | unicode_t n = rxvt_compose (*tp, c); |
1018 | unicode_t n = rxvt_compose (*tp, c); |
980 | if (n == NOCHAR) |
1019 | if (n == NOCHAR) |
981 | n = rxvt_composite.compose (*tp, c); |
1020 | n = rxvt_composite.compose (*tp, c); |
982 | |
1021 | |
983 | *tp = n; |
1022 | *tp = n; |
984 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
1023 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
985 | #endif |
1024 | #endif |
986 | } |
1025 | } |
987 | } |
1026 | } |
988 | |
1027 | |
989 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1028 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
… | |
… | |
1028 | * Process Horizontal Tab |
1067 | * Process Horizontal Tab |
1029 | * count: +ve = forward; -ve = backwards |
1068 | * count: +ve = forward; -ve = backwards |
1030 | * XTERM_SEQ: CTRL-I |
1069 | * XTERM_SEQ: CTRL-I |
1031 | */ |
1070 | */ |
1032 | void |
1071 | void |
1033 | rxvt_term::scr_tab (int count) |
1072 | rxvt_term::scr_tab (int count, bool ht) |
1034 | { |
1073 | { |
1035 | int i, x; |
1074 | int i, x; |
1036 | |
1075 | |
1037 | want_refresh = 1; |
1076 | want_refresh = 1; |
1038 | i = x = screen.cur.col; |
1077 | i = x = screen.cur.col; |
1039 | |
1078 | |
1040 | if (count == 0) |
1079 | if (count == 0) |
1041 | return; |
1080 | return; |
1042 | else if (count > 0) |
1081 | else if (count > 0) |
1043 | { |
1082 | { |
|
|
1083 | int row = TermWin.saveLines + screen.cur.row; |
|
|
1084 | text_t *tp = screen.text[row]; |
|
|
1085 | rend_t *rp = screen.rend[row]; |
|
|
1086 | rend_t base_rend = rp[i]; |
|
|
1087 | ht &= tp[i] == ' '; |
|
|
1088 | |
1044 | for (; ++i < TermWin.ncol; ) |
1089 | for (; ++i < TermWin.ncol; ) |
1045 | if (tabs[i]) |
1090 | if (tabs[i]) |
1046 | { |
1091 | { |
1047 | x = i; |
1092 | x = i; |
1048 | if (!--count) |
1093 | if (!--count) |
1049 | break; |
1094 | break; |
1050 | } |
1095 | } |
|
|
1096 | else |
|
|
1097 | ht &= tp[i] == ' ' |
|
|
1098 | && RS_SAME (rp[i], base_rend); |
1051 | |
1099 | |
1052 | if (count) |
1100 | if (count) |
1053 | x = TermWin.ncol - 1; |
1101 | x = TermWin.ncol - 1; |
|
|
1102 | |
|
|
1103 | // store horizontal tab commands as characters inside the text |
|
|
1104 | // buffer so they can be selected and pasted. |
|
|
1105 | if (ht && options & Opt_pastableTabs) |
|
|
1106 | { |
|
|
1107 | base_rend = SET_FONT (base_rend, 0); |
|
|
1108 | |
|
|
1109 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
1110 | MAX_IT (screen.tlen[row], x); |
|
|
1111 | |
|
|
1112 | i = screen.cur.col; |
|
|
1113 | |
|
|
1114 | tp[i] = '\t'; |
|
|
1115 | rp[i] = base_rend; |
|
|
1116 | |
|
|
1117 | while (++i < x) |
|
|
1118 | { |
|
|
1119 | tp[i] = NOCHAR; |
|
|
1120 | rp[i] = base_rend; |
|
|
1121 | } |
|
|
1122 | } |
1054 | } |
1123 | } |
1055 | else /* if (count < 0) */ |
1124 | else /* if (count < 0) */ |
1056 | { |
1125 | { |
1057 | for (; --i >= 0; ) |
1126 | for (; --i >= 0; ) |
1058 | if (tabs[i]) |
1127 | if (tabs[i]) |
… | |
… | |
1314 | ren = DEFAULT_RSTYLE; |
1383 | ren = DEFAULT_RSTYLE; |
1315 | CLEAR_ROWS (row, num); |
1384 | CLEAR_ROWS (row, num); |
1316 | } |
1385 | } |
1317 | else |
1386 | else |
1318 | { |
1387 | { |
1319 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1388 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1320 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1389 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1321 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1390 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1322 | ERASE_ROWS (row, num); |
1391 | ERASE_ROWS (row, num); |
1323 | gcvalue.foreground = pix_colors[Color_fg]; |
1392 | gcvalue.foreground = pix_colors[Color_fg]; |
1324 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1393 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1325 | } |
1394 | } |
1326 | |
1395 | |
1327 | for (; num--; row++) |
1396 | for (; num--; row++) |
1328 | { |
1397 | { |
1329 | scr_blank_screen_mem (screen.text, screen.rend, |
1398 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); |
1330 | (unsigned int) (row + row_offset), rstyle); |
|
|
1331 | screen.tlen[row + row_offset] = 0; |
1399 | screen.tlen[row + row_offset] = 0; |
1332 | scr_blank_line (drawn_text[row], drawn_rend[row], |
1400 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1333 | (unsigned int)TermWin.ncol, ren); |
|
|
1334 | } |
1401 | } |
1335 | } |
1402 | } |
1336 | |
1403 | |
1337 | /* ------------------------------------------------------------------------- */ |
1404 | /* ------------------------------------------------------------------------- */ |
1338 | /* |
1405 | /* |
… | |
… | |
1349 | ZERO_SCROLLBACK (); |
1416 | ZERO_SCROLLBACK (); |
1350 | |
1417 | |
1351 | num_scr_allow = 0; |
1418 | num_scr_allow = 0; |
1352 | selection_check (3); |
1419 | selection_check (3); |
1353 | |
1420 | |
1354 | fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); |
1421 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1355 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1422 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1356 | { |
1423 | { |
1357 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1424 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1358 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1425 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1359 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
1426 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
… | |
… | |
1422 | slp = &screen.tlen[row]; |
1489 | slp = &screen.tlen[row]; |
1423 | |
1490 | |
1424 | switch (insdel) |
1491 | switch (insdel) |
1425 | { |
1492 | { |
1426 | case INSERT: |
1493 | case INSERT: |
1427 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1494 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) |
1428 | col--) |
|
|
1429 | { |
1495 | { |
1430 | stp[col] = stp[col - count]; |
1496 | stp[col] = stp[col - count]; |
1431 | srp[col] = srp[col - count]; |
1497 | srp[col] = srp[col - count]; |
1432 | } |
1498 | } |
1433 | |
1499 | |
… | |
… | |
1443 | if (selection.end.row != screen.cur.row |
1509 | if (selection.end.row != screen.cur.row |
1444 | || (selection.end.col + count >= TermWin.ncol)) |
1510 | || (selection.end.col + count >= TermWin.ncol)) |
1445 | CLEAR_SELECTION (); |
1511 | CLEAR_SELECTION (); |
1446 | else |
1512 | else |
1447 | { /* shift selection */ |
1513 | { /* shift selection */ |
1448 | selection.beg.col += count; |
1514 | selection.beg.col += count; |
1449 | selection.mark.col += count; /* XXX: yes? */ |
1515 | selection.mark.col += count; /* XXX: yes? */ |
1450 | selection.end.col += count; |
1516 | selection.end.col += count; |
1451 | } |
1517 | } |
1452 | } |
1518 | } |
1453 | |
1519 | |
1454 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1520 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1455 | (unsigned int)count, rstyle); |
1521 | (unsigned int)count, rstyle); |
1456 | break; |
1522 | break; |
1457 | |
1523 | |
1458 | case ERASE: |
1524 | case ERASE: |
1459 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1525 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1460 | selection_check (1); |
1526 | selection_check (1); |
1461 | screen.cur.col -= count; |
1527 | screen.cur.col -= count; |
1462 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1528 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1463 | (unsigned int)count, rstyle); |
1529 | (unsigned int)count, rstyle); |
1464 | break; |
1530 | break; |
1465 | |
1531 | |
1466 | case DELETE: |
1532 | case DELETE: |
1467 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1533 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1470 | { |
1536 | { |
1471 | stp[col] = stp[col + count]; |
1537 | stp[col] = stp[col + count]; |
1472 | srp[col] = srp[col + count]; |
1538 | srp[col] = srp[col + count]; |
1473 | } |
1539 | } |
1474 | |
1540 | |
1475 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1541 | scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], |
1476 | & (srp[TermWin.ncol - count]), |
|
|
1477 | (unsigned int)count, tr); |
1542 | (unsigned int)count, tr); |
1478 | |
1543 | |
1479 | if (*slp == -1) /* break line continuation */ |
1544 | if (*slp == -1) /* break line continuation */ |
1480 | *slp = TermWin.ncol; |
1545 | *slp = TermWin.ncol; |
1481 | |
1546 | |
… | |
… | |
1490 | || selection.end.col >= TermWin.ncol) |
1555 | || selection.end.col >= TermWin.ncol) |
1491 | CLEAR_SELECTION (); |
1556 | CLEAR_SELECTION (); |
1492 | else |
1557 | else |
1493 | { |
1558 | { |
1494 | /* shift selection */ |
1559 | /* shift selection */ |
1495 | selection.beg.col -= count; |
1560 | selection.beg.col -= count; |
1496 | selection.mark.col -= count; /* XXX: yes? */ |
1561 | selection.mark.col -= count; /* XXX: yes? */ |
1497 | selection.end.col -= count; |
1562 | selection.end.col -= count; |
1498 | } |
1563 | } |
1499 | } |
1564 | } |
1500 | |
1565 | |
1501 | break; |
1566 | break; |
1502 | } |
1567 | } |
… | |
… | |
1568 | { |
1633 | { |
1569 | if (mode) |
1634 | if (mode) |
1570 | screen.flags |= Screen_Relative; |
1635 | screen.flags |= Screen_Relative; |
1571 | else |
1636 | else |
1572 | screen.flags &= ~Screen_Relative; |
1637 | screen.flags &= ~Screen_Relative; |
|
|
1638 | |
1573 | scr_gotorc (0, 0, 0); |
1639 | scr_gotorc (0, 0, 0); |
1574 | } |
1640 | } |
1575 | |
1641 | |
1576 | /* ------------------------------------------------------------------------- */ |
1642 | /* ------------------------------------------------------------------------- */ |
1577 | /* |
1643 | /* |
… | |
… | |
1617 | |
1683 | |
1618 | if (rvideo != mode) |
1684 | if (rvideo != mode) |
1619 | { |
1685 | { |
1620 | rvideo = mode; |
1686 | rvideo = mode; |
1621 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1687 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1622 | #if defined(XPM_BACKGROUND) |
1688 | #if XPM_BACKGROUND |
1623 | if (bgPixmap.pixmap == None) |
1689 | if (bgPixmap.pixmap == None) |
1624 | #endif |
1690 | #endif |
1625 | #if defined(TRANSPARENT) |
1691 | #if TRANSPARENT |
1626 | if (! (options & Opt_transparent) || am_transparent == 0) |
1692 | if (! (options & Opt_transparent) || am_transparent == 0) |
1627 | #endif |
1693 | #endif |
1628 | XSetWindowBackground (display->display, TermWin.vt, |
1694 | XSetWindowBackground (display->display, TermWin.vt, |
1629 | pix_colors[Color_bg]); |
1695 | pix_colors[Color_bg]); |
1630 | |
1696 | |
… | |
… | |
1685 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1751 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1686 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1752 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1687 | */ |
1753 | */ |
1688 | void |
1754 | void |
1689 | rxvt_term::scr_charset_choose (int set) |
1755 | rxvt_term::scr_charset_choose (int set) |
1690 | { |
1756 | { |
1691 | screen.charset = set; |
1757 | screen.charset = set; |
1692 | set_font_style (); |
1758 | set_font_style (); |
1693 | } |
1759 | } |
1694 | |
1760 | |
1695 | /* ------------------------------------------------------------------------- */ |
1761 | /* ------------------------------------------------------------------------- */ |
1696 | /* |
1762 | /* |
1697 | * Set a font |
1763 | * Set a font |
1698 | * XTERM_SEQ: Set G0 character set: ESC ( <C> |
1764 | * XTERM_SEQ: Set G0 character set: ESC ( <C> |
… | |
… | |
1701 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1767 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1702 | * See set_font_style for possible values for <C> |
1768 | * See set_font_style for possible values for <C> |
1703 | */ |
1769 | */ |
1704 | void |
1770 | void |
1705 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1771 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1706 | { |
1772 | { |
1707 | charsets[set] = (unsigned char)ch; |
1773 | charsets[set] = (unsigned char)ch; |
1708 | set_font_style (); |
1774 | set_font_style (); |
1709 | } |
1775 | } |
1710 | |
1776 | |
1711 | |
1777 | |
1712 | /* ------------------------------------------------------------------------- * |
1778 | /* ------------------------------------------------------------------------- * |
1713 | * MAJOR SCREEN MANIPULATION * |
1779 | * MAJOR SCREEN MANIPULATION * |
1714 | * ------------------------------------------------------------------------- */ |
1780 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1808 | */ |
1874 | */ |
1809 | int |
1875 | int |
1810 | rxvt_term::scr_move_to (int y, int len) |
1876 | rxvt_term::scr_move_to (int y, int len) |
1811 | { |
1877 | { |
1812 | long p = 0; |
1878 | long p = 0; |
1813 | uint16_t oldviewstart; |
1879 | unsigned int oldviewstart; |
1814 | |
1880 | |
1815 | oldviewstart = TermWin.view_start; |
1881 | oldviewstart = TermWin.view_start; |
1816 | |
1882 | |
1817 | if (y < len) |
1883 | if (y < len) |
1818 | { |
1884 | { |
1819 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1885 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1820 | p -= (long) (TermWin.nrow - 1); |
1886 | p -= (long) (TermWin.nrow - 1); |
1821 | p = max (p, 0); |
1887 | p = max (p, 0); |
1822 | } |
1888 | } |
1823 | |
1889 | |
1824 | TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); |
1890 | TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); |
1825 | |
1891 | |
1826 | return scr_changeview (oldviewstart); |
1892 | return scr_changeview (oldviewstart); |
1827 | } |
1893 | } |
1828 | |
1894 | |
1829 | /* ------------------------------------------------------------------------- */ |
1895 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1833 | */ |
1899 | */ |
1834 | int |
1900 | int |
1835 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1901 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1836 | { |
1902 | { |
1837 | int n; |
1903 | int n; |
1838 | uint16_t oldviewstart; |
1904 | unsigned int oldviewstart; |
1839 | |
1905 | |
1840 | #ifdef DEBUG_STRICT |
1906 | #ifdef DEBUG_STRICT |
1841 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1907 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1842 | #endif |
1908 | #endif |
1843 | oldviewstart = TermWin.view_start; |
1909 | oldviewstart = TermWin.view_start; |
… | |
… | |
1853 | } |
1919 | } |
1854 | return scr_changeview (oldviewstart); |
1920 | return scr_changeview (oldviewstart); |
1855 | } |
1921 | } |
1856 | |
1922 | |
1857 | int |
1923 | int |
1858 | rxvt_term::scr_changeview (uint16_t oldviewstart) |
1924 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1859 | { |
1925 | { |
1860 | if (TermWin.view_start != oldviewstart) |
1926 | if (TermWin.view_start != oldviewstart) |
1861 | { |
1927 | { |
1862 | want_refresh = 1; |
1928 | want_refresh = 1; |
1863 | num_scr -= (TermWin.view_start - oldviewstart); |
1929 | num_scr -= (TermWin.view_start - oldviewstart); |
… | |
… | |
1960 | |
2026 | |
1961 | void |
2027 | void |
1962 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2028 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1963 | { |
2029 | { |
1964 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2030 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1965 | rvid, /* reverse video this position */ |
|
|
1966 | showcursor; /* show the cursor */ |
2031 | showcursor; /* show the cursor */ |
1967 | int16_t col, row, /* column/row we're processing */ |
2032 | int16_t col, row, /* column/row we're processing */ |
1968 | ocrow; /* old cursor row */ |
2033 | ocrow; /* old cursor row */ |
1969 | int i, /* tmp */ |
2034 | int i, /* tmp */ |
1970 | row_offset; /* basic offset in screen structure */ |
2035 | row_offset; /* basic offset in screen structure */ |
1971 | #ifndef NO_CURSORCOLOR |
2036 | #ifndef NO_CURSORCOLOR |
1972 | rend_t cc1; /* store colours at cursor position (s) */ |
2037 | rend_t cc1; /* store colours at cursor position (s) */ |
1973 | #endif |
2038 | #endif |
1974 | rend_t *crp; // cursor rendition pointer |
2039 | rend_t *crp; // cursor rendition pointer |
1975 | |
2040 | |
|
|
2041 | want_refresh = 0; /* screen is current */ |
|
|
2042 | |
1976 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
2043 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1977 | return; |
2044 | return; |
1978 | |
2045 | |
1979 | /* |
2046 | /* |
1980 | * A: set up vars |
2047 | * A: set up vars |
… | |
… | |
1982 | must_clear = 0; |
2049 | must_clear = 0; |
1983 | refresh_count = 0; |
2050 | refresh_count = 0; |
1984 | |
2051 | |
1985 | row_offset = TermWin.saveLines - TermWin.view_start; |
2052 | row_offset = TermWin.saveLines - TermWin.view_start; |
1986 | |
2053 | |
1987 | #ifdef XPM_BACKGROUND |
2054 | #if XPM_BACKGROUND |
1988 | must_clear |= (bgPixmap.pixmap != None); |
2055 | must_clear |= (bgPixmap.pixmap != None); |
1989 | #endif |
2056 | #endif |
1990 | #ifdef TRANSPARENT |
2057 | #if TRANSPARENT |
1991 | must_clear |= ((options & Opt_transparent) && am_transparent); |
2058 | must_clear |= ((options & Opt_transparent) && am_transparent); |
1992 | #endif |
2059 | #endif |
1993 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2060 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1994 | |
2061 | |
1995 | /* |
2062 | /* |
1996 | * B: reverse any characters which are selected |
2063 | * B: reverse any characters which are selected |
1997 | */ |
2064 | */ |
1998 | scr_reverse_selection (); |
2065 | scr_reverse_selection (); |
1999 | #if ENABLE_OVERLAY |
|
|
2000 | scr_swap_overlay (); |
|
|
2001 | #endif |
|
|
2002 | |
2066 | |
2003 | /* |
2067 | /* |
2004 | * C: set the cursor character (s) |
2068 | * C: set the cursor character (s) |
2005 | */ |
2069 | */ |
2006 | { |
2070 | { |
… | |
… | |
2080 | oldcursor.col = screen.cur.col; |
2144 | oldcursor.col = screen.cur.col; |
2081 | } |
2145 | } |
2082 | } |
2146 | } |
2083 | } |
2147 | } |
2084 | |
2148 | |
|
|
2149 | #if ENABLE_OVERLAY |
|
|
2150 | scr_swap_overlay (); |
|
|
2151 | #endif |
|
|
2152 | |
2085 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
2153 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
2086 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
2154 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
2155 | |
2087 | #ifndef NO_SLOW_LINK_SUPPORT |
2156 | #ifndef NO_SLOW_LINK_SUPPORT |
2088 | /* |
2157 | /* |
2089 | * D: CopyArea pass - very useful for slower links |
2158 | * D: CopyArea pass - very useful for slower links |
2090 | * This has been deliberately kept simple. |
2159 | * This has been deliberately kept simple. |
2091 | */ |
2160 | */ |
… | |
… | |
2168 | |
2237 | |
2169 | for (col = 0; col < TermWin.ncol; col++) |
2238 | for (col = 0; col < TermWin.ncol; col++) |
2170 | { |
2239 | { |
2171 | /* compare new text with old - if exactly the same then continue */ |
2240 | /* compare new text with old - if exactly the same then continue */ |
2172 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2241 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2173 | && (srp[col] == drp[col] /* Either rendition the same or */ |
2242 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2174 | || (stp[col] == ' ' /* space w/ no background change */ |
2243 | || (stp[col] == ' ' /* space w/ no background change */ |
2175 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
2244 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
2176 | continue; |
2245 | continue; |
2177 | |
2246 | |
2178 | // redraw one or more characters |
2247 | // redraw one or more characters |
2179 | |
2248 | |
2180 | // seek to the beginning if wide characters |
2249 | // seek to the beginning of wide characters |
2181 | while (stp[col] == NOCHAR && col > 0) |
2250 | while (stp[col] == NOCHAR && col > 0) |
2182 | --col; |
2251 | --col; |
2183 | |
2252 | |
2184 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2253 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2185 | text_t *text = stp + col; |
2254 | text_t *text = stp + col; |
… | |
… | |
2188 | dtp[col] = stp[col]; |
2257 | dtp[col] = stp[col]; |
2189 | drp[col] = rend; |
2258 | drp[col] = rend; |
2190 | |
2259 | |
2191 | int xpixel = Col2Pixel (col); |
2260 | int xpixel = Col2Pixel (col); |
2192 | |
2261 | |
2193 | // this loop looks very messy, it can probably be optimized |
|
|
2194 | // and cleaned a bit by you? |
|
|
2195 | for (i = 0; ++col < TermWin.ncol; ) |
2262 | for (i = 0; ++col < TermWin.ncol; ) |
2196 | { |
2263 | { |
2197 | if (stp[col] == NOCHAR) |
2264 | if (stp[col] == NOCHAR) |
2198 | { |
2265 | { |
2199 | dtp[col] = stp[col]; |
2266 | dtp[col] = stp[col]; |
… | |
… | |
2202 | i++; |
2269 | i++; |
2203 | |
2270 | |
2204 | continue; |
2271 | continue; |
2205 | } |
2272 | } |
2206 | |
2273 | |
2207 | if (rend != srp[col]) |
2274 | if (!RS_SAME (rend, srp[col])) |
2208 | break; |
2275 | break; |
2209 | |
2276 | |
2210 | count++; |
2277 | count++; |
2211 | |
2278 | |
2212 | if (stp[col] != dtp[col] |
2279 | if (stp[col] != dtp[col] |
2213 | || srp[col] != drp[col]) |
2280 | || !RS_SAME (srp[col], drp[col])) |
2214 | { |
2281 | { |
2215 | if (must_clear && (i++ > count / 2)) |
2282 | if (must_clear && (i++ > count / 2)) |
2216 | break; |
2283 | break; |
2217 | |
2284 | |
2218 | dtp[col] = stp[col]; |
2285 | dtp[col] = stp[col]; |
… | |
… | |
2228 | |
2295 | |
2229 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2296 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2230 | while (i && text[count] == NOCHAR) |
2297 | while (i && text[count] == NOCHAR) |
2231 | count++, i--; |
2298 | count++, i--; |
2232 | |
2299 | |
|
|
2300 | #if ENABLE_STYLES |
|
|
2301 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2302 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
|
|
2303 | drp[col + 1] = ~srp[col + 1]; |
|
|
2304 | |
|
|
2305 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2306 | while (text > stp |
|
|
2307 | && srp[text - stp - 1] & RS_Careful |
|
|
2308 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2309 | text--, count++, xpixel -= TermWin.fwidth; |
|
|
2310 | #endif |
|
|
2311 | |
2233 | /* |
2312 | /* |
2234 | * Determine the attributes for the string |
2313 | * Determine the attributes for the string |
2235 | */ |
2314 | */ |
2236 | int fid = GET_FONT (rend); |
|
|
2237 | int fore = GET_FGCOLOR (rend); // desired foreground |
2315 | int fore = GET_FGCOLOR (rend); // desired foreground |
2238 | int back = GET_BGCOLOR (rend); // desired background |
2316 | int back = GET_BGCOLOR (rend); // desired background |
2239 | |
2317 | |
2240 | rend = GET_ATTR (rend); |
2318 | // only do special processing if ana attributes are set, which is rare |
2241 | |
2319 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) |
2242 | rvid = !!(rend & RS_RVid); |
2320 | { |
|
|
2321 | bool invert = rend & RS_RVid; |
2243 | |
2322 | |
2244 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2323 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2245 | if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold)) |
2324 | if (rend & RS_Bold |
|
|
2325 | && fore == Color_fg) |
2246 | { |
2326 | { |
2247 | if (ISSET_PIXCOLOR (Color_BD)) |
2327 | if (ISSET_PIXCOLOR (Color_BD)) |
2248 | fore = Color_BD; |
2328 | fore = Color_BD; |
|
|
2329 | # if !ENABLE_STYLES |
2249 | else |
2330 | else |
2250 | rvid = !rvid; |
2331 | invert = !invert; |
|
|
2332 | # endif |
|
|
2333 | } |
|
|
2334 | |
|
|
2335 | if (rend & RS_Italic |
|
|
2336 | && fore == Color_fg) |
|
|
2337 | { |
|
|
2338 | if (ISSET_PIXCOLOR (Color_IT)) |
|
|
2339 | fore = Color_IT; |
|
|
2340 | # if !ENABLE_STYLES |
|
|
2341 | else |
|
|
2342 | invert = !invert; |
|
|
2343 | # endif |
|
|
2344 | } |
|
|
2345 | |
|
|
2346 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
|
|
2347 | fore = Color_UL; |
|
|
2348 | #endif |
|
|
2349 | |
|
|
2350 | if (invert) |
|
|
2351 | { |
|
|
2352 | SWAP_IT (fore, back, int); |
|
|
2353 | |
|
|
2354 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2355 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2356 | back = Color_RV; |
|
|
2357 | #endif |
|
|
2358 | } |
|
|
2359 | |
|
|
2360 | #ifdef TEXT_BLINK |
|
|
2361 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
|
|
2362 | { |
|
|
2363 | if (!text_blink_ev.active) |
|
|
2364 | { |
|
|
2365 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
2366 | hidden_text = 0; |
|
|
2367 | } |
|
|
2368 | else if (hidden_text) |
|
|
2369 | fore = back; |
|
|
2370 | } |
|
|
2371 | #endif |
2251 | } |
2372 | } |
2252 | |
|
|
2253 | if (rend & RS_Uline) |
|
|
2254 | if (ISSET_PIXCOLOR (Color_UL)) |
|
|
2255 | fore = Color_UL; |
|
|
2256 | #endif |
|
|
2257 | |
|
|
2258 | if (rvid) |
|
|
2259 | { |
|
|
2260 | SWAP_IT (fore, back, int); |
|
|
2261 | |
|
|
2262 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2263 | if (ISSET_PIXCOLOR (Color_RV) |
|
|
2264 | # ifndef NO_CURSORCOLOR |
|
|
2265 | && !ISSET_PIXCOLOR (Color_cursor) |
|
|
2266 | # endif |
|
|
2267 | ) |
|
|
2268 | back = Color_RV; |
|
|
2269 | #endif |
|
|
2270 | } |
|
|
2271 | |
|
|
2272 | #ifdef TEXT_BLINK |
|
|
2273 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
|
|
2274 | { |
|
|
2275 | if (!text_blink_ev.active) |
|
|
2276 | { |
|
|
2277 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
2278 | hidden_text = 0; |
|
|
2279 | } |
|
|
2280 | else if (hidden_text) |
|
|
2281 | fore = back; |
|
|
2282 | } |
|
|
2283 | #endif |
|
|
2284 | |
2373 | |
2285 | /* |
2374 | /* |
2286 | * Actually do the drawing of the string here |
2375 | * Actually do the drawing of the string here |
2287 | */ |
2376 | */ |
2288 | rxvt_font *font = (*TermWin.fontset)[fid]; |
2377 | rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2289 | |
2378 | |
2290 | if (back == fore) |
2379 | if (back == fore) |
2291 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2380 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2292 | TermWin.fwidth * count, TermWin.fheight, |
2381 | TermWin.fwidth * count, TermWin.fheight, |
2293 | back); |
2382 | back); |
… | |
… | |
2315 | xpixel, ypixel + font->ascent + 1, |
2404 | xpixel, ypixel + font->ascent + 1, |
2316 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2405 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2317 | } /* for (col....) */ |
2406 | } /* for (col....) */ |
2318 | } /* for (row....) */ |
2407 | } /* for (row....) */ |
2319 | |
2408 | |
|
|
2409 | #if ENABLE_OVERLAY |
|
|
2410 | scr_swap_overlay (); |
|
|
2411 | #endif |
|
|
2412 | |
2320 | /* |
2413 | /* |
2321 | * G: cleanup cursor and display outline cursor if necessary |
2414 | * G: cleanup cursor and display outline cursor if necessary |
2322 | */ |
2415 | */ |
2323 | if (showcursor) |
2416 | if (showcursor) |
2324 | { |
2417 | { |
… | |
… | |
2349 | } |
2442 | } |
2350 | |
2443 | |
2351 | /* |
2444 | /* |
2352 | * H: cleanup selection |
2445 | * H: cleanup selection |
2353 | */ |
2446 | */ |
2354 | #if ENABLE_OVERLAY |
|
|
2355 | scr_swap_overlay (); |
|
|
2356 | #endif |
|
|
2357 | scr_reverse_selection (); |
2447 | scr_reverse_selection (); |
2358 | |
2448 | |
2359 | if (refresh_type & SMOOTH_REFRESH) |
2449 | if (refresh_type & SMOOTH_REFRESH) |
2360 | XFlush (display->display); |
2450 | XFlush (display->display); |
2361 | |
2451 | |
2362 | num_scr = 0; |
2452 | num_scr = 0; |
2363 | num_scr_allow = 1; |
2453 | num_scr_allow = 1; |
2364 | want_refresh = 0; /* screen is current */ |
|
|
2365 | } |
2454 | } |
2366 | |
2455 | |
2367 | void |
2456 | void |
2368 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2457 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2369 | { |
2458 | { |
2370 | if (!rp || !tp) |
2459 | if (!rp || !tp) |
2371 | return; |
2460 | return; |
2372 | |
2461 | |
2373 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2462 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2374 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
2463 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
2375 | } |
2464 | } |
2376 | |
2465 | |
2377 | void |
2466 | void |
2378 | rxvt_term::scr_remap_chars () |
2467 | rxvt_term::scr_remap_chars () |
2379 | { |
2468 | { |
… | |
… | |
2385 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2474 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2386 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2475 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2387 | } |
2476 | } |
2388 | } |
2477 | } |
2389 | |
2478 | |
|
|
2479 | void |
|
|
2480 | rxvt_term::scr_recolour () |
|
|
2481 | { |
|
|
2482 | if (1 |
|
|
2483 | #if TRANSPARENT |
|
|
2484 | && !am_transparent |
|
|
2485 | #endif |
|
|
2486 | #if XPM_BACKGROUND |
|
|
2487 | && !bgPixmap.pixmap |
|
|
2488 | #endif |
|
|
2489 | ) |
|
|
2490 | { |
|
|
2491 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); |
|
|
2492 | XClearWindow (display->display, TermWin.parent[0]); |
|
|
2493 | XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); |
|
|
2494 | #if HAVE_SCROLLBARS |
|
|
2495 | if (scrollBar.win) |
|
|
2496 | { |
|
|
2497 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
|
|
2498 | scrollBar.setIdle (); |
|
|
2499 | scrollbar_show (0); |
|
|
2500 | } |
|
|
2501 | #endif |
|
|
2502 | } |
|
|
2503 | |
|
|
2504 | scr_clear (); |
|
|
2505 | scr_touch (true); |
|
|
2506 | want_refresh = 1; |
|
|
2507 | } |
|
|
2508 | |
2390 | /* ------------------------------------------------------------------------- */ |
2509 | /* ------------------------------------------------------------------------- */ |
2391 | void |
2510 | void |
2392 | rxvt_term::scr_clear (bool really) |
2511 | rxvt_term::scr_clear (bool really) |
2393 | { |
2512 | { |
2394 | if (!TermWin.mapped) |
2513 | if (!TermWin.mapped) |
2395 | return; |
2514 | return; |
2396 | |
2515 | |
2397 | num_scr_allow = 0; |
2516 | num_scr_allow = 0; |
2398 | want_refresh = 1; |
2517 | want_refresh = 1; |
2399 | |
2518 | |
2400 | #ifdef TRANSPARENT |
2519 | #if TRANSPARENT |
2401 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
2520 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
2402 | { |
2521 | { |
2403 | int i; |
2522 | int i; |
2404 | |
2523 | |
2405 | if (! (options & Opt_transparent_all)) |
2524 | if (!(options & Opt_transparent_all)) |
2406 | i = 0; |
2525 | i = 0; |
2407 | else |
2526 | else |
2408 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2527 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2409 | |
2528 | |
2410 | while (i--) |
2529 | while (i--) |
… | |
… | |
2426 | int end_row = TermWin.saveLines - TermWin.view_start; |
2545 | int end_row = TermWin.saveLines - TermWin.view_start; |
2427 | int i = selection.beg.row + TermWin.saveLines; |
2546 | int i = selection.beg.row + TermWin.saveLines; |
2428 | int col, row = selection.end.row + TermWin.saveLines; |
2547 | int col, row = selection.end.row + TermWin.saveLines; |
2429 | rend_t *srp; |
2548 | rend_t *srp; |
2430 | |
2549 | |
2431 | if (i >= end_row) |
2550 | #if ENABLE_FRILLS |
2432 | col = selection.beg.col; |
2551 | if (selection.rect) |
|
|
2552 | { |
|
|
2553 | end_row += TermWin.nrow; |
|
|
2554 | |
|
|
2555 | for (; i <= row && i <= end_row; i++) |
|
|
2556 | for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) |
|
|
2557 | srp[col] ^= RS_RVid; |
|
|
2558 | } |
2433 | else |
2559 | else |
|
|
2560 | #endif |
|
|
2561 | { |
|
|
2562 | if (i >= end_row) |
|
|
2563 | col = selection.beg.col; |
|
|
2564 | else |
2434 | { |
2565 | { |
2435 | col = 0; |
2566 | col = 0; |
2436 | i = end_row; |
2567 | i = end_row; |
2437 | } |
2568 | } |
2438 | |
2569 | |
2439 | end_row += TermWin.nrow; |
2570 | end_row += TermWin.nrow; |
|
|
2571 | |
2440 | for (; i < row && i < end_row; i++, col = 0) |
2572 | for (; i < row && i < end_row; i++, col = 0) |
2441 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2573 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2442 | srp[col] ^= RS_RVid; |
2574 | srp[col] ^= RS_RVid; |
2443 | |
2575 | |
2444 | if (i == row && i < end_row) |
2576 | if (i == row && i < end_row) |
2445 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2577 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2446 | srp[col] ^= RS_RVid; |
2578 | srp[col] ^= RS_RVid; |
|
|
2579 | } |
2447 | } |
2580 | } |
2448 | } |
2581 | } |
2449 | |
2582 | |
2450 | /* ------------------------------------------------------------------------- */ |
2583 | /* ------------------------------------------------------------------------- */ |
2451 | /* |
2584 | /* |
… | |
… | |
2801 | |
2934 | |
2802 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2935 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2803 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2936 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2804 | |
2937 | |
2805 | col = selection.beg.col; |
2938 | col = selection.beg.col; |
2806 | MAX_IT (col, 0); |
|
|
2807 | row = selection.beg.row + TermWin.saveLines; |
2939 | row = selection.beg.row + TermWin.saveLines; |
2808 | end_row = selection.end.row + TermWin.saveLines; |
2940 | end_row = selection.end.row + TermWin.saveLines; |
2809 | int ofs = 0; |
2941 | int ofs = 0; |
2810 | int extra = 0; |
2942 | int extra = 0; |
2811 | |
2943 | |
2812 | for (; row <= end_row; row++, col = 0) |
2944 | for (; row <= end_row; row++, col = 0) |
2813 | { |
2945 | { |
2814 | t = &screen.text[row][col]; |
|
|
2815 | |
|
|
2816 | end_col = screen.tlen[row]; |
2946 | end_col = screen.tlen[row]; |
|
|
2947 | |
|
|
2948 | #if ENABLE_FRILLS |
|
|
2949 | if (selection.rect) |
|
|
2950 | { |
|
|
2951 | col = selection.beg.col; |
|
|
2952 | end_col = TermWin.ncol + 1; |
|
|
2953 | } |
|
|
2954 | #endif |
|
|
2955 | |
|
|
2956 | MAX_IT (col, 0); |
2817 | |
2957 | |
2818 | if (end_col == -1) |
2958 | if (end_col == -1) |
2819 | end_col = TermWin.ncol; |
2959 | end_col = TermWin.ncol; |
2820 | |
2960 | |
2821 | if (row == end_row) |
2961 | if (row == end_row || selection.rect) |
2822 | MIN_IT (end_col, selection.end.col); |
2962 | MIN_IT (end_col, selection.end.col); |
2823 | |
2963 | |
|
|
2964 | t = &screen.text[row][col]; |
2824 | for (; col < end_col; col++) |
2965 | for (; col < end_col; col++) |
2825 | { |
2966 | { |
2826 | if (*t == NOCHAR) |
2967 | if (*t == NOCHAR) |
2827 | t++; |
2968 | t++; |
2828 | #if ENABLE_COMBINING |
2969 | #if ENABLE_COMBINING |
… | |
… | |
3088 | enum { |
3229 | enum { |
3089 | LEFT, RIGHT |
3230 | LEFT, RIGHT |
3090 | } closeto = RIGHT; |
3231 | } closeto = RIGHT; |
3091 | |
3232 | |
3092 | want_refresh = 1; |
3233 | want_refresh = 1; |
|
|
3234 | |
3093 | switch (selection.op) |
3235 | switch (selection.op) |
3094 | { |
3236 | { |
3095 | case SELECTION_INIT: |
3237 | case SELECTION_INIT: |
3096 | CLEAR_SELECTION (); |
3238 | CLEAR_SELECTION (); |
3097 | selection.op = SELECTION_BEGIN; |
3239 | selection.op = SELECTION_BEGIN; |
… | |
… | |
3110 | selection_start_colrow (col, row); |
3252 | selection_start_colrow (col, row); |
3111 | /* FALLTHROUGH */ |
3253 | /* FALLTHROUGH */ |
3112 | default: |
3254 | default: |
3113 | return; |
3255 | return; |
3114 | } |
3256 | } |
|
|
3257 | |
3115 | if (selection.beg.col == selection.end.col |
3258 | if (selection.beg.col == selection.end.col |
3116 | && selection.beg.col != selection.mark.col |
3259 | && selection.beg.col != selection.mark.col |
3117 | && selection.beg.row == selection.end.row |
3260 | && selection.beg.row == selection.end.row |
3118 | && selection.beg.row != selection.mark.row) |
3261 | && selection.beg.row != selection.mark.row) |
3119 | { |
3262 | { |
… | |
… | |
3169 | } |
3312 | } |
3170 | else |
3313 | else |
3171 | { /* button1 drag or button3 drag */ |
3314 | { /* button1 drag or button3 drag */ |
3172 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3315 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3173 | { |
3316 | { |
3174 | if ((selection.mark.row == selection.end.row) |
3317 | if (selection.mark.row == selection.end.row |
3175 | && (selection.mark.col == selection.end.col) |
3318 | && selection.mark.col == selection.end.col |
|
|
3319 | && clickchange |
3176 | && clickchange && selection.clicks == 2) |
3320 | && selection.clicks == 2) |
3177 | selection.mark.col--; |
3321 | selection.mark.col--; |
3178 | |
3322 | |
3179 | selection.beg.row = pos.row; |
3323 | selection.beg.row = pos.row; |
3180 | selection.beg.col = pos.col; |
3324 | selection.beg.col = pos.col; |
3181 | selection.end.row = selection.mark.row; |
3325 | selection.end.row = selection.mark.row; |
… | |
… | |
3192 | |
3336 | |
3193 | if (selection.clicks == 1) |
3337 | if (selection.clicks == 1) |
3194 | { |
3338 | { |
3195 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3339 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3196 | |
3340 | |
3197 | if (end_col != -1 && selection.beg.col > end_col) |
3341 | if (selection.beg.col > end_col |
|
|
3342 | && end_col != -1 |
|
|
3343 | #if ENABLE_FRILLS |
|
|
3344 | && !selection.rect |
|
|
3345 | #endif |
3198 | { |
3346 | ) |
3199 | #if 1 |
|
|
3200 | selection.beg.col = ncol; |
3347 | selection.beg.col = ncol; |
3201 | #else |
|
|
3202 | if (selection.beg.row != selection.end.row) |
|
|
3203 | selection.beg.col = ncol; |
|
|
3204 | else |
|
|
3205 | selection.beg.col = selection.mark.col; |
|
|
3206 | #endif |
|
|
3207 | } |
|
|
3208 | |
3348 | |
3209 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3349 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3210 | |
3350 | |
3211 | if (end_col != -1 && selection.end.col > end_col) |
3351 | if ( |
|
|
3352 | selection.end.col > end_col |
|
|
3353 | && end_col != -1 |
|
|
3354 | #if ENABLE_FRILLS |
|
|
3355 | && !selection.rect |
|
|
3356 | #endif |
|
|
3357 | ) |
3212 | selection.end.col = ncol; |
3358 | selection.end.col = ncol; |
3213 | } |
3359 | } |
3214 | else if (selection.clicks == 2) |
3360 | else if (selection.clicks == 2) |
3215 | { |
3361 | { |
3216 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3362 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3217 | selection.end.col--; |
3363 | selection.end.col--; |
3218 | |
3364 | |
3219 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
|
|
3220 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3365 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
|
|
3366 | selection_delimit_word (DN, &selection.end, &selection.end); |
3221 | } |
3367 | } |
3222 | else if (selection.clicks == 3) |
3368 | else if (selection.clicks == 3) |
3223 | { |
3369 | { |
3224 | #if ENABLE_FRILLS |
3370 | #if ENABLE_FRILLS |
3225 | if ((options & Opt_tripleclickwords)) |
3371 | if ((options & Opt_tripleclickwords)) |
3226 | { |
3372 | { |
3227 | int end_row; |
3373 | int end_row; |
3228 | |
3374 | |
3229 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3375 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3230 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3376 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3231 | |
3377 | |
3232 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3378 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3233 | { |
3379 | { |
3234 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3380 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
… | |
… | |
3245 | else |
3391 | else |
3246 | #endif |
3392 | #endif |
3247 | { |
3393 | { |
3248 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3394 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3249 | selection.mark.col++; |
3395 | selection.mark.col++; |
|
|
3396 | |
3250 | selection.beg.col = 0; |
3397 | selection.beg.col = 0; |
3251 | selection.end.col = ncol; |
3398 | selection.end.col = ncol; |
3252 | } |
3399 | } |
3253 | } |
3400 | } |
3254 | |
3401 | |
… | |
… | |
3263 | { |
3410 | { |
3264 | selection.mark.row = selection.beg.row; |
3411 | selection.mark.row = selection.beg.row; |
3265 | selection.mark.col = selection.beg.col; |
3412 | selection.mark.col = selection.beg.col; |
3266 | } |
3413 | } |
3267 | } |
3414 | } |
3268 | } |
|
|
3269 | |
3415 | |
3270 | #if ENABLE_FRILLS |
3416 | #if ENABLE_FRILLS |
|
|
3417 | if (selection.rect && selection.beg.col > selection.end.col) |
|
|
3418 | SWAP_IT (selection.beg.col, selection.end.col, int); |
|
|
3419 | #endif |
|
|
3420 | } |
|
|
3421 | |
|
|
3422 | #if ENABLE_FRILLS |
3271 | void |
3423 | void |
3272 | rxvt_term::selection_remove_trailing_spaces () |
3424 | rxvt_term::selection_remove_trailing_spaces () |
3273 | { |
3425 | { |
3274 | int32_t end_col, end_row; |
3426 | int32_t end_col, end_row; |
3275 | text_t *stp; |
3427 | text_t *stp; |
3276 | |
3428 | |
3277 | end_col = selection.end.col; |
3429 | end_col = selection.end.col; |
3278 | end_row = selection.end.row; |
3430 | end_row = selection.end.row; |
|
|
3431 | |
3279 | for ( ; end_row >= selection.beg.row; ) |
3432 | for ( ; end_row >= selection.beg.row; ) |
3280 | { |
3433 | { |
3281 | stp = screen.text[end_row + TermWin.saveLines]; |
3434 | stp = screen.text[end_row + TermWin.saveLines]; |
|
|
3435 | |
3282 | while (--end_col >= 0) |
3436 | while (--end_col >= 0) |
3283 | { |
3437 | { |
3284 | if (stp[end_col] != ' ' && stp[end_col] != '\t') |
3438 | if (stp[end_col] != ' ' |
|
|
3439 | && stp[end_col] != '\t' |
|
|
3440 | && stp[end_col] != NOCHAR) |
3285 | break; |
3441 | break; |
3286 | } |
3442 | } |
|
|
3443 | |
3287 | if (end_col >= 0 |
3444 | if (end_col >= 0 |
3288 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3445 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3289 | { |
3446 | { |
3290 | selection.end.col = end_col + 1; |
3447 | selection.end.col = end_col + 1; |
3291 | selection.end.row = end_row; |
3448 | selection.end.row = end_row; |
3292 | break; |
3449 | break; |
3293 | } |
3450 | } |
|
|
3451 | |
3294 | end_row--; |
3452 | end_row--; |
3295 | end_col = TermWin.ncol; |
3453 | end_col = TermWin.ncol; |
3296 | } |
3454 | } |
|
|
3455 | |
3297 | if (selection.mark.row > selection.end.row) |
3456 | if (selection.mark.row > selection.end.row) |
3298 | { |
3457 | { |
3299 | selection.mark.row = selection.end.row; |
3458 | selection.mark.row = selection.end.row; |
3300 | selection.mark.col = selection.end.col; |
3459 | selection.mark.col = selection.end.col; |
3301 | } |
3460 | } |
… | |
… | |
3314 | rxvt_term::selection_rotate (int x, int y) |
3473 | rxvt_term::selection_rotate (int x, int y) |
3315 | { |
3474 | { |
3316 | selection.clicks = selection.clicks % 3 + 1; |
3475 | selection.clicks = selection.clicks % 3 + 1; |
3317 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3476 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3318 | } |
3477 | } |
3319 | |
|
|
3320 | /* ------------------------------------------------------------------------- */ |
|
|
3321 | /* |
|
|
3322 | * On some systems, the Atom typedef is 64 bits wide. We need to have a type |
|
|
3323 | * that is exactly 32 bits wide, because a format of 64 is not allowed by |
|
|
3324 | * the X11 protocol. |
|
|
3325 | */ |
|
|
3326 | typedef CARD32 Atom32; |
|
|
3327 | |
3478 | |
3328 | /* ------------------------------------------------------------------------- */ |
3479 | /* ------------------------------------------------------------------------- */ |
3329 | /* |
3480 | /* |
3330 | * Respond to a request for our current selection |
3481 | * Respond to a request for our current selection |
3331 | * EXT: SelectionRequest |
3482 | * EXT: SelectionRequest |
… | |
… | |
3346 | ev.target = rq.target; |
3497 | ev.target = rq.target; |
3347 | ev.time = rq.time; |
3498 | ev.time = rq.time; |
3348 | |
3499 | |
3349 | if (rq.target == xa[XA_TARGETS]) |
3500 | if (rq.target == xa[XA_TARGETS]) |
3350 | { |
3501 | { |
3351 | Atom32 target_list[6]; |
3502 | Atom target_list[6]; |
3352 | Atom32 *target = target_list; |
3503 | Atom *target = target_list; |
3353 | |
3504 | |
3354 | *target++ = (Atom32) xa[XA_TARGETS]; |
3505 | *target++ = xa[XA_TARGETS]; |
3355 | *target++ = (Atom32) xa[XA_TIMESTAMP]; |
3506 | *target++ = xa[XA_TIMESTAMP]; |
3356 | *target++ = (Atom32) XA_STRING; |
3507 | *target++ = XA_STRING; |
3357 | *target++ = (Atom32) xa[XA_TEXT]; |
3508 | *target++ = xa[XA_TEXT]; |
3358 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3509 | *target++ = xa[XA_COMPOUND_TEXT]; |
3359 | #if X_HAVE_UTF8_STRING |
3510 | #if X_HAVE_UTF8_STRING |
3360 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3511 | *target++ = xa[XA_UTF8_STRING]; |
3361 | #endif |
3512 | #endif |
3362 | |
3513 | |
3363 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3514 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3364 | (8 * sizeof (target_list[0])), PropModeReplace, |
3515 | 32, PropModeReplace, |
3365 | (unsigned char *)target_list, |
3516 | (unsigned char *)target_list, target - target_list); |
3366 | target - target_list); |
|
|
3367 | ev.property = rq.property; |
3517 | ev.property = rq.property; |
3368 | } |
3518 | } |
3369 | #if TODO // TODO |
3519 | #if TODO // TODO |
3370 | else if (rq.target == xa[XA_MULTIPLE]) |
3520 | else if (rq.target == xa[XA_MULTIPLE]) |
3371 | { |
3521 | { |
3372 | /* TODO: Handle MULTIPLE */ |
3522 | /* TODO: Handle MULTIPLE */ |
3373 | } |
3523 | } |
3374 | #endif |
3524 | #endif |
3375 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3525 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3376 | { |
3526 | { |
3377 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3527 | XChangeProperty (display->display, rq.requestor, rq.property, rq.target, |
3378 | (8 * sizeof (Time)), PropModeReplace, |
|
|
3379 | (unsigned char *)&selection_time, 1); |
3528 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3380 | ev.property = rq.property; |
3529 | ev.property = rq.property; |
3381 | } |
3530 | } |
3382 | else if (rq.target == XA_STRING |
3531 | else if (rq.target == XA_STRING |
3383 | || rq.target == xa[XA_TEXT] |
3532 | || rq.target == xa[XA_TEXT] |
3384 | || rq.target == xa[XA_COMPOUND_TEXT] |
3533 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3507 | { |
3656 | { |
3508 | text_t *tp = ov_text[y] = new text_t[w]; |
3657 | text_t *tp = ov_text[y] = new text_t[w]; |
3509 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3658 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3510 | |
3659 | |
3511 | text_t t0, t1, t2; |
3660 | text_t t0, t1, t2; |
3512 | rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg); |
3661 | rend_t r = OVERLAY_RSTYLE; |
3513 | |
3662 | |
3514 | if (y == 0) |
3663 | if (y == 0) |
3515 | t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; |
3664 | t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; |
3516 | else if (y < h - 1) |
3665 | else if (y < h - 1) |
3517 | t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; |
3666 | t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; |
… | |
… | |
3551 | } |
3700 | } |
3552 | |
3701 | |
3553 | void |
3702 | void |
3554 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
3703 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
3555 | { |
3704 | { |
3556 | if (!ov_text || x >= ov_w - 2 || y >= ov_h) |
3705 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3557 | return; |
3706 | return; |
3558 | |
3707 | |
3559 | x++, y++; |
3708 | x++, y++; |
3560 | |
3709 | |
3561 | ov_text[y][x] = text; |
3710 | ov_text[y][x] = text; |
… | |
… | |
3587 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
3736 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
3588 | |
3737 | |
3589 | for (int x = ov_w; x--; ) |
3738 | for (int x = ov_w; x--; ) |
3590 | { |
3739 | { |
3591 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3740 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3592 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, TermWin.fontset->find_font (t, false)); |
3741 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3593 | } |
3742 | } |
3594 | } |
3743 | } |
3595 | } |
3744 | } |
3596 | |
3745 | |
3597 | #endif |
3746 | #endif |