Import of tcsh-6.14.00

1 files changed, 37 insertions, 8 deletions

diff --git a/contrib/tcsh/ed.h b/contrib/tcsh/ed.h
index ddc80ba..fba6299 100644
--- a/contrib/tcsh/ed.h
+++ b/contrib/tcsh/ed.h
@@ -1,4 +1,4 @@
-/* $Header: /src/pub/tcsh/ed.h,v 3.33 2002/07/06 22:28:13 christos Exp $ */
+/* $Header: /src/pub/tcsh/ed.h,v 3.44 2005/03/05 03:20:15 christos Exp $ */
 /*
  * ed.h: Editor declarations and globals
  */
@@ -54,12 +54,12 @@
 #define KEYCMD   unsigned char	/* size needed to index into CcFuncTbl */
  /* Must be unsigned 		       */
 
-typedef CCRETVAL(*PFCmd) __P((int));	/* pointer to function returning CCRETVAL */
+typedef CCRETVAL(*PFCmd) __P((Char));	/* pointer to function returning CCRETVAL */
 
 struct KeyFuncs {		/* for the "bind" shell command */
-    char   *name;		/* function name for bind command */
+    const char *name;		/* function name for bind command */
     int     func;		/* function numeric value */
-    char   *desc;		/* description of function */
+    const char *desc;		/* description of function */
 };
 
 extern PFCmd CcFuncTbl[];	/* table of available commands */
@@ -149,21 +149,28 @@ EXTERN int HistWhich;		/* Hist_num is saved in this */
 EXTERN char Expand;		/* true if we are expanding a line */
 extern Char HistLit;		/* true if history lines are shown literal */
 EXTERN Char CurrentHistLit;	/* Literal status of current show history line */
+extern int Tty_raw_mode;
 
 /*
  * These are truly extern
  */
 extern int MacroLvl;
+extern Char *litptr;	 /* Entries start at offsets divisible by LIT_FACTOR */
+#define LIT_FACTOR 4
+extern int didsetty;
 
 EXTERN Char *KeyMacro[MAXMACROLEVELS];
 
+/* CHAR_DBWIDTH in Display and Vdisplay means the non-first column of a character
+   that is wider than one "regular" position. The cursor should never point
+   in the middle of a multiple-column character. */
 EXTERN Char **Display;		/* display buffer seed vector */
 EXTERN int CursorV,		/* real cursor vertical (line) */
         CursorH,		/* real cursor horisontal (column) */
         TermV,			/* number of real screen lines
 				 * (sizeof(DisplayBuf) / width */
         TermH;			/* screen width */
-EXTERN Char **Vdisplay;		/* new buffer */
+EXTERN Char **Vdisplay;	/* new buffer */
 
 /* Variables that describe terminal ability */
 EXTERN int T_Lines, T_Cols;	/* Rows and Cols of the terminal */
@@ -207,13 +214,35 @@ EXTERN Char T_HasMeta;		/* true if we have a meta key */
 # define M_NN		3
 #endif /* TERMIO */
 typedef struct { 
-    char *t_name;
-    int  t_setmask;
-    int  t_clrmask;
+    const char *t_name;
+    unsigned int  t_setmask;
+    unsigned int  t_clrmask;
 } ttyperm_t[NN_IO][M_NN];
 
 extern ttyperm_t ttylist;
 #include "ed.term.h"
 #include "ed.decls.h"
 
+#ifndef POSIX
+/*
+ * We don't prototype these, cause some systems have them wrong!
+ */
+extern int   tgetent	__P(());
+extern char *tgetstr	__P(());
+extern int   tgetflag	__P(());
+extern int   tgetnum	__P(());
+extern char *tgoto	__P(());
+# define PUTPURE putpure
+# define PUTRAW putraw
+#else
+extern int   tgetent	__P((char *, const char *));
+extern char *tgetstr	__P((const char *, char **));
+extern int   tgetflag	__P((const char *));
+extern int   tgetnum	__P((const char *));
+extern char *tgoto	__P((const char *, int, int));
+extern void  tputs	__P((const char *, int, void (*)(int)));
+# define PUTPURE ((void (*)__P((int))) putpure)
+# define PUTRAW ((void (*)__P((int))) putraw)
+#endif
+
 #endif /* _h_ed */