| … | … | ||
|---|---|---|---|
| 1128 | for (wchar_t *wc = wstr; *wc; wc++) | 1128 | for (wchar_t *wc = wstr; *wc; wc++) |
| 1129 | { | 1129 | { |
| 1130 | int w = WCWIDTH (*wc); | 1130 | int w = WCWIDTH (*wc); |
| 1131 | 1131 | ||
| 1132 | if (w) | 1132 | if (w) |
| 1133 | RETVAL += min (w, 1); | 1133 | RETVAL += max (w, 1); |
| 1134 | } | 1134 | } |
| 1135 | rxvt_pop_locale (); | 1135 | rxvt_pop_locale (); |
| 1136 | 1136 | ||
| 1137 | free (wstr); | 1137 | free (wstr); |
| 1138 | } | 1138 | } |
| … | … | ||
| 1169 | rxvt_pop_locale (); | 1169 | rxvt_pop_locale (); |
| 1170 | 1170 | ||
| 1171 | RETVAL = wcs2sv (wstr); | 1171 | RETVAL = wcs2sv (wstr); |
| 1172 | free (wstr); | 1172 | free (wstr); |
| 1173 | } | 1173 | } |
| 1174 | OUTPUT: | ||
| 1175 | RETVAL | ||
| 1176 | |||
| 1177 | char * | ||
| 1178 | rxvt_term::locale () | ||
| 1179 | CODE: | ||
| 1180 | RETVAL = THIS->locale; | ||
| 1174 | OUTPUT: | 1181 | OUTPUT: |
| 1175 | RETVAL | 1182 | RETVAL |
| 1176 | 1183 | ||
| 1177 | #define TERM_OFFSET(sym) offsetof (TermWin_t, sym) | 1184 | #define TERM_OFFSET(sym) offsetof (TermWin_t, sym) |
| 1178 | 1185 |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |