diff options
| author | dickey <dickey> | 2000-12-28 00:51:49 +0000 |
|---|---|---|
| committer | dickey <dickey> | 2000-12-28 00:51:49 +0000 |
| commit | c6c31027172d9c00f893f0f2977d30ad4be4943e (patch) | |
| tree | 1ea6f37b91619758f5468e0331a0e35569955be6 /programs/xterm/screen.c | |
| parent | 6876b3077867e68cebabae9b5670fb85540280c8 (diff) | |
This is the remainder of patch #149, which I postponed til after 4.0.2:
+ restructured includes for "termios.h", "termio.h</code> and related
definitions for main.c, os2main.c, screen.c and resize.c so they will
share equivalent definitions in a new header "xterm_io.h". This is
intended to solve some problems mainly for HPUX which appear to arise
from inconsistent definitions for SIGWINCH- and HAS_LTCHARS-related
symbols (reports by Bruno Betro, Jeremie Petit and Clint Olsen).
+ improve usability of double-width fonts by allowing normal fonts to
be given as double-width (from a patch by Fabrice Bellard
<bellard@email.enst.fr>).
+ correct a few compiler warnings in TRACE() macros for signed/unsigned
variable differences (reported by Clint Olsen).
Diffstat (limited to 'programs/xterm/screen.c')
| -rw-r--r-- | programs/xterm/screen.c | 58 |
1 files changed, 2 insertions, 56 deletions
diff --git a/programs/xterm/screen.c b/programs/xterm/screen.c index 1a18ac221..5b51f5370 100644 --- a/programs/xterm/screen.c +++ b/programs/xterm/screen.c @@ -54,7 +54,7 @@ * SOFTWARE. */ -/* $XFree86: xc/programs/xterm/screen.c,v 3.51 2000/08/25 21:51:13 dawes Exp $ */ +/* $XFree86: xc/programs/xterm/screen.c,v 3.52 2000/09/22 10:42:08 alanh Exp $ */ /* screen.c */ @@ -63,64 +63,10 @@ #include <error.h> #include <data.h> #include <xcharmouse.h> +#include <xterm_io.h> #include <signal.h> -#ifdef SVR4 -#include <termios.h> -#elif !defined(__CYGWIN__) -#include <sys/ioctl.h> -#endif - -#if defined(__CYGWIN__) && !defined(TIOCSPGRP) -#include <termios.h> -#define TIOCSPGRP (_IOW('t', 118, pid_t)) -#endif - -#ifdef __hpux -#include <sys/termio.h> -#endif - -#ifdef SYSV -#if !defined(DGUX) /* Intel DG/ux uses termios.h */ -#include <sys/termio.h> -#endif /* DGUX */ -#ifdef USE_USG_PTYS -#include <sys/stream.h> /* get typedef used in ptem.h */ -#include <sys/ptem.h> -#endif -#elif defined(sun) && !defined(SVR4) -#include <sys/ttycom.h> -#ifdef TIOCSWINSZ -#undef TIOCSSIZE -#endif -#endif - -#ifdef MINIX -#include <termios.h> -#endif - -#ifdef ISC -#ifndef SYSV -#include <sys/termio.h> -#endif -#define TIOCGPGRP TCGETPGRP -#define TIOCSPGRP TCSETPGRP -#endif - -#ifdef __EMX__ -extern int ptioctl(int fd, int func, void* data); -#define ioctl ptioctl -#define TIOCSWINSZ 113 -#define TIOCGWINSZ 117 -struct winsize { - unsigned short ws_row; /* rows, in characters */ - unsigned short ws_col; /* columns, in characters */ - unsigned short ws_xpixel; /* horizontal size, pixels */ - unsigned short ws_ypixel; /* vertical size, pixels */ -}; -#endif - /* * Allocates memory for a 2-dimensional array of chars and returns a pointer * thereto. Each line is formed from a set of char arrays, with an index |