| … | |
… | |
| 36 | |
36 | |
| 37 | char *dst = r; |
37 | char *dst = r; |
| 38 | while (len--) |
38 | while (len--) |
| 39 | { |
39 | { |
| 40 | ssize_t l = wcrtomb (dst, *str++, mbs); |
40 | ssize_t l = wcrtomb (dst, *str++, mbs); |
|
|
41 | |
| 41 | if (l < 0) |
42 | if (l < 0) |
| 42 | *dst++ = '?'; |
43 | *dst++ = '?'; |
| 43 | else |
44 | else |
| 44 | dst += l; |
45 | dst += l; |
| 45 | } |
46 | } |
| … | |
… | |
| 553 | void |
554 | void |
| 554 | rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) |
555 | rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) |
| 555 | { |
556 | { |
| 556 | int shadow; |
557 | int shadow; |
| 557 | |
558 | |
| 558 | shadow = (w == 0 || h == 0) ? 1 : SHADOW; |
559 | shadow = (w == 0 || h == 0) ? 1 : MENU_SHADOW; |
| 559 | w += x - 1; |
560 | w += x - 1; |
| 560 | h += y - 1; |
561 | h += y - 1; |
| 561 | for (; shadow-- > 0; x++, y++, w--, h--) |
562 | for (; shadow-- > 0; x++, y++, w--, h--) |
| 562 | { |
563 | { |
| 563 | XDrawLine (display, win, topShadow, x, y, w, y); |
564 | XDrawLine (display, win, topShadow, x, y, w, y); |
