summaryrefslogtreecommitdiffstats
path: root/release/sysinstall/dist.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1996-04-25 17:31:27 +0000
committerjkh <jkh@FreeBSD.org>1996-04-25 17:31:27 +0000
commit553bed49c44aafc3cba97d0dd96e45ce7bcca3b6 (patch)
treeeed63e3f1a52745b1f4775b9da1bfc44ade22ebb /release/sysinstall/dist.c
parentbd013f51f73fe7618393e72f501e20ecd6f63f56 (diff)
downloadFreeBSD-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 'release/sysinstall/dist.c')
-rw-r--r--release/sysinstall/dist.c27
1 files changed, 11 insertions, 16 deletions
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index 52573c2..5194891 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: dist.c,v 1.41 1996/04/13 13:31:30 jkh Exp $
+ * $Id: dist.c,v 1.42 1996/04/23 01:29:17 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -161,6 +161,7 @@ int
distReset(dialogMenuItem *self)
{
Dists = 0;
+ DESDists = 0;
SrcDists = 0;
XF86Dists = 0;
XF86ServerDists = 0;
@@ -169,14 +170,6 @@ distReset(dialogMenuItem *self)
}
int
-distSrcReset(dialogMenuItem *self)
-{
- Dists &= ~DIST_SRC;
- SrcDists = 0;
- return DITEM_SUCCESS | DITEM_REDRAW;
-}
-
-int
distSetDeveloper(dialogMenuItem *self)
{
distReset(NULL);
@@ -254,11 +247,12 @@ distSetDES(dialogMenuItem *self)
if (DESDists & DIST_DES_KERBEROS)
DESDists |= DIST_DES_DES;
Dists |= DIST_DES;
+ msgDebug("SetDES Masks: DES: %0x, Dists: %0x\n", DESDists, Dists);
}
}
else
i = DITEM_FAILURE;
- return i | DITEM_RESTORE;
+ return i | DITEM_RECREATE | DITEM_RESTORE;
}
int
@@ -267,12 +261,14 @@ distSetSrc(dialogMenuItem *self)
int i = DITEM_SUCCESS;
if (dmenuOpenSimple(&MenuSrcDistributions)) {
- if (SrcDists)
+ if (SrcDists) {
Dists |= DIST_SRC;
+ msgDebug("SetSrc Masks: Srcs: %0x, Dists: %0x\n", SrcDists, Dists);
+ }
}
else
i = DITEM_FAILURE;
- return i | DITEM_RESTORE;
+ return i | DITEM_RECREATE | DITEM_RESTORE;
}
int
@@ -287,13 +283,12 @@ distSetXF86(dialogMenuItem *self)
XF86Dists |= DIST_XF86_FONTS;
if (XF86Dists)
Dists |= DIST_XF86;
- if (isDebug())
- msgDebug("SetXF86 Masks: Server: %0x, Fonts: %0x, XDists: %0x, Dists: %0x\n",
- XF86ServerDists, XF86FontDists, XF86Dists, Dists);
+ msgDebug("SetXF86 Masks: Server: %0x, Fonts: %0x, XDists: %0x, Dists: %0x\n",
+ XF86ServerDists, XF86FontDists, XF86Dists, Dists);
}
else
i = DITEM_FAILURE;
- return i | DITEM_RESTORE;
+ return i | DITEM_RECREATE | DITEM_RESTORE;
}
static Boolean
OpenPOWER on IntegriCloud