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>
This commit is contained in:
parent
e08d8a2b04
commit
0b9dbd4bf2
|
@ -490,9 +490,8 @@ void dmxConfigSetMaxScreens(void)
|
||||||
return (char *)(dmx##glob ? dmx##glob : def); \
|
return (char *)(dmx##glob ? dmx##glob : def); \
|
||||||
}
|
}
|
||||||
|
|
||||||
GEN(rules, XkbRules, DMX_DEFAULT_XKB_RULES)
|
GEN(rules, XkbRules, XKB_DFLT_RULES)
|
||||||
GEN(model, XkbModel, DMX_DEFAULT_XKB_MODEL)
|
GEN(model, XkbModel, XKB_DFLT_MODEL)
|
||||||
GEN(layout, XkbLayout, DMX_DEFAULT_XKB_LAYOUT)
|
GEN(layout, XkbLayout, XKB_DFLT_LAYOUT)
|
||||||
GEN(variant, XkbVariant, DMX_DEFAULT_XKB_VARIANT)
|
GEN(variant, XkbVariant, XKB_DFLT_VARIANT)
|
||||||
GEN(options, XkbOptions, DMX_DEFAULT_XKB_OPTIONS)
|
GEN(options, XkbOptions, XKB_DFLT_OPTIONS)
|
||||||
|
|
||||||
|
|
|
@ -36,11 +36,8 @@
|
||||||
|
|
||||||
#ifndef _DMXCONFIG_H_
|
#ifndef _DMXCONFIG_H_
|
||||||
#define _DMXCONFIG_H_
|
#define _DMXCONFIG_H_
|
||||||
#define DMX_DEFAULT_XKB_RULES "base"
|
|
||||||
#define DMX_DEFAULT_XKB_MODEL "pc101"
|
#include <xkb-config.h>
|
||||||
#define DMX_DEFAULT_XKB_LAYOUT "us"
|
|
||||||
#define DMX_DEFAULT_XKB_VARIANT NULL
|
|
||||||
#define DMX_DEFAULT_XKB_OPTIONS NULL
|
|
||||||
|
|
||||||
extern void dmxConfigStoreDisplay(const char *display);
|
extern void dmxConfigStoreDisplay(const char *display);
|
||||||
extern void dmxConfigStoreInput(const char *input); /* Core devices */
|
extern void dmxConfigStoreInput(const char *input); /* Core devices */
|
||||||
|
|
|
@ -898,11 +898,11 @@ KdNewKeyboard (void)
|
||||||
ki->bellDuration = 200;
|
ki->bellDuration = 200;
|
||||||
ki->next = NULL;
|
ki->next = NULL;
|
||||||
ki->options = NULL;
|
ki->options = NULL;
|
||||||
ki->xkbRules = strdup("base");
|
ki->xkbRules = strdup(XKB_DFLT_RULES);
|
||||||
ki->xkbModel = strdup("pc105");
|
ki->xkbModel = strdup(XKB_DFLT_MODEL);
|
||||||
ki->xkbLayout = strdup("us");
|
ki->xkbLayout = strdup(XKB_DFLT_LAYOUT);
|
||||||
ki->xkbVariant = NULL;
|
ki->xkbVariant = strdup(XKB_DFLT_VARIANT);
|
||||||
ki->xkbOptions = NULL;
|
ki->xkbOptions = strdup(XKB_DFLT_OPTIONS);
|
||||||
|
|
||||||
return ki;
|
return ki;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user