… | |
… | |
159 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
160 | |
160 | |
161 | void |
161 | void |
162 | rxvt_term::scr_reset () |
162 | rxvt_term::scr_reset () |
163 | { |
163 | { |
|
|
164 | #if ENABLE_OVERLAY |
|
|
165 | scr_overlay_off (); |
|
|
166 | #endif |
|
|
167 | |
164 | view_start = 0; |
168 | view_start = 0; |
165 | num_scr = 0; |
169 | num_scr = 0; |
166 | |
170 | |
167 | if (ncol == 0) |
171 | if (ncol == 0) |
168 | ncol = 80; |
172 | ncol = 80; |
… | |
… | |
199 | term_start = 0; |
203 | term_start = 0; |
200 | |
204 | |
201 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
202 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
203 | |
207 | |
204 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
208 | row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); |
205 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
206 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
207 | |
211 | |
208 | for (int row = nrow; row--; ) |
212 | for (int row = nrow; row--; ) |
209 | { |
213 | { |
… | |
… | |
271 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
275 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
272 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
273 | } |
277 | } |
274 | |
278 | |
275 | line_t *old_buf = row_buf; |
279 | line_t *old_buf = row_buf; |
276 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
280 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
277 | |
281 | |
278 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
279 | int pend = MOD (term_start + top_row , prev_total_rows); |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
280 | int q = total_rows; // rewrapped row |
284 | int q = total_rows; // rewrapped row |
281 | |
285 | |
… | |
… | |
634 | |
638 | |
635 | if (count > 0 |
639 | if (count > 0 |
636 | && row1 == 0 |
640 | && row1 == 0 |
637 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
641 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
638 | { |
642 | { |
|
|
643 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
644 | |
639 | top_row = max (top_row - count, -saveLines); |
645 | top_row = max (top_row - count, -saveLines); |
640 | |
|
|
641 | // scroll everything up 'count' lines |
|
|
642 | term_start = (term_start + count) % total_rows; |
|
|
643 | |
646 | |
644 | // sever bottommost line |
647 | // sever bottommost line |
645 | { |
648 | { |
646 | line_t &l = ROW(row2 - count); |
649 | line_t &l = ROW(row2); |
647 | l.is_longer (0); |
650 | l.is_longer (0); |
648 | l.touch (); |
651 | l.touch (); |
649 | } |
652 | } |
650 | |
653 | |
|
|
654 | // scroll everything up 'count' lines |
|
|
655 | term_start = (term_start + count) % total_rows; |
|
|
656 | |
|
|
657 | // now copy lines below the scroll region bottom to the |
|
|
658 | // bottom of the screen again, so they look as if they |
|
|
659 | // hadn't moved. |
|
|
660 | for (int i = nrow; --i > row2; ) |
|
|
661 | { |
|
|
662 | line_t &l1 = ROW(i - count); |
|
|
663 | line_t &l2 = ROW(i); |
|
|
664 | |
|
|
665 | ::swap (l1, l2); |
|
|
666 | l2.touch (); |
|
|
667 | } |
|
|
668 | |
651 | // erase newly scrolled-in lines |
669 | // erase newly scrolled-in lines |
652 | for (int i = count; i--; ) |
670 | for (int i = count; i--; ) |
653 | { |
671 | { |
654 | line_t &l = ROW(nrow - 1 - i); |
672 | line_t &l = ROW(row2 - i); |
655 | |
673 | |
656 | // optimize if already cleared, can be significant on slow machines |
674 | // optimise if already cleared, can be significant on slow machines |
657 | // could be rolled into scr_blank_screen_mem |
675 | // could be rolled into scr_blank_screen_mem |
658 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
676 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
659 | { |
677 | { |
660 | scr_blank_line (l, 0, l.l, rstyle); |
678 | scr_blank_line (l, 0, l.l, rstyle); |
661 | l.l = 0; |
679 | l.l = 0; |
662 | l.f = 0; |
680 | l.f = 0; |
663 | } |
681 | } |
664 | else |
682 | else |
665 | scr_blank_screen_mem (l, rstyle); |
683 | scr_blank_screen_mem (l, rstyle); |
666 | } |
|
|
667 | |
|
|
668 | // now copy lines below the scroll region bottom to the |
|
|
669 | // bottom of the screen again, so they look as if they |
|
|
670 | // hadn't moved. |
|
|
671 | for (int i = nrow; --i > row2; ) |
|
|
672 | { |
|
|
673 | line_t &l1 = ROW(i - count); |
|
|
674 | line_t &l2 = ROW(i); |
|
|
675 | |
|
|
676 | ::swap (l1, l2); |
|
|
677 | l2.touch (); |
|
|
678 | } |
684 | } |
679 | |
685 | |
680 | // move and/or clear selection, if any |
686 | // move and/or clear selection, if any |
681 | if (selection.op && current_screen == selection.screen) |
687 | if (selection.op && current_screen == selection.screen) |
682 | { |
688 | { |
… | |
… | |
728 | } |
734 | } |
729 | |
735 | |
730 | // use a simple and robust scrolling algorithm, this |
736 | // use a simple and robust scrolling algorithm, this |
731 | // part of scr_scroll_text is not time-critical. |
737 | // part of scr_scroll_text is not time-critical. |
732 | |
738 | |
|
|
739 | // sever line above scroll region |
|
|
740 | if (row1) |
|
|
741 | { |
|
|
742 | line_t &l = ROW(row1 - 1); |
|
|
743 | l.is_longer (0); |
|
|
744 | l.touch (); |
|
|
745 | } |
|
|
746 | |
733 | int rows = row2 - row1 + 1; |
747 | int rows = row2 - row1 + 1; |
734 | |
748 | |
735 | min_it (count, rows); |
749 | min_it (count, rows); |
736 | |
750 | |
737 | line_t *temp_buf = row_buf + total_rows; |
751 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
738 | |
752 | |
739 | for (int row = 0; row < rows; row++) |
753 | for (int row = 0; row < rows; row++) |
740 | { |
754 | { |
741 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
755 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
742 | |
756 | |
… | |
… | |
744 | scr_blank_screen_mem (temp_buf [row], rstyle); |
758 | scr_blank_screen_mem (temp_buf [row], rstyle); |
745 | } |
759 | } |
746 | |
760 | |
747 | for (int row = 0; row < rows; row++) |
761 | for (int row = 0; row < rows; row++) |
748 | ROW(row1 + row) = temp_buf [row]; |
762 | ROW(row1 + row) = temp_buf [row]; |
|
|
763 | |
|
|
764 | // sever bottommost line |
|
|
765 | { |
|
|
766 | line_t &l = ROW(row2); |
|
|
767 | l.is_longer (0); |
|
|
768 | l.touch (); |
|
|
769 | } |
749 | } |
770 | } |
750 | |
771 | |
751 | return count; |
772 | return count; |
752 | } |
773 | } |
753 | |
774 | |
… | |
… | |
795 | |
816 | |
796 | while (str < strend) |
817 | while (str < strend) |
797 | { |
818 | { |
798 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
819 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
799 | |
820 | |
800 | if (expect_false (c < 0x20)) |
821 | if (ecb_unlikely (c < 0x20)) |
801 | if (c == C0_LF) |
822 | if (c == C0_LF) |
802 | { |
823 | { |
803 | max_it (line->l, screen.cur.col); |
824 | max_it (line->l, screen.cur.col); |
804 | |
825 | |
805 | screen.flags &= ~Screen_WrapNext; |
826 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
824 | { |
845 | { |
825 | scr_tab (1, true); |
846 | scr_tab (1, true); |
826 | continue; |
847 | continue; |
827 | } |
848 | } |
828 | |
849 | |
829 | if (expect_false ( |
850 | if (ecb_unlikely ( |
830 | checksel /* see if we're writing within selection */ |
851 | checksel /* see if we're writing within selection */ |
831 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
852 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
832 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
853 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
833 | )) |
854 | )) |
834 | { |
855 | { |
… | |
… | |
839 | * should be a similar check. |
860 | * should be a similar check. |
840 | */ |
861 | */ |
841 | CLEAR_SELECTION (); |
862 | CLEAR_SELECTION (); |
842 | } |
863 | } |
843 | |
864 | |
844 | if (expect_false (screen.flags & Screen_WrapNext)) |
865 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
845 | { |
866 | { |
846 | scr_do_wrap (); |
867 | scr_do_wrap (); |
847 | |
868 | |
848 | line->l = ncol; |
869 | line->l = ncol; |
849 | line->is_longer (1); |
870 | line->is_longer (1); |
… | |
… | |
851 | row = screen.cur.row; |
872 | row = screen.cur.row; |
852 | line = &ROW(row); /* _must_ refresh */ |
873 | line = &ROW(row); /* _must_ refresh */ |
853 | } |
874 | } |
854 | |
875 | |
855 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
876 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
856 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
877 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
857 | c = 0xfffd; |
878 | c = 0xfffd; |
858 | |
879 | |
859 | // rely on wcwidth to tell us the character width, do wcwidth before |
880 | // rely on wcwidth to tell us the character width, do wcwidth before |
860 | // further replacements, as wcwidth might return -1 for the line |
881 | // further replacements, as wcwidth might return -1 for the line |
861 | // drawing characters below as they might be invalid in the current |
882 | // drawing characters below as they might be invalid in the current |
862 | // locale. |
883 | // locale. |
863 | int width = WCWIDTH (c); |
884 | int width = WCWIDTH (c); |
864 | |
885 | |
865 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
886 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
866 | { |
887 | { |
867 | // vt100 special graphics and line drawing |
888 | // vt100 special graphics and line drawing |
868 | // 5f-7e standard vt100 |
889 | // 5f-7e standard vt100 |
869 | // 40-5e rxvt extension for extra curses acs chars |
890 | // 40-5e rxvt extension for extra curses acs chars |
870 | static uint16_t vt100_0[62] = { // 41 .. 7e |
891 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
883 | c = vt100_0[c - 0x41]; |
904 | c = vt100_0[c - 0x41]; |
884 | width = 1; // vt100 line drawing characters are always single-width |
905 | width = 1; // vt100 line drawing characters are always single-width |
885 | } |
906 | } |
886 | } |
907 | } |
887 | |
908 | |
888 | if (expect_false (screen.flags & Screen_Insert)) |
909 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
889 | scr_insdel_chars (width, INSERT); |
910 | scr_insdel_chars (width, INSERT); |
890 | |
911 | |
891 | if (width != 0) |
912 | if (width != 0) |
892 | { |
913 | { |
893 | #if !UNICODE_3 |
914 | #if !UNICODE_3 |
… | |
… | |
901 | #endif |
922 | #endif |
902 | |
923 | |
903 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
924 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
904 | |
925 | |
905 | // if the character doesn't fit into the remaining columns... |
926 | // if the character doesn't fit into the remaining columns... |
906 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
927 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
907 | { |
928 | { |
908 | if (screen.flags & Screen_Autowrap) |
929 | if (screen.flags & Screen_Autowrap) |
909 | { |
930 | { |
910 | // ... artificially enlargen the previous one |
931 | // ... artificially enlargen the previous one |
911 | c = NOCHAR; |
932 | c = NOCHAR; |
… | |
… | |
918 | |
939 | |
919 | // nuke the character at this position, if required |
940 | // nuke the character at this position, if required |
920 | // due to wonderful coincidences everywhere else in this loop |
941 | // due to wonderful coincidences everywhere else in this loop |
921 | // we never have to check for overwriting a wide char itself, |
942 | // we never have to check for overwriting a wide char itself, |
922 | // only its tail. |
943 | // only its tail. |
923 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
944 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
924 | scr_kill_char (*line, screen.cur.col); |
945 | scr_kill_char (*line, screen.cur.col); |
925 | |
946 | |
926 | line->touch (); |
947 | line->touch (); |
927 | |
948 | |
928 | do |
949 | do |
929 | { |
950 | { |
930 | line->t[screen.cur.col] = c; |
951 | line->t[screen.cur.col] = c; |
931 | line->r[screen.cur.col] = rend; |
952 | line->r[screen.cur.col] = rend; |
932 | |
953 | |
933 | if (expect_true (screen.cur.col < ncol - 1)) |
954 | if (ecb_likely (screen.cur.col < ncol - 1)) |
934 | screen.cur.col++; |
955 | screen.cur.col++; |
935 | else |
956 | else |
936 | { |
957 | { |
937 | line->l = ncol; |
958 | line->l = ncol; |
938 | if (screen.flags & Screen_Autowrap) |
959 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
941 | goto end_of_line; |
962 | goto end_of_line; |
942 | } |
963 | } |
943 | |
964 | |
944 | c = NOCHAR; |
965 | c = NOCHAR; |
945 | } |
966 | } |
946 | while (expect_false (--width > 0)); |
967 | while (ecb_unlikely (--width > 0)); |
947 | |
968 | |
948 | // pad with spaces when overwriting wide character with smaller one |
969 | // pad with spaces when overwriting wide character with smaller one |
949 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
970 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
950 | { |
971 | { |
951 | line->t[c] = ' '; |
972 | line->t[c] = ' '; |
952 | line->r[c] = rend; |
973 | line->r[c] = rend; |
953 | } |
974 | } |
954 | |
975 | |
… | |
… | |
1920 | |
1941 | |
1921 | # ifndef NO_MAPALERT |
1942 | # ifndef NO_MAPALERT |
1922 | # ifdef MAPALERT_OPTION |
1943 | # ifdef MAPALERT_OPTION |
1923 | if (option (Opt_mapAlert)) |
1944 | if (option (Opt_mapAlert)) |
1924 | # endif |
1945 | # endif |
1925 | XMapWindow (dpy, parent[0]); |
1946 | XMapWindow (dpy, parent); |
1926 | # endif |
1947 | # endif |
1927 | |
1948 | |
1928 | # if ENABLE_FRILLS |
1949 | # if ENABLE_FRILLS |
1929 | if (option (Opt_urgentOnBell)) |
1950 | if (option (Opt_urgentOnBell)) |
1930 | set_urgency (1); |
1951 | set_urgency (1); |
… | |
… | |
1943 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1964 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1944 | #endif |
1965 | #endif |
1945 | } |
1966 | } |
1946 | |
1967 | |
1947 | /* ------------------------------------------------------------------------- */ |
1968 | /* ------------------------------------------------------------------------- */ |
1948 | /* ARGSUSED */ |
|
|
1949 | void |
1969 | void |
1950 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1970 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1951 | { |
1971 | { |
1952 | #ifdef PRINTPIPE |
1972 | #ifdef PRINTPIPE |
1953 | int nrows, row_start; |
1973 | int nrows, row_start; |
… | |
… | |
2231 | continue; |
2251 | continue; |
2232 | |
2252 | |
2233 | // redraw one or more characters |
2253 | // redraw one or more characters |
2234 | |
2254 | |
2235 | // seek to the beginning of wide characters |
2255 | // seek to the beginning of wide characters |
2236 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2256 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2237 | --col; |
2257 | --col; |
2238 | |
2258 | |
2239 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2259 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2240 | text_t *text = stp + col; |
2260 | text_t *text = stp + col; |
2241 | int count = 1; |
2261 | int count = 1; |
… | |
… | |
2279 | |
2299 | |
2280 | col--; /* went one too far. move back */ |
2300 | col--; /* went one too far. move back */ |
2281 | count -= i; /* dump any matching trailing chars */ |
2301 | count -= i; /* dump any matching trailing chars */ |
2282 | |
2302 | |
2283 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2303 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2284 | while (expect_false (i && text[count] == NOCHAR)) |
2304 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2285 | count++, i--; |
2305 | count++, i--; |
2286 | |
2306 | |
2287 | /* |
2307 | /* |
2288 | * Determine the attributes for the string |
2308 | * Determine the attributes for the string |
2289 | */ |
2309 | */ |
2290 | int fore = fgcolor_of (rend); // desired foreground |
2310 | int fore = fgcolor_of (rend); // desired foreground |
2291 | int back = bgcolor_of (rend); // desired background |
2311 | int back = bgcolor_of (rend); // desired background |
2292 | |
2312 | |
2293 | // only do special processing if any attributes are set, which is unlikely |
2313 | // only do special processing if any attributes are set, which is unlikely |
2294 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2314 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2295 | { |
2315 | { |
2296 | bool invert = rend & RS_RVid; |
2316 | bool invert = rend & RS_RVid; |
2297 | |
2317 | |
2298 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2318 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2299 | if (rend & RS_Bold && fore == Color_fg) |
2319 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2388 | /* |
2408 | /* |
2389 | * Actually do the drawing of the string here |
2409 | * Actually do the drawing of the string here |
2390 | */ |
2410 | */ |
2391 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2411 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2392 | |
2412 | |
2393 | if (expect_true (have_bg && back == Color_bg)) |
2413 | if (ecb_likely (have_bg && back == Color_bg)) |
2394 | { |
2414 | { |
2395 | // this is very ugly, maybe push it into ->draw? |
2415 | // this is very ugly, maybe push it into ->draw? |
2396 | |
2416 | |
2397 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2417 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2398 | if (text[i] != ' ') |
2418 | if (text[i] != ' ') |
… | |
… | |
2405 | did_clear: ; |
2425 | did_clear: ; |
2406 | } |
2426 | } |
2407 | else |
2427 | else |
2408 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2428 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2409 | |
2429 | |
2410 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2430 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2411 | { |
2431 | { |
2412 | #if ENABLE_FRILLS |
2432 | #if ENABLE_FRILLS |
2413 | if (ISSET_PIXCOLOR (Color_underline)) |
2433 | if (ISSET_PIXCOLOR (Color_underline)) |
2414 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2434 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2415 | else |
2435 | else |
… | |
… | |
2516 | if (bg_pixmap != None) |
2536 | if (bg_pixmap != None) |
2517 | { |
2537 | { |
2518 | # ifdef ENABLE_TRANSPARENCY |
2538 | # ifdef ENABLE_TRANSPARENCY |
2519 | if (bg_flags & BG_IS_TRANSPARENT) |
2539 | if (bg_flags & BG_IS_TRANSPARENT) |
2520 | { |
2540 | { |
2521 | XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); |
2541 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
2522 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2542 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2523 | |
2543 | |
2524 | transparent = true; |
2544 | transparent = true; |
2525 | } |
2545 | } |
2526 | else |
2546 | else |
2527 | # endif |
2547 | # endif |
2528 | { |
2548 | { |
2529 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2549 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2530 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
2550 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
2531 | } |
2551 | } |
2532 | } |
2552 | } |
2533 | else |
2553 | else |
2534 | #endif |
2554 | #endif |
2535 | { |
2555 | { |
2536 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2556 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2537 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2557 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2538 | } |
2558 | } |
2539 | |
2559 | |
2540 | XClearWindow (dpy, parent[0]); |
2560 | XClearWindow (dpy, parent); |
2541 | |
2561 | |
2542 | if (scrollBar.win) |
2562 | if (scrollBar.win) |
2543 | { |
2563 | { |
2544 | if (transparent) |
2564 | if (transparent) |
2545 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2565 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2546 | else |
2566 | else |
2547 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2567 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2548 | scrollBar.state = STATE_IDLE; |
2568 | scrollBar.state = SB_STATE_IDLE; |
2549 | scrollBar.show (0); |
2569 | scrollBar.show (0); |
2550 | } |
2570 | } |
2551 | |
2571 | |
2552 | if (refresh) |
2572 | if (refresh) |
2553 | { |
2573 | { |
… | |
… | |
2697 | || (check_more == 3 |
2717 | || (check_more == 3 |
2698 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2718 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2699 | || (check_more == 4 /* screen width change */ |
2719 | || (check_more == 4 /* screen width change */ |
2700 | && (selection.beg.row != selection.end.row |
2720 | && (selection.beg.row != selection.end.row |
2701 | || selection.end.col > ncol))) |
2721 | || selection.end.col > ncol))) |
2702 | CLEAR_SELECTION (); |
2722 | CLEAR_ALL_SELECTION (); |
2703 | } |
2723 | } |
2704 | |
2724 | |
2705 | /* ------------------------------------------------------------------------- */ |
2725 | /* ------------------------------------------------------------------------- */ |
2706 | /* |
2726 | /* |
2707 | * Paste a selection direct to the command fd |
2727 | * Paste a selection direct to the command fd |
… | |
… | |
2732 | tt_paste (data, len); |
2752 | tt_paste (data, len); |
2733 | } |
2753 | } |
2734 | |
2754 | |
2735 | /* ------------------------------------------------------------------------- */ |
2755 | /* ------------------------------------------------------------------------- */ |
2736 | /* |
2756 | /* |
2737 | * Request the current selection: |
2757 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2738 | * Order: > internal selection if available |
2758 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2739 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2759 | * as fallback |
2740 | * > CUT_BUFFER0 |
|
|
2741 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2742 | * will auto fallback to CUT_BUFFER0 |
|
|
2743 | * EXT: button 2 release |
2760 | * EXT: button 2 release |
2744 | */ |
2761 | */ |
2745 | void |
2762 | void |
2746 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2763 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2747 | { |
2764 | { |
2748 | if (selection.text && selnum == Sel_Primary) |
|
|
2749 | { |
|
|
2750 | /* internal selection */ |
|
|
2751 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2752 | paste (str, strlen (str)); |
|
|
2753 | free (str); |
|
|
2754 | } |
|
|
2755 | else if (!selection_req) |
2765 | if (!selection_req) |
2756 | { |
2766 | { |
2757 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
2767 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
2758 | selection_req->run (); |
2768 | selection_req->run (); |
2759 | } |
2769 | } |
2760 | } |
2770 | } |
… | |
… | |
3408 | * EXT: SelectionRequest |
3418 | * EXT: SelectionRequest |
3409 | */ |
3419 | */ |
3410 | void |
3420 | void |
3411 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3421 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3412 | { |
3422 | { |
|
|
3423 | Atom property = rq.property == None ? rq.target : rq.property; |
3413 | XSelectionEvent ev; |
3424 | XSelectionEvent ev; |
3414 | |
3425 | |
3415 | ev.type = SelectionNotify; |
3426 | ev.type = SelectionNotify; |
3416 | ev.property = None; |
3427 | ev.property = None; |
3417 | ev.display = rq.display; |
3428 | ev.display = rq.display; |
… | |
… | |
3432 | *target++ = xa[XA_COMPOUND_TEXT]; |
3443 | *target++ = xa[XA_COMPOUND_TEXT]; |
3433 | #if X_HAVE_UTF8_STRING |
3444 | #if X_HAVE_UTF8_STRING |
3434 | *target++ = xa[XA_UTF8_STRING]; |
3445 | *target++ = xa[XA_UTF8_STRING]; |
3435 | #endif |
3446 | #endif |
3436 | |
3447 | |
3437 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3448 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3438 | 32, PropModeReplace, |
3449 | 32, PropModeReplace, |
3439 | (unsigned char *)target_list, target - target_list); |
3450 | (unsigned char *)target_list, target - target_list); |
3440 | ev.property = rq.property; |
3451 | ev.property = property; |
3441 | } |
3452 | } |
3442 | #if TODO // TODO |
3453 | #if TODO // TODO |
3443 | else if (rq.target == xa[XA_MULTIPLE]) |
3454 | else if (rq.target == xa[XA_MULTIPLE]) |
3444 | { |
3455 | { |
3445 | /* TODO: Handle MULTIPLE */ |
3456 | /* TODO: Handle MULTIPLE */ |
3446 | } |
3457 | } |
3447 | #endif |
3458 | #endif |
3448 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3459 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3449 | { |
3460 | { |
3450 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3461 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3451 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3462 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3452 | ev.property = rq.property; |
3463 | ev.property = property; |
3453 | } |
3464 | } |
3454 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3465 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3455 | { |
3466 | { |
3456 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3467 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3457 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3468 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3458 | ev.property = rq.property; |
3469 | ev.property = property; |
3459 | } |
3470 | } |
3460 | else if (rq.target == XA_STRING |
3471 | else if (rq.target == XA_STRING |
3461 | || rq.target == xa[XA_TEXT] |
3472 | || rq.target == xa[XA_TEXT] |
3462 | || rq.target == xa[XA_COMPOUND_TEXT] |
3473 | || rq.target == xa[XA_COMPOUND_TEXT] |
3463 | || rq.target == xa[XA_UTF8_STRING] |
3474 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3534 | ct.value = (unsigned char *)cl; |
3545 | ct.value = (unsigned char *)cl; |
3535 | ct.nitems = selectlen; |
3546 | ct.nitems = selectlen; |
3536 | ct.encoding = target; |
3547 | ct.encoding = target; |
3537 | } |
3548 | } |
3538 | |
3549 | |
3539 | XChangeProperty (dpy, rq.requestor, rq.property, |
3550 | XChangeProperty (dpy, rq.requestor, property, |
3540 | ct.encoding, 8, PropModeReplace, |
3551 | ct.encoding, 8, PropModeReplace, |
3541 | ct.value, (int)ct.nitems); |
3552 | ct.value, (int)ct.nitems); |
3542 | ev.property = rq.property; |
3553 | ev.property = property; |
3543 | |
3554 | |
3544 | if (freect) |
3555 | if (freect) |
3545 | XFree (ct.value); |
3556 | XFree (ct.value); |
3546 | } |
3557 | } |
3547 | |
3558 | |