diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2005-01-12 20:09:51 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2005-01-12 20:09:51 +0000 |
| commit | 80aa8646d4e39e36422d8b12bab9c260af9d4852 (patch) | |
| tree | 359dd13eb54a10a3f67d885c2cd5e3122624e9bb /hw/xfree86 | |
| parent | b710b325cfd584df35243dee7f8f26d59af3f9a4 (diff) | |
Bugzilla #2211 (https://bugs.freedesktop.org/show_bug.cgi?id=2211)
attachment #1627 (https://bugs.freedesktop.org/attachment.cgi?id=1627):
xorgconfig default keyboard model outdated (should be pc105, not
pc101/pc102). Patch by Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/utils/xorgconfig/xorgconfig.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c index 9504a3443..cc6d99f30 100644 --- a/hw/xfree86/utils/xorgconfig/xorgconfig.c +++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c @@ -94,7 +94,7 @@ * Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp) */ /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v 1.6 2004/08/13 23:57:38 alanc Exp $ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v 1.6.2.1 2005/01/12 03:29:20 gisburn Exp $ */ #include <stdlib.h> #include <stdio.h> @@ -225,7 +225,7 @@ char *config_keyboard_dev = "/dev/wskbd0"; #endif int config_xkbdisable = 0; char *config_xkbrules; -char *config_xkbmodel = "pc101"; +char *config_xkbmodel = "pc105"; char *config_xkblayout = "us"; char *config_xkbvariant = (char *) 0; char *config_xkboptions = (char *) 0; @@ -679,7 +679,7 @@ mouse_configuration(void) { static char *xkbmodeltext = "Please select one of the following keyboard types that is the better\n" "description of your keyboard. If nothing really matches,\n" -"choose 1 (Generic 101-key PC)\n\n"; +"choose \"Generic 104-key PC\"\n\n"; static char *xkblayouttext = "Please select the layout corresponding to your keyboard\n"; @@ -2076,7 +2076,7 @@ static char *keyboardchunk3_text = "# To customise the XKB settings to suit your keyboard, modify the\n" "# lines below (which are the defaults). For example, for a non-U.S.\n" "# keyboard, you will probably want to use:\n" -"# Option \"XkbModel\" \"pc102\"\n" +"# Option \"XkbModel\" \"pc105\"\n" "# If you have a US Microsoft Natural keyboard, you can use:\n" "# Option \"XkbModel\" \"microsoft\"\n" "#\n" @@ -2093,7 +2093,7 @@ static char *keyboardchunk3_text = "\n" "# These are the default XKB settings for "__XSERVERNAME__"\n" "# Option \"XkbRules\" \""__XKBDEFRULES__"\"\n" -"# Option \"XkbModel\" \"pc101\"\n" +"# Option \"XkbModel\" \"pc105\"\n" "# Option \"XkbLayout\" \"us\"\n" "# Option \"XkbVariant\" \"\"\n" "# Option \"XkbOptions\" \"\"\n" |