mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-18 22:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #555 from mikkeloscar/mode-name-spaces

Browse source 
Allow surrounding spaces in mode name
This commit is contained in:
Drew DeVault 2016-03-30 07:37:55 -04:00
parent c3a5e00b6e 948c594132
commit 3ffff5e4f2
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/commands.c
View file

@ -678,16 +678,12 @@ static struct cmd_results *cmd_mode(int argc, char **argv) {
if ((error = checkarg(argc, "mode", EXPECTED_AT_LEAST, 1))) { if ((error = checkarg(argc, "mode", EXPECTED_AT_LEAST, 1))) {
return error; return error;
} }
char *mode_name = join_args(argv, argc);
int mode_len = strlen(mode_name); const char *mode_name = argv[0];
bool mode_make = mode_name[mode_len-1] == '{'; bool mode_make = (argc == 2 && strcmp(argv[1], "{") == 0);
if (mode_make) { if (mode_make) {
if (!config->reading) if (!config->reading)
return cmd_results_new(CMD_FAILURE, "mode", "Can only be used in config file."); return cmd_results_new(CMD_FAILURE, "mode", "Can only be used in config file.");
// Trim trailing spaces
do {
mode_name[--mode_len] = 0;
} while(isspace(mode_name[mode_len-1]));
} }
struct sway_mode *mode = NULL; struct sway_mode *mode = NULL;
// Find mode // Find mode
@ -708,13 +704,11 @@ static struct cmd_results *cmd_mode(int argc, char **argv) {
} }
if (!mode) { if (!mode) {
error = cmd_results_new(CMD_INVALID, "mode", "Unknown mode `%s'", mode_name); error = cmd_results_new(CMD_INVALID, "mode", "Unknown mode `%s'", mode_name);
free(mode_name);
return error; return error;
} }
if ((config->reading && mode_make) || (!config->reading && !mode_make)) { if ((config->reading && mode_make) || (!config->reading && !mode_make)) {
sway_log(L_DEBUG, "Switching to mode `%s'",mode->name); sway_log(L_DEBUG, "Switching to mode `%s'",mode->name);
} }
free(mode_name);
// Set current mode // Set current mode
config->current_mode = mode; config->current_mode = mode;
if (!mode_make) { if (!mode_make) {