Config: HAL: Use input.xkb namespace
Use an explicit input.xkb.foo namespace, not input.xkb_foo.
This commit is contained in:
parent
838e59c02e
commit
aef255425a
10
config/hal.c
10
config/hal.c
|
@ -198,12 +198,12 @@ device_added(LibHalContext *hal_ctx, const char *udi)
|
||||||
name = xstrdup("(unnamed)");
|
name = xstrdup("(unnamed)");
|
||||||
|
|
||||||
if (type & TYPE_KEYS) {
|
if (type & TYPE_KEYS) {
|
||||||
xkb_rules = get_prop_string(hal_ctx, udi, "input.xkb_rules", &error);
|
xkb_rules = get_prop_string(hal_ctx, udi, "input.xkb.rules", &error);
|
||||||
xkb_model = get_prop_string(hal_ctx, udi, "input.xkb_model", &error);
|
xkb_model = get_prop_string(hal_ctx, udi, "input.xkb.model", &error);
|
||||||
xkb_layout = get_prop_string(hal_ctx, udi, "input.xkb_layout", &error);
|
xkb_layout = get_prop_string(hal_ctx, udi, "input.xkb.layout", &error);
|
||||||
xkb_variant = get_prop_string(hal_ctx, udi, "input.xkb_variant",
|
xkb_variant = get_prop_string(hal_ctx, udi, "input.xkb.variant",
|
||||||
&error);
|
&error);
|
||||||
xkb_options = get_prop_string_array(hal_ctx, udi, "input.xkb_options",
|
xkb_options = get_prop_string_array(hal_ctx, udi, "input.xkb.options",
|
||||||
&error);
|
&error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,21 +11,21 @@
|
||||||
</match>
|
</match>
|
||||||
|
|
||||||
<match key="info.capabilities" contains="input.keys">
|
<match key="info.capabilities" contains="input.keys">
|
||||||
<merge key="input.xkb_rules" type="string">base</merge>
|
<merge key="input.xkb.rules" type="string">base</merge>
|
||||||
|
|
||||||
<!-- If we're using Linux, we use evdev by default (falling back to
|
<!-- If we're using Linux, we use evdev by default (falling back to
|
||||||
keyboard otherwise). -->
|
keyboard otherwise). -->
|
||||||
<merge key="input.x11_driver" type="string">keyboard</merge>
|
<merge key="input.x11_driver" type="string">keyboard</merge>
|
||||||
<merge key="input.xkb_model" type="string">keyboard</merge>
|
<merge key="input.xkb.model" type="string">keyboard</merge>
|
||||||
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
|
<match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
|
||||||
string="Linux">
|
string="Linux">
|
||||||
<merge key="input.x11_driver" type="string">evdev</merge>
|
<merge key="input.x11_driver" type="string">evdev</merge>
|
||||||
<merge key="input.xkb_model" type="string">evdev</merge>
|
<merge key="input.xkb.model" type="string">evdev</merge>
|
||||||
</match>
|
</match>
|
||||||
|
|
||||||
<merge key="input.xkb_layout" type="string">us</merge>
|
<merge key="input.xkb.layout" type="string">us</merge>
|
||||||
|
|
||||||
<merge key="input.xkb_variant" type="string" />
|
<merge key="input.xkb.variant" type="string" />
|
||||||
</match>
|
</match>
|
||||||
</device>
|
</device>
|
||||||
</deviceinfo>
|
</deviceinfo>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user