Sync OpenBSD patchset 346:

Trim some code by moving the ioctl(TIOCGWINSZ) after SIGWINCH from the client
into the server.

This is another (the second of four) protocol version changes coming this
morning, so again the server should be killed before upgrading.
This commit is contained in:
Tiago Cunha
2009-09-23 14:44:02 +00:00
parent acedc2dcf2
commit 2acf349d4e
4 changed files with 37 additions and 66 deletions

13
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.451 2009-09-23 14:39:30 tcunha Exp $ */
/* $Id: tmux.h,v 1.452 2009-09-23 14:44:02 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -21,7 +21,7 @@
#include "config.h"
#define PROTOCOL_VERSION 2
#define PROTOCOL_VERSION 3
#include <sys/param.h>
#include <sys/time.h>
@ -335,14 +335,6 @@ struct msg_identify_data {
#define IDENTIFY_88COLOURS 0x4
#define IDENTIFY_HASDEFAULTS 0x8
int flags;
u_int sx;
u_int sy;
};
struct msg_resize_data {
u_int sx;
u_int sy;
};
struct msg_unlock_data {
@ -1197,6 +1189,7 @@ void tty_puts(struct tty *, const char *);
void tty_putc(struct tty *, u_char);
void tty_pututf8(struct tty *, const struct grid_utf8 *);
void tty_init(struct tty *, int, char *);
void tty_resize(struct tty *);
void tty_start_tty(struct tty *);
void tty_stop_tty(struct tty *);
void tty_detect_utf8(struct tty *);