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

Only try to setup moused(8) before setting up the X server if WITH_MICE is

Browse Source 
defined.

Approved by:	re
This commit is contained in:
John Baldwin 2002-11-27 19:39:26 +00:00
parent 8e5bc72116
commit cab2a4d2b9
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -650,7 +650,9 @@ int
configXSetup(dialogMenuItem *self)
{
char *config, *execfile, *execcmd, *style, *tmp;
#ifdef WITH_MICE
char *moused;
#endif
WINDOW *w = savescr();
setenv("XWINHOME", "/usr/X11R6", 1);
@ -697,6 +699,7 @@ tryagain:
*tmp = '\0';
if (file_executable(execfile)) {
free(execfile);
#ifdef WITH_MICE
moused = variable_get(VAR_MOUSED);
while (!moused || strcmp(moused, "YES")) {
if (msgYesNo("The X server may access the mouse in two ways: direct access\n"
@ -714,6 +717,7 @@ tryagain:
"Choose \"/dev/sysmouse\" as the mouse port and \"SysMouse\" or\n"
"\"MouseSystems\" as the mouse protocol in the X configuration\n"
"utility.");
#endif
Mkdir("/etc/X11"); /* XXX:Remove this later after we are happy mtree will have created this for us. */
systemExecute(execcmd);
if (!file_readable("/etc/X11/XF86Config")) {

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

@ -650,7 +650,9 @@ int
configXSetup(dialogMenuItem *self)
{
char *config, *execfile, *execcmd, *style, *tmp;
#ifdef WITH_MICE
char *moused;
#endif
WINDOW *w = savescr();
setenv("XWINHOME", "/usr/X11R6", 1);
@ -697,6 +699,7 @@ tryagain:
*tmp = '\0';
if (file_executable(execfile)) {
free(execfile);
#ifdef WITH_MICE
moused = variable_get(VAR_MOUSED);
while (!moused || strcmp(moused, "YES")) {
if (msgYesNo("The X server may access the mouse in two ways: direct access\n"
@ -714,6 +717,7 @@ tryagain:
"Choose \"/dev/sysmouse\" as the mouse port and \"SysMouse\" or\n"
"\"MouseSystems\" as the mouse protocol in the X configuration\n"
"utility.");
#endif
Mkdir("/etc/X11"); /* XXX:Remove this later after we are happy mtree will have created this for us. */
systemExecute(execcmd);
if (!file_readable("/etc/X11/XF86Config")) {