mirror of
https://github.com/swaywm/sway.git
synced 2024-11-12 19:23:18 +00:00
1a8b9fda8a
In cmd_mode, the mode is currently being reset to the default mode after a mode subcommand handler is executed. This stores and restores the mode instead
88 lines
2.3 KiB
C
88 lines
2.3 KiB
C
#define _POSIX_C_SOURCE 200809L
|
|
#include <stdbool.h>
|
|
#include <string.h>
|
|
#include "sway/commands.h"
|
|
#include "sway/config.h"
|
|
#include "sway/ipc-server.h"
|
|
#include "list.h"
|
|
#include "log.h"
|
|
#include "stringop.h"
|
|
|
|
// Must be in order for the bsearch
|
|
static struct cmd_handler mode_handlers[] = {
|
|
{ "bindcode", cmd_bindcode },
|
|
{ "bindswitch", cmd_bindswitch },
|
|
{ "bindsym", cmd_bindsym },
|
|
{ "set", cmd_set },
|
|
{ "unbindcode", cmd_unbindcode },
|
|
{ "unbindswitch", cmd_unbindswitch },
|
|
{ "unbindsym", cmd_unbindsym },
|
|
};
|
|
|
|
struct cmd_results *cmd_mode(int argc, char **argv) {
|
|
struct cmd_results *error = NULL;
|
|
if ((error = checkarg(argc, "mode", EXPECTED_AT_LEAST, 1))) {
|
|
return error;
|
|
}
|
|
|
|
bool pango = strcmp(*argv, "--pango_markup") == 0;
|
|
if (pango) {
|
|
argc--; argv++;
|
|
if (argc == 0) {
|
|
return cmd_results_new(CMD_FAILURE, "Mode name is missing");
|
|
}
|
|
}
|
|
|
|
if (config->reading && argc == 1) {
|
|
return cmd_results_new(CMD_DEFER, NULL);
|
|
}
|
|
|
|
char *mode_name = *argv;
|
|
strip_quotes(mode_name);
|
|
struct sway_mode *mode = NULL;
|
|
// Find mode
|
|
for (int i = 0; i < config->modes->length; ++i) {
|
|
struct sway_mode *test = config->modes->items[i];
|
|
if (strcmp(test->name, mode_name) == 0) {
|
|
mode = test;
|
|
break;
|
|
}
|
|
}
|
|
// Create mode if it doesn't exist
|
|
if (!mode && argc > 1) {
|
|
mode = calloc(1, sizeof(struct sway_mode));
|
|
if (!mode) {
|
|
return cmd_results_new(CMD_FAILURE, "Unable to allocate mode");
|
|
}
|
|
mode->name = strdup(mode_name);
|
|
mode->keysym_bindings = create_list();
|
|
mode->keycode_bindings = create_list();
|
|
mode->mouse_bindings = create_list();
|
|
mode->switch_bindings = create_list();
|
|
mode->pango = pango;
|
|
list_add(config->modes, mode);
|
|
}
|
|
if (!mode) {
|
|
error = cmd_results_new(CMD_INVALID, "Unknown mode `%s'", mode_name);
|
|
return error;
|
|
}
|
|
// Set current mode
|
|
struct sway_mode *stored_mode = config->current_mode;
|
|
config->current_mode = mode;
|
|
if (argc == 1) {
|
|
// trigger IPC mode event
|
|
sway_log(SWAY_DEBUG, "Switching to mode `%s' (pango=%d)",
|
|
mode->name, mode->pango);
|
|
ipc_event_mode(config->current_mode->name,
|
|
config->current_mode->pango);
|
|
return cmd_results_new(CMD_SUCCESS, NULL);
|
|
}
|
|
|
|
// Create binding
|
|
struct cmd_results *result = config_subcommand(argv + 1, argc - 1,
|
|
mode_handlers, sizeof(mode_handlers));
|
|
config->current_mode = stored_mode;
|
|
|
|
return result;
|
|
}
|