alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

bindsym: change xkb_rule_names initialization

Browse source
This commit is contained in:
Konstantin Pospelov 2019-03-05 22:38:26 +03:00 committed by Simon Ser
parent ddf63ffabe
commit c42497aca0
4 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sway/config.h
View file

@ -577,7 +577,8 @@ void merge_input_config(struct input_config *dst, struct input_config *src);
struct input_config *store_input_config(struct input_config *ic); struct input_config *store_input_config(struct input_config *ic);
struct xkb_rule_names input_config_get_rule_names(struct input_config *ic); void input_config_fill_rule_names(struct input_config *ic,
struct xkb_rule_names *rules);
void free_input_config(struct input_config *ic); void free_input_config(struct input_config *ic);

5
sway/config.c
View file

@ -337,7 +337,7 @@ static void config_defaults(struct sway_config *config) {
if (!(config->ipc_policies = create_list())) goto cleanup; if (!(config->ipc_policies = create_list())) goto cleanup;
// The keysym to keycode translation // The keysym to keycode translation
struct xkb_rule_names rules = {}; struct xkb_rule_names rules = {0};
config->keysym_translation_state = config->keysym_translation_state =
keysym_translation_state_create(rules); keysym_translation_state_create(rules);
@ -989,7 +989,8 @@ static void translate_binding_list(list_t *bindings, list_t *bindsyms,
void translate_keysyms(struct input_config *input_config) { void translate_keysyms(struct input_config *input_config) {
keysym_translation_state_destroy(config->keysym_translation_state); keysym_translation_state_destroy(config->keysym_translation_state);
struct xkb_rule_names rules = input_config_get_rule_names(input_config); struct xkb_rule_names rules = {0};
input_config_fill_rule_names(input_config, &rules);
config->keysym_translation_state = config->keysym_translation_state =
keysym_translation_state_create(rules); keysym_translation_state_create(rules);

17
sway/config/input.c
View file

@ -212,16 +212,13 @@ struct input_config *store_input_config(struct input_config *ic) {
return ic; return ic;
} }
struct xkb_rule_names input_config_get_rule_names(struct input_config *ic) { void input_config_fill_rule_names(struct input_config *ic,
struct xkb_rule_names rules = { struct xkb_rule_names *rules) {
.layout = ic->xkb_layout, rules->layout = ic->xkb_layout;
.model = ic->xkb_model, rules->model = ic->xkb_model;
.options = ic->xkb_options, rules->options = ic->xkb_options;
.rules = ic->xkb_rules, rules->rules = ic->xkb_rules;
.variant = ic->xkb_variant, rules->variant = ic->xkb_variant;
};
return rules;
} }
void free_input_config(struct input_config *ic) { void free_input_config(struct input_config *ic) {

6
sway/input/keyboard.c
View file

@ -482,11 +482,9 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
struct wlr_input_device *wlr_device = struct wlr_input_device *wlr_device =
keyboard->seat_device->input_device->wlr_device; keyboard->seat_device->input_device->wlr_device;
struct xkb_rule_names rules; struct xkb_rule_names rules = {0};
if (input_config) { if (input_config) {
rules = input_config_get_rule_names(input_config); input_config_fill_rule_names(input_config, &rules);
} else {
memset(&rules, 0, sizeof(rules));
} }
if (!rules.layout) { if (!rules.layout) {