mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-20 05:34:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement input_cmd_xkb_file (#3999)

Browse source 
Adds a new commend "xkb_file", which constructs the internal
xkb_keymap from a xkb file rather than an RMLVO configuration.
This allows greater flexibility when specifying xkb configurations.
An xkb file can be dumped with the xkbcomp program.
This commit is contained in:
Ed Younis 2019-07-12 19:04:29 -07:00 • committed by Brian Ashworth
parent 3716c53d35
commit eb770e88b7
8 changed files with 90 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sway/commands/input.c
View file

@ -28,6 +28,7 @@ static struct cmd_handler input_handlers[] = {
{ "scroll_method", input_cmd_scroll_method },
{ "tap", input_cmd_tap },
{ "tap_button_map", input_cmd_tap_button_map },
{ "xkb_file", input_cmd_xkb_file },
{ "xkb_layout", input_cmd_xkb_layout },
{ "xkb_model", input_cmd_xkb_model },
{ "xkb_options", input_cmd_xkb_options },
@ -48,8 +49,8 @@ static struct cmd_handler input_config_handlers[] = {
static void retranslate_keysyms(struct input_config *input_config) {
for (int i = 0; i < config->input_configs->length; ++i) {
struct input_config *ic = config->input_configs->items[i];
if (ic->xkb_layout) {
// this is the first config with xkb_layout
if (ic->xkb_layout || ic->xkb_file) {
// this is the first config with xkb_layout or xkb_file
if (ic->identifier == input_config->identifier) {
translate_keysyms(ic);
}

28
sway/commands/input/xkb_file.c Normal file
View file

@ -0,0 +1,28 @@
#define _POSIX_C_SOURCE 200809L
#include "sway/config.h"
#include "sway/commands.h"
#include "sway/input/input-manager.h"
#include "log.h"
struct cmd_results *input_cmd_xkb_file(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "xkb_file", EXPECTED_EQUAL_TO, 1))) {
return error;
}
struct input_config *ic = config->handler_context.input_config;
if (!ic) {
return cmd_results_new(CMD_FAILURE, "No input device defined.");
}
if (strcmp(argv[0], "-") == 0) {
free(ic->xkb_file);
ic->xkb_file = NULL;
} else {
ic->xkb_file = strdup(argv[0]);
}
ic->xkb_file_is_set = true;
sway_log(SWAY_DEBUG, "set-xkb_file for config: %s file: %s",
ic->identifier, ic->xkb_file);
return cmd_results_new(CMD_SUCCESS, NULL);
}