summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libcurses/curs_getch.3tbl13
-rw-r--r--lib/libcurses/curses.h4
-rw-r--r--lib/libpanel/p_bottom.c6
-rw-r--r--lib/libpanel/p_delete.c6
-rw-r--r--lib/libpanel/p_hide.c6
-rw-r--r--lib/libpanel/p_move.c10
-rw-r--r--lib/libpanel/p_replace.c10
-rw-r--r--lib/libpanel/p_show.c6
-rw-r--r--lib/libpanel/p_update.c6
-rw-r--r--lib/libpanel/panel.c6
-rw-r--r--lib/libpanel/panel.priv.h14
-rw-r--r--usr.bin/infocmp/infocmp.c6
-rw-r--r--usr.bin/tset/tset.c14
13 files changed, 58 insertions, 49 deletions
diff --git a/lib/libcurses/curs_getch.3tbl b/lib/libcurses/curs_getch.3tbl
index 8cb9a9f3a73..631538c2096 100644
--- a/lib/libcurses/curs_getch.3tbl
+++ b/lib/libcurses/curs_getch.3tbl
@@ -1,5 +1,5 @@
'\" t
-.\" $OpenBSD: curs_getch.3tbl,v 1.9 2000/07/10 03:06:06 millert Exp $
+.\" $OpenBSD: curs_getch.3tbl,v 1.10 2001/02/28 22:58:53 millert Exp $
.\"
.\"***************************************************************************
.\" Copyright (c) 1998,2000 Free Software Foundation, Inc. *
@@ -29,7 +29,7 @@
.\" authorization. *
.\"***************************************************************************
.\"
-.\" $From: curs_getch.3x,v 1.17 2000/07/01 16:45:36 tom Exp $
+.\" $From: curs_getch.3x,v 1.18 2001/02/25 00:20:30 tom Exp $
.TH curs_getch 3 ""
.SH NAME
\fBgetch\fR,
@@ -225,6 +225,15 @@ Use of the escape key by a programmer for a single character function is
discouraged, as it will cause a delay of up to one second while the
keypad code looks for a following function-key sequence.
+Note that some keys may be the same as commonly used control
+keys, e.g., KEY_ENTER versus control/M, KEY_BACKSPACE versus control/H.
+Some curses implementations may differ according to whether they
+treat these control keys specially (and ignore the terminfo), or
+use the terminfo definitions.
+\fBNcurses\fR uses the terminfo definition.
+If it says that KEY_ENTER is control/M, \fBgetch\fR, will return KEY_ENTER
+when you press control/M.
+
When using \fBgetch\fR, \fBwgetch\fR, \fBmvgetch\fR, or
\fBmvwgetch\fR, nocbreak mode (\fBnocbreak\fR) and echo mode
(\fBecho\fR) should not be used at the same time. Depending on the
diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h
index 275d36a9b36..d632b4eb468 100644
--- a/lib/libcurses/curses.h
+++ b/lib/libcurses/curses.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: curses.h,v 1.58 2001/02/22 04:16:34 millert Exp $ */
+/* $OpenBSD: curses.h,v 1.59 2001/02/28 22:58:53 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
@@ -50,7 +50,7 @@
/* These are defined only in curses.h, and are used for conditional compiles */
#define NCURSES_VERSION_MAJOR 5
#define NCURSES_VERSION_MINOR 2
-#define NCURSES_VERSION_PATCH 20010210
+#define NCURSES_VERSION_PATCH 20010224
/* This is defined in more than one ncurses header, for identification */
#undef NCURSES_VERSION
diff --git a/lib/libpanel/p_bottom.c b/lib/libpanel/p_bottom.c
index 608a6db87d0..5d4a2b4da48 100644
--- a/lib/libpanel/p_bottom.c
+++ b/lib/libpanel/p_bottom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_bottom.c,v 1.4 2001/01/22 18:02:09 millert Exp $ */
+/* $OpenBSD: p_bottom.c,v 1.5 2001/02/28 22:58:53 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,2000 Free Software Foundation, Inc. *
@@ -38,7 +38,7 @@
*/
#include "panel.priv.h"
-MODULE_ID("$From: p_bottom.c,v 1.8 2000/12/10 02:20:44 tom Exp $")
+MODULE_ID("$From: p_bottom.c,v 1.9 2001/02/24 23:46:33 tom Exp $")
NCURSES_EXPORT(int)
bottom_panel (PANEL *pan)
@@ -51,7 +51,7 @@ bottom_panel (PANEL *pan)
dBug(("--> bottom_panel %s", USER_PTR(pan->user)));
- HIDE_PANEL(pan,err,FALSE);
+ HIDE_PANEL(pan,err,OK);
assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel);
dStack("<lb%d>",1,pan);
diff --git a/lib/libpanel/p_delete.c b/lib/libpanel/p_delete.c
index 371c98bf5df..66444579b94 100644
--- a/lib/libpanel/p_delete.c
+++ b/lib/libpanel/p_delete.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_delete.c,v 1.4 2001/01/22 18:02:09 millert Exp $ */
+/* $OpenBSD: p_delete.c,v 1.5 2001/02/28 22:58:53 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,2000 Free Software Foundation, Inc. *
@@ -38,7 +38,7 @@
*/
#include "panel.priv.h"
-MODULE_ID("$From: p_delete.c,v 1.5 2000/12/10 02:20:44 tom Exp $")
+MODULE_ID("$From: p_delete.c,v 1.6 2001/02/24 23:46:41 tom Exp $")
NCURSES_EXPORT(int)
del_panel (PANEL *pan)
@@ -47,7 +47,7 @@ del_panel (PANEL *pan)
if(pan)
{
dBug(("--> del_panel %s", USER_PTR(pan->user)));
- HIDE_PANEL(pan,err,FALSE);
+ HIDE_PANEL(pan,err,OK);
free((void *)pan);
}
else
diff --git a/lib/libpanel/p_hide.c b/lib/libpanel/p_hide.c
index 036fb510d5d..18fde25f856 100644
--- a/lib/libpanel/p_hide.c
+++ b/lib/libpanel/p_hide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_hide.c,v 1.4 2001/01/22 18:02:09 millert Exp $ */
+/* $OpenBSD: p_hide.c,v 1.5 2001/02/28 22:58:53 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,2000 Free Software Foundation, Inc. *
@@ -38,7 +38,7 @@
*/
#include "panel.priv.h"
-MODULE_ID("$From: p_hide.c,v 1.6 2000/12/10 02:20:44 tom Exp $")
+MODULE_ID("$From: p_hide.c,v 1.7 2001/02/24 23:46:45 tom Exp $")
NCURSES_EXPORT(int)
hide_panel (register PANEL *pan)
@@ -51,7 +51,7 @@ hide_panel (register PANEL *pan)
dBug(("--> hide_panel %s", USER_PTR(pan->user)));
dStack("<u%d>",1,pan);
- HIDE_PANEL(pan,err,TRUE);
+ HIDE_PANEL(pan,err,ERR);
dStack("<u%d>",9,pan);
diff --git a/lib/libpanel/p_move.c b/lib/libpanel/p_move.c
index 08be50b3875..1e7f49452c1 100644
--- a/lib/libpanel/p_move.c
+++ b/lib/libpanel/p_move.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_move.c,v 1.4 2001/01/22 18:02:09 millert Exp $ */
+/* $OpenBSD: p_move.c,v 1.5 2001/02/28 22:58:53 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,2000 Free Software Foundation, Inc. *
@@ -38,7 +38,7 @@
*/
#include "panel.priv.h"
-MODULE_ID("$From: p_move.c,v 1.6 2000/12/10 02:20:44 tom Exp $")
+MODULE_ID("$From: p_move.c,v 1.7 2001/02/24 23:41:35 tom Exp $")
NCURSES_EXPORT(int)
move_panel (PANEL *pan, int starty, int startx)
@@ -46,8 +46,10 @@ move_panel (PANEL *pan, int starty, int startx)
if(!pan)
return(ERR);
- if (IS_LINKED(pan))
- PANEL_UPDATE(pan,(PANEL*)0, TRUE);
+ if (IS_LINKED(pan)) {
+ Touchpan(pan);
+ PANEL_UPDATE(pan,(PANEL*)0);
+ }
if (mvwin(pan->win,starty,startx))
return(ERR);
diff --git a/lib/libpanel/p_replace.c b/lib/libpanel/p_replace.c
index 0999af0f0b9..09dd010b4c6 100644
--- a/lib/libpanel/p_replace.c
+++ b/lib/libpanel/p_replace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_replace.c,v 1.4 2001/01/22 18:02:09 millert Exp $ */
+/* $OpenBSD: p_replace.c,v 1.5 2001/02/28 22:58:53 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,2000 Free Software Foundation, Inc. *
@@ -38,7 +38,7 @@
*/
#include "panel.priv.h"
-MODULE_ID("$From: p_replace.c,v 1.6 2000/12/10 02:20:44 tom Exp $")
+MODULE_ID("$From: p_replace.c,v 1.7 2001/02/24 23:41:38 tom Exp $")
NCURSES_EXPORT(int)
replace_panel (PANEL *pan, WINDOW *win)
@@ -46,8 +46,10 @@ replace_panel (PANEL *pan, WINDOW *win)
if(!pan)
return(ERR);
- if (IS_LINKED(pan))
- PANEL_UPDATE(pan,(PANEL*)0, TRUE);
+ if (IS_LINKED(pan)) {
+ Touchpan(pan);
+ PANEL_UPDATE(pan,(PANEL*)0);
+ }
pan->win = win;
diff --git a/lib/libpanel/p_show.c b/lib/libpanel/p_show.c
index c2a8ed7d0df..b4a24b4ce65 100644
--- a/lib/libpanel/p_show.c
+++ b/lib/libpanel/p_show.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_show.c,v 1.4 2001/01/22 18:02:10 millert Exp $ */
+/* $OpenBSD: p_show.c,v 1.5 2001/02/28 22:58:53 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,2000 Free Software Foundation, Inc. *
@@ -38,7 +38,7 @@
*/
#include "panel.priv.h"
-MODULE_ID("$From: p_show.c,v 1.8 2000/12/10 02:20:44 tom Exp $")
+MODULE_ID("$From: p_show.c,v 1.9 2001/02/24 23:46:50 tom Exp $")
NCURSES_EXPORT(int)
show_panel (PANEL *pan)
@@ -53,7 +53,7 @@ show_panel (PANEL *pan)
dBug(("--> show_panel %s", USER_PTR(pan->user)));
- HIDE_PANEL(pan,err,FALSE);
+ HIDE_PANEL(pan,err,OK);
dStack("<lt%d>",1,pan);
assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel);
diff --git a/lib/libpanel/p_update.c b/lib/libpanel/p_update.c
index 8da441ec40a..1913edbafa0 100644
--- a/lib/libpanel/p_update.c
+++ b/lib/libpanel/p_update.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_update.c,v 1.4 2001/01/22 18:02:10 millert Exp $ */
+/* $OpenBSD: p_update.c,v 1.5 2001/02/28 22:58:53 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,2000 Free Software Foundation, Inc. *
@@ -38,7 +38,7 @@
*/
#include "panel.priv.h"
-MODULE_ID("$From: p_update.c,v 1.6 2000/12/10 02:20:44 tom Exp $")
+MODULE_ID("$From: p_update.c,v 1.7 2001/02/24 23:41:42 tom Exp $")
NCURSES_EXPORT(void)
update_panels (void)
@@ -49,7 +49,7 @@ update_panels (void)
pan = _nc_bottom_panel;
while(pan && pan->above)
{
- PANEL_UPDATE(pan,pan->above, FALSE);
+ PANEL_UPDATE(pan,pan->above);
pan = pan->above;
}
diff --git a/lib/libpanel/panel.c b/lib/libpanel/panel.c
index d8e9f902940..56e33aa1d07 100644
--- a/lib/libpanel/panel.c
+++ b/lib/libpanel/panel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: panel.c,v 1.8 2001/01/22 18:02:10 millert Exp $ */
+/* $OpenBSD: panel.c,v 1.9 2001/02/28 22:58:53 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,2000 Free Software Foundation, Inc. *
@@ -36,7 +36,7 @@
/* panel.c -- implementation of panels library, some core routines */
#include "panel.priv.h"
-MODULE_ID("$From: panel.c,v 1.19 2000/12/10 02:20:43 tom Exp $")
+MODULE_ID("$From: panel.c,v 1.20 2001/02/24 23:17:26 tom Exp $")
#ifdef TRACE
#ifndef TRACE_TXT
@@ -137,6 +137,6 @@ _nc_Touchline
#ifndef TRACE
# ifndef __GNUC__
/* Some C compilers need something defined in a source file */
- static char GCC_UNUSED dummy;
+ void _nc_dummy_panel(void) { }
# endif
#endif
diff --git a/lib/libpanel/panel.priv.h b/lib/libpanel/panel.priv.h
index 99388fdf5a6..05d6a72779a 100644
--- a/lib/libpanel/panel.priv.h
+++ b/lib/libpanel/panel.priv.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: panel.priv.h,v 1.7 2001/01/22 18:02:11 millert Exp $ */
+/* $OpenBSD: panel.priv.h,v 1.8 2001/02/28 22:58:53 millert Exp $ */
/****************************************************************************
* Copyright (c) 2000 Free Software Foundation, Inc. *
@@ -28,7 +28,7 @@
* authorization. *
****************************************************************************/
-/* $From: panel.priv.h,v 1.15 2000/12/10 00:27:20 tom Exp $ */
+/* $From: panel.priv.h,v 1.17 2001/02/24 23:47:05 tom Exp $ */
#ifndef _PANEL_PRIV_H
#define _PANEL_PRIV_H
@@ -152,10 +152,8 @@
If the "touch" flag is set, the panel gets touched before it is
updated.
---------------------------------------------------------------------------*/
-#define PANEL_UPDATE(pan,panstart,touch)\
+#define PANEL_UPDATE(pan,panstart)\
{ PANEL* pan2 = ((panstart) ? (panstart) : _nc_bottom_panel);\
- if (touch)\
- Touchpan(pan);\
while(pan2) {\
if ((pan2 != pan) && PANELS_OVERLAPPED(pan,pan2)) {\
int y,ix1,ix2,iy1,iy2;\
@@ -194,12 +192,12 @@
#define HIDE_PANEL(pan,err,err_if_unlinked)\
if (IS_LINKED(pan)) {\
- PANEL_UPDATE(pan,(PANEL*)0,TRUE);\
+ Touchpan(pan);\
+ PANEL_UPDATE(pan,(PANEL*)0);\
PANEL_UNLINK(pan,err);\
} \
else {\
- if (err_if_unlinked)\
- err = ERR;\
+ err = err_if_unlinked;\
}
#endif /* _PANEL_PRIV_H */
diff --git a/usr.bin/infocmp/infocmp.c b/usr.bin/infocmp/infocmp.c
index e4263156b2f..93c1f055073 100644
--- a/usr.bin/infocmp/infocmp.c
+++ b/usr.bin/infocmp/infocmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: infocmp.c,v 1.12 2001/01/22 18:02:18 millert Exp $ */
+/* $OpenBSD: infocmp.c,v 1.13 2001/02/28 22:58:52 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
@@ -43,7 +43,7 @@
#include <term_entry.h>
#include <dump_entry.h>
-MODULE_ID("$From: infocmp.c,v 1.59 2000/11/05 00:22:07 tom Exp $")
+MODULE_ID("$From: infocmp.c,v 1.60 2001/02/24 22:03:12 tom Exp $")
#define L_CURL "{"
#define R_CURL "}"
@@ -712,7 +712,6 @@ file_comparison(int argc, char *argv[])
/* someday we may allow comparisons on more files */
int filecount = 0;
ENTRY *heads[MAXCOMPARE];
- ENTRY *tails[MAXCOMPARE];
ENTRY *qp, *rp;
int i, n;
@@ -746,7 +745,6 @@ file_comparison(int argc, char *argv[])
}
heads[filecount] = _nc_head;
- tails[filecount] = _nc_tail;
filecount++;
}
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index 413af8e8f40..018a5d235df 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tset.c,v 1.22 2001/01/29 01:58:24 niklas Exp $ */
+/* $OpenBSD: tset.c,v 1.23 2001/02/28 22:58:52 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
@@ -105,7 +105,7 @@ char *ttyname(int fd);
#include <dump_entry.h>
#include <transform.h>
-MODULE_ID("$From: tset.c,v 0.48 2000/11/04 22:50:15 tom Exp $")
+MODULE_ID("$From: tset.c,v 0.49 2001/02/24 23:29:33 tom Exp $")
extern char **environ;
@@ -161,14 +161,14 @@ failed(const char *msg)
static void
cat(char *file)
{
- register int fd, nr, nw;
+ register int fd, nr;
char buf[BUFSIZ];
if ((fd = open(file, O_RDONLY, 0)) < 0)
failed(file);
while ((nr = read(fd, buf, sizeof(buf))) > 0)
- if ((nw = write(STDERR_FILENO, buf, (size_t) nr)) == -1)
+ if (write(STDERR_FILENO, buf, (size_t) nr) == -1)
failed("write to stderr");
if (nr != 0)
failed(file);
@@ -497,7 +497,7 @@ mapped(const char *type)
static const char *
get_termcap_entry(char *userarg)
{
- int rval, errret;
+ int errret;
char *p;
const char *ttype;
#if HAVE_GETTTYNAM
@@ -590,8 +590,8 @@ get_termcap_entry(char *userarg)
ttype = askuser(0);
}
/* Find the terminfo entry. If it doesn't exist, ask the user. */
- while ((rval = setupterm((NCURSES_CONST char *) ttype, STDOUT_FILENO,
- &errret)) != OK) {
+ while (setupterm((NCURSES_CONST char *) ttype, STDOUT_FILENO, &errret)
+ != OK) {
if (errret == 0) {
(void) fprintf(stderr, "tset: unknown terminal type %s\n",
ttype);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 15:57:28 +0000