… | |
… | |
441 | */ |
441 | */ |
442 | void |
442 | void |
443 | rxvt_term::scr_release () |
443 | rxvt_term::scr_release () |
444 | { |
444 | { |
445 | unsigned int total_rows; |
445 | unsigned int total_rows; |
446 | int i; |
|
|
447 | |
446 | |
448 | total_rows = TermWin.nrow + TermWin.saveLines; |
447 | total_rows = TermWin.nrow + TermWin.saveLines; |
449 | |
448 | |
450 | delete talloc; talloc = 0; |
449 | delete talloc; talloc = 0; |
451 | delete ralloc; ralloc = 0; |
450 | delete ralloc; ralloc = 0; |
… | |
… | |
773 | * Add text given in <str> of length <len> to screen struct |
772 | * Add text given in <str> of length <len> to screen struct |
774 | */ |
773 | */ |
775 | void |
774 | void |
776 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
775 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
777 | { |
776 | { |
|
|
777 | if (len <= 0) /* sanity */ |
|
|
778 | return; |
|
|
779 | |
778 | unsigned char checksel; |
780 | unsigned char checksel; |
779 | unicode_t c; |
781 | unicode_t c; |
780 | int i, row, last_col; |
782 | int row, last_col; |
781 | text_t *stp; |
783 | text_t *stp; |
782 | rend_t *srp; |
784 | rend_t *srp; |
783 | |
785 | const unicode_t *strend = str + len; |
784 | if (len <= 0) /* sanity */ |
|
|
785 | return; |
|
|
786 | |
786 | |
787 | want_refresh = 1; |
787 | want_refresh = 1; |
788 | ZERO_SCROLLBACK (); |
788 | ZERO_SCROLLBACK (); |
789 | last_col = TermWin.ncol; |
789 | last_col = TermWin.ncol; |
790 | |
790 | |
… | |
… | |
815 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
815 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
816 | |
816 | |
817 | stp = screen.text[row]; |
817 | stp = screen.text[row]; |
818 | srp = screen.rend[row]; |
818 | srp = screen.rend[row]; |
819 | |
819 | |
820 | while (len--) |
820 | while (str < strend) |
821 | { |
821 | { |
822 | c = *str++; |
822 | c = *str++; |
823 | |
823 | |
824 | if (c < 0x20) |
824 | if (c < 0x20) |
825 | switch (c) |
825 | if (c == C0_LF) |
|
|
826 | { |
|
|
827 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
828 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
829 | |
|
|
830 | screen.flags &= ~Screen_WrapNext; |
|
|
831 | |
|
|
832 | if (screen.cur.row == screen.bscroll) |
|
|
833 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
834 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
835 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
836 | |
|
|
837 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
838 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
839 | continue; |
|
|
840 | } |
|
|
841 | else if (c == C0_CR) |
826 | { |
842 | { |
827 | case C0_HT: |
|
|
828 | scr_tab (1, true); |
|
|
829 | continue; |
|
|
830 | |
|
|
831 | case C0_LF: |
|
|
832 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
843 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
833 | MAX_IT (screen.tlen[row], screen.cur.col); |
844 | MAX_IT (screen.tlen[row], screen.cur.col); |
834 | |
845 | |
835 | screen.flags &= ~Screen_WrapNext; |
846 | screen.flags &= ~Screen_WrapNext; |
836 | |
|
|
837 | if (screen.cur.row == screen.bscroll) |
|
|
838 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
839 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
840 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
841 | |
|
|
842 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
843 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
844 | continue; |
|
|
845 | |
|
|
846 | case C0_CR: |
|
|
847 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
848 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
849 | |
|
|
850 | screen.flags &= ~Screen_WrapNext; |
|
|
851 | screen.cur.col = 0; |
847 | screen.cur.col = 0; |
852 | continue; |
848 | continue; |
|
|
849 | } |
|
|
850 | else if (c == C0_HT) |
|
|
851 | { |
|
|
852 | scr_tab (1, true); |
|
|
853 | continue; |
853 | } |
854 | } |
854 | |
855 | |
855 | if (checksel /* see if we're writing within selection */ |
856 | if (checksel /* see if we're writing within selection */ |
856 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
857 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
857 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
858 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
… | |
… | |
867 | |
868 | |
868 | if (screen.flags & Screen_WrapNext) |
869 | if (screen.flags & Screen_WrapNext) |
869 | { |
870 | { |
870 | screen.tlen[row] = -1; |
871 | screen.tlen[row] = -1; |
871 | |
872 | |
|
|
873 | scr_do_wrap (); |
|
|
874 | |
872 | scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; |
875 | row = screen.cur.row + TermWin.saveLines; |
873 | |
|
|
874 | stp = screen.text[row]; /* _must_ refresh */ |
876 | stp = screen.text[row]; /* _must_ refresh */ |
875 | srp = screen.rend[row]; /* _must_ refresh */ |
877 | srp = screen.rend[row]; /* _must_ refresh */ |
876 | } |
878 | } |
877 | |
879 | |
|
|
880 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
|
|
881 | if (IN_RANGE (c, 0xd800, 0xdfff)) |
|
|
882 | c = 0xfffd; |
|
|
883 | |
878 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
884 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
879 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
885 | // do wcwidth before further replacements, as wcwidth might return -1 |
880 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
886 | // for the line drawing characters below as they might be invalid in the current |
|
|
887 | // locale. |
881 | int width = c < 0x100 ? 1 : wcwidth (c); |
888 | int width = c < 0x100 ? 1 : wcwidth (c); |
882 | |
889 | |
883 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
890 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
884 | { |
891 | { |
885 | // vt100 special graphics and line drawing |
892 | // vt100 special graphics and line drawing |
886 | // 5f-7e standard vt100 |
893 | // 5f-7e standard vt100 |
887 | // 40-5e rxvt extension for extra curses acs chars |
894 | // 40-5e rxvt extension for extra curses acs chars |
888 | static uint16_t vt100_0[63] = { // 40 .. 7e |
895 | static uint16_t vt100_0[62] = { // 41 .. 7e |
889 | 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! |
896 | 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman! |
890 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f |
897 | 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f |
891 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 |
898 | 0, 0, 0, 0, 0, 0, 0, 0, // 50-57 |
892 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f |
899 | 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f |
893 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
900 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
894 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
901 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
895 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
902 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
896 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
903 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
897 | }; |
904 | }; |
898 | |
905 | |
899 | if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) |
906 | if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41]) |
900 | { |
907 | { |
901 | c = vt100_0[c - 0x40]; |
908 | c = vt100_0[c - 0x41]; |
902 | width = 1; |
909 | width = 1; // vt100 line drawing characters are always single-width |
903 | } |
910 | } |
904 | } |
911 | } |
905 | |
912 | |
906 | if (screen.flags & Screen_Insert) |
913 | if (screen.flags & Screen_Insert) |
907 | scr_insdel_chars (width, INSERT); |
914 | scr_insdel_chars (width, INSERT); |
908 | |
915 | |
909 | if (width != 0) |
916 | if (width != 0) |
910 | { |
917 | { |
911 | // some utf-8 decoders decode surrogate characters. |
|
|
912 | if (0xd800 <= c && c <= 0xdfff) |
|
|
913 | c = 0xfffd; |
|
|
914 | |
|
|
915 | #if !UNICODE_3 |
918 | #if !UNICODE_3 |
916 | // trim characters we can't store directly :( |
919 | // trim characters we can't store directly :( |
917 | if (c >= 0x10000) |
920 | if (c >= 0x10000) |
918 | # if ENABLE_COMBINING |
921 | # if ENABLE_COMBINING |
919 | c = rxvt_composite.compose (c); // map to lower 16 bits |
922 | c = rxvt_composite.compose (c); // map to lower 16 bits |
… | |
… | |
942 | col++; |
945 | col++; |
943 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
946 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
944 | } |
947 | } |
945 | |
948 | |
946 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
949 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
950 | |
|
|
951 | // if the character doesn't fit into the remaining columns... |
|
|
952 | if (screen.cur.col > last_col - width && last_col >= width) |
|
|
953 | { |
|
|
954 | // ...output spaces |
|
|
955 | c = ' '; |
|
|
956 | // and try the same character next loop iteration |
|
|
957 | --str; |
|
|
958 | } |
947 | |
959 | |
948 | do |
960 | do |
949 | { |
961 | { |
950 | stp[screen.cur.col] = c; |
962 | stp[screen.cur.col] = c; |
951 | srp[screen.cur.col] = rend; |
963 | srp[screen.cur.col] = rend; |
… | |
… | |
970 | { |
982 | { |
971 | stp[c] = ' '; |
983 | stp[c] = ' '; |
972 | srp[c] = rend; |
984 | srp[c] = rend; |
973 | } |
985 | } |
974 | } |
986 | } |
975 | else if (width == 0) |
987 | else // width == 0 |
976 | { |
988 | { |
977 | #if ENABLE_COMBINING |
989 | #if ENABLE_COMBINING |
978 | // handle combining characters |
990 | // handle combining characters |
979 | // we just tag the accent on the previous on-screen character. |
991 | // we just tag the accent on the previous on-screen character. |
980 | // this is arguably not correct, but also arguably not wrong. |
992 | // this is arguably not correct, but also arguably not wrong. |
981 | // we don't handle double-width characters nicely yet. |
993 | // we don't handle double-width characters nicely yet. |
982 | |
|
|
983 | text_t *tp; |
994 | text_t *tp; |
984 | rend_t *rp; |
995 | rend_t *rp; |
985 | |
996 | |
986 | if (screen.cur.col > 0) |
997 | if (screen.cur.col > 0) |
987 | { |
998 | { |
… | |
… | |
1936 | /* ------------------------------------------------------------------------- */ |
1947 | /* ------------------------------------------------------------------------- */ |
1937 | void |
1948 | void |
1938 | rxvt_term::scr_bell () |
1949 | rxvt_term::scr_bell () |
1939 | { |
1950 | { |
1940 | #ifndef NO_BELL |
1951 | #ifndef NO_BELL |
|
|
1952 | |
1941 | # ifndef NO_MAPALERT |
1953 | # ifndef NO_MAPALERT |
1942 | # ifdef MAPALERT_OPTION |
1954 | # ifdef MAPALERT_OPTION |
1943 | if (options & Opt_mapAlert) |
1955 | if (options & Opt_mapAlert) |
1944 | # endif |
1956 | # endif |
1945 | XMapWindow (display->display, TermWin.parent[0]); |
1957 | XMapWindow (display->display, TermWin.parent[0]); |
1946 | # endif |
1958 | # endif |
|
|
1959 | |
1947 | if (options & Opt_visualBell) |
1960 | if (options & Opt_visualBell) |
1948 | { |
1961 | { |
1949 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1962 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1963 | rxvt_usleep (VISUAL_BELL_DURATION); |
1950 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1964 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1951 | } |
1965 | } |
1952 | else |
1966 | else |
1953 | XBell (display->display, 0); |
1967 | XBell (display->display, 0); |
|
|
1968 | |
1954 | #endif |
1969 | #endif |
1955 | } |
1970 | } |
1956 | |
1971 | |
1957 | /* ------------------------------------------------------------------------- */ |
1972 | /* ------------------------------------------------------------------------- */ |
1958 | /* ARGSUSED */ |
1973 | /* ARGSUSED */ |
… | |
… | |
2145 | |
2160 | |
2146 | #if ENABLE_OVERLAY |
2161 | #if ENABLE_OVERLAY |
2147 | scr_swap_overlay (); |
2162 | scr_swap_overlay (); |
2148 | #endif |
2163 | #endif |
2149 | |
2164 | |
2150 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
|
|
2151 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
2152 | |
|
|
2153 | #ifndef NO_SLOW_LINK_SUPPORT |
2165 | #ifndef NO_SLOW_LINK_SUPPORT |
2154 | /* |
2166 | /* |
2155 | * D: CopyArea pass - very useful for slower links |
2167 | * D: CopyArea pass - very useful for slower links |
2156 | * This has been deliberately kept simple. |
2168 | * This has been deliberately kept simple. |
2157 | */ |
2169 | */ |
… | |
… | |
2292 | |
2304 | |
2293 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2305 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2294 | while (i && text[count] == NOCHAR) |
2306 | while (i && text[count] == NOCHAR) |
2295 | count++, i--; |
2307 | count++, i--; |
2296 | |
2308 | |
2297 | #if ENABLE_STYLES |
|
|
2298 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2299 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
|
|
2300 | drp[col + 1] = ~srp[col + 1]; |
|
|
2301 | |
|
|
2302 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2303 | while (text > stp |
|
|
2304 | && srp[text - stp - 1] & RS_Careful |
|
|
2305 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2306 | text--, count++, xpixel -= TermWin.fwidth; |
|
|
2307 | #endif |
|
|
2308 | |
|
|
2309 | /* |
2309 | /* |
2310 | * Determine the attributes for the string |
2310 | * Determine the attributes for the string |
2311 | */ |
2311 | */ |
2312 | int fore = GET_FGCOLOR (rend); // desired foreground |
2312 | int fore = GET_FGCOLOR (rend); // desired foreground |
2313 | int back = GET_BGCOLOR (rend); // desired background |
2313 | int back = GET_BGCOLOR (rend); // desired background |
2314 | |
2314 | |
2315 | // only do special processing if ana attributes are set, which is rare |
2315 | // only do special processing if any attributes are set, which is rare |
2316 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) |
2316 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2317 | { |
2317 | { |
|
|
2318 | #if ENABLE_STYLES |
|
|
2319 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2320 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
|
|
2321 | drp[col + 1] = ~srp[col + 1]; |
|
|
2322 | |
|
|
2323 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2324 | while (text > stp |
|
|
2325 | && srp[text - stp - 1] & RS_Careful |
|
|
2326 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2327 | text--, count++, xpixel -= TermWin.fwidth; |
|
|
2328 | #endif |
|
|
2329 | |
2318 | bool invert = rend & RS_RVid; |
2330 | bool invert = rend & RS_RVid; |
2319 | |
2331 | |
2320 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2332 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2321 | if (rend & RS_Bold |
2333 | if (rend & RS_Bold |
2322 | && fore == Color_fg) |
2334 | && fore == Color_fg) |
… | |
… | |
2349 | SWAP_IT (fore, back, int); |
2361 | SWAP_IT (fore, back, int); |
2350 | |
2362 | |
2351 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2363 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2352 | if (ISSET_PIXCOLOR (Color_RV)) |
2364 | if (ISSET_PIXCOLOR (Color_RV)) |
2353 | back = Color_RV; |
2365 | back = Color_RV; |
|
|
2366 | |
|
|
2367 | if (fore == back) |
|
|
2368 | { |
|
|
2369 | fore = Color_bg; |
|
|
2370 | back = Color_fg; |
|
|
2371 | } |
2354 | #endif |
2372 | #endif |
2355 | } |
2373 | } |
2356 | |
2374 | |
2357 | #ifdef TEXT_BLINK |
2375 | #ifdef TEXT_BLINK |
2358 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2376 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
… | |
… | |
2433 | #endif |
2451 | #endif |
2434 | } |
2452 | } |
2435 | } |
2453 | } |
2436 | else if (oldcursor.row >= 0) |
2454 | else if (oldcursor.row >= 0) |
2437 | { |
2455 | { |
|
|
2456 | int cursorwidth = 1; |
|
|
2457 | int col = oldcursor.col; |
|
|
2458 | |
|
|
2459 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
|
|
2460 | col--; |
|
|
2461 | |
|
|
2462 | while (col + cursorwidth < TermWin.ncol |
|
|
2463 | && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) |
|
|
2464 | cursorwidth++; |
|
|
2465 | |
2438 | #ifndef NO_CURSORCOLOR |
2466 | #ifndef NO_CURSORCOLOR |
2439 | if (ISSET_PIXCOLOR (Color_cursor)) |
2467 | if (ISSET_PIXCOLOR (Color_cursor)) |
2440 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2468 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2441 | #endif |
2469 | #endif |
2442 | int cursorwidth = 1; |
|
|
2443 | while (oldcursor.col + cursorwidth < TermWin.ncol |
|
|
2444 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
|
|
2445 | cursorwidth++; |
|
|
2446 | |
2470 | |
2447 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2471 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2448 | Col2Pixel (oldcursor.col), |
2472 | Col2Pixel (col), |
2449 | Row2Pixel (oldcursor.row), |
2473 | Row2Pixel (oldcursor.row), |
2450 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2474 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2451 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2475 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2452 | } |
2476 | } |
2453 | } |
2477 | } |
… | |
… | |
2524 | if (!TermWin.mapped) |
2548 | if (!TermWin.mapped) |
2525 | return; |
2549 | return; |
2526 | |
2550 | |
2527 | num_scr_allow = 0; |
2551 | num_scr_allow = 0; |
2528 | want_refresh = 1; |
2552 | want_refresh = 1; |
2529 | |
|
|
2530 | #if TRANSPARENT |
|
|
2531 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
|
|
2532 | { |
|
|
2533 | int i; |
|
|
2534 | |
|
|
2535 | if (!(options & Opt_transparent_all)) |
|
|
2536 | i = 0; |
|
|
2537 | else |
|
|
2538 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
|
|
2539 | |
|
|
2540 | while (i--) |
|
|
2541 | if (TermWin.parent[i] != None) |
|
|
2542 | XClearWindow (display->display, TermWin.parent[i]); |
|
|
2543 | } |
|
|
2544 | #endif |
|
|
2545 | |
2553 | |
2546 | if (really) |
2554 | if (really) |
2547 | XClearWindow (display->display, TermWin.vt); |
2555 | XClearWindow (display->display, TermWin.vt); |
2548 | } |
2556 | } |
2549 | |
2557 | |
… | |
… | |
3796 | while (*s) |
3804 | while (*s) |
3797 | scr_overlay_set (x++, y, *s++); |
3805 | scr_overlay_set (x++, y, *s++); |
3798 | } |
3806 | } |
3799 | |
3807 | |
3800 | void |
3808 | void |
|
|
3809 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
|
|
3810 | { |
|
|
3811 | while (*s) |
|
|
3812 | { |
|
|
3813 | text_t t = *s++; |
|
|
3814 | int width = wcwidth (t); |
|
|
3815 | |
|
|
3816 | while (width--) |
|
|
3817 | { |
|
|
3818 | scr_overlay_set (x++, y, t); |
|
|
3819 | t = NOCHAR; |
|
|
3820 | } |
|
|
3821 | } |
|
|
3822 | } |
|
|
3823 | |
|
|
3824 | void |
3801 | rxvt_term::scr_swap_overlay () |
3825 | rxvt_term::scr_swap_overlay () |
3802 | { |
3826 | { |
3803 | if (!ov_text) |
3827 | if (!ov_text) |
3804 | return; |
3828 | return; |
3805 | |
3829 | |