diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-10-06 17:00:58 +1000 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-06 01:12:56 -0700 |
| commit | adc1048980113b329d97ebf5b974ca4a50fc86ba (patch) | |
| tree | 12fddd65b9184ab2057e76b915f1394bf8ad5410 | |
| parent | ecd34ebd43d5a8c0db0a6dd132b61a4c663c7fd8 (diff) | |
| download | xorg-driver-xf86-input-keyboard-adc1048980113b329d97ebf5b974ca4a50fc86ba.tar.gz | |
Don't use XKB_DFLT_RULES from the server.
On Linux, the server uses default rules of "evdev" which doesn't apply for
this driver. For all other cases, the server uses "base", so let's just
hardcode it here too.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | src/kbd.c | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -113,12 +113,6 @@ static const OptionInfoRec KeyboardOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -/* Xorg 1.6 and earlier put the default XKB rules file in __XKBDEFRULES__ - in xorg-server.h, later versions switched to XKB_DFLT_RULES */ -#if !defined(XKB_DFLT_RULES) && defined(__XKBDEFRULES__) -# define XKB_DFLT_RULES __XKBDEFRULES__ -#endif - static const char *kbdDefaults[] = { #ifdef XQUEUE "Protocol", "Xqueue", @@ -126,7 +120,7 @@ static const char *kbdDefaults[] = { "Protocol", "standard", #endif "AutoRepeat", "500 30", - "XkbRules", XKB_DFLT_RULES, + "XkbRules", "base", "XkbModel", "pc105", "XkbLayout", "us", "CustomKeycodes", "off", |