mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Per-keyboard configuration

Browse source
This commit is contained in:
emersion 2017-10-26 19:59:32 +02:00
parent 92b41bb51f
commit 4e5d23daa9
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
5 changed files with 118 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
rootston/keyboard.c
View file

@ -137,13 +137,33 @@ void keyboard_add(struct wlr_input_device *device, struct roots_input *input) {
wl_signal_add(&device->keyboard->events.key, &keyboard->key);
wl_list_insert(&input->keyboards, &keyboard->link);
struct keyboard_config *config = config_get_keyboard(input->config,
device);
struct xkb_rule_names rules;
memset(&rules, 0, sizeof(rules));
rules.rules = getenv("XKB_DEFAULT_RULES");
rules.model = getenv("XKB_DEFAULT_MODEL");
rules.layout = getenv("XKB_DEFAULT_LAYOUT");
rules.variant = getenv("XKB_DEFAULT_VARIANT");
rules.options = getenv("XKB_DEFAULT_OPTIONS");
if (config != NULL) {
rules.rules = config->rules;
rules.model = config->model;
rules.layout = config->layout;
rules.variant = config->variant;
rules.options = config->options;
}
if (rules.rules == NULL) {
rules.rules = getenv("XKB_DEFAULT_RULES");
}
if (rules.model == NULL) {
rules.model = getenv("XKB_DEFAULT_MODEL");
}
if (rules.layout == NULL) {
rules.layout = getenv("XKB_DEFAULT_LAYOUT");
}
if (rules.variant == NULL) {
rules.variant = getenv("XKB_DEFAULT_VARIANT");
}
if (rules.options == NULL) {
rules.options = getenv("XKB_DEFAULT_OPTIONS");
}
struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
if (context == NULL) {
wlr_log(L_ERROR, "Cannot create XKB context");