mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-21 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement bindsym --to-code

Browse source 
* `bindsym --to-code` enables keysym to keycode translation.
* If there are no `xkb_layout` commands in the config file, the translation
uses the XKB_DEFAULT_LAYOUT value.
* It there is one or more `xkb_layout` command, the translation uses
the first one.
* If the translation is unsuccessful, a message is logged and the binding
is stored as BINDING_KEYSYM.
* The binding keysyms are stored and re-translated when a change in the input
configuration may affect the translated bindings.
This commit is contained in:
Konstantin Pospelov 2019-02-17 19:08:22 +03:00 • committed by Simon Ser
parent bd32b300fb
commit a09c144b8b
4 changed files with 274 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

76
sway/config.c
View file

@ -33,6 +33,31 @@
struct sway_config *config = NULL;
static struct keysym_translation_data new_keysym_translation_data(
const char *layout) {
struct xkb_rule_names rules = {
.layout = layout,
};
struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
xkb_context_new(XKB_CONTEXT_NO_FLAGS),
&rules,
XKB_KEYMAP_COMPILE_NO_FLAGS);
struct keysym_translation_data result = {
.xkb_keymap = xkb_keymap,
.xkb_state = xkb_state_new(xkb_keymap),
};
return result;
}
static void free_keysym_translation_data(
struct keysym_translation_data config) {
xkb_state_unref(config.xkb_state);
xkb_keymap_unref(config.xkb_keymap);
}
static void free_mode(struct sway_mode *mode) {
if (!mode) {
return;
@ -146,6 +171,7 @@ void free_config(struct sway_config *config) {
free(config->swaynag_command);
free((char *)config->current_config_path);
free((char *)config->current_config);
free_keysym_translation_data(config->keysym_translation);
free(config);
}
@ -317,6 +343,9 @@ static void config_defaults(struct sway_config *config) {
if (!(config->feature_policies = create_list())) goto cleanup;
if (!(config->ipc_policies = create_list())) goto cleanup;
// The keysym to keycode translation
config->keysym_translation = new_keysym_translation_data(getenv("XKB_DEFAULT_LAYOUT"));
return;
cleanup:
sway_abort("Unable to allocate config structures");
@ -937,3 +966,50 @@ void config_update_font_height(bool recalculate) {
arrange_root();
}
}
static void translate_binding_list(list_t *bindings, list_t *bindsyms,
list_t *bindcodes) {
for (int i = 0; i < bindings->length; ++i) {
struct sway_binding *binding = bindings->items[i];
translate_binding(binding);
list_t *bindings;
switch (binding->type) {
case BINDING_KEYSYM:
bindings = bindsyms;
break;
case BINDING_KEYCODE:
bindings = bindcodes;
break;
default:
sway_assert(false, "unexpected translated binding type: %d",
binding->type);
break;
}
binding_add_translated(binding, bindings);
}
}
void translate_keysyms(const char *layout) {
free_keysym_translation_data(config->keysym_translation);
config->keysym_translation = new_keysym_translation_data(layout);
for (int i = 0; i < config->modes->length; ++i) {
struct sway_mode *mode = config->modes->items[i];
list_t *bindsyms = create_list();
list_t *bindcodes = create_list();
translate_binding_list(mode->keysym_bindings, bindsyms, bindcodes);
translate_binding_list(mode->keycode_bindings, bindsyms, bindcodes);
list_free(mode->keysym_bindings);
list_free(mode->keycode_bindings);
mode->keysym_bindings = bindsyms;
mode->keycode_bindings = bindcodes;
}
sway_log(SWAY_DEBUG, "Translated keysyms for layout %s", layout);
}