diff options
| author | jkh <jkh@FreeBSD.org> | 1996-04-25 17:31:27 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-04-25 17:31:27 +0000 |
| commit | 553bed49c44aafc3cba97d0dd96e45ce7bcca3b6 (patch) | |
| tree | eed63e3f1a52745b1f4775b9da1bfc44ade22ebb /usr.sbin/sysinstall/dmenu.c | |
| parent | bd013f51f73fe7618393e72f501e20ecd6f63f56 (diff) | |
| download | FreeBSD-src-553bed49c44aafc3cba97d0dd96e45ce7bcca3b6.zip FreeBSD-src-553bed49c44aafc3cba97d0dd96e45ce7bcca3b6.tar.gz | |
Quite a few changes:
1. Fix the last display bugs (I hope) by use of dialog rebuilds at stategic
points.
2. Clean up the distributions menus so that everybody (that's reasonable)
has All and Clear options for setting/clearing things en-masse.
3. Various attempts at display optimization.
4. Change the wording of the `Don't use Write!' dialogs to make them more
explicitly define when and when not to use the option.
Diffstat (limited to 'usr.sbin/sysinstall/dmenu.c')
| -rw-r--r-- | usr.sbin/sysinstall/dmenu.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr.sbin/sysinstall/dmenu.c b/usr.sbin/sysinstall/dmenu.c index 8081dd7..7880770 100644 --- a/usr.sbin/sysinstall/dmenu.c +++ b/usr.sbin/sysinstall/dmenu.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: dmenu.c,v 1.16 1996/04/13 13:31:31 jkh Exp $ + * $Id: dmenu.c,v 1.17 1996/04/23 01:29:18 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -51,10 +51,8 @@ dmenuDisplayFile(dialogMenuItem *tmp) int dmenuSubmenu(dialogMenuItem *tmp) { - int i; - - i = dmenuOpenSimple((DMenu *)tmp->data) ? DITEM_SUCCESS : DITEM_FAILURE; - return i | DITEM_RESTORE; + return (dmenuOpenSimple((DMenu *)(tmp->data)) ? DITEM_SUCCESS : DITEM_FAILURE) | + DITEM_RESTORE | DITEM_RECREATE; } int @@ -201,10 +199,10 @@ dmenuOpen(DMenu *menu, int *choice, int *scroll, int *curr, int *max) menu_height(menu, n), -n, menu->items, NULL); else msgFatal("Menu: `%s' is of an unknown type\n", menu->title); - + clearok(stdscr, TRUE); if (rval) return FALSE; - else if (cancelled || (menu->type & (DMENU_SELECTION_RETURNS | DMENU_RADIO_TYPE | DMENU_CHECKLIST_TYPE))) { + else if (cancelled || menu->type & DMENU_SELECTION_RETURNS) { cancelled = FALSE; return TRUE; } |
