diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-07 20:20:25 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-06-07 20:20:25 +0000 |
| commit | 6a69937862dae0dcad84f30dbe32767c5a3eb149 (patch) | |
| tree | 53557e77ac2b3ab2cc0dd8939331aa8b7b27017d /app/xterm/xterm_io.h | |
| parent | a64d53a3cd043209550978ba9e9b8d5c21725516 (diff) | |
Update to xterm 279. Tested by krw@, mpi@, shadchin@.
Diffstat (limited to 'app/xterm/xterm_io.h')
| -rw-r--r-- | app/xterm/xterm_io.h | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/app/xterm/xterm_io.h b/app/xterm/xterm_io.h index d24da4d6e..7c6f5deca 100644 --- a/app/xterm/xterm_io.h +++ b/app/xterm/xterm_io.h @@ -1,7 +1,7 @@ -/* $XTermId: xterm_io.h,v 1.53 2011/12/30 22:45:49 tom Exp $ */ +/* $XTermId: xterm_io.h,v 1.54 2012/03/16 09:48:56 tom Exp $ */ /* - * Copyright 2000-2006,2010 by Thomas E. Dickey + * Copyright 2000-2011,2012 by Thomas E. Dickey * * All Rights Reserved * @@ -293,15 +293,33 @@ extern int ptioctl(int fd, int func, void* data); #endif /* TTYSIZE_STRUCT */ #if defined(USE_STRUCT_TTYSIZE) + #define TTYSIZE_STRUCT struct ttysize -#define SET_TTYSIZE(fd, data) ioctl(fd, TIOCSSIZE, &data); +#define GET_TTYSIZE(fd, data) ioctl(fd, TIOCGSIZE, &data) +#define SET_TTYSIZE(fd, data) ioctl(fd, TIOCSSIZE, &data) #define TTYSIZE_COLS(data) data.ts_cols #define TTYSIZE_ROWS(data) data.ts_lines + #elif defined(USE_STRUCT_WINSIZE) + #define TTYSIZE_STRUCT struct winsize +#define GET_TTYSIZE(fd, data) ioctl(fd, TIOCGWINSZ, (char *) &data) #define SET_TTYSIZE(fd, data) ioctl(fd, TIOCSWINSZ, (char *) &data) #define TTYSIZE_COLS(data) data.ws_col #define TTYSIZE_ROWS(data) data.ws_row + +#endif /* (USE_STRUCT_TTYSIZE) */ + +#if OPT_TRACE +#define TRACE_TTYSIZE(fd, id) { \ + TTYSIZE_STRUCT debug_ttysize; \ + if (GET_TTYSIZE(fd, debug_ttysize) == 0) \ + TRACE(("%s@%d, TTYSIZE %s %d %d\n", __FILE__, __LINE__, id, TTYSIZE_ROWS(debug_ttysize), TTYSIZE_COLS(debug_ttysize))); \ + else \ + TRACE(("%s@%d, TTYSIZE failed %s\n", __FILE__, __LINE__, strerror(errno))); \ + } +#else +#define TRACE_TTYSIZE(fd, id) /* nothing */ #endif typedef unsigned short ttySize_t; |