===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/client.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -c -r1.55 -r1.56
*** src/usr.bin/tmux/client.c	2012/05/25 08:28:10	1.55
--- src/usr.bin/tmux/client.c	2012/06/18 13:16:42	1.56
***************
*** 1,4 ****
! /* $OpenBSD: client.c,v 1.55 2012/05/25 08:28:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: client.c,v 1.56 2012/06/18 13:16:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 169,174 ****
--- 169,175 ----
  	pid_t			 ppid;
  	enum msgtype		 msg;
  	char			*cause;
+ 	struct termios		 tio, saved_tio;
  
  	/* Set up the initial command. */
  	cmdflags = 0;
***************
*** 233,238 ****
--- 234,256 ----
  	setblocking(STDIN_FILENO, 0);
  	event_set(&client_stdin, STDIN_FILENO, EV_READ|EV_PERSIST,
  	    client_stdin_callback, NULL);
+ 	if (flags & IDENTIFY_TERMIOS) {
+ 		if (tcgetattr(STDIN_FILENO, &saved_tio) != 0) {
+ 			fprintf(stderr, "tcgetattr failed: %s\n",
+ 			    strerror(errno));
+ 			return (1);
+ 		}
+ 		cfmakeraw(&tio);
+ 		tio.c_iflag = ICRNL|IXANY;
+ 		tio.c_oflag = OPOST|ONLCR;
+ 		tio.c_lflag = NOKERNINFO;
+ 		tio.c_cflag = CREAD|CS8|HUPCL;
+ 		tio.c_cc[VMIN] = 1;
+ 		tio.c_cc[VTIME] = 0;
+ 		cfsetispeed(&tio, cfgetispeed(&saved_tio));
+ 		cfsetospeed(&tio, cfgetospeed(&saved_tio));
+ 		tcsetattr(STDIN_FILENO, TCSANOW, &tio);
+ 	}
  
  	/* Establish signal handlers. */
  	set_signals(client_signal);
***************
*** 273,279 ****
  		ppid = getppid();
  		if (client_exittype == MSG_DETACHKILL && ppid > 1)
  			kill(ppid, SIGHUP);
! 	}
  	setblocking(STDIN_FILENO, 1);
  	return (client_exitval);
  }
--- 291,298 ----
  		ppid = getppid();
  		if (client_exittype == MSG_DETACHKILL && ppid > 1)
  			kill(ppid, SIGHUP);
! 	} else if (flags & IDENTIFY_TERMIOS)
! 		tcsetattr(STDOUT_FILENO, TCSAFLUSH, &saved_tio);
  	setblocking(STDIN_FILENO, 1);
  	return (client_exitval);
  }
***************
*** 513,518 ****
--- 532,543 ----
  
  			shell_exec(shelldata.shell, shellcmd);
  			/* NOTREACHED */
+ 		case MSG_DETACH:
+ 			client_write_server(MSG_EXITING, NULL, 0);
+ 			break;
+ 		case MSG_EXITED:
+ 			imsg_free(&imsg);
+ 			return (-1);
  		default:
  			fatalx("unexpected message");
  		}