d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better screen handling in X desktop setup.

Browse Source 
Don't get cute with nested dialogs now.
This commit is contained in:
Jordan K. Hubbard 1999-12-18 02:04:02 +00:00
parent 5703faa226
commit 8932007887
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=54762
6 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/sysinstall/config.c
View File

@ -564,11 +564,10 @@ configXSetup(dialogMenuItem *self)
{
char *config, *execfile, *style;
char *moused;
WINDOW *w;
WINDOW *w = savescr();
setenv("XWINHOME", "/usr/X11R6", 1);
tryagain:
w = savescr();
variable_unset(VAR_DESKSTYLE);
variable_unset(VAR_XF86_CONFIG);
dialog_clear_norefresh();

11
release/sysinstall/label.c
View File

@ -327,12 +327,7 @@ get_mountpoint(struct chunk *old)
tmp = old->private_data;
else
tmp = NULL;
if (!old) {
DialogX = 14;
DialogY = 16;
}
val = msgGetInput(tmp ? tmp->mountpoint : NULL, "Please specify a mount point for the partition");
DialogX = DialogY = 0;
if (!val || !*val) {
if (!old)
return NULL;
@ -391,13 +386,10 @@ get_partition_type(void)
};
WINDOW *w = savescr();
DialogX = 7;
DialogY = 8;
i = dialog_menu("Please choose a partition type",
"If you want to use this partition for swap space, select Swap.\n"
"If you want to put a filesystem on it, choose FS.",
-1, -1, 2, 2, fs_types, selection, NULL, NULL);
DialogX = DialogY = 0;
restorescr(w);
if (!i) {
if (!strcmp(selection, "FS"))
@ -908,13 +900,10 @@ diskLabel(Device *dev)
u_long flags = 0;
sprintf(osize, "%d", sz);
DialogX = 3;
DialogY = 2;
val = msgGetInput(osize,
"Please specify the partition size in blocks or append a trailing M for\n"
"megabytes or C for cylinders. %d blocks (%dMB) are free.",
sz, sz / ONE_MEG);
DialogX = DialogY = 0;
if (!val || (size = strtol(val, &cp, 0)) <= 0) {
clear_wins();
break;

3
usr.sbin/sade/config.c
View File

@ -564,11 +564,10 @@ configXSetup(dialogMenuItem *self)
{
char *config, *execfile, *style;
char *moused;
WINDOW *w;
WINDOW *w = savescr();
setenv("XWINHOME", "/usr/X11R6", 1);
tryagain:
w = savescr();
variable_unset(VAR_DESKSTYLE);
variable_unset(VAR_XF86_CONFIG);
dialog_clear_norefresh();

11
usr.sbin/sade/label.c
View File

@ -327,12 +327,7 @@ get_mountpoint(struct chunk *old)
tmp = old->private_data;
else
tmp = NULL;
if (!old) {
DialogX = 14;
DialogY = 16;
}
val = msgGetInput(tmp ? tmp->mountpoint : NULL, "Please specify a mount point for the partition");
DialogX = DialogY = 0;
if (!val || !*val) {
if (!old)
return NULL;
@ -391,13 +386,10 @@ get_partition_type(void)
};
WINDOW *w = savescr();
DialogX = 7;
DialogY = 8;
i = dialog_menu("Please choose a partition type",
"If you want to use this partition for swap space, select Swap.\n"
"If you want to put a filesystem on it, choose FS.",
-1, -1, 2, 2, fs_types, selection, NULL, NULL);
DialogX = DialogY = 0;
restorescr(w);
if (!i) {
if (!strcmp(selection, "FS"))
@ -908,13 +900,10 @@ diskLabel(Device *dev)
u_long flags = 0;
sprintf(osize, "%d", sz);
DialogX = 3;
DialogY = 2;
val = msgGetInput(osize,
"Please specify the partition size in blocks or append a trailing M for\n"
"megabytes or C for cylinders. %d blocks (%dMB) are free.",
sz, sz / ONE_MEG);
DialogX = DialogY = 0;
if (!val || (size = strtol(val, &cp, 0)) <= 0) {
clear_wins();
break;

3
usr.sbin/sysinstall/config.c
View File

@ -564,11 +564,10 @@ configXSetup(dialogMenuItem *self)
{
char *config, *execfile, *style;
char *moused;
WINDOW *w;
WINDOW *w = savescr();
setenv("XWINHOME", "/usr/X11R6", 1);
tryagain:
w = savescr();
variable_unset(VAR_DESKSTYLE);
variable_unset(VAR_XF86_CONFIG);
dialog_clear_norefresh();

11
usr.sbin/sysinstall/label.c
View File

@ -327,12 +327,7 @@ get_mountpoint(struct chunk *old)
tmp = old->private_data;
else
tmp = NULL;
if (!old) {
DialogX = 14;
DialogY = 16;
}
val = msgGetInput(tmp ? tmp->mountpoint : NULL, "Please specify a mount point for the partition");
DialogX = DialogY = 0;
if (!val || !*val) {
if (!old)
return NULL;
@ -391,13 +386,10 @@ get_partition_type(void)
};
WINDOW *w = savescr();
DialogX = 7;
DialogY = 8;
i = dialog_menu("Please choose a partition type",
"If you want to use this partition for swap space, select Swap.\n"
"If you want to put a filesystem on it, choose FS.",
-1, -1, 2, 2, fs_types, selection, NULL, NULL);
DialogX = DialogY = 0;
restorescr(w);
if (!i) {
if (!strcmp(selection, "FS"))
@ -908,13 +900,10 @@ diskLabel(Device *dev)
u_long flags = 0;
sprintf(osize, "%d", sz);
DialogX = 3;
DialogY = 2;
val = msgGetInput(osize,
"Please specify the partition size in blocks or append a trailing M for\n"
"megabytes or C for cylinders. %d blocks (%dMB) are free.",
sz, sz / ONE_MEG);
DialogX = DialogY = 0;
if (!val || (size = strtol(val, &cp, 0)) <= 0) {
clear_wins();
break;