diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-10-16 08:24:37 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-10-20 13:32:11 +1000 |
| commit | 0b9dbd4bf2d1061514bebd28648538a5fc0b60e6 (patch) | |
| tree | 0516359f3af8a34a5ad68cc77041f18faea34c01 | |
| parent | e08d8a2b043e5be821c5e8b2dbf37b09102b5d01 (diff) | |
| download | xserver-0b9dbd4bf2d1061514bebd28648538a5fc0b60e6.tar.gz | |
Use the default XKB settings for dmx and kdrive.
Drop the dmx-specific defines, there's no reason to have separate ones
considering they're about as hardcoded as the default rules anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | hw/dmx/config/dmxconfig.c | 11 | ||||
| -rw-r--r-- | hw/dmx/config/dmxconfig.h | 7 | ||||
| -rw-r--r-- | hw/kdrive/src/kinput.c | 10 |
3 files changed, 12 insertions, 16 deletions
diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c index 225d89277..a31e5f7f7 100644 --- a/hw/dmx/config/dmxconfig.c +++ b/hw/dmx/config/dmxconfig.c @@ -490,9 +490,8 @@ void dmxConfigSetMaxScreens(void) return (char *)(dmx##glob ? dmx##glob : def); \ } -GEN(rules, XkbRules, DMX_DEFAULT_XKB_RULES) -GEN(model, XkbModel, DMX_DEFAULT_XKB_MODEL) -GEN(layout, XkbLayout, DMX_DEFAULT_XKB_LAYOUT) -GEN(variant, XkbVariant, DMX_DEFAULT_XKB_VARIANT) -GEN(options, XkbOptions, DMX_DEFAULT_XKB_OPTIONS) - +GEN(rules, XkbRules, XKB_DFLT_RULES) +GEN(model, XkbModel, XKB_DFLT_MODEL) +GEN(layout, XkbLayout, XKB_DFLT_LAYOUT) +GEN(variant, XkbVariant, XKB_DFLT_VARIANT) +GEN(options, XkbOptions, XKB_DFLT_OPTIONS) diff --git a/hw/dmx/config/dmxconfig.h b/hw/dmx/config/dmxconfig.h index 477db4a63..91a6662e3 100644 --- a/hw/dmx/config/dmxconfig.h +++ b/hw/dmx/config/dmxconfig.h @@ -36,11 +36,8 @@ #ifndef _DMXCONFIG_H_ #define _DMXCONFIG_H_ -#define DMX_DEFAULT_XKB_RULES "base" -#define DMX_DEFAULT_XKB_MODEL "pc101" -#define DMX_DEFAULT_XKB_LAYOUT "us" -#define DMX_DEFAULT_XKB_VARIANT NULL -#define DMX_DEFAULT_XKB_OPTIONS NULL + +#include <xkb-config.h> extern void dmxConfigStoreDisplay(const char *display); extern void dmxConfigStoreInput(const char *input); /* Core devices */ diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index fb8ebd076..65fc75a54 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -898,11 +898,11 @@ KdNewKeyboard (void) ki->bellDuration = 200; ki->next = NULL; ki->options = NULL; - ki->xkbRules = strdup("base"); - ki->xkbModel = strdup("pc105"); - ki->xkbLayout = strdup("us"); - ki->xkbVariant = NULL; - ki->xkbOptions = NULL; + ki->xkbRules = strdup(XKB_DFLT_RULES); + ki->xkbModel = strdup(XKB_DFLT_MODEL); + ki->xkbLayout = strdup(XKB_DFLT_LAYOUT); + ki->xkbVariant = strdup(XKB_DFLT_VARIANT); + ki->xkbOptions = strdup(XKB_DFLT_OPTIONS); return ki; } |