Use the FD_* macros with select(). Take a clue from XFree-3.3.6 xterm,

and make this conditional on only "#ifndef VMS".

5 files changed, 156 insertions, 1 deletions

diff --git a/x11/hanterm/distinfo b/x11/hanterm/distinfo
index a60a322c4e5..a51674b10a4 100644
--- a/x11/hanterm/distinfo
+++ b/x11/hanterm/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/05/03 00:47:49 fredb Exp $
+$NetBSD: distinfo,v 1.3 2001/05/03 18:37:47 fredb Exp $
 
 SHA1 (hanterm-3.1.4.tar.gz) = 6b88d880f78a85e46ffc7d1c448148ba551dff8f
 Size (hanterm-3.1.4.tar.gz) = 219740 bytes
 SHA1 (patch-aa) = ecb7dc3d4a4b155b3d71e873f3ce5b56c2d6a91f
+SHA1 (patch-ab) = 8b861979eeffc3e9763f4a2162c0e007c61f1a6c
+SHA1 (patch-ac) = 4c6b6efc12f2e1fba6eb577c65c94d701574353b
+SHA1 (patch-ad) = e6bf91a30c1b318c2f60ac8590e4842d9e8bab12
+SHA1 (patch-ae) = 39d01a39808d144823885c8b674d333362825da7
diff --git a/x11/hanterm/patches/patch-ab b/x11/hanterm/patches/patch-ab
new file mode 100644
index 00000000000..6579b72877d
--- /dev/null
+++ b/x11/hanterm/patches/patch-ab
@@ -0,0 +1,94 @@
+$NetBSD: patch-ab,v 1.1 2001/05/03 18:37:48 fredb Exp $
+
+--- charproc.c.orig	Tue Nov 28 04:44:05 2000
++++ charproc.c
+@@ -46,6 +46,8 @@
+ #include <setjmp.h>
+ #include <ctype.h>
+ #include <X11/keysym.h>
++#include <sys/types.h>
++
+ #include "hangul.h"
+ #include "hstrdefs.h"
+ 
+@@ -1755,7 +1757,7 @@
+ static char *v_bufstr = NULL;	/* beginning of area to write */
+ static char *v_bufptr;		/* end of area to write */
+ static char *v_bufend;		/* end of physical buffer */
+-#if !defined(linux) && !defined(SVR4)	/* dkim@surecom.com */
++#ifdef VMS
+ #define	ptymask()	(v_bufptr > v_bufstr ? pty_mask : 0)
+ #endif
+ 
+@@ -1783,7 +1785,7 @@
+ 	fprintf(stderr, "\n");
+ #endif
+ 
+-#if defined(linux) || defined(SVR4)
++#ifndef VMS
+ 	if (f != pty_mask)
+ #else
+ 	if ((1 << f) != pty_mask)
+@@ -1908,7 +1910,7 @@
+ 	return(c);
+ }
+ 
+-#if (defined(linux)||defined(SVR4))||(defined(hpux) && OSMAJORVERSION >= 10)
++#ifndef VMS
+ static fd_set select_mask;
+ static fd_set write_mask;
+ #else
+@@ -1924,7 +1926,7 @@
+     static struct timeval select_timeout;
+ 
+     for( ; ; ) {
+-#if defined(linux)||defined(SVR4)||(defined(hpux) && OSMAJORVERSION >= 10)
++#ifndef VMS
+ 	if (FD_ISSET(pty_mask, &select_mask) && eventMode == NORMAL) {
+ #else
+ 	if (select_mask & pty_mask && eventMode == NORMAL) {
+@@ -1984,7 +1986,7 @@
+ 		/* stop speed reading at some point to look for X stuff */
+ 		/* (4096 is just a random large number.) */
+ 		if (pty_read_bytes > 4096) {
+-#if defined(linux)||defined(SVR4)||(defined(hpux) && OSMAJORVERSION >= 10)
++#ifndef VMS
+ 		    FD_CLR(pty_mask, &select_mask);
+ #else
+ 		    select_mask &= ~pty_mask;
+@@ -2014,7 +2016,7 @@
+ 	/* Update the masks and, unless X events are already in the queue,
+ 	   wait for I/O to be possible. */
+ 	select_mask = Select_mask;
+-#if defined(linux) || defined(SVR4) ||(defined(hpux) && OSMAJORVERSION >= 10)
++#ifndef VMS
+ 	if (v_bufptr > v_bufstr)
+ 	  FD_SET(pty_mask, &write_mask);
+        else
+@@ -2028,7 +2030,7 @@
+ /* by sangil's report */
+ /* #if defined(linux)||defined(SVR4)
+     ||(defined(hpux) && OSMAJORVERSION >= 10) */
+-#if defined(linux)||defined(SVR4)
++#ifndef VMS
+ 	if (QLength (screen->display))
+ 	{
+ 	    i = select(max_plus1, (fd_set*) &select_mask, (fd_set*) &write_mask, (fd_set *)NULL, (struct timeval *) &select_timeout);
+@@ -2054,7 +2056,7 @@
+ 	} 
+ 
+ 	/* if there is room to write more data to the pty, go write more */
+-#if defined(linux)||defined(SVR4)||(defined(hpux) && OSMAJORVERSION >= 10)
++#ifndef VMS
+ 	if ((v_bufptr > v_bufstr) && FD_ISSET(pty_mask, &write_mask)) {
+ #else
+ 	if (write_mask & ptymask()) {
+@@ -2064,7 +2066,7 @@
+ 
+ 	/* if there are X events already in our queue, it
+ 	   counts as being readable */
+-#if defined(linux)||defined(SVR4)||(defined(hpux) && OSMAJORVERSION >= 10)
++#ifndef VMS
+ 	if (QLength(screen->display) || (FD_ISSET(X_mask, &select_mask))) {
+ #else
+ 	if (QLength(screen->display) || (select_mask & X_mask)) {
diff --git a/x11/hanterm/patches/patch-ac b/x11/hanterm/patches/patch-ac
new file mode 100644
index 00000000000..a8fd047f635
--- /dev/null
+++ b/x11/hanterm/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2001/05/03 18:37:48 fredb Exp $
+
+--- data.c.orig	Wed Feb 24 05:04:50 1999
++++ data.c
+@@ -28,6 +28,7 @@
+ #include "ptyx.h"		/* gets Xt stuff, too */
+ #include "data.h"
+ #include <setjmp.h>
++#include <sys/types.h>
+ 
+ int bcnt = 0;
+ #if !defined(NO_PATCH_CURSOR_MOVE) /* by hanmaum 1998.2.6 */
+@@ -61,7 +62,7 @@
+ int am_slave = 0;	/* set to 1 if running as a slave process */
+ int max_plus1;
+ int pty_mask;
+-#if defined(linux)||defined(SVR4)||(defined(hpux)&&OSMAJORVERSION>=10)
++#ifndef VMS
+ fd_set Select_mask;
+ #else
+ int Select_mask;
diff --git a/x11/hanterm/patches/patch-ad b/x11/hanterm/patches/patch-ad
new file mode 100644
index 00000000000..cac4c72c10a
--- /dev/null
+++ b/x11/hanterm/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2001/05/03 18:37:49 fredb Exp $
+
+--- data.h.orig	Wed Feb 24 05:04:50 1999
++++ data.h
+@@ -24,6 +24,8 @@
+  * SOFTWARE.
+  */
+ 
++#include <sys/types.h>
++
+ extern XPoint VTbox[];
+ extern XPoint hVTbox[];
+ extern Char *bptr;
+@@ -34,7 +36,7 @@
+ extern char *ttydev;
+ extern char *xterm_name;
+ extern Char buffer[];
+-#if defined(linux) || defined(SVR4)||(defined(hpux)&&OSMAJORVERSION>=10)
++#ifndef VMS
+ extern fd_set Select_mask;
+ #else
+ extern int Select_mask;
diff --git a/x11/hanterm/patches/patch-ae b/x11/hanterm/patches/patch-ae
new file mode 100644
index 00000000000..129ef720b7a
--- /dev/null
+++ b/x11/hanterm/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2001/05/03 18:37:49 fredb Exp $
+
+--- main.c.orig	Tue Nov 28 04:44:05 2000
++++ main.c
+@@ -1508,7 +1508,8 @@
+ 	if (ioctl (pty, FIONBIO, (char *)&mode) == -1) SysError (ERROR_FIONBIO);
+ #endif	/* USE_SYSV_TERMIO */
+ 	
+-#if defined(linux)||defined(SVR4)||(defined(hpux)&&OSMAJORVERSION>=10)
++
++#ifndef VMS
+ 	pty_mask = pty;
+ 	X_mask = Xsocket;
+ 	FD_ZERO(&Select_mask);