diff options
Diffstat (limited to 'window.c')
| -rw-r--r-- | window.c | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -26,7 +26,6 @@ #include <string.h> #include <termios.h> #include <unistd.h> -#include <util.h> #include "tmux.h" @@ -750,6 +749,9 @@ window_pane_destroy(struct window_pane *wp) evtimer_del(&wp->timer); if (wp->fd != -1) { +#ifdef HAVE_UTEMPTER + utempter_remove_record(wp->fd); +#endif bufferevent_free(wp->event); close(wp->fd); } @@ -782,6 +784,9 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv, char *argv0, *cmd, **argvp, paneid[16]; const char *ptr, *first; struct termios tio2; +#ifdef HAVE_UTEMPTER + char s[32]; +#endif int i; if (wp->fd != -1) { @@ -826,6 +831,10 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv, if (tio != NULL) memcpy(tio2.c_cc, tio->c_cc, sizeof tio2.c_cc); tio2.c_cc[VERASE] = '\177'; +#ifdef IUTF8 + if (options_get_number(&wp->window->options, "utf8")) + tio2.c_iflag |= IUTF8; +#endif if (tcsetattr(STDIN_FILENO, TCSANOW, &tio2) != 0) fatal("tcgetattr failed"); @@ -872,6 +881,11 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv, fatal("execl failed"); } +#ifdef HAVE_UTEMPTER + xsnprintf(s, sizeof s, "tmux(%lu).%%%u", (long) getpid(), wp->id); + utempter_add_record(wp->fd, s); +#endif + setblocking(wp->fd, 0); wp->event = bufferevent_new(wp->fd, window_pane_read_callback, NULL, |