Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an MC_ALWAYS_SCROLL to mean "always allow space for 'scrolltext'". 

All scrolltext to be #defined so it can be translated.
This commit is contained in:
dsl 2003-10-18 18:26:53 +00:00
parent c4990e5532
commit 51fe540362
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.bin/menuc/mdb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mdb.c,v 1.38 2003/07/27 07:21:57 dsl Exp $ */
/* $NetBSD: mdb.c,v 1.39 2003/10/18 18:26:53 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: mdb.c,v 1.38 2003/07/27 07:21:57 dsl Exp $");
__RCSID("$NetBSD: mdb.c,v 1.39 2003/10/18 18:26:53 dsl Exp $");
#endif
@ -213,6 +213,7 @@ write_menu_file (char *initcode)
"#define MC_NOSHORTCUT 8\n"
"#define MC_NOCLEAR 16\n"
"#define MC_DFLTEXIT 32\n"
"#define MC_ALWAYS_SCROLL 64\n"
"#define MC_VALID 256\n"
);

12
usr.bin/menuc/menu_sys.def
View File

@ -1,4 +1,4 @@
/* $NetBSD: menu_sys.def,v 1.47 2003/09/27 09:44:13 dsl Exp $ */
/* $NetBSD: menu_sys.def,v 1.48 2003/10/18 18:26:53 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -57,7 +57,9 @@
static int __menu_init = 0;
int __m_endwin = 0;
static int max_lines = 0, max_cols = 0;
#ifndef scrolltext
static const char *scrolltext = " <: page up, >: page down";
#endif
static menudesc *menus = menu_def;
@ -160,8 +162,8 @@ init_menu(menudesc *m)
m->h = m->numopts + exithadd;
m->h = MIN(m->h, max_lines - m->y - hadd);
if (m->h < m->numopts + exithadd) {
if (!(m->mopt & MC_SCROLL) || m->h < 3) {
if (m->h < m->numopts + exithadd || m->mopt & MC_ALWAYS_SCROLL) {
if (!(m->mopt & (MC_SCROLL | MC_ALWAYS_SCROLL)) || m->h < 3) {
endwin();
(void)fprintf(stderr,
"Window too short for menu \"%s\"\n",
@ -186,7 +188,7 @@ init_menu(menudesc *m)
/* Calculate w? */
if (m->w == 0) {
if (m->mopt & MC_SCROLL)
if (m->mopt & (MC_SCROLL | MC_ALWAYS_SCROLL))
wmax = MAX(wmax,strlen(scrolltext));
for (i = 0; i < m->numopts; i++)
wmax = MAX(wmax, strlen(MSG_XLAT(m->opts[i].opt_name)) + 3);
@ -432,7 +434,7 @@ process_req(menudesc *m, void *arg, int num, int req)
break;
}
m->cursel = ch;
if (m->mopt & MC_SCROLL && m->cursel >= m->topline + m->h)
if (m->cursel >= m->topline + m->h)
m->topline = m->cursel - m->h + 1;
break;

4
usr.bin/menuc/menuc.1
View File

@ -1,4 +1,4 @@
.\" $NetBSD: menuc.1,v 1.19 2003/07/27 07:21:58 dsl Exp $
.\" $NetBSD: menuc.1,v 1.20 2003/10/18 18:26:53 dsl Exp $
.\"
.\" Copyright 1997 Piermont Information Systems Inc.
.\" All rights reserved.
@ -373,6 +373,8 @@ struct menudesc {
#define MC_SCROLL 4
#define MC_NOSHORTCUT 8
#define MC_NOCLEAR 16
#define MC_DFLTEXIT 32
#define MC_ALWAYS_SCROLL 64
int new_menu(const char *title, menu_ent *opts, int numopts,
int x, int y, int h, int w, int mopt,