diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:16 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:16 +0000 |
| commit | 696b137d5855cdcd0e6b95e16ce2dad00510a41d (patch) | |
| tree | 93d38eaf0eb8fd4bb2d9725dc242c5434ceabfa8 /hw/xfree86/common/xf86Configure.c | |
| parent | 2c971497fc9fc09d342cdb13a985fdde81f82351 (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_0-MERGE
Diffstat (limited to 'hw/xfree86/common/xf86Configure.c')
| -rw-r--r-- | hw/xfree86/common/xf86Configure.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 4e1473ef7..be37f53be 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -1,5 +1,4 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 1.1.4.1.2.1 2004/03/17 20:30:26 ago Exp $ */ /* * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales. * @@ -258,7 +257,11 @@ configureInputSection (void) parsePrologue (XF86ConfInputPtr, XF86ConfInputRec) ptr->inp_identifier = "Keyboard0"; +#ifdef USE_DEPRECATED_KEYBOARD_DRIVER ptr->inp_driver = "keyboard"; +#else + ptr->inp_driver = "kbd"; +#endif ptr->list.next = NULL; /* Crude mechanism to auto-detect mouse (os dependent) */ @@ -750,8 +753,8 @@ configureDDCMonitorSection (int screennum) ptr->mon_vrefresh[ptr->mon_n_hsync].lo = ConfiguredMonitor->det_mon[i].section.ranges.min_v; ptr->mon_vrefresh[ptr->mon_n_hsync].hi = + ConfiguredMonitor->det_mon[i].section.ranges.max_v; ptr->mon_n_hsync++; - ConfiguredMonitor->det_mon[i].section.ranges.max_v; default: break; } @@ -1004,7 +1007,7 @@ DoConfigure() } ErrorF("\nYour %s file is %s\n\n", XF86CONFIGFILE ,filename); - ErrorF("To test the server, run 'X -xf86config %s'\n\n", filename); + ErrorF("To test the server, run 'X -config %s'\n\n", filename); bail: OsCleanup(TRUE); |