mirror of
https://github.com/swaywm/sway.git
synced 2024-11-15 06:54:28 +01:00
Compare commits
2 Commits
5e18ed3cf0
...
59f6292383
Author | SHA1 | Date | |
---|---|---|---|
|
59f6292383 | ||
|
fd9ab9ee06 |
@ -37,19 +37,26 @@
|
|||||||
struct sway_config *config = NULL;
|
struct sway_config *config = NULL;
|
||||||
|
|
||||||
static struct xkb_state *keysym_translation_state_create(
|
static struct xkb_state *keysym_translation_state_create(
|
||||||
struct xkb_rule_names rules) {
|
struct xkb_rule_names rules, uint32_t context_flags) {
|
||||||
struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_SECURE_GETENV);
|
struct xkb_context *context = xkb_context_new(context_flags | XKB_CONTEXT_NO_SECURE_GETENV);
|
||||||
struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
|
struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
|
||||||
context,
|
context,
|
||||||
&rules,
|
&rules,
|
||||||
XKB_KEYMAP_COMPILE_NO_FLAGS);
|
XKB_KEYMAP_COMPILE_NO_FLAGS);
|
||||||
|
|
||||||
xkb_context_unref(context);
|
xkb_context_unref(context);
|
||||||
|
if (xkb_keymap == NULL) {
|
||||||
|
sway_log(SWAY_ERROR, "Failed to compile keysym translation XKB keymap");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
return xkb_state_new(xkb_keymap);
|
return xkb_state_new(xkb_keymap);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void keysym_translation_state_destroy(
|
static void keysym_translation_state_destroy(
|
||||||
struct xkb_state *state) {
|
struct xkb_state *state) {
|
||||||
|
if (state == NULL) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
xkb_keymap_unref(xkb_state_get_keymap(state));
|
xkb_keymap_unref(xkb_state_get_keymap(state));
|
||||||
xkb_state_unref(state);
|
xkb_state_unref(state);
|
||||||
}
|
}
|
||||||
@ -337,8 +344,14 @@ static void config_defaults(struct sway_config *config) {
|
|||||||
|
|
||||||
// The keysym to keycode translation
|
// The keysym to keycode translation
|
||||||
struct xkb_rule_names rules = {0};
|
struct xkb_rule_names rules = {0};
|
||||||
config->keysym_translation_state =
|
config->keysym_translation_state = keysym_translation_state_create(rules, 0);
|
||||||
keysym_translation_state_create(rules);
|
if (config->keysym_translation_state == NULL) {
|
||||||
|
config->keysym_translation_state = keysym_translation_state_create(rules,
|
||||||
|
XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
|
||||||
|
}
|
||||||
|
if (config->keysym_translation_state == NULL) {
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
cleanup:
|
cleanup:
|
||||||
@ -985,8 +998,12 @@ void translate_keysyms(struct input_config *input_config) {
|
|||||||
|
|
||||||
struct xkb_rule_names rules = {0};
|
struct xkb_rule_names rules = {0};
|
||||||
input_config_fill_rule_names(input_config, &rules);
|
input_config_fill_rule_names(input_config, &rules);
|
||||||
config->keysym_translation_state =
|
config->keysym_translation_state = keysym_translation_state_create(rules, 0);
|
||||||
keysym_translation_state_create(rules);
|
if (config->keysym_translation_state == NULL) {
|
||||||
|
sway_log(SWAY_ERROR, "Failed to create keysym translation XKB state "
|
||||||
|
"for device '%s'", input_config->identifier);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
for (int i = 0; i < config->modes->length; ++i) {
|
for (int i = 0; i < config->modes->length; ++i) {
|
||||||
struct sway_mode *mode = config->modes->items[i];
|
struct sway_mode *mode = config->modes->items[i];
|
||||||
|
Loading…
Reference in New Issue
Block a user