| … | |
… | |
| 799 | |
799 | |
| 800 | while (str < strend) |
800 | while (str < strend) |
| 801 | { |
801 | { |
| 802 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
802 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
| 803 | |
803 | |
| 804 | if (expect_false (c < 0x20)) |
804 | if (ecb_unlikely (c < 0x20)) |
| 805 | if (c == C0_LF) |
805 | if (c == C0_LF) |
| 806 | { |
806 | { |
| 807 | max_it (line->l, screen.cur.col); |
807 | max_it (line->l, screen.cur.col); |
| 808 | |
808 | |
| 809 | screen.flags &= ~Screen_WrapNext; |
809 | screen.flags &= ~Screen_WrapNext; |
| … | |
… | |
| 828 | { |
828 | { |
| 829 | scr_tab (1, true); |
829 | scr_tab (1, true); |
| 830 | continue; |
830 | continue; |
| 831 | } |
831 | } |
| 832 | |
832 | |
| 833 | if (expect_false ( |
833 | if (ecb_unlikely ( |
| 834 | checksel /* see if we're writing within selection */ |
834 | checksel /* see if we're writing within selection */ |
| 835 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
835 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
| 836 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
836 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
| 837 | )) |
837 | )) |
| 838 | { |
838 | { |
| … | |
… | |
| 843 | * should be a similar check. |
843 | * should be a similar check. |
| 844 | */ |
844 | */ |
| 845 | CLEAR_SELECTION (); |
845 | CLEAR_SELECTION (); |
| 846 | } |
846 | } |
| 847 | |
847 | |
| 848 | if (expect_false (screen.flags & Screen_WrapNext)) |
848 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
| 849 | { |
849 | { |
| 850 | scr_do_wrap (); |
850 | scr_do_wrap (); |
| 851 | |
851 | |
| 852 | line->l = ncol; |
852 | line->l = ncol; |
| 853 | line->is_longer (1); |
853 | line->is_longer (1); |
| … | |
… | |
| 855 | row = screen.cur.row; |
855 | row = screen.cur.row; |
| 856 | line = &ROW(row); /* _must_ refresh */ |
856 | line = &ROW(row); /* _must_ refresh */ |
| 857 | } |
857 | } |
| 858 | |
858 | |
| 859 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
859 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
| 860 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
860 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
| 861 | c = 0xfffd; |
861 | c = 0xfffd; |
| 862 | |
862 | |
| 863 | // rely on wcwidth to tell us the character width, do wcwidth before |
863 | // rely on wcwidth to tell us the character width, do wcwidth before |
| 864 | // further replacements, as wcwidth might return -1 for the line |
864 | // further replacements, as wcwidth might return -1 for the line |
| 865 | // drawing characters below as they might be invalid in the current |
865 | // drawing characters below as they might be invalid in the current |
| 866 | // locale. |
866 | // locale. |
| 867 | int width = WCWIDTH (c); |
867 | int width = WCWIDTH (c); |
| 868 | |
868 | |
| 869 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
869 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
| 870 | { |
870 | { |
| 871 | // vt100 special graphics and line drawing |
871 | // vt100 special graphics and line drawing |
| 872 | // 5f-7e standard vt100 |
872 | // 5f-7e standard vt100 |
| 873 | // 40-5e rxvt extension for extra curses acs chars |
873 | // 40-5e rxvt extension for extra curses acs chars |
| 874 | static uint16_t vt100_0[62] = { // 41 .. 7e |
874 | static uint16_t vt100_0[62] = { // 41 .. 7e |
| … | |
… | |
| 887 | c = vt100_0[c - 0x41]; |
887 | c = vt100_0[c - 0x41]; |
| 888 | width = 1; // vt100 line drawing characters are always single-width |
888 | width = 1; // vt100 line drawing characters are always single-width |
| 889 | } |
889 | } |
| 890 | } |
890 | } |
| 891 | |
891 | |
| 892 | if (expect_false (screen.flags & Screen_Insert)) |
892 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
| 893 | scr_insdel_chars (width, INSERT); |
893 | scr_insdel_chars (width, INSERT); |
| 894 | |
894 | |
| 895 | if (width != 0) |
895 | if (width != 0) |
| 896 | { |
896 | { |
| 897 | #if !UNICODE_3 |
897 | #if !UNICODE_3 |
| … | |
… | |
| 905 | #endif |
905 | #endif |
| 906 | |
906 | |
| 907 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
907 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
| 908 | |
908 | |
| 909 | // if the character doesn't fit into the remaining columns... |
909 | // if the character doesn't fit into the remaining columns... |
| 910 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
910 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
| 911 | { |
911 | { |
| 912 | if (screen.flags & Screen_Autowrap) |
912 | if (screen.flags & Screen_Autowrap) |
| 913 | { |
913 | { |
| 914 | // ... artificially enlargen the previous one |
914 | // ... artificially enlargen the previous one |
| 915 | c = NOCHAR; |
915 | c = NOCHAR; |
| … | |
… | |
| 922 | |
922 | |
| 923 | // nuke the character at this position, if required |
923 | // nuke the character at this position, if required |
| 924 | // due to wonderful coincidences everywhere else in this loop |
924 | // due to wonderful coincidences everywhere else in this loop |
| 925 | // we never have to check for overwriting a wide char itself, |
925 | // we never have to check for overwriting a wide char itself, |
| 926 | // only its tail. |
926 | // only its tail. |
| 927 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
927 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
| 928 | scr_kill_char (*line, screen.cur.col); |
928 | scr_kill_char (*line, screen.cur.col); |
| 929 | |
929 | |
| 930 | line->touch (); |
930 | line->touch (); |
| 931 | |
931 | |
| 932 | do |
932 | do |
| 933 | { |
933 | { |
| 934 | line->t[screen.cur.col] = c; |
934 | line->t[screen.cur.col] = c; |
| 935 | line->r[screen.cur.col] = rend; |
935 | line->r[screen.cur.col] = rend; |
| 936 | |
936 | |
| 937 | if (expect_true (screen.cur.col < ncol - 1)) |
937 | if (ecb_likely (screen.cur.col < ncol - 1)) |
| 938 | screen.cur.col++; |
938 | screen.cur.col++; |
| 939 | else |
939 | else |
| 940 | { |
940 | { |
| 941 | line->l = ncol; |
941 | line->l = ncol; |
| 942 | if (screen.flags & Screen_Autowrap) |
942 | if (screen.flags & Screen_Autowrap) |
| … | |
… | |
| 945 | goto end_of_line; |
945 | goto end_of_line; |
| 946 | } |
946 | } |
| 947 | |
947 | |
| 948 | c = NOCHAR; |
948 | c = NOCHAR; |
| 949 | } |
949 | } |
| 950 | while (expect_false (--width > 0)); |
950 | while (ecb_unlikely (--width > 0)); |
| 951 | |
951 | |
| 952 | // pad with spaces when overwriting wide character with smaller one |
952 | // pad with spaces when overwriting wide character with smaller one |
| 953 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
953 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
| 954 | { |
954 | { |
| 955 | line->t[c] = ' '; |
955 | line->t[c] = ' '; |
| 956 | line->r[c] = rend; |
956 | line->r[c] = rend; |
| 957 | } |
957 | } |
| 958 | |
958 | |
| … | |
… | |
| 2234 | continue; |
2234 | continue; |
| 2235 | |
2235 | |
| 2236 | // redraw one or more characters |
2236 | // redraw one or more characters |
| 2237 | |
2237 | |
| 2238 | // seek to the beginning of wide characters |
2238 | // seek to the beginning of wide characters |
| 2239 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2239 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
| 2240 | --col; |
2240 | --col; |
| 2241 | |
2241 | |
| 2242 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2242 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
| 2243 | text_t *text = stp + col; |
2243 | text_t *text = stp + col; |
| 2244 | int count = 1; |
2244 | int count = 1; |
| … | |
… | |
| 2282 | |
2282 | |
| 2283 | col--; /* went one too far. move back */ |
2283 | col--; /* went one too far. move back */ |
| 2284 | count -= i; /* dump any matching trailing chars */ |
2284 | count -= i; /* dump any matching trailing chars */ |
| 2285 | |
2285 | |
| 2286 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2286 | // sometimes we optimize away the trailing NOCHAR's, add them back |
| 2287 | while (expect_false (i && text[count] == NOCHAR)) |
2287 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
| 2288 | count++, i--; |
2288 | count++, i--; |
| 2289 | |
2289 | |
| 2290 | /* |
2290 | /* |
| 2291 | * Determine the attributes for the string |
2291 | * Determine the attributes for the string |
| 2292 | */ |
2292 | */ |
| 2293 | int fore = fgcolor_of (rend); // desired foreground |
2293 | int fore = fgcolor_of (rend); // desired foreground |
| 2294 | int back = bgcolor_of (rend); // desired background |
2294 | int back = bgcolor_of (rend); // desired background |
| 2295 | |
2295 | |
| 2296 | // only do special processing if any attributes are set, which is unlikely |
2296 | // only do special processing if any attributes are set, which is unlikely |
| 2297 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2297 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
| 2298 | { |
2298 | { |
| 2299 | bool invert = rend & RS_RVid; |
2299 | bool invert = rend & RS_RVid; |
| 2300 | |
2300 | |
| 2301 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2301 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
| 2302 | if (rend & RS_Bold && fore == Color_fg) |
2302 | if (rend & RS_Bold && fore == Color_fg) |
| … | |
… | |
| 2391 | /* |
2391 | /* |
| 2392 | * Actually do the drawing of the string here |
2392 | * Actually do the drawing of the string here |
| 2393 | */ |
2393 | */ |
| 2394 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2394 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
| 2395 | |
2395 | |
| 2396 | if (expect_true (have_bg && back == Color_bg)) |
2396 | if (ecb_likely (have_bg && back == Color_bg)) |
| 2397 | { |
2397 | { |
| 2398 | // this is very ugly, maybe push it into ->draw? |
2398 | // this is very ugly, maybe push it into ->draw? |
| 2399 | |
2399 | |
| 2400 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2400 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
| 2401 | if (text[i] != ' ') |
2401 | if (text[i] != ' ') |
| … | |
… | |
| 2408 | did_clear: ; |
2408 | did_clear: ; |
| 2409 | } |
2409 | } |
| 2410 | else |
2410 | else |
| 2411 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2411 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
| 2412 | |
2412 | |
| 2413 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2413 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
| 2414 | { |
2414 | { |
| 2415 | #if ENABLE_FRILLS |
2415 | #if ENABLE_FRILLS |
| 2416 | if (ISSET_PIXCOLOR (Color_underline)) |
2416 | if (ISSET_PIXCOLOR (Color_underline)) |
| 2417 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2417 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
| 2418 | else |
2418 | else |
