aboutsummaryrefslogtreecommitdiffstats
path: root/lib/libedit/src/tty.h
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libedit/src/tty.h')
-rw-r--r--lib/libedit/src/tty.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/libedit/src/tty.h b/lib/libedit/src/tty.h
index f4b4d42a5eee..2603e1ad2d6d 100644
--- a/lib/libedit/src/tty.h
+++ b/lib/libedit/src/tty.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.h,v 1.12 2009/12/30 22:37:40 christos Exp $ */
+/* $NetBSD: tty.h,v 1.21 2016/05/09 21:46:56 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -40,8 +40,6 @@
#ifndef _h_el_tty
#define _h_el_tty
-#include "sys.h"
-#include "histedit.h"
#include <termios.h>
#include <unistd.h>
@@ -431,7 +429,7 @@
#define C_MIN 23
#define C_TIME 24
#define C_NCC 25
-#define C_SH(A) (1 << (A))
+#define C_SH(A) ((unsigned int)(1 << (A)))
/*
* Terminal dependend data structures
@@ -442,6 +440,7 @@
#define QU_IO 2 /* used only for quoted chars */
#define NN_IO 3 /* The number of entries */
+/* Don't re-order */
#define MD_INP 0
#define MD_OUT 1
#define MD_CTL 2
@@ -457,24 +456,25 @@ typedef struct {
typedef unsigned char ttychar_t[NN_IO][C_NCC];
-protected int tty_init(EditLine *);
-protected void tty_end(EditLine *);
-protected int tty_stty(EditLine *, int, const Char **);
-protected int tty_rawmode(EditLine *);
-protected int tty_cookedmode(EditLine *);
-protected int tty_quotemode(EditLine *);
-protected int tty_noquotemode(EditLine *);
-protected void tty_bind_char(EditLine *, int);
+libedit_private int tty_init(EditLine *);
+libedit_private void tty_end(EditLine *);
+libedit_private int tty_stty(EditLine *, int, const wchar_t **);
+libedit_private int tty_rawmode(EditLine *);
+libedit_private int tty_cookedmode(EditLine *);
+libedit_private int tty_quotemode(EditLine *);
+libedit_private int tty_noquotemode(EditLine *);
+libedit_private void tty_bind_char(EditLine *, int);
typedef struct {
ttyperm_t t_t;
ttychar_t t_c;
- struct termios t_ex, t_ed, t_ts;
+ struct termios t_or, t_ex, t_ed, t_ts;
int t_tabs;
int t_eight;
speed_t t_speed;
- int t_mode;
+ unsigned char t_mode;
unsigned char t_vdisable;
+ unsigned char t_initialized;
} el_tty_t;