| … | |
… | |
| 2085 | ccol2 = bgcolor_of (rstyle); |
2085 | ccol2 = bgcolor_of (rstyle); |
| 2086 | #else |
2086 | #else |
| 2087 | ccol2 = Color_bg; |
2087 | ccol2 = Color_bg; |
| 2088 | #endif |
2088 | #endif |
| 2089 | |
2089 | |
| 2090 | if (showcursor && focus) |
2090 | if (focus) |
| 2091 | { |
2091 | { |
| 2092 | if (option (Opt_cursorUnderline)) |
2092 | if (option (Opt_cursorUnderline)) |
| 2093 | *crp ^= RS_Uline; |
2093 | *crp ^= RS_Uline; |
| 2094 | else |
2094 | else |
| 2095 | { |
2095 | { |
| … | |
… | |
| 2377 | } |
2377 | } |
| 2378 | |
2378 | |
| 2379 | /* |
2379 | /* |
| 2380 | * Actually do the drawing of the string here |
2380 | * Actually do the drawing of the string here |
| 2381 | */ |
2381 | */ |
| 2382 | rxvt_font *font = fontset [GET_STYLE (rend)]->get (*text, GET_FONT (rend)); |
2382 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
| 2383 | |
2383 | |
| 2384 | if (expect_true (have_bg && back == Color_bg)) |
2384 | if (expect_true (have_bg && back == Color_bg)) |
| 2385 | { |
2385 | { |
| 2386 | // this is very ugly, maybe push it into ->draw? |
2386 | // this is very ugly, maybe push it into ->draw? |
| 2387 | |
2387 | |
| … | |
… | |
| 2904 | selection_wait = Sel_normal; |
2904 | selection_wait = Sel_normal; |
| 2905 | |
2905 | |
| 2906 | #if X_HAVE_UTF8_STRING |
2906 | #if X_HAVE_UTF8_STRING |
| 2907 | selection_type = Sel_UTF8String; |
2907 | selection_type = Sel_UTF8String; |
| 2908 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2908 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
| 2909 | return; |
2909 | return; |
| 2910 | #else |
2910 | #else |
| 2911 | selection_type = Sel_CompoundText; |
2911 | selection_type = Sel_CompoundText; |
| 2912 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2912 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
| 2913 | return; |
2913 | return; |
| 2914 | #endif |
2914 | #endif |
| 2915 | } |
2915 | } |
| 2916 | |
2916 | |
| 2917 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2917 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
| 2918 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2918 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
