| … | |
… | |
| 1137 | |
1137 | |
| 1138 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1138 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
| 1139 | cmdbuf_ptr = cmdbuf_base; |
1139 | cmdbuf_ptr = cmdbuf_base; |
| 1140 | cmdbuf_endp = cmdbuf_ptr + n; |
1140 | cmdbuf_endp = cmdbuf_ptr + n; |
| 1141 | |
1141 | |
| 1142 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1142 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
| 1143 | |
1143 | |
| 1144 | if (r > 0) |
1144 | if (r > 0) |
| 1145 | { |
1145 | { |
| 1146 | cmdbuf_endp += r; |
1146 | cmdbuf_endp += r; |
| 1147 | return true; |
1147 | return true; |
| … | |
… | |
| 3969 | if (query) |
3969 | if (query) |
| 3970 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3970 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
| 3971 | else |
3971 | else |
| 3972 | { |
3972 | { |
| 3973 | set_locale (str); |
3973 | set_locale (str); |
| 3974 | pty.set_utf8_mode (enc_utf8); |
3974 | pty->set_utf8_mode (enc_utf8); |
| 3975 | init_xlocale (); |
3975 | init_xlocale (); |
| 3976 | } |
3976 | } |
| 3977 | break; |
3977 | break; |
| 3978 | |
3978 | |
| 3979 | case URxvt_view_up: |
3979 | case URxvt_view_up: |
| … | |
… | |
| 4411 | rxvt_term::tt_write (const char *data, unsigned int len) |
4411 | rxvt_term::tt_write (const char *data, unsigned int len) |
| 4412 | { |
4412 | { |
| 4413 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4413 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
| 4414 | return; |
4414 | return; |
| 4415 | |
4415 | |
| 4416 | if (pty.pty < 0) |
4416 | if (pty->pty < 0) |
| 4417 | return; |
4417 | return; |
| 4418 | |
4418 | |
| 4419 | if (v_buflen == 0) |
4419 | if (v_buflen == 0) |
| 4420 | { |
4420 | { |
| 4421 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4421 | ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); |
| 4422 | |
4422 | |
| 4423 | if ((unsigned int)written == len) |
4423 | if ((unsigned int)written == len) |
| 4424 | return; |
4424 | return; |
| 4425 | |
4425 | |
| 4426 | data += written; |
4426 | data += written; |
| … | |
… | |
| 4435 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4435 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
| 4436 | } |
4436 | } |
| 4437 | |
4437 | |
| 4438 | void rxvt_term::pty_write () |
4438 | void rxvt_term::pty_write () |
| 4439 | { |
4439 | { |
| 4440 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4440 | int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
| 4441 | |
4441 | |
| 4442 | if (written > 0) |
4442 | if (written > 0) |
| 4443 | { |
4443 | { |
| 4444 | v_buflen -= written; |
4444 | v_buflen -= written; |
| 4445 | |
4445 | |
