diff options
| author | jkh <jkh@FreeBSD.org> | 1996-04-23 01:29:35 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-04-23 01:29:35 +0000 |
| commit | e665fee23a1e8faaacaceda94ce45295956dee10 (patch) | |
| tree | 61dd517d68f78c02b32b70a1ec457f1509801e87 /release/sysinstall/doc.c | |
| parent | 70a317a618a87b0eac973736356fadfa45b35959 (diff) | |
| download | FreeBSD-src-e665fee23a1e8faaacaceda94ce45295956dee10.zip FreeBSD-src-e665fee23a1e8faaacaceda94ce45295956dee10.tar.gz | |
Bring this into sync.
I still have a _very very annoying_ display bug which occurs when a menu
item causes a submenu to be displayed - the screen repaints for the original
menu (which is restored upon return from the submenu) are off by about 4
characters. I've tried restoring the screen, the cursor position, you name
it - same deal. Grrrr! This commit is my first step in trying to get someone
else to help me look into this one since I'm just tearing my hair out at this
point!
Diffstat (limited to 'release/sysinstall/doc.c')
| -rw-r--r-- | release/sysinstall/doc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/release/sysinstall/doc.c b/release/sysinstall/doc.c index 8a7e897..dc3e20f 100644 --- a/release/sysinstall/doc.c +++ b/release/sysinstall/doc.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.15 1996/04/07 03:52:23 jkh Exp $ + * $Id: doc.c,v 1.12 1996/04/13 13:31:32 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -57,14 +57,12 @@ docBrowser(dialogMenuItem *self) /* First, make sure we have whatever browser we've chosen is here */ if (package_add(browser) != DITEM_SUCCESS) { - dialog_clear(); msgConfirm("Unable to install the %s HTML browser package. You may\n" "wish to verify that your media is configured correctly and\n" "try again.", browser); return DITEM_FAILURE; } if (!file_executable(variable_get(VAR_BROWSER_BINARY))) { - dialog_clear(); if (!msgYesNo("Hmmm. The %s package claims to have installed, but I can't\n" "find its binary in %s! You may wish to try a different\n" "location to load the package from (go to Media menu) and see if that\n" @@ -92,7 +90,6 @@ docShowDocument(dialogMenuItem *self) char *str = self->prompt; if (!file_executable(browser)) { - dialog_clear(); msgConfirm("Can't find the browser in %s! Please ensure that it's\n" "properly set in the Options editor.", browser); return DITEM_FAILURE; @@ -115,8 +112,9 @@ docShowDocument(dialogMenuItem *self) } if (where) { sprintf(tmp, "%s %s", browser, where); + dialog_clear(); systemExecute(tmp); - return DITEM_SUCCESS; + return DITEM_SUCCESS | DITEM_RESTORE; } else { msgConfirm("Hmmmmm! I can't seem to access the documentation you selected!\n" @@ -124,4 +122,3 @@ docShowDocument(dialogMenuItem *self) return DITEM_FAILURE; } } - |
