summaryrefslogtreecommitdiffstats
path: root/contrib/nvi/cl/cl.h
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/nvi/cl/cl.h')
-rw-r--r--contrib/nvi/cl/cl.h51
1 files changed, 34 insertions, 17 deletions
diff --git a/contrib/nvi/cl/cl.h b/contrib/nvi/cl/cl.h
index 2ef2b8d..c84ef88 100644
--- a/contrib/nvi/cl/cl.h
+++ b/contrib/nvi/cl/cl.h
@@ -6,11 +6,24 @@
*
* See the LICENSE file for redistribution information.
*
- * @(#)cl.h 10.19 (Berkeley) 9/24/96
+ * $Id: cl.h,v 10.34 2011/08/15 20:07:32 zy Exp $
*/
+#ifdef USE_WIDECHAR
+#define _XOPEN_SOURCE_EXTENDED
+#endif
+#ifdef HAVE_NCURSES_H
+#include <ncurses.h>
+#else
+#include <curses.h>
+#endif
+
typedef struct _cl_private {
- CHAR_T ibuf[256]; /* Input keys. */
+ char ibuf[256]; /* Input keys. */
+
+ size_t skip; /* Remaining keys. */
+
+ CONVWIN cw; /* Conversion buffer. */
int eof_count; /* EOF count. */
@@ -24,6 +37,10 @@ typedef struct _cl_private {
char *rmso, *smso; /* Inverse video terminal strings. */
char *smcup, *rmcup; /* Terminal start/stop strings. */
+ char *oname; /* Original screen window name. */
+
+ SCR *focus; /* Screen that has the "focus". */
+
int killersig; /* Killer signal. */
#define INDX_HUP 0
#define INDX_INT 1
@@ -39,29 +56,29 @@ typedef struct _cl_private {
TE_SENT=0, TI_SENT } ti_te;
#define CL_IN_EX 0x0001 /* Currently running ex. */
-#define CL_RENAME 0x0002 /* X11 xterm icon/window renamed. */
-#define CL_RENAME_OK 0x0004 /* User wants the windows renamed. */
-#define CL_SCR_EX_INIT 0x0008 /* Ex screen initialized. */
-#define CL_SCR_VI_INIT 0x0010 /* Vi screen initialized. */
-#define CL_SIGHUP 0x0020 /* SIGHUP arrived. */
-#define CL_SIGINT 0x0040 /* SIGINT arrived. */
-#define CL_SIGTERM 0x0080 /* SIGTERM arrived. */
-#define CL_SIGWINCH 0x0100 /* SIGWINCH arrived. */
-#define CL_STDIN_TTY 0x0200 /* Talking to a terminal. */
+#define CL_LAYOUT 0x0002 /* Screen layout changed. */
+#define CL_RENAME 0x0004 /* X11 xterm icon/window renamed. */
+#define CL_RENAME_OK 0x0008 /* User wants the windows renamed. */
+#define CL_SCR_EX_INIT 0x0010 /* Ex screen initialized. */
+#define CL_SCR_VI_INIT 0x0020 /* Vi screen initialized. */
+#define CL_SIGHUP 0x0040 /* SIGHUP arrived. */
+#define CL_SIGINT 0x0080 /* SIGINT arrived. */
+#define CL_SIGTERM 0x0100 /* SIGTERM arrived. */
+#define CL_SIGWINCH 0x0200 /* SIGWINCH arrived. */
+#define CL_STDIN_TTY 0x0400 /* Talking to a terminal. */
u_int32_t flags;
} CL_PRIVATE;
#define CLP(sp) ((CL_PRIVATE *)((sp)->gp->cl_private))
#define GCLP(gp) ((CL_PRIVATE *)gp->cl_private)
+#define CLSP(sp) ((WINDOW *)((sp)->cl_private))
/* Return possibilities from the keyboard read routine. */
typedef enum { INP_OK=0, INP_EOF, INP_ERR, INP_INTR, INP_TIMEOUT } input_t;
-/* The screen line relative to a specific window. */
-#define RLNO(sp, lno) (sp)->woff + (lno)
-
-/* X11 xterm escape sequence to rename the icon/window. */
-#define XTERM_RENAME "\033]0;%s\007"
+/* The screen position relative to a specific window. */
+#define RCNO(sp, cno) (cno)
+#define RLNO(sp, lno) (lno)
/*
* XXX
@@ -75,4 +92,4 @@ typedef enum { INP_OK=0, INP_EOF, INP_ERR, INP_INTR, INP_TIMEOUT } input_t;
#define FALSE 0
#endif
-#include "cl_extern.h"
+#include "extern.h"
OpenPOWER on IntegriCloud